merge

[plan9front.git] / sys / src / 9 / bcm / dat.h

diff --git a/sys/src/9/bcm/dat.h b/sys/src/9/bcm/dat.h
index cf674cf3eab23ae5be5bff539c1424b06af684cb..0c4f7351f234daae7a727d8ac05be9dbab9adbb4 100644 (file)
--- a/sys/src/9/bcm/dat.h
+++ b/sys/src/9/bcm/dat.h
@@ -227,7 +227,6 @@ extern register Mach* m;                    /* R10 */
 extern register Proc* up;                      /* R9 */
 extern uintptr kseg0;
 extern Mach* machaddr[MAXMACH];
-extern ulong memsize;
 extern int normalprint;
 
 /*
@@ -282,17 +281,17 @@ struct DevConf
 
 struct Soc {                   /* SoC dependent configuration */
        ulong   dramsize;
-       uintptr physio;
+       ulong   iosize;
        uintptr busdram;
        uintptr busio;
+       uintptr physio;
+       uintptr virtio;
        uintptr armlocal;
        u32int  l1ptedramattrs;
        u32int  l2ptedramattrs;
 };
 extern Soc soc;
 
-#define BUSUNKNOWN -1
-
 /*
  * GPIO
  */