Changeset 933

Timestamp:

03/13/10 18:28:29 (23 months ago)

Author:

uwe

Message:

Various coding style and cosmetic changes (trivial).

• Fix coding-style, whitespace, and indentation in a few places.

• Consistently use the same spelling ("Super I/O") everywhere.

• Make some flashrom stdout output look a bit nicer.

Signed-off-by: Uwe Hermann <uwe@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk

Files:

• board_enable.c (modified) (14 diffs)
• cli_output.c (modified) (3 diffs)
• dmi.c (modified) (9 diffs)
• flashrom.c (modified) (4 diffs)
• hwaccess.h (modified) (4 diffs)
• internal.c (modified) (3 diffs)
• it87spi.c (modified) (2 diffs)
• serial.c (modified) (3 diffs)

trunk/board_enable.c

@@ -80 +80 @@
         case SUPERIO_VENDOR_ITE:
                 enter_conf_mode_ite(superio.port);
-                /* Enable flash mapping. Works for most old ITE style SuperI/O. */
+                /* Enable flash mapping. Works for most old ITE style Super I/O. */
                 tmp = sio_read(superio.port, 0x24);
                 tmp |= 0xfc;
@@ -88 +88 @@
                 break;
         default:
-                printf_debug("Unhandled SuperI/O type!\n");
+                printf_debug("Unhandled Super I/O type!\n");
                 ret = -1;
                 break;
@@ -227 +227 @@
  *  - Shuttle AK38N: VIA KT333CF + VIA VT8235 + ITE IT8705F
  *
- * SIS950 superio probably requires the same flash write enable.
+ * The SIS950 Super I/O probably requires the same flash write enable.
  */
 static int it8705f_write_enable_2e(const char *name)
@@ -240 +240 @@
         int gpio_pin = gpio % 8;
         uint16_t baseport;
-        uint8_t id;
-        uint8_t val;
-
-        if (gpio_bank > 4)
-        {
+        uint8_t id, val;
+
+        if (gpio_bank > 4) {
                 fprintf(stderr, "PC87360: Invalid GPIO %d\n", gpio);
                 return -1;
@@ -250 +248 @@
 
         id = sio_read(0x2E, 0x20);
-        if (id != 0xE1)
-        {
+        if (id != 0xE1) {
                 fprintf(stderr, "PC87360: unexpected ID %02x\n", id);
                 return -1;
         }
 
-        sio_write(0x2E, 0x07, 0x07);            /* select GPIO device */
+        sio_write(0x2E, 0x07, 0x07);            /* Select GPIO device */
         baseport = (sio_read(0x2E, 0x60) << 8) | sio_read(0x2E, 0x61);
-        if((baseport & 0xFFF0) == 0xFFF0 || baseport == 0)
-        {
+        if ((baseport & 0xFFF0) == 0xFFF0 || baseport == 0) {
                 fprintf (stderr, "PC87360: invalid GPIO base address %04x\n",
                          baseport);
@@ -265 +261 @@
         }
         sio_mask (0x2E, 0x30, 0x01, 0x01);      /* Enable logical device */
-        sio_write(0x2E, 0xF0, gpio_bank*16 + gpio_pin);
+        sio_write(0x2E, 0xF0, gpio_bank * 16 + gpio_pin);
         sio_mask (0x2E, 0xF1, 0x01, 0x01);      /* Make pin output */
 
         val = INB(baseport + bankbase[gpio_bank]);
-        if(raise)
+        if (raise)
                 val |= 1 << gpio_pin;
         else
@@ -1029 +1025 @@
 {
         struct pci_dev *dev;
-        uint16_t base;
-        uint16_t temp;
+        uint16_t base, temp;
 
         dev = pci_dev_find(0x1039, 0x0962);
@@ -1134 +1129 @@
 
         if (id != 0x8701) {
-                fprintf(stderr, "\nERROR: IT8703F SuperIO not found.\n");
+                fprintf(stderr, "\nERROR: IT8703F Super I/O not found.\n");
                 return -1;
         }
@@ -1145 +1140 @@
 
         if (!base) {
-                fprintf(stderr, "\nERROR: Failed to read IT8703F SuperIO GPIO"
+                fprintf(stderr, "\nERROR: Failed to read IT8703F Super I/O GPIO"
                         " Base.\n");
                 return -1;
@@ -1162 +1157 @@
  * There is only some limited checking on the port numbers.
  */
-static int
-it8712f_gpio_set(unsigned int line, int raise)
+static int it8712f_gpio_set(unsigned int line, int raise)
 {
         unsigned int port;
@@ -1187 +1181 @@
 
         if (id != 0x8712) {
-                fprintf(stderr, "\nERROR: IT8712F SuperIO not found.\n");
+                fprintf(stderr, "\nERROR: IT8712F Super I/O not found.\n");
                 return -1;
         }
@@ -1198 +1192 @@
 
         if (!base) {
-                fprintf(stderr, "\nERROR: Failed to read IT8712F SuperIO GPIO"
+                fprintf(stderr, "\nERROR: Failed to read IT8712F Super I/O GPIO"
                         " Base.\n");
                 return -1;
@@ -1447 +1441 @@
 
         if (board && board->status == NT) {
-                if (!force_boardenable)
-                {
+                if (!force_boardenable) {
                         printf("WARNING: Your mainboard is %s %s, but the mainboard-specific\n"
                                "code has not been tested, and thus will not not be executed by default.\n"
@@ -1454 +1447 @@
                                "can fail without running the board specific code.\n\n"
                                "Please see the man page (section PROGRAMMER SPECIFIC INFO, subsection\n"
-                               "\"internal programmer\") for details\n",
+                               "\"internal programmer\") for details.\n",
                                board->vendor_name, board->board_name);
                         board = NULL;
-                }
-                else
+                } else {
                         printf("NOTE: Running an untested board enable procedure.\n"
-                               "Please report success/failure to flashrom@flashrom.org\n");
+                               "Please report success/failure to flashrom@flashrom.org.\n");
+                }
         }
 

trunk/cli_output.c

@@ -28 +28 @@
         int ret;
         FILE *output_type;
-        
-        switch (type)
-        {
+
+        switch (type) {
         case MSG_ERROR:
                 output_type = stderr;
                 break;
         case MSG_BARF:
-                if (verbose < 2) return 0;
+                if (verbose < 2)
+                        return 0;
         case MSG_DEBUG:
-                if (verbose < 1) return 0;
+                if (verbose < 1)
+                        return 0;
         case MSG_INFO:
         default:
@@ -43 +44 @@
                 break;
         }
-        
+
         va_start(ap, fmt);
         ret = vfprintf(output_type, fmt, ap);
@@ -49 +50 @@
         return ret;
 }
-

trunk/dmi.c

@@ -32 +32 @@
         DMI_BB_PRODUCT,
         DMI_BB_VERSION,
-        DMI_ID_INVALID /* This must always be the last entry */
+        DMI_ID_INVALID, /* This must always be the last entry! */
 };
 
-/* The short_id for baseboard starts with "m" as in mainboard to leave
-   "b" available for BIOS */
+/*
+ * The short_id for baseboard starts with "m" as in mainboard to leave
+ * "b" available for BIOS.
+ */
 const char *dmidecode_names[DMI_ID_INVALID] = {
         "system-manufacturer",
@@ -43 +45 @@
         "baseboard-manufacturer",
         "baseboard-product-name",
-        "baseboard-version"
+        "baseboard-version",
 };
 
@@ -52 +54 @@
 char *dmistrings[DMI_ID_INVALID];
 
-/* strings longer than 4096 in DMI are just insane */
+/* Strings longer than 4096 in DMI are just insane. */
 #define DMI_MAX_ANSWER_LEN 4096
 
@@ -60 +62 @@
         char *result;
         char answerbuf[DMI_MAX_ANSWER_LEN];
-        char commandline[DMI_COMMAND_LEN_MAX+40];
+        char commandline[DMI_COMMAND_LEN_MAX + 40];
+
         snprintf(commandline, sizeof(commandline),
                  "%s -s %s", dmidecode_command, string_name);
@@ -83 +86 @@
         }
 
-        /* chomp trailing newline */
+        /* Chomp trailing newline. */
         if (answerbuf[0] != 0 &&
             answerbuf[strlen(answerbuf) - 1] == '\n')
@@ -100 +103 @@
         int i;
         char *chassis_type;
+
         has_dmi_support = 1;
         for (i = 0; i < DMI_ID_INVALID; i++) {
@@ -132 +136 @@
         int anchored = 0;
         int patternlen;
+
         printf_debug("matching %s against %s\n", value, pattern);
-        /* The empty string is part of all strings */
+        /* The empty string is part of all strings! */
         if (pattern[0] == 0)
                 return 1;
@@ -146 +151 @@
                 int valuelen = strlen(value);
                 patternlen--;
-                if(patternlen > valuelen)
+                if (patternlen > valuelen)
                         return 0;
 
                 /* full string match: require same length */
-                if(anchored && (valuelen != patternlen))
+                if (anchored && (valuelen != patternlen))
                         return 0;
 
@@ -167 +172 @@
 {
         int i;
+
         if (!has_dmi_support)
                 return 0;
 
-        for (i = 0;i < DMI_ID_INVALID; i++)
-                if(dmi_compare(dmistrings[i], pattern))
+        for (i = 0; i < DMI_ID_INVALID; i++)
+                if (dmi_compare(dmistrings[i], pattern))
                         return 1;
 

trunk/flashrom.c

@@ -665 +665 @@
                 for (j = 0; j < len / 256; j++) {
                         limit = min (256, len - j * 256);
-                        /* Are have and want identical? */
+                        /* Are 'have' and 'want' identical? */
                         if (!memcmp(have + j * 256, want + j * 256, limit))
                                 continue;
@@ -1029 +1029 @@
                  * easiest way to check this is with function pointers.
                  */
-                for (j = k + 1; j < NUM_ERASEFUNCTIONS; j++)
+                for (j = k + 1; j < NUM_ERASEFUNCTIONS; j++) {
                         if (eraser.block_erase ==
                             flash->block_erasers[j].block_erase) {
@@ -1038 +1038 @@
                                 ret = 1;
                         }
+                }
         }
         return ret;
@@ -1199 +1200 @@
                        "with the additional -V option for all operations you "
                        "tested (-V, -rV,\n-wV, -EV), and mention which "
-                       "mainboard or programmer you tested. Thanks for your "
+                       "mainboard or programmer you tested.\nThanks for your "
                        "help!\n===\n");
         }

trunk/hwaccess.h

@@ -16 +16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- *
+ */
+
+/*
  * Header file for hardware access and OS abstraction. Included from flash.h.
  */
@@ -90 +91 @@
   #include <stdint.h>
 
-static inline void
-outb(uint8_t value, uint16_t port)
+static inline void outb(uint8_t value, uint16_t port)
 {
         asm volatile ("outb %b0,%w1": :"a" (value), "Nd" (port));
 }
 
-static inline uint8_t
-inb(uint16_t port)
+static inline uint8_t inb(uint16_t port)
 {
         uint8_t value;
@@ -104 +103 @@
 }
 
-static inline void
-outw(uint16_t value, uint16_t port)
+static inline void outw(uint16_t value, uint16_t port)
 {
         asm volatile ("outw %w0,%w1": :"a" (value), "Nd" (port));
 }
 
-static inline uint16_t
-inw(uint16_t port)
+static inline uint16_t inw(uint16_t port)
 {
         uint16_t value;
@@ -118 +115 @@
 }
 
-static inline void
-outl(uint32_t value, uint16_t port)
+static inline void outl(uint32_t value, uint16_t port)
 {
         asm volatile ("outl %0,%w1": :"a" (value), "Nd" (port));
 }
 
-static inline uint32_t
-inl(uint16_t port)
+static inline uint32_t inl(uint16_t port)
 {
         uint32_t value;

trunk/internal.c

@@ -106 +106 @@
 {
         superio = probe_superio_ite();
-#if 0   /* Winbond SuperI/O code is not yet available. */
+#if 0
+        /* Winbond Super I/O code is not yet available. */
         if (superio.vendor == SUPERIO_VENDOR_NONE)
                 superio = probe_superio_winbond();
@@ -151 +152 @@
         dmi_init();
 
-        /* Probe for the SuperI/O chip and fill global struct superio. */
+        /* Probe for the Super I/O chip and fill global struct superio. */
         probe_superio();
 
-        /* Warn if a laptop is detected */
+        /* Warn if a laptop is detected. */
         if (is_laptop)
                 printf("========================================================================\n"
@@ -160 +161 @@
                        "Laptops, notebooks and netbooks are difficult to support and we recommend\n"
                        "to use the vendor flashing utility. The embedded controller (EC) in these\n"
-                       "machines often interacts badly with flashing\n"
-                       "See http://www.flashrom.org/Laptops\n"
+                       "machines often interacts badly with flashing.\n"
+                       "See http://www.flashrom.org/Laptops for details.\n"
                        "========================================================================\n");
 

trunk/it87spi.c

@@ -82 +82 @@
                 case 0x86:
                 case 0x87:
-                        msg_pinfo("Found ITE SuperI/O, id %04hx\n",
+                        msg_pinfo("Found ITE Super I/O, id %04hx\n",
                                      ret.model);
                         return ret;
@@ -171 +171 @@
 
         get_io_perms();
-        /* Probe for the SuperI/O chip and fill global struct superio. */
+        /* Probe for the Super I/O chip and fill global struct superio. */
         probe_superio();
         ret = it87spi_common_init();

trunk/serial.c

@@ -106 +106 @@
 #ifdef _WIN32
         HANDLE fd;
-        char* dev2 = dev;
-        if ((strlen(dev) > 3) && (tolower(dev[0])=='c') && (tolower(dev[1])=='o') && (tolower(dev[2])=='m')) {
-                dev2 = malloc(strlen(dev)+5);
+        char *dev2 = dev;
+        if ((strlen(dev) > 3) && (tolower(dev[0]) == 'c')
+            && (tolower(dev[1]) == 'o') && (tolower(dev[2]) == 'm')) {
+                dev2 = malloc(strlen(dev) + 5);
                 strcpy(dev2, "\\\\.\\");
-                strcpy(dev2+4, dev);
-        }
-        fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+                strcpy(dev2 + 4, dev);
+        }
+        fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+                        OPEN_EXISTING, 0, NULL);
         if (dev2 != dev)
                 free(dev2);
@@ -130 +132 @@
                 default: sp_die("Error: Could not set baud rate");
         }
-        dcb.ByteSize=8;
-        dcb.Parity=NOPARITY;
-        dcb.StopBits=ONESTOPBIT;
+        dcb.ByteSize = 8;
+        dcb.Parity = NOPARITY;
+        dcb.StopBits = ONESTOPBIT;
         if (!SetCommState(fd, &dcb)) {
                 sp_die("Error: Could not change serial port configuration");
@@ -148 +150 @@
                 if (sp_baudtable[i].baud == 0) {
                         close(fd);
-                        msg_perr(
-                                "Error: cannot configure for baudrate %d\n",
-                                baud);
+                        msg_perr("Error: cannot configure for baudrate %d\n",
+                                 baud);
                         exit(1);
                 }