basic heap implementation

[cortex-from-scratch] / main.c

diff --git a/main.c b/main.c
index d2087d7..b2ff855 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,14 +18,19 @@
 #include <sys/mmap.h>
 
 #include <lib/regfunc.h>
+#include <lib/pool.h>
 #include <lib/stdio.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>
+
+mem_pool_t kheap_pool;
 
 void main()
 {
@@ -39,11 +44,14 @@ 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);
 
@@ -54,7 +62,35 @@ void main()
        led_init();
 
        /* Real time clock */
-       //rtc_init();
+       rtc_init();
+
+       extern uint32_t * _beginofheap;
+       //printf("%p", &_beginofheap);
+       kpool_init(&kheap_pool, 512, 10, (uint32_t *) &_beginofheap);
+
+//     printf("%p\n", &kheap_pool);
+
+       char * string = (char *) kalloc(&kheap_pool);
+       char * string2 = (char *) kalloc(&kheap_pool);
+       char * string3 = (char *) kalloc(&kheap_pool);
+
+
+       printf("%p\n", string);
+       printf("%p\n", string2);
+       printf("%p\n", string3);
+
+       kfree(&kheap_pool, string);
+
+       char * string6 = (char *) kalloc(&kheap_pool);
+       char * string7 = (char *) kalloc(&kheap_pool);
+       printf("%p\n", string6);
+       printf("%p\n", string7);
+
+       //free(string);
+
+       //char * string2 = (char *) alloc();
+       
+       //string2 = "taalb";
 
        /* Eeprom Driver
        eeprom_at24c_init();
@@ -64,17 +100,22 @@ void main()
        /* LED Segment Driver */
        //tm1637_init();
 
+       /* ASM Blocking routine */
        //for (int i = 0; i < 1000; i++)
        //      _block(10000);
 
-       /* TEMP SENSOR */
+       /* TEMP SENSOR 
        tsensor_printid();
        uint16_t temp = tsensor_get_temp();
-       printf("Current temperature: %d °C\n", temp); 
+       printf("Current temperature: %d °C\n", temp); */
+
+       /* ADC Joystick module */
+       // mk450_init();        
+
 
        /* Start up terminal */
        terminal();
-
+       
        /* Should not be here, endless loop */
        for(;;) {