Changeset 1413 for trunk

Timestamp:

08/15/11 21:54:20 (9 months ago)

Author:

hailfinger

Message:

Fixup of r1397:

• Mixing uninitialized and initialized local variables leads to confusion.
• ft2232_spi error cases should have gotten some error handling, and that's the reason the curly braces were there.
• Fixing typos/wording in some places would have been nice given that those places were touched anyway.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

Location:

trunk

Files:

• board_enable.c (modified) (3 diffs)
• buspirate_spi.c (modified) (1 diff)
• chipset_enable.c (modified) (2 diffs)
• cli_classic.c (modified) (1 diff)
• dediprog.c (modified) (2 diffs)
• dmi.c (modified) (1 diff)
• flashrom.c (modified) (7 diffs)
• ft2232_spi.c (modified) (2 diffs)
• it85spi.c (modified) (2 diffs)
• it87spi.c (modified) (1 diff)
• physmap.c (modified) (1 diff)

trunk/board_enable.c

@@ -861 +861 @@
         }
 
-        /* First, check the ISA bridge */
+        /* Check for the ISA bridge first. */
         dev = pci_dev_find_vendorclass(0x10DE, 0x0601);
         switch (dev->device_id) {
@@ -1130 +1130 @@
         uint32_t tmp, base;
 
-        /* GPPO {0,8,27,28,30} are always available */
-        static const uint32_t nonmuxed_gpos  = 0x58000101;
+        /* GPO{0,8,27,28,30} are always available. */
+        static const uint32_t nonmuxed_gpos = 0x58000101;
 
         static const struct {unsigned int reg, mask, value; } piix4_gpo[] = {
@@ -1180 +1180 @@
 
         if ((((1 << gpo) & nonmuxed_gpos) == 0) &&
-             (pci_read_word(dev, piix4_gpo[gpo].reg)
-             & piix4_gpo[gpo].mask) != piix4_gpo[gpo].value) {
-                msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n",
-                         gpo);
+            ((pci_read_word(dev, piix4_gpo[gpo].reg) & piix4_gpo[gpo].mask) !=
+             piix4_gpo[gpo].value)) {
+                msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n", gpo);
                 return -1;
         }

trunk/buspirate_spi.c

@@ -151 +151 @@
 {
         unsigned char buf[512];
-        int ret = 0, i, spispeed = 0x7;
         char *dev = NULL;
         char *speed = NULL;
+        int spispeed = 0x7;
+        int ret = 0;
+        int i;
 
         dev = extract_programmer_param("dev");

trunk/chipset_enable.c

@@ -310 +310 @@
 {
         uint32_t fwh_conf;
+        int i, tmp;
         char *idsel = NULL;
-        int i, tmp, max_decode_fwh_idsel = 0, max_decode_fwh_decode = 0;
+        int max_decode_fwh_idsel = 0, max_decode_fwh_decode = 0;
         int contiguous = 1;
 
@@ -1036 +1037 @@
         } else {
                 msg_pinfo("AMD Elan SC520 detected, but no BOOTCS. "
-                          "Assuming flash at 4G\n");
+                          "Assuming flash at 4G.\n");
         }
 

trunk/cli_classic.c

@@ -105 +105 @@
         struct flashchip *fill_flash;
         const char *name;
-        int startchip = 0, chipcount = 0, namelen, opt, option_index = 0;
+        int namelen, opt, i;
+        int startchip = 0, chipcount = 0, option_index = 0, force = 0;
+#if CONFIG_PRINT_WIKI == 1
+        int list_supported_wiki = 0;
+#endif
         int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0;
-        int dont_verify_it = 0, list_supported = 0, force = 0;
-#if CONFIG_PRINT_WIKI == 1
-        int list_supported_wiki = 0;
-#endif
-        int operation_specified = 0, i, ret = 0;
+        int dont_verify_it = 0, list_supported = 0, operation_specified = 0;
+        int ret = 0;
 
         static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh";

trunk/dediprog.c

@@ -497 +497 @@
 {
         char *tmp = NULL;
-        int i, millivolt, fraction = 0;
+        int i;
+        int millivolt = 0, fraction = 0;
 
         if (!voltage || !strlen(voltage)) {
@@ -575 +576 @@
         struct usb_device *dev;
         char *voltage;
-        int millivolt = 3500, ret;
+        int millivolt = 3500;
+        int ret;
 
         msg_pspew("%s\n", __func__);

trunk/dmi.c

@@ -197 +197 @@
 static int dmi_compare(const char *value, const char *pattern)
 {
-        int anchored = 0, patternlen;
+        int anchored = 0;
+        int patternlen;
 
         msg_pspew("matching %s against %s\n", value, pattern);

trunk/flashrom.c

@@ -601 +601 @@
         /* Flash registers live 4 MByte below the flash. */
         /* FIXME: This is incorrect for nonstandard flashbase. */
-        flash->virtual_registers = (chipaddr)programmer_map_flash_region(
-            "flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size);
+        flash->virtual_registers = (chipaddr)programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size);
 }
 
@@ -754 +753 @@
                  const char *message)
 {
-        int i, ret = 0, failcount = 0;
+        int i;
         uint8_t *readbuf = malloc(len);
+        int ret = 0, failcount = 0;
 
         if (!len)
@@ -833 +833 @@
 int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran)
 {
-        int result = 0, i, j, limit;
+        int result = 0;
+        int i, j, limit;
 
         switch (gran) {
@@ -899 +900 @@
                           int *first_start, enum write_granularity gran)
 {
-        int need_write = 0, rel_start = 0, first_len = 0, i, limit, stride;
+        int need_write = 0, rel_start = 0, first_len = 0;
+        int i, limit, stride;
 
         switch (gran) {
@@ -1327 +1329 @@
 static int selfcheck_eraseblocks(const struct flashchip *flash)
 {
-        int i, j, k, ret = 0;
+        int i, j, k;
+        int ret = 0;
 
         for (k = 0; k < NUM_ERASEFUNCTIONS; k++) {
@@ -1452 +1455 @@
 {
         int i, j;
-        unsigned int start = 0, len;
+        unsigned int start = 0;
+        unsigned int len;
         struct block_eraser eraser = flash->block_erasers[erasefunction];
 
@@ -1604 +1608 @@
 {
         const char *pname;
-        int pnamelen, remaining = 0, firstline = 1, i;
+        int pnamelen;
+        int remaining = 0, firstline = 1;
         enum programmer p;
+        int i;
 
         for (p = 0; p < PROGRAMMER_INVALID; p++) {

trunk/ft2232_spi.c

@@ -253 +253 @@
         }
 
-        if (ftdi_usb_reset(ftdic) < 0)
+        if (ftdi_usb_reset(ftdic) < 0) {
                 msg_perr("Unable to reset FTDI device\n");
-
-        if (ftdi_set_latency_timer(ftdic, 2) < 0)
+        }
+
+        if (ftdi_set_latency_timer(ftdic, 2) < 0) {
                 msg_perr("Unable to set latency timer\n");
-
-        if (ftdi_write_data_set_chunksize(ftdic, 256))
+        }
+
+        if (ftdi_write_data_set_chunksize(ftdic, 256)) {
                 msg_perr("Unable to set chunk size\n");
-
-        if (ftdi_set_bitmode(ftdic, 0x00, BITMODE_BITBANG_SPI) < 0)
+        }
+
+        if (ftdi_set_bitmode(ftdic, 0x00, BITMODE_BITBANG_SPI) < 0) {
                 msg_perr("Unable to set bitmode to SPI\n");
+        }
 
         if (clock_5x) {
@@ -330 +334 @@
         static unsigned char *buf = NULL;
         /* failed is special. We use bitwise ops, but it is essentially bool. */
-        int i = 0, ret = 0, failed = 0, bufsize;
+        int i = 0, ret = 0, failed = 0;
+        int bufsize;
         static int oldbufsize = 0;
 

trunk/it85spi.c

@@ -85 +85 @@
 
 /* This function will poll the keyboard status register until either
- *   an expected value shows up, or
- *   timeout reaches.
- *
- * Returns: 0 -- the expected value has shown.
- *          1 -- timeout reached.
+ * an expected value shows up, or the timeout is reached.
+ * timeout is in usec.
+ *
+ * Returns: 0 -- the expected value showed up.
+ *          1 -- timeout.
  */
 static int wait_for(const unsigned int mask, const unsigned int expected_value,
-                const int timeout /* in usec */, const char *error_message,
-                const char *function_name, const int lineno)
+                    const int timeout, const char * error_message,
+                    const char * function_name, const int lineno)
 {
         int time_passed;
@@ -318 +318 @@
 
         it85xx_enter_scratch_rom();
-        /* exit scratch ROM ONLY when programmer shuts down. Otherwise, the
-         * temporary flash state may halt EC. */
+        /* Exit scratch ROM ONLY when programmer shuts down. Otherwise, the
+         * temporary flash state may halt the EC.
+         */
 
 #ifdef LPC_IO

trunk/it87spi.c

@@ -204 +204 @@
 int init_superio_ite(void)
 {
-        int i, ret = 0;
+        int i;
+        int ret = 0;
 
         for (i = 0; i < superio_count; i++) {

trunk/physmap.c

@@ -77 +77 @@
         mi.address = phys_addr;
         mi.size = len;
-        ret = __dpmi_physical_address_mapping (&mi);
+        ret = __dpmi_physical_address_mapping(&mi);
 
         if (ret != 0)