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

 DRIVER_OBJ drv;
 /*--- LOCALS ------------------------------------------------------------------------------*/
 /*--- FUNCTIONS ---------------------------------------------------------------------------*/
+struct proc_dir_entry *proc;
 static int my_interrupt(u16 intCSR)
+{
     int result = NOT_MY_INTERRUPT;
     if (intCSR & 0x0040)  // it is global enabled
         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);
+{
     u16 intCSR_store;
     u16 cntrl_store;
     int found = 0;
     u16 data;
     cntrl_store  = readw((const volatile void *) pd->pPCIADACntrl);  /* read CONTROL register */
     intCSR_store = readw((const volatile void *) pd->pPCIADAIntCSR); /* read interrupt + CSR register */
     PRINTK(KERN_DEBUG "%s : cntrl=0x%04x, intCSR=0x%04x\n", DEVICE_NAME, cntrl_store, intCSR_store);
             pd->cWordMode         = (data & 0x0004);
+        }
         // clear possible interrupts
         writew(cntrl_store & ~0x0100, (volatile void *) pd->pPCIADACntrl); /* clear potential interrupt */
         /* restore all contents */
         writew(cntrl_store,  (volatile void *) pd->pPCIADACntrl);
         writew(intCSR_store, (volatile void *) pd->pPCIADAIntCSR);
+    }
     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, " ---------------------\n");
     pos += sprintf(buf + pos, " Interfaces found : %d\n", drv.count);
     pos += sprintf(buf + pos, " Major Number     : %d\n", drv.nMajor);
             pos += sprintf(buf + pos, " Systemcontroller       : %s\n", (pd->cSystemController) ? "yes" : "no");
             pos += sprintf(buf + pos, " Word Mode              : %s\n", (pd->cWordMode) ? "yes" : "no");
+        }
         else
             pos += sprintf(buf + pos, " VMEMM is or was        : not (software) connected.\n");
         if (!((cntrl & 0x0800) && (!(cntrl & 0x0600))))
             pos += sprintf(buf + pos, " VMEMM is               : powered off or cable disconnected.\n");
         pos += sprintf(buf + pos, " IrqCount               : %d\n", pd->dwInterruptCount);
         if (pd->wIrqStatus & PCIADA_INTERRUPT)
                 cause = "VME";
         pos += sprintf(buf + pos, " Pending IrqStatus      : %s\n", cause);
+    }
     pos += sprintf(buf + pos, "\n");
+    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;
+}
     mode:       S_IFREG | S_IRUGO,  /* mode */
     nlink:      1,                  /* nlinks */
     get_info:   pcivme_read_proc,  /* function used to read data */
 };
 #else
-struct file_operations proc_fops = {
+struct file_operations pcivme_read_proc_fops = {
 read: pcivme_read_proc
 };
 #endif
 static void deleteMyLists(void)
+    }
     DeletePCIConfig(&drv);
+}
-int init_module(void)
+int pcivme_module_init(void)
+{
     PCIConfig        *ch;
     DEVICE_OBJ       *pd;
     int              result = 0;
     struct list_head *ptr;
         printk(KERN_DEBUG "%s : major #%d assigned.\n", DEVICE_NAME, drv.nMajor);
+    }
     /* register the proc device */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-    proc_register_dynamic(&proc_root, &pcimod_proc_entry);
-    return 0;
-#else
     // create_proc_read_entry is depricated since kernel 3.10
     //return create_proc_read_entry(DEVICE_NAME, 0, NULL, pcivme_read_proc, NULL) ? 0 : -ENODEV;
-    return proc_create_data(DEVICE_NAME, 0, NULL, &pcivme_fops, NULL) ? 0 : -ENODEV;
+    proc = proc_create_data(DEVICE_NAME, 0, NULL, &pcivme_read_proc_fops, NULL);
+    return (proc) ? 0 : -ENODEV;
-#endif
+}
-void cleanup_module(void)
+void pcivme_module_exit(void)
+{
     PCIConfig        *ch;
     DEVICE_OBJ       *pd;
     struct list_head *ptr;
     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);
             default: pd->wInitStep = 0;
+        }
         drv.count--;
+    }
     deleteMyLists();
     return;
+}
+module_init(pcivme_module_init);
+module_exit(pcivme_module_exit);

Subversion Repositories f9daq

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