usb4bsd: Adjust header paths in libusbhid, usbhidctl, and public headers.

Also remove some __FBSDID's.

Submitted-by: Markus Pfeiffer <markus.pfeiffer@morphism.de>

diff --git a/lib/libu4bhid/data.c b/lib/libu4bhid/data.c
index f607737..8aa8cd9 100644 (file)
--- 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 def90da..112101c 100644 (file)
--- 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 f7c2cb1..83b05d0 100644 (file)
--- 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 3960dad..5e5e615 100644 (file)
--- 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 eac2762..cc1873a 100644 (file)
--- 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 9af6ee5..5f379ad 100644 (file)
--- 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 4816e87..3a9dfd7 100644 (file)
--- 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 d9d960a..5206505 100644 (file)
--- 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;