more: stop using bss
[oweals/busybox.git] / miscutils / hdparm.c
index 925644e1fc8943ff1cf3ae45de60e584bbd714fa..fe4c67a9a8ce74d3de26de0c42e42974fbb0bc2c 100644 (file)
  *          - by Mark Lord (C) 1994-2002 -- freely distributable
  */
 
-#include "busybox.h"
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/ioctl.h>
-#include <sys/sysmacros.h>
-#include <sys/times.h>
-#include <sys/mman.h>
-#include <linux/types.h>
+#include "libbb.h"
 #include <linux/hdreg.h>
 
-#if BB_BIG_ENDIAN && !defined(__USE_XOPEN)
-# define __USE_XOPEN
-#endif
-#include <unistd.h>
-
 /* device types */
 /* ------------ */
 #define NO_DEV                  0xffff
@@ -53,7 +39,7 @@
 #define LENGTH_FW_REV           4  /*  4 words (8 bytes or characters) */
 #define START_MODEL            27  /* ASCII model number */
 #define LENGTH_MODEL           20  /* 20 words (40 bytes or characters) */
-#define SECTOR_XFER_MAX                47  /* r/w multiple: max sectors xfered */
+#define SECTOR_XFER_MAX                47  /* r/w multiple: max sectors xfered */
 #define DWORD_IO               48  /* can do double-word IO (ATA-1 only) */
 #define CAPAB_0                        49  /* capabilities */
 #define CAPAB_1                        50
@@ -62,7 +48,7 @@
 #define WHATS_VALID            53  /* what fields are valid */
 #define LCYLS_CUR              54  /* current logical cylinders */
 #define LHEADS_CUR             55  /* current logical heads */
-#define LSECTS_CUR             56  /* current logical sectors/track */
+#define LSECTS_CUR             56  /* current logical sectors/track */
 #define CAPACITY_LSB           57  /* current capacity in sectors */
 #define CAPACITY_MSB           58
 #define SECTOR_XFER_CUR                59  /* r/w multiple: current sectors xfered */
 
 #define CDROM 0x0005
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static const char * const pkt_str[] = {
        "Direct-access device",                 /* word 0, bits 12-8 = 00 */
        "Sequential-access device",             /* word 0, bits 12-8 = 01 */
@@ -253,7 +239,7 @@ static const char * const ata1_cfg_str[] = {                        /* word 0 in ATA-1 mode */
 
 /* word 81: minor version number */
 #define MINOR_MAX              0x22
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static const char *minor_str[MINOR_MAX+2] = {                  /* word 81 value: */
        "Unspecified",                                  /* 0x0000       */
        "ATA-1 X3T9.2 781D prior to rev.4",     /* 0x0001       */
@@ -340,7 +326,7 @@ static const char actual_ver[MINOR_MAX+2] = {
 #define SUPPORT_48_BIT         0x0400
 #define NUM_CMD_FEAT_STR       48
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static const char * const cmd_feat_str[] = {
        "",                                     /* word 82 bit 15: obsolete  */
        "NOP cmd",                              /* word 82 bit 14 */
@@ -407,27 +393,27 @@ void identify_from_stdin(void);
  */
 
 /* words 89, 90, SECU ERASE TIME */
-#define ERASE_BITS             0x00ff
+#define ERASE_BITS      0x00ff
 
 /* word 92: master password revision */
 /* NOVAL_0 or  NOVAL_1 means no support for master password revision */
 
 /* word 93: hw reset result */
-#define CBLID                  0x2000  /* CBLID status */
-#define RST0                   0x0001  /* 1=reset to device #0 */
-#define DEV_DET                        0x0006  /* how device num determined */
-#define JUMPER_VAL             0x0002  /* device num determined by jumper */
-#define CSEL_VAL               0x0004  /* device num determined by CSEL_VAL */
+#define CBLID           0x2000  /* CBLID status */
+#define RST0            0x0001  /* 1=reset to device #0 */
+#define DEV_DET         0x0006  /* how device num determined */
+#define JUMPER_VAL      0x0002  /* device num determined by jumper */
+#define CSEL_VAL        0x0004  /* device num determined by CSEL_VAL */
 
 /* word 127: removable media status notification feature set support */
-#define RM_STAT_BITS           0x0003
-#define RM_STAT_SUP            0x0001
+#define RM_STAT_BITS    0x0003
+#define RM_STAT_SUP     0x0001
 
 /* word 128: security */
-#define SECU_ENABLED   0x0002
-#define SECU_LEVEL             0x0010
-#define NUM_SECU_STR   6
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#define SECU_ENABLED    0x0002
+#define SECU_LEVEL      0x0010
+#define NUM_SECU_STR    6
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static const char * const secu_str[] = {
        "supported",                    /* word 128, bit 0 */
        "enabled",                      /* word 128, bit 1 */
@@ -439,22 +425,21 @@ static const char * const secu_str[] = {
 #endif
 
 /* word 160: CFA power mode */
-#define VALID_W160             0x8000  /* 1=word valid */
-#define PWR_MODE_REQ           0x2000  /* 1=CFA power mode req'd by some cmds*/
-#define PWR_MODE_OFF           0x1000  /* 1=CFA power moded disabled */
-#define MAX_AMPS               0x0fff  /* value = max current in ma */
+#define VALID_W160              0x8000  /* 1=word valid */
+#define PWR_MODE_REQ            0x2000  /* 1=CFA power mode req'd by some cmds*/
+#define PWR_MODE_OFF            0x1000  /* 1=CFA power moded disabled */
+#define MAX_AMPS                0x0fff  /* value = max current in ma */
 
 /* word 255: integrity */
-#define SIG                    0x00ff  /* signature location */
-#define SIG_VAL                        0x00A5  /* signature value */
+#define SIG                     0x00ff  /* signature location */
+#define SIG_VAL                 0x00a5  /* signature value */
 
-#define TIMING_MB              64
-#define TIMING_BUF_MB          1
-#define TIMING_BUF_BYTES       (TIMING_BUF_MB * 1024 * 1024)
-#define TIMING_BUF_COUNT       (timing_MB / TIMING_BUF_MB)
-#define BUFCACHE_FACTOR                2
+#define TIMING_MB               64
+#define TIMING_BUF_MB           1
+#define TIMING_BUF_BYTES        (TIMING_BUF_MB * 1024 * 1024)
+#define BUFCACHE_FACTOR         2
 
-#undef DO_FLUSHCACHE           /* under construction: force cache flush on -W0 */
+#undef DO_FLUSHCACHE            /* under construction: force cache flush on -W0 */
 
 /* Busybox messages and functions */
 static int bb_ioctl(int fd, int request, void *argp, const char *string)
@@ -473,13 +458,14 @@ static int bb_ioctl_alt(int fd, int cmd, unsigned char *args, int alt, const cha
        return bb_ioctl(fd, cmd, args, string);
 }
 
-static void on_off(unsigned int value);
-
-static void print_flag_on_off(unsigned long get_arg, const char *s, unsigned long arg)
+static void on_off(int value)
 {
+       printf(value ? " (on)\n" : " (off)\n");
+}
 
-       if (get_arg)
-       {
+static void print_flag_on_off(int get_arg, const char *s, unsigned long arg)
+{
+       if (get_arg) {
                printf(" setting %s to %ld", s, arg);
                on_off(arg);
        }
@@ -490,63 +476,59 @@ static void bb_ioctl_on_off(int fd, int request, void *argp, const char *string,
 {
        if (ioctl(fd, request, &argp) != 0)
                bb_perror_msg(" %s", string);
-       else
-       {
+       else {
                printf(" %s\t= %2ld", str, (unsigned long) argp);
-               on_off((unsigned long) argp);
+               on_off(((unsigned long) argp) != 0);
        }
 }
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 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);
        }
 }
 #endif
-/* end of  busybox specific stuff */
+/* end of busybox specific stuff */
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t *have_mode)
 {
        uint16_t ii;
        uint8_t err_dma = 0;
 
-       for (ii = 0; ii <= MODE_MAX; ii++)
-       {
-               if (mode_sel & 0x0001)
-               {
-                       printf("*%cdma%u ",cc,ii);
+       for (ii = 0; ii <= MODE_MAX; ii++) {
+               if (mode_sel & 0x0001) {
+                       printf("*%cdma%u ", cc, ii);
                        if (*have_mode)
                                err_dma = 1;
                        *have_mode = 1;
-               }
-               else if (mode_sup & 0x0001)
-                       printf("%cdma%u ",cc,ii);
+               } else if (mode_sup & 0x0001)
+                       printf("%cdma%u ", cc, ii);
 
-               mode_sup >>=1;
-               mode_sel >>=1;
+               mode_sup >>= 1;
+               mode_sel >>= 1;
        }
        return err_dma;
 }
 
-static void print_ascii(uint16_t *p, uint8_t length) {
+static void print_ascii(uint16_t *p, uint8_t length)
+{
        uint8_t ii;
        char cl;
 
        /* find first non-space & print it */
-       for (ii = 0; ii< length; ii++)
-       {
-               if (((char) 0x00ff&((*p)>>8)) != ' ')
+       for (ii = 0; ii < length; ii++) {
+               if ((char)((*p)>>8) != ' ')
                        break;
-               if ((cl = (char) 0x00ff&(*p)) != ' ')
-               {
-                       if (cl != '\0') printf("%c",cl);
+               cl = (char)(*p);
+               if (cl != ' ') {
+                       if (cl != '\0')
+                               printf("%c", cl);
                        p++;
                        ii++;
                        break;
@@ -554,14 +536,13 @@ static void print_ascii(uint16_t *p, uint8_t length) {
                p++;
        }
        /* print the rest */
-       for (; ii< length; ii++)
-       {
+       for (; ii< length; ii++) {
                if (!(*p))
                        break; /* some older devices have NULLs */
-               printf("%c%c",(char)0x00ff&((*p)>>8),(char)(*p)&0x00ff);
+               printf("%c%c", (char)((*p)>>8), (char)(*p));
                p++;
        }
-       printf("\n");
+       puts("");
 }
 
 // Parse 512 byte disk identification block and print much crap.
@@ -583,33 +564,28 @@ static void identify(uint16_t *id_supplied)
        if (BB_BIG_ENDIAN) {
                swab(id_supplied, buf, sizeof(buf));
                val = buf;
-       } else val = id_supplied;
+       } else
+               val = id_supplied;
 
        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;
                printf("ATAPI %s, with ", pkt_str[eqpt]);
                like_std = 3;
-       }
-       else
+       } 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");
+               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
@@ -619,13 +595,13 @@ static void identify(uint16_t *id_supplied)
         * 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) ||
-          (val[CONFIG]==PWRD_NID_VAL) || (val[CONFIG]==PWRD_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((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL))
+               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))
+               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");
        }
 
@@ -639,110 +615,96 @@ static void identify(uint16_t *id_supplied)
        /* 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 (val[MINOR] && (val[MINOR] <= MINOR_MAX))
-               {
-                       if(like_std < 3) like_std = 3;
+       if (eqpt != CDROM) {
+               if (val[MINOR] && (val[MINOR] <= MINOR_MAX)) {
+                       if (like_std < 3) like_std = 3;
                        std = actual_ver[val[MINOR]];
-                       if(std) printf("\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--)
-                       {
-                               if (jj & 0x8000)
-                               {
+                       for (ii = 14; (ii >0)&&(ii>kk); ii--) {
+                               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;
                                        }
-                                       if(min_std > ii) min_std = ii;
+                                       if (min_std > ii) min_std = ii;
                                }
                                jj <<= 1;
                        }
-                       if(like_std < 3) 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.
                 */
-               if(like_std < std) like_std = std;
+               if (like_std < std) like_std = std;
 
                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) &&
-                       (       val[CMDS_SUPP_2] & CMDS_W84) ) ) )
-               {
+                       (       val[CMDS_SUPP_2] & CMDS_W84) ) )
+               {
                        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) &&
                        ((      val[CMDS_SUPP_1] & CMDS_W83) > 0x001f)) ) )
                {
                        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))) ||
                                ((      val[CAPAB_1] & VALID) == VALID_VAL) ||
                                ((      val[WHATS_VALID] & OK_W88) && val[ULTRA_DMA]) ||
-                               ((      val[RM_STAT] & RM_STAT_BITS) == RM_STAT_SUP) ) )
-               {
+                               ((      val[RM_STAT] & RM_STAT_BITS) == RM_STAT_SUP) )
+               {
                        like_std = 4;
-               }
-               else if (((std == 2) || (!std && (like_std < 3))) &&
-                          ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) )
-               {
+               } 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)
-                       printf("\n\tLikely used: %u\n",like_std);
+                       printf("\n\tLikely used: %u\n", like_std);
                else if (like_std > std)
-                       printf("& some of %u\n",like_std);
+                       printf("& some of %u\n", like_std);
                else
-                       printf("\n");
-       }
-       else
-       {
+                       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++)
-                       {
-                               if(jj & 0x0001) printf("-%u ", ii);
+                       for (ii = 1; ii < 15; ii++) {
+                               if (jj & 0x0001) printf("-%u ", ii);
                                jj >>= 1;
                        }
                }
-               printf("%s\n", (!kk) ? "\n\tLikely used CD-ROM ATAPI-1" : "" );
+               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;
        }
@@ -752,24 +714,22 @@ static void identify(uint16_t *id_supplied)
 
        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++)
-               {
-                       if(jj & 0x0001) printf("\t%s\n",ata1_cfg_str[ii]);
+               for (ii = 1; ii < 15; ii++) {
+                       if (jj & 0x0001)
+                               printf("\t%s\n", ata1_cfg_str[ii]);
                        jj >>=1;
                }
        }
-       if (dev == ATAPI_DEV)
-       {
+       if (dev == ATAPI_DEV) {
                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 
+               else
                        strng = "Unknown";
                printf("\tDRQ response: %s\n\tPacket size: ", strng); /* Data Request (DRQ) */
 
@@ -780,131 +740,114 @@ static void identify(uint16_t *id_supplied)
                else
                        strng = "Unknown";
                puts(strng);
-       }
-       else
-       {
+       } else {
                /* addressing...CHS? See section 6.2 of ATA specs 4 or 5 */
                ll = (uint32_t)val[LBA_SECTS_MSB] << 16 | val[LBA_SECTS_LSB];
                mm = 0; bbbig = 0;
-               if ( (ll > 0x00FBFC10) && (!val[LCYLS]))
+               if ((ll > 0x00FBFC10) && (!val[LCYLS]))
                        printf("\tCHS addressing not supported\n");
-               else
-               {
+               else {
                        jj = val[WHATS_VALID] & OK_W54_58;
                        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 ((min_std == 1) && (val[TRACK_BYTES] || val[SECT_BYTES]))
-                               printf("\tbytes/track: %u\tbytes/sector: %u\n",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)
-                               {
-                                        /* check Endian of capacity bytes */
+                               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))
                                                mm = oo;
                                }
-                               printf("\tCHS current addressable sectors:%11u\n",mm);
+                               printf("\tCHS current addressable sectors:%11u\n", mm);
                        }
                }
                /* LBA addressing */
-               printf("\tLBA    user addressable sectors:%11u\n",ll);
-               if ( ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) &&
-                    (val[CMDS_SUPP_1] & SUPPORT_48_BIT) )
-               {
-                       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:%11"PRIu64"\n",bbbig);
+               printf("\tLBA    user addressable sectors:%11u\n", ll);
+               if (((val[CMDS_SUPP_1] & VALID) == VALID_VAL)
+                && (val[CMDS_SUPP_1] & SUPPORT_48_BIT)
+               {
+                       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:%11"PRIu64"\n", bbbig);
                }
 
                if (!bbbig)
                        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: %11"PRIu64" MBytes ",bbbig);
+               printf("\tdevice size with M = 1024*1024: %11"PRIu64" MBytes\n", bbbig>>11);
+               bbbig = (bbbig << 9) / 1000000;
+               printf("\tdevice size with M = 1000*1000: %11"PRIu64" MBytes ", bbbig);
 
                if (bbbig > 1000)
                        printf("(%"PRIu64" GB)\n", bbbig/1000);
-               else 
-                       printf("\n");
+               else
+                       puts("");
        }
 
        /* hw support of commands (capabilities) */
        printf("Capabilities:\n\t");
 
-       if (dev == ATAPI_DEV)
-       {
+       if (dev == ATAPI_DEV) {
                if (eqpt != CDROM && (val[CAPAB_0] & CMD_Q_SUP)) printf("Cmd queuing, ");
                if (val[CAPAB_0] & OVLP_SUP) printf("Cmd overlap, ");
        }
        if (val[CAPAB_0] & LBA_SUP) printf("LBA, ");
 
-       if (like_std != 1)
-       {
-               printf("IORDY%s(can%s be disabled)\n", 
-                               !(val[CAPAB_0] & IORDY_SUP) ? "(may be)" : "", 
+       if (like_std != 1) {
+               printf("IORDY%s(can%s be disabled)\n",
+                               !(val[CAPAB_0] & IORDY_SUP) ? "(may be)" : "",
                                (val[CAPAB_0] & IORDY_OFF) ? "" :"not");
-       }
-       else
+       } else
                printf("no IORDY\n");
 
-       if ((like_std == 1) && val[BUF_TYPE])
-       {
+       if ((like_std == 1) && val[BUF_TYPE]) {
                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) ? "single port, single-sector" : "dual port, multi-sector",
                                (val[BUF_TYPE] > 2) ? " with read caching ability" : "");
        }
 
-       if ((min_std == 1) && (val[BUFFER__SIZE] && (val[BUFFER__SIZE] != NOVAL_1)))
-       {
-               printf("\tBuffer size: %.1fkB\n",(float)val[BUFFER__SIZE]/2);
+       if ((min_std == 1) && (val[BUFFER__SIZE] && (val[BUFFER__SIZE] != NOVAL_1))) {
+               printf("\tBuffer size: %.1fkB\n", (float)val[BUFFER__SIZE]/2);
        }
-       if ((min_std < 4) && (val[RW_LONG]))
-       {
-               printf("\tbytes avail on r/w long: %u\n",val[RW_LONG]);
+       if ((min_std < 4) && (val[RW_LONG])) {
+               printf("\tbytes avail on r/w long: %u\n", val[RW_LONG]);
        }
-       if ((eqpt != CDROM) && (like_std > 3))
-       {
-               printf("\tQueue depth: %u\n",(val[QUEUE_DEPTH] & DEPTH_BITS)+1);
+       if ((eqpt != CDROM) && (like_std > 3)) {
+               printf("\tQueue depth: %u\n", (val[QUEUE_DEPTH] & DEPTH_BITS) + 1);
        }
 
-       if (dev == ATA_DEV)
-       {
+       if (dev == ATA_DEV) {
                if (like_std == 1)
-                       printf("\tCan%s perform double-word IO\n",(!val[DWORD_IO]) ?"not":"");
-               else
-               {
+                       printf("\tCan%s perform double-word IO\n", (!val[DWORD_IO]) ? "not" : "");
+               else {
                        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");
+                               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))
                        printf("not supported\n");
-               else
-               {
-                       printf("Max = %u\tCurrent = ",val[SECTOR_XFER_MAX] & SECTOR_XFER);
+               else {
+                       printf("Max = %u\tCurrent = ", val[SECTOR_XFER_MAX] & 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
                           nothing here. */
                        printf("\tAdvancedPM level: ");
-                       if ( (val[ADV_PWR] & 0xFF00) == 0x4000 )
-                       {
+                       if ((val[ADV_PWR] & 0xFF00) == 0x4000) {
                                uint8_t apm_level = val[ADV_PWR] & 0x00FF;
                                printf("%u (0x%x)\n", apm_level, apm_level);
                        }
@@ -913,21 +856,18 @@ static void identify(uint16_t *id_supplied)
                }
                if (like_std > 5 && val[ACOUSTIC]) {
                        printf("\tRecommended acoustic management value: %u, current value: %u\n",
-                                                                       (val[ACOUSTIC] >> 8) & 0x00ff, val[ACOUSTIC] & 0x00ff);
+                                       (val[ACOUSTIC] >> 8) & 0x00ff, val[ACOUSTIC] & 0x00ff);
                }
-       }
-       else
-       {
+       } else {
                 /* ATAPI */
                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 (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]);
-                       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("");
                }
        }
 
@@ -935,41 +875,37 @@ static void identify(uint16_t *id_supplied)
        printf("\tDMA: ");
        if (!(val[CAPAB_0] & DMA_SUP))
                printf("not supported\n");
-       else
-       {
+       else {
                if (val[DMA_MODE] && !val[SINGLE_DMA] && !val[MULTI_DMA])
-                       printf(" sdma%u\n",(val[DMA_MODE] & MODE) >> 8);
-               if (val[SINGLE_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);
+                       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);
+                       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);
+                       err_dma += mode_loop(jj, kk, 'u', &have_mode);
                }
                if (err_dma || !have_mode) printf("(?)");
-               printf("\n");
+               puts("");
 
                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) &&
-                  (val[DMA_TIME_MIN] || val[DMA_TIME_NORM]))
-               {
+               if ((val[WHATS_VALID] & OK_W64_70)
+                && (val[DMA_TIME_MIN] || val[DMA_TIME_NORM])
+               {
                        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]);
-                       printf("\n");
+                       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("");
                }
        }
 
@@ -977,124 +913,105 @@ static void identify(uint16_t *id_supplied)
        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++)
-               {
-                       if (jj & 0x0001) printf("pio%d ",ii);
+               for (ii = 0; ii <= PIO_MODE_MAX; ii++) {
+                       if (jj & 0x0001) printf("pio%d ", ii);
                        jj >>=1;
                }
-               printf("\n");
-       }
-       else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) )
-       {
+               puts("");
+       } else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE)) {
                for (ii = 0; ii <= val[PIO_MODE]>>8; ii++)
-                       printf("pio%d ",ii);
-               printf("\n");
-       }
-       else
+                       printf("pio%d ", ii);
+               puts("");
+       } else
                printf("unknown\n");
 
-       if (val[WHATS_VALID] & OK_W64_70)
-       {
-               if (val[PIO_NO_FLOW] || val[PIO_FLOW])
-               {
+       if (val[WHATS_VALID] & OK_W64_70) {
+               if (val[PIO_NO_FLOW] || val[PIO_FLOW]) {
                        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]);
-                       printf("\n");
+                       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++)
-               {
-                       if ((jj & 0x8000) && (*cmd_feat_str[ii] != '\0'))
-                       {
+               for (ii = 0; ii < NUM_CMD_FEAT_STR; ii++) {
+                       if ((jj & 0x8000) && (*cmd_feat_str[ii] != '\0')) {
                                printf("\t%s\t%s\n", (kk & 0x8000) ? "   *" : "", cmd_feat_str[ii]);
                        }
-                       jj <<=1; kk<<=1;
-                       if (ii%16 == 15)
-                       {
+                       jj <<= 1;
+                       kk <<= 1;
+                       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)
                                        ii +=16;
                        }
                }
        }
        /* Removable Media Status Notification feature set */
-       if((val[RM_STAT] & RM_STAT_BITS) == RM_STAT_SUP)
+       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) &&
-          (val[SECU_STATUS] || val[ERASE_TIME] || val[ENH_ERASE_TIME]))
-       {
+       if ((eqpt != CDROM) && (like_std > 3)
+        && (val[SECU_STATUS] || val[ERASE_TIME] || val[ENH_ERASE_TIME])
+       {
                printf("Security:\n");
                if (val[PSWD_CODE] && (val[PSWD_CODE] != NOVAL_1))
-                       printf("\tMaster password revision code = %u\n",val[PSWD_CODE]);
+                       printf("\tMaster password revision code = %u\n", val[PSWD_CODE]);
                jj = val[SECU_STATUS];
-               if (jj)
-               {
-                       for (ii = 0; ii < NUM_SECU_STR; ii++)
-                       {
+               if (jj) {
+                       for (ii = 0; ii < NUM_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 %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 (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 ");
-                       printf("\n");
+                       puts("");
                }
        }
 
        /* reset result */
        jj = val[HWRST_RSLT];
-       if ((jj & VALID) == VALID_VAL)
-       {
+       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 
+               else
                        strng = "";
-               printf("HW reset results:\n\tCBLID- %s Vih\n\tDevice num = %i%s\n", 
+               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 (val[CFA_PWR_MODE] & VALID_W160)
-               {
+       if ((like_std > 4) && (eqpt != CDROM)) {
+               if (val[CFA_PWR_MODE] & VALID_W160) {
                        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" : "");
+                                       (val[CFA_PWR_MODE] & PWR_MODE_REQ) ? " and required by some commands" : "");
 
-                       if (val[CFA_PWR_MODE] & MAX_AMPS) printf("\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: %scorrect\n", chksum ? "in" : "");
                }
        }
@@ -1103,62 +1020,71 @@ static void identify(uint16_t *id_supplied)
 }
 #endif
 
-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;
-static unsigned long set_mult, get_mult, mult;
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
-static unsigned long set_dma, get_dma, dma;
-#endif
-static unsigned long set_dma_q, get_dma_q, dma_q;
-static unsigned long set_nowerr, get_nowerr, nowerr;
-static unsigned long set_keep, get_keep, keep;
-static unsigned long set_io32bit, get_io32bit, io32bit;
-static unsigned long set_piomode, noisy_piomode;
+static smallint get_identity, get_geom;
+static smallint do_flush;
+static smallint do_ctimings, do_timings;
+static smallint reread_partn;
+
+static smallint set_piomode, noisy_piomode;
+static smallint set_readahead, get_readahead;
+static smallint set_readonly, get_readonly;
+static smallint set_unmask, get_unmask;
+static smallint set_mult, get_mult;
+static smallint set_dma_q, get_dma_q;
+static smallint set_nowerr, get_nowerr;
+static smallint set_keep, get_keep;
+static smallint set_io32bit, get_io32bit;
 static int piomode;
+static unsigned long Xreadahead;
+static unsigned long readonly;
+static unsigned long unmask;
+static unsigned long mult;
+static unsigned long dma_q;
+static unsigned long nowerr;
+static unsigned long keep;
+static unsigned long io32bit;
+#if ENABLE_FEATURE_HDPARM_HDIO_GETSET_DMA
+static unsigned long dma;
+static smallint set_dma, get_dma;
+#endif
 #ifdef HDIO_DRIVE_CMD
-static unsigned long set_dkeep, get_dkeep, dkeep;
-static unsigned long set_standby, get_standby, standby_requested;
-static unsigned long set_xfermode, get_xfermode;
+static smallint set_xfermode, get_xfermode;
+static smallint set_dkeep, get_dkeep;
+static smallint set_standby, get_standby;
+static smallint set_lookahead, get_lookahead;
+static smallint set_prefetch, get_prefetch;
+static smallint set_defects, get_defects;
+static smallint set_wcache, get_wcache;
+static smallint set_doorlock, get_doorlock;
+static smallint set_seagate, get_seagate;
+static smallint set_standbynow, get_standbynow;
+static smallint set_sleepnow, get_sleepnow;
+static smallint get_powermode;
+static smallint set_apmmode, get_apmmode;
 static int xfermode_requested;
-static unsigned long set_lookahead, get_lookahead, lookahead;
-static unsigned long set_prefetch, get_prefetch, prefetch;
-static unsigned long set_defects, get_defects, defects;
-static unsigned long set_wcache, get_wcache, wcache;
-static unsigned long set_doorlock, get_doorlock, doorlock;
-static unsigned long set_seagate, get_seagate;
-static unsigned long set_standbynow, get_standbynow;
-static unsigned long set_sleepnow, get_sleepnow;
-static unsigned long get_powermode;
-static unsigned long set_apmmode, get_apmmode, apmmode;
-#endif
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
-static int get_IDentity;
+static unsigned long dkeep;
+static unsigned long standby_requested;
+static unsigned long lookahead;
+static unsigned long prefetch;
+static unsigned long defects;
+static unsigned long wcache;
+static unsigned long doorlock;
+static unsigned long apmmode;
 #endif
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
-static unsigned long   unregister_hwif;
-static unsigned long   hwif;
-#endif
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
-static unsigned long scan_hwif;
+USE_FEATURE_HDPARM_GET_IDENTITY(        static smallint get_IDentity;)
+USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(  static smallint set_busstate, get_busstate;)
+USE_FEATURE_HDPARM_HDIO_DRIVE_RESET(    static smallint perform_reset;)
+USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(  static smallint perform_tristate;)
+USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(static smallint unregister_hwif;)
+USE_FEATURE_HDPARM_HDIO_SCAN_HWIF(      static smallint scan_hwif;)
+USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(  static unsigned long busstate;)
+USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(  static unsigned long tristate;)
+USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(static unsigned long hwif;)
+#if ENABLE_FEATURE_HDPARM_HDIO_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 unsigned long   set_busstate, get_busstate, busstate;
-#endif
-static int     reread_partn;
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
-static int     perform_reset;
-#endif /* CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET */
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-static unsigned long   perform_tristate,       tristate;
-#endif /* CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF */
 
 // Historically, if there was no HDIO_OBSOLETE_IDENTITY, then
 // then the HDIO_GET_IDENTITY only returned 142 bytes.
@@ -1171,7 +1097,7 @@ static unsigned long      perform_tristate,       tristate;
 // On a really old system, it will not, and we will be confused.
 // Too bad, really.
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 static const char * const cfg_str[] =
 {      "",          "HardSect",   "SoftSect",   "NotMFM",
        "HdSw>15uSec", "SpinMotCtl", "Fixed",     "Removeable",
@@ -1184,70 +1110,65 @@ static const char * const BuffType[] = {"Unknown", "1Sect", "DualPort", "DualPor
 static void dump_identity(const struct hd_driveid *id)
 {
        int i;
-       const unsigned short int *id_regs= (const void*) id;
+       const unsigned short int *id_regs = (const void*) id;
 
        printf("\n Model=%.40s, FwRev=%.8s, SerialNo=%.20s\n Config={",
                                id->model, id->fw_rev, id->serial_no);
-       for (i=0; i<=15; i++) {
+       for (i = 0; i <= 15; i++) {
                if (id->config & (1<<i))
                        printf(" %s", cfg_str[i]);
        }
-       printf( " }\n RawCHS=%u/%u/%u, TrkSize=%u, SectSize=%u, ECCbytes=%u\n"
+       printf(" }\n RawCHS=%u/%u/%u, TrkSize=%u, SectSize=%u, ECCbytes=%u\n"
                        " BuffType=(%u) %s, BuffSize=%ukB, MaxMultSect=%u",
                                id->cyls, id->heads, id->sectors, id->track_bytes,
                                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)
-       {
+       if (id->max_multsect) {
                printf(", MultSect=");
-               if (!(id->multsect_valid&1))
+               if (!(id->multsect_valid & 1))
                        printf("?%u?", id->multsect);
                else if (id->multsect)
                        printf("%u", id->multsect);
                else
                        printf("off");
        }
-       printf("\n");
+       puts("");
 
-       if(!(id->field_valid&1))
+       if (!(id->field_valid & 1))
                printf(" (maybe):");
 
-       printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads,
-                                                                                                       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");
+       printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s", id->cur_cyls, id->cur_heads,
+               id->cur_sectors,
+               (BB_BIG_ENDIAN) ?
+                       (unsigned long)(id->cur_capacity0 << 16) | id->cur_capacity1 :
+                       (unsigned long)(id->cur_capacity1 << 16) | id->cur_capacity0,
+                       ((id->capability&2) == 0) ? "no" : "yes");
 
-       if (id->capability&2)
+       if (id->capability & 2)
                printf(", LBAsects=%u", id->lba_capacity);
 
-       printf("\n IORDY=%s", (id->capability&8) ? (id->capability&4) ?  "on/off" : "yes" : "no");
+       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)
+       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))
+
+       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)
-       {
+       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->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 (id->capability & 1) {
+               if (id->dma_1word | id->dma_mword) {
                        printf("\n DMA modes:  ");
                        if (id->dma_1word & 0x100) printf("*");
                        if (id->dma_1word & 1) printf("sdma0 ");
@@ -1267,8 +1188,7 @@ static void dump_identity(const struct hd_driveid *id)
                        if (id->dma_mword & 0xf8) printf("mdma? ");
                }
        }
-       if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&4)
-       {       
+       if (((id->capability & 8) || (id->field_valid & 2)) && id->field_valid & 4) {
                printf("\n UDMA modes: ");
                if (id->dma_ultra & 0x100) printf("*");
                if (id->dma_ultra & 0x001) printf("udma0 ");
@@ -1277,11 +1197,9 @@ static void dump_identity(const struct hd_driveid *id)
                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 (id->dma_ultra & 0x0800) printf("*");
                        if (id->dma_ultra & 0x0008) printf("udma3 ");
@@ -1295,25 +1213,25 @@ static void dump_identity(const struct hd_driveid *id)
                        if (id->dma_ultra & 0x0080) printf("udma7 ");
                }
        }
-       printf("\n AdvancedPM=%s",((id_regs[83]&8)==0)?"no":"yes");
-       if (id_regs[83] & 8)
-       {
-               if (!(id_regs[86]&8))
+       printf("\n AdvancedPM=%s", (!(id_regs[83] & 8)) ? "no" : "yes");
+       if (id_regs[83] & 8) {
+               if (!(id_regs[86] & 8))
                        printf(": disabled (255)");
-               else if ((id_regs[91]&0xFF00)!=0x4000)
+               else if ((id_regs[91] & 0xFF00) != 0x4000)
                        printf(": unknown setting");
                else
-                       printf(": mode=0x%02X (%u)",id_regs[91]&0xFF,id_regs[91]&0xFF);
+                       printf(": mode=0x%02X (%u)", id_regs[91] & 0xFF, id_regs[91] & 0xFF);
        }
-       if (id_regs[82]&0x20)
-               printf(" 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))
-       {
+       if ((id->minor_rev_num && id->minor_rev_num <= 31)
+        || (id->major_rev_num && id->minor_rev_num <= 31)
+       ) {
                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++) {
+                       for (i = 0; i <= 15; i++) {
                                if (id->major_rev_num & (1<<i))
                                                printf(" ATA/ATAPI-%u", i);
                        }
@@ -1327,7 +1245,7 @@ static void dump_identity(const struct hd_driveid *id)
 static void flush_buffer_cache(int fd)
 {
        fsync(fd);                              /* flush buffers */
-       bb_ioctl(fd, BLKFLSBUF, NULL,"BLKFLSBUF" ) ;/* do it again, big time */
+       bb_ioctl(fd, BLKFLSBUF, NULL, "BLKFLSBUF"); /* do it again, big time */
 #ifdef HDIO_DRIVE_CMD
        sleep(1);
        if (ioctl(fd, HDIO_DRIVE_CMD, NULL) && errno != EINVAL) /* await completion */
@@ -1346,7 +1264,8 @@ static int read_big_block(int fd, char *buf)
 {
        int i;
 
-       if ((i = read(fd, buf, TIMING_BUF_BYTES)) != TIMING_BUF_BYTES) {
+       i = read(fd, buf, TIMING_BUF_BYTES);
+       if (i != TIMING_BUF_BYTES) {
                bb_error_msg("read(%d bytes) failed (rc=%d)", TIMING_BUF_BYTES, i);
                return 1;
        }
@@ -1356,18 +1275,10 @@ static int read_big_block(int fd, char *buf)
        return 0;
 }
 
-static void print_timing(int t, double e)
-{
-       if (t >= 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)
+static int do_blkgetsize(int fd, unsigned long long *blksize64)
 {
-       int             rc;
-       unsigned int    blksize32 = 0;
+       int rc;
+       unsigned blksize32 = 0;
 
        if (0 == ioctl(fd, BLKGETSIZE64, blksize64)) {  // returns bytes
                *blksize64 /= 512;
@@ -1380,15 +1291,22 @@ static int do_blkgetsize (int fd, unsigned long long *blksize64)
        return rc;
 }
 
+static void print_timing(unsigned t, double e)
+{
+       if (t >= e)  /* more than 1MB/s */
+               printf("%4d MB in %.2f seconds = %.2f %cB/sec\n", t, e, t / e, 'M');
+       else
+               printf("%4d MB in %.2f seconds = %.2f %cB/sec\n", t, e, t / e * 1024, 'k');
+}
+
 static void do_time(int flag, int fd)
-/*
-       flag = 0 time_cache
-       flag = 1 time_device
-*/
+/* flag = 0 time_cache, 1 time_device */
 {
-       struct itimerval e1, e2;
-       double elapsed, elapsed2;
-       unsigned int max_iterations = 1024, total_MB, iterations;
+       static const struct itimerval thousand = {{1000, 0}, {1000, 0}};
+
+       struct itimerval itv;
+       unsigned elapsed, elapsed2;
+       unsigned max_iterations, total_MB, iterations;
        unsigned long long blksize;
        RESERVE_CONFIG_BUFFER(buf, TIMING_BUF_BYTES);
 
@@ -1397,87 +1315,65 @@ static void do_time(int flag, int fd)
                goto quit2;
        }
 
+       max_iterations = 1024;
        if (0 == do_blkgetsize(fd, &blksize)) {
                max_iterations = blksize / (2 * 1024) / TIMING_BUF_MB;
        }
 
        /* Clear out the device request queues & give them time to complete */
        sync();
-       sleep(3);
-
-       setitimer(ITIMER_REAL, &(struct itimerval){{1000,0},{1000,0}}, NULL);
-
-       if (flag  == 0) /* Time cache */
-       {
-               if (seek_to_zero (fd)) return;
-               if (read_big_block (fd, buf)) return;
-               printf(" Timing cached reads:   ");
-               fflush(stdout);
-       
-               /* Now do the timing */
-               iterations = 0;
-               getitimer(ITIMER_REAL, &e1);
-               do {
-                       ++iterations;
-                       if (seek_to_zero (fd) || read_big_block (fd, buf))
-                               goto quit;
-                       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;
-
+       sleep(2);
+       if (flag == 0) { /* Time cache */
+               if (seek_to_zero(fd))
+                       goto quit;
+               if (read_big_block(fd, buf))
+                       goto quit;
+               printf(" Timing buffer-cache reads:  ");
+       } else { /* Time device */
+               printf(" Timing buffered disk reads: ");
+       }
+       fflush(stdout);
+       iterations = 0;
+       /*
+        * getitimer() is used rather than gettimeofday() because
+        * it is much more consistent (on my machine, at least).
+        */
+       setitimer(ITIMER_REAL, &thousand, NULL);
+       /* Now do the timing */
+       do {
+               ++iterations;
+               if ((flag == 0) && seek_to_zero(fd))
+                       goto quit;
+               if (read_big_block(fd, buf))
+                       goto quit;
+               getitimer(ITIMER_REAL, &itv);
+               elapsed = (1000 - itv.it_value.tv_sec) * 1000000
+                               - itv.it_value.tv_usec;
+       } while (elapsed < 3000000 && iterations < max_iterations);
+       total_MB = iterations * TIMING_BUF_MB;
+       if (flag == 0) {
                /* Now remove the lseek() and getitimer() overheads from the elapsed time */
-               getitimer(ITIMER_REAL, &e1);
+               setitimer(ITIMER_REAL, &thousand, NULL);
                do {
-                       if (seek_to_zero (fd))
+                       if (seek_to_zero(fd))
                                goto quit;
-                       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);
+                       getitimer(ITIMER_REAL, &itv);
+                       elapsed2 = (1000 - itv.it_value.tv_sec) * 1000000
+                                       - itv.it_value.tv_usec;
                } while (--iterations);
-       
                elapsed -= elapsed2;
-               print_timing(BUFCACHE_FACTOR * total_MB, elapsed);      
+               total_MB *= BUFCACHE_FACTOR;
                flush_buffer_cache(fd);
-               sleep(1);
-       }
-       else /* Time device */
-       {
-               printf(" Timing buffered disk reads:  ");
-               fflush(stdout);
-               /*
-               * getitimer() is used rather than gettimeofday() because
-               * it is much more consistent (on my machine, at least).
-               */
-               /* Now do the timings for real */
-               iterations = 0;
-               getitimer(ITIMER_REAL, &e1);
-               do {
-                       ++iterations;
-                       if (read_big_block (fd, buf))
-                               goto quit;
-                       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);
-       
-               total_MB = iterations * TIMING_BUF_MB;
-               print_timing(total_MB, elapsed);
-       }
-quit:
+       }
+       print_timing(total_MB, elapsed / 1000000.0);
+ quit:
        munlock(buf, TIMING_BUF_BYTES);
-quit2:
+ quit2:
        RELEASE_CONFIG_BUFFER(buf);
 }
 
-static void on_off (unsigned int value)
-{
-       printf(value ? " (on)\n" : " (off)\n");
-}
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-static void bus_state_value(unsigned int value)
+#if ENABLE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+static void bus_state_value(unsigned value)
 {
        if (value == BUSSTATE_ON)
                on_off(1);
@@ -1491,11 +1387,11 @@ static void bus_state_value(unsigned int value)
 #endif
 
 #ifdef HDIO_DRIVE_CMD
-static void interpret_standby(unsigned int standby)
+static void interpret_standby(unsigned standby)
 {
-       unsigned int t;
-
+       unsigned t;
 
+       printf(" (");
        if (standby == 0)
                printf("off");
        else if (standby == 252)
@@ -1506,58 +1402,56 @@ static void interpret_standby(unsigned int standby)
                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");
-       }
+       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");
 }
 
 struct xfermode_entry {
-    int val;
-    const char *name;
+       int val;
+       const char *name;
 };
 
 static const struct xfermode_entry xfermode_table[] = {
-    { 8,    "pio0" },
-    { 9,    "pio1" },
-    { 10,   "pio2" },
-    { 11,   "pio3" },
-    { 12,   "pio4" },
-    { 13,   "pio5" },
-    { 14,   "pio6" },
-    { 15,   "pio7" },
-    { 16,   "sdma0" },
-    { 17,   "sdma1" },
-    { 18,   "sdma2" },
-    { 19,   "sdma3" },
-    { 20,   "sdma4" },
-    { 21,   "sdma5" },
-    { 22,   "sdma6" },
-    { 23,   "sdma7" },
-    { 32,   "mdma0" },
-    { 33,   "mdma1" },
-    { 34,   "mdma2" },
-    { 35,   "mdma3" },
-    { 36,   "mdma4" },
-    { 37,   "mdma5" },
-    { 38,   "mdma6" },
-    { 39,   "mdma7" },
-    { 64,   "udma0" },
-    { 65,   "udma1" },
-    { 66,   "udma2" },
-    { 67,   "udma3" },
-    { 68,   "udma4" },
-    { 69,   "udma5" },
-    { 70,   "udma6" },
-    { 71,   "udma7" },
-    { 0, NULL }
+       { 8,    "pio0" },
+       { 9,    "pio1" },
+       { 10,   "pio2" },
+       { 11,   "pio3" },
+       { 12,   "pio4" },
+       { 13,   "pio5" },
+       { 14,   "pio6" },
+       { 15,   "pio7" },
+       { 16,   "sdma0" },
+       { 17,   "sdma1" },
+       { 18,   "sdma2" },
+       { 19,   "sdma3" },
+       { 20,   "sdma4" },
+       { 21,   "sdma5" },
+       { 22,   "sdma6" },
+       { 23,   "sdma7" },
+       { 32,   "mdma0" },
+       { 33,   "mdma1" },
+       { 34,   "mdma2" },
+       { 35,   "mdma3" },
+       { 36,   "mdma4" },
+       { 37,   "mdma5" },
+       { 38,   "mdma6" },
+       { 39,   "mdma7" },
+       { 64,   "udma0" },
+       { 65,   "udma1" },
+       { 66,   "udma2" },
+       { 67,   "udma3" },
+       { 68,   "udma4" },
+       { 69,   "udma5" },
+       { 70,   "udma6" },
+       { 71,   "udma7" },
+       { 0, NULL }
 };
 
 static int translate_xfermode(char * name)
@@ -1566,9 +1460,7 @@ static int translate_xfermode(char * name)
        char *endptr;
        int val = -1;
 
-
-       for (tmp = xfermode_table; tmp->name != NULL; ++tmp)
-       {
+       for (tmp = xfermode_table; tmp->name != NULL; ++tmp) {
                if (!strcmp(name, tmp->name))
                        return tmp->val;
        }
@@ -1580,7 +1472,7 @@ static int translate_xfermode(char * name)
        return -1;
 }
 
-static void interpret_xfermode(unsigned int xfermode)
+static void interpret_xfermode(unsigned xfermode)
 {
        printf(" (");
        if (xfermode == 0)
@@ -1601,42 +1493,39 @@ static void interpret_xfermode(unsigned int xfermode)
 }
 #endif /* HDIO_DRIVE_CMD */
 
-static void print_flag(unsigned long flag, char *s, unsigned long value)
+static void print_flag(int flag, const char *s, unsigned long value)
 {
-       if(flag)
+       if (flag)
                printf(" setting %s to %ld\n", s, value);
 }
 
 static void process_dev(char *devname)
 {
        int fd;
-       static long parm, multcount;
+       long parm, multcount;
 #ifndef HDIO_DRIVE_CMD
        int force_operation = 0;
 #endif
        /* Please restore args[n] to these values after each ioctl
           except for args[2] */
-       unsigned char args[4] = {WIN_SETFEATURES,0,0,0};
+       unsigned char args[4] = { WIN_SETFEATURES, 0, 0, 0 };
        const char *fmt = " %s\t= %2ld";
 
-       fd = bb_xopen(devname, O_RDONLY|O_NONBLOCK);
+       fd = xopen(devname, O_RDONLY|O_NONBLOCK);
        printf("\n%s:\n", devname);
 
-       if (set_readahead)
-       {
-               print_flag(get_readahead,"fs readahead", Xreadahead);
-               bb_ioctl(fd, BLKRASET,(int *)Xreadahead,"BLKRASET");
+       if (set_readahead) {
+               print_flag(get_readahead, "fs readahead", Xreadahead);
+               bb_ioctl(fd, BLKRASET, (int *)Xreadahead, "BLKRASET");
        }
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
-       if (unregister_hwif)
-       {
+#if ENABLE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+       if (unregister_hwif) {
                printf(" attempting to unregister hwif#%lu\n", hwif);
-               bb_ioctl(fd, HDIO_UNREGISTER_HWIF,(int *)(unsigned long)hwif,"HDIO_UNREGISTER_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)
-       {
+#if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF
+       if (scan_hwif) {
                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;
@@ -1646,10 +1535,8 @@ static void process_dev(char *devname)
                args[1] = 0;
        }
 #endif
-       if (set_piomode)
-       {
-               if (noisy_piomode)
-               {
+       if (set_piomode) {
+               if (noisy_piomode) {
                        printf(" attempting to ");
                        if (piomode == 255)
                                printf("auto-tune PIO mode\n");
@@ -1662,119 +1549,102 @@ static void process_dev(char *devname)
                }
                bb_ioctl(fd, HDIO_SET_PIO_MODE, (int *)(unsigned long)piomode, "HDIO_SET_PIO_MODE");
        }
-       if (set_io32bit)
-       {
-               print_flag(get_io32bit,"32-bit IO_support flag", io32bit);
+       if (set_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)
-       {
+       if (set_mult) {
                print_flag(get_mult, "multcount", mult);
 #ifdef HDIO_DRIVE_CMD
-               bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT");
+               bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT");
 #else
-               force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT"));
+               force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT"));
 #endif
        }
-       if (set_readonly)
-       {
-               print_flag_on_off(get_readonly,"readonly", readonly);
+       if (set_readonly) {
+               print_flag_on_off(get_readonly, "readonly", readonly);
                bb_ioctl(fd, BLKROSET, &readonly, "BLKROSET");
        }
-       if (set_unmask)
-       {
-               print_flag_on_off(get_unmask,"unmaskirq", unmask);
+       if (set_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)
-       {
+#if ENABLE_FEATURE_HDPARM_HDIO_GETSET_DMA
+       if (set_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)
-       {
-               print_flag_on_off(get_dma_q,"DMA queue_depth", dma_q);
+#endif /* FEATURE_HDPARM_HDIO_GETSET_DMA */
+       if (set_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)
-       {
-               print_flag_on_off(get_nowerr,"nowerr", nowerr);
-               bb_ioctl(fd, HDIO_SET_NOWERR, (int *)nowerr,"HDIO_SET_NOWERR");
+       if (set_nowerr) {
+               print_flag_on_off(get_nowerr, "nowerr", nowerr);
+               bb_ioctl(fd, HDIO_SET_NOWERR, (int *)nowerr, "HDIO_SET_NOWERR");
        }
-       if (set_keep)
-       {
-               print_flag_on_off(get_keep,"keep_settings", keep);
-               bb_ioctl(fd, HDIO_SET_KEEPSETTINGS, (int *)keep,"HDIO_SET_KEEPSETTINGS");
+       if (set_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)
-       {
+       if (set_doorlock) {
                args[0] = doorlock ? WIN_DOORLOCK : WIN_DOORUNLOCK;
                args[2] = 0;
-               print_flag_on_off(get_doorlock,"drive doorlock", doorlock);
-               bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(doorlock)");
+               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)
-       {
+       if (set_dkeep) {
                /* lock/unlock the drive's "feature" settings */
-               print_flag_on_off(get_dkeep,"drive keep features", 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)");
+               bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(keepsettings)");
        }
-       if (set_defects)
-       {
+       if (set_defects) {
                args[2] = defects ? 0x04 : 0x84;
-               print_flag(get_defects,"drive defect-mgmt", defects);
-               bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(defectmgmt)");
+               print_flag(get_defects, "drive defect-mgmt", defects);
+               bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(defectmgmt)");
        }
-       if (set_prefetch)
-       {
+       if (set_prefetch) {
                args[1] = prefetch;
                args[2] = 0xab;
-               print_flag(get_prefetch,"drive prefetch", prefetch);
+               print_flag(get_prefetch, "drive prefetch", prefetch);
                bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setprefetch)");
                args[1] = 0;
        }
-       if (set_xfermode)
-       {
+       if (set_xfermode) {
                args[1] = xfermode_requested;
                args[2] = 3;
-               if (get_xfermode)
-               {
-                       print_flag(1,"xfermode", xfermode_requested);
+               if (get_xfermode) {
+                       print_flag(1, "xfermode", xfermode_requested);
                        interpret_xfermode(xfermode_requested);
                }
-               bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(setxfermode)");
+               bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setxfermode)");
                args[1] = 0;
        }
-       if (set_lookahead)
-       {
+       if (set_lookahead) {
                args[2] = lookahead ? 0xaa : 0x55;
-               print_flag_on_off(get_lookahead,"drive read-lookahead", 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)
-       {
+       if (set_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");
+               bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD");
                args[1] = 0;
        }
-       if (set_wcache)
-       {
+       if (set_wcache) {
 #ifdef DO_FLUSHCACHE
 #ifndef WIN_FLUSHCACHE
 #define WIN_FLUSHCACHE 0xe7
 #endif
-               static unsigned char flushcache[4] = {WIN_FLUSHCACHE,0,0,0};
+               static unsigned char flushcache[4] = { WIN_FLUSHCACHE, 0, 0, 0 };
 #endif /* DO_FLUSHCACHE */
                args[2] = wcache ? 0x02 : 0x82;
-               print_flag_on_off(get_wcache,"drive write-caching", wcache);
+               print_flag_on_off(get_wcache, "drive write-caching", wcache);
 #ifdef DO_FLUSHCACHE
                if (!wcache)
                        bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)");
@@ -1790,8 +1660,7 @@ static void process_dev(char *devname)
           is preserved, including args[2] */
        args[2] = 0;
 
-       if (set_standbynow)
-       {
+       if (set_standbynow) {
 #ifndef WIN_STANDBYNOW1
 #define WIN_STANDBYNOW1 0xE0
 #endif
@@ -1802,8 +1671,7 @@ static void process_dev(char *devname)
                args[0] = WIN_STANDBYNOW1;
                bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_STANDBYNOW2, "HDIO_DRIVE_CMD(standby)");
        }
-       if (set_sleepnow)
-       {
+       if (set_sleepnow) {
 #ifndef WIN_SLEEPNOW1
 #define WIN_SLEEPNOW1 0xE6
 #endif
@@ -1814,27 +1682,23 @@ static void process_dev(char *devname)
                args[0] = WIN_SLEEPNOW1;
                bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_SLEEPNOW2, "HDIO_DRIVE_CMD(sleep)");
        }
-       if (set_seagate)
-       {
+       if (set_seagate) {
                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)
-       {
+       if (set_standby) {
                args[0] = WIN_SETIDLE1;
                args[1] = standby_requested;
-               if (get_standby)
-               {
-                       print_flag(1,"standby", standby_requested);
+               if (get_standby) {
+                       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)
-       {
+       if (force_operation) {
                char buf[512];
                flush_buffer_cache(fd);
                if (-1 == read(fd, buf, sizeof(buf)))
@@ -1842,24 +1706,18 @@ static void process_dev(char *devname)
        }
 #endif /* HDIO_DRIVE_CMD */
 
-       if (get_mult || get_identity)
-       {
+       if (get_mult || get_identity) {
                multcount = -1;
-               if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount))
-               {
+               if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) {
                        if (get_mult)
                                bb_perror_msg("HDIO_GET_MULTCOUNT");
-               }
-               else if (get_mult)
-               {
+               } else if (get_mult) {
                        printf(fmt, "multcount", multcount);
-                       on_off(multcount);
+                       on_off(multcount != 0);
                }
        }
-       if (get_io32bit)
-       {
-               if (!bb_ioctl(fd, HDIO_GET_32BIT, &parm, "HDIO_GET_32BIT"))
-               {
+       if (get_io32bit) {
+               if (!bb_ioctl(fd, HDIO_GET_32BIT, &parm, "HDIO_GET_32BIT")) {
                        printf(" IO_support\t=%3ld (", parm);
                        if (parm == 0)
                                printf("default 16-bit)\n");
@@ -1875,55 +1733,46 @@ static void process_dev(char *devname)
                                printf("\?\?\?)\n");
                }
        }
-       if (get_unmask)
-       {
-               bb_ioctl_on_off(fd, HDIO_GET_UNMASKINTR,(unsigned long *)parm,
-                                               "HDIO_GET_UNMASKINTR","unmaskirq");
+       if (get_unmask) {
+               bb_ioctl_on_off(fd, HDIO_GET_UNMASKINTR, (unsigned long *)parm,
+                                       "HDIO_GET_UNMASKINTR", "unmaskirq");
        }
 
 
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
+#if ENABLE_FEATURE_HDPARM_HDIO_GETSET_DMA
        if (get_dma) {
-               if (!bb_ioctl(fd, HDIO_GET_DMA, &parm, "HDIO_GET_DMA"))
-               {
+               if (!bb_ioctl(fd, HDIO_GET_DMA, &parm, "HDIO_GET_DMA")) {
                        printf(fmt, "using_dma", parm);
                        if (parm == 8)
                                printf(" (DMA-Assisted-PIO)\n");
                        else
-                               on_off(parm);
+                               on_off(parm != 0);
                }
        }
 #endif
-       if (get_dma_q)
-       {
-               bb_ioctl_on_off (fd, HDIO_GET_QDMA,(unsigned long *)parm,
-                                                 "HDIO_GET_QDMA","queue_depth");
-       }
-       if (get_keep)
-       {
-               bb_ioctl_on_off (fd, HDIO_GET_KEEPSETTINGS,(unsigned long *)parm,
-                                                       "HDIO_GET_KEEPSETTINGS","keepsettings");
-       }
-
-       if (get_nowerr)
-       {
-               bb_ioctl_on_off  (fd, HDIO_GET_NOWERR,(unsigned long *)&parm,
-                                                       "HDIO_GET_NOWERR","nowerr");
-       }
-       if (get_readonly)
-       {
-               bb_ioctl_on_off(fd, BLKROGET,(unsigned long *)parm,
-                                                 "BLKROGET","readonly");
-       }
-       if (get_readahead)
-       {
-               bb_ioctl_on_off (fd, BLKRAGET, (unsigned long *) parm,
-                                                       "BLKRAGET","readahead");
-       }
-       if (get_geom)
-       {
-               if (!bb_ioctl(fd, BLKGETSIZE, &parm, "BLKGETSIZE"))
-               {
+       if (get_dma_q) {
+               bb_ioctl_on_off(fd, HDIO_GET_QDMA, (unsigned long *)parm,
+                                               "HDIO_GET_QDMA", "queue_depth");
+       }
+       if (get_keep) {
+               bb_ioctl_on_off(fd, HDIO_GET_KEEPSETTINGS, (unsigned long *)parm,
+                                               "HDIO_GET_KEEPSETTINGS", "keepsettings");
+       }
+
+       if (get_nowerr) {
+               bb_ioctl_on_off(fd, HDIO_GET_NOWERR, (unsigned long *)&parm,
+                                               "HDIO_GET_NOWERR", "nowerr");
+       }
+       if (get_readonly) {
+               bb_ioctl_on_off(fd, BLKROGET, (unsigned long *)parm,
+                                               "BLKROGET", "readonly");
+       }
+       if (get_readahead) {
+               bb_ioctl_on_off(fd, BLKRAGET, (unsigned long *) parm,
+                                               "BLKRAGET", "readahead");
+       }
+       if (get_geom) {
+               if (!bb_ioctl(fd, BLKGETSIZE, &parm, "BLKGETSIZE")) {
                        struct hd_geometry g;
 
                        if (!bb_ioctl(fd, HDIO_GETGEO, &g, "HDIO_GETGEO"))
@@ -1932,8 +1781,7 @@ static void process_dev(char *devname)
                }
        }
 #ifdef HDIO_DRIVE_CMD
-       if (get_powermode)
-       {
+       if (get_powermode) {
 #ifndef WIN_CHECKPOWERMODE1
 #define WIN_CHECKPOWERMODE1 0xE5
 #endif
@@ -1943,58 +1791,48 @@ static void process_dev(char *devname)
                const char *state;
 
                args[0] = WIN_CHECKPOWERMODE1;
-               if (bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_CHECKPOWERMODE2, 0))
-               {
+               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
+               } else
                        state = (args[2] == 255) ? "active/idle" : "standby";
                args[1] = args[2] = 0;
 
                printf(" drive state is:  %s\n", state);
        }
 #endif
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
-       if (perform_reset)
-       {
+#if ENABLE_FEATURE_HDPARM_HDIO_DRIVE_RESET
+       if (perform_reset) {
                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)
-       {
+#endif /* FEATURE_HDPARM_HDIO_DRIVE_RESET */
+#if ENABLE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+       if (perform_tristate) {
                args[0] = 0;
                args[1] = tristate;
                bb_ioctl(fd, HDIO_TRISTATE_HWIF, &args, "HDIO_TRISTATE_HWIF");
        }
-#endif /* CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF */
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
-       if (get_identity)
-       {
-               static struct hd_driveid id;
+#endif /* FEATURE_HDPARM_HDIO_TRISTATE_HWIF */
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
+       if (get_identity) {
+               struct hd_driveid id;
 
-               if (!ioctl(fd, HDIO_GET_IDENTITY, &id))
-               {
-                       if (multcount != -1)
-                       {
+               if (!ioctl(fd, HDIO_GET_IDENTITY, &id)) {
+                       if (multcount != -1) {
                                id.multsect = multcount;
                                id.multsect_valid |= 1;
-                       }
-                       else
+                       } else
                                id.multsect_valid &= ~1;
                        dump_identity(&id);
-               }
-               else if (errno == -ENOMSG)
+               } else if (errno == -ENOMSG)
                        printf(" no identification info available\n");
                else
                        bb_perror_msg("HDIO_GET_IDENTITY");
        }
 
-       if (get_IDentity)
-       {
+       if (get_IDentity) {
                unsigned char args1[4+512]; /* = { ... } will eat 0.5k of rodata! */
 
                memset(args1, 0, sizeof(args1));
@@ -2004,20 +1842,16 @@ static void process_dev(char *devname)
                        identify((void *)(args1 + 4));
        }
 #endif
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-       if (set_busstate)
-       {
-               if (get_busstate)
-               {
+#if ENABLE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+       if (set_busstate) {
+               if (get_busstate) {
                        print_flag(1, "bus state", busstate);
                        bus_state_value(busstate);
                }
                bb_ioctl(fd, HDIO_SET_BUSSTATE, (int *)(unsigned long)busstate, "HDIO_SET_BUSSTATE");
        }
-       if (get_busstate)
-       {
-               if (!bb_ioctl(fd, HDIO_GET_BUSSTATE, &parm, "HDIO_GET_BUSSTATE"))
-               {
+       if (get_busstate) {
+               if (!bb_ioctl(fd, HDIO_GET_BUSSTATE, &parm, "HDIO_GET_BUSSTATE")) {
                        printf(fmt, "bus state", parm);
                        bus_state_value(parm);
                }
@@ -2026,41 +1860,40 @@ static void process_dev(char *devname)
        if (reread_partn)
                bb_ioctl(fd, BLKRRPART, NULL, "BLKRRPART");
 
-
        if (do_ctimings)
-               do_time(0,fd);          /*time cache  */
+               do_time(0, fd); /* time cache */
        if (do_timings)
-               do_time(1,fd);          /*time device */
+               do_time(1, fd); /* time device */
        if (do_flush)
                flush_buffer_cache(fd);
        close(fd);
 }
 
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
 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 void identify_from_stdin(void)
 {
        uint16_t sbuf[256];
-       unsigned char  buf[1280], *b = (unsigned char *)buf;
-       int i, count = read(0, buf, 1280);
+       unsigned char buf[1280];
+       unsigned char *b = (unsigned char *)buf;
+       int i;
 
-       if (count != 1280)
-               bb_error_msg_and_die("read(%d bytes) failed (rc=%d)", 1280, count);
+       xread(0, buf, 1280);
 
        // Convert the newline-separated hex data into an identify block.
 
-       for (i = 0; i<256; i++)
-       {
+       for (i = 0; i < 256; i++) {
                int j;
-               for(j=0;j<4;j++) sbuf[i] = (sbuf[i] <<4) + fromhex(*(b++));
+               for (j = 0; j < 4; j++)
+                       sbuf[i] = (sbuf[i] << 4) + fromhex(*(b++));
        }
 
        // Parse the data.
@@ -2070,40 +1903,41 @@ static void identify_from_stdin(void)
 #endif
 
 /* busybox specific stuff */
-static void parse_opts(unsigned long *get, unsigned long *set, unsigned long *value, int min, int max)
+static void parse_opts(smallint *get, smallint *set, unsigned long *value, int min, int max)
 {
-               if (get) {
-                       *get = 1;
-               }
-               if (optarg) {
-                       *set = 1;
-                       *value = bb_xgetlarg(optarg, 10, min, max);
-               }
+       if (get) {
+               *get = 1;
+       }
+       if (optarg) {
+               *set = 1;
+               *value = xatol_range(optarg, min, max);
+       }
 }
 
-static void parse_xfermode(int flag, unsigned long *get, unsigned long *set, int *value)
+static void parse_xfermode(int flag, smallint *get, smallint *set, int *value)
 {
        if (flag) {
                *get = 1;
                if (optarg) {
-                       *set = ((*value = translate_xfermode(optarg)) > -1);
+                       *value = translate_xfermode(optarg);
+                       *set = (*value > -1);
                }
        }
 }
 
 /*------- getopt short options --------*/
-static const char hdparm_options[]=    "gfu::n::p:r::m::c::k::a::B:tTh"\
+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"
+       "S:D:P:X:K:A:L:W:CyYzZ"
 #endif
        USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:")
 #ifdef HDIO_GET_QDMA
 #ifdef HDIO_SET_QDMA
-                                                                       "Q:"
+       "Q:"
 #else
-                                                                       "Q"
+       "Q"
 #endif
 #endif
        USE_FEATURE_HDPARM_HDIO_DRIVE_RESET("w")
@@ -2112,7 +1946,7 @@ static const char hdparm_options[]=       "gfu::n::p:r::m::c::k::a::B:tTh"\
 /*-------------------------------------*/
 
 /* our main() routine: */
-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;
@@ -2128,7 +1962,7 @@ int hdparm_main(int argc, char **argv)
                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);
+               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*/);
@@ -2138,7 +1972,7 @@ int hdparm_main(int argc, char **argv)
                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 == '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);
@@ -2152,24 +1986,24 @@ int hdparm_main(int argc, char **argv)
                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));   
+               USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(if (c == 'U') parse_opts(NULL, &unregister_hwif, &hwif, 0, INT_MAX));
 #ifdef HDIO_GET_QDMA
                if (c == 'Q') {
 #ifdef HDIO_SET_QDMA
                        parse_opts(&get_dma_q, &set_dma_q, &dma_q, 0, INT_MAX);
 #else
-                       parse_opts(&get_dma_q, NULL, NULL, 0, 0);       
+                       parse_opts(&get_dma_q, NULL, NULL, 0, 0);
 #endif
                }
-#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)); 
+               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 =  bb_xgetlarg((argv[optind]) ? argv[optind] : "", 10, 0, INT_MAX);
-                       hwif_irq  =  bb_xgetlarg((argv[optind+1]) ? argv[optind+1] : "", 10, 0, INT_MAX);
+                       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;
@@ -2177,22 +2011,21 @@ int hdparm_main(int argc, char **argv)
 #endif
        }
        /* When no flags are given (flagcount = 0), -acdgkmnru is assumed. */
-       if (!flagcount){
+       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;
 
-       if (argc < 1) {
+       if (!*argv) {
                if (ENABLE_FEATURE_HDPARM_GET_IDENTITY && !isatty(STDIN_FILENO))
                        identify_from_stdin(); /* EXIT */
                else bb_show_usage();
        }
 
-       while (argc--) {
-               process_dev(*argv);
-               argv++;
-       }
-       exit(EXIT_SUCCESS);
+       do {
+               process_dev(*argv++);
+       } while (*argv);
+
+       return EXIT_SUCCESS;
 }