Skip to content

Commit 1c0122b

Browse files
U-ANALOG\BHurstU-ANALOG\BHurst
U-ANALOG\BHurst
authored and
U-ANALOG\BHurst
committed
pre-commit formatting fixes
1 parent 4f87c17 commit 1c0122b

File tree

3 files changed

+36
-40
lines changed

3 files changed

+36
-40
lines changed

‎ports/analog/common-hal/digitalio/DigitalInOut.c‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
5555
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
5656
mxc_gpio_regs_t *port = gpio_ports[self->pin->port];
5757
uint32_t mask = self->pin->mask;
58-
int err=E_NO_ERROR;
58+
int err = E_NO_ERROR;
5959

6060
if (self->pin->port == 4) {
6161
// Set GPIO(s) to input mode
6262
MXC_MCR->gpio4_ctrl &= ~GPIO4_OUTEN_MASK(mask);
6363
MXC_MCR->outen &= ~GPIO4_AFEN_MASK(mask);
64-
}
65-
else {
64+
} else {
6665
err = MXC_GPIO_RevA_SetAF((mxc_gpio_reva_regs_t *)port, MXC_GPIO_FUNC_IN, mask);
6766
}
6867
if (err != E_NO_ERROR) {
@@ -81,8 +80,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
8180
// Set GPIO(s) to output mode
8281
MXC_MCR->gpio4_ctrl |= GPIO4_OUTEN_MASK(mask);
8382
MXC_MCR->outen &= ~GPIO4_AFEN_MASK(mask);
84-
}
85-
else {
83+
} else {
8684
MXC_GPIO_RevA_SetAF((mxc_gpio_reva_regs_t *)port, MXC_GPIO_FUNC_OUT, mask);
8785
}
8886
common_hal_digitalio_digitalinout_set_value(self, value);
@@ -110,17 +108,14 @@ digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
110108
return DIRECTION_OUTPUT;
111109
} else if ((port->en0 & mask) && (port->inen & mask)) {
112110
return DIRECTION_INPUT;
113-
}
114-
// do not try to drive a pin which has an odd configuration here
115-
else {
111+
// do not try to drive a pin which has an odd configuration here
112+
} else {
116113
return DIRECTION_INPUT;
117114
}
118-
}
119-
else {
115+
} else {
120116
if (MXC_MCR->gpio4_ctrl & GPIO4_OUTEN_MASK(mask)) {
121117
return DIRECTION_OUTPUT;
122-
}
123-
else {
118+
} else {
124119
return DIRECTION_INPUT;
125120
}
126121
}
@@ -154,9 +149,9 @@ bool common_hal_digitalio_digitalinout_get_value(digitalio_digitalinout_obj_t *s
154149
if (self->pin->port == 4) {
155150
return (bool)(MXC_MCR->gpio4_ctrl & GPIO4_DATAIN_MASK(mask));
156151
}
157-
return (MXC_GPIO_InGet(port, mask) && mask);
152+
return MXC_GPIO_InGet(port, mask) && mask;
158153
} else {
159-
return (MXC_GPIO_OutGet(port, mask) && mask);
154+
return MXC_GPIO_OutGet(port, mask) && mask;
160155
}
161156
}
162157

@@ -187,8 +182,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
187182
if (self->pin->port == 4) {
188183
MXC_MCR->gpio4_ctrl &= ~(GPIO4_PULLDIS_MASK(mask));
189184
return DIGITALINOUT_OK;
190-
}
191-
else {
185+
} else {
192186
if ((mask & port->en0) & (mask & ~(port->outen))) {
193187
// PULL_NONE, PULL_UP, or PULL_DOWN
194188
switch (pull) {
@@ -208,8 +202,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
208202
break;
209203
}
210204
return DIGITALINOUT_OK;
211-
}
212-
else {
205+
} else {
213206
return DIGITALINOUT_PIN_BUSY;
214207
}
215208
}
@@ -228,9 +221,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
228221
return PULL_DOWN;
229222
} else if (!(pin_padctrl0) && !(pin_padctrl1)) {
230223
return PULL_NONE;
231-
}
232-
// Shouldn't happen, (value 0b11 is reserved)
233-
else {
224+
} else {
234225
return PULL_NONE;
235226
}
236227
}

‎ports/analog/max32_port.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@
2626
#define GPIO4_PIN_MASK 0x00000003
2727
#define GPIO4_RESET_MASK 0xFFFFFF77
2828
#define GPIO4_OUTEN_MASK(mask) \
29-
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_OE_POS) | \
30-
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_OE_POS - 1)))
29+
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_OE_POS) | \
30+
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_OE_POS - 1)))
3131
#define GPIO4_PULLDIS_MASK(mask) \
32-
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_PE_POS) | \
33-
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_PE_POS - 1)))
32+
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_PE_POS) | \
33+
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_PE_POS - 1)))
3434
#define GPIO4_DATAOUT_MASK(mask) \
35-
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_DO_POS) | \
36-
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_DO_POS - 1)))
35+
(((mask & (1 << 0)) << MXC_F_MCR_GPIO4_CTRL_P40_DO_POS) | \
36+
((mask & (1 << 1)) << (MXC_F_MCR_GPIO4_CTRL_P41_DO_POS - 1)))
3737
#define GPIO4_DATAOUT_GET_MASK(mask) \
38-
((((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_DO) >> MXC_F_MCR_GPIO4_CTRL_P40_DO_POS) | \
39-
((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_DO) >> \
40-
(MXC_F_MCR_GPIO4_CTRL_P41_DO_POS - 1))) & \
41-
mask)
38+
((((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_DO) >> MXC_F_MCR_GPIO4_CTRL_P40_DO_POS) | \
39+
((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_DO) >> \
40+
(MXC_F_MCR_GPIO4_CTRL_P41_DO_POS - 1)))& \
41+
mask)
4242
#define GPIO4_DATAIN_MASK(mask) \
43-
((((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_IN) >> MXC_F_MCR_GPIO4_CTRL_P40_IN_POS) | \
44-
((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_IN) >> \
45-
(MXC_F_MCR_GPIO4_CTRL_P41_IN_POS - 1))) & \
46-
mask)
43+
((((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_IN) >> MXC_F_MCR_GPIO4_CTRL_P40_IN_POS) | \
44+
((MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_IN) >> \
45+
(MXC_F_MCR_GPIO4_CTRL_P41_IN_POS - 1)))& \
46+
mask)
4747
#define GPIO4_AFEN_MASK(mask) \
48-
(((mask & (1 << 0)) << MXC_F_MCR_OUTEN_PDOWN_OUT_EN_POS) | \
49-
((mask & (1 << 1)) >> (MXC_F_MCR_OUTEN_SQWOUT_EN_POS + 1)))
48+
(((mask & (1 << 0)) << MXC_F_MCR_OUTEN_PDOWN_OUT_EN_POS) | \
49+
((mask & (1 << 1)) >> (MXC_F_MCR_OUTEN_SQWOUT_EN_POS + 1)))
5050
/** END: GPIO4 Handling specific to MAX32690 */
5151

5252
#endif

‎ports/analog/supervisor/port.c‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,16 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) {
227227

228228
// Enable 1/1024 second tick.
229229
void port_enable_tick(void) {
230-
while ( MXC_RTC_Start() == E_BUSY );
230+
while (MXC_RTC_Start() == E_BUSY) {
231+
;
232+
}
231233
}
232234

233235
// Disable 1/1024 second tick.
234236
void port_disable_tick(void) {
235-
while( MXC_RTC_Stop() == E_BUSY );
237+
while (MXC_RTC_Stop() == E_BUSY) {
238+
;
239+
}
236240
}
237241

238242
// Wake the CPU after a given # of ticks or sooner
@@ -253,7 +257,8 @@ void port_interrupt_after_ticks(uint32_t ticks) {
253257

254258
// Subsec alarm is the starting/reload value of the SSEC counter.
255259
// ISR triggered when SSEC rolls over from 0xFFFF_FFFF to 0x0
256-
while (MXC_RTC_SetSubsecondAlarm(MSEC_TO_SS_ALARM(ticks_msec)) != E_SUCCESS) {}
260+
while (MXC_RTC_SetSubsecondAlarm(MSEC_TO_SS_ALARM(ticks_msec)) != E_SUCCESS) {
261+
}
257262

258263
MXC_RTC_EnableInt(MXC_F_RTC_CTRL_SSEC_ALARM_IE);
259264

0 commit comments

Comments
 (0)