From 1175ff63f2a8c4762692551403862f9f0789aef8 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Tue, 2 May 2017 17:10:02 -0400
Subject: Merge branch 'init_cleanup' into no-rtos

Clean up Makefiles and initialization code.
---
 projects/rtos-test/Makefile         | 22 --------------------
 projects/rtos-test/mutex-test.c     | 40 -------------------------------------
 projects/rtos-test/semaphore-test.c | 34 -------------------------------
 projects/rtos-test/thread-test.c    | 24 ----------------------
 4 files changed, 120 deletions(-)
 delete mode 100644 projects/rtos-test/Makefile
 delete mode 100644 projects/rtos-test/mutex-test.c
 delete mode 100644 projects/rtos-test/semaphore-test.c
 delete mode 100644 projects/rtos-test/thread-test.c

(limited to 'projects/rtos-test')

diff --git a/projects/rtos-test/Makefile b/projects/rtos-test/Makefile
deleted file mode 100644
index 9e58a41..0000000
--- a/projects/rtos-test/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-TEST = thread-test semaphore-test mutex-test
-
-CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M
-
-LIBS += $(RTOS_DIR)/librtos.a
-
-all: $(TEST:=.elf)
-
-%.elf: %.o $(BOARD_OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map
-	$(OBJCOPY) -O ihex $*.elf $*.hex
-	$(OBJCOPY) -O binary $*.elf $*.bin
-	$(OBJDUMP) -St $*.elf >$*.lst
-	$(SIZE) $*.elf
-
-clean:
-	rm -f *.o
-	rm -f *.elf
-	rm -f *.hex
-	rm -f *.bin
-	rm -f *.map
-	rm -f *.lst
diff --git a/projects/rtos-test/mutex-test.c b/projects/rtos-test/mutex-test.c
deleted file mode 100644
index 402f9ba..0000000
--- a/projects/rtos-test/mutex-test.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "cmsis_os.h"
-
-#include "stm-init.h"
-#include "stm-uart.h"
-
-osMutexId stdio_mutex;
-osMutexDef(stdio_mutex);
-
-void notify(const char* name, int state) {
-    osMutexWait(stdio_mutex, osWaitForever);
-    //printf("%s: %d\n\r", name, state);
-    uart_send_string(name);
-    uart_send_string(": ");
-    uart_send_integer(state, 1);
-    uart_send_string("\r\n");
-    osMutexRelease(stdio_mutex);
-}
-
-void test_thread(void const *args) {
-    while (1) {
-        notify((const char*)args, 0); osDelay(1000);
-        notify((const char*)args, 1); osDelay(1000);
-    }
-}
-
-void t2(void const *argument) {test_thread("Th 2");}
-osThreadDef(t2, osPriorityNormal, DEFAULT_STACK_SIZE);
-
-void t3(void const *argument) {test_thread("Th 3");}
-osThreadDef(t3, osPriorityNormal, DEFAULT_STACK_SIZE);
-
-int main() {
-    stm_init();
-    stdio_mutex = osMutexCreate(osMutex(stdio_mutex));
-
-    osThreadCreate(osThread(t2), NULL);
-    osThreadCreate(osThread(t3), NULL);
-
-    test_thread((void *)"Th 1");
-}
diff --git a/projects/rtos-test/semaphore-test.c b/projects/rtos-test/semaphore-test.c
deleted file mode 100644
index 3a3b5de..0000000
--- a/projects/rtos-test/semaphore-test.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "cmsis_os.h"
-
-#include "stm-init.h"
-#include "stm-uart.h"
-
-osSemaphoreId two_slots;
-osSemaphoreDef(two_slots);
-
-void test_thread(void const *name) {
-    while (1) {
-        osSemaphoreWait(two_slots, osWaitForever);
-        //printf("%s\n\r", (const char*)name);
-        uart_send_string((const char*)name);
-        uart_send_string("\r\n");
-        osDelay(1000);
-        osSemaphoreRelease(two_slots);
-    }
-}
-
-void t2(void const *argument) {test_thread("Th 2");}
-osThreadDef(t2, osPriorityNormal, DEFAULT_STACK_SIZE);
-
-void t3(void const *argument) {test_thread("Th 3");}
-osThreadDef(t3, osPriorityNormal, DEFAULT_STACK_SIZE);
-
-int main (void) {
-    stm_init();
-    two_slots = osSemaphoreCreate(osSemaphore(two_slots), 2);
-
-    osThreadCreate(osThread(t2), NULL);
-    osThreadCreate(osThread(t3), NULL);
-
-    test_thread((void *)"Th 1");
-}
diff --git a/projects/rtos-test/thread-test.c b/projects/rtos-test/thread-test.c
deleted file mode 100644
index 8b31a26..0000000
--- a/projects/rtos-test/thread-test.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "cmsis_os.h"
-
-#include "stm-init.h"
-#include "stm-led.h"
-
-void led2_thread(void const *args)
-{
-    while (1) {
-        led_toggle(LED_BLUE);
-        osDelay(1000);
-    }
-}
-osThreadDef(led2_thread, osPriorityNormal, DEFAULT_STACK_SIZE);
-
-int main()
-{
-    stm_init();
-    osThreadCreate(osThread(led2_thread), NULL);
-    
-    while (1) {
-        led_toggle(LED_GREEN);
-        osDelay(500);
-    }
-}
-- 
cgit v1.2.3