Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5943451

Browse files
astyle
1 parent 8e29acf commit 5943451

File tree

2 files changed

+54
-68
lines changed

2 files changed

+54
-68
lines changed

‎cores/arduino/stm32/usb_host/usbh_conf.c‎

Lines changed: 47 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,12 @@ USBH_StatusTypeDef USBH_Get_USB_Status(HAL_StatusTypeDef hal_status);
6161
*******************************************************************************/
6262
/* MSP Init */
6363

64-
void HAL_HCD_MspInit(HCD_HandleTypeDef*hhcd)
64+
void HAL_HCD_MspInit(HCD_HandleTypeDef*hhcd)
6565
{
6666
const PinMap *map = NULL;
6767
#if defined (USB_OTG_FS)
68-
if(hhcd->Instance==USB_OTG_FS)
69-
{
70-
/* Configure USB FS GPIOs */
68+
if (hhcd->Instance == USB_OTG_FS) {
69+
/* Configure USB FS GPIOs */
7170
map = PinMap_USB_OTG_FS;
7271
while (map->pin != NC) {
7372
pin_function(map->pin, map->function);
@@ -104,7 +103,7 @@ void HAL_HCD_MspInit(HCD_HandleTypeDef* hhcd)
104103
#endif
105104
}
106105

107-
void HAL_HCD_MspDeInit(HCD_HandleTypeDef*hhcd)
106+
void HAL_HCD_MspDeInit(HCD_HandleTypeDef*hhcd)
108107
{
109108
#if defined (USB_OTG_FS)
110109
if (hhcd->Instance == USB_OTG_FS) {
@@ -197,23 +196,22 @@ USBH_StatusTypeDef USBH_LL_Init(USBH_HandleTypeDef *phost)
197196
{
198197
/* Init USB_IP */
199198
if (phost->id == HOST_FS) {
200-
/* Link the driver to the stack. */
201-
hhcd_USB_OTG_FS.pData = phost;
202-
phost->pData = &hhcd_USB_OTG_FS;
203-
204-
hhcd_USB_OTG_FS.Instance = USB_OTG_FS;
205-
hhcd_USB_OTG_FS.Init.Host_channels = 8;
206-
hhcd_USB_OTG_FS.Init.speed = HCD_SPEED_FULL;
207-
hhcd_USB_OTG_FS.Init.dma_enable = DISABLE;
208-
hhcd_USB_OTG_FS.Init.phy_itface = HCD_PHY_EMBEDDED;
209-
hhcd_USB_OTG_FS.Init.Sof_enable = DISABLE;
210-
if (HAL_HCD_Init(&hhcd_USB_OTG_FS) != HAL_OK)
211-
{
212-
// Error_Handler( );
213-
return USBH_FAIL;
214-
}
199+
/* Link the driver to the stack. */
200+
hhcd_USB_OTG_FS.pData = phost;
201+
phost->pData = &hhcd_USB_OTG_FS;
202+
203+
hhcd_USB_OTG_FS.Instance = USB_OTG_FS;
204+
hhcd_USB_OTG_FS.Init.Host_channels = 8;
205+
hhcd_USB_OTG_FS.Init.speed = HCD_SPEED_FULL;
206+
hhcd_USB_OTG_FS.Init.dma_enable = DISABLE;
207+
hhcd_USB_OTG_FS.Init.phy_itface = HCD_PHY_EMBEDDED;
208+
hhcd_USB_OTG_FS.Init.Sof_enable = DISABLE;
209+
if (HAL_HCD_Init(&hhcd_USB_OTG_FS) != HAL_OK) {
210+
// Error_Handler( );
211+
return USBH_FAIL;
212+
}
215213

216-
USBH_LL_SetTimer(phost, HAL_HCD_GetCurrentFrame(&hhcd_USB_OTG_FS));
214+
USBH_LL_SetTimer(phost, HAL_HCD_GetCurrentFrame(&hhcd_USB_OTG_FS));
217215
}
218216
return USBH_OK;
219217
}
@@ -278,23 +276,22 @@ USBH_SpeedTypeDef USBH_LL_GetSpeed(USBH_HandleTypeDef *phost)
278276
{
279277
USBH_SpeedTypeDef speed = USBH_SPEED_FULL;
280278

281-
switch (HAL_HCD_GetCurrentSpeed(phost->pData))
282-
{
283-
case 0 :
284-
speed = USBH_SPEED_HIGH;
285-
break;
279+
switch (HAL_HCD_GetCurrentSpeed(phost->pData)) {
280+
case 0 :
281+
speed = USBH_SPEED_HIGH;
282+
break;
286283

287-
case 1 :
288-
speed = USBH_SPEED_FULL;
289-
break;
284+
case 1 :
285+
speed = USBH_SPEED_FULL;
286+
break;
290287

291-
case 2 :
292-
speed = USBH_SPEED_LOW;
293-
break;
288+
case 2 :
289+
speed = USBH_SPEED_LOW;
290+
break;
294291

295-
default:
296-
speed = USBH_SPEED_FULL;
297-
break;
292+
default:
293+
speed = USBH_SPEED_FULL;
294+
break;
298295
}
299296
return speed;
300297
}
@@ -404,7 +401,7 @@ USBH_StatusTypeDef USBH_LL_SubmitURB(USBH_HandleTypeDef *phost, uint8_t pipe, ui
404401
HAL_StatusTypeDef hal_status = HAL_OK;
405402
USBH_StatusTypeDef usb_status = USBH_OK;
406403

407-
hal_status = HAL_HCD_HC_SubmitRequest(phost->pData, pipe, direction,
404+
hal_status = HAL_HCD_HC_SubmitRequest(phost->pData, pipe, direction,
408405
ep_type, token, pbuff, length,
409406
do_ping);
410407
usb_status = USBH_Get_USB_Status(hal_status);
@@ -428,7 +425,7 @@ USBH_StatusTypeDef USBH_LL_SubmitURB(USBH_HandleTypeDef *phost, uint8_t pipe, ui
428425
*/
429426
USBH_URBStateTypeDef USBH_LL_GetURBState(USBH_HandleTypeDef *phost, uint8_t pipe)
430427
{
431-
return (USBH_URBStateTypeDef)HAL_HCD_HC_GetURBState(phost->pData, pipe);
428+
return (USBH_URBStateTypeDef)HAL_HCD_HC_GetURBState(phost->pData, pipe);
432429
}
433430

434431
/**
@@ -447,18 +444,14 @@ USBH_StatusTypeDef USBH_LL_DriverVBUS(USBH_HandleTypeDef *phost, uint8_t state)
447444

448445
/* USER CODE END 0*/
449446

450-
if (phost->id == HOST_FS)
451-
{
452-
if (state == 0)
453-
{
447+
if (phost->id == HOST_FS) {
448+
if (state == 0) {
454449
/* Drive high Charge pump */
455450
/* ToDo: Add IOE driver control */
456451
/* USER CODE BEGIN DRIVE_HIGH_CHARGE_FOR_FS */
457452

458453
/* USER CODE END DRIVE_HIGH_CHARGE_FOR_FS */
459-
}
460-
else
461-
{
454+
} else {
462455
/* Drive low Charge pump */
463456
/* ToDo: Add IOE driver control */
464457
/* USER CODE BEGIN DRIVE_LOW_CHARGE_FOR_FS */
@@ -482,12 +475,9 @@ USBH_StatusTypeDef USBH_LL_SetToggle(USBH_HandleTypeDef *phost, uint8_t pipe, ui
482475
HCD_HandleTypeDef *pHandle;
483476
pHandle = phost->pData;
484477

485-
if(pHandle->hc[pipe].ep_is_in)
486-
{
478+
if (pHandle->hc[pipe].ep_is_in) {
487479
pHandle->hc[pipe].toggle_in = toggle;
488-
}
489-
else
490-
{
480+
} else {
491481
pHandle->hc[pipe].toggle_out = toggle;
492482
}
493483

@@ -506,12 +496,9 @@ uint8_t USBH_LL_GetToggle(USBH_HandleTypeDef *phost, uint8_t pipe)
506496
HCD_HandleTypeDef *pHandle;
507497
pHandle = phost->pData;
508498

509-
if(pHandle->hc[pipe].ep_is_in)
510-
{
499+
if (pHandle->hc[pipe].ep_is_in) {
511500
toggle = pHandle->hc[pipe].toggle_in;
512-
}
513-
else
514-
{
501+
} else {
515502
toggle = pHandle->hc[pipe].toggle_out;
516503
}
517504
return toggle;
@@ -536,23 +523,22 @@ USBH_StatusTypeDef USBH_Get_USB_Status(HAL_StatusTypeDef hal_status)
536523
{
537524
USBH_StatusTypeDef usb_status = USBH_OK;
538525

539-
switch (hal_status)
540-
{
526+
switch (hal_status) {
541527
case HAL_OK :
542528
usb_status = USBH_OK;
543-
break;
529+
break;
544530
case HAL_ERROR :
545531
usb_status = USBH_FAIL;
546-
break;
532+
break;
547533
case HAL_BUSY :
548534
usb_status = USBH_BUSY;
549-
break;
535+
break;
550536
case HAL_TIMEOUT :
551537
usb_status = USBH_FAIL;
552-
break;
538+
break;
553539
default :
554540
usb_status = USBH_FAIL;
555-
break;
541+
break;
556542
}
557543
return usb_status;
558544
}

‎cores/arduino/stm32/usb_host/usbh_conf.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef __USBH_CONF__H__
2424
#define __USBH_CONF__H__
2525
#ifdef __cplusplus
26-
extern "C" {
26+
extern "C" {
2727
#endif
2828

2929
// #define USBHOST
@@ -98,8 +98,8 @@
9898

9999
/****************************************/
100100
/* #define for FS and HS identification */
101-
#define HOST_HS 0
102-
#define HOST_FS 1
101+
#define HOST_HS 0
102+
#define HOST_FS 1
103103

104104
/* Interrupt priority */
105105
#ifndef USBH_IRQ_PRIO
@@ -110,9 +110,9 @@
110110
#endif /* USBH_IRQ_SUBPRIO */
111111

112112
#if (USBH_USE_OS == 1)
113-
#include "cmsis_os.h"
114-
#define USBH_PROCESS_PRIO osPriorityNormal
115-
#define USBH_PROCESS_STACK_SIZE ((uint16_t)0)
113+
#include "cmsis_os.h"
114+
#define USBH_PROCESS_PRIO osPriorityNormal
115+
#define USBH_PROCESS_STACK_SIZE ((uint16_t)0)
116116
#endif /* (USBH_USE_OS == 1) */
117117

118118
/**
@@ -207,7 +207,7 @@ extern void spi_debug(const char *msg, ...);
207207
* @}
208208
*/
209209

210-
#endif /* USBHOST */
210+
#endif /* USBHOST */
211211

212212
#ifdef __cplusplus
213213
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /