Module Name: src
Committed By: christos
Date: Thu Nov 19 00:40:43 UTC 2015
Added Files:
src/sys/dev/usb: usbroothub_subr.c usbroothub_subr.h
Log Message:
Put these back. They are used.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/sys/dev/usb/usbroothub_subr.c \
src/sys/dev/usb/usbroothub_subr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/usb/usbroothub_subr.c
diff -u /dev/null src/sys/dev/usb/usbroothub_subr.c:1.3
--- /dev/null Wed Nov 18 19:40:43 2015
+++ src/sys/dev/usb/usbroothub_subr.c Wed Nov 18 19:40:43 2015
@@ -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);
+}
Index: src/sys/dev/usb/usbroothub_subr.h
diff -u /dev/null src/sys/dev/usb/usbroothub_subr.h:1.3
--- /dev/null Wed Nov 18 19:40:43 2015
+++ src/sys/dev/usb/usbroothub_subr.h Wed Nov 18 19:40:43 2015
@@ -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);
