1 files changed, 4 insertions, 46 deletions

diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h
index b4997addc41..77874ef1155 100644
--- a/sys/arch/macppc/dev/adbvar.h
+++ b/sys/arch/macppc/dev/adbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbvar.h,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: adbvar.h,v 1.4 2002/06/07 07:14:48 miod Exp $	*/
 /*	$NetBSD: adbvar.h,v 1.3 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*-
@@ -42,30 +42,18 @@ struct adb_attach_args {
 	int	handler_id;
 };
 
-#define ADB_MAXTRACE	(NBPG / sizeof(int) - 1)
-extern int adb_traceq[ADB_MAXTRACE];
-extern int adb_traceq_tail;
-extern int adb_traceq_len;
-
-typedef struct adb_trace_xlate_s {
-	int     params;
-	char   *string;
-}       adb_trace_xlate_t;
-
-extern adb_trace_xlate_t adb_trace_xlations[];
-
 #ifdef DEBUG
 #ifndef ADB_DEBUG
 #define ADB_DEBUG
 #endif
 #endif
 
+extern int	adb_polling;	/* Are we polling?  (Debugger mode) */
 #ifdef ADB_DEBUG
 extern int	adb_debug;
 #endif
 
 typedef caddr_t Ptr;
-typedef caddr_t *Handle;
 
 /* ADB Manager */
 typedef struct {
@@ -84,50 +72,20 @@ struct adb_softc {
 	char *sc_regbase;
 };
 
-
-/* adb.c */
-void	adb_enqevent(adb_event_t *event);
-void	adb_handoff(adb_event_t *event);
-void	adb_autorepeat(void *keyp);
-void	adb_dokeyupdown(adb_event_t *event);
-void	adb_keymaybemouse(adb_event_t *event);
-void	adb_processevent(adb_event_t *event);
-int	adbopen(dev_t dev, int flag, int mode, struct proc *p);
-int	adbclose(dev_t dev, int flag, int mode, struct proc *p);
-int	adbread(dev_t dev, struct uio *uio, int flag);
-int	adbwrite(dev_t dev, struct uio *uio, int flag);
-int	adbioctl(dev_t , int , caddr_t , int , struct proc *);
-int	adbpoll(dev_t dev, int events, struct proc *p);
-
-/* adbsys.c */
-void	adb_complete(caddr_t buffer, caddr_t data_area, int adb_command);
-void	adb_msa3_complete(caddr_t buffer, caddr_t data_area, int adb_command);
-void	adb_mm_nonemp_complete(caddr_t buffer, caddr_t data_area, int adb_command);
-void	extdms_init(int);
-void	extdms_complete(caddr_t, caddr_t, int);
-
-/* types of adb hardware that we (will eventually) support */
-#define ADB_HW_UNKNOWN		0x01	/* don't know */
-#define ADB_HW_II		0x02	/* Mac II series */
-#define ADB_HW_IISI		0x03	/* Mac IIsi series */
-#define ADB_HW_PB		0x04	/* PowerBook series */
-#define ADB_HW_CUDA		0x05	/* Machines with a Cuda chip */
-
-extern int adbHardware;                 /* in adb_direct.c */
+/* adb_direct.c */
+extern int adbHardware;
 
 #define ADB_CMDADDR(cmd)	((u_int8_t)((cmd) & 0xf0) >> 4)
 #define ADBFLUSH(dev)		((((u_int8_t)(dev) & 0x0f) << 4) | 0x01)
 #define ADBLISTEN(dev, reg)	((((u_int8_t)(dev) & 0x0f) << 4) | 0x08 | (reg))
 #define ADBTALK(dev, reg)	((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg))
 
-/* adb_direct.c */
 int	adb_poweroff(void);
 int	CountADBs(void);
 void	ADBReInit(void);
 int	GetIndADB(ADBDataBlock * info, int index);
 int	GetADBInfo(ADBDataBlock * info, int adbAddr);
 int	SetADBInfo(ADBSetInfoBlock * info, int adbAddr);
-int	ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum);
 int	adb_read_date_time(unsigned long *t);
 int	adb_set_date_time(unsigned long t);
 int	adb_intr(void *arg);