summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-14 08:08:22 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-14 08:08:22 +0000
commit7cf69ae9a4a66deb84f85670d57d616431419299 (patch)
tree1908916a831a047279d771cd4d304a16ba879045 /sys/dev
parent81d37f5acb8dbeb4c69b8539353acc64e604fb9f (diff)
Move four #defines out of usb_port.h and to the places where they are used.
ok jsg.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ucomvar.h5
-rw-r--r--sys/dev/usb/uhidev.h5
-rw-r--r--sys/dev/usb/usb_port.h7
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) \