patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

samples: mpu: migrate sample to the new shell

Browse source 
Migrate mpu example to use the new shell.
Fixed scripts/checkpatch.pl warnings.

Signed-off-by: Jakub Rzeszutko <jakub.rzeszutko@nordicsemi.no>
This commit is contained in:
Jakub Rzeszutko 2018-10-15 13:36:23 +02:00 committed by Anas Nashif
parent 9b2475e175
commit 99b5c65edb
3 changed files with 87 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
samples/mpu/mpu_test/prj.conf
View file

@ -1,4 +1,5 @@
CONFIG_CONSOLE_SHELL=y
CONFIG_SHELL=y
CONFIG_LOG=y
### In order to allow the flash device to be written to, this line will
### need to be uncommented. Note that on some devices (MCUX/NXP), this

2
samples/mpu/mpu_test/prj_single.conf
View file

@ -1 +1,3 @@
CONFIG_MULTITHREADING=n
CONFIG_SHELL=y
CONFIG_LOG=y

125
samples/mpu/mpu_test/src/main.c
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2017 Linaro Limited.
* Copyright (c) 2018 Nordic Semiconductor.
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -7,8 +8,12 @@
#include <zephyr.h>
#include <flash.h>
#include <misc/printk.h>
#include <shell/legacy_shell.h>
#include <shell/shell.h>
#define PR_SHELL(shell, fmt, ...) \
shell_fprintf(shell, SHELL_NORMAL, fmt, ##__VA_ARGS__)
#define PR_ERROR(shell, fmt, ...) \
shell_fprintf(shell, SHELL_ERROR, fmt, ##__VA_ARGS__)
/* Assumption: our devices have less than 64MB of memory */
#define RESERVED_MEM_MAP (CONFIG_SRAM_BASE_ADDRESS + 0x4000000)
@ -19,44 +24,56 @@
#define READ_CMD_HELP "Read from a reserved address in the memory map"
#define WRITE_CMD_HELP "Write in to boot FLASH/ROM"
#define RUN_CMD_HELP "Run code located in RAM"
#define MTEST_CMD_HELP "Memory Test writes or reads a memory location"
#define MTEST_CMD_HELP "Memory Test writes or reads a memory location.\n" \
"Command accepts 1 (Read) or 2 (Write) parameters."
static int shell_cmd_read(int argc, char *argv[])
static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
{
ARG_UNUSED(argc);
ARG_UNUSED(argv);
u32_t *p_mem = (u32_t *) RESERVED_MEM_MAP;
if (shell_help_requested(shell)) {
shell_help_print(shell, NULL, 0);
return 0;
}
/* Reads from an address that is reserved in the memory map */
printk("The value is: %d", *p_mem);
PR_SHELL(shell, "The value is: %d\n", *p_mem);
return 0;
}
#if defined(CONFIG_SOC_FLASH_MCUX)
static int shell_cmd_write_mcux(int argc, char *argv[])
static int cmd_write_mcux(const struct shell *shell, size_t argc, char *argv[])
{
ARG_UNUSED(argc);
ARG_UNUSED(argv);
struct device *flash_dev;
u32_t value[2];
u32_t offset;
if (shell_help_requested(shell)) {
shell_help_print(shell, NULL, 0);
return 0;
}
flash_dev = device_get_binding(FLASH_DEV_NAME);
u32_t value[2];
/* 128K reserved to the application */
u32_t offset = FLASH_MEM + 0x20000;
offset = FLASH_MEM + 0x20000;
value[0] = 0xBADC0DE;
value[1] = 0xBADC0DE;
printk("write address: 0x%x\n", offset);
PR_SHELL(shell, "write address: 0x%x\n", offset);
flash_write_protection_set(flash_dev, false);
if (flash_write(flash_dev, offset, value,
sizeof(value)) != 0) {
printk("Flash write failed!\n");
PR_ERROR(shell, "Flash write failed!\n");
return 1;
}
@ -66,25 +83,30 @@ static int shell_cmd_write_mcux(int argc, char *argv[])
}
#elif defined(CONFIG_SOC_FLASH_STM32)
static int shell_cmd_write_stm32(int argc, char *argv[])
static int cmd_write_stm32(const struct shell *shell, size_t argc, char *argv[])
{
ARG_UNUSED(argc);
ARG_UNUSED(argv);
struct device *flash_dev;
if (shell_help_requested(shell)) {
shell_help_print(shell, NULL, 0);
return 0;
}
flash_dev = device_get_binding(FLASH_DEV_NAME);
/* 16K reserved to the application */
u32_t offset = FLASH_MEM + 0x4000;
u32_t value = 0xBADC0DE;
printk("write address: 0x%x\n", offset);
PR_SHELL(shell, "write address: 0x%x\n", offset);
flash_write_protection_set(flash_dev, false);
if (flash_write(flash_dev, offset, &value,
sizeof(value)) != 0) {
printk("Flash write failed!\n");
if (flash_write(flash_dev, offset, &value, sizeof(value)) != 0) {
PR_ERROR(shell, "Flash write failed!\n");
return 1;
}
@ -93,7 +115,7 @@ static int shell_cmd_write_stm32(int argc, char *argv[])
return 0;
}
#else
static int shell_cmd_write(int argc, char *argv[])
static int cmd_write(const struct shell *shell, size_t argc, char *argv[])
{
ARG_UNUSED(argc);
ARG_UNUSED(argv);
@ -101,7 +123,12 @@ static int shell_cmd_write(int argc, char *argv[])
/* 16K reserved to the application */
u32_t *p_mem = (u32_t *) (FLASH_MEM + 0x4000);
printk("write address: 0x%x\n", FLASH_MEM + 0x4000);
if (shell_help_requested(shell)) {
shell_help_print(shell, NULL, 0);
return 0;
}
PR_SHELL(shell, "write address: 0x%x\n", FLASH_MEM + 0x4000);
/* Write in to boot FLASH/ROM */
*p_mem = 0xBADC0DE;
@ -110,32 +137,44 @@ static int shell_cmd_write(int argc, char *argv[])
}
#endif /* SOC_FLASH_MCUX */
static int shell_cmd_run(int argc, char *argv[])
static int cmd_run(const struct shell *shell, size_t argc, char *argv[])
{
ARG_UNUSED(argc);
ARG_UNUSED(argv);
void (*func_ptr)(void) = (void (*)(void)) RAM_MEM;
if (shell_help_requested(shell)) {
shell_help_print(shell, NULL, 0);
return 0;
}
/* Run code located in RAM */
func_ptr();
return 0;
}
static int shell_cmd_mtest(int argc, char *argv[])
static int cmd_mtest(const struct shell *shell, size_t argc, char *argv[])
{
u32_t *mem;
u32_t val;
if (argc > 3) {
printk("mtest accepts 1 (Read) or 2 (Write) parameters\n");
return 1;
PR_ERROR(shell, "mtest accepts 1 (Read) or 2 (Write)"
"parameters\n");
return -EINVAL;
}
u32_t val = (u32_t)strtol(argv[1], NULL, 16);
if (!shell_cmd_precheck(shell, (argc >= 2) && (argc <= 3), NULL, 0)) {
return 0;
}
u32_t *mem = (u32_t *) val;
val = (u32_t)strtol(argv[1], NULL, 16);
mem = (u32_t *) val;
if (argc == 2) {
printk("The value is: 0x%x\n", *mem);
PR_SHELL(shell, "The value is: 0x%x\n", *mem);
} else {
*mem = (u32_t) strtol(argv[2], NULL, 16);
}
@ -143,23 +182,25 @@ static int shell_cmd_mtest(int argc, char *argv[])
return 0;
}
#define SHELL_MODULE "mpu_test"
static struct shell_cmd commands[] = {
{ "read", shell_cmd_read, READ_CMD_HELP},
#if defined(CONFIG_SOC_FLASH_MCUX)
{ "write", shell_cmd_write_mcux, WRITE_CMD_HELP },
#elif defined(CONFIG_SOC_FLASH_STM32)
{ "write", shell_cmd_write_stm32, WRITE_CMD_HELP },
#else
{ "write", shell_cmd_write, WRITE_CMD_HELP },
#endif /* SOC_FLASH_MCUX*/
{ "run", shell_cmd_run, RUN_CMD_HELP },
{ "mtest", shell_cmd_mtest, MTEST_CMD_HELP },
{ NULL, NULL, NULL }
};
void main(void)
{
SHELL_REGISTER(SHELL_MODULE, commands);
}
SHELL_CREATE_STATIC_SUBCMD_SET(sub_mpu)
{
SHELL_CMD(mtest, NULL, MTEST_CMD_HELP, cmd_mtest),
SHELL_CMD(read, NULL, READ_CMD_HELP, cmd_read),
SHELL_CMD(run, NULL, RUN_CMD_HELP, cmd_run),
#if defined(CONFIG_SOC_FLASH_MCUX)
SHELL_CMD(write, NULL, WRITE_CMD_HELP, cmd_write_mcux),
#elif defined(CONFIG_SOC_FLASH_STM32)
SHELL_CMD(write, NULL, WRITE_CMD_HELP, cmd_write_stm32),
#else
SHELL_CMD(write, NULL, WRITE_CMD_HELP, cmd_write),
#endif /* SOC_FLASH_MCUX*/
SHELL_SUBCMD_SET_END /* Array terminated. */
};
SHELL_CMD_REGISTER(mpu, &sub_mpu, "MPU related commands.", NULL);