Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #5649 from jflyper/bdev-msc-white-space-tidy-2

Browse source 
MSC support code: White space tidy
This commit is contained in:
jflyper 2018-04-09 11:14:33 +09:00 • committed by GitHub
commit 4a314613d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/main/drivers/usb_msc_f4xx.c
View file

@ -74,21 +74,21 @@ void mscInit(void)
uint8_t mscStart(void) uint8_t mscStart(void)
{ {
ledInit(statusLedConfig()); ledInit(statusLedConfig());
//Start USB //Start USB
usbGenerateDisconnectPulse(); usbGenerateDisconnectPulse();
IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, 0); IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, 0);
IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, 0); IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, 0);
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &MSC_desc, &USBD_MSC_cb, &USR_cb); USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &MSC_desc, &USBD_MSC_cb, &USR_cb);
// NVIC configuration for SYSTick // NVIC configuration for SYSTick
NVIC_DisableIRQ(SysTick_IRQn); NVIC_DisableIRQ(SysTick_IRQn);
NVIC_SetPriority(SysTick_IRQn, NVIC_BUILD_PRIORITY(0, 0)); NVIC_SetPriority(SysTick_IRQn, NVIC_BUILD_PRIORITY(0, 0));
NVIC_EnableIRQ(SysTick_IRQn); NVIC_EnableIRQ(SysTick_IRQn);
return 0; return 0;
} }
bool mscCheckBoot(void) bool mscCheckBoot(void)
@ -116,16 +116,16 @@ bool mscCheckButton(void)
void mscWaitForButton(void) void mscWaitForButton(void)
{ {
// In order to exit MSC mode simply disconnect the board, or push the button again. // In order to exit MSC mode simply disconnect the board, or push the button again.
while (mscCheckButton()); while (mscCheckButton());
delay(DEBOUNCE_TIME_MS); delay(DEBOUNCE_TIME_MS);
while (true) { while (true) {
asm("NOP"); asm("NOP");
if (mscCheckButton()) { if (mscCheckButton()) {
*((uint32_t *)0x2001FFF0) = 0xFFFFFFFF; *((uint32_t *)0x2001FFF0) = 0xFFFFFFFF;
delay(1); delay(1);
NVIC_SystemReset(); NVIC_SystemReset();
} }
} }
} }
#endif #endif

54
src/main/drivers/usb_msc_f7xx.c
View file

@ -63,30 +63,30 @@ void mscInit(void)
uint8_t mscStart(void) uint8_t mscStart(void)
{ {
ledInit(statusLedConfig()); ledInit(statusLedConfig());
//Start USB //Start USB
usbGenerateDisconnectPulse(); usbGenerateDisconnectPulse();
IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, 0); IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, 0);
IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, 0); IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, 0);
USBD_Init(&USBD_Device, &VCP_Desc, 0); USBD_Init(&USBD_Device, &VCP_Desc, 0);
/** Regsiter class */ /** Regsiter class */
USBD_RegisterClass(&USBD_Device, USBD_MSC_CLASS); USBD_RegisterClass(&USBD_Device, USBD_MSC_CLASS);
/** Register interface callbacks */ /** Register interface callbacks */
USBD_MSC_RegisterStorage(&USBD_Device, &USBD_MSC_Template_fops); USBD_MSC_RegisterStorage(&USBD_Device, &USBD_MSC_Template_fops);
USBD_Start(&USBD_Device); USBD_Start(&USBD_Device);
// NVIC configuration for SYSTick // NVIC configuration for SYSTick
NVIC_DisableIRQ(SysTick_IRQn); NVIC_DisableIRQ(SysTick_IRQn);
NVIC_SetPriority(SysTick_IRQn, NVIC_BUILD_PRIORITY(0, 0)); NVIC_SetPriority(SysTick_IRQn, NVIC_BUILD_PRIORITY(0, 0));
NVIC_EnableIRQ(SysTick_IRQn); NVIC_EnableIRQ(SysTick_IRQn);
return 0; return 0;
} }
bool mscCheckBoot(void) bool mscCheckBoot(void)
@ -114,16 +114,16 @@ bool mscCheckButton(void)
void mscWaitForButton(void) void mscWaitForButton(void)
{ {
// In order to exit MSC mode simply disconnect the board, or push the button again. // In order to exit MSC mode simply disconnect the board, or push the button again.
while (mscCheckButton()); while (mscCheckButton());
delay(DEBOUNCE_TIME_MS); delay(DEBOUNCE_TIME_MS);
while (true) { while (true) {
asm("NOP"); asm("NOP");
if (mscCheckButton()) { if (mscCheckButton()) {
*((uint32_t *)0x2001FFF0) = 0xFFFFFFFF; *((uint32_t *)0x2001FFF0) = 0xFFFFFFFF;
delay(1); delay(1);
NVIC_SystemReset(); NVIC_SystemReset();
} }
} }
} }
#endif #endif