[Zyxel630-11-cvs] amedyn/amcontrol amcontrol.c,1.6,1.7

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

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

Modified Files:
	amcontrol.c 
Log Message:
Move structs usb_modem_char and usb_modem_info to amedyn.h. Remove adsl_modems.

Index: amcontrol.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/amcontrol/amcontrol.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** amcontrol.c	11 Jul 2006 14:20:25 -0000	1.6
--- amcontrol.c	22 Jul 2006 11:37:31 -0000	1.7
***************
*** 62,170 ****
  
  /* modem internal characteristics */
- struct usb_modem_char
- {
-   unsigned int vid;		/* VendorID */
-   unsigned int pid;		/* ProductID */
-   char *firmfile;		/* firmware file name */
-   int datamax;			/* maximum data that we can send in a block */
- };
  struct usb_modem_char modem_char;
  
  /* info about modem */
- struct usb_modem_info
- {
-   int modem_status;
-   char firm_version[5];		/* firmware version */
-   char mac[6];			/* MAC address */
-   int down_bitrate;		/* download bitrate */
-   int up_bitrate;		/* upload bitrate */
-   int link_status;		/* link status */
-   int line_status;		/* line status */
-   int operational_mode;		/* operational mode */
- 
- 
-   int down_bitrate_percent;
-   int up_bitrate_percent;
-   unsigned int down_attenuation;
-   unsigned int up_attenuation;
- 
-   char tons[256];		/* bits/simbolo */
-   float potenciat, potenciar;
-   float ruidot, ruidor;
- 
-   unsigned int NearFecNotInterleaved;
-   unsigned int NearFecInterleaved;
-   unsigned int NearCrcNotInterleaved;
-   unsigned int NearCrcInterleaved;
-   unsigned int NearHecNotInterleaved;
-   unsigned int NearHecInterleaved;
- 
-   unsigned int FarFecNotInterleaved;
-   unsigned int FarFecInterleaved;
-   unsigned int FarCrcNotInterleaved;
-   unsigned int FarCrcInterleaved;
-   unsigned int FarHecNotInterleaved;
-   unsigned int FarHecInterleaved;
- 
- // From cxacru
- /*
-   // version
-   unsigned char mod_major;
-   unsigned char mod_minor;
-   unsigned char mod_release;
-   unsigned char mod_speed;
-   int hard_version;  // controller version
-   char firm_version[5];
-   unsigned char mac[6];
- 
-   // transmit/configuration
-   unsigned int atm_cell_tx;
-   unsigned int atm_cell_rx;
-   unsigned int oam_loopback;
-   short vpi;
-   int vci;
- 
-   //state
-   int link_status;
-   int line_status;
-   unsigned int open_mode;
-   unsigned int operational_mode;  //modulation
-   unsigned int data_path;
-   unsigned int startup_attempts;
-   unsigned int line_startable;
-   unsigned int link_lost;
-   int down_bitrate; // *
-   int up_bitrate; // *
-   unsigned int adsl_headend;
-   unsigned int adsl_headend_env;
- 
-   //advanced
-   unsigned char extended_info;
-   int up_snr_margin;
-   int down_snr_margin;
-   unsigned int up_attenuation; // *
-   unsigned int down_attenuation; // *
-   int transmitter_power;
-   unsigned int up_bits_frame;
-   unsigned int down_bits_frame;
-   unsigned int up_crc_errors;
-   unsigned int down_crc_errors;
-   unsigned int up_fec_errors;
-   unsigned int down_fec_errors;
-   unsigned int up_hec_errors;
-   unsigned int down_hec_errors;
- 
- */
- 
- };
  struct usb_modem_info modem_info;
  
- /* adsl modes */
- const char *adsl_modes[] = {
-   "ANSI",
-   "G.DMT",
-   "G.Lite"
- };
- 
  /* show printable char */
  void
--- 62,70 ----