interrupts, timers, under construction

[rpikern] / src / main.c

diff --git a/src/main.c b/src/main.c
index e204820..18ed725 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,13 +1,20 @@
 #include "config.h"
 
+#include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <ctype.h>
 #include "asm.h"
+#include "rpi.h"
+#include "contty.h"
 #include "serial.h"
+#include "timer.h"
+#include "video.h"
+#include "intr.h"
 
 void dbgled(int x);
-void exit(int x);
+
+void reboot(void);
 
 static void cmdrun(char *cmd);
 
@@ -17,49 +24,66 @@ int main(void)
        static char cmdbuf[256];
        static int cmdend;
 
-       init_serial(115200);
-       ser_printstr("starting rpikern\n");
+       rpi_init();
+       /*init_serial(115200); done in rpi_init now for early debugging */
+       con_init();
+
+       printf("Detected raspberry pi %d, I/O base: %x\n", rpi_model, rpi_iobase);
+       printf("Main RAM base: %x, size: %u bytes\n", rpi_mem_base, rpi_mem_size);
+       printf("Video RAM base: %x, size: %u bytes\n", rpi_vmem_base, rpi_vmem_size);
+
+       timer_init();
+       video_init();
+
+       enable_intr();
+
+       printf("Going interactive\n");
 
        for(;;) {
-               int c = ser_getchar();
-
-               switch(c) {
-               case '\r':
-               case '\n':
-                       if(!lastnl) {
-                               ser_printstr("\r\n");
-                               cmdbuf[cmdend] = 0;
-                               cmdend = 0;
-                               cmdrun(cmdbuf);
-                       }
-                       lastnl = 1;
-                       break;
-
-               case -1:
-                       lastnl = 0;
-                       ser_printstr("error!\n");
-                       break;
-
-               default:
-                       lastnl = 0;
-                       ser_putchar(c);
-                       if(cmdend < sizeof cmdbuf) {
-                               cmdbuf[cmdend++] = c;
+               while(ser_pending()) {
+                       int c = getchar();
+
+                       switch(c) {
+                       case '\r':
+                       case '\n':
+                               if(!lastnl) {
+                                       printf("\r\n");
+                                       cmdbuf[cmdend] = 0;
+                                       cmdend = 0;
+                                       cmdrun(cmdbuf);
+                               }
+                               lastnl = 1;
+                               break;
+
+                       case -1:
+                               lastnl = 0;
+                               printf("error!\n");
+                               break;
+
+                       default:
+                               lastnl = 0;
+                               putchar(c);
+                               if(cmdend < sizeof cmdbuf) {
+                                       cmdbuf[cmdend++] = c;
+                               }
                        }
                }
+
+               /*video_update(1);*/
        }
 
        return 0;
 }
 
-void panic(void)
+void reboot(void)
 {
-       ser_printstr("PANIC!\n");
-       exit(0);
+       printf("Rebooting ...\n");
+       rpi_reboot();
 }
 
 static void cmdrun(char *cmd)
 {
+       static int cur_x, cur_y;
        char *ptr, *args;
 
        while(*cmd && isspace(*cmd)) cmd++;
@@ -68,13 +92,27 @@ static void cmdrun(char *cmd)
        *ptr = 0;
        args = ptr + 1;
 
-       if(strcmp(cmd, "help") == 0) {
-               ser_printstr("help not implemented yet\n");
+       if(strcmp(cmd, "reboot") == 0) {
+               reboot();
+
+       } else if(strcmp(cmd, "down") == 0) {
+               printf("scroll down\n");
+               cur_y += 10;
+               video_scroll(cur_x, cur_y);
+
+       } else if(strcmp(cmd, "up") == 0) {
+               printf("scroll up\n");
+               cur_y -= 10;
+               video_scroll(cur_x, cur_y);
+
+       } else if(strcmp(cmd, "ticks") == 0) {
+               printf("%lu\n", num_ticks);
+
+       } else if(strcmp(cmd, "help") == 0) {
+               printf("help not implemented yet\n");
        } else if(strcmp(cmd, "ver") == 0) {
-               ser_printstr("rpikern version 0.0\n");
+               printf("rpikern version 0.0\n");
        } else {
-               ser_printstr("Unknown command: ");
-               ser_printstr(cmd);
-               ser_printstr("\n");
+               printf("Unknown command: %s\n", cmd);
        }
 }