qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-25 18:02:49 +02:00
Code

fw/antorcha.c: cleanup

Browse Source 
- rename "param" to send_param"
- move "map" from add_param to compilation unit scope
This commit is contained in:
Werner Almesberger 2012-06-27 03:32:10 -03:00
parent 558f5a7503
commit fe3ff8d5e1
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/antorcha.c
View File

@ -296,28 +296,29 @@ static struct params params = {
.tp_bwd_pix = TP_BWD_PIX_DEFAULT, .tp_bwd_pix = TP_BWD_PIX_DEFAULT,
}; };
static struct map {
const char *name; /* NULL to mark end */
void *p;
int bytes; /* 1, 2, or 4 */
} map[] = {
{ "xa_high", &params.xa_high, 2 },
{ "xa_low", &params.xa_low, 2 },
{ "px_fwd_left", &params.px_fwd_left, 1 },
{ "px_bwd_left", &params.px_bwd_left, 1 },
{ "px_fwd_right", &params.px_fwd_right, 1 },
{ "px_bwd_right", &params.px_bwd_right, 1 },
{ "tp_fwd_start", &params.tp_fwd_start, 4 },
{ "tp_bwd_start", &params.tp_bwd_start, 4 },
{ "tp_fwd_pix", &params.tp_fwd_pix, 2 },
{ "tp_bwd_pix", &params.tp_bwd_pix, 2 },
{ NULL }
};
static int have_params = 0; static int have_params = 0;
static void add_param(const char *arg, const char *eq) static void add_param(const char *arg, const char *eq)
{ {
struct map {
const char *name; /* NULL to mark end */
void *p;
int bytes; /* 1, 2, or 4 */
} map[] = {
{ "xa_high", &params.xa_high, 2 },
{ "xa_low", &params.xa_low, 2 },
{ "px_fwd_left", &params.px_fwd_left, 1 },
{ "px_bwd_left", &params.px_bwd_left, 1 },
{ "px_fwd_right", &params.px_fwd_right, 1 },
{ "px_bwd_right", &params.px_bwd_right, 1 },
{ "tp_fwd_start", &params.tp_fwd_start, 4 },
{ "tp_bwd_start", &params.tp_bwd_start, 4 },
{ "tp_fwd_pix", &params.tp_fwd_pix, 2 },
{ "tp_bwd_pix", &params.tp_bwd_pix, 2 },
{ NULL }
};
const struct map *m; const struct map *m;
size_t len; size_t len;
unsigned long v; unsigned long v;
@ -355,7 +356,7 @@ static void add_param(const char *arg, const char *eq)
} }
static void param(struct atrf_dsc *dsc) static void send_param(struct atrf_dsc *dsc)
{ {
uint8_t payload[PAYLOAD]; uint8_t payload[PAYLOAD];
@ -550,7 +551,7 @@ int main(int argc, char **argv)
usage(*argv); usage(*argv);
if (optind != argc) if (optind != argc)
image(dsc, argv[optind]); image(dsc, argv[optind]);
param(dsc); send_param(dsc);
} }
return 0; return 0;