diff options
| -rw-r--r-- | misc/drivers/rtl8187x/rtl8187x.c | 10 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/Kconfig | 21 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/Make.defs | 4 |
3 files changed, 28 insertions, 7 deletions
diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index 20d66e239..ac66854b9 100644 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -386,7 +386,7 @@ static int rtl8187x_netuninitialize(FAR struct rtl8187x_state_s *priv); * Private Data ****************************************************************************/ -/* This structure provides the registry entry ID informatino that will be +/* This structure provides the registry entry ID information that will be * used to associate the USB class driver to a connected USB device. */ @@ -396,15 +396,15 @@ static const const struct usbhost_id_s g_id[2] = USB_CLASS_VENDOR_SPEC, /* base */ 0xff, /* subclass */ 0xff, /* proto */ - CONFIG_USB_WLAN_VID, /* vid */ - CONFIG_USB_WLAN_PID /* pid */ + CONFIG_RTL8187_VID, /* vid */ + CONFIG_RTL8187_PID /* pid */ }, { 0, /* base */ 0, /* subclass */ 0, /* proto */ - CONFIG_USB_WLAN_VID, /* vid */ - CONFIG_USB_WLAN_PID /* pid */ + CONFIG_RTL8187_VID, /* vid */ + CONFIG_RTL8187_PID /* pid */ } }; diff --git a/nuttx/drivers/usbhost/Kconfig b/nuttx/drivers/usbhost/Kconfig index 56ba022ac..947098a88 100644 --- a/nuttx/drivers/usbhost/Kconfig +++ b/nuttx/drivers/usbhost/Kconfig @@ -284,6 +284,27 @@ config HIDMOUSE_WTHRESH endif # MOUSE_WHEEL endif # USBHOST_HIDMOUSE +config USBHOST_RTL8187 + bool "RTL8187-based wireless LAN" + default n + depends on NET + +if USBHOST_RTL8187 + +config RTL8187B + bool "RTL8187B chip" + default y + +config RTL8187_VID + hex "RTL8187 VID" + default 0x0bda + +config RTL8187_PID + hex "RTL8187 PID" + default 0x8189 + +endif # USBHOST_RTL8187 + config USBHOST_TRACE bool "Enable USB HCD tracing for debug" default n diff --git a/nuttx/drivers/usbhost/Make.defs b/nuttx/drivers/usbhost/Make.defs index 8ef90ad42..55a28a129 100644 --- a/nuttx/drivers/usbhost/Make.defs +++ b/nuttx/drivers/usbhost/Make.defs @@ -60,9 +60,9 @@ CSRCS += usbhost_trace.c endif endif -# Include add-on USB host driver logic (see misc/drivers) +# Include add-on USB host driver logic if present and selected (see misc/drivers) -ifeq ($(CONFIG_NET),y) +ifeq ($(CONFIG_USBHOST_RTL8187),y) RTL8187_CSRC := ${shell if [ -f usbhost$(DELIM)rtl8187x.c ]; then echo "rtl8187x.c"; fi} CSRCS += $(RTL8187_CSRC) endif |