Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nick-nhusb]: src/sys Rename usbroothub_subr.[ch] to usbroothub.[ch]
details: https://anonhg.NetBSD.org/src/rev/f618d7c86693
branches: nick-nhusb
changeset: 334072:f618d7c86693
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Dec 03 23:05:06 2014 +0000
description:
Rename usbroothub_subr.[ch] to usbroothub.[ch]
diffstat:
sys/conf/files | 4 +-
sys/dev/ic/sl811hs.c | 6 +-
sys/dev/usb/ehci.c | 6 +-
sys/dev/usb/motg.c | 6 +-
sys/dev/usb/ohci.c | 6 +-
sys/dev/usb/uhci.c | 6 +-
sys/dev/usb/usbroothub.c | 66 +++++++++++++++++++++++++++++++++++++
sys/dev/usb/usbroothub.h | 4 ++
sys/dev/usb/usbroothub_subr.c | 66 -------------------------------------
sys/dev/usb/usbroothub_subr.h | 4 --
sys/dev/usb/xhci.c | 6 +-
sys/external/bsd/dwc2/dwc2.c | 6 +-
sys/rump/dev/lib/libugenhc/ugenhc.c | 6 +-
sys/rump/dev/lib/libusb/Makefile | 4 +-
14 files changed, 98 insertions(+), 98 deletions(-)
diffs (truncated from 408 to 300 lines):
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/conf/files
--- a/sys/conf/files Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/conf/files Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1121.2.1 2014/12/02 09:00:33 skrll Exp $
+# $NetBSD: files,v 1.1121.2.2 2014/12/03 23:05:06 skrll Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20141030
@@ -1207,7 +1207,7 @@
#
define usbroothub
-file dev/usb/usbroothub_subr.c usbroothub
+file dev/usb/usbroothub.c usbroothub
define usb_dma
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/dev/ic/sl811hs.c Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.47.6.8 2014/12/03 22:40:55 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.47.6.9 2014/12/03 23:05:06 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.8 2014/12/03 22:40:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.9 2014/12/03 23:05:06 skrll Exp $");
#include "opt_slhci.h"
@@ -90,7 +90,7 @@
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usbroothub_subr.h>
+#include <dev/usb/usbroothub.h>
#include <dev/ic/sl811hsreg.h>
#include <dev/ic/sl811hsvar.h>
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/dev/usb/ehci.c Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.11 2014/12/03 22:40:55 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.12 2014/12/03 23:05:06 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.11 2014/12/03 22:40:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.12 2014/12/03 23:05:06 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -81,7 +81,7 @@
#include <dev/usb/usbhist.h>
#include <dev/usb/usb_mem.h>
#include <dev/usb/usb_quirks.h>
-#include <dev/usb/usbroothub_subr.h>
+#include <dev/usb/usbroothub.h>
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/dev/usb/motg.c Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.12.2.7 2014/12/03 22:42:41 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.12.2.8 2014/12/03 23:05:06 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include "opt_motg.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.7 2014/12/03 22:42:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.8 2014/12/03 23:05:06 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@
#endif
#include <dev/usb/motgvar.h>
-#include <dev/usb/usbroothub_subr.h>
+#include <dev/usb/usbroothub.h>
#define MOTG_DEBUG
#ifdef MOTG_DEBUG
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/dev/usb/ohci.c Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.10 2014/12/03 22:40:55 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.11 2014/12/03 23:05:06 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.10 2014/12/03 22:40:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.11 2014/12/03 23:05:06 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@
#include <dev/usb/ohcireg.h>
#include <dev/usb/ohcivar.h>
-#include <dev/usb/usbroothub_subr.h>
+#include <dev/usb/usbroothub.h>
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c Wed Dec 03 22:42:41 2014 +0000
+++ b/sys/dev/usb/uhci.c Wed Dec 03 23:05:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.4.10 2014/12/03 22:40:55 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.264.4.11 2014/12/03 23:05:06 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.10 2014/12/03 22:40:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.11 2014/12/03 23:05:06 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@
#include <dev/usb/uhcireg.h>
#include <dev/usb/uhcivar.h>
-#include <dev/usb/usbroothub_subr.h>
+#include <dev/usb/usbroothub.h>
/* Use bandwidth reclamation for control transfers. Some devices choke on it. */
/*#define UHCI_CTL_LOOP */
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/usbroothub.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/usb/usbroothub.c Wed Dec 03 23:05:06 2014 +0000
@@ -0,0 +1,66 @@
+/* $NetBSD: usbroothub.c,v 1.1.2.1 2014/12/03 23:05:06 skrll Exp $ */
+
+/*
+ * Copyright (c) 2008
+ * Matthias Drochner. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbroothub.h>
+
+/* helper functions for USB root hub emulation */
+
+int
+usb_makestrdesc(usb_string_descriptor_t *p, int l, const char *s)
+{
+ int i;
+
+ if (l == 0)
+ return (0);
+ p->bLength = 2 * strlen(s) + 2;
+ if (l == 1)
+ return (1);
+ p->bDescriptorType = UDESC_STRING;
+ l -= 2;
+ /* poor man's utf-16le conversion */
+ for (i = 0; s[i] && l > 1; i++, l -= 2)
+ USETW2(p->bString[i], 0, s[i]);
+ return (2 * i + 2);
+}
+
+int
+usb_makelangtbl(usb_string_descriptor_t *p, int l)
+{
+
+ if (l == 0)
+ return (0);
+ p->bLength = 4;
+ if (l == 1)
+ return (1);
+ p->bDescriptorType = UDESC_STRING;
+ if (l < 4)
+ return (2);
+ USETW(p->bString[0], 0x0409); /* english/US */
+ return (4);
+}
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/usbroothub.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/usb/usbroothub.h Wed Dec 03 23:05:06 2014 +0000
@@ -0,0 +1,4 @@
+/* $NetBSD: usbroothub.h,v 1.1.2.1 2014/12/03 23:05:06 skrll Exp $ */
+
+int usb_makestrdesc(usb_string_descriptor_t *, int, const char *);
+int usb_makelangtbl(usb_string_descriptor_t *, int);
diff -r d0ddcb8b8c7f -r f618d7c86693 sys/dev/usb/usbroothub_subr.c
--- a/sys/dev/usb/usbroothub_subr.c Wed Dec 03 22:42:41 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/* $NetBSD: usbroothub_subr.c,v 1.1 2008/02/03 10:57:13 drochner Exp $ */
-
-/*
- * Copyright (c) 2008
- * Matthias Drochner. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbroothub_subr.h>
-
-/* helper functions for USB root hub emulation */
-
-int
-usb_makestrdesc(usb_string_descriptor_t *p, int l, const char *s)
-{
- int i;
-
- if (l == 0)
- return (0);
- p->bLength = 2 * strlen(s) + 2;
- if (l == 1)
- return (1);
- p->bDescriptorType = UDESC_STRING;
- l -= 2;
- /* poor man's utf-16le conversion */
- for (i = 0; s[i] && l > 1; i++, l -= 2)
- USETW2(p->bString[i], 0, s[i]);
- return (2 * i + 2);
-}
-
-int
-usb_makelangtbl(usb_string_descriptor_t *p, int l)
-{
-
- if (l == 0)
- return (0);
- p->bLength = 4;
- if (l == 1)
- return (1);
- p->bDescriptorType = UDESC_STRING;
- if (l < 4)
- return (2);
- USETW(p->bString[0], 0x0409); /* english/US */
- return (4);
Home |
Main Index |
Thread Index |
Old Index