Skip to content

Commit 44a4c25

Browse files
tokangasrlubos
authored andcommitted
samples: cellular: modem_shell: Add support for nRF92
Added flagging needed to compile for nRF92. Signed-off-by: Tommi Kangas <tommi.kangas@nordicsemi.no>
1 parent e93e433 commit 44a4c25

6 files changed

Lines changed: 13 additions & 3 deletions

File tree

ext/curl/lib/curl_config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,9 @@
10891089
/* #undef USE_WOLFSSL */
10901090

10911091
/* Version number of package */
1092+
#if !defined(CONFIG_NRF_CURL_INTEGRATION)
10921093
#define VERSION "-"
1094+
#endif
10931095

10941096
/* Define to 1 to provide own prototypes. */
10951097
/* #undef WANT_IDN_PROTOTYPES */

ext/curl/lib/easy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static CURLcode easy_transfer(struct Curl_multi *multi)
586586
while(!done && !mcode) {
587587
int still_running = 0;
588588

589-
#if defined(CONFIG_NRF_IPERF3_INTEGRATION)
589+
#if defined(CONFIG_NRF_CURL_INTEGRATION)
590590
if (multi->kill_signal != NULL) {
591591
int set, res;
592592

ext/curl/tool/tool_main.c

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

3535
#if defined(CONFIG_NRF_CURL_INTEGRATION)
3636
#if defined (CONFIG_NRF_MODEM_LIB_TRACE)
37-
/* NRF_IPERF3_INTEGRATION_CHANGE: added */
37+
/* NRF_CURL_INTEGRATION_CHANGE: added */
3838
#include <nrf_modem_at.h>
3939
#endif
4040
#endif

ext/curl/tool/tool_operate.c

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

8888
#if defined(CONFIG_NRF_CURL_INTEGRATION)
8989
#if defined (CONFIG_NRF_MODEM_LIB_TRACE)
90-
/* NRF_IPERF3_INTEGRATION_CHANGE: added */
90+
/* NRF_CURL_INTEGRATION_CHANGE: added */
9191
#include <nrf_modem_at.h>
9292
#endif
9393
#endif

ext/iperf3/iperf_config.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@
127127
#define STDC_HEADERS 1
128128

129129
/* Version number of package */
130+
#if !defined(CONFIG_NRF_IPERF3_INTEGRATION)
130131
#define VERSION "3.9"
131132
#define IPERF_VERSION VERSION
133+
#else
134+
#define IPERF_VERSION "3.9"
135+
#endif
132136
/* Define to empty if `const' does not conform to ANSI C. */
133137
/* #undef const */

samples/cellular/modem_shell/src/link/link_shell.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,11 +1749,15 @@ static int link_shell_modem(const struct shell *shell, size_t argc, char **argv)
17491749
break;
17501750
case LINK_SHELL_OPT_MODEM_SYSTEMOFF:
17511751
operation_selected = true;
1752+
#if defined(CONFIG_POWEROFF)
17521753
nrf_modem_at_printf("AT+CFUN=0");
17531754
nrf_modem_lib_shutdown();
17541755
printk("Entering SYSTEMOFF in 1 second, wakeup only with reset\n");
17551756
k_sleep(K_SECONDS(1));
17561757
sys_poweroff();
1758+
#else
1759+
mosh_error("Enable CONFIG_POWEROFF for SYSTEMOFF support");
1760+
#endif
17571761
break;
17581762

17591763
case 'h':

0 commit comments

Comments
 (0)