USB modes cleanup (#5396)

* USB modes cleanup

* Forgot a couple

* Exclude joystick code from bootloader
This commit is contained in:
Andre Bernet
2017-11-22 10:41:19 +01:00
committed by Bertrand Songis
parent f2cf444a64
commit 8662de39f5
10 changed files with 14 additions and 20 deletions
@@ -37,7 +37,6 @@ set(FIRMWARE_TARGET_SRC
../common/arm/stm32/usbd_usr.cpp
../common/arm/stm32/usb_driver.cpp
)
add_definitions(-DUSB_SERIAL)
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_cdc.cpp
@@ -46,7 +45,6 @@ set(STM32USB_SRC
${STM32USB_SRC}
STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c
)
add_definitions(-DUSB_MASS_STORAGE)
set(STM32USB_SRC
${STM32USB_SRC}
STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c
@@ -58,7 +56,6 @@ set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_storage_msd.cpp
)
add_definitions(-DUSB_JOYSTICK)
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_hid_joystick.c
@@ -116,7 +116,7 @@ bool usbStarted()
return usbDriverStarted;
}
#if defined(USB_JOYSTICK)
#if !defined(BOOT)
/*
Prepare and send new USB data packet
@@ -157,5 +157,4 @@ void usbJoystickUpdate()
USBD_HID_SendReport(&USB_OTG_dev, HID_Buffer, HID_IN_PACKET);
}
}
#endif // #defined(USB_JOYSTICK)
#endif
@@ -45,7 +45,7 @@ void setSelectedUsbMode(int mode);
void usbSerialPutc(uint8_t c);
// Used in view_statistics.cpp
#if defined(USB_SERIAL)
#if defined(DEBUG) && !defined(BOOT)
extern uint16_t usbWraps;
extern uint16_t charsWritten;
extern volatile uint32_t APP_Rx_ptr_in;