michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: migrate modem shell to new shell API

Browse source 
Convert modem-shell to use the new shell API.

Signed-off-by: Michael Scott <mike@foundries.io>
This commit is contained in:
Michael Scott 2018-10-19 15:15:44 -07:00 • committed by Anas Nashif
commit 38bdc9f532
2 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/modem/Kconfig
View file

@ -34,7 +34,7 @@ config MODEM_RECEIVER_MAX_CONTEXTS
config MODEM_SHELL config MODEM_SHELL
bool "Enable modem shell utilities" bool "Enable modem shell utilities"
select CONSOLE_SHELL select SHELL
help help
Activate shell module that provides modem utilities like Activate shell module that provides modem utilities like
sending a command to the modem UART. sending a command to the modem UART.

49
drivers/modem/modem_shell.c
View file

@ -10,30 +10,32 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define LOG_MODULE_NAME modem_shell
#include <zephyr.h> #include <zephyr.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <device.h> #include <device.h>
#include <shell/legacy_shell.h> #include <shell/shell.h>
#include <misc/printk.h> #include <misc/printk.h>
#include <drivers/modem/modem_receiver.h> #include <drivers/modem/modem_receiver.h>
#define MODEM_SHELL_MODULE "modem" static int cmd_modem_list(const struct shell *shell, size_t argc,
char *argv[])
int modem_shell_cmd_list(int argc, char *argv[])
{ {
struct mdm_receiver_context *mdm_ctx; struct mdm_receiver_context *mdm_ctx;
int i, count = 0; int i, count = 0;
printk("Modem receivers:\n"); shell_fprintf(shell, SHELL_NORMAL, "Modem receivers:\n");
for (i = 0; i < CONFIG_MODEM_RECEIVER_MAX_CONTEXTS; i++) { for (i = 0; i < CONFIG_MODEM_RECEIVER_MAX_CONTEXTS; i++) {
mdm_ctx = mdm_receiver_context_from_id(i); mdm_ctx = mdm_receiver_context_from_id(i);
if (mdm_ctx) { if (mdm_ctx) {
count++; count++;
printk("%d:\tUART Name: %s\n" shell_fprintf(shell, SHELL_NORMAL,
"%d:\tUART Name: %s\n"
"\tManufacturer: %s\n" "\tManufacturer: %s\n"
"\tModel: %s\n" "\tModel: %s\n"
"\tRevision: %s\n" "\tRevision: %s\n"
@ -49,13 +51,14 @@ int modem_shell_cmd_list(int argc, char *argv[])
} }
if (!count) { if (!count) {
printk("None found.\n"); shell_fprintf(shell, SHELL_NORMAL, "None found.\n");
} }
return 0; return 0;
} }
int modem_shell_cmd_send(int argc, char *argv[]) static int cmd_modem_send(const struct shell *shell, size_t argc,
char *argv[])
{ {
struct mdm_receiver_context *mdm_ctx; struct mdm_receiver_context *mdm_ctx;
char *endptr; char *endptr;
@ -63,27 +66,30 @@ int modem_shell_cmd_send(int argc, char *argv[])
/* list */ /* list */
if (!argv[arg]) { if (!argv[arg]) {
printk("Please enter a modem index\n"); shell_fprintf(shell, SHELL_ERROR,
"Please enter a modem index\n");
return -EINVAL; return -EINVAL;
} }
/* <index> of modem receiver */ /* <index> of modem receiver */
i = (int)strtol(argv[arg], &endptr, 10); i = (int)strtol(argv[arg], &endptr, 10);
if (*endptr != '\0') { if (*endptr != '\0') {
printk("Please enter a modem index\n"); shell_fprintf(shell, SHELL_ERROR,
"Please enter a modem index\n");
return -EINVAL; return -EINVAL;
} }
mdm_ctx = mdm_receiver_context_from_id(i); mdm_ctx = mdm_receiver_context_from_id(i);
if (!mdm_ctx) { if (!mdm_ctx) {
printk("Modem receiver not found!"); shell_fprintf(shell, SHELL_ERROR, "Modem receiver not found!");
return 0; return 0;
} }
for (i = arg + 1; i < argc; i++) { for (i = arg + 1; i < argc; i++) {
ret = mdm_receiver_send(mdm_ctx, argv[i], strlen(argv[i])); ret = mdm_receiver_send(mdm_ctx, argv[i], strlen(argv[i]));
if (ret < 0) { if (ret < 0) {
printk("Error sending '%s': %d\n", argv[i], ret); shell_fprintf(shell, SHELL_ERROR,
"Error sending '%s': %d\n", argv[i], ret);
return 0; return 0;
} }
@ -94,7 +100,9 @@ int modem_shell_cmd_send(int argc, char *argv[])
} }
if (ret < 0) { if (ret < 0) {
printk("Error sending (CRLF or space): %d\n", ret); shell_fprintf(shell, SHELL_ERROR,
"Error sending (CRLF or space): %d\n",
ret);
return 0; return 0;
} }
} }
@ -102,13 +110,12 @@ int modem_shell_cmd_send(int argc, char *argv[])
return 0; return 0;
} }
static struct shell_cmd modem_commands[] = { SHELL_CREATE_STATIC_SUBCMD_SET(sub_modem) {
/* Keep the commands in alphabetical order */ /* Alphabetically sorted. */
{ "list", modem_shell_cmd_list, "\n\tList registered modems" }, SHELL_CMD(list, NULL, "List registered modems", cmd_modem_list),
{ "send", modem_shell_cmd_send, SHELL_CMD(send, NULL, "Send an AT <command> to a registered modem "
"\n\tSend an AT <command> to a registered modem receiver:" "receiver", cmd_modem_send),
"\n\tsend <index> <command>" }, SHELL_SUBCMD_SET_END /* Array terminated. */
{ NULL, NULL, NULL }
}; };
SHELL_REGISTER(MODEM_SHELL_MODULE, modem_commands); SHELL_CMD_REGISTER(modem, &sub_modem, "Modem commands", NULL);