-#define ubamem(unit, off) \
- ((struct device *)(umaddr[UNITTOUBA(unit)]+(off&017777)))
+#define ubamem(unit, off) ((umaddr[UNITTOUBA(unit)]+ubdevreg(off)))
+
+#define PHYSUBA0 0x20006000
+#define PHYSMBA0 0x20010000
+#define PHYSMBA1 0x20012000
+#define PHYSUMEM 0x2013e000