Skip to content

Commit 9c479d2

Browse files
martinlingantoinevg
martinling
authored and
antoinevg
committed
Rename 'struct gpio_t' to 'struct gpio' to distinguish from gpio_t.
1 parent 2a59e05 commit 9c479d2

12 files changed

Lines changed: 128 additions & 128 deletions

File tree

‎firmware/common/gpio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <stdbool.h>
2727

28-
typedef const struct gpio_t* gpio_t;
28+
typedef const struct gpio* gpio_t;
2929

3030
void gpio_init();
3131
void gpio_set(gpio_t gpio);

‎firmware/common/gpio_lpc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* register #defines and API declarations into separate header files.
3333
*/
3434

35-
typedef struct gpio_port_t {
35+
typedef struct gpio_port {
3636
volatile uint32_t dir; /* +0x000 */
3737
uint32_t _reserved0[31];
3838
volatile uint32_t mask; /* +0x080 */
@@ -48,7 +48,7 @@ typedef struct gpio_port_t {
4848
volatile uint32_t not ; /* +0x300 */
4949
} gpio_port_t;
5050

51-
struct gpio_t {
51+
struct gpio {
5252
const uint32_t mask;
5353
gpio_port_t* const port;
5454
volatile uint32_t* const gpio_w;

‎firmware/common/hackrf_core.c‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "gpio_lpc.h"
5252

5353
/* GPIO Output PinMux */
54-
static struct gpio_t gpio_led[] = {
54+
static struct gpio gpio_led[] = {
5555
GPIO(2, 1),
5656
GPIO(2, 2),
5757
GPIO(2, 8),
@@ -65,134 +65,134 @@ static struct gpio_t gpio_led[] = {
6565

6666
// clang-format off
6767
#ifndef PRALINE
68-
static struct gpio_t gpio_1v8_enable = GPIO(3, 6);
68+
static struct gpio gpio_1v8_enable = GPIO(3, 6);
6969
#else
70-
static struct gpio_t gpio_1v2_enable = GPIO(4, 7);
71-
static struct gpio_t gpio_3v3aux_enable_n = GPIO(5, 15);
70+
static struct gpio gpio_1v2_enable = GPIO(4, 7);
71+
static struct gpio gpio_3v3aux_enable_n = GPIO(5, 15);
7272
#endif
7373

7474
/* MAX283x GPIO (XCVR_CTL / CS_XCVR) PinMux */
7575
#ifdef PRALINE
76-
static struct gpio_t gpio_max283x_select = GPIO(6, 28);
76+
static struct gpio gpio_max283x_select = GPIO(6, 28);
7777
#else
78-
static struct gpio_t gpio_max283x_select = GPIO(0, 15);
78+
static struct gpio gpio_max283x_select = GPIO(0, 15);
7979
#endif
8080

8181
/* MAX5864 SPI chip select (AD_CS / CS_AD) GPIO PinMux */
8282
#ifdef PRALINE
83-
static struct gpio_t gpio_max5864_select = GPIO(6, 30);
83+
static struct gpio gpio_max5864_select = GPIO(6, 30);
8484
#else
85-
static struct gpio_t gpio_max5864_select = GPIO(2, 7);
85+
static struct gpio gpio_max5864_select = GPIO(2, 7);
8686
#endif
8787

8888
/* RFFC5071 GPIO serial interface PinMux */
8989
// #ifdef RAD1O
90-
// static struct gpio_t gpio_rffc5072_select = GPIO(2, 13);
91-
// static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6);
92-
// static struct gpio_t gpio_rffc5072_data = GPIO(3, 3);
93-
// static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14);
90+
// static struct gpio gpio_rffc5072_select = GPIO(2, 13);
91+
// static struct gpio gpio_rffc5072_clock = GPIO(5, 6);
92+
// static struct gpio gpio_rffc5072_data = GPIO(3, 3);
93+
// static struct gpio gpio_rffc5072_reset = GPIO(2, 14);
9494
// #endif
9595

9696
/* RF supply (VAA) control */
9797
#ifdef HACKRF_ONE
98-
static struct gpio_t gpio_vaa_disable = GPIO(2, 9);
98+
static struct gpio gpio_vaa_disable = GPIO(2, 9);
9999
#endif
100100
#ifdef PRALINE
101-
static struct gpio_t gpio_vaa_disable = GPIO(4, 1);
101+
static struct gpio gpio_vaa_disable = GPIO(4, 1);
102102
#endif
103103
#ifdef RAD1O
104-
static struct gpio_t gpio_vaa_enable = GPIO(2, 9);
104+
static struct gpio gpio_vaa_enable = GPIO(2, 9);
105105
#endif
106106

107-
static struct gpio_t gpio_w25q80bv_hold = GPIO(1, 14);
108-
static struct gpio_t gpio_w25q80bv_wp = GPIO(1, 15);
109-
static struct gpio_t gpio_w25q80bv_select = GPIO(5, 11);
107+
static struct gpio gpio_w25q80bv_hold = GPIO(1, 14);
108+
static struct gpio gpio_w25q80bv_wp = GPIO(1, 15);
109+
static struct gpio gpio_w25q80bv_select = GPIO(5, 11);
110110

111111
/* RF switch control */
112112
#ifdef HACKRF_ONE
113-
static struct gpio_t gpio_hp = GPIO(2, 0);
114-
static struct gpio_t gpio_lp = GPIO(2, 10);
115-
static struct gpio_t gpio_tx_mix_bp = GPIO(2, 11);
116-
static struct gpio_t gpio_no_mix_bypass = GPIO(1, 0);
117-
static struct gpio_t gpio_rx_mix_bp = GPIO(2, 12);
118-
static struct gpio_t gpio_tx_amp = GPIO(2, 15);
119-
static struct gpio_t gpio_tx = GPIO(5, 15);
120-
static struct gpio_t gpio_mix_bypass = GPIO(5, 16);
121-
static struct gpio_t gpio_rx = GPIO(5, 5);
122-
static struct gpio_t gpio_no_tx_amp_pwr = GPIO(3, 5);
123-
static struct gpio_t gpio_amp_bypass = GPIO(0, 14);
124-
static struct gpio_t gpio_rx_amp = GPIO(1, 11);
125-
static struct gpio_t gpio_no_rx_amp_pwr = GPIO(1, 12);
113+
static struct gpio gpio_hp = GPIO(2, 0);
114+
static struct gpio gpio_lp = GPIO(2, 10);
115+
static struct gpio gpio_tx_mix_bp = GPIO(2, 11);
116+
static struct gpio gpio_no_mix_bypass = GPIO(1, 0);
117+
static struct gpio gpio_rx_mix_bp = GPIO(2, 12);
118+
static struct gpio gpio_tx_amp = GPIO(2, 15);
119+
static struct gpio gpio_tx = GPIO(5, 15);
120+
static struct gpio gpio_mix_bypass = GPIO(5, 16);
121+
static struct gpio gpio_rx = GPIO(5, 5);
122+
static struct gpio gpio_no_tx_amp_pwr = GPIO(3, 5);
123+
static struct gpio gpio_amp_bypass = GPIO(0, 14);
124+
static struct gpio gpio_rx_amp = GPIO(1, 11);
125+
static struct gpio gpio_no_rx_amp_pwr = GPIO(1, 12);
126126
#endif
127127
#ifdef RAD1O
128-
static struct gpio_t gpio_tx_rx_n = GPIO(1, 11);
129-
static struct gpio_t gpio_tx_rx = GPIO(0, 14);
130-
static struct gpio_t gpio_by_mix = GPIO(1, 12);
131-
static struct gpio_t gpio_by_mix_n = GPIO(2, 10);
132-
static struct gpio_t gpio_by_amp = GPIO(1, 0);
133-
static struct gpio_t gpio_by_amp_n = GPIO(5, 5);
134-
static struct gpio_t gpio_mixer_en = GPIO(5, 16);
135-
static struct gpio_t gpio_low_high_filt = GPIO(2, 11);
136-
static struct gpio_t gpio_low_high_filt_n = GPIO(2, 12);
137-
static struct gpio_t gpio_tx_amp = GPIO(2, 15);
138-
static struct gpio_t gpio_rx_lna = GPIO(5, 15);
128+
static struct gpio gpio_tx_rx_n = GPIO(1, 11);
129+
static struct gpio gpio_tx_rx = GPIO(0, 14);
130+
static struct gpio gpio_by_mix = GPIO(1, 12);
131+
static struct gpio gpio_by_mix_n = GPIO(2, 10);
132+
static struct gpio gpio_by_amp = GPIO(1, 0);
133+
static struct gpio gpio_by_amp_n = GPIO(5, 5);
134+
static struct gpio gpio_mixer_en = GPIO(5, 16);
135+
static struct gpio gpio_low_high_filt = GPIO(2, 11);
136+
static struct gpio gpio_low_high_filt_n = GPIO(2, 12);
137+
static struct gpio gpio_tx_amp = GPIO(2, 15);
138+
static struct gpio gpio_rx_lna = GPIO(5, 15);
139139
#endif
140140
#ifdef PRALINE
141-
static struct gpio_t gpio_tx_en = GPIO(3, 4);
142-
static struct gpio_t gpio_mix_en_n = GPIO(3, 2);
143-
static struct gpio_t gpio_mix_en_n_r1_0 = GPIO(5, 6);
144-
static struct gpio_t gpio_lpf_en = GPIO(4, 8);
145-
static struct gpio_t gpio_rf_amp_en = GPIO(4, 9);
146-
static struct gpio_t gpio_ant_bias_en_n = GPIO(1, 12);
141+
static struct gpio gpio_tx_en = GPIO(3, 4);
142+
static struct gpio gpio_mix_en_n = GPIO(3, 2);
143+
static struct gpio gpio_mix_en_n_r1_0 = GPIO(5, 6);
144+
static struct gpio gpio_lpf_en = GPIO(4, 8);
145+
static struct gpio gpio_rf_amp_en = GPIO(4, 9);
146+
static struct gpio gpio_ant_bias_en_n = GPIO(1, 12);
147147
#endif
148148

149149
/* CPLD JTAG interface GPIO pins, FPGA config pins in Praline */
150-
static struct gpio_t gpio_cpld_tck = GPIO(3, 0);
150+
static struct gpio gpio_cpld_tck = GPIO(3, 0);
151151
#ifdef PRALINE
152-
static struct gpio_t gpio_fpga_cfg_creset = GPIO(2, 11);
153-
static struct gpio_t gpio_fpga_cfg_cdone = GPIO(5, 14);
154-
static struct gpio_t gpio_fpga_cfg_spi_cs = GPIO(2, 10);
152+
static struct gpio gpio_fpga_cfg_creset = GPIO(2, 11);
153+
static struct gpio gpio_fpga_cfg_cdone = GPIO(5, 14);
154+
static struct gpio gpio_fpga_cfg_spi_cs = GPIO(2, 10);
155155
#else
156-
static struct gpio_t gpio_cpld_tdo = GPIO(5, 18);
156+
static struct gpio gpio_cpld_tdo = GPIO(5, 18);
157157
#if (defined HACKRF_ONE || defined RAD1O)
158-
static struct gpio_t gpio_cpld_tms = GPIO(3, 4);
159-
static struct gpio_t gpio_cpld_tdi = GPIO(3, 1);
158+
static struct gpio gpio_cpld_tms = GPIO(3, 4);
159+
static struct gpio gpio_cpld_tdi = GPIO(3, 1);
160160
#else
161-
static struct gpio_t gpio_cpld_tms = GPIO(3, 1);
162-
static struct gpio_t gpio_cpld_tdi = GPIO(3, 4);
161+
static struct gpio gpio_cpld_tms = GPIO(3, 1);
162+
static struct gpio gpio_cpld_tdi = GPIO(3, 4);
163163
#endif
164164
#endif
165165

166166
#if (defined HACKRF_ONE || defined PRALINE)
167-
static struct gpio_t gpio_cpld_pp_tms = GPIO(1, 1);
168-
static struct gpio_t gpio_cpld_pp_tdo = GPIO(1, 8);
167+
static struct gpio gpio_cpld_pp_tms = GPIO(1, 1);
168+
static struct gpio gpio_cpld_pp_tdo = GPIO(1, 8);
169169
#endif
170170

171171
/* other CPLD interface GPIO pins */
172172
#ifndef PRALINE
173-
static struct gpio_t gpio_trigger_enable = GPIO(5, 12);
173+
static struct gpio gpio_trigger_enable = GPIO(5, 12);
174174
#endif
175-
static struct gpio_t gpio_q_invert = GPIO(0, 13);
175+
static struct gpio gpio_q_invert = GPIO(0, 13);
176176

177177
/* HackRF One r9 */
178178
#ifdef HACKRF_ONE
179-
static struct gpio_t gpio_h1r9_rx = GPIO(0, 7);
180-
static struct gpio_t gpio_h1r9_1v8_enable = GPIO(2, 9);
181-
static struct gpio_t gpio_h1r9_vaa_disable = GPIO(3, 6);
182-
static struct gpio_t gpio_h1r9_trigger_enable = GPIO(5, 5);
179+
static struct gpio gpio_h1r9_rx = GPIO(0, 7);
180+
static struct gpio gpio_h1r9_1v8_enable = GPIO(2, 9);
181+
static struct gpio gpio_h1r9_vaa_disable = GPIO(3, 6);
182+
static struct gpio gpio_h1r9_trigger_enable = GPIO(5, 5);
183183
#endif
184184

185185
#ifdef PRALINE
186-
static struct gpio_t gpio_p2_ctrl0 = GPIO(7, 3);
187-
static struct gpio_t gpio_p2_ctrl1 = GPIO(7, 4);
188-
static struct gpio_t gpio_p1_ctrl0 = GPIO(0, 14);
189-
static struct gpio_t gpio_p1_ctrl1 = GPIO(5, 16);
190-
static struct gpio_t gpio_p1_ctrl2 = GPIO(3, 5);
191-
static struct gpio_t gpio_clkin_ctrl = GPIO(0, 15);
192-
static struct gpio_t gpio_aa_en = GPIO(1, 7);
193-
static struct gpio_t gpio_trigger_in = GPIO(6, 26);
194-
static struct gpio_t gpio_trigger_out = GPIO(5, 6);
195-
static struct gpio_t gpio_pps_out = GPIO(5, 5);
186+
static struct gpio gpio_p2_ctrl0 = GPIO(7, 3);
187+
static struct gpio gpio_p2_ctrl1 = GPIO(7, 4);
188+
static struct gpio gpio_p1_ctrl0 = GPIO(0, 14);
189+
static struct gpio gpio_p1_ctrl1 = GPIO(5, 16);
190+
static struct gpio gpio_p1_ctrl2 = GPIO(3, 5);
191+
static struct gpio gpio_clkin_ctrl = GPIO(0, 15);
192+
static struct gpio gpio_aa_en = GPIO(1, 7);
193+
static struct gpio gpio_trigger_in = GPIO(6, 26);
194+
static struct gpio gpio_trigger_out = GPIO(5, 6);
195+
static struct gpio gpio_pps_out = GPIO(5, 5);
196196
#endif
197197
// clang-format on
198198

@@ -247,10 +247,10 @@ const ssp_config_t ssp_config_max283x = {
247247
.gpio_select = &gpio_max283x_select,
248248
};
249249

250-
static struct gpio_t gpio_max2831_enable = GPIO(7, 1);
251-
static struct gpio_t gpio_max2831_rx_enable = GPIO(7, 2);
252-
static struct gpio_t gpio_max2831_rxhp = GPIO(6, 29);
253-
static struct gpio_t gpio_max2831_ld = GPIO(4, 11);
250+
static struct gpio gpio_max2831_enable = GPIO(7, 1);
251+
static struct gpio gpio_max2831_rx_enable = GPIO(7, 2);
252+
static struct gpio gpio_max2831_rxhp = GPIO(6, 29);
253+
static struct gpio gpio_max2831_ld = GPIO(4, 11);
254254

255255
max2831_driver_t max283x = {
256256
.bus = &spi_bus_ssp1,

‎firmware/common/max283x.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333

3434
extern spi_bus_t spi_bus_ssp1;
3535
#ifdef PRALINE
36-
static struct gpio_t gpio_max2837_enable = GPIO(6, 29);
37-
static struct gpio_t gpio_max2837_rx_enable = GPIO(3, 3);
38-
static struct gpio_t gpio_max2837_tx_enable = GPIO(3, 2);
36+
static struct gpio gpio_max2837_enable = GPIO(6, 29);
37+
static struct gpio gpio_max2837_rx_enable = GPIO(3, 3);
38+
static struct gpio gpio_max2837_tx_enable = GPIO(3, 2);
3939
#else
40-
static struct gpio_t gpio_max2837_enable = GPIO(2, 6);
41-
static struct gpio_t gpio_max2837_rx_enable = GPIO(2, 5);
42-
static struct gpio_t gpio_max2837_tx_enable = GPIO(2, 4);
40+
static struct gpio gpio_max2837_enable = GPIO(2, 6);
41+
static struct gpio gpio_max2837_rx_enable = GPIO(2, 5);
42+
static struct gpio gpio_max2837_tx_enable = GPIO(2, 4);
4343
#endif
4444

4545
max2837_driver_t max2837 = {

‎firmware/common/mixer.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828
/* RFFC5071 GPIO serial interface PinMux */
2929
// clang-format off
3030
#if (defined JAWBREAKER || defined HACKRF_ONE)
31-
static struct gpio_t gpio_rffc5072_select = GPIO(2, 13);
32-
static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6);
33-
static struct gpio_t gpio_rffc5072_data = GPIO(3, 3);
34-
static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14);
31+
static struct gpio gpio_rffc5072_select = GPIO(2, 13);
32+
static struct gpio gpio_rffc5072_clock = GPIO(5, 6);
33+
static struct gpio gpio_rffc5072_data = GPIO(3, 3);
34+
static struct gpio gpio_rffc5072_reset = GPIO(2, 14);
3535
#endif
3636
#ifdef RAD1O
37-
static struct gpio_t gpio_vco_ce = GPIO(2, 13);
38-
static struct gpio_t gpio_vco_sclk = GPIO(5, 6);
39-
static struct gpio_t gpio_vco_sdata = GPIO(3, 3);
40-
static struct gpio_t gpio_vco_le = GPIO(2, 14);
41-
static struct gpio_t gpio_vco_mux = GPIO(5, 25);
42-
static struct gpio_t gpio_synt_rfout_en = GPIO(3, 5);
37+
static struct gpio gpio_vco_ce = GPIO(2, 13);
38+
static struct gpio gpio_vco_sclk = GPIO(5, 6);
39+
static struct gpio gpio_vco_sdata = GPIO(3, 3);
40+
static struct gpio gpio_vco_le = GPIO(2, 14);
41+
static struct gpio gpio_vco_mux = GPIO(5, 25);
42+
static struct gpio gpio_synt_rfout_en = GPIO(3, 5);
4343
#endif
4444
#ifdef PRALINE
45-
static struct gpio_t gpio_rffc5072_select = GPIO(2, 13);
46-
static struct gpio_t gpio_rffc5072_clock = GPIO(5, 18);
47-
static struct gpio_t gpio_rffc5072_data = GPIO(4, 14);
48-
static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14);
49-
static struct gpio_t gpio_rffc5072_ld = GPIO(6, 25);
45+
static struct gpio gpio_rffc5072_select = GPIO(2, 13);
46+
static struct gpio gpio_rffc5072_clock = GPIO(5, 18);
47+
static struct gpio gpio_rffc5072_data = GPIO(4, 14);
48+
static struct gpio gpio_rffc5072_reset = GPIO(2, 14);
49+
static struct gpio gpio_rffc5072_ld = GPIO(6, 25);
5050
#endif
5151
// clang-format on
5252

‎firmware/common/operacake.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ uint16_t gpio_test(uint8_t address)
393393
scu_pinmux(SCU_PINMUX_GPIO3_14, SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
394394
scu_pinmux(SCU_PINMUX_GPIO3_15, SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
395395

396-
static struct gpio_t gpio_pins[] = {
396+
static struct gpio gpio_pins[] = {
397397
GPIO(3, 8), // u1ctrl IO2
398398
GPIO(3, 14), // u3ctrl0 IO3
399399
GPIO(3, 15), // u3ctrl1 IO4

‎firmware/common/platform_detect.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
static board_id_t platform = BOARD_ID_UNDETECTED;
3131
static board_rev_t revision = BOARD_REV_UNDETECTED;
3232

33-
static struct gpio_t gpio2_9_on_P5_0 = GPIO(2, 9);
34-
static struct gpio_t gpio3_6_on_P6_10 = GPIO(3, 6);
35-
static struct gpio_t gpio3_4_on_P6_5 = GPIO(3, 4);
36-
static struct gpio_t gpio2_6_on_P4_6 = GPIO(2, 6);
33+
static struct gpio gpio2_9_on_P5_0 = GPIO(2, 9);
34+
static struct gpio gpio3_6_on_P6_10 = GPIO(3, 6);
35+
static struct gpio gpio3_4_on_P6_5 = GPIO(3, 4);
36+
static struct gpio gpio2_6_on_P4_6 = GPIO(2, 6);
3737

3838
#define P5_0_PUP (1 << 0)
3939
#define P5_0_PDN (1 << 1)
@@ -60,9 +60,9 @@ static struct gpio_t gpio2_6_on_P4_6 = GPIO(2, 6);
6060
* hardware detection failure, but three LEDs are flashed if CPLD/FPGA configuration
6161
* fails.
6262
*/
63-
static struct gpio_t gpio_led1 = GPIO(2, 1);
64-
static struct gpio_t gpio_led2 = GPIO(2, 2);
65-
static struct gpio_t gpio_led3 = GPIO(2, 8);
63+
static struct gpio gpio_led1 = GPIO(2, 1);
64+
static struct gpio gpio_led2 = GPIO(2, 2);
65+
static struct gpio gpio_led3 = GPIO(2, 8);
6666

6767
/*
6868
* Starting with r6, HackRF One has pin straps on ADC pins that indicate

‎firmware/common/portapack.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ static void portapack_sleep_milliseconds(const uint32_t milliseconds)
3434
}
3535

3636
// clang-format off
37-
static struct gpio_t gpio_io_stbx = GPIO(5, 0); /* P2_0 */
38-
static struct gpio_t gpio_addr = GPIO(5, 1); /* P2_1 */
37+
static struct gpio gpio_io_stbx = GPIO(5, 0); /* P2_0 */
38+
static struct gpio gpio_addr = GPIO(5, 1); /* P2_1 */
3939
__attribute__((unused))
40-
static struct gpio_t gpio_lcd_te = GPIO(5, 3); /* P2_3 */
40+
static struct gpio gpio_lcd_te = GPIO(5, 3); /* P2_3 */
4141
__attribute__((unused))
42-
static struct gpio_t gpio_unused = GPIO(5, 7); /* P2_8 */
43-
static struct gpio_t gpio_lcd_rdx = GPIO(5, 4); /* P2_4 */
44-
static struct gpio_t gpio_lcd_wrx = GPIO(1, 10); /* P2_9 */
45-
static struct gpio_t gpio_dir = GPIO(1, 13); /* P2_13 */
42+
static struct gpio gpio_unused = GPIO(5, 7); /* P2_8 */
43+
static struct gpio gpio_lcd_rdx = GPIO(5, 4); /* P2_4 */
44+
static struct gpio gpio_lcd_wrx = GPIO(1, 10); /* P2_9 */
45+
static struct gpio gpio_dir = GPIO(1, 13); /* P2_13 */
4646

4747
// clang-format on
4848

‎firmware/common/rad1o/display.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ static void delayms(const uint32_t milliseconds)
1616
delay(milliseconds * 40800);
1717
}
1818

19-
static struct gpio_t gpio_lcd_cs = GPIO(4, 12); /* P9_0 */
20-
static struct gpio_t gpio_lcd_bl_en = GPIO(0, 8); /* P1_1 */
21-
static struct gpio_t gpio_lcd_reset = GPIO(5, 17); /* P9_4 */
19+
static struct gpio gpio_lcd_cs = GPIO(4, 12); /* P9_0 */
20+
static struct gpio gpio_lcd_bl_en = GPIO(0, 8); /* P1_1 */
21+
static struct gpio gpio_lcd_reset = GPIO(5, 17); /* P9_4 */
2222

2323
/**************************************************************************/
2424
/* Utility routines to manage nokia display */

0 commit comments

Comments
 (0)