Skip to content

Commit 4082099

Browse files
committed
TARGET_STM USB astyle
1 parent 6391b7f commit 4082099

File tree

8 files changed

+365
-320
lines changed

8 files changed

+365
-320
lines changed

features/unsupported/USBDevice/targets/TARGET_STM/USBHAL_IP_DEVICE.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
#error "FIFO dimensioning incorrect"
4343
#endif
4444

45-
typedef struct
46-
{
45+
typedef struct {
4746
USBHAL *inst;
4847

4948
void (USBHAL::*bus_reset)(void);
@@ -71,10 +70,10 @@ uint32_t HAL_PCDEx_GetTxFiFo(PCD_HandleTypeDef *hpcd, uint8_t fifo)
7170
return 1024;
7271
}
7372

74-
void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
73+
void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
7574
{
76-
USBHAL_Private_t *priv=((USBHAL_Private_t *)(hpcd->pData));
77-
USBHAL *obj= priv->inst;
75+
USBHAL_Private_t *priv = ((USBHAL_Private_t *)(hpcd->pData));
76+
USBHAL *obj = priv->inst;
7877
uint32_t sofnum = (hpcd->Instance->FNR) & USB_FNR_FN;
7978
void (USBHAL::*func)(int frame) = priv->sof;
8079
(obj->*func)(sofnum);
@@ -92,8 +91,9 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state)
9291

9392
USBHAL *USBHAL::instance;
9493

95-
USBHAL::USBHAL(void) {
96-
USBHAL_Private_t *HALPriv = new(USBHAL_Private_t);
94+
USBHAL::USBHAL(void)
95+
{
96+
USBHAL_Private_t *HALPriv = new (USBHAL_Private_t);
9797

9898
hpcd.Instance = USB;
9999

@@ -151,7 +151,7 @@ USBHAL::USBHAL(void) {
151151
__HAL_RCC_SYSCFG_CLK_ENABLE();
152152

153153
// Configure PCD and FIFOs
154-
hpcd.pData = (void*)HALPriv;
154+
hpcd.pData = (void *)HALPriv;
155155
hpcd.State = HAL_PCD_STATE_RESET;
156156
HAL_PCD_Init(&hpcd);
157157

features/unsupported/USBDevice/targets/TARGET_STM/USBHAL_IP_OTGFSHS.h

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
#error "FIFO dimensioning incorrect"
4545
#endif
4646

47-
typedef struct
48-
{
47+
typedef struct {
4948
USBHAL *inst;
5049

5150
void (USBHAL::*bus_reset)(void);
@@ -71,17 +70,16 @@ uint32_t HAL_PCDEx_GetTxFiFo(PCD_HandleTypeDef *hpcd, uint8_t fifo)
7170
uint32_t len;
7271
if (fifo == 0) {
7372
len = hpcd->Instance->DIEPTXF0_HNPTXFSIZ >> 16;
74-
}
75-
else {
73+
} else {
7674
len = hpcd->Instance->DIEPTXF[fifo - 1] >> 16;
7775
}
7876
return len * 4;
7977
}
8078

81-
void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
79+
void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
8280
{
83-
USBHAL_Private_t *priv=((USBHAL_Private_t *)(hpcd->pData));
84-
USBHAL *obj= priv->inst;
81+
USBHAL_Private_t *priv = ((USBHAL_Private_t *)(hpcd->pData));
82+
USBHAL *obj = priv->inst;
8583
USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;
8684
uint32_t sofnum = (USBx_DEVICE->DSTS & USB_OTG_DSTS_FNSOF) >> 8;
8785
void (USBHAL::*func)(int frame) = priv->sof;
@@ -90,8 +88,9 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
9088

9189
USBHAL *USBHAL::instance;
9290

93-
USBHAL::USBHAL(void) {
94-
USBHAL_Private_t *HALPriv = new(USBHAL_Private_t);
91+
USBHAL::USBHAL(void)
92+
{
93+
USBHAL_Private_t *HALPriv = new (USBHAL_Private_t);
9594

9695
memset(&hpcd.Init, 0, sizeof(hpcd.Init));
9796

@@ -215,7 +214,7 @@ USBHAL::USBHAL(void) {
215214
__HAL_RCC_SYSCFG_CLK_ENABLE();
216215

217216
// Configure PCD and FIFOs
218-
hpcd.pData = (void*)HALPriv;
217+
hpcd.pData = (void *)HALPriv;
219218
hpcd.State = HAL_PCD_STATE_RESET;
220219
HAL_PCD_Init(&hpcd);
221220

0 commit comments

Comments
 (0)