diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
| commit | 67cf22cbdef8c62ffa28b4caf935825fe410c68d (patch) | |
| tree | 57659ce202ce5f782442db271e67bd8e3ce409ba /common/usb.c | |
| parent | 5d5833af64bbafb308b3a2415e3186def678861b (diff) | |
| parent | 1af9bfd334a5c92cb3123be7c8da3ba0f522cf4a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Introduce CONFIG_SPL_DM_USB
Diffstat (limited to 'common/usb.c')
| -rw-r--r-- | common/usb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/usb.c b/common/usb.c index 78178c54c8..b70f614d24 100644 --- a/common/usb.c +++ b/common/usb.c @@ -42,7 +42,7 @@ static int asynch_allowed; char usb_started; /* flag for the started/stopped USB status */ -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) static struct usb_device usb_dev[USB_MAX_DEVICE]; static int dev_index; @@ -183,7 +183,7 @@ int usb_disable_asynch(int disable) asynch_allowed = !disable; return old_value; } -#endif /* !CONFIG_DM_USB */ +#endif /* !CONFIG_IS_ENABLED(DM_USB) */ /*------------------------------------------------------------------- @@ -849,7 +849,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size) * the USB device are static allocated [USB_MAX_DEVICE]. */ -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) /* returns a pointer to the device with the index [index]. * if the device is not assigned (dev->devnum==-1) returns NULL @@ -906,7 +906,7 @@ __weak int usb_alloc_device(struct usb_device *udev) { return 0; } -#endif /* !CONFIG_DM_USB */ +#endif /* !CONFIG_IS_ENABLED(DM_USB) */ static int usb_hub_port_reset(struct usb_device *dev, struct usb_device *hub) { @@ -1166,7 +1166,7 @@ int usb_setup_device(struct usb_device *dev, bool do_read, return ret; } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) /* * By the time we get here, the device has gotten a new device ID * and is in the default state. We need to identify the thing and @@ -1215,14 +1215,14 @@ int board_usb_cleanup(int index, enum usb_init_type init) bool usb_device_has_child_on_port(struct usb_device *parent, int port) { -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) return false; #else return parent->children[port] != NULL; #endif } -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) void usb_find_usb2_hub_address_port(struct usb_device *udev, uint8_t *hub_address, uint8_t *hub_port) { |