diff options
| author |   mbalmer <mbalmer@openbsd.org> | 2007-06-14 08:08:21 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@openbsd.org> | 2007-06-14 08:08:21 +0000 |
| commit | 0e8489a46e644b03f47482de29758b2b4f64e5e9 (patch) | |
| tree | 3abe650f75de94b0885f750821e137c7139d854a | |
| parent | Move the inclusion of sys/timeout.h from usb_port.h to the drivers that (diff) | |
| download | wireguard-openbsd-0e8489a46e644b03f47482de29758b2b4f64e5e9.tar.xz wireguard-openbsd-0e8489a46e644b03f47482de29758b2b4f64e5e9.zip | |
Move four #defines out of usb_port.h and to the places where they are used.
ok jsg.
| -rw-r--r-- | sys/dev/usb/ucomvar.h | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uhidev.h | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h index d58725c7723..5e721cc33fb 100644 --- a/sys/dev/usb/ucomvar.h +++ b/sys/dev/usb/ucomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ucomvar.h,v 1.15 2007/06/11 16:30:31 mbalmer Exp $ */ +/* $OpenBSD: ucomvar.h,v 1.16 2007/06/14 08:08:21 mbalmer Exp $ */ /* $NetBSD: ucomvar.h,v 1.10 2001/12/31 12:15:21 augustss Exp $ */ /* @@ -38,6 +38,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#define UCOMBUSCF_PORTNO 0 +#define UCOMBUSCF_PORTNO_DEFAULT -1 + #define ucomcf_portno cf_loc[UCOMBUSCF_PORTNO] #define UCOM_UNK_PORTNO UCOMBUSCF_PORTNO_DEFAULT diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h index f3a73dc06ea..b0f8895e536 100644 --- a/sys/dev/usb/uhidev.h +++ b/sys/dev/usb/uhidev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.h,v 1.8 2007/06/06 19:25:49 mk Exp $ */ +/* $OpenBSD: uhidev.h,v 1.9 2007/06/14 08:08:21 mbalmer Exp $ */ /* $NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $ */ /* @@ -38,6 +38,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#define UHIDBUSCF_REPORTID 0 +#define UHIDBUSCF_REPORTID_DEFAULT -1 + #define uhidevcf_reportid cf_loc[UHIDBUSCF_REPORTID] #define UHIDEV_UNK_REPORTID UHIDBUSCF_REPORTID_DEFAULT diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 8b574a7af3c..7761cc119d4 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.91 2007/06/14 06:55:10 mbalmer Exp $ */ +/* $OpenBSD: usb_port.h,v 1.92 2007/06/14 08:08:21 mbalmer Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -52,11 +52,6 @@ #undef USB_USE_SOFTINTR #endif -#define UCOMBUSCF_PORTNO 0 -#define UCOMBUSCF_PORTNO_DEFAULT -1 -#define UHIDBUSCF_REPORTID 0 -#define UHIDBUSCF_REPORTID_DEFAULT -1 - #define mstohz(ms) ((ms) * hz / 1000) #define USB_DECLARE_DRIVER_CLASS(dname, devclass) \ |