me8100: comparison me8100.c

equal deleted inserted replaced

-:984e6da93d95
+:23bb80f9220c
 * (request_region, ...)
 */
 #include <linux/ioport.h>
 #include <linux/fs.h>
+#include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 static int me8100_int_occur(me8100_int_occur_type *, me8100_info_t *);
 static int me8100_setup_icsr(unsigned char *, me8100_info_t *);
 static int me8100_read_icsr(unsigned char *, me8100_info_t *);
 static int me8100_get_board_info(me8100_info_t *, me8100_info_t *);
 static int me8100_get_int_count(me8100_int_occur_type *, me8100_info_t *);
+static int me8100_read_proc(char*, char**, off_t, int, int*, void*);
 static inline int DEVICE(int i) { return i & 0x0f; }
 static inline int SUBDEVICE(int i) { return (i >> 4) - 1; }
 *   On success the return value is 0, else is failure.
 *--------------------------------------------------------------------------
 * Author: GG
 * Modification:
 */
+int init_module(void){
 #ifdef CONFIG_PCI
-int init_module(void){
 int result;
 unsigned short board_count = 0;
 unsigned short sort_count;
 struct pci_dev *pci_dev_ptr = NULL;
 PDEBUG("init_module() is executed\n");
 /* Set the board context to 0 */
 memset(&info_vec, 0, sizeof(info_vec));
-if (pci_present()){
+if (pci_present()) {
 /* Search for ME8100_A boards */
 for(sort_count = 0;
 	sort_count < ME8100_MAX_DEVICES;
 	sort_count++, board_count++){
 pci_dev_ptr = pci_find_device(PCI_VENDOR_ID_MEILHAUS,
 */
 result = register_chrdev(major, ME8100_NAME, &me8100_file_operations);
 if (result < 0){
 printk(KERN_ERR"ME8100:init_module():Can't get major no\n");
 return result;
-}
+} else {
-else{
+/* Finally successful. */
 major = result;
 PDEBUG("init_module():Major = %d\n", major);
+create_proc_read_entry("me8100", 0, NULL, me8100_read_proc, NULL);
 }
 }
 else{
 printk(KERN_ERR"ME8100:init_module():No PCI-BIOS present !\n");
 return -ENODEV;
 }
 return 0;
+#else
+return -ENODEV
+#endif
 }
-#else
-return -ENODEV
-#endif
 /*
 * Routine:
 if ((icsr & icsr_mask[i]) == icsr_mask[i]) {
 me8100_subinfo_t *subinfo = &info->subinfo[i];
 PDEBUG("==> Interrupt for subdevice %d\n", i);
+/* Remember the the time the interrupt was seen. This is used
+* later from read() to decide if it has to wait for further
+* bytes on the input port. */
 subinfo->int_seen = jiffies;
 ++subinfo->int_count;
+/* Read the word and store it for later read().  Then
+* perform a "dummy" read to re-enable the IRQ line */
 subinfo->int_di = inw(subinfo->regbase + ME8100_INT_DI_REG);
-inw(subinfo->regbase + ME8100_RES_INT_REG);	  // dummy read
+inw(subinfo->regbase + ME8100_RES_INT_REG);
 PDEBUG("==> read: 0x%04x\n", subinfo->int_di);
+/* Now wake up all sleeping processes and send the
+* interrupt (SIGIO) signal to all asked for. */
 wake_up_interruptible(&subinfo->readq);
 if (subinfo->fasync_ptr) kill_fasync(&subinfo->fasync_ptr, SIGIO, POLL_IN);
 }
 }
 if(major){
 err = unregister_chrdev(major, ME8100_NAME);
 if(err)
 printk(KERN_WARNING"ME8100:cleanup_module():cannot unregister major\n");
 }
+remove_proc_entry("me8100", NULL);
 }
 /* Reading: we do only read (at most) one word (an usigned short) and return immediatly,
 * thus passing the responsibility for reading a bunch of words back to the caller.
 * This seems to be ok, since it's not expected to read more than one word at once
 if (len == 0) return 0;	/* do we really need this check? */
 if (len < 0) return -EINVAL;	/* do we really need this check? */
 /* If the time we did the last read operation is more recent than the
-* last interupt, we have to go to sleep (or return -EAGAIN in non blockin
+* last interupt, we have to go to sleep (or return -EAGAIN in non blocking
 * mode).  Then, if we're awoken, we return the value that triggered the
 * interrupt.  (If awoken from a signal, we return -ERESTARTSYS.)
 *
 * If we haven't read any data since the last irq occured, we return
 * the current(!) value visible on the port!
 if (wait_event_interruptible(subinfo->readq, (priv->last_read != subinfo->int_seen)))
 return -ERESTARTSYS;
 val = subinfo->int_di;
-} else val = inw(subinfo->regbase + ME8100_DI_REG);
+} else val = subinfo->int_di = inw(subinfo->regbase + ME8100_DI_REG);
-PDEBUG("me8100_read: val=0x%04x\n", val);
 /* Remember the time of the last interrupt we've seen.  (It might be
 * 0 if there was no interrupt yet.  This doesn't hurt, since the next
 * read will see this (see above) and will wait until an irq raises.)
 */
 priv->last_read = subinfo->int_seen;
+PDEBUG("me8100_read: val=0x%04x\n", val);
 /* Return at most 2 byte, but check if the read want's them both! */
 if (len >= sizeof(val)) {
 err = put_user(val, (unsigned short*) buffer);
 len = sizeof(val);
 if (priv->last_read >= subinfo->int_seen) return 0;
 return POLLIN | POLLRDNORM;
 }
+int me8100_read_proc(char *buffer, char **start, off_t offset, int count, int *eof, void *data)
+{
+int len = 0;
+len += sprintf(buffer + len, "Version: $Id$\n");
+*eof = 1;
+return len;
+}
 /*
 vim:sts=2 sw=2 aw ai sm:
 */

changeset 26	23bb80f9220c
parent 24	24a49943680f
child 27	4516904df6b3