This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / istallion.c

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 4a8b7d5..ba5229b 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -680,8 +680,8 @@ static int  stli_portinfo(stlibrd_t *brdp, stliport_t *portp, int portnr, char *p
 
 static int     stli_brdinit(stlibrd_t *brdp);
 static int     stli_startbrd(stlibrd_t *brdp);
-static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp);
-static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp);
+static ssize_t stli_memread(struct file *fp, char *buf, size_t count, loff_t *offp);
+static ssize_t stli_memwrite(struct file *fp, const char *buf, size_t count, loff_t *offp);
 static int     stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);
 static void    stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp);
 static void    stli_poll(unsigned long arg);
@@ -700,14 +700,14 @@ static void       stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tio
 static void    stli_mkasysigs(asysigs_t *sp, int dtr, int rts);
 static long    stli_mktiocm(unsigned long sigvalue);
 static void    stli_read(stlibrd_t *brdp, stliport_t *portp);
-static int     stli_getserial(stliport_t *portp, struct serial_struct __user *sp);
-static int     stli_setserial(stliport_t *portp, struct serial_struct __user *sp);
-static int     stli_getbrdstats(combrd_t __user *bp);
-static int     stli_getportstats(stliport_t *portp, comstats_t __user *cp);
+static int     stli_getserial(stliport_t *portp, struct serial_struct *sp);
+static int     stli_setserial(stliport_t *portp, struct serial_struct *sp);
+static int     stli_getbrdstats(combrd_t *bp);
+static int     stli_getportstats(stliport_t *portp, comstats_t *cp);
 static int     stli_portcmdstats(stliport_t *portp);
-static int     stli_clrportstats(stliport_t *portp, comstats_t __user *cp);
-static int     stli_getportstruct(stliport_t __user *arg);
-static int     stli_getbrdstruct(stlibrd_t __user *arg);
+static int     stli_clrportstats(stliport_t *portp, comstats_t *cp);
+static int     stli_getportstruct(unsigned long arg);
+static int     stli_getbrdstruct(unsigned long arg);
 static void    *stli_memalloc(int len);
 static stlibrd_t *stli_allocbrd(void);
 
@@ -808,7 +808,7 @@ static int __init istallion_module_init(void)
 {
        unsigned long   flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("init_module()\n");
 #endif
 
@@ -829,7 +829,7 @@ static void __exit istallion_module_exit(void)
        unsigned long   flags;
        int             i, j;
 
-#ifdef DEBUG
+#if DEBUG
        printk("cleanup_module()\n");
 #endif
 
@@ -901,13 +901,13 @@ module_exit(istallion_module_exit);
  *     Check for any arguments passed in on the module load command line.
  */
 
-static void stli_argbrds(void)
+static void stli_argbrds()
 {
        stlconf_t       conf;
        stlibrd_t       *brdp;
        int             nrargs, i;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_argbrds()\n");
 #endif
 
@@ -975,7 +975,7 @@ static int stli_parsebrd(stlconf_t *confp, char **argp)
        char    *sp;
        int     nrbrdnames, i;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_parsebrd(confp=%x,argp=%x)\n", (int) confp, (int) argp);
 #endif
 
@@ -1025,7 +1025,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
        unsigned int    minordev;
        int             brdnr, portnr, rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_open(tty=%x,filp=%x): device=%s\n", (int) tty,
                (int) filp, tty->name);
 #endif
@@ -1125,7 +1125,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
        stliport_t      *portp;
        unsigned long   flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_close(tty=%x,filp=%x)\n", (int) tty, (int) filp);
 #endif
 
@@ -1210,7 +1210,7 @@ static int stli_initopen(stlibrd_t *brdp, stliport_t *portp)
        asyport_t               aport;
        int                     rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_initopen(brdp=%x,portp=%x)\n", (int) brdp, (int) portp);
 #endif
 
@@ -1263,7 +1263,7 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i
        unsigned long           flags;
        int                     rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_rawopen(brdp=%x,portp=%x,arg=%x,wait=%d)\n",
                (int) brdp, (int) portp, (int) arg, wait);
 #endif
@@ -1344,7 +1344,7 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,
        unsigned long           flags;
        int                     rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_rawclose(brdp=%x,portp=%x,arg=%x,wait=%d)\n",
                (int) brdp, (int) portp, (int) arg, wait);
 #endif
@@ -1417,7 +1417,7 @@ static int stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, v
 {
        unsigned long   flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_cmdwait(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"
                "copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,
                (int) arg, size, copyback);
@@ -1461,7 +1461,7 @@ static int stli_setport(stliport_t *portp)
        stlibrd_t       *brdp;
        asyport_t       aport;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_setport(portp=%x)\n", (int) portp);
 #endif
 
@@ -1489,7 +1489,7 @@ static int stli_setport(stliport_t *portp)
 
 static void stli_delay(int len)
 {
-#ifdef DEBUG
+#if DEBUG
        printk("stli_delay(len=%d)\n", len);
 #endif
        if (len > 0) {
@@ -1510,7 +1510,7 @@ static int stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *fil
        unsigned long   flags;
        int             rc, doclocal;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_waitcarrier(brdp=%x,portp=%x,filp=%x)\n",
                (int) brdp, (int) portp, (int) filp);
 #endif
@@ -1578,7 +1578,7 @@ static int stli_write(struct tty_struct *tty, int from_user, const unsigned char
        unsigned int            len, stlen, head, tail, size;
        unsigned long           flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_write(tty=%x,from_user=%d,buf=%x,count=%d)\n",
                (int) tty, from_user, (int) buf, count);
 #endif
@@ -1699,7 +1699,7 @@ static int stli_write(struct tty_struct *tty, int from_user, const unsigned char
 
 static void stli_putchar(struct tty_struct *tty, unsigned char ch)
 {
-#ifdef DEBUG
+#if DEBUG
        printk("stli_putchar(tty=%x,ch=%x)\n", (int) tty, (int) ch);
 #endif
 
@@ -1736,7 +1736,7 @@ static void stli_flushchars(struct tty_struct *tty)
        unsigned char           *buf, *shbuf;
        unsigned long           flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_flushchars(tty=%x)\n", (int) tty);
 #endif
 
@@ -1827,7 +1827,7 @@ static int stli_writeroom(struct tty_struct *tty)
        unsigned int            head, tail, len;
        unsigned long           flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_writeroom(tty=%x)\n", (int) tty);
 #endif
 
@@ -1887,7 +1887,7 @@ static int stli_charsinbuffer(struct tty_struct *tty)
        unsigned int            head, tail, len;
        unsigned long           flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_charsinbuffer(tty=%x)\n", (int) tty);
 #endif
 
@@ -1927,12 +1927,12 @@ static int stli_charsinbuffer(struct tty_struct *tty)
  *     Generate the serial struct info.
  */
 
-static int stli_getserial(stliport_t *portp, struct serial_struct __user *sp)
+static int stli_getserial(stliport_t *portp, struct serial_struct *sp)
 {
        struct serial_struct    sio;
        stlibrd_t               *brdp;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_getserial(portp=%x,sp=%x)\n", (int) portp, (int) sp);
 #endif
 
@@ -1964,13 +1964,13 @@ static int stli_getserial(stliport_t *portp, struct serial_struct __user *sp)
  *     just quietly ignore any requests to change irq, etc.
  */
 
-static int stli_setserial(stliport_t *portp, struct serial_struct __user *sp)
+static int stli_setserial(stliport_t *portp, struct serial_struct *sp)
 {
        struct serial_struct    sio;
        int                     rc;
 
-#ifdef DEBUG
-       printk("stli_setserial(portp=%p,sp=%p)\n", portp, sp);
+#if DEBUG
+       printk("stli_setserial(portp=%x,sp=%x)\n", (int) portp, (int) sp);
 #endif
 
        if (copy_from_user(&sio, sp, sizeof(struct serial_struct)))
@@ -2058,9 +2058,8 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
        stlibrd_t       *brdp;
        unsigned int    ival;
        int             rc;
-       void __user *argp = (void __user *)arg;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_ioctl(tty=%x,file=%x,cmd=%x,arg=%x)\n",
                (int) tty, (int) file, cmd, (int) arg);
 #endif
@@ -2087,32 +2086,40 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
        switch (cmd) {
        case TIOCGSOFTCAR:
                rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0),
-                       (unsigned __user *) arg);
+                       (unsigned int *) arg);
                break;
        case TIOCSSOFTCAR:
-               if ((rc = get_user(ival, (unsigned __user *) arg)) == 0)
+               if ((rc = get_user(ival, (unsigned int *) arg)) == 0)
                        tty->termios->c_cflag =
                                (tty->termios->c_cflag & ~CLOCAL) |
                                (ival ? CLOCAL : 0);
                break;
        case TIOCGSERIAL:
-               rc = stli_getserial(portp, argp);
+               if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+                   sizeof(struct serial_struct))) == 0)
+                       rc = stli_getserial(portp, (struct serial_struct *) arg);
                break;
        case TIOCSSERIAL:
-               rc = stli_setserial(portp, argp);
+               if ((rc = verify_area(VERIFY_READ, (void *) arg,
+                   sizeof(struct serial_struct))) == 0)
+                       rc = stli_setserial(portp, (struct serial_struct *)arg);
                break;
        case STL_GETPFLAG:
-               rc = put_user(portp->pflag, (unsigned __user *)argp);
+               rc = put_user(portp->pflag, (unsigned int *) arg);
                break;
        case STL_SETPFLAG:
-               if ((rc = get_user(portp->pflag, (unsigned __user *)argp)) == 0)
+               if ((rc = get_user(portp->pflag, (unsigned int *) arg)) == 0)
                        stli_setport(portp);
                break;
        case COM_GETPORTSTATS:
-               rc = stli_getportstats(portp, argp);
+               if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+                   sizeof(comstats_t))) == 0)
+                       rc = stli_getportstats(portp, (comstats_t *) arg);
                break;
        case COM_CLRPORTSTATS:
-               rc = stli_clrportstats(portp, argp);
+               if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+                   sizeof(comstats_t))) == 0)
+                       rc = stli_clrportstats(portp, (comstats_t *) arg);
                break;
        case TIOCSERCONFIG:
        case TIOCSERGWILD:
@@ -2143,7 +2150,7 @@ static void stli_settermios(struct tty_struct *tty, struct termios *old)
        struct termios  *tiosp;
        asyport_t       aport;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_settermios(tty=%x,old=%x)\n", (int) tty, (int) old);
 #endif
 
@@ -2190,7 +2197,7 @@ static void stli_throttle(struct tty_struct *tty)
 {
        stliport_t      *portp;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_throttle(tty=%x)\n", (int) tty);
 #endif
 
@@ -2215,7 +2222,7 @@ static void stli_unthrottle(struct tty_struct *tty)
 {
        stliport_t      *portp;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_unthrottle(tty=%x)\n", (int) tty);
 #endif
 
@@ -2241,7 +2248,7 @@ static void stli_stop(struct tty_struct *tty)
        stliport_t      *portp;
        asyctrl_t       actrl;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_stop(tty=%x)\n", (int) tty);
 #endif
 
@@ -2275,7 +2282,7 @@ static void stli_start(struct tty_struct *tty)
        stlibrd_t       *brdp;
        asyctrl_t       actrl;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_start(tty=%x)\n", (int) tty);
 #endif
 
@@ -2312,7 +2319,7 @@ static void stli_dohangup(void *arg)
 {
        stliport_t      *portp;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_dohangup(portp=%x)\n", (int) arg);
 #endif
 
@@ -2344,7 +2351,7 @@ static void stli_hangup(struct tty_struct *tty)
        stlibrd_t       *brdp;
        unsigned long   flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_hangup(tty=%x)\n", (int) tty);
 #endif
 
@@ -2402,7 +2409,7 @@ static void stli_flushbuffer(struct tty_struct *tty)
        stlibrd_t       *brdp;
        unsigned long   ftype, flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_flushbuffer(tty=%x)\n", (int) tty);
 #endif
 
@@ -2452,7 +2459,7 @@ static void stli_breakctl(struct tty_struct *tty, int state)
        long            arg;
        /* long savestate, savetime; */
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_breakctl(tty=%x,state=%d)\n", (int) tty, state);
 #endif
 
@@ -2491,7 +2498,7 @@ static void stli_waituntilsent(struct tty_struct *tty, int timeout)
        stliport_t      *portp;
        unsigned long   tend;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_waituntilsent(tty=%x,timeout=%x)\n", (int) tty, timeout);
 #endif
 
@@ -2522,7 +2529,7 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)
        stliport_t      *portp;
        asyctrl_t       actrl;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_sendxchar(tty=%x,ch=%x)\n", (int) tty, ch);
 #endif
 
@@ -2629,7 +2636,7 @@ static int stli_readproc(char *page, char **start, off_t off, int count, int *eo
        int             curoff, maxoff;
        char            *pos;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_readproc(page=%x,start=%x,off=%x,count=%d,eof=%x,"
                "data=%x\n", (int) page, (int) start, (int) off, count,
                (int) eof, (int) data);
@@ -2705,7 +2712,7 @@ static void stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd,
        volatile unsigned char  *bits;
        unsigned long           flags;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_sendcmd(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"
                "copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,
                (int) arg, size, copyback);
@@ -2759,7 +2766,7 @@ static inline void stli_read(stlibrd_t *brdp, stliport_t *portp)
        unsigned int            head, tail, size;
        unsigned int            len, stlen;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_read(brdp=%x,portp=%d)\n",
                        (int) brdp, (int) portp);
 #endif
@@ -2876,7 +2883,7 @@ static inline int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)
        unsigned long           oldsigs;
        int                     rc, donerx;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_hostcmd(brdp=%x,channr=%d)\n",
                        (int) brdp, channr);
 #endif
@@ -3128,7 +3135,7 @@ static void stli_poll(unsigned long arg)
 
 static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp)
 {
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_mkasyport(portp=%x,pp=%x,tiosp=%d)\n",
                (int) portp, (int) pp, (int) tiosp);
 #endif
@@ -3251,7 +3258,7 @@ static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tio
 
 static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts)
 {
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_mkasysigs(sp=%x,dtr=%d,rts=%d)\n",
                        (int) sp, dtr, rts);
 #endif
@@ -3278,7 +3285,7 @@ static long stli_mktiocm(unsigned long sigvalue)
 {
        long    tiocm;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_mktiocm(sigvalue=%x)\n", (int) sigvalue);
 #endif
 
@@ -3304,7 +3311,7 @@ static inline int stli_initports(stlibrd_t *brdp)
        stliport_t      *portp;
        int             i, panelnr, panelport;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_initports(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3348,7 +3355,7 @@ static void stli_ecpinit(stlibrd_t *brdp)
 {
        unsigned long   memconf;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpinit(brdp=%d)\n", (int) brdp);
 #endif
 
@@ -3365,7 +3372,7 @@ static void stli_ecpinit(stlibrd_t *brdp)
 
 static void stli_ecpenable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpenable(brdp=%x)\n", (int) brdp);
 #endif
        outb(ECP_ATENABLE, (brdp->iobase + ECP_ATCONFR));
@@ -3375,7 +3382,7 @@ static void stli_ecpenable(stlibrd_t *brdp)
 
 static void stli_ecpdisable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpdisable(brdp=%x)\n", (int) brdp);
 #endif
        outb(ECP_ATDISABLE, (brdp->iobase + ECP_ATCONFR));
@@ -3388,7 +3395,7 @@ static char *stli_ecpgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
        void            *ptr;
        unsigned char   val;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
                (int) offset);
 #endif
@@ -3397,7 +3404,7 @@ static char *stli_ecpgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                        (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % ECP_ATPAGESIZE);
@@ -3411,7 +3418,7 @@ static char *stli_ecpgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 
 static void stli_ecpreset(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpreset(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3425,7 +3432,7 @@ static void stli_ecpreset(stlibrd_t *brdp)
 
 static void stli_ecpintr(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpintr(brdp=%x)\n", (int) brdp);
 #endif
        outb(0x1, brdp->iobase);
@@ -3441,7 +3448,7 @@ static void stli_ecpeiinit(stlibrd_t *brdp)
 {
        unsigned long   memconf;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpeiinit(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3478,7 +3485,7 @@ static char *stli_ecpeigetmemptr(stlibrd_t *brdp, unsigned long offset, int line
        void            *ptr;
        unsigned char   val;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecpeigetmemptr(brdp=%x,offset=%x,line=%d)\n",
                (int) brdp, (int) offset, line);
 #endif
@@ -3487,7 +3494,7 @@ static char *stli_ecpeigetmemptr(stlibrd_t *brdp, unsigned long offset, int line
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                        (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % ECP_EIPAGESIZE);
@@ -3539,7 +3546,7 @@ static char *stli_ecpmcgetmemptr(stlibrd_t *brdp, unsigned long offset, int line
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                        (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % ECP_MCPAGESIZE);
@@ -3567,7 +3574,7 @@ static void stli_ecpmcreset(stlibrd_t *brdp)
 
 static void stli_ecppciinit(stlibrd_t *brdp)
 {
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecppciinit(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3584,7 +3591,7 @@ static char *stli_ecppcigetmemptr(stlibrd_t *brdp, unsigned long offset, int lin
        void            *ptr;
        unsigned char   val;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_ecppcigetmemptr(brdp=%x,offset=%x,line=%d)\n",
                (int) brdp, (int) offset, line);
 #endif
@@ -3593,7 +3600,7 @@ static char *stli_ecppcigetmemptr(stlibrd_t *brdp, unsigned long offset, int lin
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), board=%d\n",
                                (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % ECP_PCIPAGESIZE);
@@ -3623,7 +3630,7 @@ static void stli_onbinit(stlibrd_t *brdp)
 {
        unsigned long   memconf;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbinit(brdp=%d)\n", (int) brdp);
 #endif
 
@@ -3642,7 +3649,7 @@ static void stli_onbinit(stlibrd_t *brdp)
 
 static void stli_onbenable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbenable(brdp=%x)\n", (int) brdp);
 #endif
        outb((brdp->enabval | ONB_ATENABLE), (brdp->iobase + ONB_ATCONFR));
@@ -3652,7 +3659,7 @@ static void stli_onbenable(stlibrd_t *brdp)
 
 static void stli_onbdisable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbdisable(brdp=%x)\n", (int) brdp);
 #endif
        outb((brdp->enabval | ONB_ATDISABLE), (brdp->iobase + ONB_ATCONFR));
@@ -3664,7 +3671,7 @@ static char *stli_onbgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 {      
        void    *ptr;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
                (int) offset);
 #endif
@@ -3673,7 +3680,7 @@ static char *stli_onbgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                                (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
        } else {
                ptr = brdp->membase + (offset % ONB_ATPAGESIZE);
        }
@@ -3685,7 +3692,7 @@ static char *stli_onbgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 static void stli_onbreset(stlibrd_t *brdp)
 {      
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbreset(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3705,7 +3712,7 @@ static void stli_onbeinit(stlibrd_t *brdp)
 {
        unsigned long   memconf;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbeinit(brdp=%d)\n", (int) brdp);
 #endif
 
@@ -3727,7 +3734,7 @@ static void stli_onbeinit(stlibrd_t *brdp)
 
 static void stli_onbeenable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbeenable(brdp=%x)\n", (int) brdp);
 #endif
        outb(ONB_EIENABLE, (brdp->iobase + ONB_EICONFR));
@@ -3737,7 +3744,7 @@ static void stli_onbeenable(stlibrd_t *brdp)
 
 static void stli_onbedisable(stlibrd_t *brdp)
 {      
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbedisable(brdp=%x)\n", (int) brdp);
 #endif
        outb(ONB_EIDISABLE, (brdp->iobase + ONB_EICONFR));
@@ -3750,7 +3757,7 @@ static char *stli_onbegetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
        void            *ptr;
        unsigned char   val;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_onbegetmemptr(brdp=%x,offset=%x,line=%d)\n",
                (int) brdp, (int) offset, line);
 #endif
@@ -3759,7 +3766,7 @@ static char *stli_onbegetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                        (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % ONB_EIPAGESIZE);
@@ -3777,7 +3784,7 @@ static char *stli_onbegetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 static void stli_onbereset(stlibrd_t *brdp)
 {      
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_ERR "stli_onbereset(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3796,7 +3803,7 @@ static void stli_onbereset(stlibrd_t *brdp)
 static void stli_bbyinit(stlibrd_t *brdp)
 {
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_ERR "stli_bbyinit(brdp=%d)\n", (int) brdp);
 #endif
 
@@ -3815,7 +3822,7 @@ static char *stli_bbygetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
        void            *ptr;
        unsigned char   val;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_ERR "stli_bbygetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
                (int) offset);
 #endif
@@ -3824,7 +3831,7 @@ static char *stli_bbygetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                                (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
                val = 0;
        } else {
                ptr = brdp->membase + (offset % BBY_PAGESIZE);
@@ -3839,7 +3846,7 @@ static char *stli_bbygetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 static void stli_bbyreset(stlibrd_t *brdp)
 {      
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_bbyreset(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3858,7 +3865,7 @@ static void stli_bbyreset(stlibrd_t *brdp)
 static void stli_stalinit(stlibrd_t *brdp)
 {
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_stalinit(brdp=%d)\n", (int) brdp);
 #endif
 
@@ -3872,7 +3879,7 @@ static char *stli_stalgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
 {      
        void    *ptr;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_stalgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
                (int) offset);
 #endif
@@ -3881,7 +3888,7 @@ static char *stli_stalgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)
                printk(KERN_ERR "STALLION: shared memory pointer=%x out of "
                                "range at line=%d(%d), brd=%d\n",
                                (int) offset, line, __LINE__, brdp->brdnr);
-               ptr = NULL;
+               ptr = 0;
        } else {
                ptr = brdp->membase + (offset % STAL_PAGESIZE);
        }
@@ -3894,7 +3901,7 @@ static void stli_stalreset(stlibrd_t *brdp)
 {      
        volatile unsigned long  *vecp;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_stalreset(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -3919,7 +3926,7 @@ static inline int stli_initecp(stlibrd_t *brdp)
        char            *name;
        int             panelnr, nrports;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_initecp(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -4079,7 +4086,7 @@ static inline int stli_initonb(stlibrd_t *brdp)
        char            *name;
        int             i;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_initonb(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -4247,7 +4254,7 @@ static int stli_startbrd(stlibrd_t *brdp)
        stliport_t              *portp;
        int                     portnr, nrdevs, i, rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_startbrd(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -4353,7 +4360,7 @@ stli_donestartup:
 
 static int __init stli_brdinit(stlibrd_t *brdp)
 {
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_brdinit(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -4420,7 +4427,7 @@ static inline int stli_eisamemprobe(stlibrd_t *brdp)
        cdkonbsig_t     onbsig, *onbsigp;
        int             i, foundit;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_eisamemprobe(brdp=%x)\n", (int) brdp);
 #endif
 
@@ -4497,7 +4504,7 @@ static inline int stli_eisamemprobe(stlibrd_t *brdp)
 
        if (! foundit) {
                brdp->memaddr = 0;
-               brdp->membase = NULL;
+               brdp->membase = 0;
                printk(KERN_ERR "STALLION: failed to probe shared memory "
                                "region for %s in EISA slot=%d\n",
                        stli_brdnames[brdp->brdtype], (brdp->iobase >> 12));
@@ -4506,20 +4513,6 @@ static inline int stli_eisamemprobe(stlibrd_t *brdp)
        return(0);
 }
 
-static inline int stli_getbrdnr(void)
-{
-       int i;
-
-       for (i = 0; i < STL_MAXBRDS; i++) {
-               if (!stli_brds[i]) {
-                       if (i >= stli_nrbrds)
-                               stli_nrbrds = i + 1;
-                       return i;
-               }
-       }
-       return -1;
-}
-
 /*****************************************************************************/
 
 /*
@@ -4532,13 +4525,13 @@ static inline int stli_getbrdnr(void)
  *     do is go probing around in the usual places hoping we can find it.
  */
 
-static inline int stli_findeisabrds(void)
+static inline int stli_findeisabrds()
 {
        stlibrd_t       *brdp;
        unsigned int    iobase, eid;
        int             i;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_findeisabrds()\n");
 #endif
 
@@ -4606,6 +4599,20 @@ static inline int stli_findeisabrds(void)
  *     Find the next available board number that is free.
  */
 
+static inline int stli_getbrdnr()
+{
+       int     i;
+
+       for (i = 0; (i < STL_MAXBRDS); i++) {
+               if (stli_brds[i] == (stlibrd_t *) NULL) {
+                       if (i >= stli_nrbrds)
+                               stli_nrbrds = i + 1;
+                       return(i);
+               }
+       }
+       return(-1);
+}
+
 /*****************************************************************************/
 
 #ifdef CONFIG_PCI
@@ -4620,7 +4627,7 @@ static inline int stli_initpcibrd(int brdtype, struct pci_dev *devp)
 {
        stlibrd_t       *brdp;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n",
                brdtype, dev->bus->number, dev->devfn);
 #endif
@@ -4636,7 +4643,7 @@ static inline int stli_initpcibrd(int brdtype, struct pci_dev *devp)
        }
        brdp->brdtype = brdtype;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "%s(%d): BAR[]=%lx,%lx,%lx,%lx\n", __FILE__, __LINE__,
                pci_resource_start(devp, 0),
                pci_resource_start(devp, 1),
@@ -4662,12 +4669,12 @@ static inline int stli_initpcibrd(int brdtype, struct pci_dev *devp)
  *     one as it is found.
  */
 
-static inline int stli_findpcibrds(void)
+static inline int stli_findpcibrds()
 {
        struct pci_dev  *dev = NULL;
        int             rc;
 
-#ifdef DEBUG
+#if DEBUG
        printk("stli_findpcibrds()\n");
 #endif
 
@@ -4688,7 +4695,7 @@ static inline int stli_findpcibrds(void)
  *     Allocate a new board structure. Fill out the basic info in it.
  */
 
-static stlibrd_t *stli_allocbrd(void)
+static stlibrd_t *stli_allocbrd()
 {
        stlibrd_t       *brdp;
 
@@ -4711,13 +4718,13 @@ static stlibrd_t *stli_allocbrd(void)
  *     can find.
  */
 
-static inline int stli_initbrds(void)
+static inline int stli_initbrds()
 {
        stlibrd_t       *brdp, *nxtbrdp;
        stlconf_t       *confp;
        int             i, j;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_initbrds()\n");
 #endif
 
@@ -4808,14 +4815,14 @@ static inline int stli_initbrds(void)
  *     the slave image (and debugging :-)
  */
 
-static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp)
+static ssize_t stli_memread(struct file *fp, char *buf, size_t count, loff_t *offp)
 {
        unsigned long   flags;
        void            *memptr;
        stlibrd_t       *brdp;
        int             brdnr, size, n;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_memread(fp=%x,buf=%x,count=%x,offp=%x)\n",
                        (int) fp, (int) buf, count, (int) offp);
 #endif
@@ -4862,15 +4869,15 @@ out:
  *     the slave image (and debugging :-)
  */
 
-static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp)
+static ssize_t stli_memwrite(struct file *fp, const char *buf, size_t count, loff_t *offp)
 {
        unsigned long   flags;
        void            *memptr;
        stlibrd_t       *brdp;
-       char            __user *chbuf;
+       char            *chbuf;
        int             brdnr, size, n;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_memwrite(fp=%x,buf=%x,count=%x,offp=%x)\n",
                        (int) fp, (int) buf, count, (int) offp);
 #endif
@@ -4886,7 +4893,7 @@ static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t cou
        if (fp->f_pos >= brdp->memsize)
                return(0);
 
-       chbuf = (char __user *) buf;
+       chbuf = (char *) buf;
        size = MIN(count, (brdp->memsize - fp->f_pos));
 
        save_flags(flags);
@@ -4916,7 +4923,7 @@ out:
  *     Return the board stats structure to user app.
  */
 
-static int stli_getbrdstats(combrd_t __user *bp)
+static int stli_getbrdstats(combrd_t *bp)
 {
        stlibrd_t       *brdp;
        int             i;
@@ -5055,26 +5062,26 @@ static int stli_portcmdstats(stliport_t *portp)
  *     what port to get stats for (used through board control device).
  */
 
-static int stli_getportstats(stliport_t *portp, comstats_t __user *cp)
+static int stli_getportstats(stliport_t *portp, comstats_t *cp)
 {
        stlibrd_t       *brdp;
        int             rc;
 
-       if (!portp) {
+       if (portp == (stliport_t *) NULL) {
                if (copy_from_user(&stli_comstats, cp, sizeof(comstats_t)))
                        return -EFAULT;
                portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
                        stli_comstats.port);
-               if (!portp)
-                       return -ENODEV;
+               if (portp == (stliport_t *) NULL)
+                       return(-ENODEV);
        }
 
        brdp = stli_brds[portp->brdnr];
-       if (!brdp)
-               return -ENODEV;
+       if (brdp == (stlibrd_t *) NULL)
+               return(-ENODEV);
 
        if ((rc = stli_portcmdstats(portp)) < 0)
-               return rc;
+               return(rc);
 
        return copy_to_user(cp, &stli_comstats, sizeof(comstats_t)) ?
                        -EFAULT : 0;
@@ -5086,27 +5093,27 @@ static int stli_getportstats(stliport_t *portp, comstats_t __user *cp)
  *     Clear the port stats structure. We also return it zeroed out...
  */
 
-static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp)
+static int stli_clrportstats(stliport_t *portp, comstats_t *cp)
 {
        stlibrd_t       *brdp;
        int             rc;
 
-       if (!portp) {
+       if (portp == (stliport_t *) NULL) {
                if (copy_from_user(&stli_comstats, cp, sizeof(comstats_t)))
                        return -EFAULT;
                portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
                        stli_comstats.port);
-               if (!portp)
-                       return -ENODEV;
+               if (portp == (stliport_t *) NULL)
+                       return(-ENODEV);
        }
 
        brdp = stli_brds[portp->brdnr];
-       if (!brdp)
-               return -ENODEV;
+       if (brdp == (stlibrd_t *) NULL)
+               return(-ENODEV);
 
        if (brdp->state & BST_STARTED) {
-               if ((rc = stli_cmdwait(brdp, portp, A_CLEARSTATS, NULL, 0, 0)) < 0)
-                       return rc;
+               if ((rc = stli_cmdwait(brdp, portp, A_CLEARSTATS, 0, 0, 0)) < 0)
+                       return(rc);
        }
 
        memset(&stli_comstats, 0, sizeof(comstats_t));
@@ -5116,7 +5123,7 @@ static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp)
 
        if (copy_to_user(cp, &stli_comstats, sizeof(comstats_t)))
                return -EFAULT;
-       return 0;
+       return(0);
 }
 
 /*****************************************************************************/
@@ -5125,19 +5132,19 @@ static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp)
  *     Return the entire driver ports structure to a user app.
  */
 
-static int stli_getportstruct(stliport_t __user *arg)
+static int stli_getportstruct(unsigned long arg)
 {
        stliport_t      *portp;
 
-       if (copy_from_user(&stli_dummyport, arg, sizeof(stliport_t)))
+       if (copy_from_user(&stli_dummyport, (void *)arg, sizeof(stliport_t)))
                return -EFAULT;
        portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
                 stli_dummyport.portnr);
-       if (!portp)
-               return -ENODEV;
-       if (copy_to_user(arg, portp, sizeof(stliport_t)))
+       if (portp == (stliport_t *) NULL)
+               return(-ENODEV);
+       if (copy_to_user((void *) arg, portp, sizeof(stliport_t)))
                return -EFAULT;
-       return 0;
+       return(0);
 }
 
 /*****************************************************************************/
@@ -5146,20 +5153,20 @@ static int stli_getportstruct(stliport_t __user *arg)
  *     Return the entire driver board structure to a user app.
  */
 
-static int stli_getbrdstruct(stlibrd_t __user *arg)
+static int stli_getbrdstruct(unsigned long arg)
 {
        stlibrd_t       *brdp;
 
-       if (copy_from_user(&stli_dummybrd, arg, sizeof(stlibrd_t)))
+       if (copy_from_user(&stli_dummybrd, (void *)arg, sizeof(stlibrd_t)))
                return -EFAULT;
        if ((stli_dummybrd.brdnr < 0) || (stli_dummybrd.brdnr >= STL_MAXBRDS))
-               return -ENODEV;
+               return(-ENODEV);
        brdp = stli_brds[stli_dummybrd.brdnr];
-       if (!brdp)
-               return -ENODEV;
-       if (copy_to_user(arg, brdp, sizeof(stlibrd_t)))
+       if (brdp == (stlibrd_t *) NULL)
+               return(-ENODEV);
+       if (copy_to_user((void *) arg, brdp, sizeof(stlibrd_t)))
                return -EFAULT;
-       return 0;
+       return(0);
 }
 
 /*****************************************************************************/
@@ -5174,9 +5181,8 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
 {
        stlibrd_t       *brdp;
        int             brdnr, rc, done;
-       void __user *argp = (void __user *)arg;
 
-#ifdef DEBUG
+#if DEBUG
        printk(KERN_DEBUG "stli_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n",
                        (int) ip, (int) fp, cmd, (int) arg);
 #endif
@@ -5189,23 +5195,23 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
 
        switch (cmd) {
        case COM_GETPORTSTATS:
-               rc = stli_getportstats(NULL, argp);
+               rc = stli_getportstats((stliport_t *)NULL, (comstats_t *)arg);
                done++;
                break;
        case COM_CLRPORTSTATS:
-               rc = stli_clrportstats(NULL, argp);
+               rc = stli_clrportstats((stliport_t *)NULL, (comstats_t *)arg);
                done++;
                break;
        case COM_GETBRDSTATS:
-               rc = stli_getbrdstats(argp);
+               rc = stli_getbrdstats((combrd_t *) arg);
                done++;
                break;
        case COM_READPORT:
-               rc = stli_getportstruct(argp);
+               rc = stli_getportstruct(arg);
                done++;
                break;
        case COM_READBOARD:
-               rc = stli_getbrdstruct(argp);
+               rc = stli_getbrdstruct(arg);
                done++;
                break;
        }
@@ -5221,7 +5227,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
        if (brdnr >= STL_MAXBRDS)
                return(-ENODEV);
        brdp = stli_brds[brdnr];
-       if (!brdp)
+       if (brdp == (stlibrd_t *) NULL)
                return(-ENODEV);
        if (brdp->state == 0)
                return(-ENODEV);