Vacuum cleaning of the adb code, step 1: random KNF, remove mac68k

leftovers, unused variables and functions, fix some comments, etc.

1 files changed, 1 insertions, 136 deletions

diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h
index 7d22035bf07..4833f6e16ec 100644
--- a/sys/arch/macppc/dev/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viareg.h,v 1.3 2002/03/14 03:15:55 millert Exp $	*/
+/*	$OpenBSD: viareg.h,v 1.4 2002/06/07 07:14:48 miod Exp $	*/
 /*	$NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $	*/
 
 /*-
@@ -42,109 +42,8 @@
 
 */
 
-
-	/* VIA1 data register A */
-#define DA1I_vSCCWrReq	0x80
-#define DA1O_vPage2	0x40
-#define DA1I_CPU_ID1	0x40
-#define DA1O_vHeadSel	0x20
-#define DA1O_vOverlay	0x10
-#define DA1O_vSync	0x08
-#define DA1O_RESERVED2	0x04
-#define DA1O_RESERVED1	0x02
-#define DA1O_RESERVED0	0x01
-
-	/* VIA1 data register B */
-#define DB1I_Par_Err	0x80
-#define DB1O_vSndEnb	0x80
-#define DB1O_Par_Enb	0x40
-#define DB1O_vFDesk2	0x20
-#define DB1O_vFDesk1	0x10
-#define DB1I_vFDBInt	0x08
-#define DB1O_rTCEnb	0x04
-#define DB1O_rTCCLK	0x02
-#define DB1O_rTCData	0x01
-#define DB1I_rTCData	0x01
-
-	/* VIA2 data register A */
-#define DA2O_v2Ram1	0x80
-#define DA2O_v2Ram0	0x40
-#define DA2I_v2IRQ0	0x40
-#define DA2I_v2IRQE	0x20
-#define DA2I_v2IRQD	0x10
-#define DA2I_v2IRQC	0x08
-#define DA2I_v2IRQB	0x04
-#define DA2I_v2IRQA	0x02
-#define DA2I_v2IRQ9	0x01
-
-	/* VIA2 data register B */
-#define DB2O_v2VBL	0x80
-#define DB2O_Par_Test	0x80
-#define DB2I_v2SNDEXT	0x40
-#define DB2I_v2TM0A	0x20
-#define DB2I_v2TM1A	0x10
-#define DB2I_vFC3	0x08
-#define DB2O_vFC3	0x08
-#define DB2O_v2PowerOff	0x04
-#define DB2O_v2BusLk	0x02
-#define DB2O_vCDis	0x01
-#define DB2O_CEnable	0x01
-
-/*
- * VIA1 interrupts
- */
-#define	VIA1_T1		6
-#define	VIA1_T2		5
-#define	VIA1_ADBCLK	4
-#define	VIA1_ADBDATA	3
-#define	VIA1_ADBRDY	2
-#define	VIA1_VBLNK	1
-#define	VIA1_ONESEC	0
-
-/* VIA1 interrupt bits */
-#define V1IF_IRQ	0x80
-#define V1IF_T1		(1 << VIA1_T1)
-#define V1IF_T2		(1 << VIA1_T2)
-#define V1IF_ADBCLK	(1 << VIA1_ADBCLK)
-#define V1IF_ADBDATA	(1 << VIA1_ADBDATA)
-#define V1IF_ADBRDY	(1 << VIA1_ADBRDY)
-#define V1IF_VBLNK	(1 << VIA1_VBLNK)
-#define V1IF_ONESEC	(1 << VIA1_ONESEC)
-
-/*
- * VIA2 interrupts
- */
-#define VIA2_T1		6
-#define VIA2_T2		5
-#define VIA2_ASC	4
-#define VIA2_SCSIIRQ	3
-#define VIA2_EXPIRQ	2
-#define VIA2_SLOTINT	1
-#define VIA2_SCSIDRQ	0
-
-/* VIA2 interrupt bits */
-#define	V2IF_IRQ	0x80
-#define	V2IF_T1		(1 << VIA2_T1)
-#define	V2IF_T2		(1 << VIA2_T2)
-#define	V2IF_ASC	(1 << VIA2_ASC)
-#define	V2IF_SCSIIRQ	(1 << VIA2_SCSIIRQ)
-#define	V2IF_EXPIRQ	(1 << VIA2_EXPIRQ)
-#define	V2IF_SLOTINT	(1 << VIA2_SLOTINT)
-#define	V2IF_SCSIDRQ	(1 << VIA2_SCSIDRQ)
-
-#define VIA1_INTS	(V1IF_T1 | V1IF_ADBRDY)
-#define VIA2_INTS	(V2IF_T1 | V2IF_ASC | V2IF_SCSIIRQ | V2IF_SLOTINT | \
-			 V2IF_SCSIDRQ)
-
-#define RBV_INTS	(V2IF_T1 | V2IF_ASC | V2IF_SCSIIRQ | V2IF_SLOTINT | \
-			 V2IF_SCSIDRQ | V1IF_ADBRDY)
-
-#define ACR_T1LATCH	0x40
-
 extern volatile unsigned char *Via1Base;
 #define VIA1_addr	Via1Base	/* at PA 0x50f00000 */
-#define VIA2OFF		1		/* VIA2 addr = VIA1_addr * 0x2000 */
-#define RBVOFF		0x13		/* RBV addr = VIA1_addr * 0x13000 */
 
 #define VIA1		0
 #define VIA2		0
@@ -162,29 +61,9 @@ extern volatile unsigned char *Via1Base;
 #define vT2CH		0x1200
 #define vSR		0x1400	/* shift register */
 #define vACR		0x1600	/* aux control register */
-#define vPCR		0x1800	/* peripheral control register */
 #define vIFR		0x1a00	/* interrupt flag register */
 #define vIER		0x1c00	/* interrupt enable register */
 
-	/* RBV interface registers */
-#define rBufB		0	/* register B */
-#define rBufA		2	/* register A */
-#define rIFR		0x3	/* interrupt flag register (writes?) */
-#define rIER		0x13	/* interrupt enable register */
-#define rMonitor	0x10	/* Monitor type */
-#define rSlotInt	0x12	/* Slot interrupt */
-
-	/* RBV monitor type flags and masks */
-#define RBVDepthMask	0x07	/* depth in bits */
-#define RBVMonitorMask	0x38	/* Type numbers */
-#define RBVOff		0x40	/* monitor turn off */
-#define RBVMonIDNone	0x38	/* What RBV actually has for no video */
-#define RBVMonIDOff	0x0	/* What rbv_vidstatus() returns for no video */
-#define RBVMonID15BWP	0x08	/* BW portrait */
-#define RBVMonIDRGB	0x10	/* color monitor */
-#define RBVMonIDRGB15	0x28	/* 15 inch RGB */
-#define RBVMonIDBW	0x30	/* No internal video */
-
 #define via_reg(v, r) (*(Via1Base + (r)))
 
 #include <machine/pio.h>
@@ -228,17 +107,3 @@ write_via_reg(int ign, int reg, int val)
 
 	out8(addr, val);
 }
-
-#define vDirA_ADBState	0x30
-
-void	via_init(void);
-int	rbv_vidstatus(void);
-void	via_shutdown(void);
-void	via_set_modem(int);
-int	add_nubus_intr(int, void (*)(void *, int), void *);
-void	enable_nubus_intr(void);
-void	via1_register_irq(int, void (*)(void *), void *);
-void	via2_register_irq(int, void (*)(void *), void *);
-
-extern void	(*via1itab[7])(void *);
-extern void	(*via2itab[7])(void *);