| a05bc8cf |
1 | --- diag-ether/myson-diag.c.org 2004-02-22 22:28:14.000000000 +0000 |
| 2 | +++ diag-ether/myson-diag.c 2004-02-22 22:30:46.000000000 +0000 |
| 3 | @@ -35,37 +35,37 @@ |
| 4 | " For details and other options see http://www.scyld.com/diag/index.html\n"; |
| 5 | |
| 6 | static const char long_usage_msg[] = |
| 7 | -"Usage: %s [-aDfrRvVw] [-AF <speed+duplex>] [-#<BoardNum>] |
| 8 | - |
| 9 | - Show the internal state of a network adapter. |
| 10 | - |
| 11 | - The common usage is |
| 12 | - diag -aem |
| 13 | - |
| 14 | - Frequently used options are |
| 15 | - -a --show_all_registers Print all registers. |
| 16 | - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. |
| 17 | - -m --show_mii Print the MII transceiver state |
| 18 | - Using -mm monitors the link. |
| 19 | - -f --force Perform operation, even on a running NIC. |
| 20 | - |
| 21 | - To operate on a single NIC, or one that hasn't been automatically found: |
| 22 | - -# --card_num INDEX Operate on the specified card index. |
| 23 | - -p --port-base IOADDR Assume an adapter at the specified I/O address. |
| 24 | - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. |
| 25 | - |
| 26 | - To change the persistent EEPROM settings |
| 27 | - -G --parameters PARMS Set adapter-specific parameters. |
| 28 | - -H --new-hwaddr 01:23:45:67:ab:cd |
| 29 | - Set a new hardware station address. Typically diabled, |
| 30 | - -w --write-EEPROM Actually write the new settings into the EEPROM. |
| 31 | - |
| 32 | - -D --debug |
| 33 | - -v --verbose Report each action taken. |
| 34 | - -V --version Emit version information. |
| 35 | - |
| 36 | - -A --advertise <speed|setting> (See the mii-diag manual page.) |
| 37 | -"; |
| 38 | +"Usage: %s [-aDfrRvVw] [-AF <speed+duplex>] [-#<BoardNum>]\n" |
| 39 | +"\n" |
| 40 | +" Show the internal state of a network adapter.\n" |
| 41 | +"\n" |
| 42 | +" The common usage is\n" |
| 43 | +" diag -aem\n" |
| 44 | +"\n" |
| 45 | +" Frequently used options are\n" |
| 46 | +" -a --show_all_registers Print all registers.\n" |
| 47 | +" -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n" |
| 48 | +" -m --show_mii Print the MII transceiver state\n" |
| 49 | +" Using -mm monitors the link.\n" |
| 50 | +" -f --force Perform operation, even on a running NIC.\n" |
| 51 | +"\n" |
| 52 | +" To operate on a single NIC, or one that hasn't been automatically found:\n" |
| 53 | +" -# --card_num INDEX Operate on the specified card index.\n" |
| 54 | +" -p --port-base IOADDR Assume an adapter at the specified I/O address.\n" |
| 55 | +" -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n" |
| 56 | +"\n" |
| 57 | +" To change the persistent EEPROM settings\n" |
| 58 | +" -G --parameters PARMS Set adapter-specific parameters.\n" |
| 59 | +" -H --new-hwaddr 01:23:45:67:ab:cd\n" |
| 60 | +" Set a new hardware station address. Typically diabled, \n" |
| 61 | +" -w --write-EEPROM Actually write the new settings into the EEPROM.\n" |
| 62 | +"\n" |
| 63 | +" -D --debug\n" |
| 64 | +" -v --verbose Report each action taken.\n" |
| 65 | +" -V --version Emit version information.\n" |
| 66 | +"\n" |
| 67 | +" -A --advertise <speed|setting> (See the mii-diag manual page.)\n" |
| 68 | +"\n"; |
| 69 | |
| 70 | #if ! defined(__OPTIMIZE__) |
| 71 | #warning You must compile this program with the correct options! |
| 72 | @@ -82,7 +82,6 @@ |
| 73 | |
| 74 | /* The following are required only with unaligned field accesses. */ |
| 75 | #include <asm/types.h> |
| 76 | -#include <asm/unaligned.h> |
| 77 | |
| 78 | #if defined(__linux__) && __GNU_LIBRARY__ == 1 |
| 79 | #include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */ |
| 80 | @@ -825,17 +824,17 @@ |
| 81 | } |
| 82 | |
| 83 | |
| 84 | -static char davicom_msg[] = " |
| 85 | - Your EEPROM has been misprogrammed from the factory! |
| 86 | - |
| 87 | - It contains the EEPROM programming for a Davicom 9102 chip, not the |
| 88 | - configuration for the Myson 800 series part. |
| 89 | - This results incorrect operation, and no Wake-On-LAN feature. |
| 90 | - Contact your vendor for a fix or replacement board. |
| 91 | - |
| 92 | - You may, at your own risk, attempt to use the '-E' Emergency rewrite |
| 93 | - option to correct the EEPROM contents. |
| 94 | -"; |
| 95 | +static char davicom_msg[] = |
| 96 | +" Your EEPROM has been misprogrammed from the factory!\n" |
| 97 | +"\n" |
| 98 | +" It contains the EEPROM programming for a Davicom 9102 chip, not the\n" |
| 99 | +" configuration for the Myson 800 series part.\n" |
| 100 | +" This results incorrect operation, and no Wake-On-LAN feature.\n" |
| 101 | +" Contact your vendor for a fix or replacement board.\n" |
| 102 | +"\n" |
| 103 | +" You may, at your own risk, attempt to use the '-E' Emergency rewrite\n" |
| 104 | +" option to correct the EEPROM contents.\n" |
| 105 | +"\n"; |
| 106 | |
| 107 | static void myson_eeprom(unsigned short *ee_data) |
| 108 | { |
projects / packages / diag-ether.git / blame