X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fhdparm.c;h=eafb0789898817ed9602af38f7e830668f227163;hb=06af2165288cd6516b89001ec9e24992619230e0;hp=30babc1655009a48802772e5aa2fea4bdad5f76d;hpb=0e6a3e14e41f6ce7407f9d47eec9db257eb6b125;p=oweals%2Fbusybox.git diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 30babc165..eafb07898 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -12,29 +12,8 @@ * - by Mark Lord (C) 1994-2002 -- freely distributable */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" -#include #include -#include -#include - - -#if BB_BIG_ENDIAN && !defined(__USE_XOPEN) -# define __USE_XOPEN -#endif /* device types */ /* ------------ */ @@ -181,11 +160,11 @@ static const char * const pkt_str[] = { "", /* word 0, bits 12-8 = 1c */ "", /* word 0, bits 12-8 = 1d */ "", /* word 0, bits 12-8 = 1e */ - "Unknown", /* word 0, bits 12-8 = 1f */ + "Unknown", /* word 0, bits 12-8 = 1f */ }; static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */ - "reserved", /* bit 0 */ + "Reserved", /* bit 0 */ "hard sectored", /* bit 1 */ "soft sectored", /* bit 2 */ "not MFM encoded ", /* bit 3 */ @@ -263,39 +242,39 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */ #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY static const char *minor_str[MINOR_MAX+2] = { /* word 81 value: */ "Unspecified", /* 0x0000 */ - "ATA-1 X3T9.2 781D prior to revision 4", /* 0x0001 */ + "ATA-1 X3T9.2 781D prior to rev.4", /* 0x0001 */ "ATA-1 published, ANSI X3.221-1994", /* 0x0002 */ - "ATA-1 X3T9.2 781D revision 4", /* 0x0003 */ + "ATA-1 X3T9.2 781D rev.4", /* 0x0003 */ "ATA-2 published, ANSI X3.279-1996", /* 0x0004 */ - "ATA-2 X3T10 948D prior to revision 2k", /* 0x0005 */ - "ATA-3 X3T10 2008D revision 1", /* 0x0006 */ - "ATA-2 X3T10 948D revision 2k", /* 0x0007 */ - "ATA-3 X3T10 2008D revision 0", /* 0x0008 */ - "ATA-2 X3T10 948D revision 3", /* 0x0009 */ + "ATA-2 X3T10 948D prior to rev.2k", /* 0x0005 */ + "ATA-3 X3T10 2008D rev.1", /* 0x0006 */ + "ATA-2 X3T10 948D rev.2k", /* 0x0007 */ + "ATA-3 X3T10 2008D rev.0", /* 0x0008 */ + "ATA-2 X3T10 948D rev.3", /* 0x0009 */ "ATA-3 published, ANSI X3.298-199x", /* 0x000a */ - "ATA-3 X3T10 2008D revision 6", /* 0x000b */ - "ATA-3 X3T13 2008D revision 7 and 7a", /* 0x000c */ - "ATA/ATAPI-4 X3T13 1153D revision 6", /* 0x000d */ - "ATA/ATAPI-4 T13 1153D revision 13", /* 0x000e */ - "ATA/ATAPI-4 X3T13 1153D revision 7", /* 0x000f */ - "ATA/ATAPI-4 T13 1153D revision 18", /* 0x0010 */ - "ATA/ATAPI-4 T13 1153D revision 15", /* 0x0011 */ + "ATA-3 X3T10 2008D rev.6", /* 0x000b */ + "ATA-3 X3T13 2008D rev.7 and 7a", /* 0x000c */ + "ATA/ATAPI-4 X3T13 1153D rev.6", /* 0x000d */ + "ATA/ATAPI-4 T13 1153D rev.13", /* 0x000e */ + "ATA/ATAPI-4 X3T13 1153D rev.7", /* 0x000f */ + "ATA/ATAPI-4 T13 1153D rev.18", /* 0x0010 */ + "ATA/ATAPI-4 T13 1153D rev.15", /* 0x0011 */ "ATA/ATAPI-4 published, ANSI INCITS 317-1998", /* 0x0012 */ - "ATA/ATAPI-5 T13 1321D revision 3", - "ATA/ATAPI-4 T13 1153D revision 14", /* 0x0014 */ - "ATA/ATAPI-5 T13 1321D revision 1", /* 0x0015 */ + "ATA/ATAPI-5 T13 1321D rev.3", + "ATA/ATAPI-4 T13 1153D rev.14", /* 0x0014 */ + "ATA/ATAPI-5 T13 1321D rev.1", /* 0x0015 */ "ATA/ATAPI-5 published, ANSI INCITS 340-2000", /* 0x0016 */ - "ATA/ATAPI-4 T13 1153D revision 17", /* 0x0017 */ - "ATA/ATAPI-6 T13 1410D revision 0", /* 0x0018 */ - "ATA/ATAPI-6 T13 1410D revision 3a", /* 0x0019 */ - "ATA/ATAPI-7 T13 1532D revision 1", /* 0x001a */ - "ATA/ATAPI-6 T13 1410D revision 2", /* 0x001b */ - "ATA/ATAPI-6 T13 1410D revision 1", /* 0x001c */ + "ATA/ATAPI-4 T13 1153D rev.17", /* 0x0017 */ + "ATA/ATAPI-6 T13 1410D rev.0", /* 0x0018 */ + "ATA/ATAPI-6 T13 1410D rev.3a", /* 0x0019 */ + "ATA/ATAPI-7 T13 1532D rev.1", /* 0x001a */ + "ATA/ATAPI-6 T13 1410D rev.2", /* 0x001b */ + "ATA/ATAPI-6 T13 1410D rev.1", /* 0x001c */ "ATA/ATAPI-7 published, ANSI INCITS 397-2005", /* 0x001d */ - "ATA/ATAPI-7 T13 1532D revision 0", /* 0x001e */ + "ATA/ATAPI-7 T13 1532D rev.0", /* 0x001e */ "Reserved" /* 0x001f */ "Reserved" /* 0x0020 */ - "ATA/ATAPI-7 T13 1532D revision 4a", /* 0x0021 */ + "ATA/ATAPI-7 T13 1532D rev.4a", /* 0x0021 */ "ATA/ATAPI-6 published, ANSI INCITS 361-2002", /* 0x0022 */ "Reserved" /* 0x0023-0xfffe*/ }; @@ -368,8 +347,8 @@ static const char * const cmd_feat_str[] = { /* --------------*/ "", /* word 83 bit 15: !valid bit */ "", /* word 83 bit 14: valid bit */ - "FLUSH CACHE EXT command", /* word 83 bit 13 */ - "Mandatory FLUSH CACHE command ", /* word 83 bit 12 */ + "FLUSH CACHE EXT cmd", /* word 83 bit 13 */ + "Mandatory FLUSH CACHE cmd ", /* word 83 bit 12 */ "Device Configuration Overlay feature set ", "48-bit Address feature set ", /* word 83 bit 10 */ "", @@ -400,6 +379,11 @@ static const char * const cmd_feat_str[] = { "SMART self-test ", /* word 84 bit 1 */ "SMART error logging " /* word 84 bit 0 */ }; + +static void identify(uint16_t *id_supplied) ATTRIBUTE_NORETURN; +static void identify_from_stdin(void) ATTRIBUTE_NORETURN; +#else +void identify_from_stdin(void); #endif @@ -450,8 +434,6 @@ static const char * const secu_str[] = { #define SIG 0x00ff /* signature location */ #define SIG_VAL 0x00A5 /* signature value */ -#define VERSION "v5.4" - #define TIMING_MB 64 #define TIMING_BUF_MB 1 #define TIMING_BUF_BYTES (TIMING_BUF_MB * 1024 * 1024) @@ -461,106 +443,55 @@ static const char * const secu_str[] = { #undef DO_FLUSHCACHE /* under construction: force cache flush on -W0 */ /* Busybox messages and functions */ - -static const char bb_msg_shared_mem[] = "could not %s sharedmem buf"; -static const char bb_msg_op_not_supp[] = " operation not supported on %s disks"; - -static void bb_ioctl(int fd, int request, void *argp, const char *string) +static int bb_ioctl(int fd, int request, void *argp, const char *string) { - if (ioctl (fd, request, argp) != 0) + int e = ioctl(fd, request, argp); + if (e && string) bb_perror_msg(" %s", string); + return e; } -static void if_printf(unsigned long i, char *fmt, ... ) +static int bb_ioctl_alt(int fd, int cmd, unsigned char *args, int alt, const char *string) { - va_list ap; - va_start(ap, fmt); - if (i) - vprintf(fmt, ap); - va_end(ap); + if (!ioctl(fd, cmd, args)) + return 0; + args[0] = alt; + return bb_ioctl(fd, cmd, args, string); } -static void on_off (unsigned int value); +static void on_off(unsigned int value); -static void if_printf_on_off(unsigned long get_arg,const char *fmt, unsigned long arg) +static void print_flag_on_off(unsigned long get_arg, const char *s, unsigned long arg) { - if (get_arg) - { - printf(fmt, arg); + if (get_arg) { + printf(" setting %s to %ld", s, arg); on_off(arg); } } static void bb_ioctl_on_off(int fd, int request, void *argp, const char *string, - const char * fmt) + const char * str) { - if (ioctl (fd, request, &argp) != 0) + if (ioctl(fd, request, &argp) != 0) bb_perror_msg(" %s", string); - else - { - printf(fmt, (unsigned long) argp); + else { + printf(" %s\t= %2ld", str, (unsigned long) argp); on_off((unsigned long) argp); } } #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY -static void if_else_printf(unsigned long i, char *fmt1, char *fmt2, ... ) -{ - va_list ap; - va_start(ap, fmt2); - if (i) - vprintf(fmt1, ap); - else - vprintf(fmt2, ap); - va_end(ap); -} - static void print_ascii(uint16_t *p, uint8_t length); -static void xprint_ascii(uint16_t *val ,int i, char * string, int n) +static void xprint_ascii(uint16_t *val ,int i, const char *string, int n) { - if(val[i]) - { - printf("\t%-20s",string); + if (val[i]) { + printf("\t%-20s", string); print_ascii(&val[i], n); } } - -static void if_strcat(unsigned long test, char *modes, char *string) -{ - if (test) - strcat(modes,string); -} #endif - -static void sync_and_sleep(int i) -{ - sync(); - sleep(i); -} - -static uint16_t check_if_min_and_set_val(uint16_t a, uint16_t b) -{ - if( a < b) - a = b; - return a; -} - -static uint16_t check_if_maj_and_set_val(uint16_t a, uint16_t b) -{ - if( a > b) - a = b; - return a; -} - -static unsigned long int set_flag(char *p, char max) -{ - if (*p >= '0' && *p <= max ) - return 1; - return 0; -} - -/* end of busybox specific stuff */ +/* end of busybox specific stuff */ #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t *have_mode) @@ -568,16 +499,16 @@ static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t * uint16_t ii; uint8_t err_dma = 0; - for(ii = 0; ii <= MODE_MAX; ii++) + for (ii = 0; ii <= MODE_MAX; ii++) { - if(mode_sel & 0x0001) + if (mode_sel & 0x0001) { printf("*%cdma%u ",cc,ii); - if(*have_mode) + if (*have_mode) err_dma = 1; *have_mode = 1; } - else if(mode_sup & 0x0001) + else if (mode_sup & 0x0001) printf("%cdma%u ",cc,ii); mode_sup >>=1; @@ -591,13 +522,13 @@ static void print_ascii(uint16_t *p, uint8_t length) { char cl; /* find first non-space & print it */ - for(ii = 0; ii< length; ii++) + for (ii = 0; ii< length; ii++) { - if(((char) 0x00ff&((*p)>>8)) != ' ') + if (((char) 0x00ff&((*p)>>8)) != ' ') break; - if((cl = (char) 0x00ff&(*p)) != ' ') + if ((cl = (char) 0x00ff&(*p)) != ' ') { - if_printf((cl != '\0'),"%c",cl); + if (cl != '\0') printf("%c",cl); p++; ii++; break; @@ -605,81 +536,53 @@ static void print_ascii(uint16_t *p, uint8_t length) { p++; } /* print the rest */ - for(; ii< length; ii++) + for (; ii< length; ii++) { - if(!(*p)) + if (!(*p)) break; /* some older devices have NULLs */ printf("%c%c",(char)0x00ff&((*p)>>8),(char)(*p)&0x00ff); p++; } - printf("\n"); + puts(""); } -/* identify() is the only extern function used across two source files. The - others, though, were declared in hdparm.c with global scope; since other - functions in that file have static (file) scope, I assume the difference is - intentional. */ -static void identify (uint16_t *id_supplied, const char *devname) -{ +// Parse 512 byte disk identification block and print much crap. - char *id_file = NULL; - FILE *fl; - uint16_t val[256], ii, jj, kk; +static void identify(uint16_t *id_supplied) +{ + uint16_t buf[256]; + uint16_t *val, ii, jj, kk; uint16_t like_std = 1, std = 0, min_std = 0xffff; uint16_t dev = NO_DEV, eqpt = NO_DEV; uint8_t have_mode = 0, err_dma = 0; uint8_t chksum = 0; uint32_t ll, mm, nn, oo; - __u64 bbbig; /* (:) */ + uint64_t bbbig; /* (:) */ + const char *strng; - if (id_supplied) - { -#if __BYTE_ORDER == __BIG_ENDIAN - swab(id_supplied, val, sizeof(val)); -#else - memcpy(val, id_supplied, sizeof(val)); -#endif - } - else - { - id_file = xcalloc(1, strlen(devname)+22); - sprintf(id_file, "/proc/ide/%s/identify", devname); - /* open the file, read in all the info and close it */ - if (id_file == NULL) - fl = stdin; - else - fl = bb_xfopen(id_file, "r"); + // Adjust for endianness if necessary. + + if (BB_BIG_ENDIAN) { + swab(id_supplied, buf, sizeof(buf)); + val = buf; + } else val = id_supplied; - /* calculate checksum over all bytes */ - for(ii = GEN_CONFIG; ii<=INTEGRITY; ii++) - { - unsigned int scratch; - if(1 != fscanf(fl,"%04x",&scratch)) - break; - val[ii] = (uint16_t)scratch; - chksum += val[ii] + (val[ii] >> 8); - } - fclose(fl); - /*bb_fclose_nonstdin(fl);*/ - if(ii < (INTEGRITY+1)) - bb_error_msg_and_die("Input file wrong format or length"); - } chksum &= 0xff; /* check if we recognise the device type */ - printf("\n"); - if(!(val[GEN_CONFIG] & NOT_ATA)) + puts(""); + if (!(val[GEN_CONFIG] & NOT_ATA)) { dev = ATA_DEV; printf("ATA device, with "); } - else if(val[GEN_CONFIG]==CFA_SUPPORT_VAL) + else if (val[GEN_CONFIG]==CFA_SUPPORT_VAL) { dev = ATA_DEV; like_std = 4; printf("CompactFlash ATA device, with "); } - else if(!(val[GEN_CONFIG] & NOT_ATAPI)) + else if (!(val[GEN_CONFIG] & NOT_ATAPI)) { dev = ATAPI_DEV; eqpt = (val[GEN_CONFIG] & EQPT_TYPE) >> SHIFT_EQPT; @@ -688,11 +591,9 @@ static void identify (uint16_t *id_supplied, const char *devname) } else /*"Unknown device type:\n\tbits 15&14 of general configuration word 0 both set to 1.\n"*/ - bb_error_msg_and_die("Unknown device type"); - - if_printf(!(val[GEN_CONFIG] & MEDIA_REMOVABLE),"non-"); - printf("removable media\n"); + bb_error_msg_and_die("unknown device type"); + printf("%sremovable media\n", !(val[GEN_CONFIG] & MEDIA_REMOVABLE) ? "non-" : ""); /* Info from the specific configuration word says whether or not the * ID command completed correctly. It is only defined, however in * ATA/ATAPI-5 & 6; it is reserved (value theoretically 0) in prior @@ -700,14 +601,14 @@ static void identify (uint16_t *id_supplied, const char *devname) * specific, it should be safe to check it now, even though we don't * know yet what standard this device is using. */ - if((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL) || + if ((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL) || (val[CONFIG]==PWRD_NID_VAL) || (val[CONFIG]==PWRD_ID_VAL) ) { like_std = 5; - if_printf(((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL)), - "powers-up in standby; SET FEATURES subcmd spins-up.\n"); - if_printf((((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==PWRD_NID_VAL)) && (val[GEN_CONFIG] & INCOMPLETE)), - "\n\tWARNING: ID response incomplete.\n\tFollowing data may be incorrect.\n\n"); + if ((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL)) + printf("powers-up in standby; SET FEATURES subcmd spins-up.\n"); + if (((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==PWRD_NID_VAL)) && (val[GEN_CONFIG] & INCOMPLETE)) + printf("\n\tWARNING: ID response incomplete.\n\tFollowing data may be incorrect.\n\n"); } /* output the model and serial numbers and the fw revision */ @@ -720,46 +621,46 @@ static void identify (uint16_t *id_supplied, const char *devname) /* major & minor standards version number (Note: these words were not * defined until ATA-3 & the CDROM std uses different words.) */ printf("Standards:"); - if(eqpt != CDROM) + if (eqpt != CDROM) { - if(val[MINOR] && (val[MINOR] <= MINOR_MAX)) + if (val[MINOR] && (val[MINOR] <= MINOR_MAX)) { - like_std=check_if_min_and_set_val(like_std, 3); + if (like_std < 3) like_std = 3; std = actual_ver[val[MINOR]]; - if_printf(std,"\n\tUsed: %s ",minor_str[val[MINOR]]); + if (std) printf("\n\tUsed: %s ",minor_str[val[MINOR]]); } /* looks like when they up-issue the std, they obsolete one; * thus, only the newest 4 issues need be supported. (That's * what "kk" and "min_std" are all about.) */ - if(val[MAJOR] && (val[MAJOR] !=NOVAL_1)) + if (val[MAJOR] && (val[MAJOR] !=NOVAL_1)) { printf("\n\tSupported: "); jj = val[MAJOR] << 1; kk = like_std >4 ? like_std-4: 0; - for(ii = 14; (ii >0)&&(ii>kk); ii--) + for (ii = 14; (ii >0)&&(ii>kk); ii--) { - if(jj & 0x8000) + if (jj & 0x8000) { printf("%u ", ii); - if(like_std < ii) + if (like_std < ii) { like_std = ii; kk = like_std >4 ? like_std-4: 0; } - min_std=check_if_maj_and_set_val(min_std, ii); + if (min_std > ii) min_std = ii; } jj <<= 1; } - like_std=check_if_min_and_set_val(like_std, 3); + if (like_std < 3) like_std = 3; } /* Figure out what standard the device is using if it hasn't told * us. If we know the std, check if the device is using any of * the words from the next level up. It happens. */ - like_std=check_if_min_and_set_val(like_std, std); + if (like_std < std) like_std = std; - if(((std == 5) || (!std && (like_std < 6))) && + if (((std == 5) || (!std && (like_std < 6))) && ((((val[CMDS_SUPP_1] & VALID) == VALID_VAL) && (( val[CMDS_SUPP_1] & CMDS_W83) > 0x00ff)) || ((( val[CMDS_SUPP_2] & VALID) == VALID_VAL) && @@ -767,7 +668,7 @@ static void identify (uint16_t *id_supplied, const char *devname) { like_std = 6; } - else if(((std == 4) || (!std && (like_std < 5))) && + else if (((std == 4) || (!std && (like_std < 5))) && ((((val[INTEGRITY] & SIG) == SIG_VAL) && !chksum) || (( val[HWRST_RSLT] & VALID) == VALID_VAL) || ((( val[CMDS_SUPP_1] & VALID) == VALID_VAL) && @@ -775,7 +676,7 @@ static void identify (uint16_t *id_supplied, const char *devname) { like_std = 5; } - else if(((std == 3) || (!std && (like_std < 4))) && + else if (((std == 3) || (!std && (like_std < 4))) && ((((val[CMDS_SUPP_1] & VALID) == VALID_VAL) && ((( val[CMDS_SUPP_1] & CMDS_W83) > 0x0000) || (( val[CMDS_SUPP_0] & CMDS_W82) > 0x000f))) || @@ -785,94 +686,82 @@ static void identify (uint16_t *id_supplied, const char *devname) { like_std = 4; } - else if(((std == 2) || (!std && (like_std < 3))) && + else if (((std == 2) || (!std && (like_std < 3))) && ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) ) { like_std = 3; } - else if(((std == 1) || (!std && (like_std < 2))) && + else if (((std == 1) || (!std && (like_std < 2))) && ((val[CAPAB_0] & (IORDY_SUP | IORDY_OFF)) || (val[WHATS_VALID] & OK_W64_70)) ) { like_std = 2; } - if(!std) + if (!std) printf("\n\tLikely used: %u\n",like_std); - else if(like_std > std) + else if (like_std > std) printf("& some of %u\n",like_std); else - printf("\n"); + puts(""); } else { /* TBD: do CDROM stuff more thoroughly. For now... */ kk = 0; - if(val[CDR_MINOR] == 9) + if (val[CDR_MINOR] == 9) { kk = 1; printf("\n\tUsed: ATAPI for CD-ROMs, SFF-8020i, r2.5"); } - if(val[CDR_MAJOR] && (val[CDR_MAJOR] !=NOVAL_1)) + if (val[CDR_MAJOR] && (val[CDR_MAJOR] !=NOVAL_1)) { kk = 1; printf("\n\tSupported: CD-ROM ATAPI"); jj = val[CDR_MAJOR] >> 1; - for(ii = 1; ii <15; ii++) + for (ii = 1; ii <15; ii++) { - if_printf((jj & 0x0001),"-%u ", ii); + if (jj & 0x0001) printf("-%u ", ii); jj >>= 1; } } - if_else_printf((!kk),"\n\tLikely used CD-ROM ATAPI-1\n","\n"); + printf("%s\n", (!kk) ? "\n\tLikely used CD-ROM ATAPI-1" : "" ); /* the cdrom stuff is more like ATA-2 than anything else, so: */ like_std = 2; } - if(min_std == 0xffff) + if (min_std == 0xffff) min_std = like_std > 4 ? like_std - 3 : 1; printf("Configuration:\n"); /* more info from the general configuration word */ - if((eqpt != CDROM) && (like_std == 1)) + if ((eqpt != CDROM) && (like_std == 1)) { jj = val[GEN_CONFIG] >> 1; - for(ii = 1; ii < 15; ii++) + for (ii = 1; ii < 15; ii++) { - if_printf((jj & 0x0001),"\t%s\n",ata1_cfg_str[ii]); + if (jj & 0x0001) printf("\t%s\n",ata1_cfg_str[ii]); jj >>=1; } } - if(dev == ATAPI_DEV) + if (dev == ATAPI_DEV) { - printf("\tDRQ response: "); /* Data Request (DRQ) */ - switch(val[GEN_CONFIG] & DRQ_RESPONSE_TIME) - { - case DRQ_3MS_VAL : - printf("3ms.\n"); - break; - case DRQ_INTR_VAL : - printf("<=10ms with INTRQ\n"); - break; - case DRQ_50US_VAL : - printf("50us.\n"); - break; - default : - printf("unknown.\n"); - break; - } - printf("\tPacket size: "); - switch(val[GEN_CONFIG] & PKT_SIZE_SUPPORTED) - { - case PKT_SIZE_12_VAL : - printf("12 bytes\n"); - break; - case PKT_SIZE_16_VAL : - printf("16 bytes\n"); - break; - default : - printf("Unknown\n"); - break; - } + if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) == DRQ_3MS_VAL) + strng = "3ms"; + else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) == DRQ_INTR_VAL) + strng = "<=10ms with INTRQ"; + else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) == DRQ_50US_VAL) + strng ="50us"; + else + strng = "Unknown"; + printf("\tDRQ response: %s\n\tPacket size: ", strng); /* Data Request (DRQ) */ + + if ((val[GEN_CONFIG] & PKT_SIZE_SUPPORTED) == PKT_SIZE_12_VAL) + strng = "12 bytes"; + else if ((val[GEN_CONFIG] & PKT_SIZE_SUPPORTED) == PKT_SIZE_16_VAL) + strng = "16 bytes"; + else + strng = "Unknown"; + puts(strng); } else { @@ -887,18 +776,18 @@ static void identify (uint16_t *id_supplied, const char *devname) printf("\tLogical\t\tmax\tcurrent\n\tcylinders\t%u\t%u\n\theads\t\t%u\t%u\n\tsectors/track\t%u\t%u\n\t--\n", val[LCYLS],jj?val[LCYLS_CUR]:0, val[LHEADS],jj?val[LHEADS_CUR]:0, val[LSECTS],jj?val[LSECTS_CUR]:0); - if_printf(((min_std == 1) && (val[TRACK_BYTES] || val[SECT_BYTES])), - "\tbytes/track: %u\tbytes/sector: %u\n",val[TRACK_BYTES], val[SECT_BYTES]); + if ((min_std == 1) && (val[TRACK_BYTES] || val[SECT_BYTES])) + printf("\tbytes/track: %u\tbytes/sector: %u\n",val[TRACK_BYTES], val[SECT_BYTES]); - if(jj) + if (jj) { mm = (uint32_t)val[CAPACITY_MSB] << 16 | val[CAPACITY_LSB]; - if(like_std < 3) + if (like_std < 3) { /* check Endian of capacity bytes */ nn = val[LCYLS_CUR] * val[LHEADS_CUR] * val[LSECTS_CUR]; oo = (uint32_t)val[CAPACITY_LSB] << 16 | val[CAPACITY_MSB]; - if(abs(mm - nn) > abs(oo - nn)) + if (abs(mm - nn) > abs(oo - nn)) mm = oo; } printf("\tCHS current addressable sectors:%11u\n",mm); @@ -906,97 +795,91 @@ static void identify (uint16_t *id_supplied, const char *devname) } /* LBA addressing */ printf("\tLBA user addressable sectors:%11u\n",ll); - if( ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) && + if ( ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) && (val[CMDS_SUPP_1] & SUPPORT_48_BIT) ) { - bbbig = (__u64)val[LBA_64_MSB] << 48 | - (__u64)val[LBA_48_MSB] << 32 | - (__u64)val[LBA_MID] << 16 | + bbbig = (uint64_t)val[LBA_64_MSB] << 48 | + (uint64_t)val[LBA_48_MSB] << 32 | + (uint64_t)val[LBA_MID] << 16 | val[LBA_LSB] ; - printf("\tLBA48 user addressable sectors:%11llu\n",bbbig); + printf("\tLBA48 user addressable sectors:%11"PRIu64"\n",bbbig); } if (!bbbig) - bbbig = (__u64)(ll>mm ? ll : mm); /* # 512 byte blocks */ - printf("\tdevice size with M = 1024*1024: %11llu MBytes\n",bbbig>>11); + bbbig = (uint64_t)(ll>mm ? ll : mm); /* # 512 byte blocks */ + printf("\tdevice size with M = 1024*1024: %11"PRIu64" MBytes\n",bbbig>>11); bbbig = (bbbig<<9)/1000000; - printf("\tdevice size with M = 1000*1000: %11llu MBytes ",bbbig); - - if_else_printf((bbbig > 1000),"(%llu GB)\n","\n",bbbig/1000); + printf("\tdevice size with M = 1000*1000: %11"PRIu64" MBytes ",bbbig); + if (bbbig > 1000) + printf("(%"PRIu64" GB)\n", bbbig/1000); + else + puts(""); } /* hw support of commands (capabilities) */ printf("Capabilities:\n\t"); - if(dev == ATAPI_DEV) + if (dev == ATAPI_DEV) { - if(eqpt != CDROM) - if_printf((val[CAPAB_0] & CMD_Q_SUP),"Cmd queuing, "); - - if_printf((val[CAPAB_0] & OVLP_SUP),"Cmd overlap, "); + if (eqpt != CDROM && (val[CAPAB_0] & CMD_Q_SUP)) printf("Cmd queuing, "); + if (val[CAPAB_0] & OVLP_SUP) printf("Cmd overlap, "); } - if_printf((val[CAPAB_0] & LBA_SUP),"LBA, "); + if (val[CAPAB_0] & LBA_SUP) printf("LBA, "); - if(like_std != 1) + if (like_std != 1) { - printf("IORDY"); - if_printf((!(val[CAPAB_0] & IORDY_SUP)),"(may be)"); - if_else_printf((val[CAPAB_0] & IORDY_OFF),"(can","(cannot"); - printf(" be disabled)\n"); + printf("IORDY%s(can%s be disabled)\n", + !(val[CAPAB_0] & IORDY_SUP) ? "(may be)" : "", + (val[CAPAB_0] & IORDY_OFF) ? "" :"not"); } else printf("no IORDY\n"); - if((like_std == 1) && val[BUF_TYPE]) + if ((like_std == 1) && val[BUF_TYPE]) { - kk = val[BUF_TYPE]; - printf("\tBuffer type: %04x: ",kk); - if_else_printf((kk < 2),"single port, single-sector","dual port, multi-sector"); - if_printf((kk > 2)," with read caching ability"); - printf("\n"); + printf("\tBuffer type: %04x: %s%s\n", val[BUF_TYPE], + (val[BUF_TYPE] < 2) ? "single port, single-sector" : "dual port, multi-sector", + (val[BUF_TYPE] > 2) ? " with read caching ability" : ""); } - jj = 0; - if((min_std == 1) && (val[BUFFER__SIZE] && (val[BUFFER__SIZE] != NOVAL_1))) + + if ((min_std == 1) && (val[BUFFER__SIZE] && (val[BUFFER__SIZE] != NOVAL_1))) { - printf("\tBuffer size: %.1fkB",(float)val[BUFFER__SIZE]/2); - jj = 1; + printf("\tBuffer size: %.1fkB\n",(float)val[BUFFER__SIZE]/2); } - if((min_std < 4) && (val[RW_LONG])) + if ((min_std < 4) && (val[RW_LONG])) { - printf("\tbytes avail on r/w long: %u",val[RW_LONG]); - jj = 1; + printf("\tbytes avail on r/w long: %u\n",val[RW_LONG]); } - if((eqpt != CDROM) && (like_std > 3)) + if ((eqpt != CDROM) && (like_std > 3)) { - printf("\tQueue depth: %u",(val[QUEUE_DEPTH] & DEPTH_BITS)+1); - jj = 1; + printf("\tQueue depth: %u\n",(val[QUEUE_DEPTH] & DEPTH_BITS)+1); } - if_printf(jj,"\n"); - if(dev == ATA_DEV) + if (dev == ATA_DEV) { - if(like_std == 1) + if (like_std == 1) printf("\tCan%s perform double-word IO\n",(!val[DWORD_IO]) ?"not":""); else { - printf("\tStandby timer values: spec'd by "); - if_else_printf((val[CAPAB_0] & STD_STBY),"Standard","Vendor"); - if((like_std > 3) && ((val[CAPAB_1] & VALID) == VALID_VAL)) + printf("\tStandby timer values: spec'd by %s", (val[CAPAB_0] & STD_STBY) ? "Standard" : "Vendor"); + if ((like_std > 3) && ((val[CAPAB_1] & VALID) == VALID_VAL)) printf(", %s device specific minimum\n",(val[CAPAB_1] & MIN_STANDBY_TIMER)?"with":"no"); else - printf("\n"); + puts(""); } printf("\tR/W multiple sector transfer: "); - if((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER)) + if ((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER)) printf("not supported\n"); else { printf("Max = %u\tCurrent = ",val[SECTOR_XFER_MAX] & SECTOR_XFER); - if_else_printf((val[SECTOR_XFER_CUR] & MULTIPLE_SETTING_VALID), - "%u\n","?\n",val[SECTOR_XFER_CUR] & SECTOR_XFER); + if (val[SECTOR_XFER_CUR] & MULTIPLE_SETTING_VALID) + printf("%u\n", val[SECTOR_XFER_CUR] & SECTOR_XFER); + else + printf("?\n"); } - if((like_std > 3) && (val[CMDS_SUPP_1] & 0x0008)) + if ((like_std > 3) && (val[CMDS_SUPP_1] & 0x0008)) { /* We print out elsewhere whether the APM feature is enabled or not. If it's not enabled, let's not repeat the info; just print @@ -1010,66 +893,65 @@ static void identify (uint16_t *id_supplied, const char *devname) else printf("unknown setting (0x%04x)\n", val[ADV_PWR]); } - if(like_std > 5) - { - if_printf(val[ACOUSTIC],"\tRecommended acoustic management value: %u, current value: %u\n", + if (like_std > 5 && val[ACOUSTIC]) { + printf("\tRecommended acoustic management value: %u, current value: %u\n", (val[ACOUSTIC] >> 8) & 0x00ff, val[ACOUSTIC] & 0x00ff); } } else { /* ATAPI */ - if(eqpt != CDROM) - if_printf((val[CAPAB_0] & SWRST_REQ),"\tATA sw reset required\n"); + if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ)) + printf("\tATA sw reset required\n"); - if(val[PKT_REL] || val[SVC_NBSY]) + if (val[PKT_REL] || val[SVC_NBSY]) { printf("\tOverlap support:"); - if_printf(val[PKT_REL]," %uus to release bus.",val[PKT_REL]); - if_printf(val[SVC_NBSY]," %uus to clear BSY after SERVICE cmd.",val[SVC_NBSY]); - printf("\n"); + if (val[PKT_REL]) printf(" %uus to release bus.",val[PKT_REL]); + if (val[SVC_NBSY]) printf(" %uus to clear BSY after SERVICE cmd.",val[SVC_NBSY]); + puts(""); } } /* DMA stuff. Check that only one DMA mode is selected. */ printf("\tDMA: "); - if(!(val[CAPAB_0] & DMA_SUP)) + if (!(val[CAPAB_0] & DMA_SUP)) printf("not supported\n"); else { - if_printf((val[DMA_MODE] && !val[SINGLE_DMA] && !val[MULTI_DMA]), - " sdma%u\n",(val[DMA_MODE] & MODE) >> 8); - if(val[SINGLE_DMA]) + if (val[DMA_MODE] && !val[SINGLE_DMA] && !val[MULTI_DMA]) + printf(" sdma%u\n",(val[DMA_MODE] & MODE) >> 8); + if (val[SINGLE_DMA]) { jj = val[SINGLE_DMA]; kk = val[SINGLE_DMA] >> 8; err_dma += mode_loop(jj,kk,'s',&have_mode); } - if(val[MULTI_DMA]) + if (val[MULTI_DMA]) { jj = val[MULTI_DMA]; kk = val[MULTI_DMA] >> 8; err_dma += mode_loop(jj,kk,'m',&have_mode); } - if((val[WHATS_VALID] & OK_W88) && val[ULTRA_DMA]) + if ((val[WHATS_VALID] & OK_W88) && val[ULTRA_DMA]) { jj = val[ULTRA_DMA]; kk = val[ULTRA_DMA] >> 8; err_dma += mode_loop(jj,kk,'u',&have_mode); } - if_printf((err_dma || !have_mode),"(?)"); - printf("\n"); + if (err_dma || !have_mode) printf("(?)"); + puts(""); - if_printf(((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)), - "\t Interleaved DMA support\n"); + if ((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)) + printf("\t\tInterleaved DMA support\n"); - if((val[WHATS_VALID] & OK_W64_70) && + if ((val[WHATS_VALID] & OK_W64_70) && (val[DMA_TIME_MIN] || val[DMA_TIME_NORM])) { - printf("\t Cycle time:"); - if_printf(val[DMA_TIME_MIN]," min=%uns",val[DMA_TIME_MIN]); - if_printf(val[DMA_TIME_NORM]," recommended=%uns",val[DMA_TIME_NORM]); - printf("\n"); + printf("\t\tCycle time:"); + if (val[DMA_TIME_MIN]) printf(" min=%uns",val[DMA_TIME_MIN]); + if (val[DMA_TIME_NORM]) printf(" recommended=%uns",val[DMA_TIME_NORM]); + puts(""); } } @@ -1077,150 +959,135 @@ static void identify (uint16_t *id_supplied, const char *devname) printf("\tPIO: "); /* If a drive supports mode n (e.g. 3), it also supports all modes less * than n (e.g. 3, 2, 1 and 0). Print all the modes. */ - if((val[WHATS_VALID] & OK_W64_70) && (val[ADV_PIO_MODES] & PIO_SUP)) + if ((val[WHATS_VALID] & OK_W64_70) && (val[ADV_PIO_MODES] & PIO_SUP)) { jj = ((val[ADV_PIO_MODES] & PIO_SUP) << 3) | 0x0007; - for(ii = 0; ii <= PIO_MODE_MAX ; ii++) + for (ii = 0; ii <= PIO_MODE_MAX ; ii++) { - if_printf((jj & 0x0001),"pio%d ",ii); + if (jj & 0x0001) printf("pio%d ",ii); jj >>=1; } - printf("\n"); + puts(""); } - else if(((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) ) + else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) ) { - for(ii = 0; ii <= val[PIO_MODE]>>8; ii++) + for (ii = 0; ii <= val[PIO_MODE]>>8; ii++) printf("pio%d ",ii); - printf("\n"); + puts(""); } else printf("unknown\n"); - if(val[WHATS_VALID] & OK_W64_70) + if (val[WHATS_VALID] & OK_W64_70) { - if(val[PIO_NO_FLOW] || val[PIO_FLOW]) + if (val[PIO_NO_FLOW] || val[PIO_FLOW]) { - printf("\t Cycle time:"); - if_printf(val[PIO_NO_FLOW]," no flow control=%uns", val[PIO_NO_FLOW]); - if_printf(val[PIO_FLOW]," IORDY flow control=%uns", val[PIO_FLOW]); - printf("\n"); + printf("\t\tCycle time:"); + if (val[PIO_NO_FLOW]) printf(" no flow control=%uns", val[PIO_NO_FLOW]); + if (val[PIO_FLOW]) printf(" IORDY flow control=%uns", val[PIO_FLOW]); + puts(""); } } - if((val[CMDS_SUPP_1] & VALID) == VALID_VAL) + if ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) { printf("Commands/features:\n\tEnabled\tSupported:\n"); jj = val[CMDS_SUPP_0]; kk = val[CMDS_EN_0]; - for(ii = 0; ii < NUM_CMD_FEAT_STR; ii++) + for (ii = 0; ii < NUM_CMD_FEAT_STR; ii++) { - if((jj & 0x8000) && (*cmd_feat_str[ii] != '\0')) + if ((jj & 0x8000) && (*cmd_feat_str[ii] != '\0')) { - if_else_printf((kk & 0x8000),"\t *","\t"); - printf("\t%s\n",cmd_feat_str[ii]); + printf("\t%s\t%s\n", (kk & 0x8000) ? " *" : "", cmd_feat_str[ii]); } jj <<=1; kk<<=1; - if(ii%16 == 15) + if (ii%16 == 15) { jj = val[CMDS_SUPP_0+1+(ii/16)]; kk = val[CMDS_EN_0+1+(ii/16)]; } - if(ii == 31) + if (ii == 31) { - if((val[CMDS_SUPP_2] & VALID) != VALID_VAL) + if ((val[CMDS_SUPP_2] & VALID) != VALID_VAL) ii +=16; } } } - if_printf(((val[RM_STAT] & RM_STAT_BITS) == RM_STAT_SUP), - "\tRemovable Media Status Notification feature set supported\n"); + /* Removable Media Status Notification feature set */ + if ((val[RM_STAT] & RM_STAT_BITS) == RM_STAT_SUP) + printf("\t%s supported\n", cmd_feat_str[27]); /* security */ - if((eqpt != CDROM) && (like_std > 3) && + if ((eqpt != CDROM) && (like_std > 3) && (val[SECU_STATUS] || val[ERASE_TIME] || val[ENH_ERASE_TIME])) { - printf("Security: \n"); - if_printf((val[PSWD_CODE] && (val[PSWD_CODE] != NOVAL_1)), - "\tMaster password revision code = %u\n",val[PSWD_CODE]); + printf("Security:\n"); + if (val[PSWD_CODE] && (val[PSWD_CODE] != NOVAL_1)) + printf("\tMaster password revision code = %u\n",val[PSWD_CODE]); jj = val[SECU_STATUS]; - if(jj) + if (jj) { - for(ii = 0; ii < NUM_SECU_STR; ii++) + for (ii = 0; ii < NUM_SECU_STR; ii++) { - if_else_printf((!(jj & 0x0001)),"\tnot\t%s\n", "\t\t%s\n", secu_str[ii]); + printf("\t%s\t%s\n", (!(jj & 0x0001)) ? "not" : "", secu_str[ii]); jj >>=1; } - if(val[SECU_STATUS] & SECU_ENABLED) + if (val[SECU_STATUS] & SECU_ENABLED) { - printf("\tSecurity level "); - if_else_printf((val[SECU_STATUS] & SECU_LEVEL),"maximum\n","high\n"); + printf("\tSecurity level %s\n", (val[SECU_STATUS] & SECU_LEVEL) ? "maximum" : "high"); } } jj = val[ERASE_TIME] & ERASE_BITS; kk = val[ENH_ERASE_TIME] & ERASE_BITS; - if(jj || kk) + if (jj || kk) { printf("\t"); - if_printf(jj,"%umin for SECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1); - if_printf(kk,"%umin for ENHANCED SECURITY ERASE UNIT.", kk==ERASE_BITS ? 508 : kk<<1); - printf("\n"); + if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, ""); + if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED "); + puts(""); } } /* reset result */ - if((val[HWRST_RSLT] & VALID) == VALID_VAL) - { - printf("HW reset results:\n"); - if_else_printf((val[HWRST_RSLT] & CBLID),"\tCBLID- above Vih\n","\tCBLID- below Vih\n"); - - if(val[HWRST_RSLT] & RST0) - { - printf("\tDevice num = 0"); - jj = val[HWRST_RSLT]; - } + jj = val[HWRST_RSLT]; + if ((jj & VALID) == VALID_VAL) + { + if (!(oo = (jj & RST0))) + jj >>= 8; + if ((jj & DEV_DET) == JUMPER_VAL) + strng = " determined by the jumper"; + else if ((jj & DEV_DET) == CSEL_VAL) + strng = " determined by CSEL"; else - { - printf("\tDevice num = 1"); - jj = val[HWRST_RSLT] >> 8; - } - - if((jj & DEV_DET) == JUMPER_VAL) - printf(" determined by the jumper"); - else if((jj & DEV_DET) == CSEL_VAL) - printf(" determined by CSEL"); - printf("\n"); + strng = ""; + printf("HW reset results:\n\tCBLID- %s Vih\n\tDevice num = %i%s\n", + (val[HWRST_RSLT] & CBLID) ? "above" : "below", !(oo), strng); } /* more stuff from std 5 */ - if((like_std > 4) && (eqpt != CDROM)) + if ((like_std > 4) && (eqpt != CDROM)) { - if(val[CFA_PWR_MODE] & VALID_W160) + if (val[CFA_PWR_MODE] & VALID_W160) { - printf("CFA power mode 1:\n\t"); - if_else_printf((val[CFA_PWR_MODE] & PWR_MODE_OFF),"disabled","enabled"); - - if_printf((val[CFA_PWR_MODE] & PWR_MODE_REQ)," and required by some commands"); - printf("\n"); + printf("CFA power mode 1:\n\t%s%s\n", (val[CFA_PWR_MODE] & PWR_MODE_OFF) ? "disabled" : "enabled", + (val[CFA_PWR_MODE] & PWR_MODE_REQ) ? " and required by some commands" : ""); - if_printf((val[CFA_PWR_MODE] & MAX_AMPS),"\tMaximum current = %uma\n",val[CFA_PWR_MODE] & MAX_AMPS); + if (val[CFA_PWR_MODE] & MAX_AMPS) printf("\tMaximum current = %uma\n",val[CFA_PWR_MODE] & MAX_AMPS); } - if((val[INTEGRITY] & SIG) == SIG_VAL) + if ((val[INTEGRITY] & SIG) == SIG_VAL) { - printf("Checksum: "); - if_printf(chksum,"in"); - printf("correct\n"); + printf("Checksum: %scorrect\n", chksum ? "in" : ""); } } - exit(0); + exit(EXIT_SUCCESS); } #endif -static int verbose, get_identity, get_geom, noisy = 1, quiet; -static int flagcount, do_flush, is_scsi_hd, is_xt_hd; +static int get_identity, get_geom; +static int do_flush; static int do_ctimings, do_timings; - static unsigned long set_readahead, get_readahead, Xreadahead; static unsigned long set_readonly, get_readonly, readonly; static unsigned long set_unmask, get_unmask, unmask; @@ -1254,17 +1121,17 @@ static unsigned long set_apmmode, get_apmmode, apmmode; static int get_IDentity; #endif #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF -static int unregister_hwif; -static int hwif; +static unsigned long unregister_hwif; +static unsigned long hwif; #endif #ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF -static int scan_hwif; -static int hwif_data; -static int hwif_ctrl; -static int hwif_irq; +static unsigned long scan_hwif; +static unsigned long hwif_data; +static unsigned long hwif_ctrl; +static unsigned long hwif_irq; #endif #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF -static int set_busstate, get_busstate, busstate; +static unsigned long set_busstate, get_busstate, busstate; #endif static int reread_partn; @@ -1272,7 +1139,7 @@ static int reread_partn; static int perform_reset; #endif /* CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET */ #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF -static int perform_tristate, tristate; +static unsigned long perform_tristate, tristate; #endif /* CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF */ // Historically, if there was no HDIO_OBSOLETE_IDENTITY, then @@ -1288,38 +1155,31 @@ static int perform_tristate, tristate; #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY static const char * const cfg_str[] = -{ "", " HardSect", " SoftSect", " NotMFM", - " HdSw>15uSec", " SpinMotCtl", " Fixed", " Removeable", - " DTR<=5Mbs", " DTR>5Mbs", " DTR>10Mbs", " RotSpdTol>.5%", - " dStbOff", " TrkOff", " FmtGapReq", " nonMagnetic" +{ "", "HardSect", "SoftSect", "NotMFM", + "HdSw>15uSec", "SpinMotCtl", "Fixed", "Removeable", + "DTR<=5Mbs", "DTR>5Mbs", "DTR>10Mbs", "RotSpdTol>.5%", + "dStbOff", "TrkOff", "FmtGapReq", "nonMagnetic" }; -static const char * const BuffType[] = {"unknown", "1Sect", "DualPort", "DualPortCache"}; +static const char * const BuffType[] = {"Unknown", "1Sect", "DualPort", "DualPortCache"}; -static void dump_identity (const struct hd_driveid *id) +static void dump_identity(const struct hd_driveid *id) { int i; - char pmodes[64], dmodes[128], umodes[128]; const unsigned short int *id_regs= (const void*) id; - unsigned long capacity; - - pmodes[0] = dmodes[0] = umodes[0] = '\0'; printf("\n Model=%.40s, FwRev=%.8s, SerialNo=%.20s\n Config={", id->model, id->fw_rev, id->serial_no); - for (i=0; i<=15; i++) - if_printf((id->config & (1<config & (1<cyls, id->heads, id->sectors, id->track_bytes, - id->sector_bytes, id->ecc_bytes); - - if (id->buf_type > 3) - printf("%s%u", " BuffType=", id->buf_type); - else - printf("%s%s", " BuffType=", BuffType[id->buf_type]); - - printf(", BuffSize=%ukB, MaxMultSect=%u", id->buf_size/2, id->max_multsect); + id->sector_bytes, id->ecc_bytes, + id->buf_type, BuffType[(id->buf_type > 3) ? 0 : id->buf_type], + id->buf_size/2, id->max_multsect); if (id->max_multsect) { printf(", MultSect="); @@ -1330,97 +1190,93 @@ static void dump_identity (const struct hd_driveid *id) else printf("off"); } - printf("\n"); - if (id->tPIO <= 5) - { - strcat(pmodes, "pio0 "); - if_strcat((id->tPIO >= 1), pmodes, "pio1 "); - if_strcat((id->tPIO >= 2), pmodes, "pio2 "); + puts(""); + + if (!(id->field_valid&1)) + printf(" (maybe):"); - } - if_printf((!(id->field_valid&1))," (maybe):"); -#if __BYTE_ORDER == __BIG_ENDIAN - capacity = (id->cur_capacity0 << 16) | id->cur_capacity1; -#else - capacity = (id->cur_capacity1 << 16) | id->cur_capacity0; -#endif printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads, - id->cur_sectors, capacity , - ((id->capability&2)==0)?"no":"yes"); + id->cur_sectors, + (BB_BIG_ENDIAN) ? + (long unsigned int)(id->cur_capacity0 << 16) | id->cur_capacity1 : + (long unsigned int)(id->cur_capacity1 << 16) | id->cur_capacity0, + ((id->capability&2) == 0) ? "no" : "yes"); + + if (id->capability&2) + printf(", LBAsects=%u", id->lba_capacity); - if_printf((id->capability&2),", LBAsects=%u", id->lba_capacity); + printf("\n IORDY=%s", (id->capability&8) ? (id->capability&4) ? "on/off" : "yes" : "no"); + if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&2) + printf(", tPIO={min:%u,w/IORDY:%u}", id->eide_pio, id->eide_pio_iordy); + + if ((id->capability&1) && (id->field_valid&2)) + printf(", tDMA={min:%u,rec:%u}", id->eide_dma_min, id->eide_dma_time); + + printf("\n PIO modes: "); + if (id->tPIO <= 5) + { + printf("pio0 "); + if (id->tPIO >= 1) printf("pio1 "); + if (id->tPIO >= 2) printf("pio2 "); + } + if (id->field_valid&2) + { + if (id->eide_pio_modes & 1) printf("pio3 "); + if (id->eide_pio_modes & 2) printf("pio4 "); + if (id->eide_pio_modes &~3) printf("pio? "); + } if (id->capability&1) { if (id->dma_1word | id->dma_mword) { - if_strcat((id->dma_1word & 0x100), dmodes, "*"); - if_strcat((id->dma_1word & 1), dmodes, "sdma0 "); - if_strcat((id->dma_1word & 0x200), dmodes, "*"); - if_strcat((id->dma_1word & 2), dmodes, "sdma1 "); - if_strcat((id->dma_1word & 0x400), dmodes, "*"); - if_strcat((id->dma_1word & 4), dmodes, "sdma2 "); - if_strcat((id->dma_1word & 0xf800), dmodes, "*"); - if_strcat((id->dma_1word & 0xf8), dmodes, "sdma? "); - if_strcat((id->dma_mword & 0x100), dmodes, "*"); - if_strcat((id->dma_mword & 1), dmodes, "mdma0 "); - if_strcat((id->dma_mword & 0x200), dmodes, "*"); - if_strcat((id->dma_mword & 2), dmodes, "mdma1 "); - if_strcat((id->dma_mword & 0x400), dmodes, "*"); - if_strcat((id->dma_mword & 4), dmodes, "mdma2 "); - if_strcat((id->dma_mword & 0xf800), dmodes, "*"); - if_strcat((id->dma_mword & 0xf8), dmodes, "mdma? "); + printf("\n DMA modes: "); + if (id->dma_1word & 0x100) printf("*"); + if (id->dma_1word & 1) printf("sdma0 "); + if (id->dma_1word & 0x200) printf("*"); + if (id->dma_1word & 2) printf("sdma1 "); + if (id->dma_1word & 0x400) printf("*"); + if (id->dma_1word & 4) printf("sdma2 "); + if (id->dma_1word & 0xf800) printf("*"); + if (id->dma_1word & 0xf8) printf("sdma? "); + if (id->dma_mword & 0x100) printf("*"); + if (id->dma_mword & 1) printf("mdma0 "); + if (id->dma_mword & 0x200) printf("*"); + if (id->dma_mword & 2) printf("mdma1 "); + if (id->dma_mword & 0x400) printf("*"); + if (id->dma_mword & 4) printf("mdma2 "); + if (id->dma_mword & 0xf800) printf("*"); + if (id->dma_mword & 0xf8) printf("mdma? "); } } - printf("\n IORDY="); - if (id->capability&8) - printf((id->capability&4) ? "on/off" : "yes"); - else - printf("no"); - - if ((id->capability&8) || (id->field_valid&2)) + if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&4) { - if (id->field_valid&2) - { - printf(", tPIO={min:%u,w/IORDY:%u}", id->eide_pio, id->eide_pio_iordy); - if_strcat((id->eide_pio_modes & 1), pmodes, "pio3 "); - if_strcat((id->eide_pio_modes & 2), pmodes, "pio4 "); - if_strcat((id->eide_pio_modes &~3), pmodes, "pio? "); - } - if (id->field_valid&4) - { - if_strcat((id->dma_ultra & 0x100),umodes,"*"); - if_strcat((id->dma_ultra & 0x001),umodes,"udma0 "); - if_strcat((id->dma_ultra & 0x200),umodes,"*"); - if_strcat((id->dma_ultra & 0x002),umodes,"udma1 "); - if_strcat((id->dma_ultra & 0x400),umodes,"*"); - if_strcat((id->dma_ultra & 0x004),umodes,"udma2 "); + printf("\n UDMA modes: "); + if (id->dma_ultra & 0x100) printf("*"); + if (id->dma_ultra & 0x001) printf("udma0 "); + if (id->dma_ultra & 0x200) printf("*"); + if (id->dma_ultra & 0x002) printf("udma1 "); + if (id->dma_ultra & 0x400) printf("*"); + if (id->dma_ultra & 0x004) printf("udma2 "); #ifdef __NEW_HD_DRIVE_ID - if (id->hw_config & 0x2000) - { + if (id->hw_config & 0x2000) + { #else /* !__NEW_HD_DRIVE_ID */ - if (id->word93 & 0x2000) - { + if (id->word93 & 0x2000) + { #endif /* __NEW_HD_DRIVE_ID */ - if_strcat((id->dma_ultra & 0x0800),umodes,"*"); - if_strcat((id->dma_ultra & 0x0008),umodes,"udma3 "); - if_strcat((id->dma_ultra & 0x1000),umodes,"*"); - if_strcat((id->dma_ultra & 0x0010),umodes,"udma4 "); - if_strcat((id->dma_ultra & 0x2000),umodes,"*"); - if_strcat((id->dma_ultra & 0x0020),umodes,"udma5 "); - if_strcat((id->dma_ultra & 0x4000),umodes,"*"); - if_strcat((id->dma_ultra & 0x0040),umodes,"udma6 "); - if_strcat((id->dma_ultra & 0x8000),umodes,"*"); - if_strcat((id->dma_ultra & 0x0080),umodes,"udma7 "); - } + if (id->dma_ultra & 0x0800) printf("*"); + if (id->dma_ultra & 0x0008) printf("udma3 "); + if (id->dma_ultra & 0x1000) printf("*"); + if (id->dma_ultra & 0x0010) printf("udma4 "); + if (id->dma_ultra & 0x2000) printf("*"); + if (id->dma_ultra & 0x0020) printf("udma5 "); + if (id->dma_ultra & 0x4000) printf("*"); + if (id->dma_ultra & 0x0040) printf("udma6 "); + if (id->dma_ultra & 0x8000) printf("*"); + if (id->dma_ultra & 0x0080) printf("udma7 "); } } - if_printf(((id->capability&1) && (id->field_valid&2)), - ", tDMA={min:%u,rec:%u}", id->eide_dma_min, id->eide_dma_time); - printf("\n PIO modes: %s", pmodes); - if_printf((*dmodes),"\n DMA modes: %s", dmodes); - if_printf((*umodes),"\n UDMA modes: %s", umodes); - printf("\n AdvancedPM=%s",((id_regs[83]&8)==0)?"no":"yes"); if (id_regs[83] & 8) { @@ -1431,162 +1287,140 @@ static void dump_identity (const struct hd_driveid *id) else printf(": mode=0x%02X (%u)",id_regs[91]&0xFF,id_regs[91]&0xFF); } - if_printf( (id_regs[82]&0x20)," WriteCache=%s",(id_regs[85]&0x20) ? "enabled" : "disabled"); + if (id_regs[82]&0x20) + printf(" WriteCache=%s",(id_regs[85]&0x20) ? "enabled" : "disabled"); #ifdef __NEW_HD_DRIVE_ID if ((id->minor_rev_num && id->minor_rev_num <= 31) || (id->major_rev_num && id->minor_rev_num <= 31)) { - printf("\n Drive conforms to: "); - if_else_printf((id->minor_rev_num <= 31),"%s: ","unknown: ", minor_str[id->minor_rev_num]); + printf("\n Drive conforms to: %s: ", (id->minor_rev_num <= 31) ? minor_str[id->minor_rev_num] : "Unknown"); if (id->major_rev_num != 0x0000 && /* NOVAL_0 */ id->major_rev_num != 0xFFFF) { /* NOVAL_1 */ - for (i=0; i <= 15; i++) - if_printf((id->major_rev_num & (1<major_rev_num & (1<= e) /* more than 1MB/s */ + printf("%2d MB in %5.2f seconds =%6.2f %cB/sec\n", t, e, t / e, 'M'); + else + printf("%2d MB in %5.2f seconds =%6.2f %cB/sec\n", t, e, t / e * 1024, 'k'); +} + +static int do_blkgetsize (int fd, unsigned long long *blksize64) +{ + int rc; + unsigned int blksize32 = 0; + + if (0 == ioctl(fd, BLKGETSIZE64, blksize64)) { // returns bytes + *blksize64 /= 512; + return 0; + } + rc = ioctl(fd, BLKGETSIZE, &blksize32); // returns sectors + if (rc) + bb_perror_msg("BLKGETSIZE"); + *blksize64 = blksize32; + return rc; +} -static void do_time (int flag, int fd) +static void do_time(int flag, int fd) /* flag = 0 time_cache flag = 1 time_device */ { - int i; - char *buf; - double elapsed; struct itimerval e1, e2; - int shmid; - int timing_MB = TIMING_MB; + double elapsed, elapsed2; + unsigned int max_iterations = 1024, total_MB, iterations; + unsigned long long blksize; + RESERVE_CONFIG_BUFFER(buf, TIMING_BUF_BYTES); - if ((shmid = shmget(IPC_PRIVATE, TIMING_BUF_BYTES, 0600)) == -1) - { - bb_error_msg (bb_msg_shared_mem,"allocate"); /*"could not allocate sharedmem buf"*/ - return; - } - if (shmctl(shmid, SHM_LOCK, NULL) == -1) - { - bb_error_msg (bb_msg_shared_mem,"lock"); /*"could not lock sharedmem buf"*/ - (void) shmctl(shmid, IPC_RMID, NULL); - return; + if (mlock(buf, TIMING_BUF_BYTES)) { + bb_perror_msg("mlock"); + goto quit2; } - if ((buf = shmat(shmid, (char *) 0, 0)) == (char *) -1) - { - bb_error_msg (bb_msg_shared_mem,"attach"); /*"could not attach sharedmem buf"*/ - (void) shmctl(shmid, IPC_RMID, NULL); - return; + + if (0 == do_blkgetsize(fd, &blksize)) { + max_iterations = blksize / (2 * 1024) / TIMING_BUF_MB; } - if (shmctl(shmid, IPC_RMID, NULL) == -1) - bb_error_msg ("shmctl(,IPC_RMID,)"); /* Clear out the device request queues & give them time to complete */ - sync_and_sleep(3); + sync(); + sleep(3); - if(flag == 0) /* Time cache */ + setitimer(ITIMER_REAL, &(struct itimerval){{1000,0},{1000,0}}, NULL); + + if (flag == 0) /* Time cache */ { - /* Calculate a correction factor for the basic - * overhead of doing a read() from the buffer cache. - * To do this, we read the data once to "cache it" and - * to force full preallocation of our timing buffer, - * and then we re-read it 10 times while timing it. - * - * getitimer() is used rather than gettimeofday() because - * it is much more consistent (on my machine, at least). - */ - setitimer(ITIMER_REAL, &(struct itimerval){{1000,0},{1000,0}}, NULL); - if (seek_to_zero (fd)) - return; - if (read_big_block (fd, buf)) - return; - printf(" Timing buffer-cache reads: "); + if (seek_to_zero (fd)) return; + if (read_big_block (fd, buf)) return; + printf(" Timing cached reads: "); fflush(stdout); - /* Clear out the device request queues & give them time to complete */ - sync_and_sleep(1); - - /* Time re-reading from the buffer-cache */ + /* Now do the timing */ + iterations = 0; getitimer(ITIMER_REAL, &e1); - for (i = (BUFCACHE_FACTOR * TIMING_BUF_COUNT) ; i > 0; --i) - { - if (seek_to_zero (fd)) + do { + ++iterations; + if (seek_to_zero (fd) || read_big_block (fd, buf)) goto quit; - if (read_big_block (fd, buf)) - goto quit; - } - getitimer(ITIMER_REAL, &e2); - correction = (e1.it_value.tv_sec - e2.it_value.tv_sec) + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); + getitimer(ITIMER_REAL, &e2); + elapsed = (e1.it_value.tv_sec - e2.it_value.tv_sec) + + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); + } while (elapsed < 2.0); + total_MB = iterations * TIMING_BUF_MB; - /* Now remove the lseek() from the correction factor */ + /* Now remove the lseek() and getitimer() overheads from the elapsed time */ getitimer(ITIMER_REAL, &e1); - for (i = (BUFCACHE_FACTOR * TIMING_BUF_COUNT) ; i > 0; --i) - { + do { if (seek_to_zero (fd)) goto quit; - } - getitimer(ITIMER_REAL, &e2); - correction -= (e1.it_value.tv_sec - e2.it_value.tv_sec) - + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); - - if ((BUFCACHE_FACTOR * timing_MB) >= correction) /* more than 1MB/s */ - printf("%2d MB in %5.2f seconds =%6.2f MB/sec\n", - (BUFCACHE_FACTOR * timing_MB), correction, - (BUFCACHE_FACTOR * timing_MB) / correction); - else - printf("%2d MB in %5.2f seconds =%6.2f kB/sec\n", - (BUFCACHE_FACTOR * timing_MB), correction, - (BUFCACHE_FACTOR * timing_MB) / correction * 1024); - correction /= BUFCACHE_FACTOR; + getitimer(ITIMER_REAL, &e2); + elapsed2 = (e1.it_value.tv_sec - e2.it_value.tv_sec) + + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); + } while (--iterations); + elapsed -= elapsed2; + print_timing(BUFCACHE_FACTOR * total_MB, elapsed); flush_buffer_cache(fd); sleep(1); } @@ -1594,63 +1428,29 @@ static void do_time (int flag, int fd) { printf(" Timing buffered disk reads: "); fflush(stdout); - /* * getitimer() is used rather than gettimeofday() because * it is much more consistent (on my machine, at least). */ - setitimer(ITIMER_REAL, &(struct itimerval){{1000,0},{1000,0}}, NULL); - /* Now do the timings for real */ + iterations = 0; getitimer(ITIMER_REAL, &e1); - for (i = TIMING_BUF_COUNT; i > 0; --i) - { + do { + ++iterations; if (read_big_block (fd, buf)) goto quit; - } - getitimer(ITIMER_REAL, &e2); + getitimer(ITIMER_REAL, &e2); + elapsed = (e1.it_value.tv_sec - e2.it_value.tv_sec) + + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); + } while (elapsed < 3.0 && iterations < max_iterations); - elapsed = (e1.it_value.tv_sec - e2.it_value.tv_sec) + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); - - if (timing_MB >= elapsed) /* more than 1MB/s */ - printf("%2d MB in %5.2f seconds =%6.2f MB/sec\n",timing_MB, elapsed, timing_MB / elapsed); - else - printf("%2d MB in %5.2f seconds =%6.2f kB/sec\n",timing_MB, elapsed, timing_MB / elapsed * 1024); - - /*"Hmm.. suspicious results: probably not enough free memory for a proper test.");*/ - if (elapsed <= (correction * 2)) - bb_error_msg(bb_msg_memory_exhausted); - -#if 0 /* the "estimate" is just plain wrong for many systems.. */ - else if (correction != 0.0) { - printf(" Estimating raw driver speed: "); - elapsed -= correction; - if (timing_MB >= elapsed) /* more than 1MB/s */ - printf("%2d MB in %5.2f seconds =%6.2f MB/sec\n", - timing_MB, elapsed, timing_MB / elapsed); - else - printf("%2d MB in %5.2f seconds =%6.2f kB/sec\n", - timing_MB, elapsed, timing_MB / elapsed * 1024); - } -#endif + total_MB = iterations * TIMING_BUF_MB; + print_timing(total_MB, elapsed); } quit: - if (-1 == shmdt(buf)) - bb_error_msg (bb_msg_shared_mem,"detach"); /*"could not detach sharedmem buf"*/ -} - - -static void no_scsi (void) -{ - /*" operation not supported on SCSI disks"*/ - if (is_scsi_hd) - bb_error_msg_and_die(bb_msg_op_not_supp,"SCSI"); -} - -static void no_xt (void) -{ - if (is_xt_hd) - bb_error_msg_and_die(bb_msg_op_not_supp,"XT"); + munlock(buf, TIMING_BUF_BYTES); +quit2: + RELEASE_CONFIG_BUFFER(buf); } static void on_off (unsigned int value) @@ -1659,72 +1459,44 @@ static void on_off (unsigned int value) } #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF -static void bus_state_value (unsigned int value) +static void bus_state_value(unsigned int value) { - const char *string; - - switch (value) - { - case BUSSTATE_ON: - string = " (on)\n"; - break; - case BUSSTATE_OFF: - string = " (off)\n"; - break; - case BUSSTATE_TRISTATE: - string = " (tristate)\n"; - break; - default: - string = " (unknown: %d)\n"; - break; - } - printf(string, value); + if (value == BUSSTATE_ON) + on_off(1); + else if (value == BUSSTATE_OFF) + on_off(0); + else if (value == BUSSTATE_TRISTATE) + printf(" (tristate)\n"); + else + printf(" (unknown: %d)\n", value); } #endif #ifdef HDIO_DRIVE_CMD -static void interpret_standby (unsigned int standby) +static void interpret_standby(unsigned int standby) { + unsigned int t; + printf(" ("); - switch(standby) - { - case 0: - printf("off"); - break; - case 252: - printf("21 minutes"); - break; - case 253: - printf("vendor-specific"); - break; - case 254: - printf("?reserved"); - break; - case 255: - printf("21 minutes + 15 seconds"); - break; - default: - if (standby <= 240) - { - unsigned int secs = standby * 5; - unsigned int mins = secs / 60; - secs %= 60; - if_printf(mins,"%u minutes", mins); - if_printf((mins && secs)," + "); - if_printf(secs,"%u seconds", secs); - } - else if (standby <= 251) - { - unsigned int mins = (standby - 240) * 30; - unsigned int hrs = mins / 60; - mins %= 60; - if_printf(hrs,"%u hours", hrs); - if_printf((hrs && mins)," + "); - if_printf(mins,"%u minutes", mins); - } - else - printf("illegal value"); - break; + if (standby == 0) + printf("off"); + else if (standby == 252) + printf("21 minutes"); + else if (standby == 253) + printf("vendor-specific"); + else if (standby == 254) + printf("Reserved"); + else if (standby == 255) + printf("21 minutes + 15 seconds"); + else { + if (standby <= 240) { + t = standby * 5; + printf("%u minutes + %u seconds", t / 60, t % 60); + } else if (standby <= 251) { + t = (standby - 240) * 30; + printf("%u hours + %u minutes", t / 60, t % 60); + } else + printf("illegal value"); } printf(")\n"); } @@ -1781,7 +1553,6 @@ static int translate_xfermode(char * name) { if (!strcmp(name, tmp->name)) return tmp->val; - } val = strtol(name, &endptr, 10); @@ -1791,175 +1562,74 @@ static int translate_xfermode(char * name) return -1; } -static void interpret_xfermode (unsigned int xfermode) +static void interpret_xfermode(unsigned int xfermode) { printf(" ("); - switch(xfermode) { - case 0: - printf("default PIO mode"); - break; - case 1: - printf("default PIO mode, disable IORDY"); - break; - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - printf("PIO flow control mode%u", xfermode-8); - break; - case 16: - case 17: - case 18: - case 19: - case 20: - case 21: - case 22: - case 23: - printf("singleword DMA mode%u", xfermode-16); - break; - case 32: - case 33: - case 34: - case 35: - case 36: - case 37: - case 38: - case 39: - printf("multiword DMA mode%u", xfermode-32); - break; - case 64: - case 65: - case 66: - case 67: - case 68: - case 69: - case 70: - case 71: - printf("UltraDMA mode%u", xfermode-64); - break; - default: - printf("unknown, probably not valid"); - break; - } + if (xfermode == 0) + printf("default PIO mode"); + else if (xfermode == 1) + printf("default PIO mode, disable IORDY"); + else if (xfermode >= 8 && xfermode <= 15) + printf("PIO flow control mode%u", xfermode-8); + else if (xfermode >= 16 && xfermode <= 23) + printf("singleword DMA mode%u", xfermode-16); + else if (xfermode >= 32 && xfermode <= 39) + printf("multiword DMA mode%u", xfermode-32); + else if (xfermode >= 64 && xfermode <= 71) + printf("UltraDMA mode%u", xfermode-64); + else + printf("Unknown"); printf(")\n"); } #endif /* HDIO_DRIVE_CMD */ -#ifndef VXVM_MAJOR -#define VXVM_MAJOR 199 -#endif - -#ifndef CCISS_MAJOR -#define CCISS_MAJOR 104 -#endif +static void print_flag(unsigned long flag, const char *s, unsigned long value) +{ + if (flag) + printf(" setting %s to %ld\n", s, value); +} -static void process_dev (char *devname) +static void process_dev(char *devname) { int fd; static long parm, multcount; - struct stat stat_buf; #ifndef HDIO_DRIVE_CMD int force_operation = 0; #endif - xstat(devname,&stat_buf); - - switch(major(stat_buf.st_rdev)) - { -#ifdef SCSI_DISK0_MAJOR - case (SCSI_DISK0_MAJOR): - case (SCSI_DISK1_MAJOR): - case (SCSI_DISK2_MAJOR): - case (SCSI_DISK3_MAJOR): - case (SCSI_DISK4_MAJOR): - case (SCSI_DISK5_MAJOR): - case (SCSI_DISK6_MAJOR): - case (SCSI_DISK7_MAJOR): -#else - case (SCSI_DISK_MAJOR): -#endif -#ifdef MD_MAJOR - case (MD_MAJOR): -#endif - case (VXVM_MAJOR): -#ifdef LVM_BLK_MAJOR - case (LVM_BLK_MAJOR): -#endif - case (CCISS_MAJOR): - is_scsi_hd = 1; - break; -#ifdef XT_DISK_MAJOR - case (XT_DISK_MAJOR): - is_xt_hd = 1; - break; -#endif - case IDE0_MAJOR: - case IDE1_MAJOR: -#ifdef IDE2_MAJOR - case IDE2_MAJOR: -#endif -#ifdef IDE3_MAJOR - case IDE3_MAJOR: -#endif -#ifdef IDE4_MAJOR - case IDE4_MAJOR: -#endif -#ifdef IDE5_MAJOR - case IDE5_MAJOR: -#endif -#ifdef IDE6_MAJOR - case IDE6_MAJOR: -#endif -#ifdef IDE7_MAJOR - case IDE7_MAJOR: -#endif -#ifdef IDE8_MAJOR - case IDE8_MAJOR: -#endif -#ifdef IDE9_MAJOR - case IDE9_MAJOR: -#endif - break; /* do nothing */ - default: - bb_error_msg_and_die("%s not supported",devname); - } + /* Please restore args[n] to these values after each ioctl + except for args[2] */ + unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; + const char *fmt = " %s\t= %2ld"; - fd = bb_xopen (devname, O_RDONLY|O_NONBLOCK); - if_printf( (!quiet),"\n%s:\n", devname); + fd = xopen(devname, O_RDONLY|O_NONBLOCK); + printf("\n%s:\n", devname); if (set_readahead) { - if_printf(get_readahead," setting fs readahead to %ld\n", Xreadahead); + print_flag(get_readahead,"fs readahead", Xreadahead); bb_ioctl(fd, BLKRASET,(int *)Xreadahead,"BLKRASET"); } #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF if (unregister_hwif) { - no_scsi(); - printf(" attempting to unregister hwif#%u\n", hwif); + printf(" attempting to unregister hwif#%lu\n", hwif); bb_ioctl(fd, HDIO_UNREGISTER_HWIF,(int *)(unsigned long)hwif,"HDIO_UNREGISTER_HWIF"); } #endif #ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF if (scan_hwif) { - int args[3]; - no_scsi(); - printf(" attempting to scan hwif (0x%x, 0x%x, %u)\n", hwif_data, hwif_ctrl, hwif_irq); + printf(" attempting to scan hwif (0x%lx, 0x%lx, %lu)\n", hwif_data, hwif_ctrl, hwif_irq); args[0] = hwif_data; args[1] = hwif_ctrl; args[2] = hwif_irq; bb_ioctl(fd, HDIO_SCAN_HWIF, args, "HDIO_SCAN_HWIF"); + args[0] = WIN_SETFEATURES; + args[1] = 0; } #endif if (set_piomode) { - no_scsi(); - no_xt(); - if (noisy_piomode) { printf(" attempting to "); @@ -1976,148 +1646,106 @@ static void process_dev (char *devname) } if (set_io32bit) { - no_scsi(); - no_xt(); - if_printf(get_io32bit," setting 32-bit IO_support flag to %ld\n", io32bit); + print_flag(get_io32bit,"32-bit IO_support flag", io32bit); bb_ioctl(fd, HDIO_SET_32BIT, (int *)io32bit, "HDIO_SET_32BIT"); } if (set_mult) { - no_scsi(); - no_xt(); - if_printf(get_mult, " setting multcount to %ld\n", mult); - if(ioctl(fd, HDIO_SET_MULTCOUNT, mult)) - bb_perror_msg("HDIO_SET_MULTCOUNT"); -#ifndef HDIO_DRIVE_CMD - else - force_operation = 1; + print_flag(get_mult, "multcount", mult); +#ifdef HDIO_DRIVE_CMD + bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT"); +#else + force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT")); #endif } if (set_readonly) { - if_printf_on_off(get_readonly," setting readonly to %ld", readonly); + print_flag_on_off(get_readonly,"readonly", readonly); bb_ioctl(fd, BLKROSET, &readonly, "BLKROSET"); } if (set_unmask) { - no_scsi(); - no_xt(); - if_printf_on_off(get_unmask," setting unmaskirq to %ld", unmask); + print_flag_on_off(get_unmask,"unmaskirq", unmask); bb_ioctl(fd, HDIO_SET_UNMASKINTR, (int *)unmask, "HDIO_SET_UNMASKINTR"); } #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA if (set_dma) { - no_scsi(); - if_printf_on_off(get_dma," setting using_dma to %ld", dma); + print_flag_on_off(get_dma, "using_dma", dma); bb_ioctl(fd, HDIO_SET_DMA, (int *)dma, "HDIO_SET_DMA"); } #endif /* CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA */ if (set_dma_q) { - no_scsi(); - if_printf_on_off(get_dma_q," setting DMA queue_depth to %ld", dma_q); + print_flag_on_off(get_dma_q,"DMA queue_depth", dma_q); bb_ioctl(fd, HDIO_SET_QDMA, (int *)dma_q, "HDIO_SET_QDMA"); } if (set_nowerr) { - no_scsi(); - no_xt(); - if_printf_on_off(get_nowerr," setting nowerr to %ld", nowerr); + print_flag_on_off(get_nowerr,"nowerr", nowerr); bb_ioctl(fd, HDIO_SET_NOWERR, (int *)nowerr,"HDIO_SET_NOWERR"); } if (set_keep) { - no_scsi(); - no_xt(); - if_printf_on_off(get_keep," setting keep_settings to %ld", keep); + print_flag_on_off(get_keep,"keep_settings", keep); bb_ioctl(fd, HDIO_SET_KEEPSETTINGS, (int *)keep,"HDIO_SET_KEEPSETTINGS"); } #ifdef HDIO_DRIVE_CMD if (set_doorlock) { - unsigned char args[4] = {0,0,0,0}; - no_scsi(); - no_xt(); - args[0] = doorlock ? WIN_DOORLOCK : WIN_DOORUNLOCK; - if_printf_on_off(get_doorlock," setting drive doorlock to %ld", doorlock); + args[2] = 0; + print_flag_on_off(get_doorlock,"drive doorlock", doorlock); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(doorlock)"); + args[0] = WIN_SETFEATURES; } if (set_dkeep) { /* lock/unlock the drive's "feature" settings */ - unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; - no_scsi(); - no_xt(); - - if_printf_on_off(get_dkeep," setting drive keep features to %ld", dkeep); + print_flag_on_off(get_dkeep,"drive keep features", dkeep); args[2] = dkeep ? 0x66 : 0xcc; bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(keepsettings)"); } if (set_defects) { - unsigned char args[4] = {WIN_SETFEATURES,0,0x04,0}; - no_scsi(); args[2] = defects ? 0x04 : 0x84; - if_printf(get_defects," setting drive defect-mgmt to %ld\n", defects); + print_flag(get_defects,"drive defect-mgmt", defects); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(defectmgmt)"); } if (set_prefetch) { - unsigned char args[4] = {WIN_SETFEATURES,0,0xab,0}; - no_scsi(); - no_xt(); - args[1] = prefetch; - if_printf(get_prefetch," setting drive prefetch to %ld\n", prefetch); + args[2] = 0xab; + print_flag(get_prefetch,"drive prefetch", prefetch); bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setprefetch)"); + args[1] = 0; } if (set_xfermode) { - unsigned char args[4] = {WIN_SETFEATURES,0,3,0}; - no_scsi(); - no_xt(); - args[1] = xfermode_requested; + args[2] = 3; if (get_xfermode) { - printf(" setting xfermode to %d", xfermode_requested); + print_flag(1,"xfermode", xfermode_requested); interpret_xfermode(xfermode_requested); } bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(setxfermode)"); + args[1] = 0; } if (set_lookahead) { - unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; - no_scsi(); - no_xt(); - args[2] = lookahead ? 0xaa : 0x55; - if_printf_on_off(get_lookahead," setting drive read-lookahead to %ld", lookahead); + print_flag_on_off(get_lookahead,"drive read-lookahead", lookahead); bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setreadahead)"); } if (set_apmmode) { - unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; - no_scsi(); - apmmode=check_if_min_and_set_val(apmmode,1); - apmmode=check_if_maj_and_set_val(apmmode,255); - if_printf(get_apmmode," setting APM level to"); - if (apmmode==255) - { - /* disable Advanced Power Management */ - args[2] = 0x85; /* feature register */ - if_printf(get_apmmode," disabled\n"); - } - else - { - /* set Advanced Power Management mode */ - args[2] = 0x05; /* feature register */ - args[1] = apmmode; /* sector count register */ - if_printf(get_apmmode," 0x%02lX (%ld)\n",apmmode,apmmode); - } + args[2] = (apmmode == 255) ? 0x85 /* disable */ : 0x05 /* set */; /* feature register */ + args[1] = apmmode; /* sector count register 1-255 */ + if (get_apmmode) + printf(" setting APM level to %s 0x%02lX (%ld)\n", (apmmode == 255) ? "disabled" : "", apmmode, apmmode); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); + args[1] = 0; } if (set_wcache) { @@ -2125,23 +1753,25 @@ static void process_dev (char *devname) #ifndef WIN_FLUSHCACHE #define WIN_FLUSHCACHE 0xe7 #endif - unsigned char flushcache[4] = {WIN_FLUSHCACHE,0,0,0}; + static unsigned char flushcache[4] = {WIN_FLUSHCACHE,0,0,0}; #endif /* DO_FLUSHCACHE */ - unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; - no_scsi(); - no_xt(); args[2] = wcache ? 0x02 : 0x82; - if_printf_on_off(get_wcache," setting drive write-caching to %ld", wcache); + print_flag_on_off(get_wcache,"drive write-caching", wcache); #ifdef DO_FLUSHCACHE - if (!wcache && ioctl(fd, HDIO_DRIVE_CMD, &flushcache)) - bb_perror_msg ("HDIO_DRIVE_CMD(flushcache)"); + if (!wcache) + bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)"); #endif /* DO_FLUSHCACHE */ bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setcache)"); #ifdef DO_FLUSHCACHE - if (!wcache && ioctl(fd, HDIO_DRIVE_CMD, &flushcache)) - bb_perror_msg ("HDIO_DRIVE_CMD(flushcache)"); + if (!wcache) + bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)"); #endif /* DO_FLUSHCACHE */ } + + /* In code below, we do not preserve args[0], but the rest + is preserved, including args[2] */ + args[2] = 0; + if (set_standbynow) { #ifndef WIN_STANDBYNOW1 @@ -2150,13 +1780,9 @@ static void process_dev (char *devname) #ifndef WIN_STANDBYNOW2 #define WIN_STANDBYNOW2 0x94 #endif - unsigned char args1[4] = {WIN_STANDBYNOW1,0,0,0}; - unsigned char args2[4] = {WIN_STANDBYNOW2,0,0,0}; - no_scsi(); - if_printf(get_standbynow," issuing standby command\n"); - if (ioctl(fd, HDIO_DRIVE_CMD, &args1) - && ioctl(fd, HDIO_DRIVE_CMD, &args2)) - bb_perror_msg("HDIO_DRIVE_CMD(standby)"); + if (get_standbynow) printf(" issuing standby command\n"); + args[0] = WIN_STANDBYNOW1; + bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_STANDBYNOW2, "HDIO_DRIVE_CMD(standby)"); } if (set_sleepnow) { @@ -2166,33 +1792,27 @@ static void process_dev (char *devname) #ifndef WIN_SLEEPNOW2 #define WIN_SLEEPNOW2 0x99 #endif - unsigned char args1[4] = {WIN_SLEEPNOW1,0,0,0}; - unsigned char args2[4] = {WIN_SLEEPNOW2,0,0,0}; - no_scsi(); - if_printf(get_sleepnow," issuing sleep command\n"); - if (ioctl(fd, HDIO_DRIVE_CMD, &args1) - && ioctl(fd, HDIO_DRIVE_CMD, &args2)) - bb_perror_msg("HDIO_DRIVE_CMD(sleep)"); + if (get_sleepnow) printf(" issuing sleep command\n"); + args[0] = WIN_SLEEPNOW1; + bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_SLEEPNOW2, "HDIO_DRIVE_CMD(sleep)"); } if (set_seagate) { - unsigned char args[4] = {0xfb,0,0,0}; - no_scsi(); - no_xt(); - if_printf(get_seagate," disabling Seagate auto powersaving mode\n"); + args[0] = 0xfb; + if (get_seagate) printf(" disabling Seagate auto powersaving mode\n"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(seagatepwrsave)"); } if (set_standby) { - unsigned char args[4] = {WIN_SETIDLE1,standby_requested,0,0}; - no_scsi(); - no_xt(); + args[0] = WIN_SETIDLE1; + args[1] = standby_requested; if (get_standby) { - printf(" setting standby to %lu", standby_requested); + print_flag(1,"standby", standby_requested); interpret_standby(standby_requested); } bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setidle1)"); + args[1] = 0; } #else /* HDIO_DRIVE_CMD */ if (force_operation) @@ -2200,76 +1820,55 @@ static void process_dev (char *devname) char buf[512]; flush_buffer_cache(fd); if (-1 == read(fd, buf, sizeof(buf))) - bb_error_msg("access failed"); + bb_perror_msg("read(%d bytes) failed (rc=%d)", sizeof(buf), -1); } #endif /* HDIO_DRIVE_CMD */ - if (!flagcount) - verbose = 1; - - if ((verbose && !is_scsi_hd && !is_xt_hd) || get_mult || get_identity) + if (get_mult || get_identity) { - no_scsi(); multcount = -1; if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) { - if ((verbose && !is_xt_hd) || get_mult) + if (get_mult) bb_perror_msg("HDIO_GET_MULTCOUNT"); } - else if (verbose | get_mult) + else if (get_mult) { - printf(" multcount = %2ld", multcount); + printf(fmt, "multcount", multcount); on_off(multcount); } } - if ((verbose && !is_scsi_hd && !is_xt_hd) || get_io32bit) + if (get_io32bit) { - no_scsi(); - no_xt(); - if(ioctl(fd, HDIO_GET_32BIT, &parm)) - bb_perror_msg("HDIO_GET_32BIT"); - else + if (!bb_ioctl(fd, HDIO_GET_32BIT, &parm, "HDIO_GET_32BIT")) { - printf(" IO_support =%3ld (", parm); - switch (parm) - { - case 0: - printf("default "); - case 2: - printf("16-bit)\n"); - break; - case 1: - printf("32-bit)\n"); - break; - case 3: - printf("32-bit w/sync)\n"); - break; - case 8: - printf("Request-Queue-Bypass)\n"); - break; - default: - printf("\?\?\?)\n"); - /*esac*/ - } + printf(" IO_support\t=%3ld (", parm); + if (parm == 0) + printf("default 16-bit)\n"); + else if (parm == 2) + printf("16-bit)\n"); + else if (parm == 1) + printf("32-bit)\n"); + else if (parm == 3) + printf("32-bit w/sync)\n"); + else if (parm == 8) + printf("Request-Queue-Bypass)\n"); + else + printf("\?\?\?)\n"); } } - if ((verbose && !is_scsi_hd && !is_xt_hd) || get_unmask) + if (get_unmask) { - no_scsi(); - no_xt(); bb_ioctl_on_off(fd, HDIO_GET_UNMASKINTR,(unsigned long *)parm, - "HDIO_GET_UNMASKINTR"," unmaskirq = %2ld"); + "HDIO_GET_UNMASKINTR","unmaskirq"); } #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA - if ((verbose && !is_scsi_hd) || get_dma) { - no_scsi(); - if(ioctl(fd, HDIO_GET_DMA, &parm)) - bb_perror_msg("HDIO_GET_DMA"); - else + if (get_dma) { + if (!bb_ioctl(fd, HDIO_GET_DMA, &parm, "HDIO_GET_DMA")) { - printf(" using_dma = %2ld", parm); + printf(fmt, "using_dma", parm); if (parm == 8) printf(" (DMA-Assisted-PIO)\n"); else @@ -2279,53 +1878,40 @@ static void process_dev (char *devname) #endif if (get_dma_q) { - no_scsi(); bb_ioctl_on_off (fd, HDIO_GET_QDMA,(unsigned long *)parm, - "HDIO_GET_QDMA"," queue_depth = %2ld"); + "HDIO_GET_QDMA","queue_depth"); } - if ((verbose && !is_scsi_hd && !is_xt_hd) || get_keep) + if (get_keep) { - no_scsi(); - no_xt(); bb_ioctl_on_off (fd, HDIO_GET_KEEPSETTINGS,(unsigned long *)parm, - "HDIO_GET_KEEPSETTINGS"," keepsettings = %2ld"); + "HDIO_GET_KEEPSETTINGS","keepsettings"); } if (get_nowerr) { - no_scsi(); - no_xt(); bb_ioctl_on_off (fd, HDIO_GET_NOWERR,(unsigned long *)&parm, - " HDIO_GET_NOWERR"," nowerr = %2ld"); + "HDIO_GET_NOWERR","nowerr"); } - if (verbose || get_readonly) + if (get_readonly) { bb_ioctl_on_off(fd, BLKROGET,(unsigned long *)parm, - " BLKROGET"," readonly = %2ld"); + "BLKROGET","readonly"); } - if ((verbose && !is_scsi_hd) || get_readahead) + if (get_readahead) { bb_ioctl_on_off (fd, BLKRAGET, (unsigned long *) parm, - " BLKRAGET"," readahead = %2ld"); + "BLKRAGET","readahead"); } - if (verbose || get_geom) + if (get_geom) { - static const char msg[] = " geometry = %u/%u/%u, sectors = %ld, start = %ld\n"; - static struct hd_geometry g; -#ifdef HDIO_GETGEO_BIG - static struct hd_big_geometry bg; -#endif + if (!bb_ioctl(fd, BLKGETSIZE, &parm, "BLKGETSIZE")) + { + struct hd_geometry g; - if (ioctl(fd, BLKGETSIZE, &parm)) - bb_perror_msg("BLKGETSIZE"); -#ifdef HDIO_GETGEO_BIG - else if (!ioctl(fd, HDIO_GETGEO_BIG, &bg)) - printf(msg, bg.cylinders, bg.heads, bg.sectors, parm, bg.start); -#endif - else if (ioctl(fd, HDIO_GETGEO, &g)) - bb_perror_msg("HDIO_GETGEO"); - else - printf(msg, g.cylinders, g.heads, g.sectors, parm, g.start); + if (!bb_ioctl(fd, HDIO_GETGEO, &g, "HDIO_GETGEO")) + printf(" geometry\t= %u/%u/%u, sectors = %ld, start = %ld\n", + g.cylinders, g.heads, g.sectors, parm, g.start); + } } #ifdef HDIO_DRIVE_CMD if (get_powermode) @@ -2336,20 +1922,19 @@ static void process_dev (char *devname) #ifndef WIN_CHECKPOWERMODE2 #define WIN_CHECKPOWERMODE2 0x98 #endif - unsigned char args[4] = {WIN_CHECKPOWERMODE1,0,0,0}; const char *state; - no_scsi(); - if (ioctl(fd, HDIO_DRIVE_CMD, &args) - && (args[0] = WIN_CHECKPOWERMODE2) /* try again with 0x98 */ - && ioctl(fd, HDIO_DRIVE_CMD, &args)) + + args[0] = WIN_CHECKPOWERMODE1; + if (bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_CHECKPOWERMODE2, 0)) { if (errno != EIO || args[0] != 0 || args[1] != 0) - state = "unknown"; + state = "Unknown"; else state = "sleeping"; } else state = (args[2] == 255) ? "active/idle" : "standby"; + args[1] = args[2] = 0; printf(" drive state is: %s\n", state); } @@ -2357,17 +1942,14 @@ static void process_dev (char *devname) #ifdef CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET if (perform_reset) { - no_scsi(); - no_xt(); bb_ioctl(fd, HDIO_DRIVE_RESET, NULL, "HDIO_DRIVE_RESET"); } #endif /* CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET */ #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF if (perform_tristate) { - unsigned char args[4] = {0,tristate,0,0}; - no_scsi(); - no_xt(); + args[0] = 0; + args[1] = tristate; bb_ioctl(fd, HDIO_TRISTATE_HWIF, &args, "HDIO_TRISTATE_HWIF"); } #endif /* CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF */ @@ -2376,9 +1958,6 @@ static void process_dev (char *devname) { static struct hd_driveid id; - no_scsi(); - no_xt(); - if (!ioctl(fd, HDIO_GET_IDENTITY, &id)) { if (multcount != -1) @@ -2398,50 +1977,30 @@ static void process_dev (char *devname) if (get_IDentity) { - unsigned char args[4+512] = {WIN_IDENTIFY,0,0,1,}; - unsigned i; - - no_scsi(); - no_xt(); - - if (ioctl(fd, HDIO_DRIVE_CMD, &args)) - { - args[0] = WIN_PIDENTIFY; - if (ioctl(fd, HDIO_DRIVE_CMD, &args)) - { - bb_perror_msg("HDIO_DRIVE_CMD(identify)"); - goto identify_abort; - } - } - for(i=0; i<(sizeof args)/2; i+=2) - __le16_to_cpus((uint16_t *)(&args[i])); + unsigned char args1[4+512]; /* = { ... } will eat 0.5k of rodata! */ - identify((void *)&args[4], NULL); -identify_abort: - /* VOID */; + memset(args1, 0, sizeof(args1)); + args1[0] = WIN_IDENTIFY; + args1[3] = 1; + if (!bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args1, WIN_PIDENTIFY, "HDIO_DRIVE_CMD(identify)")) + identify((void *)(args1 + 4)); } #endif #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF if (set_busstate) { - no_scsi(); if (get_busstate) { - printf(" setting bus state to %d", busstate); + print_flag(1, "bus state", busstate); bus_state_value(busstate); } bb_ioctl(fd, HDIO_SET_BUSSTATE, (int *)(unsigned long)busstate, "HDIO_SET_BUSSTATE"); } -#endif -#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF if (get_busstate) { - no_scsi(); - if (ioctl(fd, HDIO_GET_BUSSTATE, &parm)) - bb_perror_msg("HDIO_GET_BUSSTATE"); - else + if (!bb_ioctl(fd, HDIO_GET_BUSSTATE, &parm, "HDIO_GET_BUSSTATE")) { - printf(" busstate = %2ld", parm); + printf(fmt, "bus state", parm); bus_state_value(parm); } } @@ -2455,418 +2014,169 @@ identify_abort: if (do_timings) do_time(1,fd); /*time device */ if (do_flush) - flush_buffer_cache (fd); - close (fd); -} - -static char * GET_NUMBER(char *p, unsigned long *flag, unsigned long *num) -{ - *num = 0; - while (isdigit(*p)) { - *flag = 1; - *num = (*num * 10) + (*p++ - '0'); - } - return p; -} - -static char * GET_STRING(char *p, unsigned long *flag, int *num) -{ - char *tmpstr; - char name[32]; - tmpstr = name; - tmpstr[0] = '\0'; - while (isalnum(*p) && (tmpstr - name) < 31) { - tmpstr[0] = *p++; - tmpstr[1] = '\0'; - ++tmpstr; - } - *num = translate_xfermode(name); - if (*num == -1) - *flag = 0; - else - *flag = 1; - return p; + flush_buffer_cache(fd); + close(fd); } #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY -static int fromhex (unsigned char c) +static int fromhex(unsigned char c) { - if (c >= 'a' && c <= 'f') - return 10 + (c - 'a'); - if (c >= '0' && c <= '9') + if (isdigit(c)) return (c - '0'); + if (c >= 'a' && c <= 'f') + return (c - ('a' - 10)); bb_error_msg_and_die("bad char: '%c' 0x%02x", c, c); } -static int identify_from_stdin (void) +static void identify_from_stdin(void) { - unsigned short sbuf[800]; - unsigned char buf[1600], *b = (unsigned char *)buf; - int i, count = read(0, buf, 1280); + uint16_t sbuf[256]; + unsigned char buf[1280]; + unsigned char *b = (unsigned char *)buf; + int i; - if (count != 1280) - bb_error_msg_and_die("read(1280 bytes) failed (rc=%d)", count); - for (i = 0; count >= 4; ++i) - { - sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); - __le16_to_cpus((uint16_t *)(&sbuf[i])); - b += 5; - count -= 5; + xread(0, buf, 1280); + + // Convert the newline-separated hex data into an identify block. + + for (i = 0; i<256; i++) { + int j; + for (j = 0; j < 4; j++) + sbuf[i] = (sbuf[i] << 4) + fromhex(*(b++)); } - identify(sbuf, NULL); - return 0; + + // Parse the data. + + identify(sbuf); } #endif -static void missing_arg(int arg, char c, char* add) +/* busybox specific stuff */ +static void parse_opts(unsigned long *get, unsigned long *set, unsigned long *value, int min, int max) { - if (!arg) - bb_error_msg("-%c: missing value %s", c, (add!=NULL)? add :""); + if (get) { + *get = 1; + } + if (optarg) { + *set = 1; + *value = xatol_range(optarg, min, max); + } } -/* our main() routine: */ -int hdparm_main(int argc, char **argv) +static void parse_xfermode(int flag, unsigned long *get, unsigned long *set, int *value) { - char c, *p; - - ++argv; - if (!--argc) - bb_show_usage(); - - while (argc--) - { -#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY - if (!strcmp("-Istdin", *argv)) - { - return identify_from_stdin(); + if (flag) { + *get = 1; + if (optarg) { + *set = ((*value = translate_xfermode(optarg)) > -1); } + } +} + +/*------- getopt short options --------*/ +static const char hdparm_options[] = "gfu::n::p:r::m::c::k::a::B:tTh" + USE_FEATURE_HDPARM_GET_IDENTITY("iI") + USE_FEATURE_HDPARM_HDIO_GETSET_DMA("d::") +#ifdef HDIO_DRIVE_CMD + "S:D:P:X:K:A:L:W:CyYzZ" #endif - p = *argv++; - if (*p == '-') - { - if (!*++p) - bb_show_usage(); - while ((c = *p++)) - { - ++flagcount; - switch (c) - { - case 'V': - /*bb_error_msg_and_die("%s", VERSION);*/ - /* We have to return 0 here and not 1 */ - printf("%s %s\n",bb_applet_name, VERSION); - return EXIT_SUCCESS; - case 'v': - verbose = 1; - break; -#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY - case 'I': - get_IDentity = 1; - break; - case 'i': - get_identity = 1; - break; + USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:") +#ifdef HDIO_GET_QDMA +#ifdef HDIO_SET_QDMA + "Q:" +#else + "Q" #endif - case 'g': - get_geom = 1; - break; - case 'f': - do_flush = 1; - break; - case 'q': - quiet = 1; - noisy = 0; - break; - case 'u': - get_unmask = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_unmask = set_flag(p,'1'))==1) - unmask = *p++ - '0'; - break; -#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA - case 'd': - get_dma = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_dma = set_flag(p,'9'))==1) - dma = *p++ - '0'; - break; -#endif /* CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA */ - case 'n': - get_nowerr = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_nowerr = set_flag(p,'1'))==1) - nowerr = *p++ - '0'; - break; - case 'p': - noisy_piomode = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_STRING(p,&set_piomode,&piomode); - break; - case 'r': - get_readonly = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_readonly = set_flag(p,'1'))==1) - readonly = *p++ - '0'; - break; - case 'm': - get_mult = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_mult,&mult); - break; - case 'c': - get_io32bit = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_io32bit,&io32bit); - break; -#ifdef HDIO_DRIVE_CMD - case 'S': - get_standby = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_standby,&standby_requested); - missing_arg(set_standby, c, NULL); - break; - - case 'D': - get_defects = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_defects,&defects); - missing_arg(set_defects, c, NULL); - break; - case 'P': - get_prefetch = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_prefetch,&prefetch); - missing_arg(set_prefetch, c, NULL); - break; - - case 'X': - get_xfermode = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_STRING(p,&set_xfermode,&xfermode_requested); - missing_arg(set_xfermode, c, NULL); - break; - - case 'K': - get_dkeep = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_dkeep = set_flag(p,'1'))==1) - dkeep = *p++ - '0'; - else - goto missing_arg_error; - break; - - case 'A': - get_lookahead = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_lookahead = set_flag(p,'1'))==1) - lookahead = *p++ - '0'; - else - goto missing_arg_error; - break; - - case 'L': - get_doorlock = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_doorlock = set_flag(p,'1'))==1) - doorlock = *p++ - '0'; - else - goto missing_arg_error; - break; - - case 'W': - get_wcache = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_wcache = set_flag(p,'1'))==1) - wcache = *p++ - '0'; - else -missing_arg_error: - missing_arg(1, c, "(0/1)"); - break; - - case 'C': - get_powermode = noisy; - noisy = 1; - break; - - case 'y': - get_standbynow = noisy; - noisy = 1; - set_standbynow = 1; - break; - - case 'Y': - get_sleepnow = noisy; - noisy = 1; - set_sleepnow = 1; - break; - - case 'z': - reread_partn = 1; - break; - - case 'Z': - get_seagate = noisy; - noisy = 1; - set_seagate = 1; - break; -#endif /* HDIO_DRIVE_CMD */ - case 'k': - get_keep = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_keep = set_flag(p,'1'))==1) - keep = *p++ - '0'; - break; -#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF - case 'U': - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if(! p) - goto expected_hwif_error; /* "expected hwif_nr" */ - - sscanf(p++, "%i", &hwif); - - unregister_hwif = 1; - break; -#endif /* CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF */ -#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF - case 'R': - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if(! p) - goto expected_hwif_error; /* "expected hwif_data" */ - - sscanf(p++, "%i", &hwif_data); - - if (argc && isdigit(**argv)) - p = *argv++, --argc; - else - goto expected_hwif_error; /* "expected hwif_ctrl" */ - - sscanf(p, "%i", &hwif_ctrl); - - if (argc && isdigit(**argv)) - p = *argv++, --argc; - else -#endif /* CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF */ -#if defined CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF || defined CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF -expected_hwif_error: - bb_error_msg_and_die("expected hwif value"); /* "expected hwif_irq" */ -#endif /* CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF || CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF */ -#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF - - sscanf(p, "%i", &hwif_irq); - - *p = '\0'; +#endif + USE_FEATURE_HDPARM_HDIO_DRIVE_RESET("w") + USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF("x::b:") + USE_FEATURE_HDPARM_HDIO_SCAN_HWIF("R:"); +/*-------------------------------------*/ - scan_hwif = 1; - break; -#endif /* CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF */ - case 'Q': +/* our main() routine: */ +int hdparm_main(int argc, char **argv) ATTRIBUTE_NORETURN;; +int hdparm_main(int argc, char **argv) ATTRIBUTE_NORETURN; +int hdparm_main(int argc, char **argv); +int hdparm_main(int argc, char **argv) +{ + int c; + int flagcount = 0; + + while ((c = getopt(argc, argv, hdparm_options)) >= 0) { + flagcount++; + if (c == 'h') bb_show_usage(); /* EXIT */ + USE_FEATURE_HDPARM_GET_IDENTITY(get_IDentity |= (c == 'I')); + USE_FEATURE_HDPARM_GET_IDENTITY(get_identity |= (c == 'i')); + get_geom |= (c == 'g'); + do_flush |= (c == 'f'); + if (c == 'u') parse_opts(&get_unmask, &set_unmask, &unmask, 0, 1); + USE_FEATURE_HDPARM_HDIO_GETSET_DMA(if (c == 'd') parse_opts(&get_dma, &set_dma, &dma, 0, 9)); + if (c == 'n') parse_opts(&get_nowerr, &set_nowerr, &nowerr, 0, 1); + parse_xfermode((c == 'p'),&noisy_piomode, &set_piomode, &piomode); + if (c == 'r') parse_opts(&get_readonly, &set_readonly, &readonly, 0, 1); + if (c == 'm') parse_opts(&get_mult, &set_mult, &mult, 0, INT_MAX /*32*/); + if (c == 'c') parse_opts(&get_io32bit, &set_io32bit, &io32bit, 0, INT_MAX /*8*/); + if (c == 'k') parse_opts(&get_keep, &set_keep, &keep, 0, 1); + if (c == 'a') parse_opts(&get_readahead, &set_readahead, &Xreadahead, 0, INT_MAX); + if (c == 'B') parse_opts(&get_apmmode, &set_apmmode, &apmmode, 1, 255); + do_flush |= do_timings |= (c == 't'); + do_flush |= do_ctimings |= (c == 'T'); +#ifdef HDIO_DRIVE_CMD + if (c == 'S') parse_opts(&get_standby, &set_standby, &standby_requested, 0, INT_MAX); + if (c == 'D') parse_opts(&get_defects, &set_defects, &defects, 0, INT_MAX); + if (c == 'P') parse_opts(&get_prefetch, &set_prefetch, &prefetch, 0, INT_MAX); + parse_xfermode((c == 'X'), &get_xfermode, &set_xfermode, &xfermode_requested); + if (c == 'K') parse_opts(&get_dkeep, &set_dkeep, &prefetch, 0, 1); + if (c == 'A') parse_opts(&get_lookahead, &set_lookahead, &lookahead, 0, 1); + if (c == 'L') parse_opts(&get_doorlock, &set_doorlock, &doorlock, 0, 1); + if (c == 'W') parse_opts(&get_wcache, &set_wcache, &wcache, 0, 1); + get_powermode |= (c == 'C'); + get_standbynow = set_standbynow |= (c == 'y'); + get_sleepnow = set_sleepnow |= (c == 'Y'); + reread_partn |= (c == 'z'); + get_seagate = set_seagate |= (c == 'Z'); +#endif + USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(if (c == 'U') parse_opts(NULL, &unregister_hwif, &hwif, 0, INT_MAX)); #ifdef HDIO_GET_QDMA - get_dma_q = noisy; - noisy = 1; + if (c == 'Q') { #ifdef HDIO_SET_QDMA - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_dma_q,&dma_q); -#ifdef HDIO_GET_QDMA - dma_q = -dma_q; + parse_opts(&get_dma_q, &set_dma_q, &dma_q, 0, INT_MAX); +#else + parse_opts(&get_dma_q, NULL, NULL, 0, 0); #endif + } #endif + USE_FEATURE_HDPARM_HDIO_DRIVE_RESET(perform_reset = (c == 'r')); + USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'x') parse_opts(NULL, &perform_tristate, &tristate, 0, 1)); + USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'b') parse_opts(&get_busstate, &set_busstate, &busstate, 0, 2)); +#if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF + if (c == 'R') { + parse_opts(NULL, &scan_hwif, &hwif_data, 0, INT_MAX); + hwif_ctrl = xatoi_u((argv[optind]) ? argv[optind] : ""); + hwif_irq = xatoi_u((argv[optind+1]) ? argv[optind+1] : ""); + /* Move past the 2 additional arguments */ + argv += 2; + argc -= 2; + } #endif - break; + } + /* When no flags are given (flagcount = 0), -acdgkmnru is assumed. */ + if (!flagcount) { + get_mult = get_io32bit = get_unmask = get_keep = get_readonly = get_readahead = get_geom = 1; + USE_FEATURE_HDPARM_HDIO_GETSET_DMA(get_dma = 1); + } + argc -= optind; + argv += optind; -#ifdef CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET - case 'w': - perform_reset = 1; - break; -#endif /* CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET */ -#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF - case 'x': - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((perform_tristate = set_flag(p,'1'))==1) - tristate = *p++ - '0'; - else - missing_arg(1, c, "(0/1)"); - break; + if (argc < 1) { + if (ENABLE_FEATURE_HDPARM_GET_IDENTITY && !isatty(STDIN_FILENO)) + identify_from_stdin(); /* EXIT */ + else bb_show_usage(); + } -#endif /* CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF */ - case 'a': - get_readahead = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_readahead,&Xreadahead); - break; - case 'B': - get_apmmode = noisy; - noisy = 1; - if (!*p && argc && isalnum(**argv)) - p = *argv++, --argc; - p=GET_NUMBER(p,&set_apmmode,&apmmode); - missing_arg(set_apmmode, c, "(1-255)"); - break; - case 't': - do_timings = 1; - do_flush = 1; - break; - case 'T': - do_ctimings = 1; - do_flush = 1; - break; -#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF - case 'b': - get_busstate = noisy; - noisy = 1; - if (!*p && argc && isdigit(**argv)) - p = *argv++, --argc; - if((set_busstate = set_flag(p,'2'))==1) - busstate = *p++ - '0'; - break; -#endif - case 'h': - default: - bb_show_usage(); - } - } - if (!argc) - bb_show_usage(); - } else { - process_dev (p); - } + while (argc--) { + process_dev(*argv); + argv++; } - return 0 ; + exit(EXIT_SUCCESS); }