summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Stein <jcs@cvs.openbsd.org>2016-01-09 04:14:43 +0000
committerJoshua Stein <jcs@cvs.openbsd.org>2016-01-09 04:14:43 +0000
commit011dc1ace7143c9e2a12ca347d17805ef02ab27a (patch)
tree36bb5032c3085577856afb81809b16898ec36bb0
parentb7758fab6d4d6406807ae0dc213e149d7101a69b (diff)
revert manual additions of hid.h now that usbhid.h brings it in
Diffstat
-rw-r--r--lib/libusbhid/usbhid.h4
-rw-r--r--sys/dev/usb/ucycom.c4
-rw-r--r--sys/dev/usb/ugold.c4
-rw-r--r--sys/dev/usb/uhid.c4
-rw-r--r--sys/dev/usb/uhidev.c4
-rw-r--r--sys/dev/usb/ukbd.c3
-rw-r--r--sys/dev/usb/ums.c3
-rw-r--r--sys/dev/usb/uoaklux.c4
-rw-r--r--sys/dev/usb/uoakrh.c4
-rw-r--r--sys/dev/usb/uoakv.c4
-rw-r--r--sys/dev/usb/upd.c4
-rw-r--r--sys/dev/usb/uslhcom.c4
-rw-r--r--sys/dev/usb/uthum.c4
-rw-r--r--sys/dev/usb/utrh.c4
-rw-r--r--sys/dev/usb/utwitch.c4
15 files changed, 15 insertions, 43 deletions
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index 6ca4e654f7b..39adb4ad02f 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbhid.h,v 1.7 2016/01/08 16:57:26 jcs Exp $ */
+/* $OpenBSD: usbhid.h,v 1.8 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: usbhid.h,v 1.1 2001/12/28 17:45:27 augustss Exp $ */
/*
@@ -27,8 +27,6 @@
* SUCH DAMAGE.
*/
-#include <dev/hid/hid.h>
-
typedef struct report_desc *report_desc_t;
typedef struct hid_data *hid_data_t;
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 47ce48065e5..d6f098c4b4e 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucycom.c,v 1.33 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: ucycom.c,v 1.34 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */
/*
@@ -57,8 +57,6 @@
#include <dev/usb/ucomvar.h>
-#include <dev/hid/hid.h>
-
#ifdef UCYCOM_DEBUG
#define DPRINTF(x) if (ucycomdebug) printf x
#define DPRINTFN(n, x) if (ucycomdebug > (n)) printf x
diff --git a/sys/dev/usb/ugold.c b/sys/dev/usb/ugold.c
index fb5cf286ac3..6e96953a3ce 100644
--- a/sys/dev/usb/ugold.c
+++ b/sys/dev/usb/ugold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ugold.c,v 1.11 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: ugold.c,v 1.12 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2013 Takayoshi SASANO <uaa@openbsd.org>
@@ -37,8 +37,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#define UGOLD_INNER 0
#define UGOLD_OUTER 1
#define UGOLD_HUM 1
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 4c73f4f1cdc..e56b2317d6a 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhid.c,v 1.62 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uhid.c,v 1.63 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -59,8 +59,6 @@
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#ifdef UHID_DEBUG
#define DPRINTF(x) do { if (uhiddebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (uhiddebug>(n)) printf x; } while (0)
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index ed4abe6ec5b..2598e2d5868 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhidev.c,v 1.72 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uhidev.c,v 1.73 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -58,8 +58,6 @@
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#ifndef SMALL_KERNEL
/* Replacement report descriptors for devices shipped with broken ones */
#include <dev/usb/uhid_rdesc.h>
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 531080a22c7..ed637adbfc1 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukbd.c,v 1.74 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: ukbd.c,v 1.75 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -72,7 +72,6 @@
#include <dev/wscons/wsksymdef.h>
#include <dev/wscons/wsksymvar.h>
-#include <dev/hid/hid.h>
#include <dev/hid/hidkbdsc.h>
#ifdef UKBD_DEBUG
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 0ad2d057cf9..a1ab3e71059 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ums.c,v 1.41 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: ums.c,v 1.42 2016/01/09 04:14:42 jcs Exp $ */
/* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -53,7 +53,6 @@
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
-#include <dev/hid/hid.h>
#include <dev/hid/hidmsvar.h>
struct ums_softc {
diff --git a/sys/dev/usb/uoaklux.c b/sys/dev/usb/uoaklux.c
index e441241af29..2a0a7abf32a 100644
--- a/sys/dev/usb/uoaklux.c
+++ b/sys/dev/usb/uoaklux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoaklux.c,v 1.11 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uoaklux.c,v 1.12 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -33,8 +33,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#include "uoak.h"
#ifdef UOAKLUX_DEBUG
diff --git a/sys/dev/usb/uoakrh.c b/sys/dev/usb/uoakrh.c
index 4181bc51da5..eb309a8dc1d 100644
--- a/sys/dev/usb/uoakrh.c
+++ b/sys/dev/usb/uoakrh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoakrh.c,v 1.12 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uoakrh.c,v 1.13 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -33,8 +33,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#include "uoak.h"
#ifdef OARKRH_DEBUG
diff --git a/sys/dev/usb/uoakv.c b/sys/dev/usb/uoakv.c
index 3cd049f7698..a46bd8c1623 100644
--- a/sys/dev/usb/uoakv.c
+++ b/sys/dev/usb/uoakv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoakv.c,v 1.11 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uoakv.c,v 1.12 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -33,8 +33,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#include "uoak.h"
#ifdef UOAKV_DEBUG
diff --git a/sys/dev/usb/upd.c b/sys/dev/usb/upd.c
index 7b7c4cb53ee..29325fe6110 100644
--- a/sys/dev/usb/upd.c
+++ b/sys/dev/usb/upd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: upd.c,v 1.24 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: upd.c,v 1.25 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2015 David Higgs <higgsd@gmail.com>
@@ -34,8 +34,6 @@
#include <dev/usb/uhidev.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/hid/hid.h>
-
#ifdef UPD_DEBUG
#define DPRINTF(x) do { printf x; } while (0)
#else
diff --git a/sys/dev/usb/uslhcom.c b/sys/dev/usb/uslhcom.c
index 1d8df4f624a..976bedba2c5 100644
--- a/sys/dev/usb/uslhcom.c
+++ b/sys/dev/usb/uslhcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslhcom.c,v 1.3 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uslhcom.c,v 1.4 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2015 SASANO Takayoshi <uaa@openbsd.org>
@@ -39,8 +39,6 @@
#include <dev/usb/ucomvar.h>
#include <dev/usb/uslhcomreg.h>
-#include <dev/hid/hid.h>
-
#ifdef USLHCOM_DEBUG
#define DPRINTF(x) if (uslhcomdebug) printf x
#else
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index f70294d7d74..b8c65754bb2 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthum.c,v 1.29 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: uthum.c,v 1.30 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@@ -33,8 +33,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#ifdef UTHUM_DEBUG
#define DPRINTF(x) do { printf x; } while (0)
#else
diff --git a/sys/dev/usb/utrh.c b/sys/dev/usb/utrh.c
index 21b57c16052..0695e87576b 100644
--- a/sys/dev/usb/utrh.c
+++ b/sys/dev/usb/utrh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utrh.c,v 1.18 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: utrh.c,v 1.19 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2009 Yojiro UO <yuo@nui.org>
@@ -33,8 +33,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#ifdef UTRH_DEBUG
#define DPRINTF(x) do { printf x; } while (0)
#else
diff --git a/sys/dev/usb/utwitch.c b/sys/dev/usb/utwitch.c
index 9543925a8f0..beb35487ea6 100644
--- a/sys/dev/usb/utwitch.c
+++ b/sys/dev/usb/utwitch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utwitch.c,v 1.15 2016/01/08 15:54:14 jcs Exp $ */
+/* $OpenBSD: utwitch.c,v 1.16 2016/01/09 04:14:42 jcs Exp $ */
/*
* Copyright (c) 2010 Yojiro UO <yuo@nui.org>
@@ -34,8 +34,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
-#include <dev/hid/hid.h>
-
#define CMD_NONE 0xf0
#define CMD_EOF 0x0d
#define CMD_ACK 0x21
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 16:39:51 +0000