From 3186c89eb8e248dbf79cae9575a6e1c3d3c9c46c Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 25 Sep 2012 23:15:43 +0200
Subject: [PATCH] usb4bsd: Adjust header paths in libusbhid, usbhidctl, and
 public headers.

Also remove some __FBSDID's.

Submitted-by: Markus Pfeiffer <markus.pfeiffer@morphism.de>
---
 lib/libu4bhid/data.c       | 5 +----
 lib/libu4bhid/descr.c      | 5 +----
 lib/libu4bhid/parse.c      | 7 ++-----
 lib/libu4bhid/usage.c      | 3 ---
 sys/bus/u4b/usb.h          | 4 ++--
 sys/bus/u4b/usb_ioctl.h    | 4 ++--
 sys/bus/u4b/usbhid.h       | 2 +-
 usr.bin/u4bhidctl/usbhid.c | 2 +-
 8 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/lib/libu4bhid/data.c b/lib/libu4bhid/data.c
index f607737522..8aa8cd9002 100644
--- a/lib/libu4bhid/data.c
+++ b/lib/libu4bhid/data.c
@@ -26,14 +26,11 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dev/usb/usb_ioctl.h>
+#include <bus/u4b/usb_ioctl.h>
 #include "usbhid.h"
 #include "usbvar.h"
 
diff --git a/lib/libu4bhid/descr.c b/lib/libu4bhid/descr.c
index def90da3b7..112101c927 100644
--- a/lib/libu4bhid/descr.c
+++ b/lib/libu4bhid/descr.c
@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 
 #include <assert.h>
@@ -38,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <dev/usb/usb_ioctl.h>
+#include <bus/u4b/usb_ioctl.h>
 
 #include "usbhid.h"
 #include "usbvar.h"
diff --git a/lib/libu4bhid/parse.c b/lib/libu4bhid/parse.c
index f7c2cb195b..83b05d011e 100644
--- a/lib/libu4bhid/parse.c
+++ b/lib/libu4bhid/parse.c
@@ -26,16 +26,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
+#include <bus/u4b/usb.h>
+#include <bus/u4b/usbhid.h>
 
 #include "usbhid.h"
 #include "usbvar.h"
diff --git a/lib/libu4bhid/usage.c b/lib/libu4bhid/usage.c
index 3960dad807..5e5e615b91 100644
--- a/lib/libu4bhid/usage.c
+++ b/lib/libu4bhid/usage.c
@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/sys/bus/u4b/usb.h b/sys/bus/u4b/usb.h
index eac27620ac..cc1873aeda 100644
--- a/sys/bus/u4b/usb.h
+++ b/sys/bus/u4b/usb.h
@@ -54,8 +54,8 @@ MALLOC_DECLARE(M_USBDEV);
 MALLOC_DECLARE(M_USBHC);
 #endif /* _KERNEL */
 
-#include <dev/usb/usb_endian.h>
-#include <dev/usb/usb_freebsd.h>
+#include <bus/u4b/usb_endian.h>
+#include <bus/u4b/usb_freebsd.h>
 
 #define	USB_STACK_VERSION 2000		/* 2.0 */
 
diff --git a/sys/bus/u4b/usb_ioctl.h b/sys/bus/u4b/usb_ioctl.h
index 9af6ee5c7a..5f379ad569 100644
--- a/sys/bus/u4b/usb_ioctl.h
+++ b/sys/bus/u4b/usb_ioctl.h
@@ -33,8 +33,8 @@
 
 /* Building "kdump" depends on these includes */
 
-#include <dev/usb/usb_endian.h>
-#include <dev/usb/usb.h>
+#include <bus/u4b/usb_endian.h>
+#include <bus/u4b/usb.h>
 
 #define	USB_DEVICE_NAME "usbctl"
 #define	USB_DEVICE_DIR "usb"
diff --git a/sys/bus/u4b/usbhid.h b/sys/bus/u4b/usbhid.h
index 4816e87076..3a9dfd70c7 100644
--- a/sys/bus/u4b/usbhid.h
+++ b/sys/bus/u4b/usbhid.h
@@ -29,7 +29,7 @@
 #ifndef _USB_HID_H_
 #define	_USB_HID_H_
 
-#include <dev/usb/usb_endian.h>
+#include <bus/u4b/usb_endian.h>
 
 #define	UR_GET_HID_DESCRIPTOR	0x06
 #define	UDESC_HID		0x21
diff --git a/usr.bin/u4bhidctl/usbhid.c b/usr.bin/u4bhidctl/usbhid.c
index d9d960a974..5206505915 100644
--- a/usr.bin/u4bhidctl/usbhid.c
+++ b/usr.bin/u4bhidctl/usbhid.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <usbhid.h>
-#include <bus/usb/usbhid.h>
+#include <bus/u4b/usbhid.h>
 
 static struct variable {
 	char *name;
-- 
2.41.0