Author: landonf
Date: Mon Sep 5 21:48:16 2016
New Revision: 305442
URL: https://svnweb.freebsd.org/changeset/base/305442
Log:
bhnd(4): Add device classes for USB host/dev/dual-mode controller cores.
Approved by: adrian (mentor, implicit)
Modified:
head/sys/dev/bhnd/bhnd_subr.c
head/sys/dev/bhnd/bhnd_types.h
Modified: head/sys/dev/bhnd/bhnd_subr.c
==============================================================================
--- head/sys/dev/bhnd/bhnd_subr.c Mon Sep 5 21:25:45 2016
(r305441)
+++ head/sys/dev/bhnd/bhnd_subr.c Mon Sep 5 21:48:16 2016
(r305442)
@@ -71,7 +71,7 @@ static const struct bhnd_core_desc {
BHND_CDESC(BCM, MIPS, CPU, "MIPS Core"),
BHND_CDESC(BCM, ENET, ENET_MAC, "Fast Ethernet MAC"),
BHND_CDESC(BCM, CODEC, OTHER, "V.90 Modem Codec"),
- BHND_CDESC(BCM, USB, OTHER, "USB 1.1 Device/Host
Controller"),
+ BHND_CDESC(BCM, USB, USB_DUAL, "USB 1.1 Device/Host
Controller"),
BHND_CDESC(BCM, ADSL, OTHER, "ADSL Core"),
BHND_CDESC(BCM, ILINE100, OTHER, "iLine100 HPNA"),
BHND_CDESC(BCM, IPSEC, OTHER, "IPsec Accelerator"),
@@ -86,10 +86,10 @@ static const struct bhnd_core_desc {
BHND_CDESC(BCM, BPHY, WLAN_PHY, "802.11b PHY"),
BHND_CDESC(BCM, GPHY, WLAN_PHY, "802.11g PHY"),
BHND_CDESC(BCM, MIPS33, CPU, "MIPS3302 Core"),
- BHND_CDESC(BCM, USB11H, OTHER, "USB 1.1 Host
Controller"),
- BHND_CDESC(BCM, USB11D, OTHER, "USB 1.1 Device Core"),
- BHND_CDESC(BCM, USB20H, OTHER, "USB 2.0 Host
Controller"),
- BHND_CDESC(BCM, USB20D, OTHER, "USB 2.0 Device Core"),
+ BHND_CDESC(BCM, USB11H, USB_HOST, "USB 1.1 Host
Controller"),
+ BHND_CDESC(BCM, USB11D, USB_DEV, "USB 1.1 Device
Controller"),
+ BHND_CDESC(BCM, USB20H, USB_HOST, "USB 2.0 Host
Controller"),
+ BHND_CDESC(BCM, USB20D, USB_DEV, "USB 2.0 Device
Controller"),
BHND_CDESC(BCM, SDIOH, OTHER, "SDIO Host Controller"),
BHND_CDESC(BCM, ROBO, OTHER, "RoboSwitch"),
BHND_CDESC(BCM, ATA100, OTHER, "Parallel ATA
Controller"),
@@ -130,8 +130,8 @@ static const struct bhnd_core_desc {
BHND_CDESC(BCM, NS_PCIE2, PCIE, "PCIe Bridge (Gen2)"),
BHND_CDESC(BCM, NS_DMA, OTHER, "DMA engine"),
BHND_CDESC(BCM, NS_SDIO, OTHER, "SDIO 3.0 Host
Controller"),
- BHND_CDESC(BCM, NS_USB20H, OTHER, "USB 2.0 Host
Controller"),
- BHND_CDESC(BCM, NS_USB30H, OTHER, "USB 3.0 Host
Controller"),
+ BHND_CDESC(BCM, NS_USB20H, USB_HOST, "USB 2.0 Host
Controller"),
+ BHND_CDESC(BCM, NS_USB30H, USB_HOST, "USB 3.0 Host
Controller"),
BHND_CDESC(BCM, NS_A9JTAG, OTHER, "ARM Cortex A9 JTAG
Interface"),
BHND_CDESC(BCM, NS_DDR23_MEMC, MEMC, "Denali DDR2/DD3 Memory
Controller"),
BHND_CDESC(BCM, NS_ROM, NVRAM, "System ROM"),
Modified: head/sys/dev/bhnd/bhnd_types.h
==============================================================================
--- head/sys/dev/bhnd/bhnd_types.h Mon Sep 5 21:25:45 2016
(r305441)
+++ head/sys/dev/bhnd/bhnd_types.h Mon Sep 5 21:48:16 2016
(r305442)
@@ -57,8 +57,11 @@ typedef enum {
BHND_DEVCLASS_SOC_BRIDGE, /**< interconnect host bridge */
BHND_DEVCLASS_EROM, /**< bus device enumeration ROM */
BHND_DEVCLASS_NVRAM, /**< nvram/flash controller */
- BHND_DEVCLASS_OTHER, /**< other / unknown */
+ BHND_DEVCLASS_USB_HOST, /**< USB host controller */
+ BHND_DEVCLASS_USB_DEV, /**< USB device controller */
+ BHND_DEVCLASS_USB_DUAL, /**< USB host/device controller */
+ BHND_DEVCLASS_OTHER = 1000, /**< other / unknown */
BHND_DEVCLASS_INVALID /**< no/invalid class */
} bhnd_devclass_t;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
