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...> - 2006-09-18 16:40:09
|
Update of /cvsroot/zyxel630-11/amedyn2/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10448 Modified Files: amedyn2.c Log Message: Don't exit before print the error! Index: amedyn2.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn2/module/amedyn2.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** amedyn2.c 11 Mar 2006 17:01:55 -0000 1.9 --- amedyn2.c 18 Sep 2006 16:40:02 -0000 1.10 *************** *** 265,270 **** ret = usb_bulk_msg (usb_dev, usb_rcvbulkpipe(usb_dev, ENDPOINT_FIRMWARE_IN), buf, 0x1ff, NULL, DATA_TIMEOUT); if (ret < 0) { - goto out_free; dbg("amedyn_upload_firmware: read bufconf failed (%d)!", ret); } memcpy(instance->bufconf, buf+0xb9, 8); --- 265,270 ---- 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); |
From: Aurelio <sk...@us...> - 2006-09-01 09:09:55
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31467 Modified Files: amfunctions.c Log Message: Removed firmware check from conexant driver. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** amfunctions.c 1 Sep 2006 09:05:17 -0000 1.16 --- amfunctions.c 1 Sep 2006 09:09:51 -0000 1.17 *************** *** 454,483 **** clear_endpoints(adsl_handle, 1); - /* - fseek(soft, 0L, SEEK_SET); - len = fread(buf, 1, 5, soft); - if (len <= 0) - { - printf(gettext("Error: No bytes to read from file %s\n"), modem_char.firmfile); - return -1; - } - if (len != 5) - { - printf(gettext("Error: I can't read initial 5 bytes from file %s\n"), filename); - return -1; - } - */ - /* check initial bytes */ - /* - PDEBUG(gettext("Initial bytes from file %s:\n"), filename); - #if DEBUG - dump(buf, 5, 5); - #endif - if (buf[0] != FIRMBYTE1 || buf[1] != FIRMBYTE2 || buf[2] != FIRMBYTE3 || buf[3] != FIRMBYTE4 || buf[4] != FIRMBYTE5) { - printf(gettext("Error: Maybe file %s isn't Conexant firmware, contact with author of this program\n"), filename); - return -1; - } - */ - /**************/ /* initialize */ --- 454,457 ---- |
From: Aurelio <sk...@us...> - 2006-09-01 09:05:20
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29784 Modified Files: amfunctions.c Log Message: Removed block 'Waiting to receive first ATM cells...' Not used yet.' Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** amfunctions.c 23 Jul 2006 11:42:01 -0000 1.15 --- amfunctions.c 1 Sep 2006 09:05:17 -0000 1.16 *************** *** 740,766 **** } - /* - #ifdef DEBUG - printf(gettext("Waiting to receive first ATM cells...\n")); - time(&first); before = first; - do { - len = usb_bulk_read(adsl_handle, USB_IN_DATA, buf, sizeof(buf), DATA_TIMEOUT); - if (len > 0) { - printf("\n"); - printf(gettext("ATM cells received:\n")); - dump(buf, len, 16); - return 0; - } - if (difftime(time(&last), before) > 1) { - printf("."); - fflush(stdout); - before = last; - } - } - while (difftime(last, first) < 60); - printf("\n"); - #endif - */ - return 0; } --- 740,743 ---- |
From: Aurelio <sk...@us...> - 2006-07-23 12:11:29
|
Update of /cvsroot/zyxel630-11/amedyn/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10472 Modified Files: amload.sh Log Message: Use --linetype option. Index: amload.sh =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/scripts/amload.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** amload.sh 16 Jul 2006 17:42:12 -0000 1.4 --- amload.sh 23 Jul 2006 12:11:25 -0000 1.5 *************** *** 49,53 **** if [ "$DRIVER_MODE" == "1" -o "$DRIVER_MODE" == "3" ]; then echo $">>> Loading firmware..." ! amload -fcs || exit 1 fi --- 49,53 ---- if [ "$DRIVER_MODE" == "1" -o "$DRIVER_MODE" == "3" ]; then echo $">>> Loading firmware..." ! amload -fcs --linetype $LINE_TYPE || exit 1 fi |
From: Aurelio <sk...@us...> - 2006-07-23 11:58:23
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6232 Modified Files: amload.c Log Message: Max verbose level is 3. Index: amload.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** amload.c 23 Jul 2006 11:54:35 -0000 1.16 --- amload.c 23 Jul 2006 11:57:13 -0000 1.17 *************** *** 146,150 **** "Time to wait until sync.", ""}, { "verbose", 'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.verbose, 0, ! "Verbose level.", "[0..1]"}, { "linetype", '\0', POPT_ARG_INT, &command_options.linetype, 0, "Set phone line type code. (default: 0x15)", "0x11 | 0x15"}, --- 146,150 ---- "Time to wait until sync.", ""}, { "verbose", 'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.verbose, 0, ! "Verbose level.", "[0..3]"}, { "linetype", '\0', POPT_ARG_INT, &command_options.linetype, 0, "Set phone line type code. (default: 0x15)", "0x11 | 0x15"}, |
From: Aurelio <sk...@us...> - 2006-07-23 11:54:37
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5000 Modified Files: amload.c Log Message: Don't show usage info afte root warning. Index: amload.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** amload.c 22 Jul 2006 20:01:17 -0000 1.15 --- amload.c 23 Jul 2006 11:54:35 -0000 1.16 *************** *** 206,213 **** if(geteuid() != 0) { fprintf(stderr, "WARNING: amload must be run with root privileges\n\n"); - poptPrintUsage(optCon, stderr, 0); exit (-1); } /* init USB bus and find devices */ usb_init(); --- 206,213 ---- if(geteuid() != 0) { fprintf(stderr, "WARNING: amload must be run with root privileges\n\n"); exit (-1); } + /* init USB bus and find devices */ usb_init(); |
From: Aurelio <sk...@us...> - 2006-07-23 11:42:04
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32076 Modified Files: amfunctions.c Log Message: Show AFE value at verbose level 1. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** amfunctions.c 23 Jul 2006 11:36:32 -0000 1.14 --- amfunctions.c 23 Jul 2006 11:42:01 -0000 1.15 *************** *** 329,333 **** /* 0x15 = analog line, 0x11 ISDN line */ buf[0] = command_options.linetype & 0xff; ! if (command_options.verbose == 2) printf ("[0x%x]", buf[0]&0xff); len = transfer_ctrl_msg(adsl_handle, VENDOR_REQUEST_OUT, 0x06, 0x03, 0x1fd, buf, 1); --- 329,333 ---- /* 0x15 = analog line, 0x11 ISDN line */ buf[0] = command_options.linetype & 0xff; ! if (command_options.verbose == 1) printf ("[0x%x]", buf[0]&0xff); len = transfer_ctrl_msg(adsl_handle, VENDOR_REQUEST_OUT, 0x06, 0x03, 0x1fd, buf, 1); |
From: Aurelio <sk...@us...> - 2006-07-23 11:36:35
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30053/init Modified Files: amfunctions.c Log Message: Add verbose output. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** amfunctions.c 22 Jul 2006 19:56:04 -0000 1.13 --- amfunctions.c 23 Jul 2006 11:36:32 -0000 1.14 *************** *** 322,329 **** --- 322,334 ---- long len; /* length */ + if (command_options.verbose == 1) + printf ("S"); + /* set AFE value, R_Function_Code = 0x15 (adjust Alcatel DSP for our configuration) */ /* 0x1fd in CTRLE protocol */ /* 0x15 = analog line, 0x11 ISDN line */ buf[0] = command_options.linetype & 0xff; + if (command_options.verbose == 2) + printf ("[0x%x]", buf[0]&0xff); len = transfer_ctrl_msg(adsl_handle, VENDOR_REQUEST_OUT, 0x06, 0x03, 0x1fd, buf, 1); if (len < 0) *************** *** 650,655 **** PDEBUG(gettext("%li bytes readed:\n"), len); #if DEBUG_TRANSFER ! if (len > 0) ! dump(buf, len, 16); #endif --- 655,661 ---- PDEBUG(gettext("%li bytes readed:\n"), len); #if DEBUG_TRANSFER ! if (command_options.verbose == 3 ) ! if (len > 0) ! dump(buf, len, 16); #endif *************** *** 657,669 **** { modem_info.modem_status = buf[1] & 0xff; ! /* if (modem_info.modem_status == MODEM_UP) ! printf ("@"); ! if (modem_info.modem_status == MODEM_DOWN) ! printf ("#"); ! if (modem_info.modem_status == MODEM_WAIT) ! printf ("_"); ! if (modem_info.modem_status == MODEM_INIT) ! printf ("-"); ! */ PDEBUG (gettext ("Modem status = %02x\n"), modem_info.modem_status); --- 663,682 ---- { modem_info.modem_status = buf[1] & 0xff; ! if (command_options.verbose == 1 ) { ! switch (modem_info.modem_status) { ! case MODEM_UP: ! printf ("@"); ! continue; ! case MODEM_DOWN: ! printf ("#"); ! continue; ! case MODEM_WAIT: ! printf ("_"); ! continue; ! case MODEM_INIT: ! printf ("-"); ! continue; ! } ! } PDEBUG (gettext ("Modem status = %02x\n"), modem_info.modem_status); *************** *** 676,682 **** { #ifndef DEBUG ! ! printf("."); ! fflush(stdout); #endif before = last; --- 689,696 ---- { #ifndef DEBUG ! if (command_options.verbose == 0 ) { ! printf("."); ! fflush(stdout); ! } #endif before = last; |
From: Aurelio <sk...@us...> - 2006-07-22 20:01:19
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22178/init Modified Files: amload.c Log Message: Add commaline option unsync_first. Index: amload.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** amload.c 22 Jul 2006 19:56:04 -0000 1.14 --- amload.c 22 Jul 2006 20:01:17 -0000 1.15 *************** *** 92,95 **** --- 92,96 ---- extern int sync_line(usb_dev_handle *adsl_handle, int tmodem, int max_wait_line_up); extern int load_firmware(usb_dev_handle *adsl_handle, int tmodem); + extern int send_line_down_signal (usb_dev_handle * adsl_handle, int tmodem); int main(int argc, char *argv[]) *************** *** 126,129 **** --- 127,131 ---- command_options.verbose=0; command_options.linetype=0x15; + command_options.unsync_first=0; /* Debug command-line optios */ *************** *** 147,150 **** --- 149,154 ---- { "linetype", '\0', POPT_ARG_INT, &command_options.linetype, 0, "Set phone line type code. (default: 0x15)", "0x11 | 0x15"}, + { "unsync_first", '\0', POPT_ARG_NONE, &command_options.unsync_first, 0, + "Send line down signal before sync line.", ""}, { NULL, '0', POPT_ARG_NONE, &command_options.no_claim_interface_0, 0, *************** *** 306,309 **** --- 310,316 ---- } + if (command_options.unsync_first) + r = send_line_down_signal (adsl_handle, tmodem); + if (command_options.sync) r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up); |
From: Aurelio <sk...@us...> - 2006-07-22 20:01:19
|
Update of /cvsroot/zyxel630-11/amedyn/include In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22178/include Modified Files: amedyn.h Log Message: Add commaline option unsync_first. Index: amedyn.h =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/include/amedyn.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** amedyn.h 22 Jul 2006 19:56:03 -0000 1.5 --- amedyn.h 22 Jul 2006 20:01:17 -0000 1.6 *************** *** 187,191 **** int linetype; int unsync_first; - int linetype; /* Debug command-line options */ --- 187,190 ---- |
From: Aurelio <sk...@us...> - 2006-07-22 19:56:07
|
Update of /cvsroot/zyxel630-11/amedyn/include In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19843/include Modified Files: amedyn.h Log Message: Add commandline optio--linetype. Index: amedyn.h =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/include/amedyn.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** amedyn.h 22 Jul 2006 19:52:18 -0000 1.4 --- amedyn.h 22 Jul 2006 19:56:03 -0000 1.5 *************** *** 187,190 **** --- 187,191 ---- int linetype; int unsync_first; + int linetype; /* Debug command-line options */ |
From: Aurelio <sk...@us...> - 2006-07-22 19:56:07
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19843/init Modified Files: amfunctions.c amload.c Log Message: Add commandline optio--linetype. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** amfunctions.c 22 Jul 2006 19:52:18 -0000 1.12 --- amfunctions.c 22 Jul 2006 19:56:04 -0000 1.13 *************** *** 325,329 **** /* 0x1fd in CTRLE protocol */ /* 0x15 = analog line, 0x11 ISDN line */ ! buf[0] = 0x15; len = transfer_ctrl_msg(adsl_handle, VENDOR_REQUEST_OUT, 0x06, 0x03, 0x1fd, buf, 1); if (len < 0) --- 325,329 ---- /* 0x1fd in CTRLE protocol */ /* 0x15 = analog line, 0x11 ISDN line */ ! buf[0] = command_options.linetype & 0xff; len = transfer_ctrl_msg(adsl_handle, VENDOR_REQUEST_OUT, 0x06, 0x03, 0x1fd, buf, 1); if (len < 0) Index: amload.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** amload.c 22 Jul 2006 19:52:18 -0000 1.13 --- amload.c 22 Jul 2006 19:56:04 -0000 1.14 *************** *** 125,128 **** --- 125,129 ---- command_options.max_wait_line_up=MAX_WAIT_LINE_UP; command_options.verbose=0; + command_options.linetype=0x15; /* Debug command-line optios */ *************** *** 144,147 **** --- 145,150 ---- { "verbose", 'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.verbose, 0, "Verbose level.", "[0..1]"}, + { "linetype", '\0', POPT_ARG_INT, &command_options.linetype, 0, + "Set phone line type code. (default: 0x15)", "0x11 | 0x15"}, { NULL, '0', POPT_ARG_NONE, &command_options.no_claim_interface_0, 0, |
From: Aurelio <sk...@us...> - 2006-07-22 19:52:20
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18538/init Modified Files: amfunctions.c amload.c Log Message: Make command line options a struct. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** amfunctions.c 22 Jul 2006 19:41:57 -0000 1.11 --- amfunctions.c 22 Jul 2006 19:52:18 -0000 1.12 *************** *** 91,94 **** --- 91,97 ---- struct usb_modem_info modem_info; + /* command-line options */ + struct options command_options; + /* check if a file exists */ int file_exists(const char *filename) Index: amload.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amload.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** amload.c 16 Jul 2006 18:46:23 -0000 1.12 --- amload.c 22 Jul 2006 19:52:18 -0000 1.13 *************** *** 85,88 **** --- 85,90 ---- #define TF_CODE "amload" + extern struct options command_options; + extern int check_modem(unsigned int vid, unsigned int pid); extern void init_modem(unsigned int tmodem, struct usb_device *adsl_dev, int open_mode); *************** *** 117,152 **** /* Command-line options */ ! int no_check_modem_before=0; ! int firmware=0; ! int config=0; ! int sync=0; ! int max_wait_line_up=MAX_WAIT_LINE_UP; ! int verbose=0; /* Debug command-line optios */ ! int no_claim_interface_0=0; ! int no_claim_interface_1=0; ! int no_claim_interface_2=0; struct poptOption optionsTable[] = { ! { "nocheck", '\0', POPT_ARG_NONE, &no_check_modem_before, 0, "Don't check modem before try to upload firmware.", ""}, ! { "firmware", 'f', POPT_ARG_NONE, &firmware, 0, "Upload firmware.", ""}, ! { "config", 'c', POPT_ARG_NONE, &config, 0, "Initial config.", ""}, ! { "sync", 's', POPT_ARG_NONE, &sync, 0, "Sync line.", ""}, ! { "time", 't', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &max_wait_line_up, 0, "Time to wait until sync.", ""}, ! { "verbose", 'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &verbose, 0, ! "Verbose level.", "[0..0]"}, { NULL, '0', ! POPT_ARG_NONE, &no_claim_interface_0, 0, "Don't claim interface 0. (Debug option)", ""}, { NULL, '1', ! POPT_ARG_NONE, &no_claim_interface_1, 0, "Don't claim interface 1. (Debug option)", ""}, { NULL, '2', ! POPT_ARG_NONE, &no_claim_interface_2, 0, "Don't claim interface 2. (Debug option)", ""}, POPT_AUTOHELP --- 119,155 ---- /* Command-line options */ ! command_options.no_check_modem_before=0; ! command_options.firmware=0; ! command_options.config=0; ! command_options.sync=0; ! command_options.max_wait_line_up=MAX_WAIT_LINE_UP; ! command_options.verbose=0; ! /* Debug command-line optios */ ! command_options.no_claim_interface_0=0; ! command_options.no_claim_interface_1=0; ! command_options.no_claim_interface_2=0; struct poptOption optionsTable[] = { ! { "nocheck", '\0', POPT_ARG_NONE, &command_options.no_check_modem_before, 0, "Don't check modem before try to upload firmware.", ""}, ! { "firmware", 'f', POPT_ARG_NONE, &command_options.firmware, 0, "Upload firmware.", ""}, ! { "config", 'c', POPT_ARG_NONE, &command_options.config, 0, "Initial config.", ""}, ! { "sync", 's', POPT_ARG_NONE, &command_options.sync, 0, "Sync line.", ""}, ! { "time", 't', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.max_wait_line_up, 0, "Time to wait until sync.", ""}, ! { "verbose", 'v', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &command_options.verbose, 0, ! "Verbose level.", "[0..1]"}, { NULL, '0', ! POPT_ARG_NONE, &command_options.no_claim_interface_0, 0, "Don't claim interface 0. (Debug option)", ""}, { NULL, '1', ! POPT_ARG_NONE, &command_options.no_claim_interface_1, 0, "Don't claim interface 1. (Debug option)", ""}, { NULL, '2', ! POPT_ARG_NONE, &command_options.no_claim_interface_2, 0, "Don't claim interface 2. (Debug option)", ""}, POPT_AUTOHELP *************** *** 266,280 **** /* check if other program is using interfaces 0, 1, 2 */ ! if ( ! no_claim_interface_0 && usb_claim_interface(adsl_handle, 0) < 0) { printf("Error: usb_claim_interface 0: %s\n", usb_strerror()); return -1; } ! if ( ! no_claim_interface_1 && usb_claim_interface(adsl_handle, 1) < 0) { printf("Error: usb_claim_interface 1: %s\n", usb_strerror()); return -1; } ! if ( ! no_claim_interface_2 && usb_claim_interface(adsl_handle, 2) < 0) { printf("Error: usb_claim_interface 2: %s\n", usb_strerror()); --- 269,283 ---- /* check if other program is using interfaces 0, 1, 2 */ ! if ( ! command_options.no_claim_interface_0 && usb_claim_interface(adsl_handle, 0) < 0) { printf("Error: usb_claim_interface 0: %s\n", usb_strerror()); return -1; } ! if ( ! command_options.no_claim_interface_1 && usb_claim_interface(adsl_handle, 1) < 0) { printf("Error: usb_claim_interface 1: %s\n", usb_strerror()); return -1; } ! if ( ! command_options.no_claim_interface_2 && usb_claim_interface(adsl_handle, 2) < 0) { printf("Error: usb_claim_interface 2: %s\n", usb_strerror()); *************** *** 286,298 **** /* Check if the modem is working yet */ ! if ( firmware || config ) { ! if ( ! no_check_modem_before ) r = usb_bulk_read(adsl_handle, USB_IN_INFO, buf, 0x10, DATA_TIMEOUT); else r=-1; if (r < 0) { ! if (firmware) r = load_firmware(adsl_handle, tmodem); ! if (config) r = first_config(adsl_handle, tmodem); } else --- 289,301 ---- /* Check if the modem is working yet */ ! if ( command_options.firmware || command_options.config ) { ! if ( ! command_options.no_check_modem_before ) r = usb_bulk_read(adsl_handle, USB_IN_INFO, buf, 0x10, DATA_TIMEOUT); else 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 *************** *** 300,312 **** } ! if (sync) ! r = sync_line(adsl_handle, tmodem, max_wait_line_up); PDEBUG(gettext("Releasing interface...\n")); ! if ( ! no_claim_interface_0 ) usb_release_interface(adsl_handle, 0); ! if ( ! no_claim_interface_1 ) usb_release_interface(adsl_handle, 1); ! if ( ! no_claim_interface_2 ) usb_release_interface(adsl_handle, 2); PDEBUG(gettext("Releasing device...\n")); --- 303,315 ---- } ! if (command_options.sync) ! r = sync_line(adsl_handle, tmodem, command_options.max_wait_line_up); PDEBUG(gettext("Releasing interface...\n")); ! if ( ! command_options.no_claim_interface_0 ) usb_release_interface(adsl_handle, 0); ! if ( ! command_options.no_claim_interface_1 ) usb_release_interface(adsl_handle, 1); ! if ( ! command_options.no_claim_interface_2 ) usb_release_interface(adsl_handle, 2); PDEBUG(gettext("Releasing device...\n")); |
From: Aurelio <sk...@us...> - 2006-07-22 19:52:20
|
Update of /cvsroot/zyxel630-11/amedyn/include In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18538/include Modified Files: amedyn.h Log Message: Make command line options a struct. Index: amedyn.h =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/include/amedyn.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** amedyn.h 22 Jul 2006 18:08:58 -0000 1.3 --- amedyn.h 22 Jul 2006 19:52:18 -0000 1.4 *************** *** 177,179 **** --- 177,196 ---- }; + /* Command-line options */ + struct options { + int no_check_modem_before; + int firmware; + int config; + int sync; + int max_wait_line_up; + int verbose; + int linetype; + int unsync_first; + + /* Debug command-line options */ + int no_claim_interface_0; + int no_claim_interface_1; + int no_claim_interface_2; + }; + #endif /* _AMEDYN_H_ */ |
From: Aurelio <sk...@us...> - 2006-07-22 19:42:01
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14094 Modified Files: amfunctions.c Log Message: Fix sync logic. Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** amfunctions.c 22 Jul 2006 11:37:32 -0000 1.10 --- amfunctions.c 22 Jul 2006 19:41:57 -0000 1.11 *************** *** 683,691 **** while ((len != 2 && (buf[0] & 0xff) != 0x40) && (modem_info.modem_status != MODEM_UP) ! && (len != 1 && (buf[0] & 0xff) != 0x50) && ((difftime (last, first) < max_wait_line_up) || max_wait_line_up == -1)); } ! while ((len != 1 && (buf[0] & 0xff) != 0x50) && (modem_info.modem_status != MODEM_UP) && ((difftime (last, first) < max_wait_line_up) --- 683,691 ---- while ((len != 2 && (buf[0] & 0xff) != 0x40) && (modem_info.modem_status != MODEM_UP) ! && ! (len == 1 && (buf[0] & 0xff) == LINE_UP) && ((difftime (last, first) < max_wait_line_up) || max_wait_line_up == -1)); } ! while (! (len == 1 && (buf[0] & 0xff) == LINE_UP) && (modem_info.modem_status != MODEM_UP) && ((difftime (last, first) < max_wait_line_up) |
From: Aurelio <sk...@us...> - 2006-07-22 18:09:02
|
Update of /cvsroot/zyxel630-11/amedyn/include In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9180 Modified Files: amedyn.h Log Message: Add LINE_UP, LINE_YET_DOWN and LINE_DOWNOK. Index: amedyn.h =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/include/amedyn.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** amedyn.h 22 Jul 2006 11:37:32 -0000 1.2 --- amedyn.h 22 Jul 2006 18:08:58 -0000 1.3 *************** *** 74,77 **** --- 74,81 ---- #define MODEM_UP 0x20 + #define LINE_UP 0x50 + #define LINE_YET_DOWN 0x60 + #define LINE_DOWN_OK 0x70: + /* usb codes */ #define VENDOR_REQUEST_OUT 0x40 /* Vendor specific requests, OUT direction */ |
From: Aurelio <sk...@us...> - 2006-07-22 11:37:35
|
Update of /cvsroot/zyxel630-11/amedyn/include In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13072/include Modified Files: amedyn.h Log Message: Move structs usb_modem_char and usb_modem_info to amedyn.h. Remove adsl_modems. Index: amedyn.h =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/include/amedyn.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** amedyn.h 7 Dec 2004 19:37:37 -0000 1.1.1.1 --- amedyn.h 22 Jul 2006 11:37:32 -0000 1.2 *************** *** 78,80 **** --- 78,175 ---- #define VENDOR_REQUEST_IN 0xC0 /* Vendor specific requets, IN direction */ + /* modem internal characteristics */ + struct usb_modem_char { + unsigned int vid; /* VendorID */ + unsigned int pid; /* ProductID */ + char *firmfile; /* firmware file name */ + char *initfirmfile; /* init firmware file name */ + int datamax; /* maximum data that we can send in a block */ + }; + + /* info about modem */ + struct usb_modem_info + { + int modem_status; + char firm_version[5]; /* firmware version */ + char mac[6]; /* MAC address */ + int down_bitrate; /* download bitrate */ + int up_bitrate; /* upload bitrate */ + int link_status; /* link status */ + int line_status; /* line status */ + int operational_mode; /* operational mode */ + + int down_bitrate_percent; + int up_bitrate_percent; + unsigned int down_attenuation; + unsigned int up_attenuation; + + char tons[256]; /* bits/simbolo */ + float potenciat, potenciar; + float ruidot, ruidor; + + unsigned int NearFecNotInterleaved; + unsigned int NearFecInterleaved; + unsigned int NearCrcNotInterleaved; + unsigned int NearCrcInterleaved; + unsigned int NearHecNotInterleaved; + unsigned int NearHecInterleaved; + + unsigned int FarFecNotInterleaved; + unsigned int FarFecInterleaved; + unsigned int FarCrcNotInterleaved; + unsigned int FarCrcInterleaved; + unsigned int FarHecNotInterleaved; + unsigned int FarHecInterleaved; + + // From cxacru + /* + // version + unsigned char mod_major; + unsigned char mod_minor; + unsigned char mod_release; + unsigned char mod_speed; + int hard_version; // controller version + char firm_version[5]; + unsigned char mac[6]; + + // transmit/configuration + unsigned int atm_cell_tx; + unsigned int atm_cell_rx; + unsigned int oam_loopback; + short vpi; + int vci; + + //state + int link_status; + int line_status; + unsigned int open_mode; + unsigned int operational_mode; //modulation + unsigned int data_path; + unsigned int startup_attempts; + unsigned int line_startable; + unsigned int link_lost; + int down_bitrate; // * + int up_bitrate; // * + unsigned int adsl_headend; + unsigned int adsl_headend_env; + + //advanced + unsigned char extended_info; + int up_snr_margin; + int down_snr_margin; + unsigned int up_attenuation; // * + unsigned int down_attenuation; // * + int transmitter_power; + unsigned int up_bits_frame; + unsigned int down_bits_frame; + unsigned int up_crc_errors; + unsigned int down_crc_errors; + unsigned int up_fec_errors; + unsigned int down_fec_errors; + unsigned int up_hec_errors; + unsigned int down_hec_errors; + */ + + }; + #endif /* _AMEDYN_H_ */ |
From: Aurelio <sk...@us...> - 2006-07-22 11:37:35
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13072/init Modified Files: amcheckline.c amfunctions.c amsyncline.c Log Message: Move structs usb_modem_char and usb_modem_info to amedyn.h. Remove adsl_modems. Index: amsyncline.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amsyncline.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** amsyncline.c 11 Dec 2005 11:05:32 -0000 1.2 --- amsyncline.c 22 Jul 2006 11:37:32 -0000 1.3 *************** *** 54,86 **** /* modem internal characteristics */ - struct usb_modem_char { - unsigned int vid; /* VendorID */ - unsigned int pid; /* ProductID */ - char *firmfile; /* firmware file name */ - char *initfirmfile; /* init firmware file name */ - int datamax; /* maximum data that we can send in a block */ - }; struct usb_modem_char modem_char; /* info about modem */ - struct usb_modem_info { - int modem_status; - char firm_version[5]; /* firmware version */ - char mac[6]; /* MAC address */ - int down_bitrate; /* download bitrate */ - int up_bitrate; /* upload bitrate */ - int link_status; /* link status */ - int line_status; /* line status */ - int operational_mode; /* operational mode */ - }; struct usb_modem_info modem_info; - /* adsl modes */ - const char *adsl_modes[] = { - "ANSI", - "G.DMT", - "G.Lite" - }; - extern int check_modem(unsigned int vid, unsigned int pid); extern void init_modem(unsigned int tmodem, struct usb_device *adsl_dev, int open_mode); --- 54,62 ---- Index: amcheckline.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amcheckline.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** amcheckline.c 3 Dec 2005 16:13:42 -0000 1.1 --- amcheckline.c 22 Jul 2006 11:37:32 -0000 1.2 *************** *** 51,83 **** /* modem internal characteristics */ - struct usb_modem_char { - unsigned int vid; /* VendorID */ - unsigned int pid; /* ProductID */ - char *firmfile; /* firmware file name */ - char *initfirmfile; /* init firmware file name */ - int datamax; /* maximum data that we can send in a block */ - }; struct usb_modem_char modem_char; /* info about modem */ - struct usb_modem_info { - int modem_status; - char firm_version[5]; /* firmware version */ - char mac[6]; /* MAC address */ - int down_bitrate; /* download bitrate */ - int up_bitrate; /* upload bitrate */ - int link_status; /* link status */ - int line_status; /* line status */ - int operational_mode; /* operational mode */ - }; struct usb_modem_info modem_info; - /* adsl modes */ - const char *adsl_modes[] = { - "ANSI", - "G.DMT", - "G.Lite" - }; - extern int check_modem(unsigned int vid, unsigned int pid); extern void init_modem(unsigned int tmodem, struct usb_device *adsl_dev, int open_mode); --- 51,59 ---- Index: amfunctions.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/amfunctions.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** amfunctions.c 16 Jul 2006 12:41:54 -0000 1.9 --- amfunctions.c 22 Jul 2006 11:37:32 -0000 1.10 *************** *** 86,119 **** /* modem internal characteristics */ - struct usb_modem_char { - unsigned int vid; /* VendorID */ - unsigned int pid; /* ProductID */ - char *firmfile; /* firmware file name */ - char *initfirmfile; /* init firmware file name */ - int datamax; /* maximum data that we can send in a block */ - }; struct usb_modem_char modem_char; /* info about modem */ - struct usb_modem_info { - int modem_status; - char firm_version[5]; /* firmware version */ - char mac[6]; /* MAC address */ - int down_bitrate; /* download bitrate */ - int up_bitrate; /* upload bitrate */ - int link_status; /* link status */ - int line_status; /* line status */ - int operational_mode; /* operational mode */ - }; struct usb_modem_info modem_info; - /* adsl modes */ - /* - const char *adsl_modes[] = { - "ANSI", - "G.DMT", - "G.Lite" - }; - */ /* check if a file exists */ int file_exists(const char *filename) --- 86,94 ---- |
From: Aurelio <sk...@us...> - 2006-07-22 11:37:35
|
Update of /cvsroot/zyxel630-11/amedyn/amcontrol In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13072/amcontrol Modified Files: amcontrol.c Log Message: Move structs usb_modem_char and usb_modem_info to amedyn.h. Remove adsl_modems. Index: amcontrol.c =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/amcontrol/amcontrol.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** amcontrol.c 11 Jul 2006 14:20:25 -0000 1.6 --- amcontrol.c 22 Jul 2006 11:37:31 -0000 1.7 *************** *** 62,170 **** /* modem internal characteristics */ - struct usb_modem_char - { - unsigned int vid; /* VendorID */ - unsigned int pid; /* ProductID */ - char *firmfile; /* firmware file name */ - int datamax; /* maximum data that we can send in a block */ - }; struct usb_modem_char modem_char; /* info about modem */ - struct usb_modem_info - { - int modem_status; - char firm_version[5]; /* firmware version */ - char mac[6]; /* MAC address */ - int down_bitrate; /* download bitrate */ - int up_bitrate; /* upload bitrate */ - int link_status; /* link status */ - int line_status; /* line status */ - int operational_mode; /* operational mode */ - - - int down_bitrate_percent; - int up_bitrate_percent; - unsigned int down_attenuation; - unsigned int up_attenuation; - - char tons[256]; /* bits/simbolo */ - float potenciat, potenciar; - float ruidot, ruidor; - - unsigned int NearFecNotInterleaved; - unsigned int NearFecInterleaved; - unsigned int NearCrcNotInterleaved; - unsigned int NearCrcInterleaved; - unsigned int NearHecNotInterleaved; - unsigned int NearHecInterleaved; - - unsigned int FarFecNotInterleaved; - unsigned int FarFecInterleaved; - unsigned int FarCrcNotInterleaved; - unsigned int FarCrcInterleaved; - unsigned int FarHecNotInterleaved; - unsigned int FarHecInterleaved; - - // From cxacru - /* - // version - unsigned char mod_major; - unsigned char mod_minor; - unsigned char mod_release; - unsigned char mod_speed; - int hard_version; // controller version - char firm_version[5]; - unsigned char mac[6]; - - // transmit/configuration - unsigned int atm_cell_tx; - unsigned int atm_cell_rx; - unsigned int oam_loopback; - short vpi; - int vci; - - //state - int link_status; - int line_status; - unsigned int open_mode; - unsigned int operational_mode; //modulation - unsigned int data_path; - unsigned int startup_attempts; - unsigned int line_startable; - unsigned int link_lost; - int down_bitrate; // * - int up_bitrate; // * - unsigned int adsl_headend; - unsigned int adsl_headend_env; - - //advanced - unsigned char extended_info; - int up_snr_margin; - int down_snr_margin; - unsigned int up_attenuation; // * - unsigned int down_attenuation; // * - int transmitter_power; - unsigned int up_bits_frame; - unsigned int down_bits_frame; - unsigned int up_crc_errors; - unsigned int down_crc_errors; - unsigned int up_fec_errors; - unsigned int down_fec_errors; - unsigned int up_hec_errors; - unsigned int down_hec_errors; - - */ - - }; struct usb_modem_info modem_info; - /* adsl modes */ - const char *adsl_modes[] = { - "ANSI", - "G.DMT", - "G.Lite" - }; - /* show printable char */ void --- 62,70 ---- |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:18
|
Update of /cvsroot/zyxel630-11/amedyn/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211/scripts Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/scripts/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 20 May 2006 12:18:04 -0000 1.4 --- Makefile 20 Jul 2006 18:24:10 -0000 1.5 *************** *** 2,12 **** ## Makefile for Zyxel 630-11 & Asus AAM6000UG (install scripts) # ! ! BIN_PATH = /usr/sbin ! CONFIG_PATH = /etc CONFIG_FILE = amedyn SERVICE_FILE = amedyn ! SHARE_PATH = /usr/share ! TMESG_PATH = /usr/share/locale LANG= #LANGUAGES = es ca --- 2,14 ---- ## Makefile for Zyxel 630-11 & Asus AAM6000UG (install scripts) # ! ifndef RPM_BUILD_ROOT ! RPM_BUILD_ROOT=/ ! endif ! BIN_PATH = $(RPM_BUILD_ROOT)/usr/sbin ! CONFIG_PATH = $(RPM_BUILD_ROOT)/etc CONFIG_FILE = amedyn SERVICE_FILE = amedyn ! SHARE_PATH = $(RPM_BUILD_ROOT)/usr/share ! TMESG_PATH = $(RPM_BUILD_ROOT)Ã B/usr/share/locale LANG= #LANGUAGES = es ca *************** *** 24,46 **** generic: $(generic_scripts) ! install -c -m 755 -p $^ $(BIN_PATH) ! install -c -m 755 -p service/$(SERVICE_FILE) /etc/$(SERVICE_FILE).service config_file: config/$(CONFIG_FILE) if [ ! -f $(CONFIG_PATH)/$(CONFIG_FILE) ]; then \ install -c -m 644 -p $^ $(CONFIG_PATH); \ fi routed: $(routed_scripts) ! install -c -m 755 -p $^ $(BIN_PATH) pppoa: $(pppoa_scripts) ! install -c -m 755 -p $^ $(BIN_PATH) bridged: $(bridged_scripts) ! install -c -m 755 -p $^ $(BIN_PATH) pppoe: $(pppoe_scripts) ! install -c -m 755 -p $^ $(BIN_PATH) uninstall: --- 26,55 ---- generic: $(generic_scripts) ! install -d $(BIN_PATH) ! install -m 755 $^ $(BIN_PATH) ! install -d $(CONFIG_PATH) ! install -m 755 service/$(SERVICE_FILE) $(CONFIG_PATH)/$(SERVICE_FILE).service config_file: config/$(CONFIG_FILE) if [ ! -f $(CONFIG_PATH)/$(CONFIG_FILE) ]; then \ + install -d $(CONFIG_PATH) ;\ install -c -m 644 -p $^ $(CONFIG_PATH); \ fi routed: $(routed_scripts) ! install -d $(BIN_PATH) ! install -m 755 $^ $(BIN_PATH) pppoa: $(pppoa_scripts) ! install -d $(BIN_PATH) ! install -m 755 $^ $(BIN_PATH) bridged: $(bridged_scripts) ! install -d $(BIN_PATH) ! install -m 755 $^ $(BIN_PATH) pppoe: $(pppoe_scripts) ! install -d $(BIN_PATH) ! install -m 755 $^ $(BIN_PATH) uninstall: |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:17
|
Update of /cvsroot/zyxel630-11/amedyn/bridged In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211/bridged Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/bridged/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 12 Apr 2005 00:32:38 -0000 1.3 --- Makefile 20 Jul 2006 18:24:10 -0000 1.4 *************** *** 12,16 **** INCLUDES = -idirafter$(KERNEL_PATH)/include LDFLAGS = -latm -lresolv ! BIN_PATH = /usr/sbin EXE_FILES = br2684ctl --- 12,19 ---- INCLUDES = -idirafter$(KERNEL_PATH)/include LDFLAGS = -latm -lresolv ! ifndef RPM_BUILD_ROOT ! RPM_BUILD_ROOT = / ! endif ! BIN_PATH = $(RPM_BUILD_ROOT)/usr/sbin EXE_FILES = br2684ctl *************** *** 33,37 **** install_program: $(EXE_FILES) ! install -c -m 755 -p $(EXE_FILES) $(BIN_PATH) uninstall: --- 36,41 ---- install_program: $(EXE_FILES) ! install -d $(BIN_PATH) ! install -m 755 $(EXE_FILES) $(BIN_PATH) uninstall: |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:17
|
Update of /cvsroot/zyxel630-11/amedyn/amcontrol In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211/amcontrol Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/amcontrol/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 15 Jul 2006 15:14:28 -0000 1.3 --- Makefile 20 Jul 2006 18:24:10 -0000 1.4 *************** *** 9,18 **** INCLUDES = -I../include LDFLAGS = -lusb -lncurses ! BIN_PATH = /usr/sbin EXE_FILES = amcontrol EXE_FILES_DEBUG = amcontroldbg amcontroldbgt LANGUAGES = es ! SHARE_PATH = /usr/share ! TMESG_PATH = /usr/share/locale ifdef SIMULATE --- 9,21 ---- INCLUDES = -I../include LDFLAGS = -lusb -lncurses ! ifndef RPM_BUILD_ROOT ! RPM_BUILD_ROOT = / ! endif ! BIN_PATH = $(RPM_BUILD_ROOT)/usr/sbin EXE_FILES = amcontrol EXE_FILES_DEBUG = amcontroldbg amcontroldbgt LANGUAGES = es ! SHARE_PATH = $(RPM_BUILD_ROOT)/usr/share ! TMESG_PATH = $(RPM_BUILD_ROOT)/usr/share/locale ifdef SIMULATE |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:13
|
Update of /cvsroot/zyxel630-11/amedyn/init In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211/init Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/init/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 16 Jul 2006 17:41:42 -0000 1.6 --- Makefile 20 Jul 2006 18:24:10 -0000 1.7 *************** *** 9,18 **** INCLUDES = -I../include LDFLAGS = -lusb -lpopt ! BIN_PATH = /usr/sbin EXE_FILES = amload amioctl amcheckline amsyncline EXE_FILES_DEBUG = amloaddbg amloaddbgt LANGUAGES = es ! SHARE_PATH = /usr/share ! TMESG_PATH = /usr/share/locale ifdef SIMULATE --- 9,21 ---- INCLUDES = -I../include LDFLAGS = -lusb -lpopt ! ifndef RPM_BUILD_ROOT ! RPM_BUILD_ROOT= / ! endif ! BIN_PATH = $(RPM_BUILD_ROOT)/usr/sbin EXE_FILES = amload amioctl amcheckline amsyncline EXE_FILES_DEBUG = amloaddbg amloaddbgt LANGUAGES = es ! SHARE_PATH = $(RPM_BUILD_ROOT)/usr/share ! TMESG_PATH = $(RPM_BUILD_ROOT)/usr/share/locale ifdef SIMULATE *************** *** 61,65 **** install_program: $(EXE_FILES) ! install -c -m 755 -p $(EXE_FILES) $(BIN_PATH) uninstall: --- 64,69 ---- install_program: $(EXE_FILES) ! install -d $(BIN_PATH) ! install -m 755 $(EXE_FILES) $(BIN_PATH) uninstall: |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:12
|
Update of /cvsroot/zyxel630-11/amedyn/module In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211/module Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/module/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 17 Jul 2006 14:46:57 -0000 1.4 --- Makefile 20 Jul 2006 18:24:10 -0000 1.5 *************** *** 3,11 **** # DEST_KERNEL = $(shell uname -r) DEST_KERNEL_MAIN = $(shell uname -r | cut -d'.' -f1-2) KERNEL_PATH = /lib/modules/$(DEST_KERNEL)/build #KERNEL_PATH = /usr/src/linux-2.6.0-0.test4.1.33 ! MODULE_PATH = /lib/modules/$(DEST_KERNEL)/kernel/drivers/usb # You need remove .config file from $(KERNEL_PATH) if you use CONFIG_PATH different of KERNEL_PATH or if you use CONFIG_NAME different of .config CONFIG_PATH = $(KERNEL_PATH) --- 3,18 ---- # + ifndef DEST_KERNEL DEST_KERNEL = $(shell uname -r) + endif + ifndef DEST_KERNEL_MAIN DEST_KERNEL_MAIN = $(shell uname -r | cut -d'.' -f1-2) + endif KERNEL_PATH = /lib/modules/$(DEST_KERNEL)/build #KERNEL_PATH = /usr/src/linux-2.6.0-0.test4.1.33 ! ifndef RPM_BUILD_ROOT ! RPM_BUILD_ROOT=/ ! endif ! MODULE_PATH = $(RPM_BUILD_ROOT)/lib/modules/$(DEST_KERNEL)/kernel/drivers/usb # You need remove .config file from $(KERNEL_PATH) if you use CONFIG_PATH different of KERNEL_PATH or if you use CONFIG_NAME different of .config CONFIG_PATH = $(KERNEL_PATH) |
From: Aurelio <sk...@us...> - 2006-07-20 18:24:12
|
Update of /cvsroot/zyxel630-11/amedyn In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7211 Modified Files: Makefile Log Message: By Mathias Gug (2004-01-24) https://sourceforge.net/tracker/index.php?func=detail&aid=883695&group_id=84006&atid=571424 This patch adds support for specifying an alternate root directory for the installation process. Also adds some new targets in the top level makefile, to make the compilation process completly independant from the installation process. Add support to configure against which kernel version module should be compiled. Index: Makefile =================================================================== RCS file: /cvsroot/zyxel630-11/amedyn/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 16 Jul 2006 18:33:20 -0000 1.5 --- Makefile 20 Jul 2006 18:24:09 -0000 1.6 *************** *** 46,52 **** #install: CX_INIT CX_FIRMWARE CX_MODULE CX_SCRIPTS BRIDGED CX_PANEL ! compile: AME_INIT AME_CONTROL ! install: AME_INIT_install AME_SCRIPTS_install AME_CONTROL_install AME_INIT: init --- 46,65 ---- #install: CX_INIT CX_FIRMWARE CX_MODULE CX_SCRIPTS BRIDGED CX_PANEL ! compile: userspace modules ! userspace: AME_INIT AME_CONTROL ! ! modules: AME_MODULE ! ! install: userspace_install modules_install ! ! userspace_install: ! make -C init install ! make -C scripts ! make -C bridged install ! make -C amcontrol install ! ! module_install: module ! make -C module install AME_INIT: init *************** *** 65,83 **** cd bridged && make - AME_INIT_install: init - cd init && make install - - AME_CONTROL_install: - cd amcontrol && make install - - AME_MODULE_install: module - cd module && make install - - AME_SCRIPTS_install: scripts - cd scripts && make - - BRIDGED_install: bridged - cd bridged && make install - package: clean cd .. && tar -zcvf ${TGZ_SRC_NAME} amedyn --- 78,81 ---- |