From 9fefe18aea16ced25d9473052a4328da94b861ff Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 1 Nov 2007 16:11:15 +0000 Subject: [PATCH] Removed kernel 2.2 and 2.4 compatibility. Removed checks for whether PCI device supports mastering as can't tell from PCI device structure. --- comedi/drivers/addi-data/addi_amcc_s5933.h | 35 ++++------------------ comedi/drivers/addi-data/addi_common.c | 6 ++-- comedi/drivers/addi-data/addi_common.h | 1 - 3 files changed, 7 insertions(+), 35 deletions(-) diff --git a/comedi/drivers/addi-data/addi_amcc_s5933.h b/comedi/drivers/addi-data/addi_amcc_s5933.h index 585fce71..106c9596 100644 --- a/comedi/drivers/addi-data/addi_amcc_s5933.h +++ b/comedi/drivers/addi-data/addi_amcc_s5933.h @@ -235,7 +235,6 @@ struct pcilst_struct{ struct pci_dev *pcidev; unsigned short vendor; unsigned short device; - unsigned int master; unsigned char pci_bus; unsigned char pci_slot; unsigned char pci_func; @@ -262,7 +261,7 @@ int i_pci_card_free(struct pcilst_struct *amcc); void v_pci_card_list_display(void); int i_pci_card_data(struct pcilst_struct *amcc, unsigned char *pci_bus, unsigned char *pci_slot, unsigned char *pci_func, - unsigned long *io_addr, unsigned short *irq, unsigned short *master); + unsigned long *io_addr, unsigned short *irq); /****************************************************************************/ @@ -276,15 +275,9 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) amcc_devices=NULL; last=NULL; -#if LINUX_VERSION_CODE < 0x020300 - for(pcidev=pci_devices;pcidev;pcidev=pcidev->next){ -#elif LINUX_VERSION_CODE >= 0x020600 for(pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL); pcidev != NULL ; pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) { -#else - pci_for_each_dev(pcidev){ -#endif for(i_Count=0;i_Count<2;i_Count++) { pci_vendor=i_ADDIDATADeviceID[i_Count]; @@ -297,29 +290,14 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) else { amcc_devices=amcc; } last=amcc; -#if LINUX_VERSION_CODE < 0x020300 amcc->vendor=pcidev->vendor; amcc->device=pcidev->device; - amcc->master=pcidev->master; - amcc->pci_bus=pcidev->bus->number; - amcc->pci_slot=PCI_SLOT(pcidev->devfn); - amcc->pci_func=PCI_FUNC(pcidev->devfn); - for (i=0;i<5;i++) - amcc->io_addr[i]=pcidev->base_address[i] & ~3UL; - amcc->irq=pcidev->irq; -#else - amcc->vendor=pcidev->vendor; - amcc->device=pcidev->device; -#if 0 - amcc->master=pcidev->master; // how get this information under 2.4 kernels? -#endif amcc->pci_bus=pcidev->bus->number; amcc->pci_slot=PCI_SLOT(pcidev->devfn); amcc->pci_func=PCI_FUNC(pcidev->devfn); for (i=0;i<5;i++) amcc->io_addr[i]=pcidev->resource[i].start & ~3UL; amcc->irq=pcidev->irq; -#endif } } @@ -387,10 +365,8 @@ int pci_card_alloc(struct pcilst_struct *amcc, int master) if (!amcc) return -1; if (amcc->used) return 1; -#if LINUX_VERSION_CODE >= 0x020600 if (pci_enable_device(amcc->pcidev)) return -1; if (master) pci_set_master(amcc->pcidev); -#endif amcc->used=1; return 0; @@ -414,12 +390,12 @@ void v_pci_card_list_display(void) struct pcilst_struct *amcc,*next; printk("List of pci cards\n"); - printk("bus:slot:func vendor device master io_amcc io_daq irq used\n"); + printk("bus:slot:func vendor device io_amcc io_daq irq used\n"); for (amcc=amcc_devices;amcc;amcc=next) { next=amcc->next; - printk("%2d %2d %2d 0x%4x 0x%4x %3s 0x%4x 0x%4x %2d %2d\n", - amcc->pci_bus,amcc->pci_slot,amcc->pci_func,amcc->vendor,amcc->device,amcc->master?"yes":"no", + printk("%2d %2d %2d 0x%4x 0x%4x 0x%4x 0x%4x %2d %2d\n", + amcc->pci_bus,amcc->pci_slot,amcc->pci_func,amcc->vendor,amcc->device, amcc->io_addr[0],amcc->io_addr[2],amcc->irq,amcc->used); } @@ -429,7 +405,7 @@ void v_pci_card_list_display(void) /* return all card information for driver */ int i_pci_card_data(struct pcilst_struct *amcc, unsigned char *pci_bus, unsigned char *pci_slot, unsigned char *pci_func, - unsigned long *io_addr, unsigned short *irq, unsigned short *master) + unsigned long *io_addr, unsigned short *irq) { int i; @@ -440,7 +416,6 @@ int i_pci_card_data(struct pcilst_struct *amcc, for (i=0;i<5;i++) io_addr[i]=amcc->io_addr[i]; *irq=amcc->irq; - *master=amcc->master; return 0; } diff --git a/comedi/drivers/addi-data/addi_common.c b/comedi/drivers/addi-data/addi_common.c index fdef4c17..dbf21bed 100644 --- a/comedi/drivers/addi-data/addi_common.c +++ b/comedi/drivers/addi-data/addi_common.c @@ -2542,7 +2542,7 @@ static int i_ADDI_Attach(comedi_device *dev,comedi_devconfig *it) int ret,pages,i,n_subdevices; DWORD dw_Dummy; unsigned long io_addr[5]; - unsigned short master,irq;//v_58 + unsigned short irq;//v_58 unsigned long iobase_a,iobase_main,iobase_addon,iobase_reserved; struct pcilst_struct *card=NULL; unsigned char pci_bus,pci_slot,pci_func; @@ -2573,7 +2573,7 @@ static int i_ADDI_Attach(comedi_device *dev,comedi_devconfig *it) return -EIO; } - if ((i_pci_card_data(card,&pci_bus,&pci_slot,&pci_func,&io_addr[0],&irq,&master))<0) + if ((i_pci_card_data(card,&pci_bus,&pci_slot,&pci_func,&io_addr[0],&irq))<0) { i_pci_card_free(card); printk(" - Can't get AMCC data!\n"); @@ -2614,7 +2614,6 @@ static int i_ADDI_Attach(comedi_device *dev,comedi_devconfig *it) return -ENOMEM; } devpriv->amcc=card; - devpriv->master=master; //testing devpriv->iobase=dev->iobase; devpriv->i_IobaseAmcc=iobase_a;//AMCC base address... devpriv->i_IobaseAddon=iobase_addon;//ADD ON base address.... @@ -2748,7 +2747,6 @@ static int i_ADDI_Attach(comedi_device *dev,comedi_devconfig *it) if (!devpriv->ul_DmaBufferVirtual[0]) { rt_printk(", Can't allocate DMA buffer, DMA disabled!"); - master=0; devpriv->us_UseDma=ADDI_DISABLE; } diff --git a/comedi/drivers/addi-data/addi_common.h b/comedi/drivers/addi-data/addi_common.h index 564a6aa6..00854054 100644 --- a/comedi/drivers/addi-data/addi_common.h +++ b/comedi/drivers/addi-data/addi_common.h @@ -393,7 +393,6 @@ typedef struct{ INT i_IobaseReserved; ULONG_PTR dw_AiBase; struct pcilst_struct *amcc; // ptr too AMCC data - UINT master; // master capable BYTE allocated; // we have blocked card BYTE b_ValidDriver;// driver is ok BYTE b_AiContinuous; // we do unlimited AI -- 2.26.2