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

 static int CmdMachine(DEVICE_OBJ *pd, const PCIVME_INIT_ELEMENT *psInitElement)
+{
     u32 adr;
     int err;
-    PRINTK(KERN_DEBUG "%s : CmdMachine()\n", DEVICE_NAME);
+    //PRINTK(KERN_DEBUG "%s : CmdMachine()\n", DEVICE_NAME);
     // loop through the init (or deinit) list
     while (psInitElement->bDestination != STOP)
+    {
         err = check_command(psInitElement);
 static int init_hardware(PATH_OBJ *pp, DEVICE_OBJ *pd, PCIVME_INIT_COMMAND *init)
+{
     int err;
     PCIVME_INIT_ELEMENT *element = init->sVie;
-    PRINTK(KERN_DEBUG "%s : init_hardware()\n", DEVICE_NAME);
+    PRINTK(KERN_INFO "%s : init_hardware()\n", DEVICE_NAME);
     err = CmdMachine(pd, element);
     if (err)
+    {
         PRINTK(KERN_DEBUG "%s : init failed with err = %d!\n", DEVICE_NAME, err);
+{
     u16 cntrl  = readw((const volatile void *) pd->pPCIADACntrl);
     u16 intCSR = readw((const volatile void *) pd->pPCIADAIntCSR);
     int status = 0;
-    PRINTK(KERN_DEBUG "%s : VMEMM_RESET()\n", DEVICE_NAME);
+    PRINTK(KERN_INFO "%s : VMEMM_RESET()\n", DEVICE_NAME);
     // am I connected and switched on??
     if ((cntrl & 0x0980) == 0x0980)
+    {
         // do command
             return -EINVAL;
+    }
     return 0;
+}
+/*
+static long  pcivme_compat_ioctl(struct file *pFile, unsigned int cmd, unsigned long arg){
+PRINTK(KERN_DEBUG "%s : pcivme_compat_ioctl(0x%08x), size = %d\n", DEVICE_NAME, cmd, _IOC_SIZE(cmd));
+return pcivme_ioctl(NULL, pFile, cmd,arg);
+}
+*/
 static long  pcivme_unlocked_ioctl(struct file *pFile, unsigned int cmd, unsigned long arg){
 long retval=0;
 #if HAVE_UNLOCKED_IOCTL
     struct mutex  fs_mutex;
    mutex_init(&fs_mutex);
    mutex_lock(&fs_mutex);
 #else
    lock_kernel();
 #endif
+PRINTK(KERN_DEBUG "%s : pcivme_unlocked_ioctl(0x%08x), size = %d\n", DEVICE_NAME, cmd, _IOC_SIZE(cmd));
 retval = pcivme_ioctl(NULL, pFile, cmd,arg);
 #if HAVE_UNLOCKED_IOCTL
    mutex_unlock(&fs_mutex);
 #else
    unlock_kernel();
 #endif
 return retval;
+}
 int pcivme_open(struct inode *pInode, struct file *pFile)
+{
     DEVICE_OBJ *pd   = 0;
     DEVICE_OBJ *desc = 0;
-        int nMinor = MINOR(pInode->i_rdev);
+    int nMinor = MINOR(pInode->i_rdev);
     struct list_head *ptr;
-    PRINTK(KERN_DEBUG "%s : pcivme_open(), %d, %d, scanning %d devices\n", DEVICE_NAME, major(pInode->i_rdev), nMinor, drv.count);
+    PRINTK(KERN_DEBUG "%s : pcivme_open(), %d, scanning %d devices\n", DEVICE_NAME, nMinor, drv.count);
     /* search for device */
     for (ptr = drv.devList.next; ptr != &drv.devList; ptr = ptr->next)
+    {
         pd = list_entry(ptr, DEVICE_OBJ, list);
         pd->bConnected =  get_module_info(pd);
         if (pd->bConnected)
+        {
             if (test_connection(pd))
+            {
-                printk(KERN_ERR "%s : connection test for module %d failed!\n", DEVICE_NAME, pd->cModuleNumber);
+                printk(KERN_ERR "%s :  pcivme_open() connection test for module %d failed!\n", DEVICE_NAME, pd->cModuleNumber);
                 pd->bConnected = 0;
+            }
             else
                 if (pd->cModuleNumber == nMinor)
+            {
                 desc = pd;
                 break;
+            }
+        }
         else
-            PRINTK(KERN_DEBUG "%s : module %d not connected!\n", DEVICE_NAME, nMinor);
+            PRINTK(KERN_DEBUG "%s  pcivme_open(): module %d not connected!\n", DEVICE_NAME, nMinor);
+    }
     if (desc)
+    {
         int       err;
         pp->read           = readByte;
         pp->write          = writeByte;
         pp->AlignmentCheck = MisalignmentForByteAccess;
         pFile->private_data = (void *)pp;
-        PRINTK(KERN_DEBUG "%s : found VMEMM module with number %d.\n", DEVICE_NAME, nMinor);
+        PRINTK(KERN_DEBUG "%s :  pcivme_open() found VMEMM module with number %d.\n", DEVICE_NAME, nMinor);
         if (!pd->nOpenCounter)
+        {
             err = CmdMachine(pd, init_element);
             if (err)
+            {
-                printk(KERN_ERR "%s : default init failed with err = %d!\n", DEVICE_NAME, err);
+                printk(KERN_ERR "%s :  pcivme_open() default init failed with err = %d!\n", DEVICE_NAME, err);
                 kfree_s(pp, sizeof(*pp));    // FREE(pFile->private_data);
                 return err;
+            }
+        }
         pd->nOpenCounter++;
+    }
     else
+    {
-        printk(KERN_ERR "%s : No VMEMM module found.\n", DEVICE_NAME);
+        printk(KERN_ERR "%s  pcivme_open(): No VMEMM module found.\n", DEVICE_NAME);
         return -ENODEV;
+    }
     __MOD_INC_USE_COUNT__;
     return 0;
 int pcivme_release(struct inode *pInode, struct file *pFile)
+{
     PATH_OBJ *pp;
-    PRINTK(KERN_DEBUG "%s : release()\n", DEVICE_NAME);
+    PRINTK(KERN_DEBUG "%s : pcivme_release()\n", DEVICE_NAME);
     if (pFile->private_data)
+    {
         pp = (PATH_OBJ *)pFile->private_data;
         if (pp && pp->pDo )
     return dwLocalCount - count;
+}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
+// http://learninglinuxkernel.in/writing-char-driver-for-linux-kernel-2-6/
+// http://appusajeev.wordpress.com/2011/06/18/writing-a-linux-character-device-driver/
-struct file_operations pcivme_fops =
+loff_t pcivme_lseek(struct file* filep, loff_t offset, int whence)
 {
-    NULL,             /* lseek */
+PRINTK(KERN_DEBUG "%s : pcivme_lseek(0x%08x, %d)\n", DEVICE_NAME, (u32) offset, whence);
-    pcivme_read,      /* read  */
+    switch (whence) {
-    pcivme_write,     /* write */
+      case 0: /* SEEK_SET */
-    NULL,             /* readdir */
+        filep->f_pos = offset;
+        break;
-    NULL,             /* select */
+      case 1: /* SEEK_CUR */
-    pcivme_ioctl,     /* ioctl */
+        filep->f_pos += offset;
+        break;
-    NULL,             /* mmap */
+      case 2: /* SEEK_END */
-    pcivme_open,      /* open */
+        return -EINVAL;
-    NULL,             /* flush */
+      default:
+        return -EINVAL;
+    };
-    pcivme_release,   /* release */
+    return filep->f_pos;
-};
+}
-#else
 struct file_operations pcivme_fops =
+{
+    .llseek    =    pcivme_lseek,  /* lseek  */
     .read    =    pcivme_read,     /* read  */
     .write   =    pcivme_write,    /* write */
+//    .compat_ioctl = pcivme_compat_ioctl,  /* ioctl */
     .unlocked_ioctl = pcivme_unlocked_ioctl,  /* ioctl */
     .open    =    pcivme_open,     /* open */
     .release =    pcivme_release,  /* release */
 };
-#endif

Subversion Repositories f9daq

(root)/pcivme-3.2/driver/fops.c – Rev 9 → 11