[Zyxel630-11-cvs] amedyn2/module amedyn2.c,1.10,1.11

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

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

Modified Files:
	amedyn2.c 
Log Message:

As Saint Xavier say, amedyn_upload_firmware declare two buffers and use only one. The unused buffer is from speedtch.c but i don't update the code to use it before. Now the function use it.
The other buffer declaration is change to use instance->scratch_buffer. It's use with usb_control_msg.


Index: amedyn2.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** amedyn2.c	18 Sep 2006 16:40:02 -0000	1.10
--- amedyn2.c	18 Sep 2006 17:40:35 -0000	1.11
***************
*** 217,224 ****
  	struct usb_interface *intf;
  	struct usb_device *usb_dev = usbatm->usb_dev;
  	
  	int ret = 0;
  	int offset;
- 	unsigned char buf[0x1ff];
  	char value;  /* returned byte */
  	int i;
--- 217,224 ----
  	struct usb_interface *intf;
  	struct usb_device *usb_dev = usbatm->usb_dev;
+ 	unsigned char *buf = instance->scratch_buffer;
  	
  	int ret = 0;
  	int offset;
  	char value;  /* returned byte */
  	int i;
***************
*** 245,250 ****
  	do {
  		int thislen = min_t(int, instance->datamax, fw1->size - offset);
! 		memcpy(buf, fw1->data + offset, thislen);
! 		if (send_block(instance, offset, buf, thislen))
  			goto out_free;
  		offset+=thislen;
--- 245,250 ----
  	do {
  		int thislen = min_t(int, instance->datamax, fw1->size - offset);
! 		memcpy(buffer, fw1->data + offset, thislen);
! 		if (send_block(instance, offset, buffer, thislen))
  			goto out_free;
  		offset+=thislen;
***************
*** 263,272 ****
  
  	/* read something needed */
! 	ret = usb_bulk_msg (usb_dev, usb_rcvbulkpipe(usb_dev, ENDPOINT_FIRMWARE_IN), buf, 0x1ff, NULL,  DATA_TIMEOUT);
  	if (ret < 0) {
  		dbg("amedyn_upload_firmware: read bufconf failed (%d)!", ret);
  		goto out_free;
  	}
! 	memcpy(instance->bufconf, buf+0xb9, 8);
  
  	dbg("amedyn_upload_firmware: Read bufconf OK");
--- 263,272 ----
  
  	/* read something needed */
! 	ret = usb_bulk_msg (usb_dev, usb_rcvbulkpipe(usb_dev, ENDPOINT_FIRMWARE_IN), buffer, 0x1ff, NULL,  DATA_TIMEOUT);
  	if (ret < 0) {
  		dbg("amedyn_upload_firmware: read bufconf failed (%d)!", ret);
  		goto out_free;
  	}
! 	memcpy(instance->bufconf, buffer+0xb9, 8);
  
  	dbg("amedyn_upload_firmware: Read bufconf OK");
***************
*** 277,282 ****
  	do {
  		int thislen = min_t(int, instance->datamax, fw2->size - offset);
! 		memcpy(buf, fw2->data + offset, thislen);
! 		if (send_block(instance, offset, buf, thislen))
  			goto out_free;
  		offset+=thislen;
--- 277,282 ----
  	do {
  		int thislen = min_t(int, instance->datamax, fw2->size - offset);
! 		memcpy(buffer, fw2->data + offset, thislen);
! 		if (send_block(instance, offset, buffer, thislen))
  			goto out_free;
  		offset+=thislen;