Kill prom stuff duplicates from bugio.[ch].

2 files changed, 9 insertions, 128 deletions

diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index c4ef12009ed..0f7f6dc93d2 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,141 +1,19 @@
-/*	$OpenBSD: bugio.h,v 1.11 2001/09/28 20:45:48 miod Exp $ */
+/*	$OpenBSD: bugio.h,v 1.12 2002/03/05 22:11:40 miod Exp $ */
 
 #ifndef __MACHINE_BUGIO_H__
 #define __MACHINE_BUGIO_H__
 
 #include <sys/cdefs.h>
 
-struct bugdisk_io {
-	char	clun;
-	char	dlun;
-	short	status;
-	void	*addr;
-	int	blkno;
-#define	fileno	blkno
-	short	nblks;
-	char	flag;
-#define	FILEMARKFLAG	0x80
-#define	IGNOREFILENO	0x02
-#define	ENDOFFILE	0x01
-	char	am;
-};	
-
-/* values are in BCD {upper nibble+lower nibble} */
-
-struct bugrtc {
-	unsigned char	Y;
-	unsigned char	M;
-	unsigned char	D;
-	unsigned char	d;
-	unsigned char	H;
-	unsigned char	m;
-	unsigned char	s;
-	unsigned char	c;
-};
-
-/* Board ID - lots of info */
-
-struct bugbrdid {
-	unsigned char	eye[4];
-	char	rev;
-	char	month;
-	char	day;
-	char	year;
-	short	packetsize;
-	short	dummy;
-	short	brdno;
-	unsigned char	brdsuf[2];
-	char	options[3];
-	char	family:4;
-	char	cpu:4;
-	short	clun;
-	short	dlun;
-	short	type;
-	short	dev;
-	int	option;
-	char	version[4];
-	char	serial[12];			/* SBC serial number */
-	char	id[16];				/* SBC id */
-	char	pwa[16];				/* printed wiring assembly number */
-	char	speed[4];			/* cpu speed */
-	char	etheraddr[6];		/* mac address, all zero if no ether */
-	char	fill[2];		
-	char	scsiid[2];			/* local SCSI id */
-	char	sysid[8];			/* system id - nothing on mvme187 */
-	char	brd1_pwb[8];		/* memory board 1 pwb */
-	char	brd1_serial[8];	/* memory board 1 serial */
-	char	brd2_pwb[8];		/* memory board 2 pwb */
-	char	brd2_serial[8];	/* memory board 2 serial */
-	char	reserved[153];
-	char	cksum[1];
-};
-
-struct bugniocall {
-	unsigned char clun;
-	unsigned char dlun;
-	unsigned char ci;
-	unsigned char cd;
-#define	NETCTRL_INITDEVICE	0
-#define	NETCTRL_GETHDW		1
-#define	NETCTRL_TX		2
-#define	NETCTRL_RX		3
-#define	NETCTRL_FLUSH		4
-#define	NETCTRL_RESET		5
-	unsigned long cid;
-	unsigned long memaddr;
-	unsigned long nbytes;
-	unsigned long csword;
-};
-
-typedef struct netcnfgp {
-	unsigned int magic;
-	unsigned int nodemem;
-	unsigned int bfla;
-	unsigned int bfea;
-	unsigned int bfed;
-	unsigned int bfl;
-	unsigned int bfbo;
-	unsigned int tbuffer;
-	unsigned char cipa[4];
-	unsigned char sipa[4];
-	unsigned char netmask[4];
-	unsigned char broadcast[4];
-	unsigned char gipa[4];
-	unsigned char bootp_retry;
-	unsigned char tftp_retry;
-	unsigned char bootp_ctl;
-	unsigned char cnfgp_ctl;
-	unsigned char filename[64];
-	unsigned char argfname[64];
-} NETCNFGP;
-
-struct bugniotcall {
-	unsigned char clun;
-	unsigned char dlun;
-	unsigned char ci;
-	unsigned char cd;
-	NETCNFGP * netcfngp_p;
-	void * unused;
-#define NIOT_READ  (1<<0)
-#define NIOT_WRITE (1<<1)
-#define NIOT_NVRAM (1<<2)    
-	unsigned long cntrlflag;
-};
+#include <machine/prom.h>
 
 void buginit	__P((void));
 int buginstat	__P((void));
 char buginchr	__P((void));
 void bugoutchr	__P((unsigned char));
 void bugoutstr	__P((char *, char *));
-void bugpcrlf	__P((void));
-int bugdskrd	__P((struct bugdisk_io *));
-int bugdskwr	__P((struct bugdisk_io *));
-void bugrtcrd	__P((struct bugrtc *));
+void bugrtcrd	__P((struct mvmeprom_time *));
 void bugreturn	__P((void));
-int bugfork	__P((int cpu, unsigned address));
-void bugbrdid	__P((struct bugbrdid *));
-void bugnetctrl	__P((struct bugniocall *));
-void bugdelay	__P((int));
-int bugnetcfg	__P((struct bugniotcall *));
+void bugbrdid	__P((struct mvmeprom_brdid *));
 
 #endif /* __MACHINE_BUGIO_H__ */
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index 2b1af80abea..f3d1a84a20d 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: prom.h,v 1.9 2002/03/05 22:11:40 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -46,14 +46,17 @@
 #define MVMEPROM_DSKFMT		0x14
 #define MVMEPROM_DSKCTRL	0x15
 #define MVMEPROM_NETCTRL	0x1d
+#define MVMEPROM_OUTSTR		0x21
 #define MVMEPROM_OUTSTRCRLF	0x22
 #define MVMEPROM_WRITE		0x23
 #define MVMEPROM_WRITELN	0x24
+#define	MVMEPROM_OUTCRLF	0x26
 #define MVMEPROM_DELAY		0x43
 #define MVMEPROM_RTC_RD		0x53
 #define MVMEPROM_EXIT		0x63
 #define MVMEPROM_GETBRDID	0x70
 #define MVMEPROM_ENVIRON	0x71
+#define	MVMEPROM_FORKMPU	0x100
 
 #define NETCTRLCMD_GETETHER	1
 
@@ -161,7 +164,7 @@ struct mvmeprom_args {
 
 #define MVMEPROM_CALL(x)	\
 	__asm__ __volatile__ ( __CONCAT("or r9,r0,",__STRING(x)) ); \
-	__asm__ __volatile__ ("tb0 0,r0,496");
+	__asm__ __volatile__ ("tb0 0,r0,496")
 
 #define MVMEPROM_REG_DEVLUN	"r2"
 #define MVMEPROM_REG_CTRLLUN	"r3"