Skip to content

W
White Rabbit Switch - Software
Commit 0b69e1cd authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

usb-loader: little style review 

Signed-off-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
parent 9fa122e1
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 27 deletions
usb-loader/mch_flasher.c
View file @ 0b69e1cd
......@@ -568,14 +568,26 @@ main(int argc, char *argv[])
//Parse options
while ((opt = getopt (argc, argv, "m:p:r:ecsh")) != -1)
switch (opt)
{
case 'm': mode_str = optarg; break;
case 'p': serial_port = optarg; break;
case 'e': erase = 1; break;
case 'c': check = 1; break;
case 's': scrub = 1; break;
case 'r': run = 1;sscanf(optarg,"%i", &run_addr); break;
switch (opt) {
case 'm':
mode_str = optarg;
break;
case 'p':
serial_port = optarg;
break;
case 'e':
erase = 1;
break;
case 'c':
check = 1;
break;
case 's':
scrub = 1;
break;
case 'r':
run = 1;
sscanf(optarg,"%i", &run_addr);
break;
case 'h':
case '?':
......@@ -607,11 +619,13 @@ main(int argc, char *argv[])
fprintf(stderr,"Initializing DDR > Done\n\n");
//Obtain the memory type mode
if(strcmp(mode_str,"nand")==0 || strcmp(mode_str,"nf")==0) type=MEMTYPE_NAND;
else if(strcmp(mode_str,"dataflash")==0 || strcmp(mode_str,"df")==0) type=MEMTYPE_DF;
else if(strcmp(mode_str,"ddr")==0 || strcmp(mode_str,"ram")==0) type=MEMTYPE_DDR;
else
{
if(strcmp(mode_str,"nand")==0 || strcmp(mode_str,"nf")==0) {
type=MEMTYPE_NAND;
} else if(strcmp(mode_str,"dataflash")==0 || strcmp(mode_str,"df")==0) {
type=MEMTYPE_DF;
} else if(strcmp(mode_str,"ddr")==0 || strcmp(mode_str,"ram")==0) {
type=MEMTYPE_DDR;
} else {
fprintf(stderr,"Bad memory type %s...\n\n",mode_str);
show_help(serial_port);
return 0;
......@@ -619,13 +633,18 @@ main(int argc, char *argv[])
//Init the memory (except DDR which is already init)
if(type!=MEMTYPE_DDR) memflash_init(type, board_rev);
if(type!=MEMTYPE_DDR)
memflash_init(type, board_rev);
//Run the action
if(erase) mem_full_erase(type);
if(check) mem_check(type);
if(scrub && type==MEMTYPE_NAND) nand_scrub();
if(nFile>0) mem_program(type,nFile,(const sndfile*)&filearray);
if(erase)
mem_full_erase(type);
if(check)
mem_check(type);
if(scrub && type==MEMTYPE_NAND)
nand_scrub();
if(nFile>0)
mem_program(type,nFile,(const sndfile*)&filearray);
if(run)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment