summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe SAVE2012-08-17 13:24:26 +0200
committerCyril Jourdan2012-09-20 17:00:05 +0200
commit12d7064cf2557d50c0b6e9013c4c0688f79476fd (patch)
treea0cd69200521018971b5bea70fc0e4a2dbd96415
parente54d46db110a89ed704cdf4fb9d266d8e41b3871 (diff)
cesar/test_general/hard/ecos: adaptations to be up-to-date
- For each program, add hal module - For exception do not force uart config (let the default one)
-rw-r--r--cesar/test_general/hard/ecos/Makefile23
-rw-r--r--cesar/test_general/hard/ecos/src/exception.c6
2 files changed, 12 insertions, 17 deletions
diff --git a/cesar/test_general/hard/ecos/Makefile b/cesar/test_general/hard/ecos/Makefile
index 9eec3a9fbe..e5246f0f2c 100644
--- a/cesar/test_general/hard/ecos/Makefile
+++ b/cesar/test_general/hard/ecos/Makefile
@@ -6,38 +6,39 @@ TARGET = sparc
TARGET_PROGRAMS = section bentry hello_world one_thread two_thread threaddelay exception interrupt timer_int pci_int mesbox mutex
bentry_SOURCES = bentry.c
-bentry_MODULES = lib
+bentry_MODULES = lib hal
hello_world_SOURCES = hello_world.c
-hello_world_MODULES = lib host
+hello_world_MODULES = lib hal
interrupt_SOURCES = interrupt.c
-interrupt_MODULES = lib host
+interrupt_MODULES = lib hal
timer_int_SOURCES = timer_int.c
-timer_int_MODULES = lib host
+timer_int_MODULES = lib hal
pci_int_SOURCES = pci_int.c
-pci_int_MODULES = lib host
+pci_int_MODULES = lib hal
exception_SOURCES = exception.c
-exception_MODULES = lib host
+exception_MODULES = lib hal
one_thread_SOURCES = one_thread.c
-one_thread_MODULES = lib host
+one_thread_MODULES = lib hal
two_thread_SOURCES = two_thread.c
-two_thread_MODULES = lib host
+two_thread_MODULES = lib hal
threaddelay_SOURCES = threaddelay.c
-threaddelay_MODULES = lib host
+threaddelay_MODULES = lib hal
mesbox_SOURCES = mesbox.c
-mesbox_MODULES = lib host
+mesbox_MODULES = lib hal
mutex_SOURCES = mutex.c
-mutex_MODULES = lib host
+mutex_MODULES = lib hal
section_SOURCES = section.c
+section_MODULES = lib hal
include $(BASE)/common/make/top.mk
diff --git a/cesar/test_general/hard/ecos/src/exception.c b/cesar/test_general/hard/ecos/src/exception.c
index 09f6dbd55f..9427610398 100644
--- a/cesar/test_general/hard/ecos/src/exception.c
+++ b/cesar/test_general/hard/ecos/src/exception.c
@@ -41,12 +41,6 @@ void cyg_user_start(void)
cyg_exception_handler_t *oldHandler;
cyg_addrword_t oldData;
- //config UART
- unsigned int *uart_scaler = (unsigned int*)0x8000007C;
- unsigned int *uart_ctrl = (unsigned int*)0x80000078;
- *uart_scaler = 0xF4; //soit 75MHz / (8 * 38400)
- *uart_ctrl = 0x3; //enable TX and RX
-
diag_write_string("debut du main\n");
cyg_exception_set_handler(CYGNUM_HAL_EXCEPTION_ILLEGAL_INSTRUCTION,