STM32 USBHOST: Corrections for DISCO_F746NG

bcostm · adbridge · commit ed9bb982e685 · 2017-12-29T15:39:06.000Z
diff --git a/features/unsupported/USBHost/targets/TARGET_STM/USBHALHost_STM.h b/features/unsupported/USBHost/targets/TARGET_STM/USBHALHost_STM.h
@@ -19,9 +19,11 @@
 #define USBHALHOST_STM_H
 
 #if defined(TARGET_DISCO_F746NG)
-// Select only one line
+#if (MBED_CONF_TARGET_USB_SPEED == 1) // Defined in json configuration file
+#define TARGET_DISCO_F746NG_HS
+#else
 #define TARGET_DISCO_F746NG_FS
-//#define TARGET_DISCO_F746NG_HS
+#endif
 #endif
 
 #if defined(TARGET_DISCO_F429ZI) || defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI)
@@ -136,7 +138,7 @@ void usb_vbus( uint8_t state)
 USBHALHost::USBHALHost()
 {
     instHost = this;
-    HCD_HandleTypeDef *hhcd;
+    HCD_HandleTypeDef *hhcd = {0};
     USBHALHost_Private_t *HALPriv = new(USBHALHost_Private_t);
 
     memset(HALPriv, 0, sizeof(USBHALHost_Private_t));
diff --git a/targets/targets.json b/targets/targets.json
@@ -1631,6 +1631,7 @@
             }
         },
         "detect_code": ["0815"],
+        "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
         "device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"],
         "features": ["LWIP"],
         "release_versions": ["2", "5"],

Original file line number	Diff line number	Diff line change
`@@ -1631,6 +1631,7 @@`
`1631`	`1631`	`}`
`1632`	`1632`	`},`
`1633`	`1633`	`"detect_code": ["0815"],`
	`1634`	`+ "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],`
`1634`	`1635`	`"device_has_add": ["ANALOGOUT", "CAN", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH"],`
`1635`	`1636`	`"features": ["LWIP"],`
`1636`	`1637`	`"release_versions": ["2", "5"],`