From 6f4595ff7ac0821c9e4a4097444e6838e33b52c1 Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Sat, 7 Nov 2015 15:17:11 -0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/311429 Commit-Ready: Shawn N Tested-by: Shawn N Reviewed-by: Alec Berg --- board/cr50/board.c | 2 +- board/dingdong/board.c | 2 +- board/dingdong/usb_pd_policy.c | 2 +- board/hoho/board.c | 2 +- board/hoho/usb_pd_policy.c | 2 +- board/honeybuns/board.c | 2 +- board/honeybuns/hx3.c | 2 +- board/honeybuns/usb_pd_policy.c | 2 +- board/pdeval-stm32f072/board.c | 2 +- board/ryu/board.c | 2 +- board/samus_pd/board.c | 2 +- board/twinkie/board.c | 2 +- board/twinkie/sniffer.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'board') diff --git a/board/cr50/board.c b/board/cr50/board.c index 972506e383..1decdbd850 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -11,7 +11,7 @@ #include "registers.h" #include "task.h" #include "trng.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb_hid.h" #include "util.h" diff --git a/board/dingdong/board.c b/board/dingdong/board.c index 2896135389..5091494dfb 100644 --- a/board/dingdong/board.c +++ b/board/dingdong/board.c @@ -11,8 +11,8 @@ #include "gpio.h" #include "hooks.h" #include "registers.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "task.h" #include "timer.h" diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c index 69d7f2d811..39980f6abf 100644 --- a/board/dingdong/usb_pd_policy.c +++ b/board/dingdong/usb_pd_policy.c @@ -14,8 +14,8 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "version.h" diff --git a/board/hoho/board.c b/board/hoho/board.c index 56484bc0a7..93329a4001 100644 --- a/board/hoho/board.c +++ b/board/hoho/board.c @@ -14,8 +14,8 @@ #include "mcdp28x0.h" #include "registers.h" #include "task.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "timer.h" #include "util.h" diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c index 175241bf33..1fafcf5f93 100644 --- a/board/hoho/usb_pd_policy.c +++ b/board/hoho/usb_pd_policy.c @@ -13,8 +13,8 @@ #include "registers.h" #include "task.h" #include "timer.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "util.h" #include "version.h" diff --git a/board/honeybuns/board.c b/board/honeybuns/board.c index b16b9b6ed3..3315418fc2 100644 --- a/board/honeybuns/board.c +++ b/board/honeybuns/board.c @@ -15,8 +15,8 @@ #include "registers.h" #include "task.h" #include "timer.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "util.h" diff --git a/board/honeybuns/hx3.c b/board/honeybuns/hx3.c index 7944035bce..fe6de3c1f4 100644 --- a/board/honeybuns/hx3.c +++ b/board/honeybuns/hx3.c @@ -12,7 +12,7 @@ #include "i2c.h" #include "task.h" #include "timer.h" -#include "usb.h" +#include "usb_descriptor.h" #include "util.h" /* Cypress HX3 I2C address */ diff --git a/board/honeybuns/usb_pd_policy.c b/board/honeybuns/usb_pd_policy.c index ca0ead8dbb..b12719703a 100644 --- a/board/honeybuns/usb_pd_policy.c +++ b/board/honeybuns/usb_pd_policy.c @@ -14,7 +14,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/board/pdeval-stm32f072/board.c b/board/pdeval-stm32f072/board.c index e0cdb7d970..3daedb5ae1 100644 --- a/board/pdeval-stm32f072/board.c +++ b/board/pdeval-stm32f072/board.c @@ -12,7 +12,7 @@ #include "i2c.h" #include "registers.h" #include "task.h" -#include "usb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "util.h" diff --git a/board/ryu/board.c b/board/ryu/board.c index 6d98af9890..e199931cdd 100644 --- a/board/ryu/board.c +++ b/board/ryu/board.c @@ -34,8 +34,8 @@ #include "spi.h" #include "system.h" #include "task.h" -#include "usb.h" #include "usb_charge.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "usb_spi.h" #include "usb-stm32f3.h" diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index ff85debd22..61159dc3c4 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -23,8 +23,8 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "usb.h" #include "usb_charge.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "util.h" diff --git a/board/twinkie/board.c b/board/twinkie/board.c index efdf16d7b7..513d45d9a7 100644 --- a/board/twinkie/board.c +++ b/board/twinkie/board.c @@ -15,7 +15,7 @@ #include "ina2xx.h" #include "registers.h" #include "task.h" -#include "usb.h" +#include "usb_descriptor.h" #include "util.h" void cc2_event(enum gpio_signal signal) diff --git a/board/twinkie/sniffer.c b/board/twinkie/sniffer.c index 86bbc7ee54..77eefb20f9 100644 --- a/board/twinkie/sniffer.c +++ b/board/twinkie/sniffer.c @@ -16,7 +16,7 @@ #include "registers.h" #include "task.h" #include "timer.h" -#include "usb.h" +#include "usb_descriptor.h" #include "util.h" #include "ina2xx.h" -- cgit v1.2.1