Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: enable write protection on USB msd 

also fixes support for MSD on FS
This commit is contained in:
bugobliterator 2023-05-26 17:03:30 +10:00 committed by Andrew Tridgell
parent a9ef3b031e
commit f7d3969116
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_HAL_ChibiOS/hwdef/common/board.c
View File

@ -304,15 +304,6 @@ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) {
(void)sdcp;
return true;
}
/**
* @brief SDC card write protection detection.
*/
bool sdc_lld_is_write_protected(SDCDriver *sdcp) {
(void)sdcp;
return false;
}
#endif /* HAL_USE_SDC */
#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)

4
libraries/AP_HAL_ChibiOS/hwdef/common/usbcfg_cdc_msd.c
View File

@ -27,7 +27,11 @@
/*
* must be 64 for full speed and 512 for high speed
*/
#if STM32_USB_HS
#define USB_MSD_EP_SIZE 512U
#else
#define USB_MSD_EP_SIZE 64U
#endif
#define USB_DATA_REQUEST_EP 2
#define USB_DATA_AVAILABLE_EP 2
#define USB_INTERRUPT_REQUEST_EP 3

3
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -929,11 +929,14 @@ class ChibiOSHWDef(object):
f.write('#define STM32_OTG2_IS_OTG1 FALSE\n')
f.write('#define HAL_USE_USB TRUE\n')
f.write('#define HAL_USE_SERIAL_USB TRUE\n')
f.write('#define STM32_USB_HS FALSE\n')
if 'OTG2' in self.bytype:
f.write('#define STM32_USB_USE_OTG2 TRUE\n')
f.write('#define STM32_USB_HS FALSE\n')
if 'OTG_HS' in self.bytype:
f.write('#define STM32_OTG2_IS_OTG1 FALSE\n')
f.write('#define STM32_USB_USE_OTG2 TRUE\n')
f.write('#define STM32_USB_HS TRUE\n')
f.write('#define HAL_USE_USB TRUE\n')
f.write('#define HAL_USE_SERIAL_USB TRUE\n')
f.write('#define BOARD_OTG2_USES_ULPI\n')

13
libraries/AP_HAL_ChibiOS/sdcard.cpp
View File

@ -30,13 +30,16 @@ extern const AP_HAL::HAL& hal;
#if HAL_HAVE_USB_CDC_MSD
bool write_protected = false;
static void block_filesys_access()
{
AP::FS().block_access();
write_protected = true;
}
static void free_filesys_access()
{
write_protected = false;
AP::FS().free_access();
}
#endif
@ -193,6 +196,16 @@ bool sdcard_init()
return false;
}
#if HAL_USE_SDC
bool sdc_lld_is_write_protected(SDCDriver *sdcp) {
#if HAL_HAVE_USB_CDC_MSD
return write_protected;
#else
return false;
#endif
}
#endif
/*
stop sdcard interface (for reboot)
*/