Module Name: src
Committed By: matt
Date: Sun Jul 10 23:13:23 UTC 2011
Modified Files:
src/sys/arch/mips/adm5120: adm5120_intr.c
src/sys/arch/mips/adm5120/dev: admpci.c if_admsw.c if_admswvar.h uart.c
wdc_extio.c
src/sys/arch/mips/alchemy: au1000.c au1100.c au1500.c au1550.c
au_chipdep.c au_himem_space.c au_icu.c au_wired_space.c aubus.c
src/sys/arch/mips/alchemy/dev: auspi.c if_aumac.c
src/sys/arch/mips/alchemy/include: auvar.h
src/sys/arch/mips/atheros: ar9344.c
src/sys/arch/mips/atheros/dev: arpci.c
src/sys/arch/mips/atheros/include: ar9344reg.h
src/sys/arch/mips/bonito: bonito_iobc.c bonito_pci.c
src/sys/arch/mips/conf: files.atheros
src/sys/arch/mips/mips: bus_dma.c bus_space_alignstride_chipdep.c
in_cksum.c mips3_clock.c mips3_clockintr.c mips_softint.c
src/sys/arch/mips/rmi: rmixl_gpio.c rmixl_intr.c rmixl_obio.c
rmixl_pcie.c rmixl_pcix.c
Log Message:
Fix machine/ includes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/adm5120/adm5120_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/adm5120/dev/admpci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/adm5120/dev/if_admsw.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/if_admswvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/uart.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/adm5120/dev/wdc_extio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/alchemy/au1000.c \
src/sys/arch/mips/alchemy/au1100.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/alchemy/au1500.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/alchemy/au1550.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/alchemy/au_chipdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/alchemy/au_himem_space.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/alchemy/au_icu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/alchemy/au_wired_space.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/alchemy/aubus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/alchemy/dev/auspi.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mips/alchemy/dev/if_aumac.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/alchemy/include/auvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/ar9344.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/atheros/dev/arpci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/atheros/include/ar9344reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/bonito/bonito_iobc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/bonito/bonito_pci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/conf/files.atheros
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/mips/bus_dma.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c \
src/sys/arch/mips/mips/in_cksum.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/mips/mips3_clock.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/mips/mips3_clockintr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/rmi/rmixl_gpio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_obio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/rmi/rmixl_pcix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/adm5120/adm5120_intr.c
diff -u src/sys/arch/mips/adm5120/adm5120_intr.c:1.5 src/sys/arch/mips/adm5120/adm5120_intr.c:1.6
--- src/sys/arch/mips/adm5120/adm5120_intr.c:1.5 Fri Jul 1 18:38:48 2011
+++ src/sys/arch/mips/adm5120/adm5120_intr.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
+/* $NetBSD: adm5120_intr.c,v 1.6 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -67,20 +67,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.6 2011/07/10 23:13:23 matt Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
#include <sys/param.h>
-#include <sys/queue.h>
+#include <sys/intr.h>
#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
#include <mips/locore.h>
#include <mips/adm5120/include/adm5120reg.h>
Index: src/sys/arch/mips/adm5120/dev/admpci.c
diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.7 src/sys/arch/mips/adm5120/dev/admpci.c:1.8
--- src/sys/arch/mips/adm5120/dev/admpci.c:1.7 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/admpci.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
+/* $NetBSD: admpci.c,v 1.8 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,9 +61,12 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.8 2011/07/10 23:13:23 matt Exp $");
#include <sys/types.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
@@ -74,10 +77,6 @@
#include <uvm/uvm_extern.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/pte.h>
-
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pciconf.h>
@@ -86,6 +85,8 @@
#include <mips/cache.h>
#endif
+#include <mips/pte.h>
+
#include <mips/adm5120/include/adm5120_mainbusvar.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120var.h>
@@ -114,7 +115,7 @@
#define ADMPCI_MAX_DEVICE
struct admpci_softc {
- struct device sc_dev;
+ device_t sc_dev;
struct mips_pci_chipset sc_pc;
bus_space_tag_t sc_memt;
@@ -125,11 +126,11 @@
bus_space_handle_t sc_datah;
};
-int admpcimatch(struct device *, struct cfdata *, void *);
-void admpciattach(struct device *, struct device *, void *);
+int admpcimatch(device_t, cfdata_t, void *);
+void admpciattach(device_t, device_t, void *);
#if NPCI > 0
-static void admpci_attach_hook(struct device *, struct device *,
+static void admpci_attach_hook(device_t, device_t,
struct pcibus_attach_args *);
static int admpci_bus_maxdevs(void *, int);
static pcitag_t admpci_make_tag(void *, int, int, int);
@@ -150,7 +151,7 @@
#endif /* NPCI > 0 */
-CFATTACH_DECL(admpci, sizeof(struct admpci_softc),
+CFATTACH_DECL_NEW(admpci, sizeof(struct admpci_softc),
admpcimatch, admpciattach, NULL, NULL);
int admpci_found = 0;
@@ -166,7 +167,7 @@
#endif
int
-admpcimatch(struct device *parent, struct cfdata *match, void *aux)
+admpcimatch(device_t parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = (struct mainbus_attach_args *)aux;
@@ -174,10 +175,10 @@
}
void
-admpciattach(struct device *parent, struct device *self, void *aux)
+admpciattach(device_t parent, device_t self, void *aux)
{
struct adm5120_config *admc = &adm5120_configuration;
- struct admpci_softc *sc = (struct admpci_softc *)self;
+ struct admpci_softc *sc = device_private(self);
struct mainbus_attach_args *ma = (struct mainbus_attach_args *)aux;
#if NPCI > 0
u_long result;
@@ -187,24 +188,24 @@
admpci_found = 1;
+ sc->sc_dev = self;
sc->sc_conft = ma->ma_obiot;
if (bus_space_map(sc->sc_conft, ADM5120_BASE_PCI_CONFDATA, 4, 0,
&sc->sc_datah) != 0) {
- printf(
- "\n%s: unable to map PCI Configuration Data register\n",
- device_xname(&sc->sc_dev));
+ aprint_error(
+ ": unable to map PCI Configuration Data register\n");
return;
}
if (bus_space_map(sc->sc_conft, ADM5120_BASE_PCI_CONFADDR, 4, 0,
&sc->sc_addrh) != 0) {
- printf(
- "\n%s: unable to map PCI Configuration Address register\n",
- device_xname(&sc->sc_dev));
+ aprint_error(
+ ": unable to map PCI Configuration Address register\n");
return;
}
- printf(": ADM5120 Host-PCI Bridge, data %"PRIxBSH" addr %"PRIxBSH", sc %p\n",
- sc->sc_datah, sc->sc_addrh, (void *)sc);
+ aprint_normal(": ADM5120 Host-PCI Bridge, "
+ "data %"PRIxBSH" addr %"PRIxBSH", sc %p\n",
+ sc->sc_datah, sc->sc_addrh, sc);
#if NPCI > 0
sc->sc_memt = &admc->pcimem_space;
@@ -271,7 +272,7 @@
#if NPCI > 0
void
-admpci_attach_hook(struct device *parent, struct device *self,
+admpci_attach_hook(device_t parent, device_t self,
struct pcibus_attach_args *pba)
{
}
Index: src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.9 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.10
--- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.9 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $ */
+/* $NetBSD: if_admsw.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,20 +76,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.10 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
+#include <sys/device.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <sys/intr.h>
+#include <sys/ioctl.h>
#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/queue.h>
+#include <sys/systm.h>
#include <prop/proplib.h>
@@ -102,10 +104,6 @@
#include <net/bpf.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-#include <machine/endian.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/mips/adm5120/dev/if_admswvar.h
diff -u src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.3 src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.4
--- src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.3 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/if_admswvar.h Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
+/* $NetBSD: if_admswvar.h,v 1.4 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -34,19 +34,21 @@
#define _IF_ADMSWVAR_H_
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.4 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
+#include <sys/device.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <sys/intr.h>
+#include <sys/ioctl.h>
#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/queue.h>
+#include <sys/systm.h>
#include <sys/wdog.h>
#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
@@ -56,10 +58,6 @@
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-#include <machine/endian.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/mips/adm5120/dev/uart.c
diff -u src/sys/arch/mips/adm5120/dev/uart.c:1.8 src/sys/arch/mips/adm5120/dev/uart.c:1.9
--- src/sys/arch/mips/adm5120/dev/uart.c:1.8 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/uart.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $ */
+/* $NetBSD: uart.c,v 1.9 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -32,30 +32,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.9 2011/07/10 23:13:23 matt Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
-
-#include <sys/proc.h>
-#include <sys/buf.h>
#include <sys/ioctl.h>
+#include <sys/intr.h>
#include <sys/kauth.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
#include <sys/tty.h>
-#include <sys/file.h>
-#include <sys/conf.h>
-#include <sys/vnode.h>
-#include <machine/intr.h>
-#include <sys/bus.h>
+#include <dev/cons.h>
#include <mips/adm5120/include/adm5120var.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
-#include <dev/cons.h>
#include <mips/adm5120/dev/uart.h>
#define REG_READ(o) bus_space_read_4(sc->sc_st, sc->sc_ioh, (o))
@@ -63,8 +56,6 @@
cons_decl(uart_);
-extern struct consdev *cn_tab; /* physical console device info */
-
dev_type_open(uart_open);
dev_type_open(uart_close);
dev_type_read(uart_read);
@@ -75,75 +66,76 @@
dev_type_stop(uart_stop);
const struct cdevsw uart_cdevsw = {
- uart_open, uart_close, uart_read, uart_write, uart_ioctl,
- uart_stop, uart_tty, uart_poll, nommap, ttykqfilter, D_TTY
+ uart_open, uart_close, uart_read, uart_write, uart_ioctl,
+ uart_stop, uart_tty, uart_poll, nommap, ttykqfilter, D_TTY
};
-
struct consdev uartcons = {
- NULL, NULL, uart_cngetc, uart_cnputc, uart_cnpollc, NULL, NULL, NULL,
- NODEV, CN_NORMAL
+ .cn_getc = uart_cngetc,
+ .cn_putc = uart_cnputc,
+ .cn_pollc = uart_cnpollc,
+ .cn_dev = NODEV,
+ .cn_pri = CN_NORMAL
};
struct uart_softc {
- struct device sc_dev;
- struct tty *sc_tty;
+ device_t sc_dev;
+ struct tty * sc_tty;
- bus_space_tag_t sc_st;
- bus_space_handle_t sc_ioh;
- void *sc_ih;
+ bus_space_tag_t sc_st;
+ bus_space_handle_t sc_ioh;
+ void * sc_ih;
};
extern struct cfdriver uart_cd;
static int uart_consattached;
-static int uart_probe (struct device *, struct cfdata *, void *);
-static void uart_attach (struct device *, struct device *, void *);
+static int uart_probe (device_t, cfdata_t, void *);
+static void uart_attach (device_t, device_t, void *);
void uart_start(struct tty *);
int uart_param(struct tty *, struct termios *);
int uart_intr(void *);
-CFATTACH_DECL(uart, sizeof(struct uart_softc),
+CFATTACH_DECL_NEW(uart, sizeof(struct uart_softc),
uart_probe, uart_attach, NULL, NULL);
static int
-uart_probe(struct device *parent, struct cfdata *cf, void *aux)
+uart_probe(device_t parent, cfdata_t cf, void *aux)
{
- struct obio_attach_args *aa = aux;
+ struct obio_attach_args * const oba = aux;
- if (strcmp(aa->oba_name, cf->cf_name) == 0)
+ if (strcmp(oba->oba_name, cf->cf_name) == 0)
return (1);
return (0);
}
static void
-uart_attach(struct device *parent, struct device *self, void *aux)
+uart_attach(device_t parent, device_t self, void *aux)
{
- struct obio_attach_args *oba = aux;
- struct uart_softc *sc = (struct uart_softc *)self;
+ struct obio_attach_args * const oba = aux;
+ struct uart_softc * const sc = device_private(self);
struct tty *tp;
int maj, minor;
-
+
+ sc->sc_dev = self;
sc->sc_st = oba->oba_st;
- if (bus_space_map(oba->oba_st, oba->oba_addr, 256, 0,
- &sc->sc_ioh)) {
- printf("%s: unable to map device\n", sc->sc_dev.dv_xname);
+ if (bus_space_map(oba->oba_st, oba->oba_addr, 256, 0, &sc->sc_ioh)) {
+ aprint_error("unable to map device\n");
return;
}
/* Establish the interrupt. */
sc->sc_ih = adm5120_intr_establish(oba->oba_irq, INTR_FIQ, uart_intr, sc);
if (sc->sc_ih == NULL) {
- printf("%s: unable to establish interrupt\n",
- sc->sc_dev.dv_xname);
+ aprint_error("unable to establish interrupt\n");
return;
}
REG_WRITE(UART_CR_REG,UART_CR_PORT_EN|UART_CR_RX_INT_EN|UART_CR_RX_TIMEOUT_INT_EN);
maj = cdevsw_lookup_major(&uart_cdevsw);
- minor = sc->sc_dev.dv_unit;
+ minor = device_unit(sc->sc_dev);
tp = tty_alloc();
tp->t_oproc = uart_start;
@@ -154,9 +146,9 @@
if (minor == 0 && uart_consattached) {
/* attach as console*/
cn_tab->cn_dev = tp->t_dev;
- printf(" console");
+ aprint_normal(" console");
}
- printf("\n");
+ aprint_normal("\n");
}
int
@@ -172,14 +164,16 @@
{
char chr;
chr = c;
- while ((*((volatile unsigned long *)0xb2600018)) & 0x20) ;
+ while ((*((volatile unsigned long *)0xb2600018)) & 0x20)
+ continue;
(*((volatile unsigned long *)0xb2600000)) = c;
}
int
uart_cngetc(dev_t dev)
{
- while ((*((volatile unsigned long *)0xb2600018)) & 0x10) ;
+ while ((*((volatile unsigned long *)0xb2600018)) & 0x10)
+ continue;
return (*((volatile unsigned long *)0xb2600000)) & 0xff;
}
Index: src/sys/arch/mips/adm5120/dev/wdc_extio.c
diff -u src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.4 src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.5
--- src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.4 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/wdc_extio.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
+/* $NetBSD: wdc_extio.c,v 1.5 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,19 +61,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.5 2011/07/10 23:13:23 matt Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/callout.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/callout.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
-#include <machine/cpu.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <mips/adm5120/include/adm5120_extiovar.h>
Index: src/sys/arch/mips/alchemy/au1000.c
diff -u src/sys/arch/mips/alchemy/au1000.c:1.9 src/sys/arch/mips/alchemy/au1000.c:1.10
--- src/sys/arch/mips/alchemy/au1000.c:1.9 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au1000.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1000.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au1000.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -101,11 +101,11 @@
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
-static const char *au1000_irqnames[] = {
+static const char * const au1000_irqnames[] = {
"uart0",
"uart1",
"uart2",
Index: src/sys/arch/mips/alchemy/au1100.c
diff -u src/sys/arch/mips/alchemy/au1100.c:1.9 src/sys/arch/mips/alchemy/au1100.c:1.10
--- src/sys/arch/mips/alchemy/au1100.c:1.9 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au1100.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,15 +97,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
-static const char *au1100_irqnames[] = {
+static const char * const au1100_irqnames[] = {
"uart0",
"uart1",
"sdcard",
Index: src/sys/arch/mips/alchemy/au1500.c
diff -u src/sys/arch/mips/alchemy/au1500.c:1.10 src/sys/arch/mips/alchemy/au1500.c:1.11
--- src/sys/arch/mips/alchemy/au1500.c:1.10 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au1500.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,15 +97,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
-static const char *au1500_irqnames[] = {
+static const char * const au1500_irqnames[] = {
"uart0",
"pci inta",
"pci intb",
Index: src/sys/arch/mips/alchemy/au1550.c
diff -u src/sys/arch/mips/alchemy/au1550.c:1.13 src/sys/arch/mips/alchemy/au1550.c:1.14
--- src/sys/arch/mips/alchemy/au1550.c:1.13 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au1550.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,15 +97,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
-static const char *au1550_irqnames[] = {
+static const char * const au1550_irqnames[] = {
"uart0",
"pci inta",
"pci intb",
Index: src/sys/arch/mips/alchemy/au_chipdep.c
diff -u src/sys/arch/mips/alchemy/au_chipdep.c:1.3 src/sys/arch/mips/alchemy/au_chipdep.c:1.4
--- src/sys/arch/mips/alchemy/au_chipdep.c:1.3 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au_chipdep.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au_chipdep.c,v 1.4 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.4 2011/07/10 23:13:23 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au_himem_space.c
diff -u src/sys/arch/mips/alchemy/au_himem_space.c:1.12 src/sys/arch/mips/alchemy/au_himem_space.c:1.13
--- src/sys/arch/mips/alchemy/au_himem_space.c:1.12 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au_himem_space.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au_himem_space.c,v 1.13 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.13 2011/07/10 23:13:23 matt Exp $");
/*
* This provides mappings for the upper I/O regions used on some
@@ -78,7 +78,7 @@
#include <uvm/uvm.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/au_himem_space.h>
#define TRUNC_PAGE(x) ((x) & ~(PAGE_SIZE - 1))
Index: src/sys/arch/mips/alchemy/au_icu.c
diff -u src/sys/arch/mips/alchemy/au_icu.c:1.27 src/sys/arch/mips/alchemy/au_icu.c:1.28
--- src/sys/arch/mips/alchemy/au_icu.c:1.27 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au_icu.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au_icu.c,v 1.28 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -68,20 +68,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.28 2011/07/10 23:13:23 matt Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
Index: src/sys/arch/mips/alchemy/au_wired_space.c
diff -u src/sys/arch/mips/alchemy/au_wired_space.c:1.7 src/sys/arch/mips/alchemy/au_wired_space.c:1.8
--- src/sys/arch/mips/alchemy/au_wired_space.c:1.7 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/au_wired_space.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: au_wired_space.c,v 1.8 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.8 2011/07/10 23:13:23 matt Exp $");
/*
* This provides mappings for the upper I/O regions used on some
@@ -76,7 +76,7 @@
#include <sys/endian.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <machine/wired_map.h>
#include <mips/alchemy/include/au_wired_space.h>
Index: src/sys/arch/mips/alchemy/aubus.c
diff -u src/sys/arch/mips/alchemy/aubus.c:1.22 src/sys/arch/mips/alchemy/aubus.c:1.23
--- src/sys/arch/mips/alchemy/aubus.c:1.22 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/aubus.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: aubus.c,v 1.23 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,24 +97,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.23 2011/07/10 23:13:23 matt Exp $");
#include "locators.h"
+#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/systm.h>
-#define _MIPS_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
#include <mips/alchemy/include/aubusvar.h>
-static int aubus_match(device_t, struct cfdata *, void *);
+static int aubus_match(device_t, cfdata_t, void *);
static void aubus_attach(device_t, device_t, void *);
static int aubus_print(void *, const char *);
@@ -132,7 +132,7 @@
* Probe for the aubus; always succeeds.
*/
static int
-aubus_match(device_t parent, struct cfdata *match, void *aux)
+aubus_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
@@ -145,7 +145,7 @@
aubus_attach(device_t parent, device_t self, void *aux)
{
struct aubus_attach_args aa;
- struct device *sc = self;
+ device_t sc = self;
struct au_chipdep *chip;
const struct au_dev *ad;
int locs[AUBUSCF_NLOCS];
Index: src/sys/arch/mips/alchemy/dev/auspi.c
diff -u src/sys/arch/mips/alchemy/dev/auspi.c:1.5 src/sys/arch/mips/alchemy/dev/auspi.c:1.6
--- src/sys/arch/mips/alchemy/dev/auspi.c:1.5 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/dev/auspi.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: auspi.c,v 1.6 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,19 +42,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.6 2011/07/10 23:13:23 matt Exp $");
#include "locators.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/errno.h>
+#include <sys/kernel.h>
#include <sys/proc.h>
-
-#include <sys/bus.h>
-#include <machine/cpu.h>
+#include <sys/systm.h>
#include <mips/alchemy/include/aubusvar.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/dev/if_aumac.c
diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.30 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.31
--- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.30 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/dev/if_aumac.c Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: if_aumac.c,v 1.31 2011/07/10 23:13:23 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,21 +46,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.31 2011/07/10 23:13:23 matt Exp $");
#include "rnd.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/callout.h>
+#include <sys/device.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <sys/intr.h>
+#include <sys/ioctl.h>
+#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
-#include <sys/kernel.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/queue.h>
#include <uvm/uvm.h> /* for PAGE_SIZE */
@@ -74,10 +75,6 @@
#include <sys/rnd.h>
#endif
-#include <sys/bus.h>
-#include <machine/intr.h>
-#include <machine/endian.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/mips/alchemy/include/auvar.h
diff -u src/sys/arch/mips/alchemy/include/auvar.h:1.10 src/sys/arch/mips/alchemy/include/auvar.h:1.11
--- src/sys/arch/mips/alchemy/include/auvar.h:1.10 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/include/auvar.h Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auvar.h,v 1.10 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: auvar.h,v 1.11 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -81,7 +81,7 @@
const char *name;
bus_addr_t icus[2]; /* in case it ever changes */
struct au_dev *devices;
- const char **irqnames;
+ const char * const *irqnames;
};
struct au_chipdep *au_chipdep(void);
Index: src/sys/arch/mips/atheros/ar9344.c
diff -u src/sys/arch/mips/atheros/ar9344.c:1.2 src/sys/arch/mips/atheros/ar9344.c:1.3
--- src/sys/arch/mips/atheros/ar9344.c:1.2 Sun Jul 10 06:26:02 2011
+++ src/sys/arch/mips/atheros/ar9344.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ar9344.c,v 1.2 2011/07/10 06:26:02 matt Exp $ */
+/* $NetBSD: ar9344.c,v 1.3 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -48,7 +48,7 @@
* family.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar9344.c,v 1.2 2011/07/10 06:26:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar9344.c,v 1.3 2011/07/10 23:13:22 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -413,7 +413,7 @@
.adv_cirq = ARCHIP_CPU_IRQ_GMAC1,
.adv_mirq = -1,
}, {
- .adv_name = "pcierc",
+ .adv_name = "arpcie",
.adv_addr = AR9344_PCIE_RC_BASE,
.adv_size = 0x1000,
.adv_cirq = AR9344_CPU_IRQ_PCIERC,
Index: src/sys/arch/mips/atheros/dev/arpci.c
diff -u src/sys/arch/mips/atheros/dev/arpci.c:1.1 src/sys/arch/mips/atheros/dev/arpci.c:1.2
--- src/sys/arch/mips/atheros/dev/arpci.c:1.1 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/mips/atheros/dev/arpci.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arpci.c,v 1.1 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: arpci.c,v 1.2 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.1 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.2 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -51,6 +51,7 @@
bus_space_handle_t sc_bsh;
struct mips_bus_space sc_memt;
struct mips_pci_chipset sc_pc;
+ bool sc_pcie;
u_int sc_pba_flags;
};
@@ -65,10 +66,10 @@
static int
arpci_bus_maxdevs(void *v, int busno)
{
- //struct arpci_softc * const sc = v;
+ struct arpci_softc * const sc = v;
if (busno == 0)
- return 22;
+ return (sc->sc_pcie ? 1 : 22);
return 32;
}
@@ -152,7 +153,7 @@
bus_space_write_4(sc->sc_bst, sc->sc_bsh,
AR7100_PCI_LCL_CFG_CMD, AR7100_PCI_LCL_CFG_CMD_READ | tag);
addr += AR7100_PCI_LCL_CFG_RDATA;
- printf("%s: tag %#lx ", __func__, tag);
+ printf("%s: tag %#lx: ", __func__, tag);
} else {
bus_space_write_4(sc->sc_bst, sc->sc_bsh,
AR7100_PCI_CFG_ADDR, tag);
@@ -287,6 +288,7 @@
sc->sc_dev = self;
sc->sc_bst = aa->aa_bst;
sc->sc_dmat = aa->aa_dmat;
+ sc->sc_pcie = (strcmp(device_cfdata(self)->cf_name, "arpcie") == 0);
if (bus_space_map(aa->aa_bst, aa->aa_addr, aa->aa_size, 0,
&sc->sc_bsh)) {
@@ -294,7 +296,7 @@
return;
}
- aprint_normal("\n");
+ aprint_normal(": PCI%s bus\n", (sc->sc_pcie ? "-Express x1" : ""));
arpci_bus_mem_init(&sc->sc_memt, sc);
arpci_chipset_init(sc);
@@ -315,6 +317,8 @@
CFATTACH_DECL_NEW(arpci, sizeof(struct arpci_softc),
arpci_match, arpci_attach, NULL, NULL);
+CFATTACH_DECL_NEW(arpcie, sizeof(struct arpci_softc),
+ arpci_match, arpci_attach, NULL, NULL);
#define CHIP arpci
#define CHIP_LITTLE_ENDIAN /* defined */
Index: src/sys/arch/mips/atheros/include/ar9344reg.h
diff -u src/sys/arch/mips/atheros/include/ar9344reg.h:1.1 src/sys/arch/mips/atheros/include/ar9344reg.h:1.2
--- src/sys/arch/mips/atheros/include/ar9344reg.h:1.1 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/mips/atheros/include/ar9344reg.h Sun Jul 10 23:13:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ar9344reg.h,v 1.1 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: ar9344reg.h,v 1.2 2011/07/10 23:13:23 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -52,7 +52,8 @@
#define AR9344_SLIC_BASE 0x180A9000
#define AR9344_STEREO_BASE 0x180B0000
#define AR9344_MDIO_BASE 0x180B8000
-#define AR9344_PCIE_RC_BASE 0x180F0000
+#define AR9344_PCIE_RC_BASE 0x180C0000
+#define AR9344_PCIE_RC_BASE2 0x180F0000
#define AR9344_WDMA_BASE 0x18100000
#define AR9344_RTC_BASE 0x18107000
#define AR9344_UART1_BASE 0x18150000 /* high speed */
Index: src/sys/arch/mips/bonito/bonito_iobc.c
diff -u src/sys/arch/mips/bonito/bonito_iobc.c:1.4 src/sys/arch/mips/bonito/bonito_iobc.c:1.5
--- src/sys/arch/mips/bonito/bonito_iobc.c:1.4 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mips/bonito/bonito_iobc.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_iobc.c,v 1.4 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: bonito_iobc.c,v 1.5 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,12 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_iobc.c,v 1.4 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_iobc.c,v 1.5 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
+#include <sys/intr.h>
-#include <machine/locore.h>
-#include <machine/intr.h>
+#include <mips/locore.h>
#include <mips/bonito/bonitoreg.h>
#include <mips/bonito/bonitovar.h>
Index: src/sys/arch/mips/bonito/bonito_pci.c
diff -u src/sys/arch/mips/bonito/bonito_pci.c:1.8 src/sys/arch/mips/bonito/bonito_pci.c:1.9
--- src/sys/arch/mips/bonito/bonito_pci.c:1.8 Fri Jul 1 20:48:47 2011
+++ src/sys/arch/mips/bonito/bonito_pci.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $ */
+/* $NetBSD: bonito_pci.c,v 1.9 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,15 +35,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.9 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/mips/conf/files.atheros
diff -u src/sys/arch/mips/conf/files.atheros:1.9 src/sys/arch/mips/conf/files.atheros:1.10
--- src/sys/arch/mips/conf/files.atheros:1.9 Thu Jul 7 05:06:45 2011
+++ src/sys/arch/mips/conf/files.atheros Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.atheros,v 1.9 2011/07/07 05:06:45 matt Exp $
+# $NetBSD: files.atheros,v 1.10 2011/07/10 23:13:22 matt Exp $
defflag opt_wisoc.h WISOC_AR5312 WISOC_AR5315 WISOC_AR7100 WISOC_AR9344
@@ -19,6 +19,7 @@
device arbus { [addr=-1] }
attach arbus at mainbus
file arch/mips/atheros/arbus.c arbus
+file arch/mips/atheros/arbusle.c arbus
# On-chip UART device
attach com at arbus with com_arbus
@@ -51,8 +52,10 @@
# On-chip PCI controller
device arpci: pcibus
+device arpcie: pcibus
attach arpci at arbus
-file arch/mips/atheros/dev/arpci.c arpci
+attach arpcie at arbus
+file arch/mips/atheros/dev/arpci.c arpci | arpcie
# On-chip OHCI USB controller
attach ohci at arbus with ohci_arbus
Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.26 src/sys/arch/mips/mips/bus_dma.c:1.27
--- src/sys/arch/mips/mips/bus_dma.c:1.26 Fri Jul 1 20:58:39 2011
+++ src/sys/arch/mips/mips/bus_dma.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $ */
+/* $NetBSD: bus_dma.c,v 1.27 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,16 +32,20 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.27 2011/07/10 23:13:22 matt Exp $");
+
+#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/evcnt.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <sys/evcnt.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
#include <uvm/uvm.h>
@@ -50,10 +54,7 @@
#include <mips/mips3_pte.h>
#endif
-#define _MIPS_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
const struct mips_bus_dmamap_ops mips_bus_dmamap_ops = _BUS_DMAMAP_OPS_INITIALIZER;
const struct mips_bus_dmamem_ops mips_bus_dmamem_ops = _BUS_DMAMEM_OPS_INITIALIZER;
Index: src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.14 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.15
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.14 Wed Jul 6 10:01:02 2011
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.14 2011/07/06 10:01:02 matt Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.15 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,14 +81,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.14 2011/07/06 10:01:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.15 2011/07/10 23:13:22 matt Exp $");
#ifdef CHIP_EXTENT
#include <sys/extent.h>
#endif
#include <sys/malloc.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/mips/mips/in_cksum.c
diff -u src/sys/arch/mips/mips/in_cksum.c:1.14 src/sys/arch/mips/mips/in_cksum.c:1.15
--- src/sys/arch/mips/mips/in_cksum.c:1.14 Sat Sep 18 16:43:50 2010
+++ src/sys/arch/mips/mips/in_cksum.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in_cksum.c,v 1.14 2010/09/18 16:43:50 tsutsui Exp $ */
+/* $NetBSD: in_cksum.c,v 1.15 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 1993 Regents of the University of California.
@@ -42,18 +42,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.14 2010/09/18 16:43:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.15 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/endian.h>
#include <sys/mbuf.h>
+#include <sys/systm.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
-#include <machine/endian.h>
union memptr {
uint32_t *l;
Index: src/sys/arch/mips/mips/mips3_clock.c
diff -u src/sys/arch/mips/mips/mips3_clock.c:1.12 src/sys/arch/mips/mips/mips3_clock.c:1.13
--- src/sys/arch/mips/mips/mips3_clock.c:1.12 Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/mips3_clock.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips3_clock.c,v 1.12 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: mips3_clock.c,v 1.13 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,18 +40,17 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips3_clock.c,v 1.12 2011/02/20 07:45:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips3_clock.c,v 1.13 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/timetc.h>
-#include <sys/cpu.h>
#include <mips/mips3_clock.h>
-#include <machine/intr.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
/*
* Wait for at least "n" microseconds.
Index: src/sys/arch/mips/mips/mips3_clockintr.c
diff -u src/sys/arch/mips/mips/mips3_clockintr.c:1.11 src/sys/arch/mips/mips/mips3_clockintr.c:1.12
--- src/sys/arch/mips/mips/mips3_clockintr.c:1.11 Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/mips3_clockintr.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips3_clockintr.c,v 1.11 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: mips3_clockintr.c,v 1.12 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,17 +39,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips3_clockintr.c,v 1.11 2011/02/20 07:45:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips3_clockintr.c,v 1.12 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/cpu.h>
#include <sys/evcnt.h>
#include <sys/intr.h>
#include <mips/mips3_clock.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
/*
* Handling to be done upon receipt of a MIPS 3 clock interrupt. This
Index: src/sys/arch/mips/mips/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.4 src/sys/arch/mips/mips/mips_softint.c:1.5
--- src/sys/arch/mips/mips/mips_softint.c:1.4 Wed Apr 6 05:23:59 2011
+++ src/sys/arch/mips/mips/mips_softint.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_softint.c,v 1.4 2011/04/06 05:23:59 matt Exp $ */
+/* $NetBSD: mips_softint.c,v 1.5 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -30,18 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.4 2011/04/06 05:23:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.5 2011/07/10 23:13:22 matt Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
-#include <sys/proc.h>
-#include <sys/lwp.h>
#include <sys/intr.h>
+#include <sys/lwp.h>
#include <sys/atomic.h>
#include <uvm/uvm_extern.h>
-#include <machine/intr.h>
#include <mips/locore.h>
#ifdef __HAVE_FAST_SOFTINTS
Index: src/sys/arch/mips/rmi/rmixl_gpio.c
diff -u src/sys/arch/mips/rmi/rmixl_gpio.c:1.2 src/sys/arch/mips/rmi/rmixl_gpio.c:1.3
--- src/sys/arch/mips/rmi/rmixl_gpio.c:1.2 Fri Jul 1 19:01:30 2011
+++ src/sys/arch/mips/rmi/rmixl_gpio.c Sun Jul 10 23:13:22 2011
@@ -1,5 +1,5 @@
-/* $NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $ */
-/* $NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.3 2011/07/10 23:13:22 matt Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.3 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.3 2011/07/10 23:13:22 matt Exp $");
#define _INTR_PRIVATE
@@ -37,17 +37,14 @@
#include "gpio.h"
#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/evcnt.h>
+#include <sys/intr.h>
#include <sys/atomic.h>
#include <uvm/uvm_extern.h>
-#include <machine/intr.h>
-
-#include <mips/cpu.h>
-
-#include <sys/bus.h>
-
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
#include <mips/rmi/rmixl_obiovar.h>
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.6 src/sys/arch/mips/rmi/rmixl_intr.c:1.7
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.6 Fri Jul 1 19:01:30 2011
+++ src/sys/arch/mips/rmi/rmixl_intr.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.6 2011/07/01 19:01:30 dyoung Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.7 2011/07/10 23:13:22 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,26 +64,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.6 2011/07/01 19:01:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.7 2011/07/10 23:13:22 matt Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#define __INTR_PRIVATE
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
+#include <sys/atomic.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/atomic.h>
+#include <sys/malloc.h>
#include <sys/mutex.h>
-#include <sys/cpu.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/systm.h>
-#include <mips/cpu.h>
#include <mips/cpuset.h>
#include <mips/locore.h>
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.4 src/sys/arch/mips/rmi/rmixl_obio.c:1.5
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.4 Fri Jul 1 19:01:31 2011
+++ src/sys/arch/mips/rmi/rmixl_obio.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.5 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,21 +40,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.5 2011/07/10 23:13:22 matt Exp $");
#include "locators.h"
#include "pci.h"
+#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/systm.h>
-#define _MIPS_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-
-#include <machine/int_fmtio.h>
+#include <mips/int_fmtio.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.7 src/sys/arch/mips/rmi/rmixl_pcie.c:1.8
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.7 Fri Jul 1 19:01:31 2011
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.8 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.8 2011/07/10 23:13:22 matt Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -48,18 +48,17 @@
#include <sys/cdefs.h>
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/intr.h>
#include <sys/kernel.h> /* for 'hz' */
-#include <sys/cpu.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
#include <mips/rmi/rmixl_intr.h>
@@ -75,8 +74,6 @@
#include <mips/cache.h>
#endif
-#include <machine/pci_machdep.h>
-
#ifdef PCI_DEBUG
int rmixl_pcie_debug = PCI_DEBUG;
# define DPRINTF(x) do { if (rmixl_pcie_debug) printf x ; } while (0)
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.8 src/sys/arch/mips/rmi/rmixl_pcix.c:1.9
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.8 Fri Jul 1 19:01:31 2011
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Sun Jul 10 23:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.8 2011/07/01 19:01:31 dyoung Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.9 2011/07/10 23:13:22 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.8 2011/07/01 19:01:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.9 2011/07/10 23:13:22 matt Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -48,18 +48,17 @@
#include <sys/cdefs.h>
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/extent.h>
+#include <sys/intr.h>
#include <sys/malloc.h>
#include <sys/kernel.h> /* for 'hz' */
-#include <sys/cpu.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
#include <mips/rmi/rmixl_intr.h>
@@ -75,8 +74,6 @@
#include <mips/cache.h>
#endif
-#include <machine/pci_machdep.h>
-
#ifdef PCI_DEBUG
int rmixl_pcix_debug = PCI_DEBUG;
# define DPRINTF(x) do { if (rmixl_pcix_debug) printf x ; } while (0)
