From e7f4222ccb29a80bd2bd917b07b75b93f13bc066 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 15 Aug 2004 12:23:14 +0000 Subject: [PATCH] Mass coding-style update. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2661 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/dump/isadump.c | 285 +++++++++++++++++++++++--------------------- 1 file changed, 146 insertions(+), 139 deletions(-) diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c index 9e49fdde..3761267a 100644 --- a/prog/dump/isadump.c +++ b/prog/dump/isadump.c @@ -47,12 +47,12 @@ unsigned long isa_io_base = 0; /* XXX for now */ char hexchar(int i) { - if ((i >= 0) && (i <= 9)) - return '0' + i; - else if (i <= 15) - return 'a' - 10 + i; - else - return 'X'; + if ((i >= 0) && (i <= 9)) + return '0' + i; + else if (i <= 15) + return 'a' - 10 + i; + else + return 'X'; } void help(void) @@ -97,154 +97,161 @@ int set_bank(int flat, int addrreg, int datareg, int bank, int bankreg) int main(int argc, char *argv[]) { - int addrreg; /* addess in flat mode */ - int datareg = 0; /* unused in flat mode */ - int range = 256; /* can be changed only in flat mode */ - int bank = -1; /* -1 means no bank operation */ - int bankreg; - int oldbank = 0; - int i,j,res; - int flat = 0; - char *end; + int addrreg; /* address in flat mode */ + int datareg = 0; /* unused in flat mode */ + int range = 256; /* can be changed only in flat mode */ + int bank = -1; /* -1 means no bank operation */ + int bankreg; + int oldbank = 0; + int i, j, res; + int flat = 0; + char *end; - if (argc < 3) { - help(); - exit(1); - } + if (argc < 3) { + help(); + exit(1); + } - if (!strcmp(argv[1], "-f")) { - flat = 1; - } + if (!strcmp(argv[1], "-f")) { + flat = 1; + } - addrreg = strtol(argv[1+flat], &end, 0); - if (*end) { - fprintf(stderr,"Error: Invalid address!\n"); - help(); - exit(1); - } - if (addrreg < 0 || addrreg > (flat?0xffff:0x3fff)) { - fprintf(stderr, "Error: Address out of range (0x0000-0x%04x)!\n", - flat?0xffff:0x3fff); - help(); - exit(1); - } + addrreg = strtol(argv[1+flat], &end, 0); + if (*end) { + fprintf(stderr, "Error: Invalid address!\n"); + help(); + exit(1); + } + if (addrreg < 0 || addrreg > (flat?0xffff:0x3fff)) { + fprintf(stderr, "Error: Address out of range " + "(0x0000-0x%04x)!\n", flat?0xffff:0x3fff); + help(); + exit(1); + } - if (flat) { - if (argc > 3) { - range = strtol(argv[3], &end, 0); - if (*end || range <= 0 || range > 0x100 || range & 0xf) { - fprintf(stderr, "Error: Invalid range!\n" - "Hint: Must be a multiple of 16 no greater than 256.\n"); - help(); - exit(1); - } - } else { - addrreg &= 0xff00; /* Force alignment */ - } - } else { - datareg = strtol(argv[2], &end, 0); - if (*end) { - fprintf(stderr, "Error: Invalid data register!\n"); - help(); - exit(1); - } - if (datareg < 0 || datareg > 0x3fff) { - fprintf(stderr, "Error: Data register out of range (0x0000-0x3fff)!\n"); - help(); - exit(1); - } - } + if (flat) { + if (argc > 3) { + range = strtol(argv[3], &end, 0); + if (*end || range <= 0 || range > 0x100 + || range & 0xf) { + fprintf(stderr, "Error: Invalid range!\n" + "Hint: Must be a multiple of 16 no " + "greater than 256.\n"); + help(); + exit(1); + } + } else { + addrreg &= 0xff00; /* Force alignment */ + } + } else { + datareg = strtol(argv[2], &end, 0); + if (*end) { + fprintf(stderr, "Error: Invalid data register!\n"); + help(); + exit(1); + } + if (datareg < 0 || datareg > 0x3fff) { + fprintf(stderr, "Error: Data register out of range " + "(0x0000-0x3fff)!\n"); + help(); + exit(1); + } + } - bankreg = default_bankreg(flat, addrreg, datareg); + bankreg = default_bankreg(flat, addrreg, datareg); - if(argc > 3+flat) { - bank = strtol(argv[3+flat],&end,0); - if (*end) { - fprintf(stderr,"Error: Invalid bank number!\n"); - help(); - exit(1); - } - if ((bank < 0) || (bank > 15)) { - fprintf(stderr,"Error: bank out of range (0-15)!\n"); - help(); - exit(1); - } + if (argc > 3+flat) { + bank = strtol(argv[3+flat], &end, 0); + if (*end) { + fprintf(stderr, "Error: Invalid bank number!\n"); + help(); + exit(1); + } + if ((bank < 0) || (bank > 15)) { + fprintf(stderr, "Error: bank out of range (0-15)!\n"); + help(); + exit(1); + } - if(argc > 4+flat) { - bankreg = strtol(argv[4+flat],&end,0); - if (*end) { - fprintf(stderr,"Error: Invalid bank register!\n"); - help(); - exit(1); - } - if (bankreg < 0 || bankreg >= range) { - fprintf(stderr, - "Error: bank out of range (0x00-0x%02x)!\n", - range-1); - help(); - exit(1); - } - } - } + if (argc > 4+flat) { + bankreg = strtol(argv[4+flat], &end, 0); + if (*end) { + fprintf(stderr, "Error: Invalid bank " + "register!\n"); + help(); + exit(1); + } + if (bankreg < 0 || bankreg >= range) { + fprintf(stderr, "Error: bank out of range " + "(0x00-0x%02x)!\n", range-1); + help(); + exit(1); + } + } + } - if (getuid()) { - fprintf(stderr,"Error: Can only be run as root (or make it suid root)\n"); - exit(1); - } + if (getuid()) { + fprintf(stderr, "Error: Can only be run as root (or make it " + "suid root)\n"); + exit(1); + } - fprintf(stderr," WARNING! Running this program can cause system crashes, " - "data loss and worse!\n"); - if(flat) - fprintf(stderr," I will probe address range 0x%04x to " - "0x%04x.\n", addrreg, addrreg + range - 1); - else - fprintf(stderr," I will probe address register 0x%04x and " - "data register 0x%04x.\n",addrreg,datareg); - if(bank>=0) - fprintf(stderr," Probing bank %d using bank register 0x%02x.\n", - bank, bankreg); - fprintf(stderr," You have five seconds to reconsider and press CTRL-C!\n\n"); - sleep(5); + fprintf(stderr, "WARNING! Running this program can cause system " + "crashes, data loss and worse!\n"); + if (flat) + fprintf(stderr, "I will probe address range 0x%04x to " + "0x%04x.\n", addrreg, addrreg + range - 1); + else + fprintf(stderr, "I will probe address register 0x%04x and " + "data register 0x%04x.\n", addrreg, datareg); + if (bank>=0) + fprintf(stderr, "Probing bank %d using bank register " + "0x%02x.\n", bank, bankreg); + fprintf(stderr, "You have five seconds to reconsider and press " + "CTRL-C!\n\n"); + sleep(5); #ifndef __powerpc__ - if ((datareg < 0x400) && (addrreg < 0x400) && !flat) { - if(ioperm(datareg,1,1)) { - fprintf(stderr,"Error: Could not ioperm() data register!\n"); - exit(1); - } - if(ioperm(addrreg,1,1)) { - fprintf(stderr,"Error: Could not ioperm() address register!\n"); - exit(1); - } - } else { - if(iopl(3)) { - fprintf(stderr,"Error: Could not do iopl(3)!\n"); - exit(1); - } - } + if ((datareg < 0x400) && (addrreg < 0x400) && !flat) { + if (ioperm(datareg, 1, 1)) { + fprintf(stderr, "Error: Could not ioperm() data " + "register!\n"); + exit(1); + } + if (ioperm(addrreg, 1, 1)) { + fprintf(stderr, "Error: Could not ioperm() address " + "register!\n"); + exit(1); + } + } else { + if (iopl(3)) { + fprintf(stderr, "Error: Could not do iopl(3)!\n"); + exit(1); + } + } #endif - if (bank >= 0) - oldbank = set_bank(flat, addrreg, datareg, bank, bankreg); + if (bank >= 0) + oldbank = set_bank(flat, addrreg, datareg, bank, bankreg); - printf(" 0 1 2 3 4 5 6 7 8 9 a b c d e f\n"); - for (i = 0; i < range; i += 16) { - printf("%c0: ",hexchar(i/16)); - for(j = 0; j < 16; j++) { - if(flat) { - res = inb(addrreg + i + j); - } else { - outb(i+j,addrreg); - res = inb(datareg); + printf(" 0 1 2 3 4 5 6 7 8 9 a b c d e f\n"); + for (i = 0; i < range; i += 16) { + printf("%c0: ", hexchar(i/16)); + for (j = 0; j < 16; j++) { + if (flat) { + res = inb(addrreg + i + j); + } else { + outb(i+j, addrreg); + res = inb(datareg); + } + printf("%c%c ", hexchar(res/16), hexchar(res%16)); + } + printf("\n"); } - printf("%c%c ",hexchar(res/16),hexchar(res%16)); - } - printf("\n"); - } - /* Restore the original bank value */ - if (bank >= 0) - set_bank(flat, addrreg, datareg, oldbank, bankreg); + /* Restore the original bank value */ + if (bank >= 0) + set_bank(flat, addrreg, datareg, oldbank, bankreg); - exit(0); + exit(0); }