-#define vacsrhi vacsr.vacsrbytes.Vacsrhi
-#define vacsrlo vacsr.vacsrbytes.Vacsrlo
-#define VAADDR ((struct varegs *)(UBA0_DEV + 0164000))
-
-/* vacsr.vacsrword bits: */
-#define ERROR 0100000 /* R Some error has occurred */
-#define NPRTIMO 01000 /* R DMA timeout error */
-#define NOTREADY 0400 /* R Something besides NPRTIMO */
-#define DONE 0200 /* R */
-#define IENABLE 0100 /* R/W Interrupt enable */
-#define SUPPLIESLOW 04 /* R */
-#define BOTOFFORM 02 /* R */
-#define BYTEREVERSE 01 /* R/W Reverse byte order in words */
-
-/* Command bytes sent to vacsrhi */
-#define VAPLOT 0340
-#define VAPRINT 0100
-#define VAPRINTPLOT 0160
-#define VAAUTOSTEP 0244
-/* The following commands are not used in this driver: */
-#define VANOAUTOSTEP 0045
-#define VAFORMFEED 0263
-#define VASLEW 0265
-#define VASTEP 0064
+#define vacsw vacs.Vacsw
+#define vacsh vacs.vacsr.Vacsh
+#define vacsl vacs.vacsr.Vacsl
+
+/* vacsw bits */
+#define ERROR 0100000 /* Some error has occurred */
+#define NPRTIMO 01000 /* DMA timeout error */
+#define NOTREADY 0400 /* Something besides NPRTIMO */
+#define DONE 0200
+#define IENABLE 0100 /* Interrupt enable */
+#define SUPPLIESLOW 04
+#define BOTOFFORM 02
+#define BYTEREVERSE 01 /* Reverse byte order in words */
+
+/* vacsh command bytes */
+#define VAPLOT 0340
+#define VAPRINT 0100
+#define VAPRINTPLOT 0160
+#define VAAUTOSTEP 0244
+#define VANOAUTOSTEP 0045 /* unused */
+#define VAFORMFEED 0263 /* unused */
+#define VASLEW 0265 /* unused */
+#define VASTEP 0064 /* unused */