summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/hal/Module2
-rw-r--r--cesar/hal/boot_params/src/boot_params_handlers.c4
-rw-r--r--cesar/hal/clk/Module1
-rw-r--r--cesar/hal/clk/clk.h31
-rw-r--r--cesar/hal/clk/src/clk.c (renamed from cesar/hal/sysclk/src/sysclk.c)10
-rw-r--r--cesar/hal/clk/test/Makefile10
-rw-r--r--cesar/hal/clk/test/override/cyg/hal/hal_clock.h18
-rw-r--r--cesar/hal/clk/test/override/pkgconf/kernel.h (renamed from cesar/hal/sysclk/test/override/pkgconf/kernel.h)8
-rw-r--r--cesar/hal/clk/test/src/test_clk.c (renamed from cesar/hal/sysclk/test/src/test_sysclk.c)20
-rw-r--r--cesar/hal/sysclk/Module1
-rw-r--r--cesar/hal/sysclk/sysclk.h31
-rw-r--r--cesar/hal/sysclk/test/Makefile10
-rw-r--r--cesar/hal/sysclk/test/override/cyg/hal/hal_clock.h18
-rw-r--r--common/tests/tests4
14 files changed, 84 insertions, 84 deletions
diff --git a/cesar/hal/Module b/cesar/hal/Module
index 22d0bed356..1906606fa7 100644
--- a/cesar/hal/Module
+++ b/cesar/hal/Module
@@ -4,5 +4,5 @@ MODULES := hal/timer hal/watchdog \
hal/phy/soft/bridgedma
else
MODULES := hal/timer hal/watchdog hal/arch \
- hal/phy hal/ipmbox hal/leon hal/boot_params hal/mem hal/sysclk
+ hal/phy hal/ipmbox hal/leon hal/boot_params hal/mem hal/clk
endif
diff --git a/cesar/hal/boot_params/src/boot_params_handlers.c b/cesar/hal/boot_params/src/boot_params_handlers.c
index 421d38de84..50e84aab3e 100644
--- a/cesar/hal/boot_params/src/boot_params_handlers.c
+++ b/cesar/hal/boot_params/src/boot_params_handlers.c
@@ -21,11 +21,11 @@
#include "hal/boot_params/inc/boot_params_handlers.h"
#include "hal/mem/mem.h"
-#include "hal/sysclk/sysclk.h"
+#include "hal/clk/clk.h"
BEGIN_BOOT_PARAM_HANDLERS
BOOT_PARAM_HANDLER ("mem", mem_handle_boot_param_mem)
-BOOT_PARAM_HANDLER ("sysclk_mhz", hal_sysclk_boot_param_sysclk_mhz)
+BOOT_PARAM_HANDLER ("sysclk_mhz", hal_clk_boot_param_sysclk_mhz)
END_BOOT_PARAM_HANDLERS
diff --git a/cesar/hal/clk/Module b/cesar/hal/clk/Module
new file mode 100644
index 0000000000..ffbcfeb16c
--- /dev/null
+++ b/cesar/hal/clk/Module
@@ -0,0 +1 @@
+SOURCES := clk.c
diff --git a/cesar/hal/clk/clk.h b/cesar/hal/clk/clk.h
new file mode 100644
index 0000000000..83233c507b
--- /dev/null
+++ b/cesar/hal/clk/clk.h
@@ -0,0 +1,31 @@
+#ifndef hal_clk_clk_h
+#define hal_clk_clk_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2012 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file hal/clk/clk.h
+ * \brief Boot param handler to get the system/uart clocks.
+ * \ingroup hal
+ *
+ * For MSE500 the system/uart clocks differs from the one of the SPC300, the
+ * main objective is to keep the same binary for both chips.
+ */
+
+BEGIN_DECLS
+
+/**
+ * Handle the boot parameter "sysclk_mhz".
+ * \param param_value value passed for the "sysclk_mhz" parameter
+ * \return 0 on success, -1 otherwise
+ */
+int
+hal_clk_boot_param_sysclk_mhz (const char *param_value);
+
+END_DECLS
+
+#endif /* hal_clk_clk_h */
diff --git a/cesar/hal/sysclk/src/sysclk.c b/cesar/hal/clk/src/clk.c
index 4c6a62fcfd..4694188753 100644
--- a/cesar/hal/sysclk/src/sysclk.c
+++ b/cesar/hal/clk/src/clk.c
@@ -6,13 +6,13 @@
*
* }}} */
/**
- * \file hal/sysclk/src/sysclk.c
+ * \file hal/clk/src/clk.c
* \brief Boot param handler to get the system clock.
* \ingroup hal
*/
#include "common/std.h"
#include "common/module.h"
-#include "hal/sysclk/sysclk.h"
+#include "hal/clk/clk.h"
#include <cyg/hal/hal_clock.h>
#include <pkgconf/kernel.h>
@@ -27,7 +27,7 @@
* \return true on success
*/
PRIVATE bool
-hal_sysclk_str_to_num (uint *num, const char *str)
+hal_clk_str_to_num (uint *num, const char *str)
{
char *endptr;
unsigned long val = strtoul (str, &endptr, 10);
@@ -40,10 +40,10 @@ hal_sysclk_str_to_num (uint *num, const char *str)
}
int
-hal_sysclk_boot_param_sysclk_mhz (const char *param_value)
+hal_clk_boot_param_sysclk_mhz (const char *param_value)
{
uint sysclk_mhz;
- if (!hal_sysclk_str_to_num (&sysclk_mhz, param_value))
+ if (!hal_clk_str_to_num (&sysclk_mhz, param_value))
{
printf (
"boot parameters \"sysclk_mhz\": error while parsing value \"%s\"\n",
diff --git a/cesar/hal/clk/test/Makefile b/cesar/hal/clk/test/Makefile
new file mode 100644
index 0000000000..4719dd7105
--- /dev/null
+++ b/cesar/hal/clk/test/Makefile
@@ -0,0 +1,10 @@
+BASE = ../../..
+
+INCLUDES = hal/clk/test/override
+DEFS = -DNO_PRIVATE
+
+HOST_PROGRAMS = test_clk
+test_clk_SOURCES = test_clk.c
+test_clk_MODULES = lib hal/clk
+
+include $(BASE)/common/make/top.mk
diff --git a/cesar/hal/clk/test/override/cyg/hal/hal_clock.h b/cesar/hal/clk/test/override/cyg/hal/hal_clock.h
new file mode 100644
index 0000000000..423b97fb5c
--- /dev/null
+++ b/cesar/hal/clk/test/override/cyg/hal/hal_clock.h
@@ -0,0 +1,18 @@
+#ifndef hal_clk_test_override_cyg_hal_hal_clock_h
+#define hal_clk_test_override_cyg_hal_hal_clock_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2012 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file hal/clk/test/override/cyg/hal/hal_clock.h
+ * \brief Override the HAL clock file of eCos.
+ * \ingroup hal
+ */
+
+extern uint cyg_hal_system_clock_freq;
+
+#endif /* hal_clk_test_override_cyg_hal_hal_clock_h */
diff --git a/cesar/hal/sysclk/test/override/pkgconf/kernel.h b/cesar/hal/clk/test/override/pkgconf/kernel.h
index 8470ee350a..d85f7eb74a 100644
--- a/cesar/hal/sysclk/test/override/pkgconf/kernel.h
+++ b/cesar/hal/clk/test/override/pkgconf/kernel.h
@@ -1,5 +1,5 @@
-#ifndef hal_sysclk_override_pkgconf_kernel_h
-#define hal_sysclk_override_pkgconf_kernel_h
+#ifndef hal_clk_override_pkgconf_kernel_h
+#define hal_clk_override_pkgconf_kernel_h
/* Cesar project {{{
*
* Copyright (C) 2012 Spidcom
@@ -8,11 +8,11 @@
*
* }}} */
/**
- * \file hal/sysclk/override/pkgconf/kernel.h
+ * \file hal/clk/override/pkgconf/kernel.h
* \brief Kernel package stub for the test.
* \ingroup hal
*/
#define HAL_CLOCK_INITIALIZE(val) ((void) 0)
-#endif /* hal_sysclk_override_pkgconf_kernel_h */
+#endif /* hal_clk_override_pkgconf_kernel_h */
diff --git a/cesar/hal/sysclk/test/src/test_sysclk.c b/cesar/hal/clk/test/src/test_clk.c
index a137949cf9..7644045af9 100644
--- a/cesar/hal/sysclk/test/src/test_sysclk.c
+++ b/cesar/hal/clk/test/src/test_clk.c
@@ -6,22 +6,22 @@
*
* }}} */
/**
- * \file hal/sysclk/test/src/test_sysclk.c
- * \brief Test the sysclk dynamic configuration.
+ * \file hal/clk/test/src/test_clk.c
+ * \brief Test the clk dynamic configuration.
* \ingroup hal
*/
#include "common/std.h"
-#include "hal/sysclk/sysclk.h"
+#include "hal/clk/clk.h"
#include "lib/test.h"
uint cyg_hal_system_clock_freq = 0;
bool
-hal_sysclk_str_to_num (uint *num, const char *str);
+hal_clk_str_to_num (uint *num, const char *str);
void
-hal_sysclk_test_case_string_to_int (test_t t)
+hal_clk_test_case_string_to_int (test_t t)
{
test_case_begin (t, "Test function conversion");
@@ -35,7 +35,7 @@ hal_sysclk_test_case_string_to_int (test_t t)
for (i = 0; i < COUNT (frequency_mhz_str); i++)
{
- ret = hal_sysclk_str_to_num (&frequency_mhz,
+ ret = hal_clk_str_to_num (&frequency_mhz,
frequency_mhz_str[i]);
test_fail_unless (ret);
test_fail_unless (frequency_mhz == expected_freq_mhz[i]);
@@ -47,7 +47,7 @@ hal_sysclk_test_case_string_to_int (test_t t)
{
bool ret = false;
uint frequency_mhz = 0;
- ret = hal_sysclk_str_to_num (&frequency_mhz, "\0");
+ ret = hal_clk_str_to_num (&frequency_mhz, "\0");
test_fail_unless (!ret);
test_fail_unless (frequency_mhz == 0);
}
@@ -55,17 +55,17 @@ hal_sysclk_test_case_string_to_int (test_t t)
}
void
-hal_sysclk_test_suite (test_t t)
+hal_clk_test_suite (test_t t)
{
test_suite_begin (t, "System clock dynamic configuration");
- hal_sysclk_test_case_string_to_int (t);
+ hal_clk_test_case_string_to_int (t);
}
int main (int argc, char *argv[])
{
test_t t;
test_init (t, argc, argv);
- hal_sysclk_test_suite (t);
+ hal_clk_test_suite (t);
test_result (t);
return test_nb_failed (t);
}
diff --git a/cesar/hal/sysclk/Module b/cesar/hal/sysclk/Module
deleted file mode 100644
index f3f5e61d55..0000000000
--- a/cesar/hal/sysclk/Module
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES := sysclk.c
diff --git a/cesar/hal/sysclk/sysclk.h b/cesar/hal/sysclk/sysclk.h
deleted file mode 100644
index 43d5cf4d88..0000000000
--- a/cesar/hal/sysclk/sysclk.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef hal_sysclk_sysclk_h
-#define hal_sysclk_sysclk_h
-/* Cesar project {{{
- *
- * Copyright (C) 2012 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file hal/sysclk/sysclk.h
- * \brief Boot param handler to get the system clock.
- * \ingroup hal
- *
- * For MSE500 the system clock differs from the one of the SPC300, the main
- * objective is to keep the same binary for both chips.
- */
-
-BEGIN_DECLS
-
-/**
- * Handle the boot parameter "sysclk_mhz".
- * \param param_value value passed for the "sysclk_mhz" parameter
- * \return 0 on success, -1 otherwise
- */
-int
-hal_sysclk_boot_param_sysclk_mhz (const char *param_value);
-
-END_DECLS
-
-#endif /* hal_sysclock_sysclock_h */
diff --git a/cesar/hal/sysclk/test/Makefile b/cesar/hal/sysclk/test/Makefile
deleted file mode 100644
index fa37f9ea3c..0000000000
--- a/cesar/hal/sysclk/test/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-BASE = ../../..
-
-INCLUDES = hal/sysclk/test/override
-DEFS = -DNO_PRIVATE
-
-HOST_PROGRAMS = test_sysclk
-test_sysclk_SOURCES = test_sysclk.c
-test_sysclk_MODULES = lib hal/sysclk
-
-include $(BASE)/common/make/top.mk
diff --git a/cesar/hal/sysclk/test/override/cyg/hal/hal_clock.h b/cesar/hal/sysclk/test/override/cyg/hal/hal_clock.h
deleted file mode 100644
index f1deda7599..0000000000
--- a/cesar/hal/sysclk/test/override/cyg/hal/hal_clock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef hal_sysclock_test_override_cyg_hal_hal_clock_h
-#define hal_sysclock_test_override_cyg_hal_hal_clock_h
-/* Cesar project {{{
- *
- * Copyright (C) 2012 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file hal/sysclock/test/override/cyg/hal/hal_clock.h
- * \brief Override the HAL clock file of eCos.
- * \ingroup hal
- */
-
-extern uint cyg_hal_system_clock_freq;
-
-#endif /* hal_sysclock_test_override_cyg_hal_hal_clock_h */
diff --git a/common/tests/tests b/common/tests/tests
index 66f0a8e727..ca163336fa 100644
--- a/common/tests/tests
+++ b/common/tests/tests
@@ -501,6 +501,6 @@ cesar/projects/plc:
make
make traces: make PROJECT_CONFIG=Config.traces
-cesar/hal/sysclk/test:
+cesar/hal/clk/test:
make
-sysclk: ./obj/test_sysclk
+clk: ./obj/test_clk