kalloc and kfree interface and abstraction

[cortex-from-scratch] / main.c

diff --git a/main.c b/main.c
index 2526963..26a7305 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,7 +18,9 @@
 #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>
@@ -26,7 +28,9 @@
 //#include <drivers/tm1637.h>
 //#include <drivers/at24c.h>
 //#include <drivers/tsensor.h>
-#include <drivers/mk450_joystick.h>
+//#include <drivers/mk450_joystick.h>
+#include <drivers/st7735s.h>
+
 
 void main()
 {
@@ -40,15 +44,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();
 
@@ -58,6 +68,7 @@ void main()
        /* Real time clock */
        rtc_init();
 
+
        /* Eeprom Driver
        eeprom_at24c_init();
        eeprom_test();
@@ -76,7 +87,8 @@ void main()
        printf("Current temperature: %d °C\n", temp); */
 
        /* ADC Joystick module */
-       mk450_init();   
+       // mk450_init();        
+
 
        /* Start up terminal */
        terminal();