[Zyxel630-11-cvs] amedyn/init amfunctions.c, 1.11, 1.12 amload.c, 1.12, 1.13

[Aurelio <sk...@us...>]

Update of /cvsroot/zyxel630-11/amedyn/init
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18538/init

Modified Files:
	amfunctions.c amload.c 
Log Message:
Make command line options a struct.

Index: amfunctions.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** amfunctions.c	22 Jul 2006 19:41:57 -0000	1.11
--- amfunctions.c	22 Jul 2006 19:52:18 -0000	1.12
***************
*** 91,94 ****
--- 91,97 ----
  struct usb_modem_info modem_info;
  
+ /* command-line options */
+ struct options command_options;
+ 
  /* check if a file exists */
  int file_exists(const char *filename)

Index: amload.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** amload.c	16 Jul 2006 18:46:23 -0000	1.12
--- amload.c	22 Jul 2006 19:52:18 -0000	1.13
***************
*** 85,88 ****
--- 85,90 ----
  #define TF_CODE "amload"
  
+ extern struct options command_options;
+ 
  extern int check_modem(unsigned int vid, unsigned int pid);
  extern void init_modem(unsigned int tmodem, struct usb_device *adsl_dev, int open_mode);
***************
*** 117,152 ****
  
    /* Command-line options */ 
!   int no_check_modem_before=0;
!   int firmware=0;
!   int config=0;
!   int sync=0;
!   int max_wait_line_up=MAX_WAIT_LINE_UP;
!   int verbose=0;
    /* Debug command-line optios */
!   int no_claim_interface_0=0;
!   int no_claim_interface_1=0;
!   int no_claim_interface_2=0;
  
    struct poptOption optionsTable[] = {
!         { "nocheck", '\0', POPT_ARG_NONE, &no_check_modem_before, 0,
              "Don't check modem before try to upload firmware.", ""},
!         { "firmware", 'f', POPT_ARG_NONE, &firmware, 0,
              "Upload firmware.", ""},
!         { "config",   'c', POPT_ARG_NONE, &config, 0,
              "Initial config.",  ""},
!         { "sync",     's', POPT_ARG_NONE, &sync, 0,
              "Sync line.",  ""},
!         { "time",     't', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &max_wait_line_up, 0,
              "Time to wait until sync.",  ""},
!         { "verbose",  'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &verbose, 0,
!             "Verbose level.",  "[0..0]"},
          { NULL,     '0',
! 	    POPT_ARG_NONE, &no_claim_interface_0, 0,
              "Don't claim interface 0. (Debug option)",  ""},
          { NULL,     '1',
! 	    POPT_ARG_NONE, &no_claim_interface_1, 0,
              "Don't claim interface 1. (Debug option)",  ""},
          { NULL,     '2',
! 	    POPT_ARG_NONE, &no_claim_interface_2, 0,
              "Don't claim interface 2. (Debug option)",  ""},
          POPT_AUTOHELP
--- 119,155 ----
  
    /* Command-line options */ 
!   command_options.no_check_modem_before=0;
!   command_options.firmware=0;
!   command_options.config=0;
!   command_options.sync=0;
!   command_options.max_wait_line_up=MAX_WAIT_LINE_UP;
!   command_options.verbose=0;
! 
    /* Debug command-line optios */
!   command_options.no_claim_interface_0=0;
!   command_options.no_claim_interface_1=0;
!   command_options.no_claim_interface_2=0;
  
    struct poptOption optionsTable[] = {
!         { "nocheck", '\0', POPT_ARG_NONE, &command_options.no_check_modem_before, 0,
              "Don't check modem before try to upload firmware.", ""},
!         { "firmware", 'f', POPT_ARG_NONE, &command_options.firmware, 0,
              "Upload firmware.", ""},
!         { "config",   'c', POPT_ARG_NONE, &command_options.config, 0,
              "Initial config.",  ""},
!         { "sync",     's', POPT_ARG_NONE, &command_options.sync, 0,
              "Sync line.",  ""},
!         { "time",     't', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.max_wait_line_up, 0,
              "Time to wait until sync.",  ""},
!         { "verbose",  'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.verbose, 0,
!             "Verbose level.",  "[0..1]"},
          { NULL,     '0',
! 	    POPT_ARG_NONE, &command_options.no_claim_interface_0, 0,
              "Don't claim interface 0. (Debug option)",  ""},
          { NULL,     '1',
! 	    POPT_ARG_NONE, &command_options.no_claim_interface_1, 0,
              "Don't claim interface 1. (Debug option)",  ""},
          { NULL,     '2',
! 	    POPT_ARG_NONE, &command_options.no_claim_interface_2, 0,
              "Don't claim interface 2. (Debug option)",  ""},
          POPT_AUTOHELP
***************
*** 266,280 ****
  
    /* check if other program is using interfaces 0, 1, 2 */
!   if ( ! no_claim_interface_0 && usb_claim_interface(adsl_handle, 0) < 0)
    {
      printf("Error: usb_claim_interface 0: %s\n", usb_strerror());
      return -1;
    }
!   if ( ! no_claim_interface_1 && usb_claim_interface(adsl_handle, 1) < 0)
    {
      printf("Error: usb_claim_interface 1: %s\n", usb_strerror());
      return -1;
    }
!   if ( ! no_claim_interface_2 && usb_claim_interface(adsl_handle, 2) < 0)
    {
      printf("Error: usb_claim_interface 2: %s\n", usb_strerror());
--- 269,283 ----
  
    /* check if other program is using interfaces 0, 1, 2 */
!   if ( ! command_options.no_claim_interface_0 && usb_claim_interface(adsl_handle, 0) < 0)
    {
      printf("Error: usb_claim_interface 0: %s\n", usb_strerror());
      return -1;
    }
!   if ( ! command_options.no_claim_interface_1 && usb_claim_interface(adsl_handle, 1) < 0)
    {
      printf("Error: usb_claim_interface 1: %s\n", usb_strerror());
      return -1;
    }
!   if ( ! command_options.no_claim_interface_2 && usb_claim_interface(adsl_handle, 2) < 0)
    {
      printf("Error: usb_claim_interface 2: %s\n", usb_strerror());
***************
*** 286,298 ****
  
  /* Check if the modem is working yet */
!   if ( firmware || config ) {
!   if ( ! no_check_modem_before )
      r = usb_bulk_read(adsl_handle, USB_IN_INFO, buf, 0x10, DATA_TIMEOUT);
    else
      r=-1;
    if (r < 0) {
!     if (firmware)
          r = load_firmware(adsl_handle, tmodem); 
!     if (config)
          r = first_config(adsl_handle, tmodem); }
    else
--- 289,301 ----
  
  /* Check if the modem is working yet */
!   if ( command_options.firmware || command_options.config ) {
!   if ( ! command_options.no_check_modem_before )
      r = usb_bulk_read(adsl_handle, USB_IN_INFO, buf, 0x10, DATA_TIMEOUT);
    else
      r=-1;
    if (r < 0) {
!     if (command_options.firmware)
          r = load_firmware(adsl_handle, tmodem); 
!     if (command_options.config)
          r = first_config(adsl_handle, tmodem); }
    else
***************
*** 300,312 ****
    }
    
!   if (sync)
!     r = sync_line(adsl_handle, tmodem, max_wait_line_up);
  
    PDEBUG(gettext("Releasing interface...\n"));
!   if ( ! no_claim_interface_0 )
       usb_release_interface(adsl_handle, 0);
!   if ( ! no_claim_interface_1 )
      usb_release_interface(adsl_handle, 1);
!   if ( ! no_claim_interface_2 )
      usb_release_interface(adsl_handle, 2);
    PDEBUG(gettext("Releasing device...\n"));
--- 303,315 ----
    }
    
!   if (command_options.sync)
!     r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up);
  
    PDEBUG(gettext("Releasing interface...\n"));
!   if ( ! command_options.no_claim_interface_0 )
       usb_release_interface(adsl_handle, 0);
!   if ( ! command_options.no_claim_interface_1 )
      usb_release_interface(adsl_handle, 1);
!   if ( ! command_options.no_claim_interface_2 )
      usb_release_interface(adsl_handle, 2);
    PDEBUG(gettext("Releasing device...\n"));