Commita84e919

committed

chore(usb): avoid USBD_free and USBD_malloc usage

to avoid call of malloc in PCD_EP_ISR_Handler.Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

1 parenta27e4a1 commita84e919Copy full SHA for a84e919

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,8 @@ __ALIGN_BEGIN static uint8_t USBD_CDC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_`
`133`	`133`	`* @{`
`134`	`134`	`*/`
`135`	`135`
	`136`	`+/* Prevent dynamic allocation */`
	`137`	`+USBD_CDC_HandleTypeDef_hcdc;`
`136`	`138`
`137`	`139`	`/* CDC interface class callbacks structure */`
`138`	`140`	`USBD_ClassTypeDefUSBD_CDC= {`
`@@ -476,7 +478,8 @@ static uint8_t USBD_CDC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)`
`476`	`478`	`UNUSED(cfgidx);`
`477`	`479`	`USBD_CDC_HandleTypeDef*hcdc;`
`478`	`480`
`479`		`-hcdc= (USBD_CDC_HandleTypeDef*)USBD_malloc(sizeof(USBD_CDC_HandleTypeDef));`
	`481`	`+// hcdc = (USBD_CDC_HandleTypeDef *)USBD_malloc(sizeof(USBD_CDC_HandleTypeDef));`
	`482`	`+hcdc=&_hcdc;`
`480`	`483`
`481`	`484`	`if (hcdc==NULL) {`
`482`	`485`	`pdev->pClassDataCmsit[pdev->classId]=NULL;`
`@@ -592,7 +595,8 @@ static uint8_t USBD_CDC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)`
`592`	`595`	`/* DeInit physical Interface components */`
`593`	`596`	`if (pdev->pClassDataCmsit[pdev->classId]!=NULL) {`
`594`	`597`	`((USBD_CDC_ItfTypeDef*)pdev->pUserData[pdev->classId])->DeInit();`
`595`		`- (void)USBD_free(pdev->pClassDataCmsit[pdev->classId]);`
	`598`	`+/* No need to free as hhid is no more dynamically allocated */`
	`599`	`+// (void)USBD_free(pdev->pClassDataCmsit[pdev->classId]);`
`596`	`600`	`pdev->pClassDataCmsit[pdev->classId]=NULL;`
`597`	`601`	`pdev->pClassData=NULL;`
`598`	`602`	`}`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ static uint8_t USBD_HID_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);`
`105`	`105`	`* @{`
`106`	`106`	`*/`
`107`	`107`
	`108`	`+/* Prevent dynamic allocation */`
	`109`	`+USBD_HID_HandleTypeDef_hhid;`
	`110`	`+`
`108`	`111`	`USBD_ClassTypeDefUSBD_COMPOSITE_HID= {`
`109`	`112`	`USBD_HID_Init,`
`110`	`113`	`USBD_HID_DeInit,`
`@@ -523,7 +526,8 @@ static uint8_t USBD_HID_Init(USBD_HandleTypeDef *pdev,`
`523`	`526`
`524`	`527`	`USBD_HID_HandleTypeDef*hhid;`
`525`	`528`
`526`		`-hhid= (USBD_HID_HandleTypeDef*)USBD_malloc(sizeof(USBD_HID_HandleTypeDef));`
	`529`	`+// hhid = (USBD_HID_HandleTypeDef *)USBD_malloc(sizeof(USBD_HID_HandleTypeDef));`
	`530`	`+hhid=&_hhid;`
`527`	`531`
`528`	`532`	`if (hhid==NULL) {`
`529`	`533`	`pdev->pClassDataCmsit[pdev->classId]=NULL;`
`@@ -589,7 +593,8 @@ static uint8_t USBD_HID_DeInit(USBD_HandleTypeDef *pdev,`
`589`	`593`
`590`	`594`	`/* Free allocated memory */`
`591`	`595`	`if (pdev->pClassDataCmsit[pdev->classId]!=NULL) {`
`592`		`- (void)USBD_free(pdev->pClassDataCmsit[pdev->classId]);`
	`596`	`+/* No need to free as hhid is no more dynamically allocated */`
	`597`	`+// (void)USBD_free(pdev->pClassDataCmsit[pdev->classId]);`
`593`	`598`	`pdev->pClassDataCmsit[pdev->classId]=NULL;`
`594`	`599`	`}`
`595`	`600`

Comments

(0)