WebSVN – f9daq – Diff – /pcivme-3.2/driver/main.c

         return IRQ_RETVAL(0);
+}
 static int request_io_memory(PCIConfig *pPch)
+{
-    if (check_mem_region(pci_resource_start(pPch->pciDev, 0),  LCR_SPACE))
+    if (!request_mem_region(pci_resource_start(pPch->pciDev, 0),  LCR_SPACE, DEVICE_NAME) ) {
-    {
+                        PRINTK(KERN_WARNING "%s: LCR memory region %llx-%llx already in use\n", DEVICE_NAME,
-        PRINTK(KERN_DEBUG "%s : LCR 0x%08lx\n", DEVICE_NAME, (long unsigned int) pci_resource_start(pPch->pciDev, 0));
+                                 pci_resource_start(pPch->pciDev, 0), pci_resource_start(pPch->pciDev, 0) + LCR_SPACE );
+                        kfree(pPch);
-        return -EBUSY;
+                        return EBUSY;
-    }
+    };
-    if (check_mem_region(pci_resource_start(pPch->pciDev, 2),  CTL_SPACE))
+    if (!request_mem_region(pci_resource_start(pPch->pciDev, 2),  CTL_SPACE, DEVICE_NAME) ){
-    {
+                        PRINTK(KERN_WARNING "%s: CTL memory region %llx-%llx already in use\n", DEVICE_NAME,
-        PRINTK(KERN_DEBUG "%s : CTL 0x%08lx\n", DEVICE_NAME, (long unsigned int) pci_resource_start(pPch->pciDev, 2));
+                                 pci_resource_start(pPch->pciDev, 0),  pci_resource_start(pPch->pciDev, 2) + CTL_SPACE );
+                        kfree(pPch);
-        return -EBUSY;
+                        return EBUSY;
-    }
-    if (check_mem_region(pci_resource_start(pPch->pciDev, 2) + CTL_SPACE, VME_SPACE))
-    {
-        PRINTK(KERN_DEBUG "%s : VME 0x%08lx\n", DEVICE_NAME, (long unsigned int) pci_resource_start(pPch->pciDev, 2) + CTL_SPACE);
-        return -EBUSY;
+    }
+    if (!request_mem_region(pci_resource_start(pPch->pciDev, 2) + CTL_SPACE, VME_SPACE, DEVICE_NAME) ){
+                        PRINTK(KERN_WARNING "%s: VME memory region %llx-%llx already in use\n", DEVICE_NAME,
+                                 pci_resource_start(pPch->pciDev, 0)+CTL_SPACE,  pci_resource_start(pPch->pciDev, 0) + LCR_SPACE+VME_SPACE );
+                        kfree(pPch);
+                        return EBUSY;
-    request_mem_region(pci_resource_start(pPch->pciDev, 0),  LCR_SPACE, DEVICE_NAME);
-    request_mem_region(pci_resource_start(pPch->pciDev, 2),  CTL_SPACE, DEVICE_NAME);
-    request_mem_region(pci_resource_start(pPch->pciDev, 2) + CTL_SPACE, VME_SPACE, DEVICE_NAME);
+    };
     return 0;
+}
 static void release_io_memory(PCIConfig *pPch)
 {
     release_mem_region(pci_resource_start(pPch->pciDev, 0),  LCR_SPACE);
     release_mem_region(pci_resource_start(pPch->pciDev, 2),  CTL_SPACE);
     release_mem_region(pci_resource_start(pPch->pciDev, 2) + CTL_SPACE, VME_SPACE);
+}
+    {
         pd->pPhysVME = pci_resource_start(pPch->pciDev, 2) + CTL_SPACE;
         pd->pCtl = (u32)ioremap(pci_resource_start(pPch->pciDev, 2)            , CTL_SPACE);
         pd->pVME = (u32)ioremap(pci_resource_start(pPch->pciDev, 2) + CTL_SPACE, VME_SPACE);
     }
     return 0;
+}
 static void un_translate_addresses(DEVICE_OBJ *pd, PCIConfig *pPch)
+{
     u32 dwStore;
     u16 wRet;
     cntrl_store  = readw((const volatile void *) pd->pPCIADACntrl);         /* read CONTROL register */
     intCSR_store = readw((const volatile void *) pd->pPCIADAIntCSR);        /* read interrupt + CSR register */
     writew(0, (volatile void *) pd->pPCIADAIntCSR);                   /* disable interrupts */
     writew(cntrl_store | 0x0180, (volatile void *) pd->pPCIADACntrl); /* enable access */
     // save adr register
     dwStore = readl((const volatile void *) dwADRHL);
     for (i = 1000; i; i--)
+    {
         writew(0x5555, (volatile void *) dwADRH);
         writew(0xAAAA, (volatile void *) dwADRL);
         wRet   = readw((const volatile void *) dwADRH);
         if (wRet != 0x5555)
         {
             error = 1;
             break;
+        }
         writew(0xAAAA, (volatile void *) dwADRH);
         writew(0x5555, (volatile void *) dwADRL);
         wRet   = readw((const volatile void *) dwADRH);
         if (wRet != 0xAAAA)
         {
             error = 1;
             break;
+        }
         writew(0x0000, (volatile void *) dwADRH);
         writew(0xFFFF, (volatile void *) dwADRL);
         wRet   = readw((const volatile void *) dwADRH);
         if (wRet != 0x0000)
         {
             error = 1;
             break;
         }
         writew(0xFFFF, (volatile void *) dwADRH);
         writew(0x0000, (volatile void *) dwADRL);
         wRet   = readw((const volatile void *) dwADRH);
         if (wRet != 0xFFFF)
+    }
     return found;
+}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-static int pcivme_read_proc(char *buf, char **start, off_t offset, int len)
-#else
 //static int pcivme_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *data)
-static int pcivme_read_proc(struct file *filp,char *buf,size_t count,loff_t *offp )
+static ssize_t pcivme_read_proc(struct file *filp,char *buf,size_t count,loff_t *offp )
-#endif
+    {
     int              pos = 0;
     DEVICE_OBJ       *pd;
     PCIConfig        *ch;
     u16                cntrl;
     char             *cause = "none";
     struct list_head *ptr;
     PRINTK(KERN_DEBUG "%s : pcivme_read_proc()\n",DEVICE_NAME);
     if (*offp != 0) return 0;
-    pos += sprintf(buf + pos, "\nPCIVME information. Version %d.%d of %s from Klaus Hitschler.\n", VERSION_HI, VERSION_LO, __DATE__);
+    pos += sprintf(buf + pos, "\nPCIVME information. Version %d.%d from Klaus Hitschler.\n", VERSION_HI, VERSION_LO);
     pos += sprintf(buf + pos, " ---------------------\n");
     pos += sprintf(buf + pos, " Interfaces found : %d\n", drv.count);
     pos += sprintf(buf + pos, " Major Number     : %d\n", drv.nMajor);
     if (pos>count) {
       buf[count-1]=0;
       pos=count;
+    }
     PRINTK(KERN_DEBUG "%s : pcivme_read_proc() end count=%d\n",DEVICE_NAME, pos);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
     //*eof = 1;
-#endif
     *offp = pos;
     return pos;
+}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-struct proc_dir_entry pcimod_proc_entry =
-{
-    namelen:    7,                  /* len of name */
-    name:       DEVICE_NAME,        /* entry  name */
-    mode:       S_IFREG | S_IRUGO,  /* mode */
-    nlink:      1,                  /* nlinks */
-    get_info:   pcivme_read_proc,  /* function used to read data */
-};
-#else
-struct file_operations pcivme_read_proc_fops = {
+static const struct proc_ops  pcivme_read_proc_fops = {
-read: pcivme_read_proc
+proc_read: pcivme_read_proc
 };
-#endif
 static void deleteMyLists(void)
+{
     DEVICE_OBJ      *pd;
                 pd->pCSR    = pd->pCtl + CSR;
                 pd->pPCIADACntrl  = pd->pLCR + PLX9050_CNTRL;
                 pd->pPCIADAIntCSR = pd->pLCR + PLX9050_INTCSR;
-                if (request_irq(pd->pPch->pciDev->irq, pcivme_irqhandler, IRQF_DISABLED| IRQF_SHARED, DEVICE_NAME, pd))
+                //if (request_irq(pd->pPch->pciDev->irq, pcivme_irqhandler, IRQF_DISABLED| IRQF_SHARED, DEVICE_NAME, pd))
+                if (request_irq(pd->pPch->pciDev->irq, pcivme_irqhandler, IRQF_SHARED, DEVICE_NAME, pd))
+                {
                     printk(KERN_ERR "%s : can't get irq @ %d\n", DEVICE_NAME, pd->pPch->pciDev->irq);
                     kfree_s(pd, sizeof(*pd));       // FREE(pd);
+                }
                 else
     PRINTK(KERN_DEBUG "%s : cleanup_module.\n", DEVICE_NAME);
     unregister_chrdev(drv.nMajor, DEVICE_NAME);
     /* unregister the proc device */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-    proc_unregister(&proc_root, pcimod_proc_entry.low_ino);
-#else
     remove_proc_entry(DEVICE_NAME, NULL);
-#endif
     /* redo all */
     for (ptr = drv.devList.next; ptr != &drv.devList; ptr = ptr->next)
+    {
         pd = list_entry(ptr, DEVICE_OBJ, list);

Subversion Repositories f9daq

(root)/pcivme-3.2/driver/main.c – Rev 44 → 362