tested working terminal and reordering of code

[cortex-from-scratch] / main.c

diff --git a/main.c b/main.c
index 5b488cf..35b718e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,60 +1,37 @@
+/* (CC-BY-NC-SA) ROBIN KRENS - ROBIN @ ROBINKRENS.NL
+ * 
+ * $LOG$
+ * 2019/7/20 - ROBIN KRENS     
+ * Initial version 
+ * 
+ * $DESCRIPTION$
+ *
+ * */
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stm32.h> // <-- your own header file located located in ./include
-#include <mmap.h>
-
-
-void *memcpy(void *dest, void *src, size_t count)
-{   
-    const char *sp = (const char *)src;
-    char *dp = (char *)dest;
-    for(; count != 0; count--) *dp++ = *sp++;
-    return dest;
-}
-
-/* fillout memory with 'val' (i.e. all zeroes)
- */
-void *memset(void *dest, unsigned char val, size_t count)
-{
-    char *temp = (char *)dest;
-    for( ; count != 0; count--) *temp++ = val;
-    return dest;
-}
-
-/* same as above but shorter */
-unsigned short *memsetw(unsigned short *dest, unsigned short val, size_t count)
-{
-    unsigned short *temp = (unsigned short *)dest;
-    for( ; count != 0; count--) *temp++ = val;
-    return dest;
-}
-
-int strlen(const char *str)
-{
-    int retval;
-    for(retval = 0; *str != '\0'; str++) retval++;
-    return retval;
-}
-
 
+#include <sys/robsys.h> 
+#include <sys/mmap.h>
 
+#include <drivers/uart.h>
 
 void main()
 {
-
        ivt_init();
-//     clock_init();
        uart_init();
+
        systick_init();
-       uart_puts("LOADING SYSTEM 0.1 ...\n");
+       
        sysinfo();
-       addrtohex((volatile uint32_t) 0x12345678 );
-       addrtohex((volatile uint32_t) *SCB_VTOR );
 
-//     asm("cpsie i"); // enable irq , cpsied f (disable faukts(
+       extern void stub();
+       //stub();
+       //__asm__ __volatile__ ("ldc p1, cr1, r0");
+
+       terminal();
 
-       // loop
        for(;;) {
 
        }