I went through Linux 2.4.0t1ac4 in search of PCI constants that are
defined by drivers and are not in pci_ids.h. Here is what I found. I
also tried to make things more consistent -- not everyone was using the
One True Way of PCI_VENDOR_ID_{V} and PCI_DEVICE_ID_{V}_{D}.
There were a few places I purposely didn't tread, because of not
knowing what was right. (Duplicate vendor IDs in HiSax, for instance.)
Also, can someone shed light on the SIS confusion? (I assume it should
be handled similar to Intel PIIX.) Finally, PCI_VENDOR_ESS_OLD isn't
really right (see comment in maestro.c).
Martin, does this look OK? If so, could you forward the right bits
(i.e. everything but HiSax) on to Linus or whoever? I hope this sort
of thing doesn't have to go through *every* driver maintainer....
Karten, could you do the same for the HiSax bits? (Though I think the
original HiSax should continue to compile with the new pci_ids.h.)
Peter
diff -urN 2.4.0test1ac4/include/linux/joystick.h~ 2.4.0test1ac4/include/linux/joystick.h
--- 2.4.0test1ac4/include/linux/joystick.h~ Mon May 29 22:13:43 2000
+++ 2.4.0test1ac4/include/linux/joystick.h Mon May 29 23:46:54 2000
@@ -152,8 +152,15 @@
#define SETUP_PARSE(x) int ints[x]; get_options(str, x, ints)
#endif
+#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_DX
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
+#endif
+
#ifndef PCI_VENDOR_ID_AUREAL
#define PCI_VENDOR_ID_AUREAL 0x12eb
+#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001
+#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002
#endif
/*
diff -urN 2.4.0test1ac4/include/linux/pci_ids.h~ 2.4.0test1ac4/include/linux/pci_ids.h
--- 2.4.0test1ac4/include/linux/pci_ids.h~ Mon May 29 16:56:19 2000
+++ 2.4.0test1ac4/include/linux/pci_ids.h Mon May 29 23:47:58 2000
@@ -253,9 +253,16 @@
#define PCI_DEVICE_ID_IBM_405GP 0x0156
#define PCI_DEVICE_ID_IBM_MPIC_2 0xffff
+#define PCI_VENDOR_ID_COMPEX2 0x101a
+#define PCI_DEVICE_ID_COMPEX2_100VG 0x0005
+
#define PCI_VENDOR_ID_WD 0x101c
#define PCI_DEVICE_ID_WD_7197 0x3296
+#define PCI_VENDOR_ID_AMI 0x101e
+#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010
+#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
+
#define PCI_VENDOR_ID_AMD 0x1022
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
@@ -268,6 +275,8 @@
#define PCI_DEVICE_ID_AMD_VIPER_740C 0x740C
#define PCI_VENDOR_ID_TRIDENT 0x1023
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
#define PCI_DEVICE_ID_TRIDENT_9320 0x9320
#define PCI_DEVICE_ID_TRIDENT_9388 0x9388
#define PCI_DEVICE_ID_TRIDENT_9397 0x9397
@@ -317,6 +326,11 @@
#define PCI_VENDOR_ID_FD 0x1036
#define PCI_DEVICE_ID_FD_36C70 0x0000
+#define PCI_VENDOR_ID_SIS 0x1039 // should be PCI_VENDOR_ID_SI
+#define PCI_DEVICE_ID_SIS_300 0x0300 // VGA function
+#define PCI_DEVICE_ID_SIS_540 0x5300 // VGA function
+#define PCI_DEVICE_ID_SIS_630 0x6300 // VGA function
+
#define PCI_VENDOR_ID_SI 0x1039
#define PCI_DEVICE_ID_SI_5591_AGP 0x0001
#define PCI_DEVICE_ID_SI_6202 0x0002
@@ -327,10 +341,10 @@
#define PCI_DEVICE_ID_SI_501 0x0406
#define PCI_DEVICE_ID_SI_496 0x0496
#define PCI_DEVICE_ID_SI_530 0x0530
-#define PCI_DEVICE_ID_SI_540 0x0540
+#define PCI_DEVICE_ID_SI_540 0x0540 // IDE function
#define PCI_DEVICE_ID_SI_601 0x0601
#define PCI_DEVICE_ID_SI_620 0x0620
-#define PCI_DEVICE_ID_SI_630 0x0630
+#define PCI_DEVICE_ID_SI_630 0x0630 // IDE function
#define PCI_DEVICE_ID_SI_5107 0x5107
#define PCI_DEVICE_ID_SI_5511 0x5511
#define PCI_DEVICE_ID_SI_5513 0x5513
@@ -369,6 +383,10 @@
#define PCI_DEVICE_ID_OPTI_82C861 0xc861
#define PCI_DEVICE_ID_OPTI_82C825 0xd568
+#define PCI_VENDOR_ID_ELSA 0x1048
+#define PCI_DEVICE_ID_ELSA_QS1000 0x1000
+#define PCI_DEVICE_ID_ELSA_QS3000 0x3000
+
#define PCI_VENDOR_ID_SGS 0x104a
#define PCI_DEVICE_ID_SGS_2000 0x0008
#define PCI_DEVICE_ID_SGS_1764 0x0009
@@ -395,6 +413,8 @@
#define PCI_DEVICE_ID_TI_1251B 0xac1f
#define PCI_DEVICE_ID_TI_1420 0xac51
+#define PCI_VENDOR_ID_SONY 0x104d
+#define PCI_DEVICE_ID_SONY_CXD3222 0x8039
#define PCI_VENDOR_ID_OAK 0x104e
#define PCI_DEVICE_ID_OAK_OTI107 0x0107
@@ -485,9 +505,10 @@
#define PCI_VENDOR_ID_LEADTEK 0x107d
#define PCI_DEVICE_ID_LEADTEK_805 0x0000
-#define PCI_VENDOR_ID_INTERPHASE 0x107e
+#define PCI_VENDOR_ID_INTERPHASE 0x107e
#define PCI_DEVICE_ID_INTERPHASE_5526 0x0004
#define PCI_DEVICE_ID_INTERPHASE_55x6 0x0005
+#define PCI_DEVICE_ID_INTERPHASE_5575 0x0008
#define PCI_VENDOR_ID_CONTAQ 0x1080
#define PCI_DEVICE_ID_CONTAQ_82C599 0x0600
@@ -597,6 +618,7 @@
#define PCI_DEVICE_ID_AL_M5229 0x5229
#define PCI_DEVICE_ID_AL_M5237 0x5237
#define PCI_DEVICE_ID_AL_M5243 0x5243
+#define PCI_DEVICE_ID_AL_M5451 0x5451
#define PCI_DEVICE_ID_AL_M7101 0x7101
#define PCI_VENDOR_ID_MITSUBISHI 0x10ba
@@ -672,6 +694,12 @@
#define PCI_DEVICE_ID_INIT_320P 0x9100
#define PCI_DEVICE_ID_INIT_360P 0x9500
+#define PCI_VENDOR_ID_CREATIVE 0x1102 // duplicate: ECTIVA
+#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
+
+#define PCI_VENDOR_ID_ECTIVA 0x1102 // duplicate: CREATIVE
+#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938
+
#define PCI_VENDOR_ID_TTI 0x1103
#define PCI_DEVICE_ID_TTI_HPT343 0x0003
#define PCI_DEVICE_ID_TTI_HPT366 0x0004
@@ -751,6 +779,9 @@
#define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000
#define PCI_DEVICE_ID_EF_ATM_ASIC 0x0002
+#define PCI_VENDOR_ID_IDT 0x111d
+#define PCI_DEVICE_ID_IDT_IDT77201 0x0001
+
#define PCI_VENDOR_ID_FORE 0x1127
#define PCI_DEVICE_ID_FORE_PCA200PC 0x0210
#define PCI_DEVICE_ID_FORE_PCA200E 0x0300
@@ -762,6 +793,17 @@
#define PCI_DEVICE_ID_PHILIPS_SAA7145 0x7145
#define PCI_DEVICE_ID_PHILIPS_SAA7146 0x7146
+#define PCI_VENDOR_ID_EICON 0x1133
+#define PCI_DEVICE_ID_EICON_DIVA20PRO 0xe001
+#define PCI_DEVICE_ID_EICON_DIVA20 0xe002
+#define PCI_DEVICE_ID_EICON_DIVA20PRO_U 0xe003
+#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004
+#define PCI_DEVICE_ID_EICON_DIVA_201 0xe005
+#define PCI_DEVICE_ID_EICON_MAESTRA 0xe010
+#define PCI_DEVICE_ID_EICON_MAESTRAQ 0xe012
+#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013
+#define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014
+
#define PCI_VENDOR_ID_CYCLONE 0x113c
#define PCI_DEVICE_ID_CYCLONE_SDK 0x0001
@@ -916,7 +958,10 @@
#define PCI_VENDOR_ID_CCUBE 0x123f
#define PCI_VENDOR_ID_AVM 0x1244
+#define PCI_DEVICE_ID_AVM_B1 0x0700
+#define PCI_DEVICE_ID_AVM_C4 0x0800
#define PCI_DEVICE_ID_AVM_A1 0x0a00
+#define PCI_DEVICE_ID_AVM_T1 0x1200
#define PCI_VENDOR_ID_DIPIX 0x1246
@@ -933,7 +978,9 @@
#define PCI_DEVICE_ID_OPTIBASE_VQUEST 0x2130
#define PCI_VENDOR_ID_ESS 0x125d
+#define PCI_DEVICE_ID_ESS_ESS1968 0x1968
#define PCI_DEVICE_ID_ESS_AUDIOPCI 0x1969
+#define PCI_DEVICE_ID_ESS_ESS1978 0x1978
#define PCI_VENDOR_ID_SATSAGEM 0x1267
#define PCI_DEVICE_ID_SATSAGEM_PCR2101 0x5352
@@ -948,6 +995,9 @@
#define PCI_VENDOR_ID_ROCKWELL 0x127A
+#define PCI_VENDOR_ID_ESS_OLD 0x1285
+#define PCI_DEVICE_ID_ESS_ESS0100 0x0100
+
#define PCI_VENDOR_ID_ALTEON 0x12ae
#define PCI_DEVICE_ID_ALTEON_ACENIC 0x0001
@@ -978,6 +1028,10 @@
#define PCI_SUBDEVICE_ID_CHASE_PCIRAS4 0xF001
#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8 0xF010
+#define PCI_VENDOR_ID_AUREAL 0x12eb
+#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001
+#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002
+
#define PCI_VENDOR_ID_CBOARDS 0x1307
#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
@@ -1020,6 +1074,9 @@
#define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061
#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
+#define PCI_VENDOR_ID_DOMEX 0x134a
+#define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001
+
#define PCI_VENDOR_ID_QUATECH 0x135C
#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010
#define PCI_DEVICE_ID_QUATECH_DSC100 0x0020
@@ -1036,12 +1093,38 @@
#define PCI_DEVICE_ID_SEALEVEL_COMM4 0x7401
#define PCI_DEVICE_ID_SEALEVEL_COMM8 0x7801
+#define PCI_VENDOR_ID_HYPERCOPE 0x1365
+#define PCI_DEVICE_ID_HYPERCOPE_PLX 0x9050
+
+#define PCI_VENDOR_ID_LMC 0x1376
+#define PCI_DEVICE_ID_LMC_HSSI 0x0003
+#define PCI_DEVICE_ID_LMC_DS3 0x0004
+#define PCI_DEVICE_ID_LMC_SSI 0x0005
+#define PCI_DEVICE_ID_LMC_T1 0x0006
+
#define PCI_VENDOR_ID_NETGEAR 0x1385
#define PCI_DEVICE_ID_NETGEAR_GA620 0x620a
+#define PCI_VENDOR_ID_APPLICOM 0x1389
+#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
+#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
+#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
+
+#define PCI_VENDOR_ID_MOXA 0x1393
+#define PCI_DEVICE_ID_MOXA_C104 0x1040
+#define PCI_DEVICE_ID_MOXA_C168 0x1680
+#define PCI_DEVICE_ID_MOXA_CP204J 0x2040
+#define PCI_DEVICE_ID_MOXA_C218 0x2180
+#define PCI_DEVICE_ID_MOXA_C320 0x3200
+
#define PCI_VENDOR_ID_3WARE 0x13C1
#define PCI_DEVICE_ID_3WARE_1000 0x1000
+#define PCI_VENDOR_ID_CMEDIA 0x13f6
+#define PCI_DEVICE_ID_CMEDIA_CM8338A 0x0100
+#define PCI_DEVICE_ID_CMEDIA_CM8338B 0x0101
+#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
+
#define PCI_VENDOR_ID_LAVA 0x1407
#define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 /* 2x 16550 */
#define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */
@@ -1065,6 +1148,11 @@
#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x950A
#define PCI_DEVICE_ID_OXSEMI_16PCI95N 0x9511
+#define PCI_VENDOR_ID_AIRONET 0x14b9
+#define PCI_DEVICE_ID_AIRONET_4800_1 0x0001
+#define PCI_DEVICE_ID_AIRONET_4800 0x4500
+#define PCI_DEVICE_ID_AIRONET_4500 0x4800
+
#define PCI_VENDOR_ID_TITAN 0x14D2
#define PCI_DEVICE_ID_TITAN_100 0xA001
#define PCI_DEVICE_ID_TITAN_200 0xA005
@@ -1153,6 +1241,7 @@
#define PCI_DEVICE_ID_INTEL_82441 0x1237
#define PCI_DEVICE_ID_INTEL_82380FB 0x124b
#define PCI_DEVICE_ID_INTEL_82439 0x1250
+#define PCI_DEVICE_ID_INTEL_80960_RP 0x1960
#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020
@@ -1270,8 +1359,3 @@
#define PCI_DEVICE_ID_ARK_STING 0xa091
#define PCI_DEVICE_ID_ARK_STINGARK 0xa099
#define PCI_DEVICE_ID_ARK_2000MT 0xa0a1
-
-#define PCI_VENDOR_ID_SIS 0x1039
-#define PCI_DEVICE_ID_SIS_300 0x0300
-#define PCI_DEVICE_ID_SIS_540 0x5300
-#define PCI_DEVICE_ID_SIS_630 0x6300
diff -urN 2.4.0test1ac4/drivers/net/wan/lmc/lmc_main.c~ 2.4.0test1ac4/drivers/net/wan/lmc/lmc_main.c
--- 2.4.0test1ac4/drivers/net/wan/lmc/lmc_main.c~ Sat May 13 20:08:28 2000
+++ 2.4.0test1ac4/drivers/net/wan/lmc/lmc_main.c Mon May 29 22:24:00 2000
@@ -951,22 +951,22 @@
sc->lmc_timing = LMC_CTL_CLOCK_SOURCE_EXT;
switch (subdevice) {
- case PCI_PRODUCT_LMC_HSSI:
+ case PCI_DEVICE_ID_LMC_HSSI:
printk ("%s: LMC HSSI\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_HSSI;
sc->lmc_media = &lmc_hssi_media;
break;
- case PCI_PRODUCT_LMC_DS3:
+ case PCI_DEVICE_ID_LMC_DS3:
printk ("%s: LMC DS3\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_DS3;
sc->lmc_media = &lmc_ds3_media;
break;
- case PCI_PRODUCT_LMC_SSI:
+ case PCI_DEVICE_ID_LMC_SSI:
printk ("%s: LMC SSI\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_SSI;
sc->lmc_media = &lmc_ssi_media;
break;
- case PCI_PRODUCT_LMC_T1:
+ case PCI_DEVICE_ID_LMC_T1:
printk ("%s: LMC T1\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_T1;
sc->lmc_media = &lmc_t1_media;
@@ -991,13 +991,13 @@
AdapModelNum = (lmc_mii_readreg (sc, 0, 3) & 0x3f0) >> 4;
if ((AdapModelNum == LMC_ADAP_T1
- && subdevice == PCI_PRODUCT_LMC_T1) || /* detect LMC1200 */
+ && subdevice == PCI_DEVICE_ID_LMC_T1) || /* detect LMC1200 */
(AdapModelNum == LMC_ADAP_SSI
- && subdevice == PCI_PRODUCT_LMC_SSI) || /* detect LMC1000 */
+ && subdevice == PCI_DEVICE_ID_LMC_SSI) || /* detect LMC1000 */
(AdapModelNum == LMC_ADAP_DS3
- && subdevice == PCI_PRODUCT_LMC_DS3) || /* detect LMC5245 */
+ && subdevice == PCI_DEVICE_ID_LMC_DS3) || /* detect LMC5245 */
(AdapModelNum == LMC_ADAP_HSSI
- && subdevice == PCI_PRODUCT_LMC_HSSI))
+ && subdevice == PCI_DEVICE_ID_LMC_HSSI))
{ /* detect LMC5200 */
}
diff -urN 2.4.0test1ac4/drivers/net/wan/lmc/lmc_var.h~ 2.4.0test1ac4/drivers/net/wan/lmc/lmc_var.h
--- 2.4.0test1ac4/drivers/net/wan/lmc/lmc_var.h~ Wed Apr 26 20:08:49 2000
+++ 2.4.0test1ac4/drivers/net/wan/lmc/lmc_var.h Mon May 29 23:39:52 2000
@@ -529,11 +529,13 @@
#define CORRECT_VENDOR_ID 0x1011
#define CORRECT_DEV_ID 9
-#define PCI_VENDOR_LMC 0x1376
-#define PCI_PRODUCT_LMC_HSSI 0x0003
-#define PCI_PRODUCT_LMC_DS3 0x0004
-#define PCI_PRODUCT_LMC_SSI 0x0005
-#define PCI_PRODUCT_LMC_T1 0x0006
+#ifndef PCI_VENDOR_ID_LMC
+#define PCI_VENDOR_ID_LMC 0x1376
+#define PCI_DEVICE_ID_LMC_HSSI 0x0003
+#define PCI_DEVICE_ID_LMC_DS3 0x0004
+#define PCI_DEVICE_ID_LMC_SSI 0x0005
+#define PCI_DEVICE_ID_LMC_T1 0x0006
+#endif
/* Adapcter module number */
#define LMC_ADAP_HSSI 2
diff -urN 2.4.0test1ac4/drivers/net/skfp/h/targetos.h~ 2.4.0test1ac4/drivers/net/skfp/h/targetos.h
--- 2.4.0test1ac4/drivers/net/skfp/h/targetos.h~ Sat May 13 20:07:57 2000
+++ 2.4.0test1ac4/drivers/net/skfp/h/targetos.h Mon May 29 21:49:24 2000
@@ -22,8 +22,10 @@
//-------- those should go into include/linux/pci.h
-#define PCI_VENDOR_ID_SK 0x1148
-#define PCI_DEVICE_ID_SK_FP 0x4000
+#ifndef PCI_VENDOR_ID_SYSKONNECT
+#define PCI_VENDOR_ID_SYSKONNECT 0x1148
+#define PCI_DEVICE_ID_SYSKONNECT_FP 0x4000
+#endif
//--------
diff -urN 2.4.0test1ac4/drivers/net/skfp/skfddi.c~ 2.4.0test1ac4/drivers/net/skfp/skfddi.c
--- 2.4.0test1ac4/drivers/net/skfp/skfddi.c~ Sat May 13 20:07:57 2000
+++ 2.4.0test1ac4/drivers/net/skfp/skfddi.c Mon May 29 21:49:54 2000
@@ -301,7 +301,7 @@
}
for (i = 0; i < SKFP_MAX_NUM_BOARDS; i++) { // scan for PCI cards
PRINTK(KERN_INFO "Check device %d\n", i);
- if ((pdev=pci_find_device(PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP,
+ if ((pdev=pci_find_device(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_FP,
pdev)) == 0) {
break;
}
diff -urN 2.4.0test1ac4/drivers/net/aironet4500_card.c~ 2.4.0test1ac4/drivers/net/aironet4500_card.c
--- 2.4.0test1ac4/drivers/net/aironet4500_card.c~ Mon May 29 16:55:59 2000
+++ 2.4.0test1ac4/drivers/net/aironet4500_card.c Mon May 29 22:33:40 2000
@@ -41,10 +41,13 @@
#include "aironet4500.h"
+#ifndef PCI_VENDOR_ID_AIRONET
#define PCI_VENDOR_ID_AIRONET 0x14b9
-#define PCI_DEVICE_AIRONET_4800_1 0x1
-#define PCI_DEVICE_AIRONET_4800 0x4500
-#define PCI_DEVICE_AIRONET_4500 0x4800
+#define PCI_DEVICE_ID_AIRONET_4800_1 0x1
+#define PCI_DEVICE_ID_AIRONET_4800 0x4500
+#define PCI_DEVICE_ID_AIRONET_4500 0x4800
+#endif
+
#define AIRONET4X00_IO_SIZE 0x40
#define AIRONET4X00_CIS_SIZE 0x300
#define AIRONET4X00_MEM_SIZE 0x300
@@ -112,9 +115,9 @@
if (vendor != PCI_VENDOR_ID_AIRONET)
continue;
- if (device != PCI_DEVICE_AIRONET_4800_1 &&
- device != PCI_DEVICE_AIRONET_4800 &&
- device != PCI_DEVICE_AIRONET_4500 )
+ if (device != PCI_DEVICE_ID_AIRONET_4800_1 &&
+ device != PCI_DEVICE_ID_AIRONET_4800 &&
+ device != PCI_DEVICE_ID_AIRONET_4500 )
continue;
// if (check_region(pci_ioaddr, AIRONET4X00_IO_SIZE) ||
@@ -141,12 +144,12 @@
}
-/* if (device == PCI_DEVICE_AIRONET_4800)
+/* if (device == PCI_DEVICE_ID_AIRONET_4800)
pci_write_config_dword(pdev, 0x40, 0x00000000);
udelay(1000);
*/
- if (device == PCI_DEVICE_AIRONET_4800)
+ if (device == PCI_DEVICE_ID_AIRONET_4800)
pci_write_config_dword(pdev, 0x40, 0x40000000);
if (awc_pci_init(dev, pdev, pci_ioaddr,pci_cisaddr,pci_memaddr,pci_irq_line)){
diff -urN 2.4.0test1ac4/drivers/char/joystick/joy-pci.c~ 2.4.0test1ac4/drivers/char/joystick/joy-pci.c
--- 2.4.0test1ac4/drivers/char/joystick/joy-pci.c~ Mon May 29 16:56:18 2000
+++ 2.4.0test1ac4/drivers/char/joystick/joy-pci.c Mon May 29 23:42:47 2000
@@ -122,13 +122,13 @@
}
static struct js_pci_data js_pci_data[] =
-{{ PCI_VENDOR_ID_TRIDENT, 0x2000, 0x10000, 0x00044 ,0x00030, 0x00031, 0x00034, 2, 0xffff,
+{{ PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX, 0x10000, 0x00044 ,0x00030, 0x00031, 0x00034, 2, 0xffff,
js_pci_4dwave_init, js_pci_4dwave_cleanup, "Trident 4DWave DX" },
- { PCI_VENDOR_ID_TRIDENT, 0x2001, 0x10000, 0x00044, 0x00030, 0x00031, 0x00034, 2, 0xffff,
+ { PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX, 0x10000, 0x00044, 0x00030, 0x00031, 0x00034, 2, 0xffff,
js_pci_4dwave_init, js_pci_4dwave_cleanup, "Trident 4DWave NX" },
- { PCI_VENDOR_ID_AUREAL, 0x0001, 0x40000, 0x1280c, 0x1100c, 0x11008, 0x11010, 4, 0x1fff,
+ { PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1, 0x40000, 0x1280c, 0x1100c, 0x11008, 0x11010, 4, 0x1fff,
js_pci_vortex_init, js_pci_vortex_cleanup, "Aureal Vortex1" },
- { PCI_VENDOR_ID_AUREAL, 0x0002, 0x40000, 0x2a00c, 0x2880c, 0x28808, 0x28810, 4, 0x1fff,
+ { PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2, 0x40000, 0x2a00c, 0x2880c, 0x28808, 0x28810, 4, 0x1fff,
js_pci_vortex_init, js_pci_vortex_cleanup, "Aureal Vortex2" },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL }};
diff -urN 2.4.0test1ac4/drivers/char/digiPCI.h~ 2.4.0test1ac4/drivers/char/digiPCI.h
--- 2.4.0test1ac4/drivers/char/digiPCI.h~ Mon Apr 3 05:01:30 2000
+++ 2.4.0test1ac4/drivers/char/digiPCI.h Mon May 29 21:51:17 2000
@@ -4,16 +4,6 @@
#define PCIMAX 32 /* maximum number of PCI boards */
-#define PCI_VENDOR_DIGI 0x114F
-#define PCI_DEVICE_EPC 0x0002
-#define PCI_DEVICE_RIGHTSWITCH 0x0003 /* For testing */
-#define PCI_DEVICE_XEM 0x0004
-#define PCI_DEVICE_XR 0x0005
-#define PCI_DEVICE_CX 0x0006
-#define PCI_DEVICE_XRJ 0x0009 /* Jupiter boards with */
-#define PCI_DEVICE_EPCJ 0x000a /* PLX 9060 chip for PCI */
-
-
/*
* On the PCI boards, there is no IO space allocated
* The I/O registers will be in the first 3 bytes of the
diff -urN 2.4.0test1ac4/drivers/char/epca.c~ 2.4.0test1ac4/drivers/char/epca.c
--- 2.4.0test1ac4/drivers/char/epca.c~ Mon May 29 16:56:18 2000
+++ 2.4.0test1ac4/drivers/char/epca.c Mon May 29 21:52:23 2000
@@ -4079,10 +4079,10 @@
static struct pci_device_id epca_pci_tbl[] __initdata = {
- { PCI_VENDOR_DIGI, PCI_DEVICE_XR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xr },
- { PCI_VENDOR_DIGI, PCI_DEVICE_XEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xem },
- { PCI_VENDOR_DIGI, PCI_DEVICE_CX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_cx },
- { PCI_VENDOR_DIGI, PCI_DEVICE_XRJ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xrj },
+ { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_XR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xr },
+ { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_XEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xem },
+ { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_CX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_cx },
+ { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_XRJ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xrj },
{ 0, }
};
diff -urN 2.4.0test1ac4/drivers/char/moxa.c~ 2.4.0test1ac4/drivers/char/moxa.c
--- 2.4.0test1ac4/drivers/char/moxa.c~ Tue May 9 09:56:35 2000
+++ 2.4.0test1ac4/drivers/char/moxa.c Mon May 29 22:28:38 2000
@@ -77,15 +77,9 @@
#ifndef PCI_VENDOR_ID_MOXA
#define PCI_VENDOR_ID_MOXA 0x1393
-#endif
-#ifndef PCI_DEVICE_ID_CP204J
-#define PCI_DEVICE_ID_CP204J 0x2040
-#endif
-#ifndef PCI_DEVICE_ID_C218
-#define PCI_DEVICE_ID_C218 0x2180
-#endif
-#ifndef PCI_DEVICE_ID_C320
-#define PCI_DEVICE_ID_C320 0x3200
+#define PCI_DEVICE_ID_MOXA_CP204J 0x2040
+#define PCI_DEVICE_ID_MOXA_C218 0x2180
+#define PCI_DEVICE_ID_MOXA_C320 0x3200
#endif
enum {
@@ -113,9 +107,9 @@
static moxa_pciinfo moxa_pcibrds[] =
{
- {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C218, MOXA_BOARD_C218_PCI},
- {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C320, MOXA_BOARD_C320_PCI},
- {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_CP204J, MOXA_BOARD_CP204J},
+ {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C218, MOXA_BOARD_C218_PCI},
+ {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C320, MOXA_BOARD_C320_PCI},
+ {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP204J, MOXA_BOARD_CP204J},
};
typedef struct _moxa_isa_board_conf {
diff -urN 2.4.0test1ac4/drivers/char/mxser.c~ 2.4.0test1ac4/drivers/char/mxser.c
--- 2.4.0test1ac4/drivers/char/mxser.c~ Mon May 29 16:56:18 2000
+++ 2.4.0test1ac4/drivers/char/mxser.c Mon May 29 22:29:59 2000
@@ -107,12 +107,8 @@
#ifndef PCI_VENDOR_ID_MOXA
#define PCI_VENDOR_ID_MOXA 0x1393
-#endif
-#ifndef PCI_DEVICE_ID_C168
-#define PCI_DEVICE_ID_C168 0x1680
-#endif
-#ifndef PCI_DEVICE_ID_C104
-#define PCI_DEVICE_ID_C104 0x1040
+#define PCI_DEVICE_ID_MOXA_C168 0x1680
+#define PCI_DEVICE_ID_MOXA_C104 0x1040
#endif
#define C168_ASIC_ID 1
@@ -166,8 +162,8 @@
static mxser_pciinfo mxser_pcibrds[] =
{
- {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C168, MXSER_BOARD_C168_PCI},
- {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C104, MXSER_BOARD_C104_PCI},
+ {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C168, MXSER_BOARD_C168_PCI},
+ {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C104, MXSER_BOARD_C104_PCI},
};
static int ioaddr[MXSER_BOARDS] = {0, 0, 0, 0};
diff -urN 2.4.0test1ac4/drivers/scsi/megaraid.h~ 2.4.0test1ac4/drivers/scsi/megaraid.h
--- 2.4.0test1ac4/drivers/scsi/megaraid.h~ Tue May 23 20:16:47 2000
+++ 2.4.0test1ac4/drivers/scsi/megaraid.h Mon May 29 21:21:15 2000
@@ -99,10 +99,12 @@
/* Define AMI's PCI codes */
#undef PCI_VENDOR_ID_AMI
#undef PCI_DEVICE_ID_AMI_MEGARAID
+#undef PCI_DEVICE_ID_AMI_MEGARAID2
#ifndef PCI_VENDOR_ID_AMI
#define PCI_VENDOR_ID_AMI 0x101E
#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010
+#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
#endif
#define PCI_CONF_BASE_ADDR_OFFSET 0x10
diff -urN 2.4.0test1ac4/drivers/scsi/megaraid.c~ 2.4.0test1ac4/drivers/scsi/megaraid.c
--- 2.4.0test1ac4/drivers/scsi/megaraid.c~ Mon May 29 16:56:01 2000
+++ 2.4.0test1ac4/drivers/scsi/megaraid.c Mon May 29 21:19:30 2000
@@ -1623,9 +1623,9 @@
printk ("megaraid: " MEGARAID_VERSION CRLFSTR);
- count += mega_findCard (pHostTmpl, 0x101E, 0x9010, 0);
- count += mega_findCard (pHostTmpl, 0x101E, 0x9060, 0);
- count += mega_findCard (pHostTmpl, 0x8086, 0x1960, BOARD_QUARTZ);
+ count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID, 0);
+ count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2, 0);
+ count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80960_RP, BOARD_QUARTZ);
return count;
}
diff -urN 2.4.0test1ac4/drivers/sound/trident.h~ 2.4.0test1ac4/drivers/sound/trident.h
--- 2.4.0test1ac4/drivers/sound/trident.h~ Tue May 9 09:56:40 2000
+++ 2.4.0test1ac4/drivers/sound/trident.h Mon May 29 23:20:34 2000
@@ -32,8 +32,8 @@
#define PCI_VENDOR_ID_SI 0x0139
#endif
-#ifndef PCI_VENDOR_ID_ALI
-#define PCI_VENDOR_ID_ALI 0x10b9
+#ifndef PCI_VENDOR_ID_AL
+#define PCI_VENDOR_ID_AL 0x10b9
#endif
#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_DX
@@ -48,8 +48,8 @@
#define PCI_DEVICE_ID_SI_7018 0x7018
#endif
-#ifndef PCI_DEVICE_ID_ALI_5451
-#define PCI_DEVICE_ID_ALI_5451 0x5451
+#ifndef PCI_DEVICE_ID_AL_M5451
+#define PCI_DEVICE_ID_AL_M5451 0x5451
#endif
#ifndef FALSE
diff -urN 2.4.0test1ac4/drivers/sound/trident.c~ 2.4.0test1ac4/drivers/sound/trident.c
--- 2.4.0test1ac4/drivers/sound/trident.c~ Mon May 29 16:56:01 2000
+++ 2.4.0test1ac4/drivers/sound/trident.c Mon May 29 21:41:12 2000
@@ -162,7 +162,7 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, TRIDENT_4D_NX},
{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_7018},
- {PCI_VENDOR_ID_ALI, PCI_DEVICE_ID_ALI_5451,
+ {PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, ALI_5451},
{0,}
};
@@ -334,7 +334,7 @@
case PCI_DEVICE_ID_SI_7018:
global_control |= (ENDLP_IE | MIDLP_IE| BANK_B_EN);
break;
- case PCI_DEVICE_ID_ALI_5451:
+ case PCI_DEVICE_ID_AL_M5451:
case PCI_DEVICE_ID_TRIDENT_4DWAVE_DX:
case PCI_DEVICE_ID_TRIDENT_4DWAVE_NX:
global_control |= (ENDLP_IE | MIDLP_IE);
@@ -580,7 +580,7 @@
/* Output the channel registers, but don't write register
three to an ALI chip. */
for (i = 0; i < CHANNEL_REGS; i++) {
- if (i == 3 && card->pci_id == PCI_DEVICE_ID_ALI_5451)
+ if (i == 3 && card->pci_id == PCI_DEVICE_ID_AL_M5451)
continue;
outl(data[i], TRID_REG(card, CHANNEL_START + 4*i));
}
@@ -600,7 +600,7 @@
switch (state->card->pci_id)
{
- case PCI_DEVICE_ID_ALI_5451:
+ case PCI_DEVICE_ID_AL_M5451:
data[0] = 0; /* Current Sample Offset */
data[2] = (channel->eso << 16) | (channel->delta & 0xffff);
data[3] = 0;
@@ -750,7 +750,7 @@
/* Enable AC-97 ADC (capture) */
switch (card->pci_id)
{
- case PCI_DEVICE_ID_ALI_5451:
+ case PCI_DEVICE_ID_AL_M5451:
case PCI_DEVICE_ID_SI_7018:
/* for 7018, the ac97 is always in playback/record (duplex) mode */
break;
@@ -814,7 +814,7 @@
switch (state->card->pci_id)
{
- case PCI_DEVICE_ID_ALI_5451:
+ case PCI_DEVICE_ID_AL_M5451:
case PCI_DEVICE_ID_SI_7018:
case PCI_DEVICE_ID_TRIDENT_4DWAVE_DX:
/* 16 bits ESO, CSO for 7018 and DX */
@@ -1341,7 +1341,7 @@
return -EFAULT;
ret = 0;
- if (state->card->pci_id == PCI_DEVICE_ID_ALI_5451)
+ if (state->card->pci_id == PCI_DEVICE_ID_AL_M5451)
outl(inl(TRID_REG (state->card, ALI_GLOBAL_CONTROL)) | ALI_PCM_IN_ENABLE,
TRID_REG (state->card, ALI_GLOBAL_CONTROL));
@@ -1444,7 +1444,7 @@
return -EFAULT;
ret = 0;
- if (state->card->pci_id == PCI_DEVICE_ID_ALI_5451)
+ if (state->card->pci_id == PCI_DEVICE_ID_AL_M5451)
if (dmabuf->channel->num == ALI_PCM_IN_CHANNEL)
outl ( inl (TRID_REG (state->card, ALI_GLOBAL_CONTROL)) &
ALI_PCM_IN_DISABLE, TRID_REG (state->card, ALI_GLOBAL_CONTROL));
@@ -1977,7 +1977,7 @@
}
if (file->f_mode & FMODE_READ) {
- if (card->pci_id == PCI_DEVICE_ID_ALI_5451) {
+ if (card->pci_id == PCI_DEVICE_ID_AL_M5451) {
card->states[ALI_PCM_IN_CHANNEL] = state;
card->states[i] = NULL;
state->virt = ALI_PCM_IN_CHANNEL;
@@ -2315,7 +2315,7 @@
really exist */
switch (card->pci_id)
{
- case PCI_DEVICE_ID_ALI_5451:
+ case PCI_DEVICE_ID_AL_M5451:
outl(PCMOUT|SECONDARY_ID, TRID_REG(card, SI_SERIAL_INTF_CTRL));
ready_2nd = inl(TRID_REG(card, SI_SERIAL_INTF_CTRL));
ready_2nd &= SI_AC97_SECONDARY_READY;
@@ -2354,7 +2354,7 @@
codec->private_data = card;
codec->id = num_ac97;
- if (card->pci_id == PCI_DEVICE_ID_ALI_5451) {
+ if (card->pci_id == PCI_DEVICE_ID_AL_M5451) {
codec->codec_read = ali_ac97_get;
codec->codec_write = ali_ac97_set;
}
@@ -2433,7 +2433,7 @@
printk(KERN_INFO "trident: %s found at IO 0x%04lx, IRQ %d\n",
card_names[pci_id->driver_data], card->iobase, card->irq);
- if(card->pci_id == PCI_DEVICE_ID_ALI_5451) {
+ if(card->pci_id == PCI_DEVICE_ID_AL_M5451) {
card->alloc_pcm_channel = ali_alloc_pcm_channel;
card->alloc_rec_pcm_channel = ali_alloc_rec_pcm_channel;
card->free_pcm_channel = ali_free_pcm_channel;
@@ -2473,7 +2473,7 @@
}
outl(0x00, TRID_REG(card, T4D_MUSICVOL_WAVEVOL));
- if (card->pci_id == PCI_DEVICE_ID_ALI_5451) {
+ if (card->pci_id == PCI_DEVICE_ID_AL_M5451) {
/* edited by HMSEO for GT sound */
#ifdef CONFIG_ALPHA_NAUTILUS
ac97_data = trident_ac97_get (card->ac97_codec[0], AC97_POWER_CONTROL);
diff -urN 2.4.0test1ac4/drivers/sound/skeleton.c~ 2.4.0test1ac4/drivers/sound/skeleton.c
--- 2.4.0test1ac4/drivers/sound/skeleton.c~ Mon May 29 16:56:19 2000
+++ 2.4.0test1ac4/drivers/sound/skeleton.c Mon May 29 22:01:54 2000
@@ -33,8 +33,8 @@
* Define our PCI vendor ID here
*/
-#ifndef PCI_VENDOR_MYIDENT
-#define PCI_VENDOR_MYIDENT 0x125D
+#ifndef PCI_VENDOR_ID_MYIDENT
+#define PCI_VENDOR_ID_MYIDENT 0x125d
/*
* PCI identity for the card.
diff -urN 2.4.0test1ac4/drivers/sound/maestro.c~ 2.4.0test1ac4/drivers/sound/maestro.c
--- 2.4.0test1ac4/drivers/sound/maestro.c~ Mon May 29 16:56:19 2000
+++ 2.4.0test1ac4/drivers/sound/maestro.c Mon May 29 22:07:14 2000
@@ -261,16 +261,16 @@
/* --------------------------------------------------------------------- */
#define DRIVER_VERSION "0.14"
-#ifndef PCI_VENDOR_ESS
-#define PCI_VENDOR_ESS 0x125D
+#ifndef PCI_VENDOR_ID_ESS
+#define PCI_VENDOR_ID_ESS 0x125D
#define PCI_DEVICE_ID_ESS_ESS1968 0x1968 /* Maestro 2 */
#define PCI_DEVICE_ID_ESS_ESS1978 0x1978 /* Maestro 2E */
-#define PCI_VENDOR_ESS_OLD 0x1285 /* Platform Tech,
+#define PCI_VENDOR_ID_ESS_OLD 0x1285 /* Platform Tech,
the people the maestro
was bought from */
#define PCI_DEVICE_ID_ESS_ESS0100 0x0100 /* maestro 1 */
-#endif /* PCI_VENDOR_ESS */
+#endif /* PCI_VENDOR_ID_ESS */
#define ESS_CHAN_HARD 0x100
@@ -3471,7 +3471,7 @@
* Find the ESS Maestro 2.
*/
- while( (pcidev = pci_find_device(PCI_VENDOR_ESS, PCI_DEVICE_ID_ESS_ESS1968, pcidev))!=NULL ) {
+ while( (pcidev = pci_find_device(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1968, pcidev))!=NULL ) {
if (maestro_install(pcidev, TYPE_MAESTRO2))
foundone=1;
}
@@ -3480,7 +3480,7 @@
* Find the ESS Maestro 2E
*/
- while( (pcidev = pci_find_device(PCI_VENDOR_ESS, PCI_DEVICE_ID_ESS_ESS1978, pcidev))!=NULL) {
+ while( (pcidev = pci_find_device(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1978, pcidev))!=NULL) {
if (maestro_install(pcidev, TYPE_MAESTRO2E))
foundone=1;
}
@@ -3489,7 +3489,7 @@
* ESS Maestro 1
*/
- while((pcidev = pci_find_device(PCI_VENDOR_ESS_OLD, PCI_DEVICE_ID_ESS_ESS0100, pcidev))!=NULL) {
+ while((pcidev = pci_find_device(PCI_VENDOR_ID_ESS_OLD, PCI_DEVICE_ID_ESS_ESS0100, pcidev))!=NULL) {
if (maestro_install(pcidev, TYPE_MAESTRO))
foundone=1;
}
diff -urN 2.4.0test1ac4/drivers/isdn/hisax/diva.c~ 2.4.0test1ac4/drivers/isdn/hisax/diva.c
--- 2.4.0test1ac4/drivers/isdn/hisax/diva.c~ Mon Apr 3 05:01:24 2000
+++ 2.4.0test1ac4/drivers/isdn/hisax/diva.c Mon May 29 23:33:03 2000
@@ -111,12 +111,14 @@
#define DIVA_IPAC_PCI 4
/* PCI stuff */
-#define PCI_VENDOR_EICON_DIEHL 0x1133
-#define PCI_DIVA20PRO_ID 0xe001
-#define PCI_DIVA20_ID 0xe002
-#define PCI_DIVA20PRO_U_ID 0xe003
-#define PCI_DIVA20_U_ID 0xe004
-#define PCI_DIVA_201 0xe005
+#ifndef PCI_VENDOR_ID_EICON
+#define PCI_VENDOR_ID_EICON 0x1133
+#define PCI_DEVICE_ID_EICON_DIVA20PRO 0xe001
+#define PCI_DEVICE_ID_EICON_DIVA20 0xe002
+#define PCI_DEVICE_ID_EICON_DIVA20PRO_U 0xe003
+#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004
+#define PCI_DEVICE_ID_EICON_DIVA_201 0xe005
+#endif
/* CTRL (Read) */
#define DIVA_IRQ_STAT 0x01
@@ -934,20 +936,20 @@
}
cs->subtyp = 0;
- if ((dev_diva = pci_find_device(PCI_VENDOR_EICON_DIEHL,
- PCI_DIVA20_ID, dev_diva))) {
+ if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON,
+ PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) {
cs->subtyp = DIVA_PCI;
cs->irq = dev_diva->irq;
cs->hw.diva.cfg_reg = dev_diva->resource[ 2].start
& PCI_BASE_ADDRESS_IO_MASK;
- } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_EICON_DIEHL,
- PCI_DIVA20_U_ID, dev_diva_u))) {
+ } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON,
+ PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) {
cs->subtyp = DIVA_PCI;
cs->irq = dev_diva_u->irq;
cs->hw.diva.cfg_reg = dev_diva_u->resource[ 2].start
& PCI_BASE_ADDRESS_IO_MASK;
- } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_EICON_DIEHL,
- PCI_DIVA_201, dev_diva201))) {
+ } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON,
+ PCI_DEVICE_ID_EICON_DIVA_201, dev_diva201))) {
cs->subtyp = DIVA_IPAC_PCI;
cs->irq = dev_diva201->irq;
cs->hw.diva.pci_cfg =
diff -urN 2.4.0test1ac4/drivers/isdn/hisax/elsa.c~ 2.4.0test1ac4/drivers/isdn/hisax/elsa.c
--- 2.4.0test1ac4/drivers/isdn/hisax/elsa.c~ Mon Apr 3 05:01:10 2000
+++ 2.4.0test1ac4/drivers/isdn/hisax/elsa.c Mon May 29 23:35:34 2000
@@ -140,9 +140,11 @@
#define ELSA_PCMCIA_IPAC 11
/* PCI stuff */
-#define PCI_VENDOR_ELSA 0x1048
-#define PCI_QS1000_ID 0x1000
-#define PCI_QS3000_ID 0x3000
+#ifndef PCI_VENDOR_ID_ELSA
+#define PCI_VENDOR_ID_ELSA 0x1048
+#define PCI_DEVICE_ID_ELSA_QS1000 0x1000
+#define PCI_DEVICE_ID_ELSA_QS3000 0x3000
+#endif
#define ELSA_PCI_IRQ_MASK 0x04
/* ITAC Registeradressen (only Microlink PC) */
@@ -1056,16 +1058,16 @@
return(0);
}
cs->subtyp = 0;
- if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ELSA, PCI_QS1000_ID,
- dev_qs1000))) {
+ if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA,
+ PCI_DEVICE_ID_ELSA_QS1000, dev_qs1000))) {
cs->subtyp = ELSA_QS1000PCI;
cs->irq = dev_qs1000->irq;
cs->hw.elsa.cfg = dev_qs1000->resource[ 1].start &
PCI_BASE_ADDRESS_IO_MASK;
cs->hw.elsa.base = dev_qs1000->resource[ 3].start &
PCI_BASE_ADDRESS_IO_MASK;
- } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ELSA,
- PCI_QS3000_ID, dev_qs3000))) {
+ } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA,
+ PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) {
cs->subtyp = ELSA_QS3000PCI;
cs->irq = dev_qs3000->irq;
cs->hw.elsa.cfg = dev_qs3000->resource[ 1].start &
diff -urN 2.4.0test1ac4/drivers/isdn/hisax/avm_pci.c~ 2.4.0test1ac4/drivers/isdn/hisax/avm_pci.c
--- 2.4.0test1ac4/drivers/isdn/hisax/avm_pci.c~ Mon Apr 3 05:01:24 2000
+++ 2.4.0test1ac4/drivers/isdn/hisax/avm_pci.c Mon May 29 21:59:37 2000
@@ -71,8 +71,10 @@
#define AVM_FRITZ_PCI 1
#define AVM_FRITZ_PNP 2
-#define PCI_VENDOR_AVM 0x1244
-#define PCI_FRITZPCI_ID 0xa00
+#ifndef PCI_VENDOR_ID_AVM
+#define PCI_VENDOR_ID_AVM 0x1244
+#define PCI_DEVICE_ID_AVM_A1 0x0a00
+#endif
#define HDLC_FIFO 0x0
#define HDLC_STATUS 0x4
@@ -816,8 +818,8 @@
printk(KERN_ERR "FritzPCI: no PCI bus present\n");
return(0);
}
- if ((dev_avm = pci_find_device(PCI_VENDOR_AVM,
- PCI_FRITZPCI_ID, dev_avm))) {
+ if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
+ PCI_DEVICE_ID_AVM_A1, dev_avm))) {
cs->irq = dev_avm->irq;
if (!cs->irq) {
printk(KERN_WARNING "FritzPCI: No IRQ for PCI card found\n");
diff -urN 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.h~ 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.h
--- 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.h~ Mon Apr 3 05:01:09 2000
+++ 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.h Mon May 29 23:37:58 2000
@@ -46,16 +46,13 @@
#ifdef __KERNEL__
-
-#define PCI_VENDOR_EICON 0x1133
-#define PCI_DIVA_PRO20 0xe001 /* Not supported */
-#define PCI_DIVA20 0xe002 /* Not supported */
-#define PCI_DIVA_PRO20_U 0xe003 /* Not supported */
-#define PCI_DIVA20_U 0xe004 /* Not supported */
-#define PCI_MAESTRA 0xe010
-#define PCI_MAESTRAQ 0xe012
-#define PCI_MAESTRAQ_U 0xe013
-#define PCI_MAESTRAP 0xe014
+#ifndef PCI_VENDOR_ID_EICON
+#define PCI_VENDOR_ID_EICON 0x1133
+#define PCI_DEVICE_ID_EICON_MAESTRA 0xe010
+#define PCI_DEVICE_ID_EICON_MAESTRAQ 0xe012
+#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013
+#define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014
+#endif
#define DIVA_PRO20 1
#define DIVA20 2
diff -urN 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.c~ 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.c
--- 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.c~ Mon Apr 3 05:01:09 2000
+++ 2.4.0test1ac4/drivers/isdn/eicon/eicon_pci.c Mon May 29 20:58:02 2000
@@ -92,7 +92,7 @@
if (pci_present()) {
struct pci_dev *pdev = NULL;
int pci_nextindex=0, pci_cards=0, pci_akt=0;
- int pci_type = PCI_MAESTRA;
+ int pci_type = PCI_DEVICE_ID_EICON_MAESTRA;
int NoMorePCICards = FALSE;
char *ram, *reg, *cfg;
unsigned int pram=0, preg=0, pcfg=0;
@@ -108,7 +108,7 @@
for (pci_cards = 0; pci_cards < 0x0f; pci_cards++)
{
do {
- if ((pdev = pci_find_device(PCI_VENDOR_EICON,
+ if ((pdev = pci_find_device(PCI_VENDOR_ID_EICON,
pci_type,
pdev)))
{
@@ -119,14 +119,14 @@
pci_nextindex = 0;
switch (pci_type) /* switch to next card type */
{
- case PCI_MAESTRA:
- pci_type = PCI_MAESTRAQ; break;
- case PCI_MAESTRAQ:
- pci_type = PCI_MAESTRAQ_U; break;
- case PCI_MAESTRAQ_U:
- pci_type = PCI_MAESTRAP; break;
+ case PCI_DEVICE_ID_EICON_MAESTRA:
+ pci_type = PCI_DEVICE_ID_EICON_MAESTRAQ; break;
+ case PCI_DEVICE_ID_EICON_MAESTRAQ:
+ pci_type = PCI_DEVICE_ID_EICON_MAESTRAQ_U; break;
+ case PCI_DEVICE_ID_EICON_MAESTRAQ_U:
+ pci_type = PCI_DEVICE_ID_EICON_MAESTRAP; break;
default:
- case PCI_MAESTRAP:
+ case PCI_DEVICE_ID_EICON_MAESTRAP:
NoMorePCICards = TRUE;
}
}
@@ -151,7 +151,7 @@
pci_akt = 0;
switch(pci_type)
{
- case PCI_MAESTRA:
+ case PCI_DEVICE_ID_EICON_MAESTRA:
printk(KERN_INFO "Eicon: DIVA Server BRI/PCI detected !\n");
aparms->type = EICON_CTYPE_MAESTRA;
@@ -167,14 +167,14 @@
pci_akt = 1;
break;
- case PCI_MAESTRAQ:
- case PCI_MAESTRAQ_U:
+ case PCI_DEVICE_ID_EICON_MAESTRAQ:
+ case PCI_DEVICE_ID_EICON_MAESTRAQ_U:
printk(KERN_ERR "Eicon: DIVA Server 4BRI/PCI detected but not supported !\n");
pci_cards--;
pci_akt = 0;
break;
- case PCI_MAESTRAP:
+ case PCI_DEVICE_ID_EICON_MAESTRAP:
printk(KERN_INFO "Eicon: DIVA Server PRI/PCI detected !\n");
aparms->type = EICON_CTYPE_MAESTRAP; /*includes 9M,30M*/
aparms->irq = pdev->irq;
@@ -204,7 +204,7 @@
/* remapping memory */
switch(pci_type)
{
- case PCI_MAESTRA:
+ case PCI_DEVICE_ID_EICON_MAESTRA:
aparms->PCIreg = (unsigned int) preg;
aparms->PCIcfg = (unsigned int) pcfg;
if (check_region((aparms->PCIreg), 0x20)) {
@@ -223,9 +223,9 @@
request_region(aparms->PCIcfg, 0x80, "eicon cfg");
}
break;
- case PCI_MAESTRAQ:
- case PCI_MAESTRAQ_U:
- case PCI_MAESTRAP:
+ case PCI_DEVICE_ID_EICON_MAESTRAQ:
+ case PCI_DEVICE_ID_EICON_MAESTRAQ_U:
+ case PCI_DEVICE_ID_EICON_MAESTRAP:
aparms->shmem = (eicon_pci_shmem *) ioremap(pram, 0x10000);
ram = (u8 *) ((u32)aparms->shmem + MP_SHARED_RAM_OFFSET);
reg = ioremap(preg, 0x4000);
diff -urN 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_defs.h~ 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_defs.h
--- 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_defs.h~ Mon Apr 3 05:01:10 2000
+++ 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_defs.h Mon May 29 22:19:21 2000
@@ -72,8 +72,10 @@
/************************/
/* PCI constant defines */
/************************/
+#ifndef PCI_VENDOR_ID_HYPERCOPE
#define PCI_VENDOR_ID_HYPERCOPE 0x1365
-#define PCI_DEVICE_ID_PLX 0x9050 /* all DPRAM cards use the same id */
+#define PCI_DEVICE_ID_HYPERCOPE_PLX 0x9050 /* all DPRAM cards use the same id */
+#endif
/*****************************/
/* sub ids determining cards */
diff -urN 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_init.c~ 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_init.c
--- 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_init.c~ Mon Apr 3 05:01:10 2000
+++ 2.4.0test1ac4/drivers/isdn/hysdn/hysdn_init.c Mon May 29 22:20:24 2000
@@ -82,7 +82,7 @@
card_root = NULL;
card_last = NULL;
- while ((akt_pcidev = pci_find_device(PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_PLX,
+ while ((akt_pcidev = pci_find_device(PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_HYPERCOPE_PLX,
akt_pcidev)) != NULL) {
if (!(card = kmalloc(sizeof(hysdn_card), GFP_KERNEL))) {
diff -urN 2.4.0test1ac4/drivers/atm/iphase.h~ 2.4.0test1ac4/drivers/atm/iphase.h
--- 2.4.0test1ac4/drivers/atm/iphase.h~ Mon Apr 3 05:00:56 2000
+++ 2.4.0test1ac4/drivers/atm/iphase.h Mon May 29 21:37:18 2000
@@ -164,12 +164,6 @@
#define NR_VCI_4K_LD 12 /* log2(NR_VCI) */
#define MEM_VALID 0xfffffff0 /* mask base address with this */
-#ifndef PCI_VENDOR_ID_IPHASE
-#define PCI_VENDOR_ID_IPHASE 0x107e
-#endif
-#ifndef PCI_DEVICE_ID_IPHASE_5575
-#define PCI_DEVICE_ID_IPHASE_5575 0x0008
-#endif
#define DEV_LABEL "ia"
#define PCR 207692
#define ICR 100000
diff -urN 2.4.0test1ac4/drivers/atm/iphase.c~ 2.4.0test1ac4/drivers/atm/iphase.c
--- 2.4.0test1ac4/drivers/atm/iphase.c~ Tue May 9 09:56:33 2000
+++ 2.4.0test1ac4/drivers/atm/iphase.c Mon May 29 21:38:00 2000
@@ -3198,8 +3198,8 @@
if (!iadev) return -ENOMEM;
memset((char*)iadev, 0, sizeof(IADEV));
prev_dev = NULL;
- while((iadev->pci = pci_find_device(PCI_VENDOR_ID_IPHASE,
- PCI_DEVICE_ID_IPHASE_5575, prev_dev))) {
+ while((iadev->pci = pci_find_device(PCI_VENDOR_ID_INTERPHASE,
+ PCI_DEVICE_ID_INTERPHASE_5575, prev_dev))) {
IF_INIT(printk("ia detected at bus:%d dev: %d function:%d\n",
iadev->pci->bus->number, PCI_SLOT(iadev->pci->devfn),
PCI_FUNC(iadev->pci->devfn));)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed May 31 2000 - 21:00:23 EST