Skip to content

Commit 0f08b35

Browse files
author
Jarkko Paso
committed
S2-LP: Renamed GPIO to RF_S2LP_GPIO as it had conflict with some platforms
1 parent 2cb017b commit 0f08b35

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
#define INTERRUPT_GPIO S2LP_GPIO3
3232

3333
#if INTERRUPT_GPIO == S2LP_GPIO0
34-
#define INT_IN_GPIO rf->GPIO0
34+
#define INT_IN_GPIO rf->RF_S2LP_GPIO0
3535
#elif INTERRUPT_GPIO == S2LP_GPIO1
36-
#define INT_IN_GPIO rf->GPIO1
36+
#define INT_IN_GPIO rf->RF_S2LP_GPIO1
3737
#elif INTERRUPT_GPIO == S2LP_GPIO2
38-
#define INT_IN_GPIO rf->GPIO2
38+
#define INT_IN_GPIO rf->RF_S2LP_GPIO2
3939
#else
40-
#define INT_IN_GPIO rf->GPIO3
40+
#define INT_IN_GPIO rf->RF_S2LP_GPIO3
4141
#endif
4242

4343
#ifdef TEST_GPIOS_ENABLED
@@ -119,10 +119,10 @@ class RFPins {
119119
DigitalOut TEST4;
120120
DigitalOut TEST5;
121121
#endif //TEST_GPIOS_ENABLED
122-
InterruptIn GPIO0;
123-
InterruptIn GPIO1;
124-
InterruptIn GPIO2;
125-
InterruptIn GPIO3;
122+
InterruptIn RF_S2LP_GPIO0;
123+
InterruptIn RF_S2LP_GPIO1;
124+
InterruptIn RF_S2LP_GPIO2;
125+
InterruptIn RF_S2LP_GPIO3;
126126
Timeout cca_timer;
127127
Timeout backup_timer;
128128
Timer tx_timer;
@@ -150,10 +150,10 @@ RFPins::RFPins(PinName spi_sdi, PinName spi_sdo,
150150
TEST4(spi_test4),
151151
TEST5(spi_test5),
152152
#endif //TEST_GPIOS_ENABLED
153-
GPIO0(spi_gpio0),
154-
GPIO1(spi_gpio1),
155-
GPIO2(spi_gpio2),
156-
GPIO3(spi_gpio3)
153+
RF_S2LP_GPIO0(spi_gpio0),
154+
RF_S2LP_GPIO1(spi_gpio1),
155+
RF_S2LP_GPIO2(spi_gpio2),
156+
RF_S2LP_GPIO3(spi_gpio3)
157157
#ifdef MBED_CONF_RTOS_PRESENT
158158
, irq_thread(osPriorityRealtime, 1024)
159159
#endif //MBED_CONF_RTOS_PRESENT
@@ -974,7 +974,7 @@ static void rf_reset(void)
974974
// Wake up
975975
rf->SDN = 0;
976976
// Wait until GPIO0 (RESETN) goes high
977-
while (rf->GPIO0 == 0);
977+
while (rf->RF_S2LP_GPIO0 == 0);
978978
}
979979

980980
static void rf_init(void)

0 commit comments

Comments
 (0)