mirror of
https://github.com/hathach/tinyusb.git
synced 2025-02-21 21:41:09 +00:00
rework suppress_tinyusb_warnings
* gcc 9.2.1 has some spurious -Wconversion warnings * cmake 3.18 and above require set_target_properties to be added from the target directory (so added it to all examples) * fixed a few warnings in a couple of examples
This commit is contained in:
parent
2f7f3e604e
commit
4057c2d8d9
@ -60,12 +60,12 @@ static void echo_serial_port(uint8_t itf, uint8_t buf[], uint32_t count)
|
|||||||
if (itf == 0)
|
if (itf == 0)
|
||||||
{
|
{
|
||||||
// echo back 1st port as lower case
|
// echo back 1st port as lower case
|
||||||
if (isupper(buf[i])) buf[i] += 'a' - 'A';
|
if (isupper(buf[i])) buf[i] = (uint8_t) (buf[i] + 'a' - 'A');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// echo back 2nd port as upper case
|
// echo back 2nd port as upper case
|
||||||
if (islower(buf[i])) buf[i] -= 'a' - 'A';
|
if (islower(buf[i])) buf[i] = (uint8_t) (buf[i] - 'a' - 'A');
|
||||||
}
|
}
|
||||||
|
|
||||||
tud_cdc_n_write_char(itf, buf[i]);
|
tud_cdc_n_write_char(itf, buf[i]);
|
||||||
|
@ -230,7 +230,7 @@ void tud_hid_report_complete_cb(uint8_t instance, uint8_t const* report, uint8_t
|
|||||||
(void) instance;
|
(void) instance;
|
||||||
(void) len;
|
(void) len;
|
||||||
|
|
||||||
uint8_t next_report_id = report[0] + 1;
|
uint8_t next_report_id = (uint8_t)(report[0] + 1);
|
||||||
|
|
||||||
if (next_report_id < REPORT_ID_COUNT)
|
if (next_report_id < REPORT_ID_COUNT)
|
||||||
{
|
{
|
||||||
|
@ -150,11 +150,13 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
|
|||||||
function(family_configure_device_example TARGET)
|
function(family_configure_device_example TARGET)
|
||||||
family_configure_target(${TARGET})
|
family_configure_target(${TARGET})
|
||||||
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_device)
|
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_device)
|
||||||
|
suppress_tinyusb_warnings()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(family_configure_host_example TARGET)
|
function(family_configure_host_example TARGET)
|
||||||
family_configure_target(${TARGET})
|
family_configure_target(${TARGET})
|
||||||
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_host)
|
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_host)
|
||||||
|
suppress_tinyusb_warnings()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(family_add_pico_pio_usb TARGET)
|
function(family_add_pico_pio_usb TARGET)
|
||||||
@ -165,6 +167,7 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
|
|||||||
family_configure_target(${TARGET})
|
family_configure_target(${TARGET})
|
||||||
# require tinyusb_pico_pio_usb
|
# require tinyusb_pico_pio_usb
|
||||||
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_device tinyusb_host tinyusb_pico_pio_usb )
|
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_device tinyusb_host tinyusb_pico_pio_usb )
|
||||||
|
suppress_tinyusb_warnings()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(check_and_add_pico_pio_usb_support)
|
function(check_and_add_pico_pio_usb_support)
|
||||||
@ -232,25 +235,34 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
|
|||||||
|
|
||||||
# This method must be called from the project scope to suppress known warnings in TinyUSB source files
|
# This method must be called from the project scope to suppress known warnings in TinyUSB source files
|
||||||
function(suppress_tinyusb_warnings)
|
function(suppress_tinyusb_warnings)
|
||||||
set_source_files_properties(
|
# some of these are pretty silly warnings only occurring in some older GCC versions
|
||||||
${PICO_TINYUSB_PATH}/src/device/usbd.c
|
set(CONVERSION_WARNING_FILES
|
||||||
|
${PICO_TINYUSB_PATH}/src/tusb.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/common/tusb_fifo.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/device/usbd.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/device/usbd_control.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/host/usbh.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/cdc/cdc_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/cdc/cdc_host.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/hid/hid_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/hid/hid_host.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/audio/audio_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/dfu/dfu_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/dfu/dfu_rt_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/midi/midi_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/class/usbtmc/usbtmc_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/hcd_rp2040.c
|
||||||
|
)
|
||||||
|
foreach(SOURCE_FILE IN LISTS CONVERSION_WARNING_FILES)
|
||||||
|
set_source_files_properties(
|
||||||
|
${SOURCE_FILE}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS "-Wno-conversion")
|
COMPILE_FLAGS "-Wno-conversion")
|
||||||
|
endforeach()
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${PICO_TINYUSB_PATH}/src/device/usbd_control.c
|
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS "-Wno-conversion")
|
COMPILE_FLAGS "-Wno-stringop-overflow -Wno-array-bounds"
|
||||||
set_source_files_properties(
|
)
|
||||||
${PICO_TINYUSB_PATH}/src/class/cdc/cdc_device.c
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "-Wno-conversion")
|
|
||||||
set_source_files_properties(
|
|
||||||
${PICO_TINYUSB_PATH}/src/common/tusb_fifo.c
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "-Wno-conversion")
|
|
||||||
set_source_files_properties(
|
|
||||||
${PICO_TINYUSB_PATH}/src/tusb.c
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "-Wno-conversion")
|
|
||||||
endfunction()
|
endfunction()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user