]>
Commit | Line | Data |
---|---|---|
a05bc8cf | 1 | --- diag-ether/natsemi-diag.c.org 2004-02-22 21:40:26.000000000 +0000 |
2 | +++ diag-ether/natsemi-diag.c 2004-02-22 21:43:40.000000000 +0000 | |
3 | @@ -37,41 +37,41 @@ | |
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 | +"Usage: %s [-aDfrRvVw] [-AF <speed+duplex>] [-#<BoardNum>]\n" | |
9 | +"\n" | |
10 | +" Show the internal state of a network adapter.\n" | |
11 | +"\n" | |
12 | +" The common usage is\n" | |
13 | +" natsemi-diag -aem\n" | |
14 | +"\n" | |
15 | +" Frequently used options are\n" | |
16 | +" -a --show_all_registers Print all registers.\n" | |
17 | +" -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details.\n" | |
18 | +" -m --show_mii Print the MII transceiver state\n" | |
19 | +" Using -mm monitors the link.\n" | |
20 | +" -f --force Perform operation, even on a running NIC.\n" | |
21 | +"\n" | |
22 | +" To operate on a single NIC, or one that hasn't been automatically found:\n" | |
23 | +" -# --card_num INDEX Operate on the specified card index.\n" | |
24 | +" -p --port-base IOADDR Assume an adapter at the specified I/O address.\n" | |
25 | +" -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list.\n" | |
26 | +"\n" | |
27 | +" To change the persistent EEPROM settings\n" | |
28 | +" -G --parameters PARMS Set adapter-specific parameters.\n" | |
29 | +" -H --new-hwaddr 01:23:45:67:ab:cd\n" | |
30 | +" Set a new hardware station address. Typically diabled, \n" | |
31 | +" -w --write-EEPROM Actually write the new settings into the EEPROM.\n" | |
32 | +" To read and write the boot BIOS extension Flash ROM\n" | |
33 | +" -B Show the first few bytes of the ROM\n" | |
34 | +" -L FILE Load the Flash from FILE.\n" | |
35 | +" -S FILE Store the Flash image to FILE.\n" | |
36 | +"\n" | |
37 | +" -D --debug\n" | |
38 | +" -v --verbose Report each action taken.\n" | |
39 | +" -V --version Emit version information.\n" | |
40 | +"\n" | |
41 | +" -A --advertise <speed|setting> (See the mii-diag manual page.)\n"; | |
42 | ||
43 | - Show the internal state of a network adapter. | |
44 | - | |
45 | - The common usage is | |
46 | - natsemi-diag -aem | |
47 | - | |
48 | - Frequently used options are | |
49 | - -a --show_all_registers Print all registers. | |
50 | - -e --show-eeprom Dump EEPROM contents, \"-ee\" shows the details. | |
51 | - -m --show_mii Print the MII transceiver state | |
52 | - Using -mm monitors the link. | |
53 | - -f --force Perform operation, even on a running NIC. | |
54 | - | |
55 | - To operate on a single NIC, or one that hasn't been automatically found: | |
56 | - -# --card_num INDEX Operate on the specified card index. | |
57 | - -p --port-base IOADDR Assume an adapter at the specified I/O address. | |
58 | - -t --chip-type TYPE Specify adapter type with '-p', use '-1' to list. | |
59 | - | |
60 | - To change the persistent EEPROM settings | |
61 | - -G --parameters PARMS Set adapter-specific parameters. | |
62 | - -H --new-hwaddr 01:23:45:67:ab:cd | |
63 | - Set a new hardware station address. Typically diabled, | |
64 | - -w --write-EEPROM Actually write the new settings into the EEPROM. | |
65 | - To read and write the boot BIOS extension Flash ROM | |
66 | - -B Show the first few bytes of the ROM | |
67 | - -L FILE Load the Flash from FILE. | |
68 | - -S FILE Store the Flash image to FILE. | |
69 | - | |
70 | - -D --debug | |
71 | - -v --verbose Report each action taken. | |
72 | - -V --version Emit version information. | |
73 | - | |
74 | - -A --advertise <speed|setting> (See the mii-diag manual page.) | |
75 | -"; | |
76 | ||
77 | #if ! defined(__OPTIMIZE__) | |
78 | #warning You must compile this program with the correct options! | |
79 | @@ -90,7 +90,7 @@ | |
80 | ||
81 | /* The following are required only with unaligned field accesses. */ | |
82 | #include <asm/types.h> | |
83 | -#include <asm/unaligned.h> | |
84 | +//#include <asm/unaligned.h> | |
85 | ||
86 | #if defined(__linux__) && __GNU_LIBRARY__ == 1 | |
87 | #include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */ |