diff options
author | wpaul <wpaul@FreeBSD.org> | 1999-11-20 18:29:44 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 1999-11-20 18:29:44 +0000 |
commit | 5ade237428fc4321958da968ae369ca0efbb43a0 (patch) | |
tree | d9163b97f24bbc2b61cafd2a1de9965eb0c4cfd2 | |
parent | b5a0bd94943cb40715dd37850d2199cac15a880f (diff) | |
download | FreeBSD-src-5ade237428fc4321958da968ae369ca0efbb43a0.zip FreeBSD-src-5ade237428fc4321958da968ae369ca0efbb43a0.tar.gz |
Minor tweak: the subsystem device ID code for the quad port 62044 card
is documented to be 0x18 in the Adaptec manual, however there appears to
be a newer board rev with code 0x19. I added a #define for this and
updated the probe code so that this board will be properly identified
in the probe messages. (Currently it's just identified generically as
an AIC-6915 chip.)
-rw-r--r-- | sys/dev/sf/if_sf.c | 3 | ||||
-rw-r--r-- | sys/dev/sf/if_sfreg.h | 6 | ||||
-rw-r--r-- | sys/pci/if_sf.c | 3 | ||||
-rw-r--r-- | sys/pci/if_sfreg.h | 6 |
4 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index bc54fed..d0fb709 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -614,7 +614,8 @@ static int sf_probe(dev) "Adaptec ANA-62022 10/100BaseTX"); return(0); break; - case AD_SUBSYSID_62044: + case AD_SUBSYSID_62044_REV0: + case AD_SUBSYSID_62044_REV1: device_set_desc(dev, "Adaptec ANA-62044 10/100BaseTX"); return(0); diff --git a/sys/dev/sf/if_sfreg.h b/sys/dev/sf/if_sfreg.h index 58f44a7..085d7f0 100644 --- a/sys/dev/sf/if_sfreg.h +++ b/sys/dev/sf/if_sfreg.h @@ -60,11 +60,15 @@ * are six different variations. Note: the Adaptec manual lists code 0x28 * for two different NICs: the 62044 and the 69011/TX. This is a typo: * the code for the 62044 is really 0x18. + * + * Note that there also appears to be an 0x19 code for a newer rev + * 62044 card. */ #define AD_SUBSYSID_62011_REV0 0x0008 /* single port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62011_REV1 0x0009 /* single port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62022 0x0010 /* dual port 10/100baseTX 64-bit */ -#define AD_SUBSYSID_62044 0x0018 /* quad port 10/100baseTX 64-bit */ +#define AD_SUBSYSID_62044_REV0 0x0018 /* quad port 10/100baseTX 64-bit */ +#define AD_SUBSYSID_62044_REV1 0x0019 /* quad port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62020 0x0020 /* single port 10/100baseFX 64-bit */ #define AD_SUBSYSID_69011 0x0028 /* single port 10/100baseTX 32-bit */ diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index bc54fed..d0fb709 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -614,7 +614,8 @@ static int sf_probe(dev) "Adaptec ANA-62022 10/100BaseTX"); return(0); break; - case AD_SUBSYSID_62044: + case AD_SUBSYSID_62044_REV0: + case AD_SUBSYSID_62044_REV1: device_set_desc(dev, "Adaptec ANA-62044 10/100BaseTX"); return(0); diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h index 58f44a7..085d7f0 100644 --- a/sys/pci/if_sfreg.h +++ b/sys/pci/if_sfreg.h @@ -60,11 +60,15 @@ * are six different variations. Note: the Adaptec manual lists code 0x28 * for two different NICs: the 62044 and the 69011/TX. This is a typo: * the code for the 62044 is really 0x18. + * + * Note that there also appears to be an 0x19 code for a newer rev + * 62044 card. */ #define AD_SUBSYSID_62011_REV0 0x0008 /* single port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62011_REV1 0x0009 /* single port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62022 0x0010 /* dual port 10/100baseTX 64-bit */ -#define AD_SUBSYSID_62044 0x0018 /* quad port 10/100baseTX 64-bit */ +#define AD_SUBSYSID_62044_REV0 0x0018 /* quad port 10/100baseTX 64-bit */ +#define AD_SUBSYSID_62044_REV1 0x0019 /* quad port 10/100baseTX 64-bit */ #define AD_SUBSYSID_62020 0x0020 /* single port 10/100baseFX 64-bit */ #define AD_SUBSYSID_69011 0x0028 /* single port 10/100baseTX 32-bit */ |