video initialization seems to work, further testing needed

[rpikern] / src / main.c

diff --git a/src/main.c b/src/main.c
index 97fcda7..0c8bdf5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,30 +2,54 @@
 
 #include <string.h>
 #include <stdint.h>
+#include <ctype.h>
 #include "asm.h"
 #include "serial.h"
+#include "video.h"
 
 void dbgled(int x);
 void exit(int x);
 
+static void cmdrun(char *cmd);
+
 int main(void)
 {
-       disable_intr();
-
-       dbgled(2);
+       int lastnl = 0;
+       static char cmdbuf[256];
+       static int cmdend;
 
        init_serial(115200);
-       ser_printstr("starting rpkern\n");
+       ser_printstr("Starting rpikern\n");
+
+       video_init();
 
+       ser_printstr("Going interactive\n");
        for(;;) {
                int c = ser_getchar();
-               if(c == -1) {
+
+               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");
-               } else {
-                       ser_printstr("got: ");
+                       break;
+
+               default:
+                       lastnl = 0;
                        ser_putchar(c);
-                       ser_putchar('\r');
-                       ser_putchar('\n');
+                       if(cmdend < sizeof cmdbuf) {
+                               cmdbuf[cmdend++] = c;
+                       }
                }
        }
 
@@ -34,6 +58,27 @@ int main(void)
 
 void panic(void)
 {
-       dbgled(1);
+       ser_printstr("PANIC!\n");
        exit(0);
 }
+
+static void cmdrun(char *cmd)
+{
+       char *ptr, *args;
+
+       while(*cmd && isspace(*cmd)) cmd++;
+       ptr = cmd;
+       while(*ptr && !isspace(*ptr)) ptr++;
+       *ptr = 0;
+       args = ptr + 1;
+
+       if(strcmp(cmd, "help") == 0) {
+               ser_printstr("help not implemented yet\n");
+       } else if(strcmp(cmd, "ver") == 0) {
+               ser_printstr("rpikern version 0.0\n");
+       } else {
+               ser_printstr("Unknown command: ");
+               ser_printstr(cmd);
+               ser_printstr("\n");
+       }
+}