diff -ur -d nictools-20030719.orig/3c515-diag.c nictools-20030719/3c515-diag.c --- nictools-20030719.orig/3c515-diag.c 2003-07-19 19:23:28.000000000 -0700 +++ nictools-20030719/3c515-diag.c 2003-09-23 15:08:22.000000000 -0700 @@ -35,13 +35,13 @@ "3c515-diag.c:v1.00 7/24/2000 Donald Becker http://scyld.com/diag/index.html\n"; static char *usage_msg = -"Usage: 3c515-diag [-afhNsvVwW] [-p ] [-F ] [-P ] - -p Use the card at this I/O address (default 0x300). - EEPROM configuration commands take effect at the next reset - -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type. - -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line. - -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base. - -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive) +"Usage: 3c515-diag [-afhNsvVwW] [-p ] [-F ] [-P ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ + EEPROM configuration commands take effect at the next reset\n\ + -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type.\n\ + -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line.\n\ + -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base.\n\ + -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/alta-diag.c nictools-20030719/alta-diag.c --- nictools-20030719.orig/alta-diag.c 2003-07-19 19:23:28.000000000 -0700 +++ nictools-20030719/alta-diag.c 2003-09-23 15:11:34.000000000 -0700 @@ -36,36 +36,36 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/at1700-diag.c nictools-20030719/at1700-diag.c --- nictools-20030719.orig/at1700-diag.c 2003-07-19 19:23:28.000000000 -0700 +++ nictools-20030719/at1700-diag.c 2003-09-23 15:07:53.000000000 -0700 @@ -27,16 +27,15 @@ */ static char *version = -"at1700-diag.c:v1.00 7/28/2000 Donald Becker http://scyld.com/diag/index.html -"; +"at1700-diag.c:v1.00 7/28/2000 Donald Becker http://scyld.com/diag/index.html\n"; static char *usage_msg = -"Usage: at1700-diag [-afhNsvVwW] [-p ] [-F ] [-P ] - -p Use the card at this I/O address (default 0x300). - EEPROM configuration commands take effect at the next reset - -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type. - -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line. - -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base. - -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive) +"Usage: at1700-diag [-afhNsvVwW] [-p ] [-F ] [-P ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ + EEPROM configuration commands take effect at the next reset\n\ + -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type.\n\ + -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line.\n\ + -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base.\n\ + -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/atlantic.c nictools-20030719/atlantic.c --- nictools-20030719.orig/atlantic.c 2003-07-19 19:23:28.000000000 -0700 +++ nictools-20030719/atlantic.c 2003-09-23 15:08:39.000000000 -0700 @@ -35,13 +35,13 @@ static char *version_msg = "atlantic.c v1.01 7/23/00 Donald Becker http://www.scyld.com/diag/index.html\n"; static char *usage_msg = -"Usage: atlantic [-afhNsvVwW] [-p ] [-F ] [-P ] - -p Use the card at this I/O address (default 0x300). - EEPROM configuration commands take effect at the next reset - -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type. - -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line. - -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base. - -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive) +"Usage: atlantic [-afhNsvVwW] [-p ] [-F ] [-P ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ + EEPROM configuration commands take effect at the next reset\n\ + -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type.\n\ + -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line.\n\ + -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base.\n\ + -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/atp-diag.c nictools-20030719/atp-diag.c --- nictools-20030719.orig/atp-diag.c 2003-07-19 19:23:28.000000000 -0700 +++ nictools-20030719/atp-diag.c 2003-09-23 15:08:49.000000000 -0700 @@ -31,8 +31,8 @@ "atp-diag.c:v1.00 7/24/2000 Donald Becker http://scyld.com/diag/index.html\n"; static const char *usage_msg = -"Usage: atp-diag [-afhNsvVwW] [-p ] - -p Use the card at this I/O address (default 0x378). +"Usage: atp-diag [-afhNsvVwW] [-p ]\n\ + -p Use the card at this I/O address (default 0x378).\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/e21.c nictools-20030719/e21.c --- nictools-20030719.orig/e21.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/e21.c 2003-09-23 15:09:02.000000000 -0700 @@ -28,8 +28,8 @@ "e21.c:v1.01 7/28/2000 Donald Becker http://www.scyld.com/diag/index.html\n"; static const char *usage_msg = -"Usage: e21 [-fhmvV] [-p ] - -p Use the card at this I/O address (default 0x300). +"Usage: e21 [-fhmvV] [-p ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/eepro100-diag.c nictools-20030719/eepro100-diag.c --- nictools-20030719.orig/eepro100-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/eepro100-diag.c 2003-09-23 15:11:51.000000000 -0700 @@ -34,36 +34,36 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type (with '-p'), use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:89:ab - Set a new hardware station address. Typically disabled for safety. - -w --write-EEPROM Actually write the new settings into the EEPROM. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type (with '-p'), use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:89:ab\n\ + Set a new hardware station address. Typically disabled for safety.\n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/eexpress.c nictools-20030719/eexpress.c --- nictools-20030719.orig/eexpress.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/eexpress.c 2003-09-23 15:09:25.000000000 -0700 @@ -29,15 +29,14 @@ */ static char *version_msg = - "eexpress.c:v1.00 7/29/2000 Donald Becker http://scyld.com/diag/index.html -"; + "eexpress.c:v1.00 7/29/2000 Donald Becker http://scyld.com/diag/index.html\n"; static char *usage_msg = -"Usage: eexpress [-afhNsvVwW] [-p ] [-F ] [-P ] - -p Use the card at this I/O address (default 0x300). - EEPROM configuration commands take effect at the next reset - -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type. - -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line. - -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base. +"Usage: eexpress [-afhNsvVwW] [-p ] [-F ] [-P ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ + EEPROM configuration commands take effect at the next reset\n\ + -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type.\n\ + -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line.\n\ + -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base.\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/hp+.c nictools-20030719/hp+.c --- nictools-20030719.orig/hp+.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/hp+.c 2003-09-23 15:09:42.000000000 -0700 @@ -31,13 +31,13 @@ "hp+.c:v1.00 7/23/00 Donald Becker http://www.scyld.com/diag/index.html\n"; static char *usage_msg = -"Usage: hp+ [-afhNsvVwW] [-p ] [-F ] [-P ] - -p Use the card at this I/O address (default 0x300). - EEPROM configuration commands take effect at the next reset - -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type. - -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line. - -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base. - -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive) +"Usage: hp+ [-afhNsvVwW] [-p ] [-F ] [-P ]\n\ + -p Use the card at this I/O address (default 0x300).\n\ + EEPROM configuration commands take effect at the next reset\n\ + -F 10baseT, 10base2, AUI, 10baset Set the specified transceiver type.\n\ + -Q 3, 4, 5, 9, 10, 11, 12, 15 Set the IRQ line.\n\ + -P 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0x360 New I/O base.\n\ + -N or -W Set to NE2000 or WD8013 clone mode (mutually exclusive)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/hp100vg-diag.c nictools-20030719/hp100vg-diag.c --- nictools-20030719.orig/hp100vg-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/hp100vg-diag.c 2003-09-23 15:10:39.000000000 -0700 @@ -41,40 +41,40 @@ "Usage: 100vg-diag [-aEfFsvVw] [-p ] [-Q ]\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled. - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled.\n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/mii-diag.c nictools-20030719/mii-diag.c --- nictools-20030719.orig/mii-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/mii-diag.c 2003-09-23 15:15:56.000000000 -0700 @@ -31,38 +31,38 @@ static const char usage_msg[] = "Usage: %s [-aDfrRvVw] [-AF ] [--watch] .\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [--watch] . - - Show the link status of the specified network interface. - The default interface is \"eth0\". - - The common usage is - mii-diag eth0 - Frequently used options are - -A --advertise - -F --fixed-speed - Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD, - 10baseT, 10baseT-FD, 10baseT-HD - -s --status Return exit status 2 if there is no link beat. - - Less frequently used options are - -a --all-interfaces Show the status all interfaces - (Not recommended with options that change settings.) - -D --debug - -g --read-parameters Get driver-specific parameters. - -G --set-parameters PARMS Set driver-specific parameters. - Parameters are comma separated, missing elements retain existing value. - -M --msg-level LEVEL Set the driver message bit map. - -p --phy ADDR Set the PHY (MII address) to report. - -r --restart Restart the link autonegotiation. - -R --reset Reset the transceiver. - -v --verbose Report each action taken. - -V --version Emit version information. - -w --watch Continuously monitor the transceiver and report changes. - - This command returns success (zero) if the interface information can be - read. If the --status option is passed, a zero return means that the - interface has link beat. +"Usage: %s [-aDfrRvVw] [-AF ] [--watch] .\n\ +\n\ + Show the link status of the specified network interface.\n\ + The default interface is \"eth0\".\n\ +\n\ + The common usage is\n\ + mii-diag eth0\n\ + Frequently used options are\n\ + -A --advertise \n\ + -F --fixed-speed \n\ + Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n\ + 10baseT, 10baseT-FD, 10baseT-HD\n\ + -s --status Return exit status 2 if there is no link beat.\n\ +\n\ + Less frequently used options are\n\ + -a --all-interfaces Show the status all interfaces\n\ + (Not recommended with options that change settings.)\n\ + -D --debug\n\ + -g --read-parameters Get driver-specific parameters.\n\ + -G --set-parameters PARMS Set driver-specific parameters.\n\ + Parameters are comma separated, missing elements retain existing value.\n\ + -M --msg-level LEVEL Set the driver message bit map.\n\ + -p --phy ADDR Set the PHY (MII address) to report.\n\ + -r --restart Restart the link autonegotiation.\n\ + -R --reset Reset the transceiver.\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ + -w --watch Continuously monitor the transceiver and report changes.\n\ +\n\ + This command returns success (zero) if the interface information can be\n\ + read. If the --status option is passed, a zero return means that the\n\ + interface has link beat.\n\ "; #include diff -ur -d nictools-20030719.orig/myson-diag.c nictools-20030719/myson-diag.c --- nictools-20030719.orig/myson-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/myson-diag.c 2003-09-23 15:12:36.000000000 -0700 @@ -35,36 +35,36 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) @@ -825,16 +825,16 @@ } -static char davicom_msg[] = " - Your EEPROM has been misprogrammed from the factory! - - It contains the EEPROM programming for a Davicom 9102 chip, not the - configuration for the Myson 800 series part. - This results incorrect operation, and no Wake-On-LAN feature. - Contact your vendor for a fix or replacement board. - - You may, at your own risk, attempt to use the '-E' Emergency rewrite - option to correct the EEPROM contents. +static char davicom_msg[] = "\n\ + Your EEPROM has been misprogrammed from the factory!\n\ +\n\ + It contains the EEPROM programming for a Davicom 9102 chip, not the\n\ + configuration for the Myson 800 series part.\n\ + This results incorrect operation, and no Wake-On-LAN feature.\n\ + Contact your vendor for a fix or replacement board.\n\ +\n\ + You may, at your own risk, attempt to use the '-E' Emergency rewrite\n\ + option to correct the EEPROM contents.\n\ "; static void myson_eeprom(unsigned short *ee_data) diff -ur -d nictools-20030719.orig/natsemi-diag.c nictools-20030719/natsemi-diag.c --- nictools-20030719.orig/natsemi-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/natsemi-diag.c 2003-09-23 15:12:48.000000000 -0700 @@ -37,40 +37,40 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - natsemi-diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + natsemi-diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/ne2k-pci-diag.c nictools-20030719/ne2k-pci-diag.c --- nictools-20030719.orig/ne2k-pci-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/ne2k-pci-diag.c 2003-09-23 15:15:43.000000000 -0700 @@ -767,34 +767,34 @@ p[23] & 8 ? "no link beat required" : "autoselect by link beat", winbond_rom[p[23]>>5]); if (ee_data[9] == 0x8c4a) - printf(" -This board has bogus information written into the configuration EEPROM. -The configuration table is for a Realtek chip, but this board is using -a Winbond 89c940 chip. This misprogramming usually results in an invalid -station address, and prevents the board from being detected by standard -drivers. - -To reprogram the configuration EEPROM select a new station address such as -40:00:00:12:34:56 and run this diagnostic with the options - --write-EEPROM --emergency-rewrite --new-hwaddr 40:00:00:12:34:56 + printf("\n\ +This board has bogus information written into the configuration EEPROM.\n\ +The configuration table is for a Realtek chip, but this board is using\n\ +a Winbond 89c940 chip. This misprogramming usually results in an invalid\n\ +station address, and prevents the board from being detected by standard\n\ +drivers.\n\ +\n\ +To reprogram the configuration EEPROM select a new station address such as\n\ +40:00:00:12:34:56 and run this diagnostic with the options\n\ + --write-EEPROM --emergency-rewrite --new-hwaddr 40:00:00:12:34:56\n\ "); return; } -static char unknown_eeprom_message[] = " - No information is known about how to read or write the configuration - EEPROM of this NIC board. It is likely that this NIC is using a common - chip with a unique PCI ID. It may be possible to read the EEPROM by - explicitly specifying the chip type and I/O address: - ne2k-pci-diag -t 1 -p # For Realtek rtl8029 chip - ne2k-pci-diag -t 2 -p # For Winbond 89C940 chip - ne2k-pci-diag -t 3 -p # For Holtek HT80229 chip - If one of these is required, please send a report to becker@scyld.com. +static char unknown_eeprom_message[] = "\n\ + No information is known about how to read or write the configuration\n\ + EEPROM of this NIC board. It is likely that this NIC is using a common\n\ + chip with a unique PCI ID. It may be possible to read the EEPROM by\n\ + explicitly specifying the chip type and I/O address:\n\ + ne2k-pci-diag -t 1 -p # For Realtek rtl8029 chip\n\ + ne2k-pci-diag -t 2 -p # For Winbond 89C940 chip\n\ + ne2k-pci-diag -t 3 -p # For Holtek HT80229 chip\n\ + If one of these is required, please send a report to becker@scyld.com.\n\ "; -static char no_rewrite_msg[] = " -*** Emergency EEPROM rewrite is not yet available for this chip type. - ** See the Scyld diagnostic web page for updates and more information. +static char no_rewrite_msg[] = "\n\ +*** Emergency EEPROM rewrite is not yet available for this chip type.\n\ + ** See the Scyld diagnostic web page for updates and more information.\n\ ** http://www.scyld.com/diag/index.html"; /* The examples below have 00:11:22:33:44:55 as the station address. */ diff -ur -d nictools-20030719.orig/ns820-diag.c nictools-20030719/ns820-diag.c --- nictools-20030719.orig/ns820-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/ns820-diag.c 2003-09-23 15:13:00.000000000 -0700 @@ -36,36 +36,36 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - ns820-diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + ns820-diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/pci-config.c nictools-20030719/pci-config.c --- nictools-20030719.orig/pci-config.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/pci-config.c 2003-09-23 15:16:08.000000000 -0700 @@ -28,32 +28,32 @@ static char *usage_msg = "Usage: pci-config [-aDfSvVW] [-# ]\n"; -static char *long_usage_msg =" - - This program shows the contents of PCI configuration space. - It reads the hardware registers, and thus must be run as 'root'. - - Running this program with no options shows the installed PCI devices. - Each line is prefixed by its index which may be used with -# - e.g. \"pci-config -#3\" to specify the device to operate on. - - Commonly use options are - -# Operate only on DEVICE-INDEX e.g -#3 - - The operations on the selected device are - -a --show-addresses Show PCI address registers. - -S --sleep Put device to sleep (ACPI D3 state) - -W --wake Wake a sleeping device (ACPI D0 state) - - Less commonly used options are - -B --bus Show only devices on BUS. - -A --set-addresses Set PCI address register 1 to the ADDR. - -D --debug Show details of operations - -f --force Override checks and perform the operation - -u --usage Show this long usage message - -v --verbose Verbose mode - -V --version Display this program's version information - +static char *long_usage_msg ="\n\ +\n\ + This program shows the contents of PCI configuration space.\n\ + It reads the hardware registers, and thus must be run as 'root'.\n\ +\n\ + Running this program with no options shows the installed PCI devices.\n\ + Each line is prefixed by its index which may be used with -#\n\ + e.g. \"pci-config -#3\" to specify the device to operate on.\n\ +\n\ + Commonly use options are\n\ + -# Operate only on DEVICE-INDEX e.g -#3\n\ +\n\ + The operations on the selected device are\n\ + -a --show-addresses Show PCI address registers.\n\ + -S --sleep Put device to sleep (ACPI D3 state)\n\ + -W --wake Wake a sleeping device (ACPI D0 state)\n\ +\n\ + Less commonly used options are\n\ + -B --bus Show only devices on BUS.\n\ + -A --set-addresses Set PCI address register 1 to the ADDR.\n\ + -D --debug Show details of operations\n\ + -f --force Override checks and perform the operation\n\ + -u --usage Show this long usage message\n\ + -v --verbose Verbose mode\n\ + -V --version Display this program's version information\n\ +\n\ "; #include diff -ur -d nictools-20030719.orig/rtl8139-diag.c nictools-20030719/rtl8139-diag.c --- nictools-20030719.orig/rtl8139-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/rtl8139-diag.c 2003-09-23 15:13:14.000000000 -0700 @@ -36,40 +36,40 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:89:ab - Set a new hardware station address. Typically disabled for safety. - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:89:ab\n\ + Set a new hardware station address. Typically disabled for safety.\n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/tulip-diag.c nictools-20030719/tulip-diag.c --- nictools-20030719.orig/tulip-diag.c 2003-07-19 19:59:54.000000000 -0700 +++ nictools-20030719/tulip-diag.c 2003-09-23 15:14:21.000000000 -0700 @@ -38,41 +38,41 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type (with '-p'), use '-1' to list. - - To change the persistent EEPROM settings - -F, --new-interface N Set the default transceiver type. - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:89:ab - Set a new hardware station address. Typically disabled for safety. - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type (with '-p'), use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -F, --new-interface N Set the default transceiver type.\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:89:ab\n\ + Set a new hardware station address. Typically disabled for safety.\n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) @@ -1410,9 +1410,9 @@ /* Should actually do a fix-up based on the vendor half of the station address prefix here. Or least use that information to report which transceiver will work. */ - printf(" * An old-style EEPROM layout was found. - * The old-style layout does not contain transceiver control information. - * This board may not work, or may work only with a subset of transceiver + printf(" * An old-style EEPROM layout was found.\n\ + * The old-style layout does not contain transceiver control information.\n\ + * This board may not work, or may work only with a subset of transceiver\n\ * options or data rates.\n"); return; } else if (ee_data[27] == 0) { @@ -1696,14 +1696,13 @@ } static const char msg_no_station_addr[] = -" However this card's station address could not be located in Card - Information Structure, therefore no corrected EEPROM table information can - be written. +" However this card's station address could not be located in Card\n\ + Information Structure, therefore no corrected EEPROM table information can\n\ + be written.\n\ "; static const char msg_bogus_intel_eeprom[] = -"You have an Intel CardBus card with an incomplete EEPROM! -"; +"You have an Intel CardBus card with an incomplete EEPROM!\n"; static void check_for_intel_cb(long ioaddr, u_int16_t *eeprom_contents) { diff -ur -d nictools-20030719.orig/via-diag.c nictools-20030719/via-diag.c --- nictools-20030719.orig/via-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/via-diag.c 2003-09-23 15:14:36.000000000 -0700 @@ -38,40 +38,40 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent configuration EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent configuration EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/vortex-diag.c nictools-20030719/vortex-diag.c --- nictools-20030719.orig/vortex-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/vortex-diag.c 2003-09-23 15:14:49.000000000 -0700 @@ -41,40 +41,40 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - vortex-diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Read the documentation first! - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + vortex-diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Read the documentation first!\n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__) diff -ur -d nictools-20030719.orig/winbond-diag.c nictools-20030719/winbond-diag.c --- nictools-20030719.orig/winbond-diag.c 2003-07-19 19:23:29.000000000 -0700 +++ nictools-20030719/winbond-diag.c 2003-09-23 15:15:03.000000000 -0700 @@ -36,40 +36,40 @@ " For details and other options see http://www.scyld.com/diag/index.html\n"; static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF ] [-#] - - Show the internal state of a network adapter. - - The common usage is - diag -aem - - Frequently used options are - -a --show_all_registers Print all registers. - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. - -m --show_mii Print the MII transceiver state - Using -mm monitors the link. - -f --force Perform operation, even on a running NIC. - - To operate on a single NIC, or one that hasn't been automatically found: - -# --card_num INDEX Operate on the specified card index. - -p --port-base IOADDR Assume an adapter at the specified I/O address. - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. - - To change the persistent EEPROM settings - -G --parameters PARMS Set adapter-specific parameters. - -H --new-hwaddr 01:23:45:67:ab:cd - Set a new hardware station address. Typically diabled, - -w --write-EEPROM Actually write the new settings into the EEPROM. - To read and write the boot BIOS extension Flash ROM - -B Show the first few bytes of the ROM - -L FILE Load the Flash from FILE. - -S FILE Store the Flash image to FILE. - - -D --debug - -v --verbose Report each action taken. - -V --version Emit version information. - - -A --advertise (See the mii-diag manual page.) +"Usage: %s [-aDfrRvVw] [-AF ] [-#]\n\ +\n\ + Show the internal state of a network adapter.\n\ +\n\ + The common usage is\n\ + diag -aem\n\ +\n\ + Frequently used options are\n\ + -a --show_all_registers Print all registers.\n\ + -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n\ + -m --show_mii Print the MII transceiver state\n\ + Using -mm monitors the link.\n\ + -f --force Perform operation, even on a running NIC.\n\ +\n\ + To operate on a single NIC, or one that hasn't been automatically found:\n\ + -# --card_num INDEX Operate on the specified card index.\n\ + -p --port-base IOADDR Assume an adapter at the specified I/O address.\n\ + -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n\ +\n\ + To change the persistent EEPROM settings\n\ + -G --parameters PARMS Set adapter-specific parameters.\n\ + -H --new-hwaddr 01:23:45:67:ab:cd\n\ + Set a new hardware station address. Typically diabled, \n\ + -w --write-EEPROM Actually write the new settings into the EEPROM.\n\ + To read and write the boot BIOS extension Flash ROM\n\ + -B Show the first few bytes of the ROM\n\ + -L FILE Load the Flash from FILE.\n\ + -S FILE Store the Flash image to FILE.\n\ +\n\ + -D --debug\n\ + -v --verbose Report each action taken.\n\ + -V --version Emit version information.\n\ +\n\ + -A --advertise (See the mii-diag manual page.)\n\ "; #if ! defined(__OPTIMIZE__)