Rename usbroothub_subr.[ch] to usbroothub.[ch]diff -r1.1121.2.1 -r1.1121.2.2 src/sys/conf/files
(skrll)
--- src/sys/conf/files 2014/12/02 09:00:33 1.1121.2.1
+++ src/sys/conf/files 2014/12/03 23:05:06 1.1121.2.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: files,v 1.1121.2.1 2014/12/02 09:00:33 skrll Exp $ | 1 | # $NetBSD: files,v 1.1121.2.2 2014/12/03 23:05:06 skrll Exp $ | |
2 | # @(#)files.newconf 7.5 (Berkeley) 5/10/93 | 2 | # @(#)files.newconf 7.5 (Berkeley) 5/10/93 | |
3 | 3 | |||
4 | version 20141030 | 4 | version 20141030 | |
5 | 5 | |||
6 | # | 6 | # | |
7 | # device classes | 7 | # device classes | |
8 | # | 8 | # | |
9 | devclass disk | 9 | devclass disk | |
10 | devclass tape | 10 | devclass tape | |
11 | devclass ifnet | 11 | devclass ifnet | |
12 | devclass tty | 12 | devclass tty | |
13 | devclass audiodev | 13 | devclass audiodev | |
14 | devclass displaydev | 14 | devclass displaydev | |
@@ -1197,27 +1197,27 @@ define usbus { } # USB attachment | @@ -1197,27 +1197,27 @@ define usbus { } # USB attachment | |||
1197 | define fwbus { } # IEEE 1394 attachment | 1197 | define fwbus { } # IEEE 1394 attachment | |
1198 | define vmebus { } # VME bus attachment | 1198 | define vmebus { } # VME bus attachment | |
1199 | define acpibus { } # ACPI "bus" attachment | 1199 | define acpibus { } # ACPI "bus" attachment | |
1200 | define pcmciabus { [controller = -1], [socket = -1]} # PCMCIA bus attachment | 1200 | define pcmciabus { [controller = -1], [socket = -1]} # PCMCIA bus attachment | |
1201 | define cbbus { } # CardBus attachment | 1201 | define cbbus { } # CardBus attachment | |
1202 | define pcmciaslot { } # PCMCIA slot itself | 1202 | define pcmciaslot { } # PCMCIA slot itself | |
1203 | define sdmmcbus { } # SD/MMC attachment | 1203 | define sdmmcbus { } # SD/MMC attachment | |
1204 | 1204 | |||
1205 | # We need the USB bus controllers here so different busses can | 1205 | # We need the USB bus controllers here so different busses can | |
1206 | # use them in an 'attach-with'. | 1206 | # use them in an 'attach-with'. | |
1207 | # | 1207 | # | |
1208 | 1208 | |||
1209 | define usbroothub | 1209 | define usbroothub | |
1210 | file dev/usb/usbroothub_subr.c usbroothub | 1210 | file dev/usb/usbroothub.c usbroothub | |
1211 | 1211 | |||
1212 | define usb_dma | 1212 | define usb_dma | |
1213 | 1213 | |||
1214 | # UHCI USB controller | 1214 | # UHCI USB controller | |
1215 | # | 1215 | # | |
1216 | device uhci: usbus, usbroothub, usb_dma | 1216 | device uhci: usbus, usbroothub, usb_dma | |
1217 | file dev/usb/uhci.c uhci needs-flag | 1217 | file dev/usb/uhci.c uhci needs-flag | |
1218 | 1218 | |||
1219 | # OHCI USB controller | 1219 | # OHCI USB controller | |
1220 | # | 1220 | # | |
1221 | device ohci: usbus, usbroothub, usb_dma | 1221 | device ohci: usbus, usbroothub, usb_dma | |
1222 | file dev/usb/ohci.c ohci needs-flag | 1222 | file dev/usb/ohci.c ohci needs-flag | |
1223 | 1223 |
--- src/sys/dev/ic/sl811hs.c 2014/12/03 22:40:55 1.47.6.8
+++ src/sys/dev/ic/sl811hs.c 2014/12/03 23:05:06 1.47.6.9
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sl811hs.c,v 1.47.6.8 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: sl811hs.c,v 1.47.6.9 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Not (c) 2007 Matthew Orgass | 4 | * Not (c) 2007 Matthew Orgass | |
5 | * This file is public domain, meaning anyone can make any use of part or all | 5 | * This file is public domain, meaning anyone can make any use of part or all | |
6 | * of this file including copying into other works without credit. Any use, | 6 | * of this file including copying into other works without credit. Any use, | |
7 | * modified or not, is solely the responsibility of the user. If this file is | 7 | * modified or not, is solely the responsibility of the user. If this file is | |
8 | * part of a collection then use in the collection is governed by the terms of | 8 | * part of a collection then use in the collection is governed by the terms of | |
9 | * the collection. | 9 | * the collection. | |
10 | */ | 10 | */ | |
11 | 11 | |||
12 | /* | 12 | /* | |
13 | * Cypress/ScanLogic SL811HS/T USB Host Controller | 13 | * Cypress/ScanLogic SL811HS/T USB Host Controller | |
14 | * Datasheet, Errata, and App Note available at www.cypress.com | 14 | * Datasheet, Errata, and App Note available at www.cypress.com | |
@@ -58,49 +58,49 @@ | @@ -58,49 +58,49 @@ | |||
58 | */ | 58 | */ | |
59 | 59 | |||
60 | /* | 60 | /* | |
61 | * XXX TODO: | 61 | * XXX TODO: | |
62 | * copy next output packet while transfering | 62 | * copy next output packet while transfering | |
63 | * usb suspend | 63 | * usb suspend | |
64 | * could keep track of known values of all buffer space? | 64 | * could keep track of known values of all buffer space? | |
65 | * combined print/log function for errors | 65 | * combined print/log function for errors | |
66 | * | 66 | * | |
67 | * ub_usepolling support is untested and may not work | 67 | * ub_usepolling support is untested and may not work | |
68 | */ | 68 | */ | |
69 | 69 | |||
70 | #include <sys/cdefs.h> | 70 | #include <sys/cdefs.h> | |
71 | __KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.8 2014/12/03 22:40:55 skrll Exp $"); | 71 | __KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.9 2014/12/03 23:05:06 skrll Exp $"); | |
72 | 72 | |||
73 | #include "opt_slhci.h" | 73 | #include "opt_slhci.h" | |
74 | 74 | |||
75 | #include <sys/cdefs.h> | 75 | #include <sys/cdefs.h> | |
76 | #include <sys/param.h> | 76 | #include <sys/param.h> | |
77 | #include <sys/systm.h> | 77 | #include <sys/systm.h> | |
78 | #include <sys/kernel.h> | 78 | #include <sys/kernel.h> | |
79 | #include <sys/proc.h> | 79 | #include <sys/proc.h> | |
80 | #include <sys/device.h> | 80 | #include <sys/device.h> | |
81 | #include <sys/kmem.h> | 81 | #include <sys/kmem.h> | |
82 | #include <sys/queue.h> | 82 | #include <sys/queue.h> | |
83 | #include <sys/gcq.h> | 83 | #include <sys/gcq.h> | |
84 | #include <sys/intr.h> | 84 | #include <sys/intr.h> | |
85 | #include <sys/cpu.h> | 85 | #include <sys/cpu.h> | |
86 | #include <sys/bus.h> | 86 | #include <sys/bus.h> | |
87 | 87 | |||
88 | #include <dev/usb/usb.h> | 88 | #include <dev/usb/usb.h> | |
89 | #include <dev/usb/usbdi.h> | 89 | #include <dev/usb/usbdi.h> | |
90 | #include <dev/usb/usbdivar.h> | 90 | #include <dev/usb/usbdivar.h> | |
91 | #include <dev/usb/usb_mem.h> | 91 | #include <dev/usb/usb_mem.h> | |
92 | #include <dev/usb/usbdevs.h> | 92 | #include <dev/usb/usbdevs.h> | |
93 | #include <dev/usb/usbroothub_subr.h> | 93 | #include <dev/usb/usbroothub.h> | |
94 | 94 | |||
95 | #include <dev/ic/sl811hsreg.h> | 95 | #include <dev/ic/sl811hsreg.h> | |
96 | #include <dev/ic/sl811hsvar.h> | 96 | #include <dev/ic/sl811hsvar.h> | |
97 | 97 | |||
98 | #define Q_CB 0 /* Control/Bulk */ | 98 | #define Q_CB 0 /* Control/Bulk */ | |
99 | #define Q_NEXT_CB 1 | 99 | #define Q_NEXT_CB 1 | |
100 | #define Q_MAX_XFER Q_CB | 100 | #define Q_MAX_XFER Q_CB | |
101 | #define Q_CALLBACKS 2 | 101 | #define Q_CALLBACKS 2 | |
102 | #define Q_MAX Q_CALLBACKS | 102 | #define Q_MAX Q_CALLBACKS | |
103 | 103 | |||
104 | #define F_AREADY (0x00000001) | 104 | #define F_AREADY (0x00000001) | |
105 | #define F_BREADY (0x00000002) | 105 | #define F_BREADY (0x00000002) | |
106 | #define F_AINPROG (0x00000004) | 106 | #define F_AINPROG (0x00000004) |
--- src/sys/dev/usb/ehci.c 2014/12/03 22:40:55 1.234.2.11
+++ src/sys/dev/usb/ehci.c 2014/12/03 23:05:06 1.234.2.12
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ehci.c,v 1.234.2.11 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: ehci.c,v 1.234.2.12 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum, | 8 | * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum, | |
9 | * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill | 9 | * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill | |
10 | * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au). | 10 | * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au). | |
11 | * | 11 | * | |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without | |
13 | * modification, are permitted provided that the following conditions | 13 | * modification, are permitted provided that the following conditions | |
14 | * are met: | 14 | * are met: | |
@@ -43,27 +43,27 @@ | @@ -43,27 +43,27 @@ | |||
43 | 43 | |||
44 | /* | 44 | /* | |
45 | * TODO: | 45 | * TODO: | |
46 | * 1) hold off explorations by companion controllers until ehci has started. | 46 | * 1) hold off explorations by companion controllers until ehci has started. | |
47 | * | 47 | * | |
48 | * 2) The hub driver needs to handle and schedule the transaction translator, | 48 | * 2) The hub driver needs to handle and schedule the transaction translator, | |
49 | * to assign place in frame where different devices get to go. See chapter | 49 | * to assign place in frame where different devices get to go. See chapter | |
50 | * on hubs in USB 2.0 for details. | 50 | * on hubs in USB 2.0 for details. | |
51 | * | 51 | * | |
52 | * 3) Command failures are not recovered correctly. | 52 | * 3) Command failures are not recovered correctly. | |
53 | */ | 53 | */ | |
54 | 54 | |||
55 | #include <sys/cdefs.h> | 55 | #include <sys/cdefs.h> | |
56 | __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.11 2014/12/03 22:40:55 skrll Exp $"); | 56 | __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.12 2014/12/03 23:05:06 skrll Exp $"); | |
57 | 57 | |||
58 | #include "ohci.h" | 58 | #include "ohci.h" | |
59 | #include "uhci.h" | 59 | #include "uhci.h" | |
60 | #include "opt_usb.h" | 60 | #include "opt_usb.h" | |
61 | 61 | |||
62 | #include <sys/param.h> | 62 | #include <sys/param.h> | |
63 | 63 | |||
64 | #include <sys/bus.h> | 64 | #include <sys/bus.h> | |
65 | #include <sys/cpu.h> | 65 | #include <sys/cpu.h> | |
66 | #include <sys/device.h> | 66 | #include <sys/device.h> | |
67 | #include <sys/kernel.h> | 67 | #include <sys/kernel.h> | |
68 | #include <sys/kmem.h> | 68 | #include <sys/kmem.h> | |
69 | #include <sys/mutex.h> | 69 | #include <sys/mutex.h> | |
@@ -71,27 +71,27 @@ __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.2 | @@ -71,27 +71,27 @@ __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.2 | |||
71 | #include <sys/queue.h> | 71 | #include <sys/queue.h> | |
72 | #include <sys/select.h> | 72 | #include <sys/select.h> | |
73 | #include <sys/sysctl.h> | 73 | #include <sys/sysctl.h> | |
74 | #include <sys/systm.h> | 74 | #include <sys/systm.h> | |
75 | 75 | |||
76 | #include <machine/endian.h> | 76 | #include <machine/endian.h> | |
77 | 77 | |||
78 | #include <dev/usb/usb.h> | 78 | #include <dev/usb/usb.h> | |
79 | #include <dev/usb/usbdi.h> | 79 | #include <dev/usb/usbdi.h> | |
80 | #include <dev/usb/usbdivar.h> | 80 | #include <dev/usb/usbdivar.h> | |
81 | #include <dev/usb/usbhist.h> | 81 | #include <dev/usb/usbhist.h> | |
82 | #include <dev/usb/usb_mem.h> | 82 | #include <dev/usb/usb_mem.h> | |
83 | #include <dev/usb/usb_quirks.h> | 83 | #include <dev/usb/usb_quirks.h> | |
84 | #include <dev/usb/usbroothub_subr.h> | 84 | #include <dev/usb/usbroothub.h> | |
85 | 85 | |||
86 | #include <dev/usb/ehcireg.h> | 86 | #include <dev/usb/ehcireg.h> | |
87 | #include <dev/usb/ehcivar.h> | 87 | #include <dev/usb/ehcivar.h> | |
88 | 88 | |||
89 | 89 | |||
90 | #ifdef USB_DEBUG | 90 | #ifdef USB_DEBUG | |
91 | #ifndef EHCI_DEBUG | 91 | #ifndef EHCI_DEBUG | |
92 | #define ehcidebug 0 | 92 | #define ehcidebug 0 | |
93 | #else | 93 | #else | |
94 | static int ehcidebug = 0; | 94 | static int ehcidebug = 0; | |
95 | 95 | |||
96 | SYSCTL_SETUP(sysctl_hw_ehci_setup, "sysctl hw.ehci setup") | 96 | SYSCTL_SETUP(sysctl_hw_ehci_setup, "sysctl hw.ehci setup") | |
97 | { | 97 | { |
--- src/sys/dev/usb/motg.c 2014/12/03 22:42:41 1.12.2.7
+++ src/sys/dev/usb/motg.c 2014/12/03 23:05:06 1.12.2.8
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: motg.c,v 1.12.2.7 2014/12/03 22:42:41 skrll Exp $ */ | 1 | /* $NetBSD: motg.c,v 1.12.2.8 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net) at | 8 | * by Lennart Augustsson (lennart@augustsson.net) at | |
9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca), | 9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca), | |
10 | * Matthew R. Green (mrg@eterna.com.au), and Manuel Bouyer (bouyer@netbsd.org). | 10 | * Matthew R. Green (mrg@eterna.com.au), and Manuel Bouyer (bouyer@netbsd.org). | |
11 | * | 11 | * | |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without | |
13 | * modification, are permitted provided that the following conditions | 13 | * modification, are permitted provided that the following conditions | |
14 | * are met: | 14 | * are met: | |
@@ -32,27 +32,27 @@ | @@ -32,27 +32,27 @@ | |||
32 | */ | 32 | */ | |
33 | 33 | |||
34 | 34 | |||
35 | /* | 35 | /* | |
36 | * This file contains the driver for the Mentor Graphics Inventra USB | 36 | * This file contains the driver for the Mentor Graphics Inventra USB | |
37 | * 2.0 High Speed Dual-Role controller. | 37 | * 2.0 High Speed Dual-Role controller. | |
38 | * | 38 | * | |
39 | * NOTE: The current implementation only supports Device Side Mode! | 39 | * NOTE: The current implementation only supports Device Side Mode! | |
40 | */ | 40 | */ | |
41 | 41 | |||
42 | #include "opt_motg.h" | 42 | #include "opt_motg.h" | |
43 | 43 | |||
44 | #include <sys/cdefs.h> | 44 | #include <sys/cdefs.h> | |
45 | __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.7 2014/12/03 22:42:41 skrll Exp $"); | 45 | __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.8 2014/12/03 23:05:06 skrll Exp $"); | |
46 | 46 | |||
47 | #include <sys/param.h> | 47 | #include <sys/param.h> | |
48 | #include <sys/systm.h> | 48 | #include <sys/systm.h> | |
49 | #include <sys/kernel.h> | 49 | #include <sys/kernel.h> | |
50 | #include <sys/kmem.h> | 50 | #include <sys/kmem.h> | |
51 | #include <sys/device.h> | 51 | #include <sys/device.h> | |
52 | #include <sys/select.h> | 52 | #include <sys/select.h> | |
53 | #include <sys/extent.h> | 53 | #include <sys/extent.h> | |
54 | #include <sys/proc.h> | 54 | #include <sys/proc.h> | |
55 | #include <sys/queue.h> | 55 | #include <sys/queue.h> | |
56 | #include <sys/bus.h> | 56 | #include <sys/bus.h> | |
57 | #include <sys/cpu.h> | 57 | #include <sys/cpu.h> | |
58 | 58 | |||
@@ -61,27 +61,27 @@ __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.1 | @@ -61,27 +61,27 @@ __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.1 | |||
61 | #include <dev/usb/usb.h> | 61 | #include <dev/usb/usb.h> | |
62 | #include <dev/usb/usbdi.h> | 62 | #include <dev/usb/usbdi.h> | |
63 | #include <dev/usb/usbdivar.h> | 63 | #include <dev/usb/usbdivar.h> | |
64 | #include <dev/usb/usb_mem.h> | 64 | #include <dev/usb/usb_mem.h> | |
65 | #include <dev/usb/usb_quirks.h> | 65 | #include <dev/usb/usb_quirks.h> | |
66 | 66 | |||
67 | #ifdef MOTG_ALLWINNER | 67 | #ifdef MOTG_ALLWINNER | |
68 | #include <arch/arm/allwinner/awin_otgreg.h> | 68 | #include <arch/arm/allwinner/awin_otgreg.h> | |
69 | #else | 69 | #else | |
70 | #include <dev/usb/motgreg.h> | 70 | #include <dev/usb/motgreg.h> | |
71 | #endif | 71 | #endif | |
72 | 72 | |||
73 | #include <dev/usb/motgvar.h> | 73 | #include <dev/usb/motgvar.h> | |
74 | #include <dev/usb/usbroothub_subr.h> | 74 | #include <dev/usb/usbroothub.h> | |
75 | 75 | |||
76 | #define MOTG_DEBUG | 76 | #define MOTG_DEBUG | |
77 | #ifdef MOTG_DEBUG | 77 | #ifdef MOTG_DEBUG | |
78 | #define DPRINTF(x) if (motgdebug) printf x | 78 | #define DPRINTF(x) if (motgdebug) printf x | |
79 | #define DPRINTFN(n,x) if (motgdebug & (n)) printf x | 79 | #define DPRINTFN(n,x) if (motgdebug & (n)) printf x | |
80 | #define MD_ROOT 0x0002 | 80 | #define MD_ROOT 0x0002 | |
81 | #define MD_CTRL 0x0004 | 81 | #define MD_CTRL 0x0004 | |
82 | #define MD_BULK 0x0008 | 82 | #define MD_BULK 0x0008 | |
83 | // int motgdebug = MD_ROOT | MD_CTRL | MD_BULK; | 83 | // int motgdebug = MD_ROOT | MD_CTRL | MD_BULK; | |
84 | int motgdebug = 0; | 84 | int motgdebug = 0; | |
85 | #else | 85 | #else | |
86 | #define DPRINTF(x) | 86 | #define DPRINTF(x) | |
87 | #define DPRINTFN(n,x) | 87 | #define DPRINTFN(n,x) |
--- src/sys/dev/usb/ohci.c 2014/12/03 22:40:55 1.254.2.10
+++ src/sys/dev/usb/ohci.c 2014/12/03 23:05:06 1.254.2.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ohci.c,v 1.254.2.10 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: ohci.c,v 1.254.2.11 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net) at | 8 | * by Lennart Augustsson (lennart@augustsson.net) at | |
9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca) | 9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca) | |
10 | * and Matthew R. Green (mrg@eterna.com.au). | 10 | * and Matthew R. Green (mrg@eterna.com.au). | |
11 | * This code is derived from software contributed to The NetBSD Foundation | 11 | * This code is derived from software contributed to The NetBSD Foundation | |
12 | * by Charles M. Hannum. | 12 | * by Charles M. Hannum. | |
13 | * | 13 | * | |
14 | * Redistribution and use in source and binary forms, with or without | 14 | * Redistribution and use in source and binary forms, with or without | |
@@ -31,49 +31,49 @@ | @@ -31,49 +31,49 @@ | |||
31 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 31 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
32 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 32 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
33 | * POSSIBILITY OF SUCH DAMAGE. | 33 | * POSSIBILITY OF SUCH DAMAGE. | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | /* | 36 | /* | |
37 | * USB Open Host Controller driver. | 37 | * USB Open Host Controller driver. | |
38 | * | 38 | * | |
39 | * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html | 39 | * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html | |
40 | * USB spec: http://www.usb.org/developers/docs/ | 40 | * USB spec: http://www.usb.org/developers/docs/ | |
41 | */ | 41 | */ | |
42 | 42 | |||
43 | #include <sys/cdefs.h> | 43 | #include <sys/cdefs.h> | |
44 | __KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.10 2014/12/03 22:40:55 skrll Exp $"); | 44 | __KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.11 2014/12/03 23:05:06 skrll Exp $"); | |
45 | 45 | |||
46 | #include <sys/param.h> | 46 | #include <sys/param.h> | |
47 | #include <sys/systm.h> | 47 | #include <sys/systm.h> | |
48 | #include <sys/kmem.h> | 48 | #include <sys/kmem.h> | |
49 | #include <sys/kernel.h> | 49 | #include <sys/kernel.h> | |
50 | #include <sys/device.h> | 50 | #include <sys/device.h> | |
51 | #include <sys/select.h> | 51 | #include <sys/select.h> | |
52 | #include <sys/proc.h> | 52 | #include <sys/proc.h> | |
53 | #include <sys/queue.h> | 53 | #include <sys/queue.h> | |
54 | #include <sys/cpu.h> | 54 | #include <sys/cpu.h> | |
55 | 55 | |||
56 | #include <machine/endian.h> | 56 | #include <machine/endian.h> | |
57 | 57 | |||
58 | #include <dev/usb/usb.h> | 58 | #include <dev/usb/usb.h> | |
59 | #include <dev/usb/usbdi.h> | 59 | #include <dev/usb/usbdi.h> | |
60 | #include <dev/usb/usbdivar.h> | 60 | #include <dev/usb/usbdivar.h> | |
61 | #include <dev/usb/usb_mem.h> | 61 | #include <dev/usb/usb_mem.h> | |
62 | #include <dev/usb/usb_quirks.h> | 62 | #include <dev/usb/usb_quirks.h> | |
63 | 63 | |||
64 | #include <dev/usb/ohcireg.h> | 64 | #include <dev/usb/ohcireg.h> | |
65 | #include <dev/usb/ohcivar.h> | 65 | #include <dev/usb/ohcivar.h> | |
66 | #include <dev/usb/usbroothub_subr.h> | 66 | #include <dev/usb/usbroothub.h> | |
67 | 67 | |||
68 | 68 | |||
69 | 69 | |||
70 | #ifdef OHCI_DEBUG | 70 | #ifdef OHCI_DEBUG | |
71 | #define DPRINTF(x) if (ohcidebug) printf x | 71 | #define DPRINTF(x) if (ohcidebug) printf x | |
72 | #define DPRINTFN(n,x) if (ohcidebug>(n)) printf x | 72 | #define DPRINTFN(n,x) if (ohcidebug>(n)) printf x | |
73 | int ohcidebug = 0; | 73 | int ohcidebug = 0; | |
74 | #else | 74 | #else | |
75 | #define DPRINTF(x) | 75 | #define DPRINTF(x) | |
76 | #define DPRINTFN(n,x) | 76 | #define DPRINTFN(n,x) | |
77 | #endif | 77 | #endif | |
78 | 78 | |||
79 | #if BYTE_ORDER == BIG_ENDIAN | 79 | #if BYTE_ORDER == BIG_ENDIAN |
--- src/sys/dev/usb/uhci.c 2014/12/03 22:40:55 1.264.4.10
+++ src/sys/dev/usb/uhci.c 2014/12/03 23:05:06 1.264.4.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: uhci.c,v 1.264.4.10 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: uhci.c,v 1.264.4.11 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net) at | 8 | * by Lennart Augustsson (lennart@augustsson.net) at | |
9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca) | 9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca) | |
10 | * and Matthew R. Green (mrg@eterna.com.au). | 10 | * and Matthew R. Green (mrg@eterna.com.au). | |
11 | * | 11 | * | |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without | |
13 | * modification, are permitted provided that the following conditions | 13 | * modification, are permitted provided that the following conditions | |
14 | * are met: | 14 | * are met: | |
@@ -32,51 +32,51 @@ | @@ -32,51 +32,51 @@ | |||
32 | */ | 32 | */ | |
33 | 33 | |||
34 | /* | 34 | /* | |
35 | * USB Universal Host Controller driver. | 35 | * USB Universal Host Controller driver. | |
36 | * Handles e.g. PIIX3 and PIIX4. | 36 | * Handles e.g. PIIX3 and PIIX4. | |
37 | * | 37 | * | |
38 | * UHCI spec: http://www.intel.com/technology/usb/spec.htm | 38 | * UHCI spec: http://www.intel.com/technology/usb/spec.htm | |
39 | * USB spec: http://www.usb.org/developers/docs/ | 39 | * USB spec: http://www.usb.org/developers/docs/ | |
40 | * PIIXn spec: ftp://download.intel.com/design/intarch/datashts/29055002.pdf | 40 | * PIIXn spec: ftp://download.intel.com/design/intarch/datashts/29055002.pdf | |
41 | * ftp://download.intel.com/design/intarch/datashts/29056201.pdf | 41 | * ftp://download.intel.com/design/intarch/datashts/29056201.pdf | |
42 | */ | 42 | */ | |
43 | 43 | |||
44 | #include <sys/cdefs.h> | 44 | #include <sys/cdefs.h> | |
45 | __KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.10 2014/12/03 22:40:55 skrll Exp $"); | 45 | __KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.11 2014/12/03 23:05:06 skrll Exp $"); | |
46 | 46 | |||
47 | #include <sys/param.h> | 47 | #include <sys/param.h> | |
48 | #include <sys/systm.h> | 48 | #include <sys/systm.h> | |
49 | #include <sys/kernel.h> | 49 | #include <sys/kernel.h> | |
50 | #include <sys/kmem.h> | 50 | #include <sys/kmem.h> | |
51 | #include <sys/device.h> | 51 | #include <sys/device.h> | |
52 | #include <sys/select.h> | 52 | #include <sys/select.h> | |
53 | #include <sys/extent.h> | 53 | #include <sys/extent.h> | |
54 | #include <sys/proc.h> | 54 | #include <sys/proc.h> | |
55 | #include <sys/queue.h> | 55 | #include <sys/queue.h> | |
56 | #include <sys/bus.h> | 56 | #include <sys/bus.h> | |
57 | #include <sys/cpu.h> | 57 | #include <sys/cpu.h> | |
58 | 58 | |||
59 | #include <machine/endian.h> | 59 | #include <machine/endian.h> | |
60 | 60 | |||
61 | #include <dev/usb/usb.h> | 61 | #include <dev/usb/usb.h> | |
62 | #include <dev/usb/usbdi.h> | 62 | #include <dev/usb/usbdi.h> | |
63 | #include <dev/usb/usbdivar.h> | 63 | #include <dev/usb/usbdivar.h> | |
64 | #include <dev/usb/usb_mem.h> | 64 | #include <dev/usb/usb_mem.h> | |
65 | #include <dev/usb/usb_quirks.h> | 65 | #include <dev/usb/usb_quirks.h> | |
66 | 66 | |||
67 | #include <dev/usb/uhcireg.h> | 67 | #include <dev/usb/uhcireg.h> | |
68 | #include <dev/usb/uhcivar.h> | 68 | #include <dev/usb/uhcivar.h> | |
69 | #include <dev/usb/usbroothub_subr.h> | 69 | #include <dev/usb/usbroothub.h> | |
70 | 70 | |||
71 | /* Use bandwidth reclamation for control transfers. Some devices choke on it. */ | 71 | /* Use bandwidth reclamation for control transfers. Some devices choke on it. */ | |
72 | /*#define UHCI_CTL_LOOP */ | 72 | /*#define UHCI_CTL_LOOP */ | |
73 | 73 | |||
74 | 74 | |||
75 | 75 | |||
76 | #ifdef UHCI_DEBUG | 76 | #ifdef UHCI_DEBUG | |
77 | uhci_softc_t *thesc; | 77 | uhci_softc_t *thesc; | |
78 | #define DPRINTF(x) if (uhcidebug) printf x | 78 | #define DPRINTF(x) if (uhcidebug) printf x | |
79 | #define DPRINTFN(n,x) if (uhcidebug>(n)) printf x | 79 | #define DPRINTFN(n,x) if (uhcidebug>(n)) printf x | |
80 | int uhcidebug = 0; | 80 | int uhcidebug = 0; | |
81 | int uhcinoloop = 0; | 81 | int uhcinoloop = 0; | |
82 | #else | 82 | #else |
/* $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);
}
/* $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);
--- src/sys/dev/usb/xhci.c 2014/12/03 22:40:55 1.28.2.10
+++ src/sys/dev/usb/xhci.c 2014/12/03 23:05:06 1.28.2.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: xhci.c,v 1.28.2.10 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: xhci.c,v 1.28.2.11 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2013 Jonathan A. Kollasch | 4 | * Copyright (c) 2013 Jonathan A. Kollasch | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -17,27 +17,27 @@ | @@ -17,27 +17,27 @@ | |||
17 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR | |
20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | |
21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | 29 | #include <sys/cdefs.h> | |
30 | __KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.10 2014/12/03 22:40:55 skrll Exp $"); | 30 | __KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.11 2014/12/03 23:05:06 skrll Exp $"); | |
31 | 31 | |||
32 | #include "opt_usb.h" | 32 | #include "opt_usb.h" | |
33 | 33 | |||
34 | #include <sys/param.h> | 34 | #include <sys/param.h> | |
35 | #include <sys/systm.h> | 35 | #include <sys/systm.h> | |
36 | #include <sys/kernel.h> | 36 | #include <sys/kernel.h> | |
37 | #include <sys/kmem.h> | 37 | #include <sys/kmem.h> | |
38 | #include <sys/device.h> | 38 | #include <sys/device.h> | |
39 | #include <sys/select.h> | 39 | #include <sys/select.h> | |
40 | #include <sys/proc.h> | 40 | #include <sys/proc.h> | |
41 | #include <sys/queue.h> | 41 | #include <sys/queue.h> | |
42 | #include <sys/mutex.h> | 42 | #include <sys/mutex.h> | |
43 | #include <sys/condvar.h> | 43 | #include <sys/condvar.h> | |
@@ -46,27 +46,27 @@ __KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.2 | @@ -46,27 +46,27 @@ __KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.2 | |||
46 | #include <sys/sysctl.h> | 46 | #include <sys/sysctl.h> | |
47 | 47 | |||
48 | #include <machine/endian.h> | 48 | #include <machine/endian.h> | |
49 | 49 | |||
50 | #include <dev/usb/usb.h> | 50 | #include <dev/usb/usb.h> | |
51 | #include <dev/usb/usbdi.h> | 51 | #include <dev/usb/usbdi.h> | |
52 | #include <dev/usb/usbdivar.h> | 52 | #include <dev/usb/usbdivar.h> | |
53 | #include <dev/usb/usbhist.h> | 53 | #include <dev/usb/usbhist.h> | |
54 | #include <dev/usb/usb_mem.h> | 54 | #include <dev/usb/usb_mem.h> | |
55 | #include <dev/usb/usb_quirks.h> | 55 | #include <dev/usb/usb_quirks.h> | |
56 | 56 | |||
57 | #include <dev/usb/xhcireg.h> | 57 | #include <dev/usb/xhcireg.h> | |
58 | #include <dev/usb/xhcivar.h> | 58 | #include <dev/usb/xhcivar.h> | |
59 | #include <dev/usb/usbroothub_subr.h> | 59 | #include <dev/usb/usbroothub.h> | |
60 | 60 | |||
61 | 61 | |||
62 | #ifdef USB_DEBUG | 62 | #ifdef USB_DEBUG | |
63 | #ifndef XHCI_DEBUG | 63 | #ifndef XHCI_DEBUG | |
64 | #define xhcidebug 0 | 64 | #define xhcidebug 0 | |
65 | #else | 65 | #else | |
66 | static int xhcidebug = 0; | 66 | static int xhcidebug = 0; | |
67 | 67 | |||
68 | SYSCTL_SETUP(sysctl_hw_xhci_setup, "sysctl hw.xhci setup") | 68 | SYSCTL_SETUP(sysctl_hw_xhci_setup, "sysctl hw.xhci setup") | |
69 | { | 69 | { | |
70 | int err; | 70 | int err; | |
71 | const struct sysctlnode *rnode; | 71 | const struct sysctlnode *rnode; | |
72 | const struct sysctlnode *cnode; | 72 | const struct sysctlnode *cnode; |
--- src/sys/external/bsd/dwc2/dwc2.c 2014/12/03 22:40:55 1.32.2.7
+++ src/sys/external/bsd/dwc2/dwc2.c 2014/12/03 23:05:06 1.32.2.8
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: dwc2.c,v 1.32.2.7 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: dwc2.c,v 1.32.2.8 2014/12/03 23:05:06 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2013 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2013 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Nick Hudson | 8 | * by Nick Hudson | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -20,48 +20,48 @@ | @@ -20,48 +20,48 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | #include <sys/cdefs.h> | 32 | #include <sys/cdefs.h> | |
33 | __KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.7 2014/12/03 22:40:55 skrll Exp $"); | 33 | __KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.8 2014/12/03 23:05:06 skrll Exp $"); | |
34 | 34 | |||
35 | #include "opt_usb.h" | 35 | #include "opt_usb.h" | |
36 | 36 | |||
37 | #include <sys/param.h> | 37 | #include <sys/param.h> | |
38 | #include <sys/systm.h> | 38 | #include <sys/systm.h> | |
39 | #include <sys/kmem.h> | 39 | #include <sys/kmem.h> | |
40 | #include <sys/kernel.h> | 40 | #include <sys/kernel.h> | |
41 | #include <sys/device.h> | 41 | #include <sys/device.h> | |
42 | #include <sys/select.h> | 42 | #include <sys/select.h> | |
43 | #include <sys/proc.h> | 43 | #include <sys/proc.h> | |
44 | #include <sys/queue.h> | 44 | #include <sys/queue.h> | |
45 | #include <sys/cpu.h> | 45 | #include <sys/cpu.h> | |
46 | 46 | |||
47 | #include <machine/endian.h> | 47 | #include <machine/endian.h> | |
48 | 48 | |||
49 | #include <dev/usb/usb.h> | 49 | #include <dev/usb/usb.h> | |
50 | #include <dev/usb/usbdi.h> | 50 | #include <dev/usb/usbdi.h> | |
51 | #include <dev/usb/usbdivar.h> | 51 | #include <dev/usb/usbdivar.h> | |
52 | #include <dev/usb/usb_mem.h> | 52 | #include <dev/usb/usb_mem.h> | |
53 | 53 | |||
54 | #include <dev/usb/usbroothub_subr.h> | 54 | #include <dev/usb/usbroothub.h> | |
55 | 55 | |||
56 | #include <dwc2/dwc2.h> | 56 | #include <dwc2/dwc2.h> | |
57 | #include <dwc2/dwc2var.h> | 57 | #include <dwc2/dwc2var.h> | |
58 | 58 | |||
59 | #include "dwc2_core.h" | 59 | #include "dwc2_core.h" | |
60 | #include "dwc2_hcd.h" | 60 | #include "dwc2_hcd.h" | |
61 | 61 | |||
62 | #ifdef DWC2_COUNTERS | 62 | #ifdef DWC2_COUNTERS | |
63 | #define DWC2_EVCNT_ADD(a,b) ((void)((a).ev_count += (b))) | 63 | #define DWC2_EVCNT_ADD(a,b) ((void)((a).ev_count += (b))) | |
64 | #else | 64 | #else | |
65 | #define DWC2_EVCNT_ADD(a,b) do { } while (/*CONSTCOND*/0) | 65 | #define DWC2_EVCNT_ADD(a,b) do { } while (/*CONSTCOND*/0) | |
66 | #endif | 66 | #endif | |
67 | #define DWC2_EVCNT_INCR(a) DWC2_EVCNT_ADD((a), 1) | 67 | #define DWC2_EVCNT_INCR(a) DWC2_EVCNT_ADD((a), 1) |
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c 2014/12/03 22:40:55 1.22.4.5
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c 2014/12/03 23:05:07 1.22.4.6
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ugenhc.c,v 1.22.4.5 2014/12/03 22:40:55 skrll Exp $ */ | 1 | /* $NetBSD: ugenhc.c,v 1.22.4.6 2014/12/03 23:05:07 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. | 4 | * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * | 14 | * | |
@@ -51,44 +51,44 @@ | @@ -51,44 +51,44 @@ | |||
51 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 51 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
52 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 52 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
53 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 53 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
54 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 54 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
55 | * POSSIBILITY OF SUCH DAMAGE. | 55 | * POSSIBILITY OF SUCH DAMAGE. | |
56 | */ | 56 | */ | |
57 | 57 | |||
58 | /* | 58 | /* | |
59 | * This rump driver attaches ugen as a kernel usb host controller. | 59 | * This rump driver attaches ugen as a kernel usb host controller. | |
60 | * It's still somewhat under the hammer .... | 60 | * It's still somewhat under the hammer .... | |
61 | */ | 61 | */ | |
62 | 62 | |||
63 | #include <sys/cdefs.h> | 63 | #include <sys/cdefs.h> | |
64 | __KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.5 2014/12/03 22:40:55 skrll Exp $"); | 64 | __KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.6 2014/12/03 23:05:07 skrll Exp $"); | |
65 | 65 | |||
66 | #include <sys/param.h> | 66 | #include <sys/param.h> | |
67 | #include <sys/bus.h> | 67 | #include <sys/bus.h> | |
68 | #include <sys/conf.h> | 68 | #include <sys/conf.h> | |
69 | #include <sys/device.h> | 69 | #include <sys/device.h> | |
70 | #include <sys/fcntl.h> | 70 | #include <sys/fcntl.h> | |
71 | #include <sys/kmem.h> | 71 | #include <sys/kmem.h> | |
72 | #include <sys/kernel.h> | 72 | #include <sys/kernel.h> | |
73 | #include <sys/kthread.h> | 73 | #include <sys/kthread.h> | |
74 | #include <sys/mutex.h> | 74 | #include <sys/mutex.h> | |
75 | 75 | |||
76 | #include <dev/usb/usb.h> | 76 | #include <dev/usb/usb.h> | |
77 | #include <dev/usb/usbdi.h> | 77 | #include <dev/usb/usbdi.h> | |
78 | #include <dev/usb/usbhid.h> | 78 | #include <dev/usb/usbhid.h> | |
79 | #include <dev/usb/usbdivar.h> | 79 | #include <dev/usb/usbdivar.h> | |
80 | #include <dev/usb/usb_mem.h> | 80 | #include <dev/usb/usb_mem.h> | |
81 | #include <dev/usb/usbroothub_subr.h> | 81 | #include <dev/usb/usbroothub.h> | |
82 | 82 | |||
83 | #include <rump/rumpuser.h> | 83 | #include <rump/rumpuser.h> | |
84 | 84 | |||
85 | #include "ugenhc_user.h" | 85 | #include "ugenhc_user.h" | |
86 | 86 | |||
87 | #include "rump_private.h" | 87 | #include "rump_private.h" | |
88 | #include "rump_dev_private.h" | 88 | #include "rump_dev_private.h" | |
89 | 89 | |||
90 | #define UGEN_NEPTS 16 | 90 | #define UGEN_NEPTS 16 | |
91 | #define UGEN_EPT_CTRL 0 /* ugenx.00 is the control endpoint */ | 91 | #define UGEN_EPT_CTRL 0 /* ugenx.00 is the control endpoint */ | |
92 | 92 | |||
93 | struct ugenhc_softc { | 93 | struct ugenhc_softc { | |
94 | struct usbd_bus sc_bus; | 94 | struct usbd_bus sc_bus; |
--- src/sys/rump/dev/lib/libusb/Makefile 2011/01/31 00:10:06 1.6
+++ src/sys/rump/dev/lib/libusb/Makefile 2014/12/03 23:05:07 1.6.32.1
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2011/01/31 00:10:06 christos Exp $ | 1 | # $NetBSD: Makefile,v 1.6.32.1 2014/12/03 23:05:07 skrll Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .PATH: ${.CURDIR}/../../../../dev/usb | 4 | .PATH: ${.CURDIR}/../../../../dev/usb | |
5 | 5 | |||
6 | LIB= rumpdev_usb | 6 | LIB= rumpdev_usb | |
7 | 7 | |||
8 | .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" | 8 | .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" | |
9 | IOCONF= USB.ioconf | 9 | IOCONF= USB.ioconf | |
10 | 10 | |||
11 | SRCS= usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c \ | 11 | SRCS= usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c \ | |
12 | uhub.c usbroothub_subr.c usb_verbose.c | 12 | uhub.c usbroothub.c usb_verbose.c | |
13 | SRCS+= usb_at_ugenhc.c | 13 | SRCS+= usb_at_ugenhc.c | |
14 | .else | 14 | .else | |
15 | SRCS= dummy.c | 15 | SRCS= dummy.c | |
16 | .endif | 16 | .endif | |
17 | 17 | |||
18 | #CPPFLAGS+= -DUHUB_DEBUG | 18 | #CPPFLAGS+= -DUHUB_DEBUG | |
19 | 19 | |||
20 | CPPFLAGS+= -I${.CURDIR}/opt | 20 | CPPFLAGS+= -I${.CURDIR}/opt | |
21 | 21 | |||
22 | .include <bsd.lib.mk> | 22 | .include <bsd.lib.mk> | |
23 | .include <bsd.klinks.mk> | 23 | .include <bsd.klinks.mk> |