zyxel630-11-cvs — Mailing list for CVS commit messages.

[Zyxel630-11-cvs] amedyn/init amfunctions.c,1.18,1.19

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

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

Modified Files:
	amfunctions.c 
Log Message:

Remove function jump_to_address and send it a static command.

The old funtion jump_to_address was never use with a address other than 0x0000.

The Windows driver use two transfers. One to set the base address and other to
send the jump to base address command, but it can be send as a single transfer.

Probably it can be send with the firmware too, as the speedtch.c driver do.


Index: amfunctions.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** amfunctions.c	28 Sep 2006 20:07:41 -0000	1.18
--- amfunctions.c	2 Dec 2006 14:58:45 -0000	1.19
***************
*** 294,319 ****
  }
  
- /* start code execution at specified address */
- int jump_to_address(usb_dev_handle *adsl_handle, unsigned int place)
- {
-   char buf[6];  /* buffer */
- 
-   buf[0] = 0x08; // Command (= set base address)
-   buf[1] = 0x04; // Length (= 4 bytes)
-   // Value (base address = place)
-   buf[2] = (place >> 24) & 0xff;
-   buf[3] = (place >> 16) & 0xff;
-   buf[4] = (place >> 8) & 0xff;
-   buf[5] = place & 0xff;
-   if (send_bulk(adsl_handle, USB_OUT_FIRM, buf, 1, 6))
-     return -1;
-   buf[0] = 0x00;  // Command (= jump?)
-   buf[1] = 0x01;  // Length (= 1 byte)
-   buf[2] = 0x14;  // Value (= jump to base address)
-   if (send_bulk(adsl_handle, USB_OUT_FIRM, buf, 1, 3))
-     return -1;
-   return 0;
- }
- 
  /* Say modem sync line */
  int send_cmds_sync (usb_dev_handle *adsl_handle, int tmodem)
--- 294,297 ----
***************
*** 450,453 ****
--- 428,443 ----
    char bufconf[8];  /* buffer to save config bytes */
  
+   /*
+     The old funtion jump_to_address was never use with a address other than
+     0x0000.
+     The Windows driver use two transfers. One to set the base address and other
+     to send the jump to base address command, but it can be send as a single
+     transfer. Probably it can be send with the firmware too, as the speedtch.c
+     driver do.
+   */
+ 
+   char jump_to_address_0x0000[9] =
+     {0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x14} ;
+ 
  
    /* clear endpoints */
***************
*** 488,492 ****
    fclose(soft);
  
!   if (jump_to_address(adsl_handle, 0x00000000))
      return -1;
  
--- 478,482 ----
    fclose(soft);
  
!   if (send_bulk(adsl_handle, USB_OUT_FIRM, jump_to_address_0x0000, 1, 9))
      return -1;
  
***************
*** 529,534 ****
    fclose(soft);
  
!   if (jump_to_address(adsl_handle, 0x00000000))
      return -1;
    printf(gettext("Firmware is sent!\n"));
  
--- 519,525 ----
    fclose(soft);
  
!   if (send_bulk(adsl_handle, USB_OUT_FIRM, jump_to_address_0x0000, 1, 9))
      return -1;
+ 
    printf(gettext("Firmware is sent!\n"));
  

[Zyxel630-11-cvs] amedyn/init amload.c,1.17,1.18

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

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

Modified Files:
	amload.c 
Log Message:
Exit on errors...

Index: amload.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** amload.c	23 Jul 2006 11:57:13 -0000	1.17
--- amload.c	29 Nov 2006 20:13:52 -0000	1.18
***************
*** 302,309 ****
      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
      printf(gettext("Firmware loaded yet!\n"));
--- 302,315 ----
      r=-1;
    if (r < 0) {
!     if (command_options.firmware) {
          r = load_firmware(adsl_handle, tmodem); 
! 	if (r < 0)
! 	    return r;
! 	}
!     if (command_options.config) {
          r = first_config(adsl_handle, tmodem); }
+ 	if (r < 0)
+ 	    return r;
+ 	}
    else
      printf(gettext("Firmware loaded yet!\n"));
***************
*** 313,319 ****
--- 319,331 ----
      r = send_line_down_signal (adsl_handle, tmodem);
  
+   if ( r < 0 )
+     return r;
+ 
    if (command_options.sync)
      r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up);
  
+   if ( r < 0 )
+     return r;
+ 
    PDEBUG(gettext("Releasing interface...\n"));
    if ( ! command_options.no_claim_interface_0 )

[Zyxel630-11-cvs] amedyn/init amload.c,1.18,1.19

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

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

Modified Files:
	amload.c 
Log Message:
Read more before commit a change. Read more before commita change. Repeat with me, read more before commit a change.

Index: amload.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** amload.c	29 Nov 2006 20:13:52 -0000	1.18
--- amload.c	29 Nov 2006 20:19:15 -0000	1.19
***************
*** 316,330 ****
    }
    
!   if (command_options.unsync_first)
      r = send_line_down_signal (adsl_handle, tmodem);
  
!   if ( r < 0 )
!     return r;
! 
!   if (command_options.sync)
      r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up);
! 
!   if ( r < 0 )
!     return r;
  
    PDEBUG(gettext("Releasing interface...\n"));
--- 316,330 ----
    }
    
!   if (command_options.unsync_first) {
      r = send_line_down_signal (adsl_handle, tmodem);
+     if ( r < 0 )
+ 	return r;
+     }
  
!   if (command_options.sync) {
      r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up);
!     if ( r < 0 )
! 	return r;
!     }
  
    PDEBUG(gettext("Releasing interface...\n"));

[Zyxel630-11-cvs] amedyn2/module amedyn2.c,1.13,1.14

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

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

Modified Files:
	amedyn2.c 
Log Message:
Nothing more to do. So return.

Index: amedyn2.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** amedyn2.c	18 Nov 2006 14:56:52 -0000	1.13
--- amedyn2.c	18 Nov 2006 15:16:50 -0000	1.14
***************
*** 541,544 ****
--- 541,545 ----
  		amedyn_line_down_signal (instance);
  		amedyn_start_synchro(instance);
+ 		return;
  	}
  
***************
*** 551,554 ****
--- 552,556 ----
  		amedyn_line_down_signal (instance);
  		amedyn_start_synchro(instance);
+ 		return;
  	}
  
***************
*** 596,599 ****
--- 598,602 ----
  		}
  		instance->last_status = status;
+ 		return;
  	}
  }

[Zyxel630-11-cvs] amedyn2/module amedyn2.c,1.12,1.13

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

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

Modified Files:
	amedyn2.c 
Log Message:

Move to kzalloc


Index: amedyn2.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** amedyn2.c	28 Sep 2006 20:08:43 -0000	1.12
--- amedyn2.c	18 Nov 2006 14:56:52 -0000	1.13
***************
*** 726,730 ****
  	}
  
! 	instance = kmalloc(sizeof(*instance), GFP_KERNEL);
  
  	if (!instance) {
--- 726,730 ----
  	}
  
! 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);
  
  	if (!instance) {
***************
*** 734,739 ****
  	}
  
- 	memset(instance, 0, sizeof(struct amedyn_instance_data));
- 
  	instance->usbatm = usbatm;
  
--- 734,737 ----

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

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

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

Modified Files:
	usbatm.c 
Log Message:

Move to kzalloc.


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** usbatm.c	18 Nov 2006 14:12:38 -0000	1.18
--- usbatm.c	18 Nov 2006 14:54:47 -0000	1.19
***************
*** 910,914 ****
  	}
  
! 	if (!(new = kmalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
  		atm_err(instance, "%s: no memory for vcc_data!\n", __func__);
  		ret = -ENOMEM;
--- 910,914 ----
  	}
  
! 	if (!(new = kzalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
  		atm_err(instance, "%s: no memory for vcc_data!\n", __func__);
  		ret = -ENOMEM;
***************
*** 1136,1140 ****
  
  	/* instance init */
! 	instance = kmalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
  	if (!instance) {
  		dev_err(dev, "%s: no memory for instance data!\n", __func__);
--- 1136,1140 ----
  
  	/* instance init */
! 	instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
  	if (!instance) {
  		dev_err(dev, "%s: no memory for instance data!\n", __func__);
***************
*** 1256,1260 ****
  
  		/* zero the tx padding to avoid leaking information */
! 		buffer = kmalloc(channel->buf_size, GFP_KERNEL);
  		if (!buffer) {
  			dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i);
--- 1256,1260 ----
  
  		/* zero the tx padding to avoid leaking information */
! 		buffer = kzalloc(channel->buf_size, GFP_KERNEL);
  		if (!buffer) {
  			dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i);

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

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

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

Modified Files:
	usbatm.c 
Log Message:

Use BUILD_BUG_ON to fail compilation if the module can't possibly work. (usbatm CVS 1.68 -> 1.69)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** usbatm.c	18 Nov 2006 13:00:49 -0000	1.17
--- usbatm.c	18 Nov 2006 14:12:38 -0000	1.18
***************
*** 1405,1412 ****
  	dbg("%s: driver version %s", __func__, DRIVER_VERSION);
  
! 	if (sizeof(struct usbatm_control) > sizeof(((struct sk_buff *) 0)->cb)) {
! 		printk(KERN_ERR "%s unusable with this kernel!\n", usbatm_driver_name);
! 		return -EIO;
! 	}
  
  	if ((num_rcv_urbs > UDSL_MAX_RCV_URBS)
--- 1405,1409 ----
  	dbg("%s: driver version %s", __func__, DRIVER_VERSION);
  
! 	BUILD_BUG_ON(sizeof(struct usbatm_control) > sizeof(((struct sk_buff *) 0)->cb));
  
  	if ((num_rcv_urbs > UDSL_MAX_RCV_URBS)

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

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

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

Modified Files:
	usbatm.c 
Log Message:

Fix for very unlikely race: if the thread manages to exit
before pid was assigned, pid will not be set to -1, and
the wrong thread may be shot down on modem disconnect.
(usbatm CVS 1.67)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** usbatm.c	18 Nov 2006 12:55:08 -0000	1.16
--- usbatm.c	18 Nov 2006 13:00:49 -0000	1.17
***************
*** 1074,1077 ****
--- 1074,1078 ----
  	daemonize(instance->driver->driver_name);
  	allow_signal(SIGTERM);
+ 	instance->thread_pid = get_current()->pid;
  
  	complete(&instance->thread_started);
***************
*** 1098,1105 ****
  	}
  
- 	mutex_lock(&instance->serialize);
- 	instance->thread_pid = ret;
- 	mutex_unlock(&instance->serialize);
- 
  	wait_for_completion(&instance->thread_started);
  
--- 1099,1102 ----

[Zyxel630-11-cvs] amedyn2/module usbatm.c,1.15,1.16

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

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

Modified Files:
	usbatm.c 
Log Message:

Remove pointless "inline". (usbatm CVS 1.66)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** usbatm.c	18 Nov 2006 12:52:54 -0000	1.15
--- usbatm.c	18 Nov 2006 12:55:08 -0000	1.16
***************
*** 1112,1116 ****
  }
  
! static inline void usbatm_init_channel(struct usbatm_channel *channel)
  {
  	spin_lock_init(&channel->lock);
--- 1112,1116 ----
  }
  
! static void usbatm_init_channel(struct usbatm_channel *channel)
  {
  	spin_lock_init(&channel->lock);

[Zyxel630-11-cvs] amedyn2/module usbatm.c,1.14,1.15

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

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

Modified Files:
	usbatm.c 
Log Message:

Improve output of modinfo: UDSL_MAX_SND_BUF_SIZE is no longer defined; and
use 65536 rather than 64 * 1024, etc. (usbatm CVS 1.65)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** usbatm.c	18 Nov 2006 12:44:50 -0000	1.14
--- usbatm.c	18 Nov 2006 12:52:54 -0000	1.15
***************
*** 100,108 ****
  #define UDSL_MAX_RCV_URBS		16
  #define UDSL_MAX_SND_URBS		16
! #define UDSL_MAX_BUF_SIZE		64 * 1024	/* bytes */
  #define UDSL_DEFAULT_RCV_URBS		4
  #define UDSL_DEFAULT_SND_URBS		4
! #define UDSL_DEFAULT_RCV_BUF_SIZE	64 * ATM_CELL_SIZE	/* bytes */
! #define UDSL_DEFAULT_SND_BUF_SIZE	64 * ATM_CELL_SIZE	/* bytes */
  
  #define ATM_CELL_HEADER			(ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
--- 100,108 ----
  #define UDSL_MAX_RCV_URBS		16
  #define UDSL_MAX_SND_URBS		16
! #define UDSL_MAX_BUF_SIZE		65536
  #define UDSL_DEFAULT_RCV_URBS		4
  #define UDSL_DEFAULT_SND_URBS		4
! #define UDSL_DEFAULT_RCV_BUF_SIZE	3392	/* 64 * ATM_CELL_SIZE */
! #define UDSL_DEFAULT_SND_BUF_SIZE	3392	/* 64 * ATM_CELL_SIZE */
  
  #define ATM_CELL_HEADER			(ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
***************
*** 136,140 ****
  MODULE_PARM_DESC(snd_buf_bytes,
  		 "Size of the buffers used for transmission, in bytes (range: 1-"
! 		 __MODULE_STRING(UDSL_MAX_SND_BUF_SIZE) ", default: "
  		 __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
  
--- 136,140 ----
  MODULE_PARM_DESC(snd_buf_bytes,
  		 "Size of the buffers used for transmission, in bytes (range: 1-"
! 		 __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
  		 __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
  

[Zyxel630-11-cvs] amedyn2/module usbatm.h,1.6,1.7

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

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

Modified Files:
	usbatm.h 
Log Message:

Resync with kernel tree (semaphore -> mutex changes). (usbatm CVS 1.32)


Index: usbatm.h
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** usbatm.h	11 Mar 2006 12:36:49 -0000	1.6
--- usbatm.h	18 Nov 2006 12:45:28 -0000	1.7
***************
*** 35,38 ****
--- 35,39 ----
  #include <linux/stringify.h>
  #include <linux/usb.h>
+ #include <linux/mutex.h>
  
  /*
***************
*** 172,176 ****
  
  	struct kref refcount;
! 	struct semaphore serialize;
  	int disconnected;
  
--- 173,177 ----
  
  	struct kref refcount;
! 	struct mutex serialize;
  	int disconnected;
  

[Zyxel630-11-cvs] amedyn2/module usbatm.c,1.13,1.14

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

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

Modified Files:
	usbatm.c 
Log Message:

Resync with kernel tree (semaphore -> mutex changes). (usbatm CVS 1.64)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** usbatm.c	11 Mar 2006 12:36:32 -0000	1.13
--- usbatm.c	18 Nov 2006 12:44:50 -0000	1.14
***************
*** 232,236 ****
  ************/
  
! static inline struct urb *usbatm_pop_urb(struct usbatm_channel *channel)
  {
  	struct urb *urb;
--- 232,236 ----
  ************/
  
! static struct urb *usbatm_pop_urb(struct usbatm_channel *channel)
  {
  	struct urb *urb;
***************
*** 249,253 ****
  }
  
! static inline int usbatm_submit_urb(struct urb *urb)
  {
  	struct usbatm_channel *channel = urb->context;
--- 249,253 ----
  }
  
! static int usbatm_submit_urb(struct urb *urb)
  {
  	struct usbatm_channel *channel = urb->context;
***************
*** 896,900 ****
  	}
  
! 	down(&instance->serialize);	/* vs self, usbatm_atm_close, usbatm_usb_disconnect */
  
  	if (instance->disconnected) {
--- 896,900 ----
  	}
  
! 	mutex_lock(&instance->serialize);	/* vs self, usbatm_atm_close, usbatm_usb_disconnect */
  
  	if (instance->disconnected) {
***************
*** 940,944 ****
  	set_bit(ATM_VF_READY, &vcc->flags);
  
! 	up(&instance->serialize);
  
  	atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
--- 940,944 ----
  	set_bit(ATM_VF_READY, &vcc->flags);
  
! 	mutex_unlock(&instance->serialize);
  
  	atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
***************
*** 948,952 ****
  fail:
  	kfree(new);
! 	up(&instance->serialize);
  	return ret;
  }
--- 948,952 ----
  fail:
  	kfree(new);
! 	mutex_unlock(&instance->serialize);
  	return ret;
  }
***************
*** 969,973 ****
  	usbatm_cancel_send(instance, vcc);
  
! 	down(&instance->serialize);	/* vs self, usbatm_atm_open, usbatm_usb_disconnect */
  
  	tasklet_disable(&instance->rx_channel.tasklet);
--- 969,973 ----
  	usbatm_cancel_send(instance, vcc);
  
! 	mutex_lock(&instance->serialize);	/* vs self, usbatm_atm_open, usbatm_usb_disconnect */
  
  	tasklet_disable(&instance->rx_channel.tasklet);
***************
*** 992,996 ****
  	clear_bit(ATM_VF_ADDR, &vcc->flags);
  
! 	up(&instance->serialize);
  
  	atm_dbg(instance, "%s successful\n", __func__);
--- 992,996 ----
  	clear_bit(ATM_VF_ADDR, &vcc->flags);
  
! 	mutex_unlock(&instance->serialize);
  
  	atm_dbg(instance, "%s successful\n", __func__);
***************
*** 1082,1088 ****
  		ret = usbatm_atm_init(instance);
  
! 	down(&instance->serialize);
  	instance->thread_pid = -1;
! 	up(&instance->serialize);
  
  	complete_and_exit(&instance->thread_exited, ret);
--- 1082,1088 ----
  		ret = usbatm_atm_init(instance);
  
! 	mutex_lock(&instance->serialize);
  	instance->thread_pid = -1;
! 	mutex_unlock(&instance->serialize);
  
  	complete_and_exit(&instance->thread_exited, ret);
***************
*** 1098,1104 ****
  	}
  
! 	down(&instance->serialize);
  	instance->thread_pid = ret;
! 	up(&instance->serialize);
  
  	wait_for_completion(&instance->thread_started);
--- 1098,1104 ----
  	}
  
! 	mutex_lock(&instance->serialize);
  	instance->thread_pid = ret;
! 	mutex_unlock(&instance->serialize);
  
  	wait_for_completion(&instance->thread_started);
***************
*** 1183,1187 ****
  
  	kref_init(&instance->refcount);		/* dropped in usbatm_usb_disconnect */
! 	init_MUTEX(&instance->serialize);
  
  	instance->thread_pid = -1;
--- 1183,1187 ----
  
  	kref_init(&instance->refcount);		/* dropped in usbatm_usb_disconnect */
! 	mutex_init(&instance->serialize);
  
  	instance->thread_pid = -1;
***************
*** 1346,1361 ****
  	usb_set_intfdata(intf, NULL);
  
! 	down(&instance->serialize);
  	instance->disconnected = 1;
  	if (instance->thread_pid >= 0)
  		kill_proc(instance->thread_pid, SIGTERM, 1);
! 	up(&instance->serialize);
  
  	wait_for_completion(&instance->thread_exited);
  
! 	down(&instance->serialize);
  	list_for_each_entry(vcc_data, &instance->vcc_list, list)
  		vcc_release_async(vcc_data->vcc, -EPIPE);
! 	up(&instance->serialize);
  
  	tasklet_disable(&instance->rx_channel.tasklet);
--- 1346,1361 ----
  	usb_set_intfdata(intf, NULL);
  
! 	mutex_lock(&instance->serialize);
  	instance->disconnected = 1;
  	if (instance->thread_pid >= 0)
  		kill_proc(instance->thread_pid, SIGTERM, 1);
! 	mutex_unlock(&instance->serialize);
  
  	wait_for_completion(&instance->thread_exited);
  
! 	mutex_lock(&instance->serialize);
  	list_for_each_entry(vcc_data, &instance->vcc_list, list)
  		vcc_release_async(vcc_data->vcc, -EPIPE);
! 	mutex_unlock(&instance->serialize);
  
  	tasklet_disable(&instance->rx_channel.tasklet);

[Zyxel630-11-cvs] amedyn2/module xusbatm.c,1.4,1.5

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

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

Modified Files:
	xusbatm.c 
Log Message:

etherdevice.h now include netdevice.h - no longer any need for us to do it. (usbatm CVS 1.23)


Index: xusbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/xusbatm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xusbatm.c	11 Mar 2006 12:13:31 -0000	1.4
--- xusbatm.c	18 Nov 2006 12:22:44 -0000	1.5
***************
*** 21,25 ****
  
  #include <linux/module.h>
- #include <linux/netdevice.h>		/* FIXME: required by linux/etherdevice.h */
  #include <linux/etherdevice.h>		/* for random_ether_addr() */
  
--- 21,24 ----

[Zyxel630-11-cvs] amedyn/scripts ammodule.sh,1.2,1.3

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

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

Modified Files:
	ammodule.sh 
Log Message:

Fail if DRIVER_MODE isn't it a known value.


Index: ammodule.sh
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/ammodule.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ammodule.sh	20 May 2006 12:18:04 -0000	1.2
--- ammodule.sh	11 Oct 2006 16:30:34 -0000	1.3
***************
*** 37,40 ****
--- 37,46 ----
              MODULE_RUN="xusbatm vendor=$VENDOR product=$PRODUCT rx_endpoint=$RX_ENDPOINT tx_endpoint=$TX_ENDPOINT rx_altsetting=$RX_ALTSETTING tx_altsetting=$TX_ALTSETTING"
              ;;
+ 	*)
+ 	    # unknown value:
+ 	    echo $"DRIVER_MODE: Unknown value."
+ 	    echo $"Check /etc/amedyn"
+ 	    exit 1
+ 	    ;;
      esac
     

[Zyxel630-11-cvs] amedyn/scripts amload.sh,1.6,1.7

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

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

Modified Files:
	amload.sh 
Log Message:

Don't fail if /proc/bus/usb can't be mount.


Index: amload.sh
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amload.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** amload.sh	8 Oct 2006 13:31:08 -0000	1.6
--- amload.sh	8 Oct 2006 13:32:37 -0000	1.7
***************
*** 40,44 ****
  if [ "$mt_old" = "" ] && [ "$mt_new" = "" ]; then
    echo $">>> Mounting USB file system..."
!   mount -t usbfs usbfs /proc/bus/usb || mount -t usbdevfs none /proc/bus/usb || exit 1
    echo
  fi
--- 40,44 ----
  if [ "$mt_old" = "" ] && [ "$mt_new" = "" ]; then
    echo $">>> Mounting USB file system..."
!   mount -t usbfs usbfs /proc/bus/usb || mount -t usbdevfs none /proc/bus/usb
    echo
  fi

[Zyxel630-11-cvs] amedyn/scripts amload.sh, 1.5, 1.6 amstart.sh, 1.2, 1.3 amstop.sh, 1.3, 1.4

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

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

Modified Files:
	amload.sh amstart.sh amstop.sh 
Log Message:

Don't fail if $RESYNC or $LINE_TYPE aren't defined in /etc/amedyn.
Thanks to Vincenzo Cuciti.


Index: amload.sh
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amload.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** amload.sh	23 Jul 2006 12:11:25 -0000	1.5
--- amload.sh	8 Oct 2006 13:31:08 -0000	1.6
***************
*** 49,53 ****
  if [ "$DRIVER_MODE" == "1" -o "$DRIVER_MODE" == "3" ]; then
      echo $">>> Loading firmware..."
!     amload -fcs --linetype $LINE_TYPE || exit 1
  fi
  
--- 49,57 ----
  if [ "$DRIVER_MODE" == "1" -o "$DRIVER_MODE" == "3" ]; then
      echo $">>> Loading firmware..."
!     LOADPRMS="-fcs"
!     if [ "$LINE_TYPE" = "0x15" -o "$LINE_TYPE" = "0x11" ]; then
! 	LOADPRMS="$LOADPRMS --linetype $LINE_TYPE"
!     fi
!     amload $LOADPRMS || exit 1
  fi
  

Index: amstop.sh
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amstop.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** amstop.sh	11 Dec 2005 15:07:03 -0000	1.3
--- amstop.sh	8 Oct 2006 13:31:08 -0000	1.4
***************
*** 8,12 ****
  . /etc/amedyn
  
! if [ "$RESYNC" -eq 1 ] && [ "$1" != "amline" ] ; then
      killall -g amline.sh 
  fi
--- 8,12 ----
  . /etc/amedyn
  
! if [ "$RESYNC" = "1" ] && [ "$1" != "amline" ] ; then
      killall -g amline.sh 
  fi

Index: amstart.sh
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amstart.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** amstart.sh	11 Dec 2005 10:00:17 -0000	1.2
--- amstart.sh	8 Oct 2006 13:31:08 -0000	1.3
***************
*** 42,46 ****
      fi
    fi
!   if [ "$RESYNC" -eq 1 ]; then
        amline.sh&
    fi
--- 42,46 ----
      fi
    fi
!   if [ "$RESYNC" = "1" ]; then
        amline.sh&
    fi

[Zyxel630-11-cvs] amedyn/doc en_install.html, 1.3, 1.4 es_install.html, 1.1, 1.2 fr_install.html, 1.2, 1.3 nl_install.html, 1.1, 1.2

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

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

Modified Files:
	en_install.html es_install.html fr_install.html 
	nl_install.html 
Log Message:
We need popt and popt-dev too. (For command line options)

Index: nl_install.html
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/doc/nl_install.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nl_install.html	11 Dec 2005 13:47:11 -0000	1.1
--- nl_install.html	7 Oct 2006 18:09:31 -0000	1.2
***************
*** 175,178 ****
--- 175,180 ----
  libusb-dev <br>
  linux-atm <br>
+ popt <br>
+ popt-dev <br>
        <br>
        </td>

Index: fr_install.html
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/doc/fr_install.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fr_install.html	11 Dec 2005 13:45:49 -0000	1.2
--- fr_install.html	7 Oct 2006 18:09:31 -0000	1.3
***************
*** 55,58 ****
--- 55,60 ----
  libusb-dev <br>
  linux-atm <br>
+ popt <br>
+ popt-dev <br>
        <br>
        </td>

Index: en_install.html
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/doc/en_install.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** en_install.html	11 Dec 2005 13:45:49 -0000	1.3
--- en_install.html	7 Oct 2006 18:09:31 -0000	1.4
***************
*** 54,57 ****
--- 54,59 ----
  libusb-dev <br>
  linux-atm <br>
+ popt <br>
+ popt-dev <br>
        <br>
        </td>

Index: es_install.html
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/doc/es_install.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** es_install.html	8 Dec 2004 14:45:01 -0000	1.1
--- es_install.html	7 Oct 2006 18:09:31 -0000	1.2
***************
*** 175,178 ****
--- 175,180 ----
  libusb-dev <br>
  linux-atm <br>
+ popt <br>
+ popt-dev <br>
        <br>
        </td>

[Zyxel630-11-cvs] amedyn Makefile,1.6,1.7

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

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

Modified Files:
	Makefile 
Log Message:

Upss. Wrong name, modules_install must be module_install.


Index: Makefile
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	20 Jul 2006 18:24:09 -0000	1.6
--- Makefile	7 Oct 2006 10:05:13 -0000	1.7
***************
*** 52,56 ****
  modules: AME_MODULE
  
! install: userspace_install modules_install
  
  userspace_install:
--- 52,56 ----
  modules: AME_MODULE
  
! install: userspace_install module_install
  
  userspace_install:

[Zyxel630-11-cvs] amedyn/module xdslusb_2.6.c,1.4,1.5

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

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

Modified Files:
	xdslusb_2.6.c 
Log Message:

Remove unused field 'owner'.



Index: xdslusb_2.6.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/module/xdslusb_2.6.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xdslusb_2.6.c	28 Sep 2006 20:07:42 -0000	1.4
--- xdslusb_2.6.c	7 Oct 2006 09:59:54 -0000	1.5
***************
*** 307,311 ****
  
  static struct usb_driver udsl_usb_driver = {
- 	.owner =	THIS_MODULE,
  	.name =		udsl_driver_name,
  	.probe =	udsl_usb_probe,
--- 307,310 ----

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

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

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

Modified Files:
	amedyn2.c 
Log Message:

Add a new vendor and product pair, 0x1767/0x0005.

Send by Vincenzo Cuciti and Vagante.

It is use by the Alcatel versions of the Mediacom 103/MADSLU.


Index: amedyn2.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** amedyn2.c	18 Sep 2006 17:40:35 -0000	1.11
--- amedyn2.c	28 Sep 2006 20:08:43 -0000	1.12
***************
*** 56,59 ****
--- 56,61 ----
  #define AME_VENDORID3		        0x0b05  /* Vendor = Asustek */
  #define AME_PRODUCTID3		        0x6206  /* Product = AAM6000UG with Alcatel chipset */
+ #define AME_VENDORID4		        0x1767  /* Vendor =  */
+ #define AME_PRODUCTID4		        0x0005  /* Product = */
  
  #define CTRL_TIMEOUT 2000	/* milliseconds */
***************
*** 656,659 ****
--- 658,662 ----
  	{USB_DEVICE(AME_VENDORID2, AME_PRODUCTID2)},
  	{USB_DEVICE(AME_VENDORID3, AME_PRODUCTID3)},
+ 	{USB_DEVICE(AME_VENDORID4, AME_PRODUCTID4)},
  	{}
  };
***************
*** 800,804 ****
  	instance->havebufconf = 0;
  	instance->initfirmfile = "Init-usb.bin";
! 	if (usb_dev->descriptor.idProduct == AME_PRODUCTID2) {
  	    dbg("Config for modem type 2 (Zyxel)");
  	    instance->datamax = 0x1a0;
--- 803,808 ----
  	instance->havebufconf = 0;
  	instance->initfirmfile = "Init-usb.bin";
! 	if (usb_dev->descriptor.idProduct == AME_PRODUCTID2
! 	    || usb_dev->descriptor.idProduct == AME_PRODUCTID4) {
  	    dbg("Config for modem type 2 (Zyxel)");
  	    instance->datamax = 0x1a0;

[Zyxel630-11-cvs] amedyn/init amfunctions.c, 1.17, 1.18 amioctl.c, 1.3, 1.4

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

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

Modified Files:
	amfunctions.c amioctl.c 
Log Message:

Add a new vendor and product pair, 0x1767/0x0005.

Send by Vincenzo Cuciti and Vagante.

It is use by the Alcatel versions of the Mediacom 103/MADSLU.


Index: amioctl.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amioctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** amioctl.c	15 Jan 2005 17:11:21 -0000	1.3
--- amioctl.c	28 Sep 2006 20:07:41 -0000	1.4
***************
*** 95,98 ****
--- 95,102 ----
      return 2;
  
+   /* Vendor = Mediacom Europe?, Product = DynaMiTe USB Modem */
+   if (vid == 0x1767 && pid == 0x0005)
+     return 1;
+ 
    return -1;
  }

Index: amfunctions.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** amfunctions.c	1 Sep 2006 09:09:51 -0000	1.17
--- amfunctions.c	28 Sep 2006 20:07:41 -0000	1.18
***************
*** 801,804 ****
--- 801,808 ----
      return 2;
  
+   /* Vendor = Mediacom Europe?, Product = DynaMiTe USB Modem */
+   if (vid == 0x1767 && pid == 0x0005)
+     return 1;
+ 
  //  if (vid == 0x0572 && pid == 0xcafe)
  //    return 2;

[Zyxel630-11-cvs] amedyn/module xdslusb_2.4.c, 1.1.1.1, 1.2 xdslusb_2.6.c, 1.3, 1.4

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

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

Modified Files:
	xdslusb_2.4.c xdslusb_2.6.c 
Log Message:

Add a new vendor and product pair, 0x1767/0x0005.

Send by Vincenzo Cuciti and Vagante.

It is use by the Alcatel versions of the Mediacom 103/MADSLU.


Index: xdslusb_2.4.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/module/xdslusb_2.4.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xdslusb_2.4.c	7 Dec 2004 19:37:41 -0000	1.1.1.1
--- xdslusb_2.4.c	28 Sep 2006 20:07:41 -0000	1.2
***************
*** 133,136 ****
--- 133,138 ----
  #define AME_VENDORID3		        0x0b05  /* Vendor = Asustek */
  #define AME_PRODUCTID3		        0x6206  /* Product = AAM6000UG with Alcatel chipset */
+ #define AME_VENDORID4		        0x1767  /* Vendor = */
+ #define AME_PRODUCTID4		        0x0005  /* Product = */
  
  		
***************
*** 195,198 ****
--- 197,201 ----
  	{ USB_DEVICE (AME_VENDORID2, AME_PRODUCTID2) },
  	{ USB_DEVICE (AME_VENDORID3, AME_PRODUCTID3) },
+ 	{ USB_DEVICE (AME_VENDORID4, AME_PRODUCTID4) },
  	{ }
  };
***************
*** 1082,1085 ****
--- 1085,1090 ----
  		return UDSL_MODEM_TYPE1;
  
+ 	else if (vid == AME_VENDORID4 && pid == AME_PRODUCTID4 && cl == USB_CLASS_VENDOR_SPEC && ifn == 1)
+ 		return UDSL_MODEM_TYPE1;
  
  	return -1;

Index: xdslusb_2.6.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/module/xdslusb_2.6.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xdslusb_2.6.c	17 Jul 2006 14:42:59 -0000	1.3
--- xdslusb_2.6.c	28 Sep 2006 20:07:42 -0000	1.4
***************
*** 116,119 ****
--- 116,121 ----
  #define AME_VENDORID3		        0x0b05  /* Vendor = Asustek */
  #define AME_PRODUCTID3		        0x6206  /* Product = AAM6000UG with Alcatel chipset */
+ #define AME_VENDORID4		        0x1767  /* Vendor =  */
+ #define AME_PRODUCTID4		        0x0005  /* Product = */
  
  		
***************
*** 178,181 ****
--- 180,184 ----
  	{ USB_DEVICE (AME_VENDORID2, AME_PRODUCTID2) },
  	{ USB_DEVICE (AME_VENDORID3, AME_PRODUCTID3) },
+ 	{ USB_DEVICE (AME_VENDORID4, AME_PRODUCTID4) },
  	{ }
  };
***************
*** 1065,1068 ****
--- 1068,1073 ----
  		return UDSL_MODEM_TYPE1;
  
+ 	else if (vid == AME_VENDORID4 && pid == AME_PRODUCTID4 && cl == USB_CLASS_VENDOR_SPEC && ifn == 1)
+ 		return UDSL_MODEM_TYPE1;
  
  	return -1;

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

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

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

Modified Files:
	amcontrol.c 
Log Message:

Add a new vendor and product pair, 0x1767/0x0005.

Send by Vincenzo Cuciti and Vagante.

It is use by the Alcatel versions of the Mediacom 103/MADSLU.


Index: amcontrol.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/amcontrol/amcontrol.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** amcontrol.c	22 Jul 2006 11:37:31 -0000	1.7
--- amcontrol.c	28 Sep 2006 20:07:41 -0000	1.8
***************
*** 287,290 ****
--- 287,294 ----
      return 2;
  
+   /* Vendor = Mediacom Europe?, Product = DynaMiTe USB Modem */
+   if (vid == 0x1767 && pid == 0x0005)
+     return 1;
+ 
  //  if (vid == 0x0572 && pid == 0xcafe)
  //    return 2;

[Zyxel630-11-cvs] amedyn/scripts/config amedyn,1.4,1.5

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

Update of /cvsroot/zyxel630-11/amedyn/scripts/config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14494/scripts/config

Modified Files:
	amedyn 
Log Message:

Add a new vendor and product pair, 0x1767/0x0005.

Send by Vincenzo Cuciti and Vagante.

It is use by the Alcatel versions of the Mediacom 103/MADSLU.


Index: amedyn
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn/scripts/config/amedyn,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** amedyn	20 May 2006 12:18:04 -0000	1.4
--- amedyn	28 Sep 2006 20:07:42 -0000	1.5
***************
*** 22,27 ****
  
  # xusbatm
! VENDOR="0x06b9"  # 0x06b9 / 0x0b05
! PRODUCT="0xa5a5" # 0xa5a5 / 0x6206
  RX_ENDPOINT="0x87"
  TX_ENDPOINT="0x07"
--- 22,27 ----
  
  # xusbatm
! VENDOR="0x06b9"  # 0x06b9 / 0x0b05 / 0x1767
! PRODUCT="0xa5a5" # 0xa5a5 / 0x6206 / 0x0005
  RX_ENDPOINT="0x87"
  TX_ENDPOINT="0x07"

[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;