Rename libusb to libusbhid, a better name, per NetBSD

10 files changed, 52 insertions, 52 deletions

diff --git a/lib/Makefile b/lib/Makefile
index d7acfcfd33e..05d4faa436c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.43 2001/09/03 05:34:02 pvalchev Exp $
+#	$OpenBSD: Makefile,v 1.44 2001/12/30 07:04:38 pvalchev Exp $
 #	$NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
 
 SUBDIR=	csu libarch libc libc_r libcom_err libcompat libcurses libcurses++ \
 	libdes libedit libform libkeynote libl libm libmenu libocurses \
 	libossaudio libpanel libpcap libresolv librpcsvc libskey \
-	libsectok libssl libtelnet libusb libutil libwrap liby libz libkvm
+	libsectok libssl libtelnet libusbhid libutil libwrap liby libz libkvm
 
 .include <bsd.subdir.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
deleted file mode 100644
index de855946112..00000000000
--- a/lib/libusb/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2001/09/03 11:29:47 deraadt Exp $
-#	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
-
-LIB=	usb
-NOPIC=
-NOPROFILE=
-MAN=	usb.3
-
-MLINKS=	usb.3 hid_dispose_report_desc.3 \
-	usb.3 hid_end_parse.3 \
-	usb.3 hid_get_data.3 \
-	usb.3 hid_get_item.3 \
-	usb.3 hid_get_report_desc.3 \
-	usb.3 hid_init.3 \
-	usb.3 hid_locate.3 \
-	usb.3 hid_parse_usage_in_page.3 \
-	usb.3 hid_parse_usage_page.3 \
-	usb.3 hid_report_size.3 \
-	usb.3 hid_set_data.3 \
-	usb.3 hid_start_parse.3 \
-	usb.3 hid_usage_in_page.3 \
-	usb.3 hid_usage_page.3 \
-	usb.3 hid_use_report_desc.3
-
-SRCS=	descr.c parse.c usage.c data.c
-
-CPPFLAGS+= -I${.CURDIR}
-
-includes:
-	@cd ${.CURDIR}; cmp -s usb.h ${DESTDIR}/usr/include/usb.h || \
-	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) usb.h \
-	  ${DESTDIR}/usr/include
-
-.include <bsd.lib.mk>
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
new file mode 100644
index 00000000000..a3dfa6790c5
--- /dev/null
+++ b/lib/libusbhid/Makefile
@@ -0,0 +1,34 @@
+#	$OpenBSD: Makefile,v 1.1 2001/12/30 07:04:38 pvalchev Exp $
+#	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
+
+LIB=	usbhid
+NOPIC=
+NOPROFILE=
+MAN=	usbhid.3
+
+MLINKS=	usbhid.3 hid_dispose_report_desc.3 \
+	usbhid.3 hid_end_parse.3 \
+	usbhid.3 hid_get_data.3 \
+	usbhid.3 hid_get_item.3 \
+	usbhid.3 hid_get_report_desc.3 \
+	usbhid.3 hid_init.3 \
+	usbhid.3 hid_locate.3 \
+	usbhid.3 hid_parse_usage_in_page.3 \
+	usbhid.3 hid_parse_usage_page.3 \
+	usbhid.3 hid_report_size.3 \
+	usbhid.3 hid_set_data.3 \
+	usbhid.3 hid_start_parse.3 \
+	usbhid.3 hid_usage_in_page.3 \
+	usbhid.3 hid_usage_page.3 \
+	usbhid.3 hid_use_report_desc.3
+
+SRCS=	descr.c parse.c usage.c data.c
+
+CPPFLAGS+= -I${.CURDIR}
+
+includes:
+	@cd ${.CURDIR}; cmp -s usbhid.h ${DESTDIR}/usr/include/usbhid.h || \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) usbhid.h \
+	  ${DESTDIR}/usr/include
+
+.include <bsd.lib.mk>
diff --git a/lib/libusb/data.c b/lib/libusbhid/data.c
index 0f365636e99..57571967fe4 100644
--- a/lib/libusb/data.c
+++ b/lib/libusbhid/data.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: data.c,v 1.1 2001/09/02 17:50:40 pvalchev Exp $	*/
+/*	$OpenBSD: data.c,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
 /*	$NetBSD: data.c,v 1.8 2000/04/02 11:10:53 augustss Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <stdlib.h>
-#include "usb.h"
+#include "usbhid.h"
 
 int
 hid_get_data(const void *p, const hid_item_t *h)
diff --git a/lib/libusb/descr.c b/lib/libusbhid/descr.c
index e50152979e0..e6bb8c4f2a1 100644
--- a/lib/libusb/descr.c
+++ b/lib/libusbhid/descr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: descr.c,v 1.1 2001/09/02 17:50:40 pvalchev Exp $	*/
+/*	$OpenBSD: descr.c,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
 /*	$NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 
 #include <dev/usb/usb.h>
 
-#include "usb.h"
+#include "usbhid.h"
 #include "usbvar.h"
 
 report_desc_t
diff --git a/lib/libusb/parse.c b/lib/libusbhid/parse.c
index 6bda035792c..737812254b1 100644
--- a/lib/libusb/parse.c
+++ b/lib/libusbhid/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.1 2001/09/02 17:50:40 pvalchev Exp $	*/
+/*	$OpenBSD: parse.c,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
 /*	$NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 
-#include "usb.h"
+#include "usbhid.h"
 #include "usbvar.h"
 
 #define MAXUSAGE 100
diff --git a/lib/libusb/usage.c b/lib/libusbhid/usage.c
index 38e87871eaa..fb36769d243 100644
--- a/lib/libusb/usage.c
+++ b/lib/libusbhid/usage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usage.c,v 1.2 2001/09/03 11:19:05 deraadt Exp $	*/
+/*	$OpenBSD: usage.c,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
 /*	$NetBSD: usage.c,v 1.11 2001/01/09 15:59:47 augustss Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "usb.h"
+#include "usbhid.h"
 
 #define _PATH_HIDTABLE "/usr/share/misc/usb_hid_usages"
 
diff --git a/lib/libusb/usb.3 b/lib/libusbhid/usbhid.3
index a279f5fb09b..a31e261b118 100644
--- a/lib/libusb/usb.3
+++ b/lib/libusbhid/usbhid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.3,v 1.3 2001/09/25 03:31:59 pvalchev Exp $
+.\"	$OpenBSD: usbhid.3,v 1.1 2001/12/30 07:04:38 pvalchev Exp $
 .\"	$NetBSD: usb.3,v 1.14 2001/04/09 12:09:49 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
@@ -26,10 +26,10 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd May 11, 1999
-.Dt USB 3
+.Dt USBHID 3
 .Os
 .Sh NAME
-.Nm usb ,
+.Nm usbhid ,
 .Nm hid_get_report_desc ,
 .Nm hid_use_report_desc ,
 .Nm hid_dispose_report_desc ,
@@ -45,7 +45,7 @@
 .Nm hid_set_data
 .Nd USB HID access routines
 .Sh SYNOPSIS
-.Fd #include <usb.h>
+.Fd #include <usbhid.h>
 .Ft report_desc_t
 .Fn hid_get_report_desc "int file"
 .Ft report_desc_t
@@ -140,7 +140,7 @@ will be filled with the relevant data for the item.
 The definition of
 .Fa hid_item_t
 can be found in
-.Pa <usb.h>
+.Pa <usbhid.h>
 and the meaning of the components in the USB HID documentation.
 .Pp
 Data should be read/written to the device in the size of
diff --git a/lib/libusb/usb.h b/lib/libusbhid/usbhid.h
index 30b5567c215..57c0b83bde9 100644
--- a/lib/libusb/usb.h
+++ b/lib/libusbhid/usbhid.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: usb.h,v 1.1 2001/09/02 17:50:40 pvalchev Exp $	*/
-/*	$NetBSD: usb.h,v 1.10 2000/09/24 02:13:25 augustss Exp $	*/
+/*	$OpenBSD: usbhid.h,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
+/*	$NetBSD: usbhid.h,v 1.1 2001/12/28 17:45:27 augustss Exp $	*/
 
 /*
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
diff --git a/lib/libusb/usbvar.h b/lib/libusbhid/usbvar.h
index e8ca497db0d..ef23a3d3bfa 100644
--- a/lib/libusb/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbvar.h,v 1.1 2001/09/02 17:50:40 pvalchev Exp $	*/
+/*	$OpenBSD: usbvar.h,v 1.1 2001/12/30 07:04:38 pvalchev Exp $	*/
 /*	$NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $	*/
 
 /*