flushtty second arg added (per lint)

[unix-history] / usr / src / sys / vax / uba / ubavar.h

diff --git a/usr/src/sys/vax/uba/ubavar.h b/usr/src/sys/vax/uba/ubavar.h
index ed6364b..b34f0ff 100644 (file)
--- a/usr/src/sys/vax/uba/ubavar.h
+++ b/usr/src/sys/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/*     ubavar.h        3.2     %H%     */
+/*     ubavar.h        4.4     %G%     */

 
 /*
  * Unibus adapter
 
 /*
  * Unibus adapter


@@ -6,9 +6,20 @@
 
 #define        UBA0            0x80060000      /* sys virt i/o for UBA 0 */
 #define        UBA0_DEV (UBA0+0x2000-0160000)  /* sys virt of device regs */
 
 #define        UBA0            0x80060000      /* sys virt i/o for UBA 0 */
 #define        UBA0_DEV (UBA0+0x2000-0160000)  /* sys virt of device regs */

-

 #define        UNIBASE 0760000                 /* UNIBUS phys base of i/o reg's */
 
 #define        UNIBASE 0760000                 /* UNIBUS phys base of i/o reg's */
 

+#if VAX==780
+#define        PHYSUBA0        0x20006000
+#define        PHYSUDEV0       0x20100000
+#else
+#define        PHYSUBA0        0xf30000
+#define        PHYSUDEV0       0xfc0000
+#endif
+#define        PHYSUMEM0       (PHYSUDEV0+0x3e000)
+#define        PHYSUMEM        PHYSUMEM0
+#define        PHYSUDEVSZ      0x40000
+
+#if VAX==780

 /* UBA Configuration Register, CNFGR */
 #define        PARFLT          0x80000000      /* SBI Parity Fault */
 #define        WSQFLT          0x40000000      /* SBI Write Sequence Fault */
 /* UBA Configuration Register, CNFGR */
 #define        PARFLT          0x80000000      /* SBI Parity Fault */
 #define        WSQFLT          0x40000000      /* SBI Write Sequence Fault */


@@ -66,6 +77,7 @@
 /* BR Receive Vector register, BRRVR */
 #define        AIRI            0x80000000      /* Adapter Interrupt Request */
 #define        DIV             0xffff          /* Device Interrupt Vector Field */
 /* BR Receive Vector register, BRRVR */
 #define        AIRI            0x80000000      /* Adapter Interrupt Request */
 #define        DIV             0xffff          /* Device Interrupt Vector Field */

+#endif

  
 /* Data Path Register, DPR */
 #define        BNE             0x80000000      /* Buffer Not Empty - Purge */
  
 /* Data Path Register, DPR */
 #define        BNE             0x80000000      /* Buffer Not Empty - Purge */


@@ -76,19 +88,25 @@
  
 /* Map Register, MR */
 #define        MRV             0x80000000      /* Map Register Valid */
  
 /* Map Register, MR */
 #define        MRV             0x80000000      /* Map Register Valid */

-#define        BO              0x2000000               /* Byte Offset Bit */
-#define        DPDB            0x1e00000               /* Data Path Designator Field */
-#define        SBIPFN          0xfffff                 /* SBI Page Address Field */
+#define        BO              0x2000000       /* Byte Offset Bit */
+#define        DPDB            0x1e00000       /* Data Path Designator Field */
+#define        SBIPFN          0xfffff         /* SBI Page Address Field */

 
 /*
  * Unibus maps
  */
 
 /*
  * Unibus maps
  */

+#if VAX==780
+#define        NUBABDP 15
+#else
+#define        NUBABDP 3
+#endif
+

 #ifdef KERNEL
 #define        UAMSIZ 50
 
 struct map ubamap[UAMSIZ];
 char   bdpwant;                /* someone is waiting for buffered data path */ 
 #ifdef KERNEL
 #define        UAMSIZ 50
 
 struct map ubamap[UAMSIZ];
 char   bdpwant;                /* someone is waiting for buffered data path */ 

-struct map bdpmap[15];
+struct map bdpmap[NUBABDP];

 char   umrwant;                /* ... for unibus map registers */
 #endif
 
 char   umrwant;                /* ... for unibus map registers */
 #endif
 


@@ -111,3 +129,16 @@ struct uba_regs
        int     pad2[480];
        struct  pte uba_map[496];
 };
        int     pad2[480];
        struct  pte uba_map[496];
 };

+
+union  ub_info {
+       struct ub_Info {
+       unsigned int    Ub_off:18,
+                       Ub_npf:10,
+                       Ub_bdp:4;
+       } ub_I;
+       int     ub_word;
+};
+
+#define        ub_off  ub_I.Ub_off
+#define        ub_npf  ub_I.Ub_npf
+#define        ub_bdp  ub_I.Ub_bdp