diff options
| author | Shawn Nematbakhsh <shawnn@google.com> | 2015-11-07 15:17:11 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-08 17:31:11 -0800 |
| commit | 6f4595ff7ac0821c9e4a4097444e6838e33b52c1 (patch) | |
| tree | 86dd5f6fd1f28c8cc1b725c4f36941704fabdd13 /chip/stm32 | |
| parent | 2d26ba2d24a4856557dc3cabf1162bd50d4cd6f5 (diff) | |
| download | chrome-ec-6f4595ff7ac0821c9e4a4097444e6838e33b52c1.tar.gz | |
cleanup: Rename usb.h to usb_descriptor.h
Rename usb.h to usb_descriptor.h to prevent conflict with a
commonly-used libusb header.
BUG=chromium:552006
BRANCH=None
TEST=`make buildall -j`
Change-Id: I6145ce120e1fda41bc5c4d4da0313272e76839c7
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/311429
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'chip/stm32')
| -rw-r--r-- | chip/stm32/usb-stream.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb-stream.h | 2 | ||||
| -rw-r--r-- | chip/stm32/usb.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_console.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_gpio.h | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_hid.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_spi.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_spi.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/chip/stm32/usb-stream.c b/chip/stm32/usb-stream.c index 08004dcad4..d077cb553b 100644 --- a/chip/stm32/usb-stream.c +++ b/chip/stm32/usb-stream.c @@ -12,7 +12,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb-stream.h" static size_t rx_read(struct usb_stream_config const *config) diff --git a/chip/stm32/usb-stream.h b/chip/stm32/usb-stream.h index da2d677880..5379d20f48 100644 --- a/chip/stm32/usb-stream.h +++ b/chip/stm32/usb-stream.h @@ -12,7 +12,7 @@ #include "hooks.h" #include "producer.h" #include "queue.h" -#include "usb.h" +#include "usb_descriptor.h" #include <stdint.h> diff --git a/chip/stm32/usb.c b/chip/stm32/usb.c index cb419d998b..ca82fbd4a4 100644 --- a/chip/stm32/usb.c +++ b/chip/stm32/usb.c @@ -14,7 +14,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" /* Console output macro */ #define CPRINTF(format, args...) cprintf(CC_USB, format, ## args) diff --git a/chip/stm32/usb_console.c b/chip/stm32/usb_console.c index 7688d4af29..b9483dd0fc 100644 --- a/chip/stm32/usb_console.c +++ b/chip/stm32/usb_console.c @@ -12,7 +12,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" /* Console output macro */ #define CPRINTF(format, args...) cprintf(CC_USB, format, ## args) diff --git a/chip/stm32/usb_gpio.h b/chip/stm32/usb_gpio.h index 1bddf65734..8f544a002a 100644 --- a/chip/stm32/usb_gpio.h +++ b/chip/stm32/usb_gpio.h @@ -8,7 +8,7 @@ /* STM32 USB GPIO driver for Chrome EC */ #include "compile_time_macros.h" -#include "usb.h" +#include "usb_descriptor.h" struct usb_gpio_state { uint32_t set_mask; diff --git a/chip/stm32/usb_hid.c b/chip/stm32/usb_hid.c index 8973ba9c25..1f01ec8dc8 100644 --- a/chip/stm32/usb_hid.c +++ b/chip/stm32/usb_hid.c @@ -14,7 +14,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb_hid.h" /* Console output macro */ diff --git a/chip/stm32/usb_spi.c b/chip/stm32/usb_spi.c index 3998b429d2..0f63cbbe65 100644 --- a/chip/stm32/usb_spi.c +++ b/chip/stm32/usb_spi.c @@ -7,7 +7,7 @@ #include "link_defs.h" #include "registers.h" #include "spi.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb_spi.h" static int16_t usb_spi_map_error(int error) diff --git a/chip/stm32/usb_spi.h b/chip/stm32/usb_spi.h index 615bbf663e..5395e9530f 100644 --- a/chip/stm32/usb_spi.h +++ b/chip/stm32/usb_spi.h @@ -9,7 +9,7 @@ #include "compile_time_macros.h" #include "hooks.h" -#include "usb.h" +#include "usb_descriptor.h" /* * Command: |