diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 1999-06-28 19:29:10 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 1999-06-28 19:29:10 +0000 |
| commit | bae9b4043d16aaf0fdfe0451782ffb7f71bb98bd (patch) | |
| tree | 027c3c6b969998bb13d4b16cee13ad1303421276 /sys | |
| parent | 08a82ce54a50b3f2a4bf60e834a3dfe82e94937b (diff) | |
sync
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 7 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index c2d33489962..c8e67c0f862 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.154 1999/06/28 18:30:04 jason Exp + * OpenBSD: pcidevs,v 1.155 1999/06/28 19:28:36 ho Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -187,7 +187,7 @@ #define PCI_VENDOR_SYSTEMSOFT 0x108f /* Systemsoft */ #define PCI_VENDOR_ENCORE 0x1090 /* Encore Computer */ #define PCI_VENDOR_INTERGRAPH 0x1091 /* Intergraph */ -#define PCI_VENDOR_DIAMOND 0x1092 /* Diamond Computer Systems */ +#define PCI_VENDOR_DIAMOND 0x1092 /* Diamond Multimedia */ #define PCI_VENDOR_NATIONALINST 0x1093 /* National Instruments */ #define PCI_VENDOR_FICOMP 0x1094 /* First Int'l Computers */ #define PCI_VENDOR_CMDTECH 0x1095 /* CMD Technology */ @@ -508,6 +508,7 @@ #define PCI_VENDOR_ALTEON 0x12ae /* Alteon */ #define PCI_VENDOR_PICTUREEL 0x12c5 /* Picture Elements */ #define PCI_VENDOR_STB2 0x12d2 /* NVidia/SGS-Thomson */ +#define PCI_VENDOR_DIAMOND2 0x12eb /* Diamond Multimedia (2nd ID) */ #define PCI_VENDOR_LMC 0x1376 /* LAN Media Corp */ #define PCI_VENDOR_NETGEAR 0x1385 /* Netgear */ #define PCI_VENDOR_INVERTEX 0x14e1 /* Invertex */ @@ -846,6 +847,8 @@ #define PCI_PRODUCT_DIAMOND_VIPER 0x9001 /* Viper/PCI */ #define PCI_PRODUCT_DIAMOND_MONSTER 0x0001 /* Monster */ +#define PCI_PRODUCT_DIAMOND2_MX300 0x0002 /* Monster Sound MX300 */ + /* Distributed Processing Technology products */ #define PCI_PRODUCT_DPT_SC_RAID 0xa400 /* SmartCache/Raid */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index ea2092dab1f..c8f7b23b97a 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.154 1999/06/28 18:30:04 jason Exp + * OpenBSD: pcidevs,v 1.155 1999/06/28 19:28:36 ho Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -1319,16 +1319,22 @@ struct pci_knowndev pci_knowndevs[] = { { PCI_VENDOR_DIAMOND, PCI_PRODUCT_DIAMOND_VIPER, 0, - "Diamond Computer Systems", + "Diamond Multimedia", "Viper/PCI", }, { PCI_VENDOR_DIAMOND, PCI_PRODUCT_DIAMOND_MONSTER, 0, - "Diamond Computer Systems", + "Diamond Multimedia", "Monster", }, { + PCI_VENDOR_DIAMOND2, PCI_PRODUCT_DIAMOND2_MX300, + 0, + "Diamond Multimedia (2nd ID)", + "Monster Sound MX300", + }, + { PCI_VENDOR_DPT, PCI_PRODUCT_DPT_SC_RAID, 0, "DPT", @@ -4193,7 +4199,7 @@ struct pci_knowndev pci_knowndevs[] = { { PCI_VENDOR_DIAMOND, 0, PCI_KNOWNDEV_NOPROD, - "Diamond Computer Systems", + "Diamond Multimedia", NULL, }, { @@ -6117,6 +6123,12 @@ struct pci_knowndev pci_knowndevs[] = { NULL, }, { + PCI_VENDOR_DIAMOND2, 0, + PCI_KNOWNDEV_NOPROD, + "Diamond Multimedia (2nd ID)", + NULL, + }, + { PCI_VENDOR_LMC, 0, PCI_KNOWNDEV_NOPROD, "LAN Media Corp", |