Kernel: Allow boot device number to be greater than 9

diff --git a/Kernel/include/kdata.h b/Kernel/include/kdata.h
index 8d39af4..7694aa9 100644 (file)
--- a/Kernel/include/kdata.h
+++ b/Kernel/include/kdata.h
@@ -4,7 +4,8 @@
 #include <stdbool.h>
 
 extern char *cmdline;
-extern char bootline[2];
+#define BOOTLINE_LEN 6
+extern char bootline[BOOTLINE_LEN];
 
 extern struct u_block ub;
 extern struct u_data udata;

diff --git a/Kernel/kdata.c b/Kernel/kdata.c
index 39417ec..95a4063 100644 (file)
--- a/Kernel/kdata.c
+++ b/Kernel/kdata.c
@@ -4,7 +4,7 @@
 
 p_tab *init_process;
 char *cmdline = (char *) CMDLINE;
-char bootline[2];
+char bootline[BOOTLINE_LEN];
 uint16_t ramsize, procmem, maxproc, nproc, nready;
 uint16_t runticks;
 bool inint;

diff --git a/Kernel/start.c b/Kernel/start.c
index 85ddafa..4eca83c 100644 (file)
--- a/Kernel/start.c
+++ b/Kernel/start.c
@@ -71,6 +71,25 @@ void create_init(void)
        udata.u_argn2 = PROGLOAD + 0xb; /* Environment (none) */
 }
 
+/* to sensibly parse device names this needs to be platform-specific,
+   so for now it only parses device numbers */
+unsigned int bootdevice(char *s)
+{
+    unsigned int r = 0;
+
+    while(*s == ' ')
+        s++;
+
+    while(true){
+        if(*s >= '0' && *s <= '9'){
+            r = (r*10) + (*s - '0');
+        }else{
+            return r;
+        }
+        s++;
+    }
+}
+
 void fuzix_main(void)
 {
        /* setup state */
@@ -89,7 +108,7 @@ void fuzix_main(void)
         "FUZIX version %s\n"
         "Copyright (c) 1988-2002 by H.F.Bower, D.Braun, S.Nitschke, H.Peraza\n"
         "Copyright (c) 1997-2001 by Arcady Schekochikhin, Adriano C. R. da Cunha\n"
-        "Copyright (c) 2013 Will Sowerbutts <will@sowerbutts.com>\n"
+        "Copyright (c) 2013-2015 Will Sowerbutts <will@sowerbutts.com>\n"
         "Copyright (c) 2014 Alan Cox <alan@etchedpixels.co.uk>\nDevboot\n",
                                                 uname_str);
 
@@ -114,8 +133,8 @@ void fuzix_main(void)
        pagemap_init();
 
        create_init();
-        kprintf("%x:%x\n", udata.u_page, udata.u_page2);
-        kprintf("%x:%x\n", udata.u_ptab->p_page, udata.u_ptab->p_page2);
+        kprintf("%x:%x, %x:%x\n", udata.u_page, udata.u_page2,
+                udata.u_ptab->p_page, udata.u_ptab->p_page2);
        kputs("Enabling interrupts ... ");
         ei();
        kputs("ok.\n");
@@ -125,19 +144,17 @@ void fuzix_main(void)
 
        root_dev = DEFAULT_ROOT;
        if (cmdline && *cmdline) {
-               while (*cmdline == ' ')
-                       ++cmdline;
-               root_dev = *cmdline - '0';
+               root_dev = bootdevice(cmdline);
        } else {
                kputs("bootdev: ");
                udata.u_base = bootline;
                udata.u_sysio = 1;
-               udata.u_count = 2;
+               udata.u_count = BOOTLINE_LEN-1;
                udata.u_euid = 0;       /* Always begin as superuser */
+               memset(bootline, 0, BOOTLINE_LEN);
 
                cdread(TTYDEV, O_RDONLY);       /* read root filesystem name from tty */
-               if (*bootline >= '0')
-                       root_dev = *bootline - '0';
+                               root_dev = bootdevice(bootline);
        }
 
        /* Mount the root device */