[Zyxel630-11-cvs] amedyn/init amcheckline.c, 1.1, 1.2 amfunctions.c, 1.9, 1.10 amsyncline.c, 1.2, 1.3

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

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

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

Index: amsyncline.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amsyncline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** amsyncline.c	11 Dec 2005 11:05:32 -0000	1.2
--- amsyncline.c	22 Jul 2006 11:37:32 -0000	1.3
***************
*** 54,86 ****
  
  /* modem internal characteristics */
- struct usb_modem_char {
-   unsigned int vid;  /* VendorID */
-   unsigned int pid;  /* ProductID */
-   char *firmfile;  /* firmware file name */
-   char *initfirmfile;  /* init 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 */
- };
  struct usb_modem_info modem_info;
  
- /* adsl modes */
- const char *adsl_modes[] = {
-  "ANSI",
-  "G.DMT",
-  "G.Lite"
- };
- 
  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);
--- 54,62 ----

Index: amcheckline.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amcheckline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** amcheckline.c	3 Dec 2005 16:13:42 -0000	1.1
--- amcheckline.c	22 Jul 2006 11:37:32 -0000	1.2
***************
*** 51,83 ****
  
  /* modem internal characteristics */
- struct usb_modem_char {
-   unsigned int vid;  /* VendorID */
-   unsigned int pid;  /* ProductID */
-   char *firmfile;  /* firmware file name */
-   char *initfirmfile;  /* init 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 */
- };
  struct usb_modem_info modem_info;
  
- /* adsl modes */
- const char *adsl_modes[] = {
-  "ANSI",
-  "G.DMT",
-  "G.Lite"
- };
- 
  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);
--- 51,59 ----

Index: amfunctions.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** amfunctions.c	16 Jul 2006 12:41:54 -0000	1.9
--- amfunctions.c	22 Jul 2006 11:37:32 -0000	1.10
***************
*** 86,119 ****
  
  /* modem internal characteristics */
- struct usb_modem_char {
-   unsigned int vid;  /* VendorID */
-   unsigned int pid;  /* ProductID */
-   char *firmfile;  /* firmware file name */
-   char *initfirmfile;  /* init 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 */
- };
  struct usb_modem_info modem_info;
  
- /* adsl modes */
- /*
- const char *adsl_modes[] = {
-  "ANSI",
-  "G.DMT",
-  "G.Lite"
- };
- */
  /* check if a file exists */
  int file_exists(const char *filename)
--- 86,94 ----