diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2001-12-13 17:43:04 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2001-12-13 17:43:04 +0000 |
| commit | 4e3f07ad324f86676c2701793828dfe8ae87f0ae (patch) | |
| tree | b4ae6541467e0c7f7119e409ac2bcdb2287a2ec9 /sys | |
| parent | 6d8b2cf9fbe2a41e1ab80cf83e42a0802505199c (diff) | |
Fix old alpha bug recently triggered by conversion to busdma.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/dc.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/dcreg.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_dc_pci.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index 455e8121e95..2f1c367faa4 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.43 2001/12/08 04:44:37 jason Exp $ */ +/* $OpenBSD: dc.c,v 1.44 2001/12/13 17:43:02 nate Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -129,10 +129,6 @@ #include <dev/pci/pcidevs.h> #define DC_USEIOSPACE -#ifdef __alpha__ -#define SRM_MEDIA -#endif - #include <dev/ic/dcreg.h> int dc_intr __P((void *)); diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h index ccd852e5ee7..9f03cc37131 100644 --- a/sys/dev/ic/dcreg.h +++ b/sys/dev/ic/dcreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dcreg.h,v 1.20 2001/12/06 21:22:07 jason Exp $ */ +/* $OpenBSD: dcreg.h,v 1.21 2001/12/13 17:43:02 nate Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -38,6 +38,10 @@ * 21143 and clone common register definitions. */ +#ifdef __alpha__ +#define SRM_MEDIA +#endif + #define DC_BUSCTL 0x00 /* bus control */ #define DC_TXSTART 0x08 /* tx start demand */ #define DC_RXSTART 0x10 /* rx start demand */ diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index c2c66b026f9..6e8a07d8151 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.21 2001/12/06 20:12:00 jason Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.22 2001/12/13 17:43:03 nate Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -457,7 +457,7 @@ void dc_pci_attach(parent, self, aux) /* Remember the SRM console media setting */ if (DC_IS_INTEL(sc)) { - command = pci_read_config(dev, DC_PCI_CFDD, 4); + command = pci_conf_read(pc, pa->pa_tag, DC_PCI_CFDD); command &= ~(DC_CFDD_SNOOZE_MODE|DC_CFDD_SLEEP_MODE); switch ((command >> 8) & 0xff) { case 3: |