diff options
| author | imp <imp@FreeBSD.org> | 2001-04-11 20:18:29 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-04-11 20:18:29 +0000 |
| commit | c9a0bb442c87ee0a7cf937ed1c3e06d16b64c00c (patch) | |
| tree | 5a5415682978b15a49e38dcdde87a59594e14d3b | |
| parent | e0d9dfbfedd05b45734092186902857c5b1c8d5b (diff) | |
| download | FreeBSD-src-c9a0bb442c87ee0a7cf937ed1c3e06d16b64c00c.zip FreeBSD-src-c9a0bb442c87ee0a7cf937ed1c3e06d16b64c00c.tar.gz | |
Add #define for IBM3765.
Fix SWAMPBOX. It had actiontec's ID.
Reorder pnpids so they are in alphabetical order.
| -rw-r--r-- | sys/dev/pcic/i82365reg.h | 6 | ||||
| -rw-r--r-- | sys/pccard/pcic.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pcic/i82365reg.h b/sys/dev/pcic/i82365reg.h index 2025ef4..fd13feb 100644 --- a/sys/dev/pcic/i82365reg.h +++ b/sys/dev/pcic/i82365reg.h @@ -352,10 +352,10 @@ #define PCIC_CIRRUS_EXT_CONTROL_1_PCI_INTR_MASK 0x18 /* Plug and play */ +#define PCIC_PNP_ACTIONTEC 0x1802A904 /* AEI0218 */ +#define PCIC_PNP_IBM3765 0x65374d24 /* IBM3765 */ #define PCIC_PNP_82365 0x000ED041 /* PNP0E00 */ #define PCIC_PNP_CL_PD6720 0x010ED041 /* PNP0E01 */ #define PCIC_PNP_VLSI_82C146 0x020ED041 /* PNP0E02 */ #define PCIC_PNP_82365_CARDBUS 0x030ED041 /* PNP0E03 */ -#define PCIC_PNP_ACTIONTEC 0x1802A904 /* AEI0218 */ -#define PCIC_PNP_SCM_SWAPBOX 0x1802A904 /* SCM0469 */ -#define PCIC_PNP_SCM_SWAPBOX2 0x69046d4c /* SCM SwapBox Classic X2P */ +#define PCIC_PNP_SCM_SWAPBOX 0x69046d4c /* SMC0469 */ diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 1b06031..82e53ad 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -79,14 +79,13 @@ static struct pcic_slot { static struct slot_ctrl cinfo; static struct isa_pnp_id pcic_ids[] = { - {0x65374d24, NULL}, /* IBM3765 */ + {PCIC_PNP_ACTIONTEC, NULL}, /* AEI0218 */ + {PCIC_PNP_IBM3765, NULL}, /* IBM3765 */ {PCIC_PNP_82365, NULL}, /* PNP0E00 */ {PCIC_PNP_CL_PD6720, NULL}, /* PNP0E01 */ {PCIC_PNP_VLSI_82C146, NULL}, /* PNP0E02 */ {PCIC_PNP_82365_CARDBUS, NULL}, /* PNP0E03 */ - {PCIC_PNP_ACTIONTEC, NULL}, /* AEI0218 */ {PCIC_PNP_SCM_SWAPBOX, NULL}, /* SCM0469 */ - {PCIC_PNP_SCM_SWAPBOX2, NULL}, /* SCM SwapBox Classic X2P */ {0} }; |
