Convert NetBSD new-style %b strings to old-style.

4 files changed, 50 insertions, 48 deletions

diff --git a/sys/arch/sparc/sparc/intreg.h b/sys/arch/sparc/sparc/intreg.h
index 5ea2f416352..f6709559a14 100644
--- a/sys/arch/sparc/sparc/intreg.h
+++ b/sys/arch/sparc/sparc/intreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intreg.h,v 1.7 2005/04/19 21:30:20 miod Exp $	*/
+/*	$OpenBSD: intreg.h,v 1.8 2006/05/29 20:40:01 miod Exp $	*/
 /*	$NetBSD: intreg.h,v 1.6 1997/07/22 20:19:10 pk Exp $ */
 
 /*
@@ -142,10 +142,12 @@ void	ienab_bic(int bic);	/* clear given bits */
 #define SINTR_SBUS(n)		(1 << (7+(n)-1))
 #define SINTR_VMEMASK		0x0000007f	/* VME */
 #define SINTR_VME(n)		(1 << ((n)-1))
-#define SINTR_BITS		"\177\020" \
-				"f\0\7VME\0f\7\7SBUS\0b\16K\0b\17S\0b\20E\0" \
-				"b\21A\0b\22SC\0b\23T\0b\24VI\0b\25MI\0"     \
-				"b\26F\0b\33V\0b\34M\0b\35I\0b\36ME\0b\37MA\0"
+#define SINTR_BITS		"\020" \
+				"\01VME0\02VME1\03VME2\04VME3\05VME4\06VME5" \
+				"\07VME6\010SBUS0\011SBUS1\012SBUS2\013SBUS3" \
+				"\014SBUS4\015SBUS5\016SBUS6\017K\020S\021E" \
+				"\022A\023SC\024T\025VI\065MI\027F" \
+				"\034V\035M\036I\037ME\040MA"
 
 
 #endif
diff --git a/sys/dev/ic/lsi64854reg.h b/sys/dev/ic/lsi64854reg.h
index 48f34d2d17f..d58ab60e077 100644
--- a/sys/dev/ic/lsi64854reg.h
+++ b/sys/dev/ic/lsi64854reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsi64854reg.h,v 1.2 2001/08/25 14:58:32 jason Exp $	*/
+/*	$OpenBSD: lsi64854reg.h,v 1.3 2006/05/29 20:40:03 miod Exp $	*/
 /*	$NetBSD: lsi64854reg.h,v 1.5 2001/03/29 02:58:39 petrov Exp $ */
 
 /*-
@@ -130,13 +130,13 @@
 #define D_ESC_BURST	0x00000800	/* DMA ESC: 16 byte bursts */
 #define D_ESC_AUTODRAIN	0x00040000	/* DMA ESC: Auto-drain */
 
-#define DDMACSR_BITS	"\177\020"				\
-	"b\00INT\0b\01ERR\0f\02\02DRAINING\0b\04IEN\0"		\
-	"b\06SLVERR\0b\07RST\0b\10WRITE\0b\11ENDMA\0"		\
-	"b\15ENCNT\0b\16TC\0\b\20DSBL_CSR_DRN\0"		\
-	"b\21DSBL_SCSI_DRN\0f\22\2BURST\0b\25TWOCYCLE\0"	\
-	"b\26FASTER\0b\27TCIDIS\0b\30ENNXT\0b\031DMAON\0"	\
-	"b\32ALOADED\0b\33NALOADED\0"
+#define DDMACSR_BITS	"\020"				\
+	"\01INT\02ERR\03DR1\04DR2\05IEN"		\
+	"\07SLVERR\010RST\011WRITE\012ENDMA"		\
+	"\016ENCNT\017TC\021DSBL_CSR_DRN"		\
+	"\022DSBL_SCSI_DRN\026TWOCYCLE"			\
+	"\027FASTER\030TCIDIS\031ENNXT\032DMAON"	\
+	"\033ALOADED\034NALOADED"
 
 
 /*
@@ -164,12 +164,12 @@
 #define E_reserved4	0x0c800000	/* */
 #define E_DEV_ID	L64854_DEVID	/* ID bits */
 
-#define EDMACSR_BITS	"\177\020"				\
-	"b\00INT\0b\01ERR\0f\02\02DRAINING\0b\04IEN\0"		\
-	"b\06SLVERR\0b\07RST\0b\10WRITE\0b\12DRAIN\0"		\
-	"b\13DSBL_WR_DRN\0b\14DSBL_RD_DRN\0b\17ILACC\0"		\
-	"b\20DSBL_BUF_WR\0b\21DSBL_WR_INVAL\0"			\
-	"b\25LOOPTEST\0b\26TP\0"
+#define EDMACSR_BITS	"\020"				\
+	"\01INT\02ERR\05IEN"				\
+	"\07SLVERR\010RST\011WRITE\013DRAIN"		\
+	"\014DSBL_WR_DRN\015DSBL_RD_DRN\020ILACC"	\
+	"\021DSBL_BUF_WR\022DSBL_WR_INVAL"		\
+	"\026LOOPTEST\027TP"
 
 /*
  * PP DMA control bits.
@@ -197,8 +197,8 @@
 #define P_NA_LOADED	0x08000000	/* next addr & count valid but not used */
 #define P_DEV_ID	L64854_DEVID	/* ID bits */
 
-#define PDMACSR_BITS	"\177\020"				\
-	"b\00INT\0b\01ERR\0f\02\02DRAINING\0b\04IEN\0"		\
-	"b\06SLVERR\0b\07RST\0b\10WRITE\0b\11ENDMA\0"		\
-	"b\15ENCNT\0b\16TC\0\b\24DIAG\0b\27TCIDIS\0"		\
-	"b\30ENNXT\0b\031DMAON\0b\32ALOADED\0b\33NALOADED\0"
+#define PDMACSR_BITS	"\020"				\
+	"\01INT\02ERR\05IEN"				\
+	"\07SLVERR\010RST\011WRITE\012ENDMA"		\
+	"\016ENCNT\017TC\025DIAG\030TCIDIS"		\
+	"\031ENNXT\032DMAON\033ALOADED\034NALOADED"
diff --git a/sys/dev/sbus/bereg.h b/sys/dev/sbus/bereg.h
index 4b3640e0c45..6564563cbcd 100644
--- a/sys/dev/sbus/bereg.h
+++ b/sys/dev/sbus/bereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bereg.h,v 1.2 2003/06/02 18:32:41 jason Exp $	*/
+/*	$OpenBSD: bereg.h,v 1.3 2006/05/29 20:40:03 miod Exp $	*/
 /*	$NetBSD: bereg.h,v 1.4 2000/07/24 04:28:51 mycroft Exp $	*/
 
 /*-
@@ -159,12 +159,12 @@ struct be_bregs {
 #define BE_BR_STAT_LCCNTEXP	0x00002000	/* late-collision cntr exp */
 #define BE_BR_STAT_FCNTEXP	0x00004000	/* first-collision cntr exp */
 #define BE_BR_STAT_DTIMEXP	0x00008000	/* defer-timer expired */
-#define BE_BR_STAT_BITS		"\177\020"				\
-			"b\0GOTFRAME\0b\1RCNTEXP\0b\2ACNTEXP\0"		\
-			"b\3CCNTEXP\0b\5LCNTEXP\0b\6RFIFOVF\0"		\
-			"b\7CVCNTEXP\0b\10SENTFRAME\0b\11TFIFO_UND\0"	\
-			"b\12MAXPKTERR\0b\13NCNTEXP\0b\14ECNTEXP\0"	\
-			"b\15LCCNTEXP\0b\16FCNTEXP\0b\17DTIMEXP\0\0"
+#define BE_BR_STAT_BITS		"\020"				\
+			"\01GOTFRAME\02RCNTEXP\03ACNTEXP"		\
+			"\04CCNTEXP\05LCNTEXP\06RFIFOVF"		\
+			"\07CVCNTEXP\011SENTFRAME\012TFIFO_UND"	\
+			"\013MAXPKTERR\014NCNTEXP\015ECNTEXP"	\
+			"\016LCCNTEXP\017FCNTEXP\020DTIMEXP"
 
 /* be_bregs.imask: interrupt mask. */
 #define BE_BR_IMASK_GOTFRAME	0x00000001	/* received a frame */
@@ -286,9 +286,9 @@ struct be_tregs {
 #define TCVR_PAL_MSENSE		0x00000004	/* media sense */
 #define TCVR_PAL_LTENABLE	0x00000008	/* link test enable */
 #define TCVR_PAL_LTSTATUS	0x00000010	/* link test status: p1 only */
-#define TCVR_PAL_BITS		"\177\020"				\
-				"b\0SERIAL\0b\1EXTLBACK\0b\2MSENSE\0"	\
-				"b\3LTENABLE\0\b4LTSTATUS\0\0"
+#define TCVR_PAL_BITS		"\020"				\
+				"\01SERIAL\02EXTLBACK\03MSENSE"	\
+				"\04LTENABLE\05LTSTATUS"
 
 /* be_tregs.mgmt_pal: management pal */
 #define MGMT_PAL_DCLOCK		0x00000001	/* data clock strobe */
@@ -299,9 +299,9 @@ struct be_tregs {
 #define MGMT_PAL_TIMEO		0x00000008	/* tx enable timeout error */
 #define MGMT_PAL_INT_MDIO	MGMT_PAL_TIMEO	/* internal mdio */
 #define MGMT_PAL_INT_MDIO_SHIFT	3		/* position of int mdio bit */
-#define MGMT_PAL_BITS		"\177\020"				\
-				"b\0DLCLOCK\0b\1OENAB\0b\2EXT_MDIO\0"	\
-				"b\3INT_MDIO\0\0"
+#define MGMT_PAL_BITS		"\020"				\
+				"\01DLCLOCK\02ENAB\03EXT_MDIO"	\
+				"\04INT_MDIO"
 
 /* Packet buffer size */
 #define BE_PKT_BUF_SZ		2048
diff --git a/sys/dev/sbus/qereg.h b/sys/dev/sbus/qereg.h
index 09a54be6dc0..cde81f198a1 100644
--- a/sys/dev/sbus/qereg.h
+++ b/sys/dev/sbus/qereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qereg.h,v 1.2 2003/06/02 18:32:41 jason Exp $	*/
+/*	$OpenBSD: qereg.h,v 1.3 2006/05/29 20:40:03 miod Exp $	*/
 /*	$NetBSD: qereg.h,v 1.3 2000/07/24 04:28:51 mycroft Exp $	*/
 
 /*-
@@ -131,16 +131,16 @@ struct qe_cregs {
 #define	QE_CR_STAT_RXLERR	0x00000004	/* rx late error */
 #define	QE_CR_STAT_RXPERR	0x00000002	/* rx parity error */
 #define	QE_CR_STAT_RXSERR	0x00000001	/* rx sbus error ack */
-#define QE_CR_STAT_BITS		"\177\020"				\
-			"b\0RXSERR\0b\1RXPERR\0b\2RXLERR\0"		\
-			"b\3RXSMALL\0b\4RXDROP\0b\5RXIRQ\0"		\
-			"b\6CECOFLOW\0b\7FCOFLOW\0b\10RLCOLL\0"		\
-			"b\11RXFOFLOW\0b\12MCOFLOW\0b\13RUOFLOW\0"	\
-			"b\14RCCOFLOW\0b\20TXSERR\0b\21TXPERR\0"	\
-			"b\22TXLERR\0b\23TXDERROR\0b\24TCCOFLOW\0"	\
-			"b\25TXIRQ\0b\26BERROR\0b\27JERROR\0"		\
-			"b\30FUFLOW\0b\31LCOLL\0b\32ERETRIES\0"		\
-			"b\33CLOSS\0b\32EDEFER\0\0"
+#define QE_CR_STAT_BITS		"\020"				\
+			"\01RXSERR\02RXPERR\03RXLERR"		\
+			"\04RXSMALL\05RXDROP\06RXIRQ"		\
+			"\07CECOFLOW\010FCOFLOW\011RLCOLL"	\
+			"\012RXFOFLOW\013MCOFLOW\014RUOFLOW"	\
+			"\015RCCOFLOW\021TXSERR\022TXPERR"	\
+			"\023TXLERR\024TXDERROR\025TCCOFLOW"	\
+			"\026TXIRQ\027BERROR\030JERROR"		\
+			"\031FUFLOW\032LCOLL\033ERETRIES"	\
+			"\034CLOSS\035EDEFER"
 
 /*
  * Errors: all status bits except for TX/RX IRQ