SYSCALL naked assembly working

[cortex-from-scratch] / main.c

diff --git a/main.c b/main.c
index 221d7d6..e87131a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,14 +18,53 @@
 #include <sys/mmap.h>
 
 #include <lib/regfunc.h>
+#include <lib/pool.h>
 #include <lib/stdio.h>
+#include <lib/string.h>
 #include <lib/tinyprintf.h>
 
 #include <drivers/uart.h>
 #include <drivers/led.h>
-#include <drivers/tm1637.h>
+//#include <drivers/tm1637.h>
 //#include <drivers/at24c.h>
-#include <drivers/tsensor.h>
+//#include <drivers/tsensor.h>
+//#include <drivers/mk450_joystick.h>
+#include <drivers/st7735s.h>
+
+
+#include <lib/syscall.h>
+
+int test3(int i, int j) {
+
+       volatile uint32_t * sp = get_msp();
+       
+       /* asm volatile (
+       "tst lr, #4" "\n\t" 
+       "ite eq" "\n\t"
+       "mrseq %0, msp" "\n\t" 
+       "mrsne r0, psp" : "=r" (sp) ); */
+
+       for (int i = 0; (sp + i) < 0x20010000; i++) {
+               printf("ADDRESS: %p, VALUE: %x\n", (sp + i), *(sp + i));
+       }
+
+       for(;;);
+       return 0xCC;
+
+}
+int test2(int i, int j) {
+
+       int x = i * j;
+       test3(0x3A, 0x3B); 
+       
+
+}
+int test(int i, int j) {
+
+       test2(0x2A, 0x2B);
+       
+       return 0xAA;
+}
 
 void main()
 {
@@ -39,14 +78,21 @@ void main()
        /* Initialze basic input and output over serial */
        uart_init();
 
+       /* TFT screen */
+       // tft_init();
+       
        /* Cortex M* integrated systick, can be replaced
         * by the more accurate RTC.
        systick_init();
        */
-
+       
        /* Set up a very small libc library */
        init_printf(NULL, putc);
 
+       /* Heap init */
+       //kheap_init();
+       //printf("%p\n", get_kheap());
+       
        /* Display some basic info at startup */
        sysinfo();
 
@@ -54,7 +100,13 @@ void main()
        led_init();
 
        /* Real time clock */
-       rtc_init();
+       //rtc_init();
+
+//     printf("press any key to start\n");
+//     asm volatile ("wfi");
+
+       syscall_init();
+       theos_test(0xA1, 0xA2);
 
        /* Eeprom Driver
        eeprom_at24c_init();
@@ -62,11 +114,24 @@ void main()
        */
        
        /* LED Segment Driver */
-       tm1637_init();
+       //tm1637_init();
+
+       /* ASM Blocking routine */
+       //for (int i = 0; i < 1000; i++)
+       //      _block(10000);
+
+       /* TEMP SENSOR 
+       tsensor_printid();
+       uint16_t temp = tsensor_get_temp();
+       printf("Current temperature: %d °C\n", temp); */
+
+       /* ADC Joystick module */
+       // mk450_init();        
+
 
        /* Start up terminal */
        terminal();
-
+       
        /* Should not be here, endless loop */
        for(;;) {