Skip to content

Commit 8f5a2a5

Browse files
committed
fix indentation and make helpers static inline
1 parent c1d3cb5 commit 8f5a2a5

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

libraries/mbed/common/gpio.c

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,42 @@
1515
*/
1616
#include "gpio_api.h"
1717

18-
#define GPIO_INIT_IN(obj, pin, mode) \
19-
gpio_init(obj, pin), \
20-
gpio_mode(obj, mode), \
21-
gpio_dir(obj, PIN_INPUT)
18+
static inline void _gpio_init_in(gpio_t* gpio, PinName pin, PinMode mode)
19+
{
20+
gpio_init(gpio, pin);
21+
gpio_mode(gpio, mode);
22+
gpio_dir(gpio, PIN_INPUT);
23+
}
2224

23-
#define GPIO_INIT_OUT(obj, pin, mode, value) \
24-
gpio_init(obj, pin), \
25-
gpio_write(obj, value), \
26-
gpio_dir(obj, PIN_OUTPUT), \
27-
gpio_mode(obj, mode)
25+
static inline void _gpio_init_out(gpio_t* gpio, PinName pin, PinMode mode, int value)
26+
{
27+
gpio_init(gpio, pin);
28+
gpio_write(gpio, value);
29+
gpio_dir(gpio, PIN_OUTPUT);
30+
gpio_mode(gpio, mode);
31+
}
2832

2933
void gpio_init_in(gpio_t* gpio, PinName pin) {
3034
gpio_init_in_ex(gpio, pin, PullDefault);
3135
}
3236

3337
void gpio_init_in_ex(gpio_t* gpio, PinName pin, PinMode mode) {
34-
GPIO_INIT_IN(gpio, pin, mode);
38+
_gpio_init_in(gpio, pin, mode);
3539
}
3640

3741
void gpio_init_out(gpio_t* gpio, PinName pin) {
3842
gpio_init_out_ex(gpio, pin, 0);
3943
}
4044

4145
void gpio_init_out_ex(gpio_t* gpio, PinName pin, int value) {
42-
GPIO_INIT_OUT(gpio, pin, PullNone, value);
46+
_gpio_init_out(gpio, pin, PullNone, value);
4347
}
4448

4549
void gpio_init_inout(gpio_t* gpio, PinName pin, PinDirection direction, PinMode mode, int value) {
4650
if (direction == PIN_INPUT) {
47-
GPIO_INIT_IN(gpio, pin, mode);
48-
gpio_write(gpio, value); // we prepare the value in case direction is switched later
51+
_gpio_init_in(gpio, pin, mode);
52+
gpio_write(gpio, value); // we prepare the value in case it is switched later
4953
} else {
50-
GPIO_INIT_OUT(gpio, pin, mode, value);
54+
_gpio_init_out(gpio, pin, mode, value);
5155
}
5256
}

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_UBLOX_C027/platform_init.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ void mbed_sdk_init()
99
gpio_t gpsEn, gpsRst, led, modemRts;
1010

1111
// start with modem disabled
12-
gpio_init_out_ex(&modemEn, MDMEN, PullNone, 0);
13-
gpio_init_out_ex(&modemRst, MDMRST, PullNone, 1);
14-
gpio_init_out_ex(&modemPwrOn, MDMPWRON, PullNone, 1);
15-
gpio_init_out_ex(&modemLvlOe, MDMLVLOE, PullNone, 1);
16-
gpio_init_out_ex(&modemILvlOe, MDMILVLOE, PullNone, 0);
17-
gpio_init_out_ex(&modemUsbDet, MDMUSBDET, PullNone, 0);
18-
gpio_init_out_ex(&modemRts, MDMRTS, PullNone, 0);
12+
gpio_init_out_ex(&modemEn, MDMEN, PullNone, 0);
13+
gpio_init_out_ex(&modemRst, MDMRST, PullNone, 1);
14+
gpio_init_out_ex(&modemPwrOn, MDMPWRON, PullNone, 1);
15+
gpio_init_out_ex(&modemLvlOe, MDMLVLOE, PullNone, 1);
16+
gpio_init_out_ex(&modemILvlOe, MDMILVLOE, PullNone, 0);
17+
gpio_init_out_ex(&modemUsbDet, MDMUSBDET, PullNone, 0);
18+
gpio_init_out_ex(&modemRts, MDMRTS, PullNone, 0);
1919
// start with gps disabled
20-
gpio_init_out_ex(&gpsEn, GPSEN, PullNone, 0);
21-
gpio_init_out_ex(&gpsRst, GPSRST, PullNone, 1);
20+
gpio_init_out_ex(&gpsEn, GPSEN, PullNone, 0);
21+
gpio_init_out_ex(&gpsRst, GPSRST, PullNone, 1);
2222
// led should be off
23-
gpio_init_out_ex(&led, LED, PullNone, 0);
24-
23+
gpio_init_out_ex(&led, LED, PullNone, 0);
24+
2525
wait_ms(50); // when USB cable is inserted the interface chip issues
2626
// multiple resets to the target CPU We wait here for a short period to
2727
// prevent those resets from propagating to the modem and other

0 commit comments

Comments
 (0)