strategy returns void, ioctl cmd is u_long

[unix-history] / usr / src / sys / hp / dev / ite.c

diff --git a/usr/src/sys/hp/dev/ite.c b/usr/src/sys/hp/dev/ite.c
index 73afadc..e0dfc68 100644 (file)
--- a/usr/src/sys/hp/dev/ite.c
+++ b/usr/src/sys/hp/dev/ite.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: ite.c 1.28 92/12/20$
  *
  *
  * from: Utah $Hdr: ite.c 1.28 92/12/20$
  *

- *     @(#)ite.c       8.1 (Berkeley) %G%
+ *     @(#)ite.c       8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -91,6 +91,7 @@ u_char  console_attributes[0x2200];
  */
 iteon(dev, flag)
        dev_t dev;
  */
 iteon(dev, flag)
        dev_t dev;

+       int flag;

 {
        int unit = UNIT(dev);
        struct tty *tp = &ite_tty[unit];
 {
        int unit = UNIT(dev);
        struct tty *tp = &ite_tty[unit];


@@ -156,6 +157,7 @@ iteinit(dev)
  */
 iteoff(dev, flag)
        dev_t dev;
  */
 iteoff(dev, flag)
        dev_t dev;

+       int flag;

 {
        register struct ite_softc *ip = &ite_softc[UNIT(dev)];
 
 {
        register struct ite_softc *ip = &ite_softc[UNIT(dev)];
 


@@ -236,6 +238,7 @@ iteclose(dev, flag, mode, p)
 iteread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 iteread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

 {
        register struct tty *tp = &ite_tty[UNIT(dev)];
 
 {
        register struct tty *tp = &ite_tty[UNIT(dev)];
 


@@ -245,6 +248,7 @@ iteread(dev, uio, flag)
 itewrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 itewrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

 {
        int unit = UNIT(dev);
        register struct tty *tp = &ite_tty[unit];
 {
        int unit = UNIT(dev);
        register struct tty *tp = &ite_tty[unit];


@@ -257,7 +261,7 @@ itewrite(dev, uio, flag)
 
 iteioctl(dev, cmd, addr, flag, p)
        dev_t dev;
 
 iteioctl(dev, cmd, addr, flag, p)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t addr;
        int flag;
        struct proc *p;
        caddr_t addr;
        int flag;
        struct proc *p;


@@ -352,7 +356,7 @@ itestart(tp)
 }
 
 itefilter(stat, c)
 }
 
 itefilter(stat, c)

-     register char stat, c;
+       register char stat, c;

 {
        static int capsmode = 0;
        static int metamode = 0;
 {
        static int capsmode = 0;
        static int metamode = 0;


@@ -385,7 +389,7 @@ itefilter(stat, c)
                        code = kbd_keymap[c];
                        break;
                }
                        code = kbd_keymap[c];
                        break;
                }

-               /* fall into... */
+               /* FALLTHROUGH */

 
        case KBD_SHIFT:
                code = kbd_shiftmap[c];
 
        case KBD_SHIFT:
                code = kbd_shiftmap[c];