Commita36188b

committed

fix(usb): disable ICACHE

When USB is used on STM32H5 and ICACHE enable it does notwork so disable it.Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

1 parent757e359 commita36188bCopy full SHA for a36188b

File tree

2 files changed

+36

-0

lines changed

cores/arduino/stm32/usb
- cdc
  - usbd_cdc_if.c
- hid
  - usbd_hid_composite_if.c

2 files changed

+36

-0

lines changed

`‎cores/arduino/stm32/usb/cdc/usbd_cdc_if.c`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ USBD_HandleTypeDef hUSBD_Device_CDC;`
`48`	`48`
`49`	`49`	`staticboolCDC_initialized= false;`
`50`	`50`	`staticboolCDC_DTR_enabled= true;`
	`51`	`+staticboolicache_enabled= false;`
`51`	`52`
`52`	`53`	`/* Received Data over USB are stored in this buffer */`
`53`	`54`	`CDC_TransmitQueue_TypeDefTransmitQueue;`
`@@ -270,6 +271,15 @@ static int8_t USBD_CDC_TransmitCplt(uint8_t Buf, uint32_t Len, uint8_t epnum)`
`270`	`271`
`271`	`272`	`voidCDC_init(void)`
`272`	`273`	`{`
	`274`	`+#if defined(ICACHE)&& defined (HAL_ICACHE_MODULE_ENABLED)&& !defined(HAL_ICACHE_MODULE_DISABLED)`
	`275`	`+if (HAL_ICACHE_IsEnabled()==1) {`
	`276`	`+icache_enabled= true;`
	`277`	`+/* Disable instruction cache prior to internal cacheable memory update */`
	`278`	`+if (HAL_ICACHE_Disable()!=HAL_OK) {`
	`279`	`+Error_Handler();`
	`280`	`+ }`
	`281`	`+ }`
	`282`	`+#endif/* ICACHE && HAL_ICACHE_MODULE_ENABLED && !HAL_ICACHE_MODULE_DISABLED */`
`273`	`283`	`if (!CDC_initialized) {`
`274`	`284`	`/* Init Device Library */`
`275`	`285`	`if (USBD_Init(&hUSBD_Device_CDC,&USBD_Desc,0)==USBD_OK) {`
`@@ -294,6 +304,14 @@ void CDC_deInit(void)`
`294`	`304`	`USBD_DeInit(&hUSBD_Device_CDC);`
`295`	`305`	`CDC_initialized= false;`
`296`	`306`	`}`
	`307`	`+#if defined(ICACHE)&& defined (HAL_ICACHE_MODULE_ENABLED)&& !defined(HAL_ICACHE_MODULE_DISABLED)`
	`308`	`+if (icache_enabled) {`
	`309`	`+/* Re-enable instruction cache */`
	`310`	`+if (HAL_ICACHE_Enable()!=HAL_OK) {`
	`311`	`+Error_Handler();`
	`312`	`+ }`
	`313`	`+ }`
	`314`	`+#endif/* ICACHE && HAL_ICACHE_MODULE_ENABLED && !HAL_ICACHE_MODULE_DISABLED */`
`297`	`315`	`}`
`298`	`316`
`299`	`317`	`boolCDC_connected()`

`‎cores/arduino/stm32/usb/hid/usbd_hid_composite_if.c`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ USBD_HandleTypeDef hUSBD_Device_HID;`
`28`	`28`
`29`	`29`	`staticboolHID_keyboard_initialized= false;`
`30`	`30`	`staticboolHID_mouse_initialized= false;`
	`31`	`+staticboolicache_enabled= false;`
`31`	`32`
`32`	`33`	`/**`
`33`	`34`	`* @brief Initialize USB devices`
`@@ -36,6 +37,15 @@ static bool HID_mouse_initialized = false;`
`36`	`37`	`*/`
`37`	`38`	`voidHID_Composite_Init(HID_Interfacedevice)`
`38`	`39`	`{`
	`40`	`+#if defined(ICACHE)&& defined (HAL_ICACHE_MODULE_ENABLED)&& !defined(HAL_ICACHE_MODULE_DISABLED)`
	`41`	`+if (HAL_ICACHE_IsEnabled()==1) {`
	`42`	`+icache_enabled= true;`
	`43`	`+/* Disable instruction cache prior to internal cacheable memory update */`
	`44`	`+if (HAL_ICACHE_Disable()!=HAL_OK) {`
	`45`	`+Error_Handler();`
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+#endif/* ICACHE && HAL_ICACHE_MODULE_ENABLED && !HAL_ICACHE_MODULE_DISABLED */`
`39`	`49`	`if (IS_HID_INTERFACE(device)&&`
`40`	`50`	`!HID_keyboard_initialized&& !HID_mouse_initialized) {`
`41`	`51`	`/* Init Device Library */`
`@@ -72,6 +82,14 @@ void HID_Composite_DeInit(HID_Interface device)`
`72`	`82`	`/* DeInit Device Library */`
`73`	`83`	`USBD_DeInit(&hUSBD_Device_HID);`
`74`	`84`	`}`
	`85`	`+#if defined(ICACHE)&& defined (HAL_ICACHE_MODULE_ENABLED)&& !defined(HAL_ICACHE_MODULE_DISABLED)`
	`86`	`+if (icache_enabled) {`
	`87`	`+/* Re-enable instruction cache */`
	`88`	`+if (HAL_ICACHE_Enable()!=HAL_OK) {`
	`89`	`+Error_Handler();`
	`90`	`+ }`
	`91`	`+ }`
	`92`	`+#endif/* ICACHE && HAL_ICACHE_MODULE_ENABLED && !HAL_ICACHE_MODULE_DISABLED */`
`75`	`93`	`if (device==HID_KEYBOARD) {`
`76`	`94`	`HID_keyboard_initialized= false;`
`77`	`95`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita36188b

File tree

2 files changed

2 files changed

`‎cores/arduino/stm32/usb/cdc/usbd_cdc_if.c`

`‎cores/arduino/stm32/usb/hid/usbd_hid_composite_if.c`

0 commit comments