[OpenBIOS] r181 - openbios-devel/drivers

Author: blueswirl
Date: 2007-12-10 21:06:58 +0100 (Mon, 10 Dec 2007)
New Revision: 181

Modified:
   openbios-devel/drivers/obio.c
Log:
Add support for SPARCstation 20 machine type

Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c	2007-12-09 17:04:51 UTC (rev 180)
+++ openbios-devel/drivers/obio.c	2007-12-10 20:06:58 UTC (rev 181)
@@ -296,7 +296,7 @@
     }
 }

-static void
+static uint32_t
 ob_eccmemctl_init(void)
 {
     uint32_t version, *regs;
@@ -335,6 +335,8 @@
     fword("property");

fword("finish-device");
+
+    return version;
 }

static unsigned char *nvram;
@@ -803,19 +805,37 @@
         ob_eccmemctl_init();
         break;
     case 0x72:
-        push_str("SPARCstation 10 (1 X 390Z55)");
-        fword("encode-string");
-        push_str("banner-name");
-        fword("property");
-        push_str("SUNW,S10,501-2365");
-        fword("encode-string");
-        push_str("model");
-        fword("property");
-        push_str("SUNW,SPARCstation-10");
-        fword("encode-string");
-        push_str("name");
-        fword("property");
-        ob_eccmemctl_init();
+        switch (ob_eccmemctl_init()) {
+        default:
+        case 0x10000000:
+            push_str("SPARCstation 10 (1 X 390Z55)");
+            fword("encode-string");
+            push_str("banner-name");
+            fword("property");
+            push_str("SUNW,S10,501-2365");
+            fword("encode-string");
+            push_str("model");
+            fword("property");
+            push_str("SUNW,SPARCstation-10");
+            fword("encode-string");
+            push_str("name");
+            fword("property");
+            break;
+        case 0x20000000:
+            push_str("SPARCstation 20 (1 X 390Z55)");
+            fword("encode-string");
+            push_str("banner-name");
+            fword("property");
+            push_str("SUNW,S20,501-2324");
+            fword("encode-string");
+            push_str("model");
+            fword("property");
+            push_str("SUNW,SPARCstation-20");
+            fword("encode-string");
+            push_str("name");
+            fword("property");
+            break;
+        }
         break;
     case 0x80:
         push_str("SPARCstation 5");