Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/mca/mca_machdep.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/mca/mca_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.34
retrieving revision 1.34.14.3
diff -u -p -r1.34 -r1.34.14.3
--- src/sys/arch/i386/mca/mca_machdep.c	2007/12/01 16:49:56	1.34
+++ src/sys/arch/i386/mca/mca_machdep.c	2009/01/17 13:28:04	1.34.14.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: mca_machdep.c,v 1.34 2007/12/01 16:49:56 ad Exp $	*/
+/*	$NetBSD: mca_machdep.c,v 1.34.14.3 2009/01/17 13:28:04 mjf Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -17,13 +17,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -43,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.34 2007/12/01 16:49:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.34.14.3 2009/01/17 13:28:04 mjf Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -85,7 +78,7 @@ struct bios_config {
 #define FEATURE_DMA3	0x80	/* DMA channel 3 used by hard disk BIOS	*/
 	uint8_t		feature2;
 	uint8_t		pad[9];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Used to encode DMA channel into ISA DMA cookie. We use upper 4 bits of
@@ -314,7 +307,7 @@ mca_busprobe(void)
 	paddr = (regs.ES << 4) + regs.BX;
 	scp = (struct bios_config *)ISA_HOLE_VADDR(paddr);
 
-	bitmask_snprintf((scp->feature2 << 8) | scp->feature1,
+	snprintb(buf, sizeof(buf),
 		"\20"
 		"\01MCA+ISA"
 		"\02MCA"
@@ -331,8 +324,7 @@ mca_busprobe(void)
 		"\015MMF"
 		"\016GPDF"
 		"\017KBDF"
-		"\020DMA32\n",
-		buf, sizeof(buf));
+		"\020DMA32\n", (scp->feature2 << 8) | scp->feature1);
 
 	aprint_verbose("BIOS CFG: Model-SubM-Rev: %02x-%02x-%02x, 0x%s\n",
 		scp->model, scp->submodel, scp->bios_rev, buf);