summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/cr50/board.c2
-rw-r--r--board/dingdong/board.c2
-rw-r--r--board/dingdong/usb_pd_policy.c2
-rw-r--r--board/hoho/board.c2
-rw-r--r--board/hoho/usb_pd_policy.c2
-rw-r--r--board/honeybuns/board.c2
-rw-r--r--board/honeybuns/hx3.c2
-rw-r--r--board/honeybuns/usb_pd_policy.c2
-rw-r--r--board/pdeval-stm32f072/board.c2
-rw-r--r--board/ryu/board.c2
-rw-r--r--board/samus_pd/board.c2
-rw-r--r--board/twinkie/board.c2
-rw-r--r--board/twinkie/sniffer.c2
-rw-r--r--chip/g/usb.c2
-rw-r--r--chip/g/usb_blob.c2
-rw-r--r--chip/g/usb_console.c2
-rw-r--r--chip/g/usb_hid.c2
-rw-r--r--chip/stm32/usb-stream.c2
-rw-r--r--chip/stm32/usb-stream.h2
-rw-r--r--chip/stm32/usb.c2
-rw-r--r--chip/stm32/usb_console.c2
-rw-r--r--chip/stm32/usb_gpio.h2
-rw-r--r--chip/stm32/usb_hid.c2
-rw-r--r--chip/stm32/usb_spi.c2
-rw-r--r--chip/stm32/usb_spi.h2
-rw-r--r--include/usb_descriptor.h (renamed from include/usb.h)6
26 files changed, 28 insertions, 28 deletions
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"
diff --git a/chip/g/usb.c b/chip/g/usb.c
index 635ce69564..3d5de2e8f0 100644
--- a/chip/g/usb.c
+++ b/chip/g/usb.c
@@ -14,7 +14,7 @@
#include "task.h"
#include "timer.h"
#include "util.h"
-#include "usb.h"
+#include "usb_descriptor.h"
#include "watchdog.h"
/* Rev A1 has a RTL bug in the FIFO */
diff --git a/chip/g/usb_blob.c b/chip/g/usb_blob.c
index 31ef590025..060573635b 100644
--- a/chip/g/usb_blob.c
+++ b/chip/g/usb_blob.c
@@ -9,7 +9,7 @@
#include "printf.h"
#include "registers.h"
#include "timer.h"
-#include "usb.h"
+#include "usb_descriptor.h"
#define CPRINTS(format, args...) cprints(CC_USB, format, ## args)
diff --git a/chip/g/usb_console.c b/chip/g/usb_console.c
index d075bdac09..1414ddbe1e 100644
--- a/chip/g/usb_console.c
+++ b/chip/g/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/g/usb_hid.c b/chip/g/usb_hid.c
index 5407aa1540..2c4d515bfc 100644
--- a/chip/g/usb_hid.c
+++ b/chip/g/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-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:
diff --git a/include/usb.h b/include/usb_descriptor.h
index 88b6d27676..62dfe093e1 100644
--- a/include/usb.h
+++ b/include/usb_descriptor.h
@@ -5,8 +5,8 @@
* USB definitions.
*/
-#ifndef __CROS_EC_USB_H
-#define __CROS_EC_USB_H
+#ifndef __CROS_EC_USB_DESCRIPTOR_H
+#define __CROS_EC_USB_DESCRIPTOR_H
#include <stddef.h> /* for wchar_t */
@@ -244,4 +244,4 @@ extern const uint8_t usb_string_desc[];
extern const void * const usb_fw_version;
extern const struct bos_context bos_ctx;
-#endif /* __CROS_EC_USB_H */
+#endif /* __CROS_EC_USB_DESCRIPTOR_H */
View Lorry Controller Status