Re #4125: New functions usbStart() and usbStop() to make USB code cleaner

This commit is contained in:
Damjan Adamic
2016-12-11 16:28:23 +01:00
parent aecf53b3e1
commit a4d899844e
7 changed files with 16 additions and 10 deletions
-1
View File
@@ -138,7 +138,6 @@ void boardInit()
__enable_irq();
i2cInit();
usbInit();
usbDeInit();
#if defined(DEBUG) && !defined(PCBX7D)
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
+2 -1
View File
@@ -426,7 +426,8 @@ uint8_t isBacklightEnabled(void);
// USB driver
int usbPlugged(void);
void usbInit(void);
void usbDeInit(void);
void usbStart(void);
void usbStop(void);
void usbSerialPutc(uint8_t c);
#define USB_NAME "FrSky Taranis"
#define USB_MANUFACTURER 'F', 'r', 'S', 'k', 'y', ' ', ' ', ' ' /* 8 bytes */
@@ -361,7 +361,6 @@ int main()
// SD card detect pin
sdInit();
usbInit();
usbDeInit();
#endif
for (;;) {
@@ -384,7 +383,7 @@ int main()
unlocked = 1;
unlockFlash();
}
usbInit();
usbStart();
usbPluggedIn();
}
}
@@ -419,7 +418,7 @@ int main()
lcdDrawTextAlignedLeft(4*FH, STR_USB_CONNECTED);
if (usbPlugged() == 0) {
vpos = 0;
usbDeInit();
usbStop();
if (unlocked) {
lockFlash();
unlocked = 0;