--- el3.c.orig Tue Oct 22 01:44:38 1996 +++ el3.c Fri Dec 5 16:40:21 1997 @@ -19,10 +19,23 @@ static char *version = "el3setup.c:v0.10 10/21/96 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; +static char *usage_msg = +"Usage: el3-diag + [ { base-address | p } port ] Specify port to use + [ all | a ] Print all registers. + [ help | h ] Give help + [ interface | f ] Interface number (built-in, AUI) + [ { irq | i } irq ] Interrupt number + [ quiet | q ] Tone down verbosity mode + [ verbose | v ] Verbose mode + [ version | V ] Display version number + [ { write-EEPROM | w } vals ] Write th EEPROMS with the specified vals +"; #include #include #include +#include #include #include #include @@ -30,10 +43,10 @@ struct option longopts[] = { /* { name has_arg *flag val } */ - {"base-address", 1, 0, 'p'}, + {"base-address", 1, 0, 'p'}, {"all", 0, 0, 'a'}, /* Print all registers. */ {"help", 0, 0, 'h'}, /* Give help */ - {"interface", 0, 0, 'f'}, /* Interface number (built-in, AUI) */ + {"interface", 0, 0, 'f'}, /* Interface number (built-in, AUI) */ {"irq", 1, 0, 'i'}, /* Interrupt number */ {"quiet", 0, 0, 'q'}, /* Tone down verbosity mode */ {"verbose", 0, 0, 'v'}, /* Verbose mode */ @@ -108,11 +121,12 @@ case 'v': verbose++; break; case 'w': write_eeprom++; break; case 'a': all_regs++; break; + case 'h': case '?': errflag++; } if (errflag) { - fprintf(stderr, "usage:"); + fprintf(stderr, usage_msg); return 2; } --- 3c5x9setup.c.orig Fri Jan 10 22:59:35 1997 +++ 3c5x9setup.c Fri Dec 5 16:36:33 1997 @@ -99,7 +99,7 @@ int c, longind, i, j, saved_window; extern char *optarg; - while ((c = getopt_long(argc, argv, "aEfF:i:p:P:Q:svVw", + while ((c = getopt_long(argc, argv, "h?aEfF:i:p:P:Q:svVw", longopts, &longind)) != -1) switch (c) { @@ -147,6 +147,7 @@ case 'v': verbose++; break; case 'V': show_version++; break; case 'w': do_write_eeprom++; break; + case 'h': case '?': errflag++; }