From e7dba34d762755a824233f4b7fcce9557377e640 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 18 Mar 2010 15:39:58 +0000 Subject: [PATCH] Give the different addi_apci_* drivers different comedi driver names. --- comedi/drivers/addi-data/addi_common.c | 8 ++++++-- comedi/drivers/addi_apci_035.c | 2 ++ comedi/drivers/addi_apci_1032.c | 2 ++ comedi/drivers/addi_apci_1500.c | 2 ++ comedi/drivers/addi_apci_1516.c | 2 ++ comedi/drivers/addi_apci_1564.c | 2 ++ comedi/drivers/addi_apci_16xx.c | 2 ++ comedi/drivers/addi_apci_1710.c | 2 ++ comedi/drivers/addi_apci_2016.c | 2 ++ comedi/drivers/addi_apci_2032.c | 2 ++ comedi/drivers/addi_apci_2200.c | 2 ++ comedi/drivers/addi_apci_3001.c | 2 ++ comedi/drivers/addi_apci_3120.c | 2 ++ comedi/drivers/addi_apci_3200.c | 2 ++ comedi/drivers/addi_apci_3300.c | 2 ++ comedi/drivers/addi_apci_3501.c | 2 ++ comedi/drivers/addi_apci_3xxx.c | 2 ++ 17 files changed, 38 insertions(+), 2 deletions(-) diff --git a/comedi/drivers/addi-data/addi_common.c b/comedi/drivers/addi-data/addi_common.c index 68571cdb..a6ab05f6 100644 --- a/comedi/drivers/addi-data/addi_common.c +++ b/comedi/drivers/addi-data/addi_common.c @@ -68,6 +68,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc #include "addi_common.h" #include "addi_amcc_s5933.h" +#ifndef ADDIDATA_DRIVER_NAME +#define ADDIDATA_DRIVER_NAME "addi_common" +#endif + //Update-0.7.57->0.7.68MODULE_AUTHOR("ADDI-DATA GmbH "); //Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module"); //Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); @@ -2528,7 +2532,7 @@ static const boardtype boardtypes[] = { #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) comedi_driver driver_addi = { - driver_name:"addi_common", + driver_name:ADDIDATA_DRIVER_NAME, module:THIS_MODULE, attach:i_ADDI_Attach, detach:i_ADDI_Detach, @@ -2583,7 +2587,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) v_pci_card_list_init(this_board->i_VendorId, 1); //1 for displaying the list.. pci_list_builded = 1; } - //rt_printk("comedi%d: addi_common: board=%s",dev->minor,this_board->pc_DriverName); + //rt_printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName); if ((this_board->i_Dma) && (it->options[2] == 0)) { i_Dma = 1; diff --git a/comedi/drivers/addi_apci_035.c b/comedi/drivers/addi_apci_035.c index bac01820..b6fcb06f 100644 --- a/comedi/drivers/addi_apci_035.c +++ b/comedi/drivers/addi_apci_035.c @@ -2,4 +2,6 @@ #define ADDIDATA_WATCHDOG 2 // Or shold it be something else +#define ADDIDATA_DRIVER_NAME "addi_apci_035" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_1032.c b/comedi/drivers/addi_apci_1032.c index fa2056e8..89b1c1de 100644 --- a/comedi/drivers/addi_apci_1032.c +++ b/comedi/drivers/addi_apci_1032.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_1032 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_1032" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_1500.c b/comedi/drivers/addi_apci_1500.c index 7a5cae59..e39c4d5d 100644 --- a/comedi/drivers/addi_apci_1500.c +++ b/comedi/drivers/addi_apci_1500.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_1500 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_1500" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_1516.c b/comedi/drivers/addi_apci_1516.c index 8d414844..a5b5b6de 100644 --- a/comedi/drivers/addi_apci_1516.c +++ b/comedi/drivers/addi_apci_1516.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_1516 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_1516" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_1564.c b/comedi/drivers/addi_apci_1564.c index 0351cdde..381687a3 100644 --- a/comedi/drivers/addi_apci_1564.c +++ b/comedi/drivers/addi_apci_1564.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_1564 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_1564" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_16xx.c b/comedi/drivers/addi_apci_16xx.c index 50679904..ab94dca1 100644 --- a/comedi/drivers/addi_apci_16xx.c +++ b/comedi/drivers/addi_apci_16xx.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_16XX 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_16xx" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_1710.c b/comedi/drivers/addi_apci_1710.c index c4334459..c73e0561 100644 --- a/comedi/drivers/addi_apci_1710.c +++ b/comedi/drivers/addi_apci_1710.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_1710 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_1710" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_2016.c b/comedi/drivers/addi_apci_2016.c index 271c47c8..291335c1 100644 --- a/comedi/drivers/addi_apci_2016.c +++ b/comedi/drivers/addi_apci_2016.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_2016 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_2016" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_2032.c b/comedi/drivers/addi_apci_2032.c index 5108ea2a..2bdc4ec2 100644 --- a/comedi/drivers/addi_apci_2032.c +++ b/comedi/drivers/addi_apci_2032.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_2032 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_2032" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_2200.c b/comedi/drivers/addi_apci_2200.c index e439f835..4ce00b13 100644 --- a/comedi/drivers/addi_apci_2200.c +++ b/comedi/drivers/addi_apci_2200.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_2200 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_2200" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3001.c b/comedi/drivers/addi_apci_3001.c index df97c305..0f73ad58 100644 --- a/comedi/drivers/addi_apci_3001.c +++ b/comedi/drivers/addi_apci_3001.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3001 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3001" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3120.c b/comedi/drivers/addi_apci_3120.c index 9183125d..3f9739b4 100644 --- a/comedi/drivers/addi_apci_3120.c +++ b/comedi/drivers/addi_apci_3120.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3120 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3120" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3200.c b/comedi/drivers/addi_apci_3200.c index f25a70b3..f959c498 100644 --- a/comedi/drivers/addi_apci_3200.c +++ b/comedi/drivers/addi_apci_3200.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3200 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3200" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3300.c b/comedi/drivers/addi_apci_3300.c index 1ee4778a..5baa6362 100644 --- a/comedi/drivers/addi_apci_3300.c +++ b/comedi/drivers/addi_apci_3300.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3300 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3300" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3501.c b/comedi/drivers/addi_apci_3501.c index 1049e202..1be0e856 100644 --- a/comedi/drivers/addi_apci_3501.c +++ b/comedi/drivers/addi_apci_3501.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3501 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3501" + #include "addi-data/addi_common.c" diff --git a/comedi/drivers/addi_apci_3xxx.c b/comedi/drivers/addi_apci_3xxx.c index fb9deb70..ff88fac0 100644 --- a/comedi/drivers/addi_apci_3xxx.c +++ b/comedi/drivers/addi_apci_3xxx.c @@ -1,3 +1,5 @@ #define CONFIG_APCI_3XXX 1 +#define ADDIDATA_DRIVER_NAME "addi_apci_3xxx" + #include "addi-data/addi_common.c" -- 2.26.2