V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: usb: Adjust the USB_DEVICE() macro naming 

In Linux USB_DEVICE() is used to declare a USB device by vendor/device ID.
We should follow the same convention in U-Boot. Rename the existing
USB_DEVICE() macro to U_BOOT_USB_DEVICE() and bring in the USB_DEVICE()
macro from Linux for use in U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-07-06 16:47:51 -06:00
parent c8c2797c38
commit abb59cffcf
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/usb_hub.c
View File

@ -652,6 +652,6 @@ static const struct usb_device_id hub_id_table[] = {
{ } /* Terminating entry */
};
USB_DEVICE(usb_generic_hub, hub_id_table);
U_BOOT_USB_DEVICE(usb_generic_hub, hub_id_table);
#endif

4
common/usb_kbd.c
View File

@ -540,8 +540,8 @@ int drv_usb_kbd_init(void)
debug("%s: Probing for keyboard\n", __func__);
#ifdef CONFIG_DM_USB
/*
* TODO: We should add USB_DEVICE() declarations to each USB ethernet
* driver and then most of this file can be removed.
* TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
* keyboard driver and then most of this file can be removed.
*/
struct udevice *bus;
struct uclass *uc;

2
common/usb_storage.c
View File

@ -1442,6 +1442,6 @@ static const struct usb_device_id mass_storage_id_table[] = {
{ } /* Terminating entry */
};
USB_DEVICE(usb_mass_storage, mass_storage_id_table);
U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table);
#endif

4
drivers/usb/Kconfig
View File

@ -46,8 +46,8 @@ config DM_USB
Much of the code is shared but with this option enabled the USB
uclass takes care of device enumeration. USB devices can be
declared with the USB_DEVICE() macro and will be automatically
probed when found on the bus.
declared with the U_BOOT_USB_DEVICE() macro and will be
automatically probed when found on the bus.
source "drivers/usb/host/Kconfig"

4
drivers/usb/eth/usb_ether.c
View File

@ -266,8 +266,8 @@ int usb_host_eth_scan(int mode)
usb_max_eth_dev = 0;
#ifdef CONFIG_DM_USB
/*
* TODO: We should add USB_DEVICE() declarations to each USB ethernet
* driver and then most of this file can be removed.
* TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
* Ethernet driver and then most of this file can be removed.
*/
struct udevice *bus;
struct uclass *uc;

18
include/usb.h
View File

@ -501,7 +501,23 @@ struct usb_driver_entry {
const struct usb_device_id *match;
};
#define USB_DEVICE(__name, __match) \
#define USB_DEVICE_ID_MATCH_DEVICE \
(USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT)
/**
* USB_DEVICE - macro used to describe a specific usb device
* @vend: the 16 bit USB Vendor ID
* @prod: the 16 bit USB Product ID
*
* This macro is used to create a struct usb_device_id that matches a
* specific device.
*/
#define USB_DEVICE(vend, prod) \
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, \
.idVendor = (vend), \
.idProduct = (prod)
#define U_BOOT_USB_DEVICE(__name, __match) \
ll_entry_declare(struct usb_driver_entry, __name, usb_driver_entry) = {\
.driver = llsym(struct driver, __name, driver), \
.match = __match, \