Changeset 933 for trunk/board_enable.c

Timestamp:

03/13/10 18:28:29 (2 years 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@…>

File:

• trunk/board_enable.c (modified) (14 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");
+                }
         }