summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/usb/hid.h2
-rw-r--r--sys/dev/usb/ohci.c2
-rw-r--r--sys/dev/usb/ohcivar.h2
-rw-r--r--sys/dev/usb/uhcivar.h2
-rw-r--r--sys/dev/usb/uhid.c63
-rw-r--r--sys/dev/usb/umodem.c91
-rw-r--r--sys/dev/usb/urio.c33
-rw-r--r--sys/dev/usb/usbdivar.h2
8 files changed, 46 insertions, 151 deletions
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index dcf27e1..8dcc46f 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.h,v 1.5 2000/04/27 15:26:46 augustss Exp $ */
+/* $NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $ */
/* $FreeBSD$ */
/*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 21d8c60..2b068de 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.90 2000/05/08 18:28:46 thorpej Exp $ */
+/* $NetBSD: ohci.c,v 1.91 2000/06/01 14:28:58 augustss Exp $ */
/* $FreeBSD$ */
/*
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 94aa880..28a8087 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.21 2000/03/29 01:46:27 augustss Exp $ */
+/* $NetBSD: ohcivar.h,v 1.22 2000/04/25 09:20:55 augustss Exp $ */
/* $FreeBSD$ */
/*
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index a47ff25..163defe 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.29 2000/04/25 09:20:55 augustss Exp $ */
+/* $NetBSD: uhcivar.h,v 1.31 2000/06/01 14:28:59 augustss Exp $ */
/* $FreeBSD$ */
/*
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 0b9fa4f..8020b0e 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.38 2000/04/27 15:26:48 augustss Exp $ */
+/* $NetBSD: uhid.c,v 1.39 2000/06/01 14:29:00 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -256,9 +256,7 @@ USB_ATTACH(uhid)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
-uhid_activate(self, act)
- device_ptr_t self;
- enum devact act;
+uhid_activate(device_ptr_t self, enum devact act)
{
struct uhid_softc *sc = (struct uhid_softc *)self;
@@ -329,10 +327,7 @@ USB_DETACH(uhid)
}
void
-uhid_intr(xfer, addr, status)
- usbd_xfer_handle xfer;
- usbd_private_handle addr;
- usbd_status status;
+uhid_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
{
struct uhid_softc *sc = addr;
@@ -376,11 +371,7 @@ uhid_intr(xfer, addr, status)
}
int
-uhidopen(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- usb_proc_ptr p;
+uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
struct uhid_softc *sc;
usbd_status err;
@@ -425,11 +416,7 @@ uhidopen(dev, flag, mode, p)
}
int
-uhidclose(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- usb_proc_ptr p;
+uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
struct uhid_softc *sc;
@@ -456,10 +443,7 @@ uhidclose(dev, flag, mode, p)
}
int
-uhid_do_read(sc, uio, flag)
- struct uhid_softc *sc;
- struct uio *uio;
- int flag;
+uhid_do_read(struct uhid_softc *sc, struct uio *uio, int flag)
{
int s;
int error = 0;
@@ -521,10 +505,7 @@ uhid_do_read(sc, uio, flag)
}
int
-uhidread(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+uhidread(dev_t dev, struct uio *uio, int flag)
{
struct uhid_softc *sc;
int error;
@@ -539,10 +520,7 @@ uhidread(dev, uio, flag)
}
int
-uhid_do_write(sc, uio, flag)
- struct uhid_softc *sc;
- struct uio *uio;
- int flag;
+uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag)
{
int error;
int size;
@@ -573,10 +551,7 @@ uhid_do_write(sc, uio, flag)
}
int
-uhidwrite(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+uhidwrite(dev_t dev, struct uio *uio, int flag)
{
struct uhid_softc *sc;
int error;
@@ -591,12 +566,8 @@ uhidwrite(dev, uio, flag)
}
int
-uhid_do_ioctl(sc, cmd, addr, flag, p)
- struct uhid_softc *sc;
- u_long cmd;
- caddr_t addr;
- int flag;
- usb_proc_ptr p;
+uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, int flag,
+ usb_proc_ptr p)
{
struct usb_ctl_report_desc *rd;
struct usb_ctl_report *re;
@@ -706,12 +677,7 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
}
int
-uhidioctl(dev, cmd, addr, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t addr;
- int flag;
- usb_proc_ptr p;
+uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
{
struct uhid_softc *sc;
int error;
@@ -726,10 +692,7 @@ uhidioctl(dev, cmd, addr, flag, p)
}
int
-uhidpoll(dev, events, p)
- dev_t dev;
- int events;
- usb_proc_ptr p;
+uhidpoll(dev_t dev, int events, usb_proc_ptr p)
{
struct uhid_softc *sc;
int revents = 0;
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 1c1a1db..1088860 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -361,9 +361,7 @@ USB_ATTACH(umodem)
}
void
-umodem_get_caps(dev, cm, acm)
- usbd_device_handle dev;
- int *cm, *acm;
+umodem_get_caps(usbd_device_handle dev, int *cm, int *acm)
{
usb_cdc_cm_descriptor_t *cmd;
usb_cdc_acm_descriptor_t *cad;
@@ -386,8 +384,7 @@ umodem_get_caps(dev, cm, acm)
}
void
-umodemstart(tp)
- struct tty *tp;
+umodemstart(struct tty *tp)
{
struct umodem_softc *sc;
struct cblock *cbp;
@@ -465,10 +462,8 @@ out:
}
void
-umodemwritecb(xfer, priv, status)
- usbd_xfer_handle xfer;
- usbd_private_handle priv;
- usbd_status status;
+umodemwritecb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
struct umodem_softc *sc = (struct umodem_softc *)priv;
struct tty *tp = sc->sc_tty;
@@ -502,9 +497,7 @@ umodemwritecb(xfer, priv, status)
}
int
-umodemparam(tp, t)
- struct tty *tp;
- struct termios *t;
+umodemparam(struct tty *tp, struct termios *t)
{
struct umodem_softc *sc;
usb_cdc_line_state_t ls;
@@ -574,10 +567,7 @@ umodemparam(tp, t)
}
int
-umodemopen(dev, flag, mode, p)
- dev_t dev;
- int flag, mode;
- usb_proc_ptr p;
+umodemopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
int unit = UMODEMUNIT(dev);
struct umodem_softc *sc;
@@ -720,8 +710,7 @@ bad:
}
usbd_status
-umodemstartread(sc)
- struct umodem_softc *sc;
+umodemstartread(struct umodem_softc *sc)
{
usbd_status err;
@@ -739,10 +728,7 @@ umodemstartread(sc)
}
void
-umodemreadcb(xfer, p, status)
- usbd_xfer_handle xfer;
- usbd_private_handle p;
- usbd_status status;
+umodemreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
{
struct umodem_softc *sc = (struct umodem_softc *)p;
struct tty *tp = sc->sc_tty;
@@ -784,10 +770,7 @@ umodemreadcb(xfer, p, status)
}
int
-umodemclose(dev, flag, mode, p)
- dev_t dev;
- int flag, mode;
- usb_proc_ptr p;
+umodemclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
struct umodem_softc *sc;
struct tty *tp;
@@ -836,8 +819,7 @@ umodemclose(dev, flag, mode, p)
}
void
-umodem_cleanup(sc)
- struct umodem_softc *sc;
+umodem_cleanup(struct umodem_softc *sc)
{
umodem_shutdown(sc);
@@ -854,10 +836,7 @@ umodem_cleanup(sc)
}
int
-umodemread(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+umodemread(dev_t dev, uio *uio, int flag)
{
struct umodem_softc *sc;
struct tty *tp;
@@ -873,10 +852,7 @@ umodemread(dev, uio, flag)
}
int
-umodemwrite(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+umodemwrite(dev_t dev, struct uio *uio, int flag)
{
struct umodem_softc *sc;
struct tty *tp;
@@ -892,9 +868,7 @@ umodemwrite(dev, uio, flag)
}
void
-umodemstop(tp, flag)
- struct tty *tp;
- int flag;
+umodemstop(struct tty *tp, int flag)
{
struct umodem_softc *sc;
int s;
@@ -913,8 +887,7 @@ umodemstop(tp, flag)
}
struct tty *
-umodemtty(dev)
- dev_t dev;
+umodemtty(dev_t dev)
{
struct umodem_softc *sc;
struct tty *tp;
@@ -927,12 +900,7 @@ umodemtty(dev)
}
int
-umodemioctl(dev, cmd, data, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- usb_proc_ptr p;
+umodemioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
{
struct umodem_softc *sc;
struct tty *tp;
@@ -1013,8 +981,7 @@ umodemioctl(dev, cmd, data, flag, p)
}
void
-umodem_shutdown(sc)
- struct umodem_softc *sc;
+umodem_shutdown(struct umodem_softc *sc)
{
struct tty *tp = sc->sc_tty;
@@ -1034,9 +1001,7 @@ umodem_shutdown(sc)
}
void
-umodem_modem(sc, onoff)
- struct umodem_softc *sc;
- int onoff;
+umodem_modem(struct umodem_softc *sc, int onoff)
{
usb_device_request_t req;
@@ -1057,9 +1022,7 @@ umodem_modem(sc, onoff)
}
void
-umodem_break(sc, onoff)
- struct umodem_softc *sc;
- int onoff;
+umodem_break(struct umodem_softc *sc, int onoff)
{
usb_device_request_t req;
@@ -1078,10 +1041,7 @@ umodem_break(sc, onoff)
}
void *
-umodem_get_desc(dev, type, subtype)
- usbd_device_handle dev;
- int type;
- int subtype;
+umodem_get_desc(usbd_device_handle dev, int type, int subtype)
{
usb_descriptor_t *desc;
usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev);
@@ -1100,10 +1060,7 @@ umodem_get_desc(dev, type, subtype)
}
usbd_status
-umodem_set_comm_feature(sc, feature, state)
- struct umodem_softc *sc;
- int feature;
- int state;
+umodem_set_comm_feature(struct umodem_softc *sc, int feature, int state)
{
usb_device_request_t req;
usbd_status err;
@@ -1127,9 +1084,7 @@ umodem_set_comm_feature(sc, feature, state)
}
usbd_status
-umodem_set_line_coding(sc, state)
- struct umodem_softc *sc;
- usb_cdc_line_state_t *state;
+umodem_set_line_coding(struct umodem_softc *sc, usb_cdc_line_state_t state)
{
usb_device_request_t req;
usbd_status err;
@@ -1164,9 +1119,7 @@ umodem_set_line_coding(sc, state)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
-umodem_activate(self, act)
- device_ptr_t self;
- enum devact act;
+umodem_activate(device_ptr_t self, enum devact act)
{
struct umodem_softc *sc = (struct umodem_softc *)self;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 8a1d2ff..b1a28a6 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -292,11 +292,7 @@ USB_ATTACH(urio)
int
-urioopen(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- usb_proc_ptr p;
+urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
#if (USBDI >= 1)
struct urio_softc * sc;
@@ -336,11 +332,7 @@ urioopen(dev, flag, mode, p)
}
int
-urioclose(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- usb_proc_ptr p;
+urioclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
{
#if (USBDI >= 1)
struct urio_softc * sc;
@@ -363,10 +355,7 @@ urioclose(dev, flag, mode, p)
}
int
-urioread(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+urioread(dev_t dev, struct uio *uio, int flag)
{
#if (USBDI >= 1)
struct urio_softc * sc;
@@ -440,10 +429,7 @@ urioread(dev, uio, flag)
}
int
-uriowrite(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
+uriowrite(dev_t dev, struct uio *uio, int flag)
{
#if (USBDI >= 1)
struct urio_softc * sc;
@@ -510,12 +496,7 @@ uriowrite(dev, uio, flag)
int
-urioioctl(dev, cmd, addr, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t addr;
- int flag;
- usb_proc_ptr p;
+urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
{
#if (USBDI >= 1)
struct urio_softc * sc;
@@ -616,9 +597,7 @@ ret:
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
-urio_activate(self, act)
- device_ptr_t self;
- enum devact act;
+urio_activate(device_ptr_t self, enum devact act)
{
struct urio_softc *sc = (struct urio_softc *)self;
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 7d7749f..95a7323 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.55 2000/03/30 00:18:18 augustss Exp $ */
+/* $NetBSD: usbdivar.h,v 1.57 2000/06/01 14:29:03 augustss Exp $ */
/* $FreeBSD$ */
/*
OpenPOWER on IntegriCloud