Changeset 913 for trunk/chipset_enable.c

Timestamp:

Feb 25, 2010 12:38:23 PM (3 years ago)

Author:

mkarcher

Message:

Rename identifiers called 'byte'

Still fallout of adding "-Wshadow". Missed the ht1000 one
(chipset_enable is not compied on Windows where we had the collision
with "byte" last time) and the other occurrence is newly introduced.
Old libpci defines a global symbol called "byte" too.

Signed-off-by: Michael Karcher <flashrom@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

File:

• trunk/chipset_enable.c (modified) (4 diffs)

trunk/chipset_enable.c

@@ -1061 +1061 @@
 {
         int ret = 0;
-        uint8_t byte;
+        uint8_t val;
         uint16_t status;
         char *busname;
@@ -1071 +1071 @@
 
         /* dev is the ISA bridge. No idea what the stuff below does. */
-        byte = pci_read_byte(dev, 0x8a);
+        val = pci_read_byte(dev, 0x8a);
         msg_pdbg("ISA/LPC bridge reg 0x8a contents: 0x%02x, bit 6 is %i, bit 5 "
-                 "is %i\n", byte, (byte >> 6) & 0x1, (byte >> 5) & 0x1);
-        switch ((byte >> 5) & 0x3) {
+                 "is %i\n", val, (val >> 6) & 0x1, (val >> 5) & 0x1);
+        switch ((val >> 5) & 0x3) {
         case 0x0:
                 buses_supported = CHIP_BUSTYPE_LPC;
@@ -1091 +1091 @@
         /* Force enable SPI and disable LPC? Not a good idea. */
 #if 0
-        byte |= (1 << 6);
-        byte &= ~(1 << 5);
-        pci_write_byte(dev, 0x8a, byte);
+        val |= (1 << 6);
+        val &= ~(1 << 5);
+        pci_write_byte(dev, 0x8a, val);
 #endif
 
@@ -1225 +1225 @@
 static int enable_flash_ht1000(struct pci_dev *dev, const char *name)
 {
-        uint8_t byte;
+        uint8_t val;
 
         /* Set the 4MB enable bit. */
-        byte = pci_read_byte(dev, 0x41);
-        byte |= 0x0e;
-        pci_write_byte(dev, 0x41, byte);
-
-        byte = pci_read_byte(dev, 0x43);
-        byte |= (1 << 4);
-        pci_write_byte(dev, 0x43, byte);
+        val = pci_read_byte(dev, 0x41);
+        val |= 0x0e;
+        pci_write_byte(dev, 0x41, val);
+
+        val = pci_read_byte(dev, 0x43);
+        val |= (1 << 4);
+        pci_write_byte(dev, 0x43, val);
 
         return 0;