Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-07 05:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

suppress null-dereference by usbh and lwip

Browse Source
This commit is contained in:
hathach 2021-10-18 11:42:00 +07:00
parent a7dd5b616c
commit 6fcf4bee8c
4 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/device/net_lwip_webserver/Makefile
View File

@ -7,6 +7,9 @@ CFLAGS += \
-DPBUF_POOL_SIZE=2 \ -DPBUF_POOL_SIZE=2 \
-DTCP_WND=2*TCP_MSS \ -DTCP_WND=2*TCP_MSS \
-DHTTPD_USE_CUSTOM_FSDATA=0 -DHTTPD_USE_CUSTOM_FSDATA=0
# suppress warning caused by lwip
CFLAGS += -Wno-error=null-dereference
INC += \ INC += \
src \ src \

3
examples/host/cdc_msc_hid/Makefile
View File

@ -9,7 +9,8 @@ INC += \
EXAMPLE_SOURCE += $(wildcard src/*.c) EXAMPLE_SOURCE += $(wildcard src/*.c)
SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE)) SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE))
CFLAGS += -Wno-error=cast-align # TODO: suppress warning caused by host stack
CFLAGS += -Wno-error=cast-align -Wno-error=null-dereference
# TinyUSB Host Stack source # TinyUSB Host Stack source
SRC_C += \ SRC_C += \

3
examples/host/hid_controller/Makefile
View File

@ -12,7 +12,8 @@ EXAMPLE_SOURCE += \
SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE)) SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE))
CFLAGS += -Wno-error=cast-align # TODO: suppress warning caused by host stack
CFLAGS += -Wno-error=cast-align -Wno-error=null-dereference
# TinyUSB Host Stack source # TinyUSB Host Stack source
SRC_C += \ SRC_C += \

48
src/host/usbh.c
View File

@ -53,13 +53,39 @@
// USBH-HCD common data structure // USBH-HCD common data structure
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
typedef struct { // device0 struct must be strictly a subset of normal device struct
//------------- port -------------// typedef struct
{
// port
uint8_t rhport; uint8_t rhport;
uint8_t hub_addr; uint8_t hub_addr;
uint8_t hub_port; uint8_t hub_port;
uint8_t speed; uint8_t speed;
volatile struct TU_ATTR_PACKED
{
uint8_t connected : 1;
uint8_t addressed : 1;
uint8_t configured : 1;
uint8_t suspended : 1;
};
} usbh_dev0_t;
typedef struct {
// port
uint8_t rhport;
uint8_t hub_addr;
uint8_t hub_port;
uint8_t speed;
volatile struct TU_ATTR_PACKED
{
uint8_t connected : 1;
uint8_t addressed : 1;
uint8_t configured : 1;
uint8_t suspended : 1;
};
//------------- device descriptor -------------// //------------- device descriptor -------------//
uint16_t vid; uint16_t vid;
uint16_t pid; uint16_t pid;
@ -73,14 +99,6 @@ typedef struct {
// uint8_t interface_count; // bNumInterfaces alias // uint8_t interface_count; // bNumInterfaces alias
//------------- device -------------// //------------- device -------------//
struct TU_ATTR_PACKED
{
uint8_t connected : 1;
uint8_t addressed : 1;
uint8_t configured : 1;
uint8_t suspended : 1;
};
volatile uint8_t state; // device state, value from enum tusbh_device_state_t volatile uint8_t state; // device state, value from enum tusbh_device_state_t
uint8_t itf2drv[16]; // map interface number to driver (0xff is invalid) uint8_t itf2drv[16]; // map interface number to driver (0xff is invalid)
@ -103,16 +121,6 @@ typedef struct {
} usbh_device_t; } usbh_device_t;
typedef struct
{
uint8_t rhport;
uint8_t hub_addr;
uint8_t hub_port;
uint8_t speed;
volatile uint8_t connected;
} usbh_dev0_t;
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF // MACRO CONSTANT TYPEDEF