[src/trunk]: src/sys/dev/usb Put these back. They are used.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8af65adaf5aa
branches:  trunk
changeset: 341705:8af65adaf5aa
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Nov 19 00:40:43 2015 +0000

description:
Put these back. They are used.

diffstat:

 sys/dev/usb/usbroothub_subr.c |  66 +++++++++++++++++++++++++++++++++++++++++++
 sys/dev/usb/usbroothub_subr.h |   4 ++
 2 files changed, 70 insertions(+), 0 deletions(-)

diffs (78 lines):

diff -r bb9662ea06d4 -r 8af65adaf5aa sys/dev/usb/usbroothub_subr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/usb/usbroothub_subr.c     Thu Nov 19 00:40:43 2015 +0000
@@ -0,0 +1,66 @@
+/* $NetBSD: usbroothub_subr.c,v 1.3 2015/11/19 00:40:43 christos 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);
+}
diff -r bb9662ea06d4 -r 8af65adaf5aa sys/dev/usb/usbroothub_subr.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/usb/usbroothub_subr.h     Thu Nov 19 00:40:43 2015 +0000
@@ -0,0 +1,4 @@
+/* $NetBSD: usbroothub_subr.h,v 1.3 2015/11/19 00:40:43 christos Exp $ */
+
+int usb_makestrdesc(usb_string_descriptor_t *, int, const char *);
+int usb_makelangtbl(usb_string_descriptor_t *, int);