[Zyxel630-11-cvs] amedyn2/module amedyn2.c,1.17,1.18

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

Update of /cvsroot/zyxel630-11/amedyn2/module
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11595

Modified Files:
	amedyn2.c 
Log Message:
"//" are for C++, comments in C are "/* ... */" (Xavier) and clean.


Index: amedyn2.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** amedyn2.c	17 Aug 2007 15:20:06 -0000	1.17
--- amedyn2.c	19 Aug 2007 23:35:02 -0000	1.18
***************
*** 67,72 ****
  #define MAX_POLL_DELAY		60000	/* milliseconds */
  
- //#define RESUBMIT_DELAY		1000	/* milliseconds */
- 
  #define DEFAULT_BULK_ALTSETTING	1
  #define DEFAULT_ISOC_ALTSETTING	1 /* This modem don't have iso*/
--- 67,70 ----
***************
*** 94,100 ****
  #define ENDPOINT_FIRMWARE		0x05
  
! // from the userspace tool
! #define AMEDYN_USB_IN_INFO  0x81    // IN endpoint address, read modem status /
! #define ENDPOINT_FIRMWARE_IN  0x85    // IN endpoint address, read config /
  
  
--- 92,98 ----
  #define ENDPOINT_FIRMWARE		0x05
  
! /* from the userspace tool */
! #define AMEDYN_USB_IN_INFO  0x81    /* IN endpoint address, read modem status */
! #define ENDPOINT_FIRMWARE_IN  0x85  /* IN endpoint address, read config */
  
  
***************
*** 130,134 ****
  	struct usb_device *usb_dev = usbatm->usb_dev;
  	struct atm_dev *atm_dev = usbatm->atm_dev;
- //	unsigned char buf[0x1ff];
  	int ret;
  
--- 128,131 ----
***************
*** 405,409 ****
  	}
  
! //	atm_dbg(usbatm, "%s: Info type - %02x\n", __func__, buf[0]);
  
  	return 0;
--- 402,406 ----
  	}
  
! /*	atm_dbg(usbatm, "%s: Info type - %02x\n", __func__, buf[0]); */
  
  	return 0;
***************
*** 550,559 ****
  	}
  
! //	if ( buf[0] == 0x01 )
! //		atm_dbg(usbatm, "%s: line state %02x\n", __func__, buf[OFFSET_7]);
! //	else {
! //	    atm_dbg(usbatm, "amedyn_get_status return useless info\n");
! //	    return ;
! //	}
  
  	status = buf[OFFSET_7];	
--- 547,556 ----
  	}
  
! /*	if ( buf[0] == 0x01 )
! 		atm_dbg(usbatm, "%s: line state %02x\n", __func__, buf[OFFSET_7]);
! 	else {
! 	    atm_dbg(usbatm, "amedyn_get_status return useless info\n");
! 	    return ;
! 	} */
  
  	status = buf[OFFSET_7];	
***************
*** 643,647 ****
  	del_timer_sync(&instance->status_checker.timer);
  
! 	mb(); // Delete?
  
  	flush_scheduled_work();
--- 640,644 ----
  	del_timer_sync(&instance->status_checker.timer);
  
! 	mb(); /* Delete? */
  
  	flush_scheduled_work();
***************
*** 789,793 ****
  	instance->poll_delay = MIN_POLL_DELAY;
  
! //-------------------------------------------------------------------
  	if ( linetype == ANALOG ||  linetype == ISDN)
  		instance->linetype = linetype;
--- 786,790 ----
  	instance->poll_delay = MIN_POLL_DELAY;
  
! /* ------------------------------------------------------------------- */
  	if ( linetype == ANALOG ||  linetype == ISDN)
  		instance->linetype = linetype;
***************
*** 808,812 ****
  	    instance->datamax = 0x1f2;
  	    instance->firmfile = "Fw-usb_A.bin"; }
! //----------------------------------------------------------------------
  	
  	/* check whether the modem already seems to be alive */
--- 805,809 ----
  	    instance->datamax = 0x1f2;
  	    instance->firmfile = "Fw-usb_A.bin"; }
! /* ------------------------------------------------------------------- */
  	
  	/* check whether the modem already seems to be alive */