typo; from weissmanndude

10 files changed, 151 insertions, 75 deletions

diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c
index 8c01bc95817..97080343462 100644
--- a/sys/dev/pci/ami_pci.c
+++ b/sys/dev/pci/ami_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami_pci.c,v 1.13 2002/12/10 23:13:59 miod Exp $	*/
+/*	$OpenBSD: ami_pci.c,v 1.14 2003/02/28 15:14:08 mickey Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -203,7 +203,7 @@ ami_pci_attach(parent, self, aux)
 		bus_space_unmap(sc->iot, sc->ioh, size);
 	}
 
-	printf(": %s", intrstr);
+	printf(": %s\n", intrstr);
 
 	csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	for (ssp = ami_pci_subsys; ssp->id; ssp++)
@@ -245,7 +245,7 @@ ami_pci_attach(parent, self, aux)
 	default:		lhc = "32b";
 	}
 
-	printf(" %s/%s\n%s", model, lhc, sc->sc_dev.dv_xname);
+	sprintf(sc->sc_raidconfig.rc_name, "%s/%s", model, lhc);
 
 	if (ami_attach(sc)) {
 		pci_intr_disestablish(pa->pa_pc, sc->sc_ih);
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 8d7b02468b1..6e38f7bad23 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auvia.c,v 1.21 2002/11/19 18:40:17 jason Exp $ */
+/*	$OpenBSD: auvia.c,v 1.22 2003/02/28 15:14:08 mickey Exp $ */
 /*	$NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $	*/
 
 /*-
@@ -132,41 +132,49 @@ struct cfattach auvia_ca = {
 #define		AUVIA_PCICONF_ACFM	 0x00000200	/* FM enab */
 #define		AUVIA_PCICONF_ACSB	 0x00000100	/* SB enab */
 
-#define AUVIA_PLAY_BASE			0x00
-#define AUVIA_RECORD_BASE		0x10
+#define AUVIA_PLAY_BASE		0x00
+#define AUVIA_RECORD_BASE	0x10
 
-#define	AUVIA_RP_STAT			0x00
-#define		AUVIA_RPSTAT_INTR		0x03
-#define AUVIA_RP_CONTROL		0x01
-#define		AUVIA_RPCTRL_START		0x80
-#define		AUVIA_RPCTRL_TERMINATE		0x40
-#define		AUVIA_RPCTRL_AUTOSTART		0x20
+#define	AUVIA_RP_STAT		0x00
+#define		AUVIA_RPSTAT_INTR	0x03
+#define AUVIA_RP_CONTROL	0x01
+#define		AUVIA_RPCTRL_START	0x80
+#define		AUVIA_RPCTRL_TERMINATE	0x40
+#define		AUVIA_RPCTRL_AUTOSTART	0x20
 /* The following are 8233 specific */
-#define		AUVIA_RPCTRL_STOP		0x04
-#define		AUVIA_RPCTRL_EOL		0x02
-#define		AUVIA_RPCTRL_FLAG		0x01
-#define AUVIA_RP_MODE			0x02
-#define		AUVIA_RPMODE_INTR_FLAG		0x01
-#define		AUVIA_RPMODE_INTR_EOL		0x02
-#define		AUVIA_RPMODE_STEREO		0x10
-#define		AUVIA_RPMODE_16BIT		0x20
-#define		AUVIA_RPMODE_AUTOSTART		0x80
-#define	AUVIA_RP_DMAOPS_BASE		0x04
-
-#define	VIA8233_RP_DXS_LVOL		0x02
-#define	VIA8233_RP_DXS_RVOL		0x03
-#define	VIA8233_RP_RATEFMT		0x08
+#define		AUVIA_RPCTRL_STOP	0x04
+#define		AUVIA_RPCTRL_EOL	0x02
+#define		AUVIA_RPCTRL_FLAG	0x01
+#define AUVIA_RP_MODE		0x02
+#define		AUVIA_RPMODE_INTR_FLAG	0x01
+#define		AUVIA_RPMODE_INTR_EOL	0x02
+#define		AUVIA_RPMODE_STEREO	0x10
+#define		AUVIA_RPMODE_16BIT	0x20
+#define		AUVIA_RPMODE_AUTOSTART	0x80
+#define	AUVIA_RP_DMAOPS_BASE	0x04
+#define		AUVIA_RPDMAOP_PTR	0x00
+#define		AUVIA_RPDMAOP_IDX	0x04
+#define		AUVIA_RPDMAOP_CNT	0x08
+#define		AUVIA_RPDMAOP_CHIDX	0x0f
+
+#define	VIA8233_RP_DXS_LVOL	0x02
+#define	VIA8233_RP_DXS_RVOL	0x03
+#define	VIA8233_RP_RATEFMT	0x08
 #define		VIA8233_RATEFMT_48K	0xfffff
 #define		VIA8233_RATEFMT_STEREO	0x00100000
 #define		VIA8233_RATEFMT_16BIT	0x00200000
 
-#define VIA_RP_DMAOPS_COUNT		0x0C
+#define	AUVIA_MPB_BASE		0x40
+#define		AUVIA_MPBMODE_16BIT	0x80
+#define		AUVIA_MPBMODE_CHMASK	0x70
 
-#define	AUVIA_CODEC_CTL			0x80
-#define		AUVIA_CODEC_READ		0x00800000
-#define		AUVIA_CODEC_BUSY		0x01000000
-#define		AUVIA_CODEC_PRIVALID		0x02000000
-#define		AUVIA_CODEC_INDEX(x)		((x)<<16)
+#define	AUVIA_CAPTURE_BASE	0x60
+
+#define	AUVIA_CODEC_CTL		0x80
+#define		AUVIA_CODEC_READ	0x00800000
+#define		AUVIA_CODEC_BUSY	0x01000000
+#define		AUVIA_CODEC_PRIVALID	0x02000000
+#define		AUVIA_CODEC_INDEX(x)	((x)<<16)
 
 #define TIMEOUT	50
 
@@ -230,6 +238,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 	pcitag_t pt = pa->pa_tag;
 	pci_intr_handle_t ih;
 	bus_size_t iosize;
+	const char *p;
 	pcireg_t pr;
 	int r, i;
 
@@ -266,6 +275,21 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 
 	printf(": %s\n", intrstr);
 
+	switch (PCI_REVISION(pa->pa_class) & 0xf0) {
+	case 0x10: p = "pre-8233";	break;
+	case 0x20: p = "8233C";		break;
+	case 0x30: p = "8233";		break;
+	case 0x50: p = "8235";		break;
+	case 0x40: p = "8233A";
+		sc->sc_flags |= AUVIA_FLAGS_MPB;
+		break;
+	}
+
+	sprintf(sc->sc_audev.name, "%s AC97", p);
+	sprintf(sc->sc_audev.version, "0x%x",
+	    PCI_REVISION(pa->pa_class) & 0xf);
+	strcpy(sc->sc_audev.config, sc->sc_dev.dv_xname);
+
 	/* disable SBPro compat & others */
 	pr = pci_conf_read(pc, pt, AUVIA_PCICONF_JUNK);
 
@@ -547,10 +571,33 @@ auvia_set_params(void *addr, int setmode, int usemode,
 			v |= VIA8233_RATEFMT_48K *
 			    (p->sample_rate / 20) / (48000 / 20);
 
-			if (p->channels == 2)
-				v |= VIA8233_RATEFMT_STEREO;
-			if (p->precision == 16)
-				v |= VIA8233_RATEFMT_16BIT;
+			if (mode == AUMODE_PLAY &&
+			    sc->sc_flags & AUVIA_FLAGS_MPB) {
+				static const u_int32_t nch2sl[] = {
+					0, 1, 0x21, 0,
+					0x4321, 0, 0x436521
+				};
+				int slots;
+
+				bus_space_write_1(sc->sc_iot, sc->sc_ioh,
+				    AUVIA_MPB_BASE + AUVIA_RP_MODE,
+				    (p->precision == 16? AUVIA_MPBMODE_16BIT:0)
+				    | (p->channels << 4));
+
+				if (p->channels <
+				    sizeof(nch2sl) / sizeof(*nch2sl))
+					slots = 0;
+				else
+					slots = nch2sl[p->channels];
+				bus_space_write_4(sc->sc_iot, sc->sc_ioh,
+				    AUVIA_RP_DMAOPS_BASE + AUVIA_RPDMAOP_IDX,
+				    slots | 0xff000000);
+			} else {
+				if (p->channels == 2)
+					v |= VIA8233_RATEFMT_STEREO;
+				if (p->precision == 16)
+					v |= VIA8233_RATEFMT_16BIT;
+			}
 
 			bus_space_write_4(sc->sc_iot, sc->sc_ioh,
 			    base + VIA8233_RP_RATEFMT, v);
@@ -652,18 +699,10 @@ auvia_halt_input(void *addr)
 
 
 int
-auvia_getdev(void *addr, struct audio_device *retp)
+auvia_getdev(void *v, struct audio_device *adp)
 {
-	struct auvia_softc *sc = addr;
-
-	if (retp) {
-		strncpy(retp->name,
-		    sc->sc_flags & AUVIA_FLAGS_VT8233? "VIA VT8233" :
-		    "VIA VT82C686A", sizeof(retp->name));
-		strncpy(retp->version, sc->sc_revision, sizeof(retp->version));
-		strncpy(retp->config, "auvia", sizeof(retp->config));
-	}
-
+	struct auvia_softc *sc = v;
+	*adp = sc->sc_audev;
 	return 0;
 }
 
@@ -958,7 +997,7 @@ auvia_intr(void *arg)
 {
 	struct auvia_softc *sc = arg;
 	u_int8_t r;
-	int i = 0;
+	int base, i = 0;
 
 	r = bus_space_read_1(sc->sc_iot, sc->sc_ioh,
 	    AUVIA_RECORD_BASE + AUVIA_RP_STAT);
@@ -972,15 +1011,19 @@ auvia_intr(void *arg)
 
 		i++;
 	}
-	r = bus_space_read_1(sc->sc_iot, sc->sc_ioh,
-	    AUVIA_PLAY_BASE + AUVIA_RP_STAT);
+
+	if (sc->sc_flags & AUVIA_FLAGS_MPB)
+		base = AUVIA_MPB_BASE;
+	else
+		base = AUVIA_PLAY_BASE;
+	r = bus_space_read_1(sc->sc_iot, sc->sc_ioh, base + AUVIA_RP_STAT);
 	if (r & AUVIA_RPSTAT_INTR) {
 		if (sc->sc_play.sc_intr)
 			sc->sc_play.sc_intr(sc->sc_play.sc_arg);
 
 		/* clear interrupts */
 		bus_space_write_1(sc->sc_iot, sc->sc_ioh,
-		    AUVIA_PLAY_BASE + AUVIA_RP_STAT, AUVIA_RPSTAT_INTR);
+		    base + AUVIA_RP_STAT, AUVIA_RPSTAT_INTR);
 
 		i++;
 	}
diff --git a/sys/dev/pci/auviavar.h b/sys/dev/pci/auviavar.h
index 9dee15abd6e..3cf252b1e33 100644
--- a/sys/dev/pci/auviavar.h
+++ b/sys/dev/pci/auviavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auviavar.h,v 1.5 2002/05/30 15:13:20 mickey Exp $ */
+/*	$OpenBSD: auviavar.h,v 1.6 2003/02/28 15:14:08 mickey Exp $ */
 /*	$NetBSD: auviavar.h,v 1.1 2000/03/31 04:45:29 tsarna Exp $	*/
 
 /*-
@@ -53,11 +53,12 @@ struct auvia_softc_chan {
 
 struct auvia_softc {
 	struct device sc_dev;
+	struct audio_device sc_audev;
 	void *sc_ih;			/* interrupt handle */
 
-	char sc_revision[8];
 	u_int sc_flags;
 #define	AUVIA_FLAGS_VT8233	0x0001
+#define	AUVIA_FLAGS_MPB		0x0002	/* use multi-pb */
 
 	pci_chipset_tag_t sc_pc;
 	pcitag_t sc_pt;
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index 7ad134f617b..c17be5f3985 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bha_pci.c,v 1.4 2002/11/19 23:57:29 jason Exp $	*/
+/*	$OpenBSD: bha_pci.c,v 1.5 2003/02/28 15:14:08 mickey Exp $	*/
 /*	$NetBSD: bha_pci.c,v 1.16 1998/08/15 10:10:53 mycroft Exp $	*/
 
 /*-
@@ -79,6 +79,8 @@ bha_pci_match(parent, match, aux)
 	void *match, *aux;
 {
 	struct pci_attach_args *pa = aux;
+	pci_chipset_tag_t pc = pa->pa_pc;
+	pcireg_t csr;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	bus_size_t iosize;
@@ -92,6 +94,10 @@ bha_pci_match(parent, match, aux)
 	    NULL, &iosize, 0))
 		return (0);
 
+	csr = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+	    csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE);
+
 	rv = bha_find(iot, ioh, NULL);
 	bus_space_unmap(iot, ioh, iosize);
 
@@ -130,6 +136,10 @@ bha_pci_attach(parent, self, aux)
 		return;
 	}
 
+	csr = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+	    csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE);
+
 	sc->sc_iot = iot;
 	sc->sc_ioh = ioh;
 	sc->sc_dmat = pa->pa_dmat;
@@ -141,10 +151,6 @@ bha_pci_attach(parent, self, aux)
 
 	sc->sc_dmaflags = 0;
 
-	csr = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
-	    csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE);
-
 	if (pci_intr_map(pa, &ih)) {
 		printf(": couldn't map interrupt\n");
 		bus_space_unmap(iot, ioh, iosize);
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index b885cffdfeb..ecdc646784f 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.144 2002/11/19 02:20:51 deraadt Exp $
+#	$OpenBSD: files.pci,v 1.145 2003/02/28 15:14:08 mickey Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -24,6 +24,10 @@ file	dev/ic/bt463.c			tga
 file	dev/ic/bt485.c			tga
 file	dev/ic/ibm561.c			tga
 
+# HP graphics (CRX, Visualize)
+attach	sti at pci with sti_pci
+file	dev/pci/sti_pci.c		sti_pci
+
 # Cypress 82c693 hyperCache(tm) Stand-Alone PCI Peripheral Controller
 # with USB.  This is a combo chip:
 #
@@ -87,11 +91,16 @@ file	dev/pci/eso.c			eso
 attach	opl at eso with opl_eso
 file	dev/pci/opl_eso.c		opl_eso
 
-# Intel 810/820/440MX ICH audio with AC'97
+# Intel 810/820/440MX ICH AC'97
 device	auich: audio, auconv, mulaw, ac97
 attach	auich at pci
 file	dev/pci/auich.c			auich
 
+# AUREAL Vortex1
+device	aureal: audio, auconv, mulaw, ac97
+attach	aureal at pci
+file	dev/pci/aureal.c		aureal
+
 # Creative Labs EMU10k1 (SBLive! series and PCI512)
 device	emu: audio, auconv, mulaw, ac97
 attach	emu at pci
@@ -141,6 +150,11 @@ device	auvia: audio, auconv, mulaw, ac97
 attach	auvia at pci
 file	dev/pci/auvia.c			auvia
 
+# BrookTree 878 Audio device
+device	aubktr: audio, auconv, mulaw
+attach	aubktr at pci
+file	dev/pci/aubktr.c		aubktr
+
 # ICP Vortex GDT PCI RAID controllers
 # device declaration in sys/conf/files
 attach	gdt at pci with gdt_pci
@@ -298,6 +312,10 @@ file	dev/pci/if_ti.c			ti
 attach	ne at pci with ne_pci: rtl80x9
 file	dev/pci/if_ne_pci.c		ne_pci
 
+# i82596-based PCI Ethernet cards
+attach	ie at pci with ie_pci
+file	dev/pci/if_ie_pci.c		ie_pci
+
 # Sun GEM ethernet
 attach	gem at pci with gem_pci
 file	dev/pci/if_gem_pci.c		gem_pci
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index a848fddfc9f..8b05606ee22 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_pci.c,v 1.29 2002/08/17 17:35:48 mjacob Exp $	*/
+/*	$OpenBSD: isp_pci.c,v 1.30 2003/02/28 15:14:08 mickey Exp $	*/
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -323,6 +323,11 @@ isp_pci_probe(struct device *parent, void *match, void *aux)
 {
         struct pci_attach_args *pa = aux;
 
+	/* those are raid puppies */
+	if (PCI_VENDOR(pci_conf_read(pa->pa_pc, pa->pa_tag,
+	    PCI_SUBSYS_ID_REG)) == PCI_VENDOR_AMI)
+		return (0);
+
         switch (pa->pa_id) {
 #ifndef	ISP_DISABLE_1020_SUPPORT
 	case PCI_QLOGIC_ISP:
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 3fc327d3787..710dc806d7d 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.30 2002/11/19 18:40:17 jason Exp $	*/
+/*	$OpenBSD: pci.c,v 1.31 2003/02/28 15:14:08 mickey Exp $	*/
 /*	$NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $	*/
 
 /*
@@ -409,10 +409,10 @@ pci_matchbyid(struct pci_attach_args *pa, const struct pci_matchid *ids,
 #include <sys/pciio.h>
 #include <sys/fcntl.h>
 
-#ifdef DEBUG
-#define PCIDEBUG(x) printf x
+#ifdef PCI_DEBUG
+#define DPRINTF(x) printf x
 #else
-#define PCIDEBUG(x)
+#define DPRINTF(x)
 #endif
 
 
@@ -423,7 +423,7 @@ int pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p);
 int
 pciopen(dev_t dev, int oflags, int devtype, struct proc *p) 
 {
-	PCIDEBUG(("pciopen ndevs: %d\n" , pci_cd.cd_ndevs));
+	DPRINTF(("pciopen ndevs: %d\n" , pci_cd.cd_ndevs));
 
 #ifndef APERTURE
 	if ((oflags & FWRITE) && securelevel > 0) {
@@ -440,7 +440,7 @@ pciopen(dev_t dev, int oflags, int devtype, struct proc *p)
 int
 pciclose(dev_t dev, int flag, int devtype, struct proc *p)
 {
-	PCIDEBUG(("pciclose\n"));
+	DPRINTF(("pciclose\n"));
 	return 0;
 }
 
@@ -455,9 +455,9 @@ pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 
 	io = (struct pci_io *)data;
 
-	PCIDEBUG(("pciioctl cmd %s", cmd == PCIOCREAD ? "pciocread" 
+	DPRINTF(("pciioctl cmd %s", cmd == PCIOCREAD ? "pciocread" 
 		  : cmd == PCIOCWRITE ? "pciocwrite" : "unknown"));
-	PCIDEBUG(("  bus %d dev %d func %d reg %x\n", io->pi_sel.pc_bus,
+	DPRINTF(("  bus %d dev %d func %d reg %x\n", io->pi_sel.pc_bus,
 		  io->pi_sel.pc_dev, io->pi_sel.pc_func, io->pi_reg));
 
 	if (io->pi_sel.pc_bus >= pci_cd.cd_ndevs) {
diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c
index 6051d25d016..c9e31d29835 100644
--- a/sys/dev/pci/pci_map.c
+++ b/sys/dev/pci/pci_map.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pci_map.c,v 1.7 2002/03/14 01:26:59 millert Exp $     */
+/*      $OpenBSD: pci_map.c,v 1.8 2003/02/28 15:14:08 mickey Exp $     */
 /*	$NetBSD: pci_map.c,v 1.7 2000/05/10 16:58:42 thorpej Exp $	*/
 
 /*-
@@ -208,7 +208,7 @@ nbsd_pci_mem_find(pc, tag, reg, type, basep, sizep, flagsp)
 			*sizep = PCI_MAPREG_MEM64_SIZE(wmask);
 	}
 	if (flagsp != 0)
-		*flagsp = PCI_MAPREG_MEM_CACHEABLE(address)
+		*flagsp = 0 /*PCI_MAPREG_MEM_CACHEABLE(address)*/
 #ifndef __OpenBSD__
 		    ? BUS_SPACE_MAP_CACHEABLE : 0
 #endif
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index b3682aa6f1b..bb288b13be4 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcivar.h,v 1.26 2002/11/19 18:40:17 jason Exp $	*/
+/*	$OpenBSD: pcivar.h,v 1.27 2003/02/28 15:14:08 mickey Exp $	*/
 /*	$NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $	*/
 
 /*
@@ -54,7 +54,7 @@ struct pcibus_attach_args;
 /*
  * Machine-dependent definitions.
  */
-#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ + __sparc64__ != 1)
+#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ + __sparc64__ + __hppa__!= 1)
 ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #endif
 #if __alpha__
@@ -75,6 +75,9 @@ ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #if __galileo__
 #include <galileo/pci/pci_machdep.h>
 #endif
+#if __hppa__
+#include <hppa/include/pci_machdep.h>
+#endif
 #if __sparc64__
 #include <sparc64/include/pci_machdep.h>
 #endif
diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c
index 9c1503eeabd..e36da14241e 100644
--- a/sys/dev/pci/puc.c
+++ b/sys/dev/pci/puc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: puc.c,v 1.7 2002/12/11 18:44:23 henning Exp $	*/
+/*	$OpenBSD: puc.c,v 1.8 2003/02/28 15:14:08 mickey Exp $	*/
 /*	$NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $	*/
 
 /*
@@ -163,7 +163,7 @@ puc_attach(parent, self, aux)
 		printf(": unknown PCI communications device\n");
 		printf("%s: compile kernel with PUC_PRINT_REGS and larger\n",
 		    sc->sc_dev.dv_xname);
-		printf("%s: mesage buffer (via 'options MSGBUFSIZE=...'),\n",
+		printf("%s: message buffer (via 'options MSGBUFSIZE=...'),\n",
 		    sc->sc_dev.dv_xname);
 		printf("%s: and report the result with sendbug(1)\n",
 		    sc->sc_dev.dv_xname);