tested working terminal and reordering of code

[cortex-from-scratch] / main.c

diff --git a/main.c b/main.c
index 87b45e7..35b718e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,62 +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
-
-
-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;
-}
+#include <sys/robsys.h> 
+#include <sys/mmap.h>
 
-int strlen(const char *str)
-{
-    int retval;
-    for(retval = 0; *str != '\0'; str++) retval++;
-    return retval;
-}
+#include <drivers/uart.h>
 
-unsigned char inportb (uint32_t _addr) 
+void main()
 {
-    unsigned char rv;
-    //__asm__ __volatile__ ("inb %1, %0" : "=a" (rv) : "dN" (_port));
-    return rv;
-
-}
+       ivt_init();
+       uart_init();
 
-void outportb (uint32_t _addr, unsigned char _data)
-{
+       systick_init();
+       
+       sysinfo();
 
-  // __asm__ __volatile__ ("str %1, %0"  : "=r" (_data)  : "m" (_addr) );
+       extern void stub();
+       //stub();
+       //__asm__ __volatile__ ("ldc p1, cr1, r0");
 
-   // __asm__ __volatile__ ("outb %1, %0" : : "dN" (_port), "a" (_data));
-}
+       terminal();
 
-void main()
-{
-       uart_init();
-       uart_puts("LOADING SYSTEM...\n");
-       // loop
        for(;;) {
 
        }