diff options
| author | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
| commit | 630936472237f319b46d51f691bf6c36d80610b3 (patch) | |
| tree | ae7e1eef805073b2fc0e3bd9bf3801b8f557e356 /src/common | |
| parent | 444e4d282137953e6834360a9fb866331d21d954 (diff) | |
| parent | e90cf7a676eddcbd9c35d2d99a0a9cd14686e2ce (diff) | |
Merge remote-tracking branch 'upstream/master' into uac2
Conflicts:
src/device/usbd.c
src/device/usbd.h
src/portable/st/synopsys/dcd_synopsys.c
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_common.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h index 1dba6c914..d95c0ffc4 100644 --- a/src/common/tusb_common.h +++ b/src/common/tusb_common.h @@ -251,16 +251,16 @@ void tu_print_var(uint8_t const* buf, uint32_t bufsize) typedef struct { uint32_t key; - char const * data; -}lookup_entry_t; + const char* data; +} tu_lookup_entry_t; typedef struct { uint16_t count; - lookup_entry_t const* items; -} lookup_table_t; + tu_lookup_entry_t const* items; +} tu_lookup_table_t; -static inline char const* lookup_find(lookup_table_t const* p_table, uint32_t key) +static inline const char* tu_lookup_find(tu_lookup_table_t const* p_table, uint32_t key) { for(uint16_t i=0; i<p_table->count; i++) { |