Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208017
b: refs/heads/master
c: f6c826a
h: refs/heads/master
i:
  208015: 1187454
v: v3
  • Loading branch information
stephane duverger authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 7176248 commit daf5589
Show file tree
Hide file tree
Showing 4 changed files with 465 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd63b10ba33f272308d9f976a40f2cd064d8b21b
refs/heads/master: f6c826a90055dd05905982f7a3f60e0bcaa0434e
28 changes: 28 additions & 0 deletions trunk/drivers/usb/gadget/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,34 @@ config USB_G_HID
Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "g_hid".

config USB_G_DBGP
tristate "EHCI Debug Device Gadget"
help
This gadget emulates an EHCI Debug device. This is useful when you want
to interact with an EHCI Debug Port.

Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "g_dbgp".

if USB_G_DBGP
choice
prompt "EHCI Debug Device mode"
default USB_G_DBGP_SERIAL

config USB_G_DBGP_PRINTK
depends on USB_G_DBGP
bool "printk"
help
Directly printk() received data. No interaction.

config USB_G_DBGP_SERIAL
depends on USB_G_DBGP
bool "serial"
help
Userland can interact using /dev/ttyGSxxx.
endchoice
endif

# put drivers that need isochronous transfer support (for audio
# or video class gadget drivers), or specific hardware, here.
config USB_G_WEBCAM
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/usb/gadget/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ g_printer-objs := printer.o
g_cdc-objs := cdc2.o
g_multi-objs := multi.o
g_hid-objs := hid.o
g_dbgp-objs := dbgp.o
g_nokia-objs := nokia.o
g_webcam-objs := webcam.o

Expand All @@ -60,6 +61,7 @@ obj-$(CONFIG_USB_G_PRINTER) += g_printer.o
obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o
obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
obj-$(CONFIG_USB_G_HID) += g_hid.o
obj-$(CONFIG_USB_G_DBGP) += g_dbgp.o
obj-$(CONFIG_USB_G_MULTI) += g_multi.o
obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o
obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o
Expand Down
Loading

0 comments on commit daf5589

Please sign in to comment.