diff options
| author | Rob Landley <rob@landley.net> | 2006-04-28 01:33:30 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-04-28 01:33:30 +0000 |
| commit | 0e6a3e14e41f6ce7407f9d47eec9db257eb6b125 (patch) | |
| tree | a7d3a9af0cabbd9a19fb86a2544a9fbca765d084 /miscutils | |
| parent | 7e21d5f6b1bdac9c20139e8bef82b17559e548a0 (diff) | |
| download | busybox-w32-0e6a3e14e41f6ce7407f9d47eec9db257eb6b125.tar.gz busybox-w32-0e6a3e14e41f6ce7407f9d47eec9db257eb6b125.tar.bz2 busybox-w32-0e6a3e14e41f6ce7407f9d47eec9db257eb6b125.zip | |
Patch from tito to update output of hdparm.
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/hdparm.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index c948d142e..30babc165 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
| @@ -259,10 +259,10 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */ | |||
| 259 | /* NOVAL_0 or NOVAL_1 means device does not report version */ | 259 | /* NOVAL_0 or NOVAL_1 means device does not report version */ |
| 260 | 260 | ||
| 261 | /* word 81: minor version number */ | 261 | /* word 81: minor version number */ |
| 262 | #define MINOR_MAX 0x1C | 262 | #define MINOR_MAX 0x22 |
| 263 | #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY | 263 | #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY |
| 264 | static const char * const minor_str[] = { /* word 81 value: */ | 264 | static const char *minor_str[MINOR_MAX+2] = { /* word 81 value: */ |
| 265 | "device does not report version", /* 0x0000 */ | 265 | "Unspecified", /* 0x0000 */ |
| 266 | "ATA-1 X3T9.2 781D prior to revision 4", /* 0x0001 */ | 266 | "ATA-1 X3T9.2 781D prior to revision 4", /* 0x0001 */ |
| 267 | "ATA-1 published, ANSI X3.221-1994", /* 0x0002 */ | 267 | "ATA-1 published, ANSI X3.221-1994", /* 0x0002 */ |
| 268 | "ATA-1 X3T9.2 781D revision 4", /* 0x0003 */ | 268 | "ATA-1 X3T9.2 781D revision 4", /* 0x0003 */ |
| @@ -280,23 +280,27 @@ static const char * const minor_str[] = { /* word 81 value: */ | |||
| 280 | "ATA/ATAPI-4 X3T13 1153D revision 7", /* 0x000f */ | 280 | "ATA/ATAPI-4 X3T13 1153D revision 7", /* 0x000f */ |
| 281 | "ATA/ATAPI-4 T13 1153D revision 18", /* 0x0010 */ | 281 | "ATA/ATAPI-4 T13 1153D revision 18", /* 0x0010 */ |
| 282 | "ATA/ATAPI-4 T13 1153D revision 15", /* 0x0011 */ | 282 | "ATA/ATAPI-4 T13 1153D revision 15", /* 0x0011 */ |
| 283 | "ATA/ATAPI-4 published, ANSI NCITS 317-1998", /* 0x0012 */ | 283 | "ATA/ATAPI-4 published, ANSI INCITS 317-1998", /* 0x0012 */ |
| 284 | "ATA/ATAPI-5 T13 1321D revision 3", | 284 | "ATA/ATAPI-5 T13 1321D revision 3", |
| 285 | "ATA/ATAPI-4 T13 1153D revision 14", /* 0x0014 */ | 285 | "ATA/ATAPI-4 T13 1153D revision 14", /* 0x0014 */ |
| 286 | "ATA/ATAPI-5 T13 1321D revision 1", /* 0x0015 */ | 286 | "ATA/ATAPI-5 T13 1321D revision 1", /* 0x0015 */ |
| 287 | "ATA/ATAPI-5 published, ANSI NCITS 340-2000", /* 0x0016 */ | 287 | "ATA/ATAPI-5 published, ANSI INCITS 340-2000", /* 0x0016 */ |
| 288 | "ATA/ATAPI-4 T13 1153D revision 17", /* 0x0017 */ | 288 | "ATA/ATAPI-4 T13 1153D revision 17", /* 0x0017 */ |
| 289 | "ATA/ATAPI-6 T13 1410D revision 0", /* 0x0018 */ | 289 | "ATA/ATAPI-6 T13 1410D revision 0", /* 0x0018 */ |
| 290 | "ATA/ATAPI-6 T13 1410D revision 3a", /* 0x0019 */ | 290 | "ATA/ATAPI-6 T13 1410D revision 3a", /* 0x0019 */ |
| 291 | "Reserved", /* 0x001a */ | 291 | "ATA/ATAPI-7 T13 1532D revision 1", /* 0x001a */ |
| 292 | "ATA/ATAPI-6 T13 1410D revision 2", /* 0x001b */ | 292 | "ATA/ATAPI-6 T13 1410D revision 2", /* 0x001b */ |
| 293 | "ATA/ATAPI-6 T13 1410D revision 1", /* 0x001c */ | 293 | "ATA/ATAPI-6 T13 1410D revision 1", /* 0x001c */ |
| 294 | "reserved", /* 0x001d */ | 294 | "ATA/ATAPI-7 published, ANSI INCITS 397-2005", /* 0x001d */ |
| 295 | "reserved", /* 0x001e */ | 295 | "ATA/ATAPI-7 T13 1532D revision 0", /* 0x001e */ |
| 296 | "reserved" /* 0x001f-0xfffe*/ | 296 | "Reserved" /* 0x001f */ |
| 297 | "Reserved" /* 0x0020 */ | ||
| 298 | "ATA/ATAPI-7 T13 1532D revision 4a", /* 0x0021 */ | ||
| 299 | "ATA/ATAPI-6 published, ANSI INCITS 361-2002", /* 0x0022 */ | ||
| 300 | "Reserved" /* 0x0023-0xfffe*/ | ||
| 297 | }; | 301 | }; |
| 298 | #endif | 302 | #endif |
| 299 | static const char actual_ver[] = { | 303 | static const char actual_ver[MINOR_MAX+2] = { |
| 300 | /* word 81 value: */ | 304 | /* word 81 value: */ |
| 301 | 0, /* 0x0000 WARNING: */ | 305 | 0, /* 0x0000 WARNING: */ |
| 302 | 1, /* 0x0001 WARNING: */ | 306 | 1, /* 0x0001 WARNING: */ |
| @@ -324,10 +328,16 @@ static const char actual_ver[] = { | |||
| 324 | 4, /* 0x0017 WARNING: */ | 328 | 4, /* 0x0017 WARNING: */ |
| 325 | 6, /* 0x0018 WARNING: */ | 329 | 6, /* 0x0018 WARNING: */ |
| 326 | 6, /* 0x0019 WARNING: */ | 330 | 6, /* 0x0019 WARNING: */ |
| 327 | 0, /* 0x001a WARNING: */ | 331 | 7, /* 0x001a WARNING: */ |
| 328 | 6, /* 0x001b WARNING: */ | 332 | 6, /* 0x001b WARNING: */ |
| 329 | 6, /* 0x001c WARNING: */ | 333 | 6, /* 0x001c WARNING: */ |
| 330 | 0 /* 0x001d-0xfffe */ | 334 | 7, /* 0x001d WARNING: */ |
| 335 | 7, /* 0x001e WARNING: */ | ||
| 336 | 0, /* 0x001f WARNING: */ | ||
| 337 | 0, /* 0x0020 WARNING: */ | ||
| 338 | 7, /* 0x0021 WARNING: */ | ||
| 339 | 6, /* 0x0022 WARNING: */ | ||
| 340 | 0 /* 0x0023-0xfffe */ | ||
| 331 | }; | 341 | }; |
| 332 | 342 | ||
| 333 | /* words 82-84: cmds/feats supported */ | 343 | /* words 82-84: cmds/feats supported */ |