You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(15) |
Feb
|
Mar
(20) |
Apr
(14) |
May
|
Jun
(24) |
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(3) |
Dec
(29) |
2006 |
Jan
|
Feb
|
Mar
(24) |
Apr
|
May
(17) |
Jun
|
Jul
(34) |
Aug
|
Sep
(9) |
Oct
(6) |
Nov
(12) |
Dec
(2) |
2007 |
Jan
(5) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(17) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Aurelio <sk...@us...> - 2007-08-30 22:46:57
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6036 Modified Files: amedyn2.c Log Message: Fix misplacing of a goto. (Xavier) Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** amedyn2.c 30 Aug 2007 22:44:06 -0000 1.22 --- amedyn2.c 30 Aug 2007 22:46:46 -0000 1.23 *************** *** 239,244 **** ret = usb_bulk_msg (usb_dev, usb_sndbulkpipe(usb_dev, ENDPOINT_FIRMWARE), buf, 3, NULL, DATA_TIMEOUT); if (ret < 0) { - goto out_free; dbg("amedyn_upload_firmware: write Init firmware to modem failed (%d)!", ret); } } while (offset < fw1->size ); --- 239,244 ---- ret = usb_bulk_msg (usb_dev, usb_sndbulkpipe(usb_dev, ENDPOINT_FIRMWARE), buf, 3, NULL, DATA_TIMEOUT); if (ret < 0) { dbg("amedyn_upload_firmware: write Init firmware to modem failed (%d)!", ret); + goto out_free; } } while (offset < fw1->size ); |
From: Aurelio <sk...@us...> - 2007-08-30 22:44:42
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5071 Modified Files: amedyn2.c Log Message: amedyn2.c Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** amedyn2.c 22 Aug 2007 18:15:36 -0000 1.21 --- amedyn2.c 30 Aug 2007 22:44:06 -0000 1.22 *************** *** 135,139 **** atm_warn(usbatm, "%s: Failed sync down command: %d\n", __func__, ret); return ret; } ! atm_dbg(usbatm, "%s: OK sync dowm command\n", __func__); atm_dev->signal = ATM_PHY_SIG_UNKNOWN; --- 135,139 ---- atm_warn(usbatm, "%s: Failed sync down command: %d\n", __func__, ret); return ret; } ! atm_dbg(usbatm, "%s: OK sync down command\n", __func__); atm_dev->signal = ATM_PHY_SIG_UNKNOWN; |
From: Aurelio <sk...@us...> - 2007-08-22 18:15:35
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24132 Modified Files: amedyn2.c Log Message: This modem don't support isochronous transfer. Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** amedyn2.c 22 Aug 2007 17:10:29 -0000 1.20 --- amedyn2.c 22 Aug 2007 18:15:36 -0000 1.21 *************** *** 68,72 **** #define DEFAULT_BULK_ALTSETTING 1 - #define DEFAULT_ISOC_ALTSETTING 1 /* This modem don't have iso*/ static unsigned int altsetting = DEFAULT_BULK_ALTSETTING; --- 68,71 ---- *************** *** 689,693 **** int num_interfaces = usb_dev->actconfig->desc.bNumInterfaces; int i, ret; - int use_isoc; /* This modem don't have iso*/ usb_dbg(usbatm, "%s entered\n", __func__); --- 688,691 ---- *************** *** 731,737 **** instance->usbatm = usbatm; ! /* altsetting and enable_isoc may change at any moment, so take a snapshot */ instance->altsetting = altsetting; - use_isoc = 0; if (instance->altsetting) --- 729,734 ---- instance->usbatm = usbatm; ! /* altsetting may change at any moment, so take a snapshot */ instance->altsetting = altsetting; if (instance->altsetting) *************** *** 741,782 **** } ! if (!instance->altsetting && use_isoc) ! if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_ISOC_ALTSETTING)) < 0) { ! usb_dbg(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_ISOC_ALTSETTING, ret); ! use_isoc = 0; /* fall back to bulk */ ! } ! ! if (use_isoc) { ! const struct usb_host_interface *desc = data_intf->cur_altsetting; ! const __u8 target_address = USB_DIR_IN | usbatm->driver->isoc_in; ! int i; ! ! use_isoc = 0; /* fall back to bulk if endpoint not found */ ! ! for (i=0; i<desc->desc.bNumEndpoints; i++) { ! const struct usb_endpoint_descriptor *endpoint_desc = &desc->endpoint[i].desc; ! ! if ((endpoint_desc->bEndpointAddress == target_address)) { ! use_isoc = (endpoint_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == ! USB_ENDPOINT_XFER_ISOC; ! break; ! } ! } ! ! if (!use_isoc) ! usb_info(usbatm, "isochronous transfer not supported - using bulk\n"); ! } ! ! if (!use_isoc && !instance->altsetting) if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_BULK_ALTSETTING)) < 0) { usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_BULK_ALTSETTING, ret); goto fail_free; } - if (!instance->altsetting) - instance->altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING; - - usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0); - INIT_DELAYED_WORK(&instance->status_checker, amedyn_check_status); --- 738,749 ---- } ! if (!instance->altsetting) { if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_BULK_ALTSETTING)) < 0) { usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_BULK_ALTSETTING, ret); goto fail_free; + } + instance->altsetting = DEFAULT_BULK_ALTSETTING; } INIT_DELAYED_WORK(&instance->status_checker, amedyn_check_status); |
From: Aurelio <sk...@us...> - 2007-08-22 17:10:30
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26071 Modified Files: amedyn2.c Log Message: Allow write linetype param on sysfs. Why? Duncan Sands say: it's not very useful, but it does allow you to experiment with different altsettings without unloading the module: write the new altsetting then replug the modem. It might also be useful if you want to plug in a second modem and use a different altsetting for that. Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** amedyn2.c 19 Aug 2007 23:41:19 -0000 1.19 --- amedyn2.c 22 Aug 2007 17:10:29 -0000 1.20 *************** *** 77,81 **** static int linetype = 0; ! module_param(linetype, uint, 0444); MODULE_PARM_DESC(linetype, "Set phone line type code"); --- 77,81 ---- static int linetype = 0; ! module_param(linetype, uint, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(linetype, "Set phone line type code"); |
From: Aurelio <sk...@us...> - 2007-08-20 16:52:36
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1107 Modified Files: usbatm.c Log Message: >From Linux Kernel: usbatm_heavy_init: don't use CLONE_SIGHAND usbatm_do_heavy_init() calls allow_signal() which plays with parent process's ->sighand. http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=b8a124da9261873e3e3541898d5c46d273afee34 Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** usbatm.c 20 Aug 2007 16:47:58 -0000 1.25 --- usbatm.c 20 Aug 2007 16:52:38 -0000 1.26 *************** *** 1096,1100 **** static int usbatm_heavy_init(struct usbatm_data *instance) { ! int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_KERNEL); if (ret < 0) { --- 1096,1100 ---- static int usbatm_heavy_init(struct usbatm_data *instance) { ! int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_FS | CLONE_FILES); if (ret < 0) { |
From: Aurelio <sk...@us...> - 2007-08-20 16:48:00
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31417 Modified Files: usbatm.c Log Message: >From Linux Kernel: header cleaning: don't include smp_lock.h when not used Remove includes of <linux/smp_lock.h> where it is not used/needed. Suggested by Al Viro. Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc, sparc64, and arm (all 59 defconfigs). http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=e63340ae6b6205fef26b40a75673d1c9c0c8bb90 Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** usbatm.c 20 Aug 2007 16:42:14 -0000 1.24 --- usbatm.c 20 Aug 2007 16:47:58 -0000 1.25 *************** *** 78,82 **** #include <linux/signal.h> #include <linux/slab.h> - #include <linux/smp_lock.h> #include <linux/stat.h> #include <linux/timer.h> --- 78,81 ---- |
From: Aurelio <sk...@us...> - 2007-08-20 16:42:13
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29302 Modified Files: usbatm.c Log Message: >From Linux Kernel: usbatm: Detect usb device shutdown and ignore failed urbs Detect usb device shutdown and ignore failed urbs. This happens when the driver is unloaded or the device is unplugged. I'm not sure what other urb statuses should be ignored, and the warning message doesn't need to be shown when the module is unloaded or the device is removed. http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=7d5e1dd40bd5ced457be178e4f0b1267a3df2142 Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** usbatm.c 20 Aug 2007 16:29:44 -0000 1.23 --- usbatm.c 20 Aug 2007 16:42:14 -0000 1.24 *************** *** 299,302 **** --- 299,305 ---- urb->status != -EILSEQ )) { + if (urb->status == -ESHUTDOWN) + return; + if (printk_ratelimit()) atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n", |
From: Aurelio <sk...@us...> - 2007-08-20 16:29:45
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23511 Modified Files: usbatm.c Log Message: >From Linux Kernel: [SK_BUFF]: Introduce skb_copy_to_linear_data{_offset} To clearly state the intent of copying to linear sk_buffs, _offset being a overly long variant but interesting for the sake of saving some bytes. http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=27d7ff46a3498d3debc6ba68fb8014c702b81170 Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** usbatm.c 20 Aug 2007 16:25:49 -0000 1.22 --- usbatm.c 20 Aug 2007 16:29:44 -0000 1.23 *************** *** 469,473 **** } ! memcpy(skb->data, skb_tail_pointer(sarb) - pdu_length, length); __skb_put(skb, length); --- 469,475 ---- } ! skb_copy_to_linear_data(skb, ! skb_tail_pointer(sarb) - pdu_length, ! length); __skb_put(skb, length); |
From: Aurelio <sk...@us...> - 2007-08-20 16:25:48
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21811 Modified Files: usbatm.c Log Message: >From Linux Kernel: [SK_BUFF]: Introduce skb_copy_from_linear_data{_offset} To clearly state the intent of copying from linear sk_buffs, _offset being a overly long variant but interesting for the sake of saving some bytes. http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=d626f62b11e00c16e81e4308ab93d3f13551812a Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** usbatm.c 20 Aug 2007 16:16:16 -0000 1.21 --- usbatm.c 20 Aug 2007 16:25:49 -0000 1.22 *************** *** 557,561 **** ptr += ATM_CELL_HEADER; ! memcpy(ptr, skb->data, data_len); ptr += data_len; __skb_pull(skb, data_len); --- 557,561 ---- ptr += ATM_CELL_HEADER; ! skb_copy_from_linear_data(skb, ptr, data_len); ptr += data_len; __skb_pull(skb, data_len); |
From: Aurelio <sk...@us...> - 2007-08-20 16:16:18
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17372 Modified Files: usbatm.c Log Message: >From Linux Kernel: So that it is also an offset from skb->head, reduces its size from 8 to 4 bytes on 64bit architectures, allowing us to combine the 4 bytes hole left by the layer headers conversion, reducing struct sk_buff size to 256 bytes, i.e. 4 64byte cachelines, and since the sk_buff slab cache is SLAB_HWCACHE_ALIGN... :-) Many calculations that previously required that skb->{transport,network, mac}_header be first converted to a pointer now can be done directly, being meaningful as offsets or pointers. http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=27a884dc3cb63b93c2b3b643f5b31eed5f8a4d26 Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** usbatm.c 20 Aug 2007 15:31:59 -0000 1.20 --- usbatm.c 20 Aug 2007 16:16:16 -0000 1.21 *************** *** 408,420 **** sarb = instance->cached_vcc->sarb; ! if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) { atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n", __func__, sarb->len, vcc); /* discard cells already received */ skb_trim(sarb, 0); ! UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end); } ! memcpy(sarb->tail, source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD); __skb_put(sarb, ATM_CELL_PAYLOAD); --- 408,420 ---- sarb = instance->cached_vcc->sarb; ! if (skb_tail_pointer(sarb) + ATM_CELL_PAYLOAD > sarb->end) { atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n", __func__, sarb->len, vcc); /* discard cells already received */ skb_trim(sarb, 0); ! UDSL_ASSERT(skb_tail_pointer(sarb) + ATM_CELL_PAYLOAD <= sarb->end); } ! memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD); __skb_put(sarb, ATM_CELL_PAYLOAD); *************** *** 443,447 **** } ! if (crc32_be(~0, sarb->tail - pdu_length, pdu_length) != 0xc704dd7b) { atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n", __func__, vcc); --- 443,447 ---- } ! if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) { atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n", __func__, vcc); *************** *** 469,473 **** } ! memcpy(skb->data, sarb->tail - pdu_length, length); __skb_put(skb, length); --- 469,473 ---- } ! memcpy(skb->data, skb_tail_pointer(sarb) - pdu_length, length); __skb_put(skb, length); |
From: Aurelio <sk...@us...> - 2007-08-20 15:31:59
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30458 Modified Files: usbatm.c Log Message: Remove struct pt_regs argument in completion handlers. Use current rather than get_current(). (usbatm CVS 1.67 -> 1.68) Index: usbatm.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** usbatm.c 18 Nov 2006 14:54:47 -0000 1.19 --- usbatm.c 20 Aug 2007 15:31:59 -0000 1.20 *************** *** 279,283 **** } ! static void usbatm_complete(struct urb *urb, struct pt_regs *regs) { struct usbatm_channel *channel = urb->context; --- 279,283 ---- } ! static void usbatm_complete(struct urb *urb) { struct usbatm_channel *channel = urb->context; *************** *** 1074,1078 **** daemonize(instance->driver->driver_name); allow_signal(SIGTERM); ! instance->thread_pid = get_current()->pid; complete(&instance->thread_started); --- 1074,1078 ---- daemonize(instance->driver->driver_name); allow_signal(SIGTERM); ! instance->thread_pid = current->pid; complete(&instance->thread_started); |
From: Aurelio <sk...@us...> - 2007-08-19 23:41:17
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14382 Modified Files: amedyn2.c Log Message: "local" functions should be declared static: format_message, send_block (Xavier) Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** amedyn2.c 19 Aug 2007 23:35:02 -0000 1.18 --- amedyn2.c 19 Aug 2007 23:41:19 -0000 1.19 *************** *** 149,153 **** /* From userspace tool */ /* format a message */ ! void format_message(int cmd, int ldata, int address, char *bufin) { char buf[8]; /* initial bytes of a message */ --- 149,153 ---- /* From userspace tool */ /* format a message */ ! static void format_message(int cmd, int ldata, int address, char *bufin) { char buf[8]; /* initial bytes of a message */ *************** *** 168,172 **** /* From userspace tool */ ! int send_block(struct amedyn_instance_data *instance, int place, char *bufin, int len) { struct usb_device *dev = instance->usbatm->usb_dev; --- 168,172 ---- /* From userspace tool */ ! static int send_block(struct amedyn_instance_data *instance, int place, char *bufin, int len) { struct usb_device *dev = instance->usbatm->usb_dev; |
From: Aurelio <sk...@us...> - 2007-08-19 23:35:02
|
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 */ |
From: Aurelio <sk...@us...> - 2007-08-19 22:45:36
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18101 Modified Files: Makefile Removed Files: xusbatm.c Log Message: Remove xusbatm.c from sourceforge. Usefull version in Linux Kernel since 2006-02-01. --- xusbatm.c DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 10 Dec 2005 01:20:38 -0000 1.7 --- Makefile 19 Aug 2007 22:45:32 -0000 1.8 *************** *** 3,7 **** endif ! obj-m := usbatm.o amedyn2.o xusbatm.o all help modules modules_install: --- 3,7 ---- endif ! obj-m := usbatm.o amedyn2.o all help modules modules_install: *************** *** 34,44 **** /sbin/depmod -ae - uninstall_xusbatm: - rm -f /lib/modules/$(shell uname -r)/extra/xusbatm.ko - /sbin/depmod -ae - uninstall_old: uninstall_amedyn uninstall_usb_atm ! keep_xusbatm: uninstall_old uninstall_amedyn2 ! ! uninstall: uninstall_old uninstall_amedyn2 uninstall_usbatm uninstall_xusbatm --- 34,38 ---- /sbin/depmod -ae uninstall_old: uninstall_amedyn uninstall_usb_atm ! uninstall: uninstall_old uninstall_amedyn2 uninstall_usbatm |
From: Aurelio <sk...@us...> - 2007-08-19 22:30:35
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14231 Removed Files: crc.h crc.c Log Message: Not need. (saint xavier) --- crc.h DELETED --- --- crc.c DELETED --- |
From: Aurelio <sk...@us...> - 2007-08-17 16:28:57
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14136 Modified Files: amedyn2.c Log Message: linux/usb_ch9.h => linux/usb/ch9.h (Renato Caldas) http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=commitdiff;h=5f848137744106ee737f559454ce5adfceb38347;hp=d728e327d4f86df439fa6b6f2f64b278394a58cc Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** amedyn2.c 13 Feb 2007 20:34:30 -0000 1.16 --- amedyn2.c 17 Aug 2007 15:20:06 -0000 1.17 *************** *** 40,44 **** #include <linux/timer.h> #include <linux/types.h> ! #include <linux/usb_ch9.h> #include <linux/workqueue.h> --- 40,44 ---- #include <linux/timer.h> #include <linux/types.h> ! #include <linux/usb/ch9.h> #include <linux/workqueue.h> |
From: Aurelio <sk...@us...> - 2007-08-17 16:25:02
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30903 Added Files: .cvsignore Log Message: (Renato Caldas) --- NEW FILE: .cvsignore --- *.ko *.mod.c *.cmd .tmp_versions Module.symvers |
From: Aurelio <sk...@us...> - 2007-03-23 21:33:36
|
Update of /cvsroot/zyxel630-11/amedyn/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13893 Modified Files: amstart.sh Log Message: Adding support for PPTP. (mrbento) Index: amstart.sh =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amstart.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** amstart.sh 8 Oct 2006 13:31:08 -0000 1.3 --- amstart.sh 23 Mar 2007 21:33:32 -0000 1.4 *************** *** 36,41 **** amnet4up.sh || exit 1 else ! echo $"Error: unknow protocol mode" 1>&2 ! exit 1 fi fi --- 36,46 ---- amnet4up.sh || exit 1 else ! if [ "$PROTOCOL_MODE" -eq 5 ]; then ! echo $"Setting PPTP..." ! amnet5up.sh || exit 1 ! else ! echo $"Error: unknow protocol mode" 1>&2 ! exit 1 ! fi fi fi |
From: Aurelio <sk...@us...> - 2007-02-13 20:34:40
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6794 Modified Files: amedyn2.c Log Message: Fix build errors with kernel 2.6.20 about work_struct. Now the module build, usbatm with warning. I'm not use it. http://lkml.org/lkml/2006/12/5/269 Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** amedyn2.c 2 Dec 2006 16:13:38 -0000 1.15 --- amedyn2.c 13 Feb 2007 20:34:30 -0000 1.16 *************** *** 106,110 **** unsigned int altsetting; ! struct work_struct status_checker; unsigned char last_status; --- 106,110 ---- unsigned int altsetting; ! struct delayed_work status_checker; unsigned char last_status; *************** *** 502,507 **** } ! static void amedyn_check_status(struct amedyn_instance_data *instance) { struct usbatm_data *usbatm = instance->usbatm; struct atm_dev *atm_dev = usbatm->atm_dev; --- 502,511 ---- } ! static void amedyn_check_status(struct work_struct *work) { + + struct amedyn_instance_data *instance = + container_of(work, struct amedyn_instance_data, + status_checker.work); struct usbatm_data *usbatm = instance->usbatm; struct atm_dev *atm_dev = usbatm->atm_dev; *************** *** 597,601 **** struct amedyn_instance_data *instance = (void *)data; ! schedule_work(&instance->status_checker); /* The following check is racy, but the race is harmless */ --- 601,605 ---- struct amedyn_instance_data *instance = (void *)data; ! schedule_delayed_work(&instance->status_checker, 0); /* The following check is racy, but the race is harmless */ *************** *** 778,782 **** usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0); ! INIT_WORK(&instance->status_checker, (void *)amedyn_check_status, instance); instance->status_checker.timer.function = amedyn_status_poll; --- 782,786 ---- usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0); ! INIT_DELAYED_WORK(&instance->status_checker, amedyn_check_status); instance->status_checker.timer.function = amedyn_status_poll; |
From: Emmanuel C. <ma...@us...> - 2007-01-19 00:25:21
|
Update of /cvsroot/zyxel630-11/amedyn/driverconfig In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5236 Modified Files: connectconfig.sh Log Message: general improvements... Index: connectconfig.sh =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/driverconfig/connectconfig.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** connectconfig.sh 18 Jan 2007 21:20:37 -0000 1.1 --- connectconfig.sh 19 Jan 2007 00:25:18 -0000 1.2 *************** *** 42,46 **** function protocol() { - clear while [ !$(true) ] do --- 42,45 ---- *************** *** 53,83 **** echo "[4] PPP over Ethernet (pppoe)" echo "=======================" ! echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-4]: " read PROTOCOL_MODE case $PROTOCOL_MODE in ! 1) echo "RFC1483/2684 routed" break ;; ! 2) echo "PPP over ATM (pppoa)" break ;; ! 3) echo "RFC1483/2684 bridged" break ;; ! 4) echo "PPP over Ethernet (pppoe)" break ;; ! *) echo "Opps!!! Please select choice 1,2,3,4"; ! # echo "Press a key. . ." ; ! read ;; esac --- 52,82 ---- echo "[4] PPP over Ethernet (pppoe)" echo "=======================" ! echo -n "Enter your menu choice. [1-4]: " read PROTOCOL_MODE case $PROTOCOL_MODE in ! 1) echo "RFC1483/2684 routed" break ;; ! 2) echo "PPP over ATM (pppoa)" break ;; ! 3) echo "RFC1483/2684 bridged" break ;; ! 4) echo "PPP over Ethernet (pppoe)" break ;; ! *) echo "Opps!!! Please select choice 1,2,3,4"; ! # echo "Press a key. . ." ; ! read ;; esac *************** *** 89,93 **** function drivermode() { - clear while [ !$(true) ] do --- 88,91 ---- *************** *** 95,123 **** echo " Driver Mode Menu " echo "-------------------------------------" ! echo "[1] Classical userspace amedyn (for mainly for 2.4 kernels)" ! echo "[2] New kernel space driver amedyn2 (experimental)" ! echo "[3] Updated generic driver usbatm (best for last 2.6 kernels)" echo "=======================" ! echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-3]: " read DRIVER_MODE case $DRIVER_MODE in ! 1) echo "amedyn" break ;; ! 2) echo "amedyn2" break ;; ! 3) echo "xusbatm" break ;; ! *) echo "Opps!!! Please select choice 1,2,3"; ! read ;; esac --- 93,121 ---- echo " Driver Mode Menu " echo "-------------------------------------" ! echo "[1] amload + amedyn : Old classical userspace driver (mainly for 2.4 kernels)" ! echo "[2] amedyn2 + usbatm : New kernel space driver (experimental, see public aid request on website)" ! echo "[3] amload + xusbatm : Updated generic driver (actualy the best solution for last 2.6 kernels)" echo "=======================" ! echo -n "Enter your menu choice. [1-3]: " read DRIVER_MODE case $DRIVER_MODE in ! 1) echo "amedyn" break ;; ! 2) echo "amedyn2" break ;; ! 3) echo "xusbatm" break ;; ! *) echo "Opps!!! Please select choice 1,2,3"; ! read ;; esac *************** *** 127,131 **** function linetype() { - clear while [ !$(true) ] do --- 125,128 ---- *************** *** 133,149 **** echo " Line Type Menu " echo "-------------------------------------" ! echo "[1] Analogical" ! echo "[2] ISDN" echo "=======================" ! echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-2]: " read linetype case $linetype in ! 1) ! echo "analogical" line=0x15 break ;; ! 2) echo "ISDN" line=0x11 --- 130,146 ---- echo " Line Type Menu " echo "-------------------------------------" ! echo "[1] Analog line" ! echo "[2] ISDN line" echo "=======================" ! echo -n "Enter your menu choice. [1-2]: " read linetype case $linetype in ! 1) ! echo "Analog" line=0x15 break ;; ! 2) echo "ISDN" line=0x11 *************** *** 151,157 **** ;; ! *) echo "Opps!!! Please select choice 1,2"; ! read ;; esac --- 148,154 ---- ;; ! *) echo "Opps!!! Please select choice 1,2"; ! read ;; esac *************** *** 162,170 **** function modem() { ! clear while [ !$(true) ] do echo -e "\n-------------------------------------" ! echo " Modem Menu " echo "-------------------------------------" echo "[1] 0x06b9/0xa5a5 : Zyxel Prestige 630-11, Zyxel Prestige 630-13, Topcom Webracer 851, ..." --- 159,193 ---- function modem() { ! echo "Please connect your modem if it's not already done ? (press any key when ready)" ! read -n1 ! ! modem=$(cat /proc/bus/usb/devices | grep "Vendor=0b05 ProdID=6206") ! if [ $? -eq 0 ]; then ! vid=0x0b05 ! pid=0x6206 ! else ! modem=$(cat /proc/bus/usb/devices | grep "Vendor=06b9 ProdID=a5a5") ! if [ $? -eq 0 ]; then ! vid=0x06b9 ! pid=0xa5a5 ! else ! modem=$(cat /proc/bus/usb/devices | grep "Vendor=1767 ProdID=0005") ! if [ $? -eq 0 ]; then ! vid=0x1767 ! pid=0x0005 ! fi ! fi ! fi ! ! if [ -n $vid ]; then ! echo "Modem found! ($vid:$pid)" ! return ! fi ! ! while [ !$(true) ] do echo -e "\n-------------------------------------" ! echo " The modem was not found please select one : " echo "-------------------------------------" echo "[1] 0x06b9/0xa5a5 : Zyxel Prestige 630-11, Zyxel Prestige 630-13, Topcom Webracer 851, ..." *************** *** 172,179 **** echo "[3] 0x1767/0x0005 : Medi@com 103/MADSLU" echo "=======================" ! echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-3]: " read modemtype case $modemtype in ! 1) echo "0x06b9/0xa5a5" vid=0x06b9 --- 195,202 ---- echo "[3] 0x1767/0x0005 : Medi@com 103/MADSLU" echo "=======================" ! echo -n "Enter your menu choice. [1-3]: " read modemtype case $modemtype in ! 1) echo "0x06b9/0xa5a5" vid=0x06b9 *************** *** 182,186 **** ;; ! 2) echo "0x0b05/0x6206" vid=0x0b05 --- 205,209 ---- ;; ! 2) echo "0x0b05/0x6206" vid=0x0b05 *************** *** 188,193 **** break ;; ! ! 3) echo "0x1767/0x0005" vid=0x1767 --- 211,216 ---- break ;; ! ! 3) echo "0x1767/0x0005" vid=0x1767 *************** *** 196,202 **** ;; ! *) echo "Opps!!! Please select choice 1,2 or 3"; ! read ;; esac --- 219,225 ---- ;; ! *) echo "Opps!!! Please select choice 1,2 or 3"; ! read ;; esac *************** *** 209,218 **** echo -e "At any time, press Ctrl+C to quit this script without saving modifications.\n" echo -n "Do you want to set your connection setting by using this script (Y/n) ? " ! read ans ! if [[ "$ans" = "n" || "$ans" = "N" ]] ! then exit 0 ! fi resync=0 --- 232,241 ---- echo -e "At any time, press Ctrl+C to quit this script without saving modifications.\n" echo -n "Do you want to set your connection setting by using this script (Y/n) ? " ! read -n1 ans ! echo -e "\n\n" ! if [[ "$ans" = "n" || "$ans" = "N" ]]; then exit 0 ! fi resync=0 *************** *** 221,239 **** modem linetype - protcol - drivermode protocol vpi vci ! clear ! if [[ "$PROTOCOL_MODE" = 1 || "$PROTOCOL_MODE" = 3 ]]; then echo -e "\n-------------------------------------" echo " For or RFC1483/2684 routed/bridged " echo -e "-------------------------------------\n" ! echo -n "Enter IP address (If you left it blank in bridged mode, then it will use DHCP to get IP), actual IP_ADDRESS : " read IP_ADDRESS ! echo -n "Enter the network mask (If you left if blank 255.255.255.0 will bu used), actual NETMASK : " read NETMASK if [ "$NETMASK" = "" ] --- 244,264 ---- modem linetype protocol + drivermode + + + if [[ $PROTOCOL_MODE -eq 1 || $PROTOCOL_MODE -eq 3 || $PROTOCOL_MODE -eq 4 ]]; then vpi vci + fi ! if [[ "$PROTOCOL_MODE" = 1 || "$PROTOCOL_MODE" = 3 ]]; then echo -e "\n-------------------------------------" echo " For or RFC1483/2684 routed/bridged " echo -e "-------------------------------------\n" ! echo -n "Enter IP address (If you left it blank in bridged mode, then it will use DHCP to get IP) : " read IP_ADDRESS ! echo -n "Enter the network mask (If you left if blank 255.255.255.0 will bu used) : " read NETMASK if [ "$NETMASK" = "" ] *************** *** 241,245 **** NETMASK=255.255.255.0 fi ! echo -n "Enter the gateway IP, actual GATEWAY : " read GATEWAY fi --- 266,270 ---- NETMASK=255.255.255.0 fi ! echo -n "Enter the gateway IP : " read GATEWAY fi *************** *** 299,307 **** RESYNC=$resync ! " > ./etc/amedyn) ] do echo -e "\nERROR writing config to file" echo -n "Try again ? (Y/n) : " ! read ans if [[ "$ans" = "n" || "$ans" = "N" ]] then --- 324,332 ---- RESYNC=$resync ! " > /etc/amedyn) ] do echo -e "\nERROR writing config to file" echo -n "Try again ? (Y/n) : " ! read -n1 ans if [[ "$ans" = "n" || "$ans" = "N" ]] then *************** *** 310,318 **** done ! if [[ "$PROTOCOL_MODE" = 2 ]]; ! then ./pppoatm_config.sh fi - echo "done" \ No newline at end of file --- 335,350 ---- done ! echo "done" ! ! if [[ "$PROTOCOL_MODE" = 2 ]]; then ! echo -n "Would you like to set connection settings ? (Y/n) : " ! read -n1 ans ! echo -e "\n\n\n\n" ! if [[ "$ans" = "n" || "$ans" = "N" ]] ! then ! exit -1 ! fi ./pppoatm_config.sh fi |
From: Emmanuel C. <ma...@us...> - 2007-01-18 21:21:52
|
Update of /cvsroot/zyxel630-11/amedyn/driverconfig In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24722 Removed Files: amedyn_autoconf Log Message: removing obsolete file --- amedyn_autoconf DELETED --- |
From: Emmanuel C. <ma...@us...> - 2007-01-18 21:20:50
|
Update of /cvsroot/zyxel630-11/amedyn/driverconfig In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24237 Added Files: amedyn_autoconf connectconfig.sh pppoatm_chap-secrets pppoatm_config.sh pppoatm_options pppoatm_pap-secrets Log Message: add some scripts to install the modem easyly --- NEW FILE: connectconfig.sh --- #!/bin/bash function vpi() { vpi="" while [ -z "$vpi" ]; do echo -n "Type in your VPI: " read vpi echo $vpi | grep -E "^[0-9]+$" > /dev/null 2>&1 if [ $? -ne 0 ]; then vpi="" echo -e "** invalid VPI, please enter it again\n" else if [ $vpi -ge 4096 ]; then vpi="" echo -e "** VPI not in range [0-4095], please enter it again\n" fi fi done } function vci() { vci="" while [ -z "$vci" ]; do echo -n "Type in your VCI: " read vci echo $vci | grep -E "^[0-9]+$" > /dev/null 2>&1 if [ $? -ne 0 ]; then vci="" echo -e "** invalid VCI, please enter it again\n" else if [ $vci -ge 65536 ]; then vci="" echo -e "** VCI not in range [0-65535], please enter it again\n" fi fi done } function protocol() { clear while [ !$(true) ] do echo -e "\n-------------------------------------" echo " Protocol Mode Menu " echo "-------------------------------------" echo "[1] RFC1483/2684 routed" echo "[2] PPP over ATM (pppoa)" echo "[3] RFC1483/2684 bridged" echo "[4] PPP over Ethernet (pppoe)" echo "=======================" echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-4]: " read PROTOCOL_MODE case $PROTOCOL_MODE in 1) echo "RFC1483/2684 routed" break ;; 2) echo "PPP over ATM (pppoa)" break ;; 3) echo "RFC1483/2684 bridged" break ;; 4) echo "PPP over Ethernet (pppoe)" break ;; *) echo "Opps!!! Please select choice 1,2,3,4"; # echo "Press a key. . ." ; read ;; esac done } function drivermode() { clear while [ !$(true) ] do echo -e "\n-------------------------------------" echo " Driver Mode Menu " echo "-------------------------------------" echo "[1] Classical userspace amedyn (for mainly for 2.4 kernels)" echo "[2] New kernel space driver amedyn2 (experimental)" echo "[3] Updated generic driver usbatm (best for last 2.6 kernels)" echo "=======================" echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-3]: " read DRIVER_MODE case $DRIVER_MODE in 1) echo "amedyn" break ;; 2) echo "amedyn2" break ;; 3) echo "xusbatm" break ;; *) echo "Opps!!! Please select choice 1,2,3"; read ;; esac done } function linetype() { clear while [ !$(true) ] do echo -e "\n-------------------------------------" echo " Line Type Menu " echo "-------------------------------------" echo "[1] Analogical" echo "[2] ISDN" echo "=======================" echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-2]: " read linetype case $linetype in 1) echo "analogical" line=0x15 break ;; 2) echo "ISDN" line=0x11 break ;; *) echo "Opps!!! Please select choice 1,2"; read ;; esac done } function modem() { clear while [ !$(true) ] do echo -e "\n-------------------------------------" echo " Modem Menu " echo "-------------------------------------" echo "[1] 0x06b9/0xa5a5 : Zyxel Prestige 630-11, Zyxel Prestige 630-13, Topcom Webracer 851, ..." echo "[2] 0x0b05/0x6206 : Asus AAM600UG" echo "[3] 0x1767/0x0005 : Medi@com 103/MADSLU" echo "=======================" echo -n "Enter your menu choice, actual $PROTOCOL_MODE. [1-3]: " read modemtype case $modemtype in 1) echo "0x06b9/0xa5a5" vid=0x06b9 pid=0xa5a5 break ;; 2) echo "0x0b05/0x6206" vid=0x0b05 pid=0x6206 break ;; 3) echo "0x1767/0x0005" vid=0x1767 pid=0x0005 break ;; *) echo "Opps!!! Please select choice 1,2 or 3"; read ;; esac done } clear echo -e "\n===== Welcome to the driver configuration tool for the Alcatel Dynamite USB modem ship based =====\n" echo -e "At any time, press Ctrl+C to quit this script without saving modifications.\n" echo -n "Do you want to set your connection setting by using this script (Y/n) ? " read ans if [[ "$ans" = "n" || "$ans" = "N" ]] then exit 0 fi resync=0 NETMASK=255.255.255.0 modem linetype protcol drivermode protocol vpi vci clear if [[ "$PROTOCOL_MODE" = 1 || "$PROTOCOL_MODE" = 3 ]]; then echo -e "\n-------------------------------------" echo " For or RFC1483/2684 routed/bridged " echo -e "-------------------------------------\n" echo -n "Enter IP address (If you left it blank in bridged mode, then it will use DHCP to get IP), actual IP_ADDRESS : " read IP_ADDRESS echo -n "Enter the network mask (If you left if blank 255.255.255.0 will bu used), actual NETMASK : " read NETMASK if [ "$NETMASK" = "" ] then NETMASK=255.255.255.0 fi echo -n "Enter the gateway IP, actual GATEWAY : " read GATEWAY fi echo -e "\nWriting configuration to file... " while [ $(echo " # # Config file for Zyxel 630-11 & Asus AAM6000UG (ADSL Modem USB) # # Line type # 0x15 = ANALOG # 0x11 = ISDN LINE_TYPE=\"$line\" # Driver mode # 1 = amedyn # 2 = amedyn2 # 3 = xusbatm DRIVER_MODE=$DRIVER_MODE # Protocol # 1 = RFC1483/2684 routed # 2 = PPP over ATM (pppoa) # 3 = RFC1483/2684 bridged # 4 = PPP over Ethernet (pppoe) PROTOCOL_MODE=$PROTOCOL_MODE # xusbatm VENDOR=\"$vid\" # 0x06b9 / 0x0b05 / 0x1767 PRODUCT=\"$pid\" # 0xa5a5 / 0x6206 / 0x0005 RX_ENDPOINT=\"0x87\" TX_ENDPOINT=\"0x07\" RX_ALTSETTING=1 TX_ALTSETTING=1 # Paths BINARY_PATH=\"/usr/sbin\" ATM_PATH=\"\" # ATM VPI=$vpi VCI=$vci # Specific for RFC1483/2684 routed/bridged # if IP_ADDRESS is blank in bridged mode then it uses DHCP to get IP IP_ADDRESS=$IP_ADDRESS NETMASK=$NETMASK GATEWAY=$GATEWAY # === Re-sync modem line if line goes down # - don't resync on line down = 0 # - resync when line goes down = 1 RESYNC=$resync " > ./etc/amedyn) ] do echo -e "\nERROR writing config to file" echo -n "Try again ? (Y/n) : " read ans if [[ "$ans" = "n" || "$ans" = "N" ]] then exit -1 fi done if [[ "$PROTOCOL_MODE" = 2 ]]; then ./pppoatm_config.sh fi echo "done" --- NEW FILE: pppoatm_chap-secrets --- # Secrets for authentication using CHAP # client server secret IP addresses user_name@provider * password * --- NEW FILE: pppoatm_options --- lock # # If something goes wrong try uncommenting this # debug kdebug 1 # # Makes this ppp link the default inet route # (route -n to check it) # defaultroute # # We don't need a default ip # noipdefault # # Asks your ISP for its DNS ip # (look at the /etc/ppp/resolv.conf) # usepeerdns noauth sync # # We don't want to negociate compression schemes at all # #noaccomp #nopcomp noccp novj holdoff 4 # # Makes pppd "dial again" when the connection is lost # persist # # pppd will try to connect "maxfail"(0=all-the-time) times and wait "holdoff" seconds # between each try. # holdoff 4 maxfail 0 passive asyncmap 0 lcp-echo-interval 2 lcp-echo-failure 7 # # pppd will try to connect "maxfail" times and wait "holdoff" seconds # between each try. # holdoff 4 maxfail 25 name user_name@provider user user_name@provider # # Requires the PPP Over ATM plugin # plugin pppoatm VPI.VCI --- NEW FILE: pppoatm_config.sh --- #!/bin/bash function user_name() { user="" while [ -z "$user" ]; do echo -n "Type in your user name (given by your provider): " read user done } function provider() { provider="" while [ -z "$provider" ]; do echo -n "Type in your provider name (by example tiscali.be): " read provider done } function password() { pwdmatch=0 while [ $pwdmatch -eq 0 ]; do stty -echo password1="" while [ -z "$password1" ]; do echo -n "Type in your password (given by your provider): " read password1 echo done password2="" while [ -z "$password2" ]; do echo -n "Type in your password again (for verification): " read password2 echo done stty echo if [ "$password1" == "$password2" ]; then pwdmatch=1 else echo -e "** passwords don't match, try again\n" fi done } function dns() { dns1="" while [ -z "$dns1" ]; do echo -n "Type in an IP for DNS1: " read dns1 echo $dns1 | grep -E "^([0-9]{1,3}\.){3}[0-9]{1,3}$" > /dev/null 2>&1 if [ $? -ne 0 ]; then dns1="" echo -e "** invalid IP for DNS1, please retry\n" fi done echo dns2="" while [ -z "$dns2" ]; do echo -n "Type in an IP for DNS2: " read dns2 echo $dns2 | grep -E "^([0-9]{1,3}\.){3}[0-9]{1,3}$" > /dev/null 2>&1 if [ $? -ne 0 ]; then dns2="" echo -e "** invalid IP for DNS2, please retry\n" fi done } function vpi() { vpi="" while [ -z "$vpi" ]; do echo -n "Type in your VPI: " read vpi echo $vpi | grep -E "^[0-9]+$" > /dev/null 2>&1 if [ $? -ne 0 ]; then vpi="" echo -e "** invalid VPI, please enter it again\n" else if [ $vpi -ge 4096 ]; then vpi="" echo -e "** VPI not in range [0-4095], please enter it again\n" fi fi done } function vci() { vci="" while [ -z "$vci" ]; do echo -n "Type in your VCI: " read vci echo $vci | grep -E "^[0-9]+$" > /dev/null 2>&1 if [ $? -ne 0 ]; then vci="" echo -e "** invalid VCI, please enter it again\n" else if [ $vci -ge 65536 ]; then vci="" echo -e "** VCI not in range [0-65535], please enter it again\n" fi fi done } function pppoatm() { pppoatm="" pppoatm=$(find /usr/lib/pppd | grep pppoatm | head -n1) } function summary() { echo "==== Configuration will be created with these values :" echo echo " + User : $user" echo " + Password : (hidden)" echo " + Provider : $provider" # echo " DNS 1 : $dns1" # echo " DNS 2 : $dns2" echo " + pppoatm : $pppoatm" echo " VPI/VCI : $vpi/$vci" } function secret() { for auth in "chap" "pap" do secretfile="./$auth-secrets" if [ -s $secretfile ] then backup "$secretfile" echo -n "modifying $secretfile.. " TMP=$(echo "$username" | sed "s/\\\/\\\\\\\\\\\/g") grep -v -E "^[ \t]*\"?$TMP\"?[ \t]*.*\n?" $backupfile > "$secretfile" else echo -n "creating $secretfile.. " echo "# Secrets for authentication using $auth" > "$secretfile" fi echo -e "\"$user\"\t*\t\"$password1\"\t*" >> "$secretfile" echo "OK" done } function write_config() { sed -e "s:pppoatm:$pppoatm:g" -e "s/VCI/$vci/g" -e "s/VPI/$vpi/g" -e "s/user_name/$user/g" -e "s/provider/$provider/g" pppoatm_options > options sed -e "s/user_name/$user/g" -e "s/provider/$provider/g" -e "s/password/$password1/g" pppoatm_pap-secrets > pap-secrets sed -e "s/user_name/$user/g" -e "s/provider/$provider/g" -e "s/password/$password1/g" pppoatm_chap-secrets > chap-secrets } echo echo "Enter now your VPI/VCI (depending on your provider/country)" echo "Example for BELGIUM: 8 35 (VPI=8, VCI=35)" echo "These values correspond to the number dialed under Windows." echo vpi vci user_name provider password clear pppoatm summary write_config cp pap-secrets /etc/pap-secrets cp chap-secrets /etc/chap-secrets cp options /etc/options rm pap-secrets chap-secrets options echo "DONE!" --- NEW FILE: amedyn_autoconf --- # # Config file for Zyxel 630-11 & Asus AAM6000UG (ADSL Modem USB) # # Line type # 0x15 = ANALOG # 0x11 = ISDN LINE_TYPE="0x15" # Driver mode # 1 = amedyn # 2 = amedyn2 # 3 = xusbatm DRIVER_MODE=3 # Protocol # 1 = RFC1483/2684 routed # 2 = PPP over ATM (pppoa) # 3 = RFC1483/2684 bridged # 4 = PPP over Ethernet (pppoe) PROTOCOL_MODE=2 # xusbatm VENDOR="0x1767" # 0x06b9 / 0x0b05 / 0x1767 PRODUCT="0x0005" # 0xa5a5 / 0x6206 / 0x0005 RX_ENDPOINT="0x87" TX_ENDPOINT="0x07" RX_ALTSETTING=1 TX_ALTSETTING=1 # Paths BINARY_PATH="/usr/sbin" ATM_PATH="" # ATM VPI=8 VCI=35 # Specific for RFC1483/2684 routed/bridged # if IP_ADDRESS is blank in bridged mode then it uses DHCP to get IP IP_ADDRESS= NETMASK=255.255.255.0 GATEWAY= # === Re-sync modem line if line goes down # - don't resync on line down = 0 # - resync when line goes down = 1 RESYNC=0 --- NEW FILE: pppoatm_pap-secrets --- # Secrets for authentication using PAP # client server secret IP addresses user_name@provider * password * |
From: Emmanuel C. <ma...@us...> - 2007-01-18 21:18:35
|
Update of /cvsroot/zyxel630-11/amedyn/driverconfig In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23313/driverconfig Log Message: Directory /cvsroot/zyxel630-11/amedyn/driverconfig added to the repository |
From: Emmanuel C. <ma...@us...> - 2007-01-18 20:27:49
|
Update of /cvsroot/zyxel630-11/amedyn/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1233/scripts Modified Files: ammodule.sh Log Message: removing "FATAL: Module crc32 not found." warning Index: ammodule.sh =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/scripts/ammodule.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ammodule.sh 11 Oct 2006 16:30:34 -0000 1.3 --- ammodule.sh 18 Jan 2007 20:26:11 -0000 1.4 *************** *** 15,19 **** crc32=`lsmod | cut -d ' ' -f1 | grep -E "^crc32$"` if [ "$crc32" = "" ]; then ! /sbin/modprobe crc32 fi fi --- 15,19 ---- crc32=`lsmod | cut -d ' ' -f1 | grep -E "^crc32$"` if [ "$crc32" = "" ]; then ! /sbin/modprobe -q crc32 fi fi |
From: Aurelio <sk...@us...> - 2006-12-02 16:13:40
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24638 Modified Files: amedyn2.c Log Message: Remove function jump_to_address and send it a static command. Look like we need wait more time before start to speek with the modem. The old function jump_to_address was never use with a address other than 0x00000000. 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: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** amedyn2.c 18 Nov 2006 15:16:50 -0000 1.14 --- amedyn2.c 2 Dec 2006 16:13:38 -0000 1.15 *************** *** 151,177 **** /* From userspace tool */ - int jump_to_address(struct amedyn_instance_data *instance, unsigned int place) - { - struct usb_device *dev = instance->usbatm->usb_dev; - unsigned 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 (usb_bulk_msg (dev, usb_sndbulkpipe(dev, ENDPOINT_FIRMWARE), buf, 6, NULL, DATA_TIMEOUT)) - return -1; - buf[0] = 0x00; // Command (= jump?) - buf[1] = 0x01; // Length (= 1 byte) - buf[2] = 0x14; // Value (= jump to base address) - if (usb_bulk_msg (dev, usb_sndbulkpipe(dev, ENDPOINT_FIRMWARE), buf, 3, NULL, DATA_TIMEOUT)) - return -1; - return 0; - } - - /* From userspace tool */ /* format a message */ void format_message(int cmd, int ldata, int address, char *bufin) --- 151,154 ---- *************** *** 226,229 **** --- 203,218 ---- int i; + /* + The old function jump_to_address was never use with a address other + than 0x00000000. + 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_0x00000000[9] = + {0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x14} ; + usb_dbg(usbatm, "%s entered\n", __func__); *************** *** 261,265 **** dbg("amedyn_upload_firmware: Init load"); ! if (jump_to_address(instance, 0x00000000)) goto out_free; --- 250,255 ---- dbg("amedyn_upload_firmware: Init load"); ! if (usb_bulk_msg (usb_dev, usb_sndbulkpipe(usb_dev, ENDPOINT_FIRMWARE), ! jump_to_address_0x00000000, 9, NULL, DATA_TIMEOUT)) goto out_free; *************** *** 293,300 **** dbg("amedyn_upload_firmware: Firmware load"); ! if (jump_to_address(instance, 0x00000000)) goto out_free; ! msleep(2000); dbg("PostInit..."); --- 283,291 ---- dbg("amedyn_upload_firmware: Firmware load"); ! if (usb_bulk_msg (usb_dev, usb_sndbulkpipe(usb_dev, ENDPOINT_FIRMWARE), ! jump_to_address_0x00000000, 9, NULL, DATA_TIMEOUT)) goto out_free; ! msleep(10000); dbg("PostInit..."); |