Skip to content

Commit 1532940

Browse files
authored
Fix nanoHAL_Uninitialize for TI SimpleLink (#1709)
***NO_CI***
1 parent 3d8b8f7 commit 1532940

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

targets/TI-SimpleLink/nanoCLR/targetHAL.cpp

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@
1111
#include <nanoHAL_ConfigurationManager.h>
1212
// #include <FreeRTOS.h>
1313

14-
#if (HAL_USE_I2C == TRUE)
14+
#if (HAL_USE_I2C_OPTION == TRUE)
1515
#include <ti/drivers/I2C.h>
1616
#include <win_dev_i2c_native_target.h>
1717
#endif
18-
#if (HAL_USE_SPI == TRUE)
18+
#if (HAL_USE_SPI_OPTION == TRUE)
1919
#include <ti/drivers/SPI.h>
2020
#include <win_dev_spi_native_target.h>
2121
#endif
22+
#if (HAL_USE_SPI == ON)
23+
#include <easylink/EasyLink.h>
24+
#endif
2225

2326
//
2427
// Reboot handlers clean up on reboot
@@ -83,18 +86,18 @@ void nanoHAL_Initialize()
8386

8487
CPU_GPIO_Initialize();
8588

86-
#if (HAL_USE_SPI == TRUE)
89+
#if (HAL_USE_SPI_OPTION == TRUE)
8790
nanoSPI_Initialize();
8891
#endif
8992

9093
// no PAL events required until now
9194
// PalEvent_Initialize();
9295

93-
#if (HAL_USE_I2C == TRUE)
96+
#if (HAL_USE_I2C_OPTION == TRUE)
9497
I2C1_PAL.i2c = NULL;
9598
#endif
9699

97-
#if (HAL_USE_SPI == TRUE)
100+
#if (HAL_USE_SPI_OPTION == TRUE)
98101
SPI1_PAL.masterSpi = NULL;
99102
#endif
100103

@@ -127,20 +130,24 @@ void nanoHAL_Uninitialize()
127130
// TODO need to call this but it's preventing the debug session from starting
128131
// Network_Uninitialize();
129132

130-
#if (HAL_USE_SPI == TRUE)
133+
#if (HAL_USE_SPI_OPTION == TRUE)
131134
nanoSPI_Uninitialize();
132135
#endif
133136

134137
CPU_GPIO_Uninitialize();
135138

136-
#if (HAL_USE_I2C == TRUE)
139+
#if (HAL_USE_I2C_OPTION == TRUE)
137140
I2C_close(I2C1_PAL.i2c);
138141
#endif
139142

140-
#if (HAL_USE_SPI == TRUE)
143+
#if (HAL_USE_SPI_OPTION == TRUE)
141144
SPI_close(SPI1_PAL.masterSpi);
142145
#endif
143146

147+
#if (HAL_USE_EASYLINK == ON)
148+
EasyLink_abort();
149+
#endif
150+
144151
Events_Uninitialize();
145152

146153
HAL_CONTINUATION::Uninitialize();

targets/TI-SimpleLink/nanoCLR/target_platform.h.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
#define SL_APP_SNTP @NF_NETWORKING_SNTP@
1919

2020
// enable I2C
21-
#define HAL_USE_I2C @API_Windows.Devices.I2c@
21+
#define HAL_USE_I2C @HAL_USE_I2C_OPTION@
2222

2323
// enable SPI
24-
#define HAL_USE_SPI @API_Windows.Devices.Spi@
24+
#define HAL_USE_SPI @HAL_USE_SPI_OPTION@
25+
26+
// enable EasyLink
27+
#define HAL_USE_EASYLINK @API_nanoFramework.TI.EasyLink@
2528

2629
#endif /* _TARGET_TI_SIMPLELINK_NANOCLR_H_ */

0 commit comments

Comments
 (0)