Skip to content

Commit 802d18e

Browse files
committed
Fix a build issue
1 parent 601b134 commit 802d18e

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

TESTS/mbed_hal/common_tickers/main.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,7 @@ extern "C" {
4848
#define TICKER_100_TICKS 100
4949
#define TICKER_500_TICKS 500
5050

51-
5251
#define MAX_FUNC_EXEC_TIME_US 30
53-
54-
/* On CC3220SF, each write/read register access takes 800us. This is HW limitation, per TI,
55-
* http://e2e.ti.com/support/wireless_connectivity/simplelink_wifi_cc31xx_cc32xx/f/968/p/714873/2635552#2635552
56-
*/
57-
#ifdef TARGET_TI
58-
#define TI_MAX_SET_INTERRUPT_EXEC_TIME_US 3400
59-
#define TI_MAX_DISABLE_INTERRUPT_EXEC_TIME_US 2000
60-
#endif
61-
6252
#define DELTA_FUNC_EXEC_TIME_US 5
6353
#define NUM_OF_CALLS 100
6454

components/storage/blockdevice/COMPONENT_SD/mbed_lib.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,7 @@
164164
"SPI_MOSI": "D11",
165165
"SPI_MISO": "D12",
166166
"SPI_CLK": "D13",
167-
"SPI_CS": "D9"
168-
},
169-
"NUCLEO_F207ZG": {
170-
"SPI_MOSI": "PC_12",
171-
"SPI_MISO": "PC_11",
172-
"SPI_CLK": "PC_10",
173-
"SPI_CS": "PA_15"
167+
"SPI_CS": "D10"
174168
},
175169
"CC3220SF_LAUNCHXL": {
176170
"SPI_MOSI": "D11",

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/cc3200_simplelink.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ int CC3200_SIMPLELINK::scan(WiFiAccessPoint *res, unsigned count)
378378
while(triggeredScanTrials < MAX_SCAN_ATTEMPTS)
379379
{
380380
/* We wait for one second for the NWP to complete the initiated scan and collect results */
381-
wait(1);
381+
wait_ms(1000);
382382

383383
/* Collect results form one-shot scans.*/
384384
ret = sl_WlanGetNetworkList(0, entries_count, netEntries);

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/cc3200_simplelink.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#ifndef CC3200_SIMPLELINK_H
1919
#define CC3200_SIMPLELINK_H
20+
#include "mbed.h"
2021
#include <assert.h>
2122
#include "nsapi_types.h"
2223
#include "nsapi.h"
@@ -318,7 +319,7 @@ class CC3200_SIMPLELINK
318319
bool _fail;
319320
bool _closed;
320321
nsapi_connection_status_t _connection_status;
321-
Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb;
322+
mbed::Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb;
322323
char _connected_ssid[SL_WLAN_SSID_MAX_LENGTH+1]; /* 32 is what 802.11 defines as longest possible name; +1 for the \0 */
323324
int _connected_channel;
324325
SlWlanNetworkEntry_t netEntries[MAX_SCAN_ENTRIES];

0 commit comments

Comments
 (0)