me8100: comparison me8100.c

equal deleted inserted replaced

-:67e56b4bce81
+:f7fb771d7842
 /* Major Device Number. 0 means to get it automatically from the System */
 static unsigned int major = 0;
-/* The queue all the readers are on. */
-DECLARE_WAIT_QUEUE_HEAD(me8100_readq);
 /* Prototypes */
 static int me8100_open(struct inode *, struct file *);
 static int me8100_release(struct inode *, struct file *);
 static int me8100_ioctl(struct inode *, struct file *,
 			unsigned int , unsigned long );
 for (i = 0; i <= 1; ++i) {
 info->subinfo[i].int_seen = 0;
 info->subinfo[i].int_count = 0;
 info->subinfo[i].fasync_ptr = NULL;
+init_waitqueue_head(&info->subinfo[i].readq);
 }
 /*--------------------------- Reset the board -----------------------------*/
 struct me8100_private_data *priv;
 PDEBUG("*** open for reading\n");
+/* Allocate memory for the private data.  If allocating fails,
+* call m8100_release() (which in turn decrements the mod-in-use-count)
+* and return IO error. */
+if (NULL == (priv = kmalloc(sizeof(*priv), GFP_KERNEL))) {
+printk(KERN_ERR"ME8100:me8100_open: kmalloc() failed.\n");
+me8100_release(inode_ptr, file_ptr);
+return -EIO;
+}
+priv->last_read = 0;
+file_ptr->private_data = priv;
 /* The first reader should setup the IRQs (enabling IRQ handling
 * with the full bit mask.  It might be modified later. */
 if (0 == subinfo->num_reader++) {
-int mask = 0xffff;
+int mask;
-unsigned short icsr = PCI_INT_EN
+unsigned short icsr;
-	| ((LOCAL_INT_EN | LOCAL_INT_POL) << (3 * subdevice));
-PDEBUG("*** first reader...\n");
+mask = 0xffff;
-subinfo->ctrl_rflags = 0;
+icsr = PCI_INT_EN | ((LOCAL_INT_EN | LOCAL_INT_POL) << (3 * subdevice));
-/* Allocate memory for the private data.  If allocating fails,
+PDEBUG("*** first reader on subdevice %d\n", subdevice);
-* call m8100_release() (which in turn decrements the mod-in-use-count)
-* and return IO error. */
-if (NULL == (priv = kmalloc(sizeof(*priv), GFP_KERNEL))) {
-	printk(KERN_ERR"ME8100:me8100_open: kmalloc() failed.\n");
-	me8100_release(inode_ptr, file_ptr);
-	return -EIO;
-}
-priv->last_read = 0;
-file_ptr->private_data = priv;
 /* 1) setup the PLX register */
 PDEBUG("*** plx = 0x%0x\n", icsr);
 outb(icsr, info->plx_regbase + PLX_ICSR);
-/* 2) setup the irq flags in regbase */
+/* 2) setup the interrupt mask */
+PDEBUG("*** irqmask = 0x%04x\n", mask);
+outw(mask, subinfo->regbase + ME8100_MASK_REG);
+/* 3) setup the irq flags in regbase */
 subinfo->ctrl_rflags = ME8100_CTRL_IRQ_MASK;
 subinfo->ctrl_reg |= subinfo->ctrl_rflags;
 PDEBUG("*** adding 0x%0x to ctrl => 0x%04x\n",
 	subinfo->ctrl_rflags, subinfo->ctrl_reg);
 outw(subinfo->ctrl_reg, subinfo->regbase + ME8100_CTRL_REG);
-/* 3) setup the interrupt mask */
-PDEBUG("*** irqmask = 0x%04x\n", mask);
-outw(mask, subinfo->regbase + ME8100_MASK_REG);
 } /* first reader */
 } /* reader */
 /* Resetting write mode if last writer is gone */
 if (file_ptr->f_mode & FMODE_WRITE) {
 PDEBUG("*** writer closes\n");
 if (0 == --subinfo->num_writer) {
+	PDEBUG("*** last writer...\n");
 	/*
 	PDEBUG("*** resetting ENIO mode ctrl: 0x%x\n", subinfo->ctrl_reg);
 	subinfo->ctrl_reg &= !subinfo->ctrl_wflags;
 	subinfo->ctrl_wflags = 0;
 	outw(subinfo->ctrl_reg, subinfo->regbase + ME8100_CTRL_REG);
 */
 static void me8100_isr(int irq, void *dev_id, struct pt_regs *regs){
 unsigned char icsr;
 unsigned short dummy;
 me8100_info_type *info;
+//unsigned short icsr_mask[] = { 0x45, 0x68 };
 PDEBUG("=====> me8100_isr() is executed\n");
 info = (me8100_info_type *) dev_id;
 struct me8100_subinfo *subinfo = &info->subinfo[0];
 PDEBUG("me8100_isr():Int1 occured\n");
 subinfo->int_seen = 1;
 subinfo->int_count++;
 dummy = inw(info->me8100_regbase + ME8100_RES_INT_REG_A);
+wake_up_interruptible(&subinfo->readq);
 if (subinfo->fasync_ptr) kill_fasync(&subinfo->fasync_ptr, SIGIO, POLL_IN);
 } else if((icsr & 0x68) == 0x68) {
 struct me8100_subinfo *subinfo = &info->subinfo[1];
 PDEBUG("me8100_isr():Int2 occured\n");
 subinfo->int_seen = 1;
 subinfo->int_count++;
 dummy = inw(info->me8100_regbase + ME8100_RES_INT_REG_B);
+wake_up_interruptible(&subinfo->readq);
 if (subinfo->fasync_ptr) kill_fasync(&subinfo->fasync_ptr, SIGIO, POLL_IN);
 } else {
 PDEBUG("me8100_isr():Not this Board\n");
 return;
 }
-PDEBUG("*** wake up sleeper\n");
+return;
-/* should be splitted too (one queue for each channel) */
-wake_up_interruptible(&me8100_readq);
 }
 if (len == 0) return 0;	/* do we really need this check? */
 if (len < 0) return -EINVAL;	/* do we really need this check? */
 if (priv->last_read > subinfo->last_change) {
 PDEBUG("*** going to sleep\n");
-interruptible_sleep_on(&me8100_readq);
+interruptible_sleep_on(&subinfo->readq);
 }
 priv->last_read = jiffies;
 val = inw(subinfo->regbase + ME8100_DI_REG);
 PDEBUG("me8100_read: val=0x%04x\n", val);

changeset 13	f7fb771d7842
parent 12	67e56b4bce81
child 14	c3f6d5e9713a