linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / sparc64 / prom / init.c

diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c
index 1c0db84..f3cc2d8 100644 (file)
--- a/arch/sparc64/prom/init.c
+++ b/arch/sparc64/prom/init.c
@@ -14,10 +14,11 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 
-/* OBP version string. */
-char prom_version[80];
+enum prom_major_version prom_vers;
+unsigned int prom_rev, prom_prev;
 
 /* The root node of the prom device tree. */
+int prom_root_node;
 int prom_stdin, prom_stdout;
 int prom_chosen_node;
 
@@ -30,25 +31,68 @@ extern void prom_cif_init(void *, void *);
 
 void __init prom_init(void *cif_handler, void *cif_stack)
 {
+       char buffer[80], *p;
+       int ints[3];
        int node;
+       int i = 0;
+       int bufadjust;
+
+       prom_vers = PROM_P1275;
 
        prom_cif_init(cif_handler, cif_stack);
 
+       prom_root_node = prom_getsibling(0);
+       if((prom_root_node == 0) || (prom_root_node == -1))
+               prom_halt();
+
        prom_chosen_node = prom_finddevice(prom_chosen_path);
        if (!prom_chosen_node || prom_chosen_node == -1)
                prom_halt();
 
-       prom_stdin = prom_getint(prom_chosen_node, "stdin");
-       prom_stdout = prom_getint(prom_chosen_node, "stdout");
+       prom_stdin = prom_getint (prom_chosen_node, "stdin");
+       prom_stdout = prom_getint (prom_chosen_node, "stdout");
 
        node = prom_finddevice("/openprom");
        if (!node || node == -1)
                prom_halt();
 
-       prom_getstring(node, "version", prom_version, sizeof(prom_version));
+       prom_getstring (node, "version", buffer, sizeof (buffer));
+
+       prom_printf ("\n");
+
+       if (strncmp (buffer, "OBP ", 4))
+               goto strange_version;
+
+       /*
+        * Version field is expected to be 'OBP xx.yy.zz date...'
+        * However, Sun can't stick to this format very well, so
+        * we need to check for 'OBP  xx.yy.zz date...' and adjust
+        * accordingly. -spot
+        */
+
+       if (strncmp (buffer, "OBP  ", 5))
+               bufadjust = 4;
+       else
+               bufadjust = 5;
+
+       p = buffer + bufadjust;
+       while (p && isdigit(*p) && i < 3) {
+               ints[i++] = simple_strtoul(p, NULL, 0);
+               if ((p = strchr(p, '.')) != NULL)
+                       p++;
+       }
+       if (i != 3)
+               goto strange_version;
+
+       prom_rev = ints[1];
+       prom_prev = (ints[0] << 16) | (ints[1] << 8) | ints[2];
+
+       printk ("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust);
 
-       prom_printf("\n");
+       /* Initialization successful. */
+       return;
 
-       printk("PROMLIB: Sun IEEE Boot Prom '%s'\n", prom_version);
-       printk("PROMLIB: Root node compatible: %s\n", prom_root_compatible);
+strange_version:
+       prom_printf ("Strange OBP version `%s'.\n", buffer);
+       prom_halt ();
 }