From 317f436475269bd265ea61bfdc0e38cb1b41f432 Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 5 Aug 2002 07:24:02 +0000 Subject: Differentiate between AT45DB011 compatible large serial flash parts and the AT24C08 small serial flash parts. We still report these as the same part (since we group things already), but now we recognize the small serial versions as well. --- sys/dev/wi/if_wi.c | 13 ++++++++++--- sys/dev/wi/if_wireg.h | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index ba18f2e..142bef2 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -160,17 +160,24 @@ struct wi_card_ident wi_card_ident[] = { { WI_NIC_3842_EVA_ID, WI_NIC_3842_EVA_STR, WI_INTERSIL }, { WI_NIC_3842_PCMCIA_AMD_ID, WI_NIC_3842_PCMCIA_STR, WI_INTERSIL }, { WI_NIC_3842_PCMCIA_SST_ID, WI_NIC_3842_PCMCIA_STR, WI_INTERSIL }, - { WI_NIC_3842_PCMCIA_ATM_ID, WI_NIC_3842_PCMCIA_STR, WI_INTERSIL }, + { WI_NIC_3842_PCMCIA_ATL_ID, WI_NIC_3842_PCMCIA_STR, WI_INTERSIL }, + { WI_NIC_3842_PCMCIA_ATS_ID, WI_NIC_3842_PCMCIA_STR, WI_INTERSIL }, { WI_NIC_3842_MINI_AMD_ID, WI_NIC_3842_MINI_STR, WI_INTERSIL }, { WI_NIC_3842_MINI_SST_ID, WI_NIC_3842_MINI_STR, WI_INTERSIL }, - { WI_NIC_3842_MINI_ATM_ID, WI_NIC_3842_MINI_STR, WI_INTERSIL }, + { WI_NIC_3842_MINI_ATL_ID, WI_NIC_3842_MINI_STR, WI_INTERSIL }, + { WI_NIC_3842_MINI_ATS_ID, WI_NIC_3842_MINI_STR, WI_INTERSIL }, { WI_NIC_3842_PCI_AMD_ID, WI_NIC_3842_PCI_STR, WI_INTERSIL }, { WI_NIC_3842_PCI_SST_ID, WI_NIC_3842_PCI_STR, WI_INTERSIL }, - { WI_NIC_3842_PCI_ATM_ID, WI_NIC_3842_PCI_STR, WI_INTERSIL }, + { WI_NIC_3842_PCI_ATS_ID, WI_NIC_3842_PCI_STR, WI_INTERSIL }, + { WI_NIC_3842_PCI_ATL_ID, WI_NIC_3842_PCI_STR, WI_INTERSIL }, { WI_NIC_P3_PCMCIA_AMD_ID, WI_NIC_P3_PCMCIA_STR, WI_INTERSIL }, { WI_NIC_P3_PCMCIA_SST_ID, WI_NIC_P3_PCMCIA_STR, WI_INTERSIL }, + { WI_NIC_P3_PCMCIA_ATL_ID, WI_NIC_P3_PCMCIA_STR, WI_INTERSIL }, + { WI_NIC_P3_PCMCIA_ATS_ID, WI_NIC_P3_PCMCIA_STR, WI_INTERSIL }, { WI_NIC_P3_MINI_AMD_ID, WI_NIC_P3_MINI_STR, WI_INTERSIL }, { WI_NIC_P3_MINI_SST_ID, WI_NIC_P3_MINI_STR, WI_INTERSIL }, + { WI_NIC_P3_MINI_ATL_ID, WI_NIC_P3_MINI_STR, WI_INTERSIL }, + { WI_NIC_P3_MINI_ATS_ID, WI_NIC_P3_MINI_STR, WI_INTERSIL }, { 0, NULL, 0 }, }; diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h index 6ac7ca6..4ce260e 100644 --- a/sys/dev/wi/if_wireg.h +++ b/sys/dev/wi/if_wireg.h @@ -440,25 +440,32 @@ struct wi_ltv_ver { #define WI_NIC_3842_PCMCIA_AMD_ID 0x800B /* Prism2.5 PCMCIA */ #define WI_NIC_3842_PCMCIA_SST_ID 0x800C -#define WI_NIC_3842_PCMCIA_ATM_ID 0x800D +#define WI_NIC_3842_PCMCIA_ATL_ID 0x800D +#define WI_NIC_3842_PCMCIA_ATS_ID 0x800E #define WI_NIC_3842_PCMCIA_STR "RF:PRISM2.5 MAC:ISL3873" #define WI_NIC_3842_MINI_AMD_ID 0x8012 /* Prism2.5 Mini-PCI */ #define WI_NIC_3842_MINI_SST_ID 0x8013 -#define WI_NIC_3842_MINI_ATM_ID 0x8014 +#define WI_NIC_3842_MINI_ATL_ID 0x8014 +#define WI_NIC_3842_MINI_ATS_ID 0x8015 #define WI_NIC_3842_MINI_STR "RF:PRISM2.5 MAC:ISL3874A(Mini-PCI)" #define WI_NIC_3842_PCI_AMD_ID 0x8016 /* Prism2.5 PCI-bridge */ #define WI_NIC_3842_PCI_SST_ID 0x8017 -#define WI_NIC_3842_PCI_ATM_ID 0x8018 +#define WI_NIC_3842_PCI_ATL_ID 0x8018 +#define WI_NIC_3842_PCI_ATS_ID 0x8018 #define WI_NIC_3842_PCI_STR "RF:PRISM2.5 MAC:ISL3874A(PCI-bridge)" #define WI_NIC_P3_PCMCIA_AMD_ID 0x801A /* Prism3 PCMCIA */ #define WI_NIC_P3_PCMCIA_SST_ID 0x801B +#define WI_NIC_P3_PCMCIA_ATL_ID 0x801C +#define WI_NIC_P3_PCMCIA_ATS_ID 0x801D #define WI_NIC_P3_PCMCIA_STR "RF:PRISM3(PCMCIA)" #define WI_NIC_P3_MINI_AMD_ID 0x8021 /* Prism3 Mini-PCI */ #define WI_NIC_P3_MINI_SST_ID 0x8022 +#define WI_NIC_P3_MINI_ATL_ID 0x8023 +#define WI_NIC_P3_MINI_ATS_ID 0x8024 #define WI_NIC_P3_MINI_STR "RF:PRISM3(Mini-PCI)" /* -- cgit v1.1