sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/dac/dac_main.c: Fix warning found in build testing. Also lots of coding standard violations.

Browse Source
This commit is contained in:
Gregory Nutt 2019-07-28 17:52:28 -06:00
parent 9e1cda95fb
commit b3c705d70c
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
examples/dac/dac_main.c
View File

@ -74,14 +74,14 @@
struct command struct command
{ {
const char *name; FAR const char *name;
int (* const cmd)(int argc, const char *argv[]); CODE int (* const cmd)(int argc, const char *argv[]);
const char *args; const char *args;
}; };
struct dac_state_s struct dac_state_s
{ {
char *devpath; FAR char *devpath;
int count; int count;
int delay; int delay;
uint8_t channel; uint8_t channel;
@ -92,8 +92,8 @@ struct dac_state_s
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
static int cmd_dac_put(int argc, const char *argv[]); static int cmd_dac_put(int argc, FAR const char *argv[]);
static int cmd_dac_putv(int argc, const char *argv[]); static int cmd_dac_putv(int argc, FAR const char *argv[]);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -111,8 +111,8 @@ static struct dac_state_s g_dacstate;
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
static void dac_devpath(struct dac_state_s *dac, static void dac_devpath(FAR struct dac_state_s *dac,
const char *devpath) FAR const char *devpath)
{ {
if (dac->devpath) if (dac->devpath)
{ {
@ -122,10 +122,10 @@ static void dac_devpath(struct dac_state_s *dac,
dac->devpath = strdup(devpath); dac->devpath = strdup(devpath);
} }
static void print_cmds(const char *header, static void print_cmds(FAR const char *header,
const struct command *cmds, FAR const struct command *cmds,
size_t ncmds, size_t ncmds,
const char *trailer) FAR const char *trailer)
{ {
printf(header); printf(header);
while (ncmds--) while (ncmds--)
@ -134,11 +134,12 @@ static void print_cmds(const char *header,
(ncmds > 0) ? '\n' : ' '); (ncmds > 0) ? '\n' : ' ');
cmds++; cmds++;
} }
printf(trailer); printf(trailer);
} }
static const struct command *find_cmd(const char *name, static const struct command *find_cmd(FAR const char *name,
const struct command *cmds, FAR const struct command *cmds,
size_t ncmds) size_t ncmds)
{ {
while (ncmds--) while (ncmds--)
@ -147,18 +148,19 @@ static const struct command *find_cmd(const char *name,
{ {
return cmds; return cmds;
} }
cmds++;
cmds++;
} }
return NULL; return NULL;
} }
static int execute_cmd(int argc, static int execute_cmd(int argc,
const char *argv[], FAR const char *argv[],
const struct command *cmds, FAR const struct command *cmds,
size_t ncmds) size_t ncmds)
{ {
const struct command *cmd; FAR const struct command *cmd;
cmd = find_cmd(argv[0], cmds, ncmds); cmd = find_cmd(argv[0], cmds, ncmds);
if (!cmd) if (!cmd)
@ -168,16 +170,18 @@ static int execute_cmd(int argc,
return -EINVAL; return -EINVAL;
} }
return cmd->cmd(argc-1, argv+1); return cmd->cmd(argc - 1, argv + 1);
} }
static int dac_put(const char *devpath, static int dac_put(FAR const char *devpath,
struct dac_msg_s *msg, FAR struct dac_msg_s *msg,
size_t nmsgs, size_t nmsgs,
int delay) int delay)
{ {
size_t retries, i; size_t retries;
int fd, ret; size_t i;
int fd;
int ret = OK;
fd = open(devpath, O_WRONLY | O_NONBLOCK); fd = open(devpath, O_WRONLY | O_NONBLOCK);
if (fd < 0) if (fd < 0)
@ -218,15 +222,17 @@ static int dac_put(const char *devpath,
return (i > 0) ? i : ret; return (i > 0) ? i : ret;
} }
static int cmd_dac_put(int argc, const char *argv[]) static int cmd_dac_put(int argc, FAR const char *argv[])
{ {
int i, data, delay;
struct dac_msg_s msgs[1]; struct dac_msg_s msgs[1];
int data;
int delay;
int i;
int ret = OK; int ret = OK;
/* This command allows overriding the "sticky" delay option. */ /* This command allows overriding the "sticky" delay option. */
data = (argc > 0) ? atoi(argv[0]) : 100; data = (argc > 0) ? atoi(argv[0]) : 100;
delay = (argc > 1) ? atoi(argv[1]) : g_dacstate.delay; delay = (argc > 1) ? atoi(argv[1]) : g_dacstate.delay;
printf("devpath=%s data=%d delay=%d\n", printf("devpath=%s data=%d delay=%d\n",
@ -243,10 +249,11 @@ static int cmd_dac_put(int argc, const char *argv[])
return ret; return ret;
} }
static int cmd_dac_putv(int argc, const char *argv[]) static int cmd_dac_putv(int argc, FAR const char *argv[])
{ {
int i, nmsgs;
struct dac_msg_s msgs[CONFIG_NSH_MAXARGUMENTS]; struct dac_msg_s msgs[CONFIG_NSH_MAXARGUMENTS];
int nmsgs;
int i;
int ret = OK; int ret = OK;
for (nmsgs = 0; nmsgs < CONFIG_NSH_MAXARGUMENTS; nmsgs++) for (nmsgs = 0; nmsgs < CONFIG_NSH_MAXARGUMENTS; nmsgs++)
@ -255,6 +262,7 @@ static int cmd_dac_putv(int argc, const char *argv[])
{ {
break; break;
} }
msgs[nmsgs].am_channel = g_dacstate.channel; msgs[nmsgs].am_channel = g_dacstate.channel;
msgs[nmsgs].am_data = atoi(argv[nmsgs]); msgs[nmsgs].am_data = atoi(argv[nmsgs]);
} }
@ -289,9 +297,9 @@ static void dac_help(void)
#endif #endif
#ifdef CONFIG_NSH_BUILTIN_APPS #ifdef CONFIG_NSH_BUILTIN_APPS
static int arg_string(const char **arg, const char **value) static int arg_string(FAR const char **arg, FAR const char **value)
{ {
const char *ptr = *arg; FAR const char *ptr = *arg;
if (ptr[2] == '\0') if (ptr[2] == '\0')
{ {
@ -307,9 +315,9 @@ static int arg_string(const char **arg, const char **value)
#endif #endif
#ifdef CONFIG_NSH_BUILTIN_APPS #ifdef CONFIG_NSH_BUILTIN_APPS
static int arg_decimal(const char **arg, long *value) static int arg_decimal(FAR const char **arg, FAR long *value)
{ {
const char *string; FAR const char *string;
int ret; int ret;
ret = arg_string(arg, &string); ret = arg_string(arg, &string);
@ -319,14 +327,16 @@ static int arg_decimal(const char **arg, long *value)
#endif #endif
#ifdef CONFIG_NSH_BUILTIN_APPS #ifdef CONFIG_NSH_BUILTIN_APPS
static int parse_args(struct dac_state_s *dac, static int parse_args(FAR struct dac_state_s *dac,
int argc, int argc,
const char *argv[]) const char *argv[])
{ {
const char *ptr; FAR const char *ptr;
const char *str; FAR const char *str;
long value; long value;
int i, n, nargs; int nargs;
int n;
int i;
for (i = n = 1; i < argc; ) for (i = n = 1; i < argc; )
{ {
@ -392,6 +402,7 @@ static int parse_args(struct dac_state_s *dac,
exit(1); exit(1);
} }
} }
return n; return n;
} }
#endif #endif
@ -400,7 +411,7 @@ static int parse_args(struct dac_state_s *dac,
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
int dac_main(int argc, const char *argv[]) int dac_main(int argc, FAR const char *argv[])
{ {
int ret; int ret;
int nargs = 1; int nargs = 1;
@ -414,8 +425,8 @@ int dac_main(int argc, const char *argv[])
/* Set the default values */ /* Set the default values */
dac_devpath(&g_dacstate, CONFIG_EXAMPLES_DAC_DEVPATH); dac_devpath(&g_dacstate, CONFIG_EXAMPLES_DAC_DEVPATH);
g_dacstate.count = 1; g_dacstate.count = 1;
g_dacstate.channel = 0; /* This seems to be ignored by driver. */ g_dacstate.channel = 0; /* This seems to be ignored by driver. */
g_dacstate.initialized = true; g_dacstate.initialized = true;
} }