Changeset 1463 for trunk/chipset_enable.c

Timestamp:

11/10/11 00:40:00 (6 months ago)

Author:

hailfinger

Message:

Register Parallel/LPC/FWH programmers the same way SPI programmers are registered.

All programmers are now calling programmer registration functions and
direct manipulations of buses_supported are not needed/possible anymore.

Note: Programmers without parallel/LPC/FWH chip support should not call
register_par_programmer().

Additional fixes:
Set max_rom_decode.parallel for drkaiser.
Remove abuse of programmer_map_flash_region in it85spi.
Annotate several FIXMEs in it85spi.

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

File:

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

trunk/chipset_enable.c

@@ -214 +214 @@
         uint16_t xbcs = 0x4e;   /* X-Bus Chip Select register. */
 
-        buses_supported = BUS_PARALLEL;
+        internal_buses_supported = BUS_PARALLEL;
 
         old = pci_read_word(dev, xbcs);
@@ -304 +304 @@
          * FB_DEC_EN2.
          */
-        buses_supported = BUS_FWH;
+        internal_buses_supported = BUS_FWH;
         return enable_flash_ich(dev, name, 0x4e);
 }
@@ -413 +413 @@
 
         /* If we're called by enable_flash_ich_dc_spi, it will override
-         * buses_supported anyway.
+         * internal_buses_supported anyway.
          */
-        buses_supported = BUS_FWH;
+        internal_buses_supported = BUS_FWH;
         return enable_flash_ich(dev, name, 0xdc);
 }
@@ -435 +435 @@
                 rpci_write_byte(dev, 0xd9, new);
 
-        buses_supported = BUS_FWH;
+        internal_buses_supported = BUS_FWH;
         return 0;
 }
@@ -469 +469 @@
         if (bnt & 0x02) {
                 /* If strapped to LPC, no SPI initialization is required */
-                buses_supported = BUS_FWH;
+                internal_buses_supported = BUS_FWH;
                 return 0;
         }
 
         /* This adds BUS_SPI */
-        buses_supported = BUS_SPI;
         if (ich_init_spi(dev, tmp, rcrb, 7) != 0) {
                 if (!ret)
@@ -557 +556 @@
          * on ICH7 when the southbridge is strapped to LPC
          */
-        buses_supported = BUS_FWH;
+        internal_buses_supported = BUS_FWH;
         if (ich_generation == CHIPSET_ICH7) {
                 if (bbs == 0x03) {
@@ -565 +564 @@
                 } else {
                         /* Disable LPC/FWH if strapped to PCI or SPI */
-                        buses_supported = 0;
+                        internal_buses_supported = BUS_NONE;
                 }
         }
@@ -670 +669 @@
 #define CS5530_ENABLE_SA20              (1 << 6)
 
-        buses_supported = BUS_PARALLEL;
+        internal_buses_supported = BUS_PARALLEL;
         /* Decode 0x000E0000-0x000FFFFF (128 kB), not just 64 kB, and
          * decode 0xFF000000-0xFFFFFFFF (16 MB), not just 256 kB.
@@ -823 +822 @@
         }
 
-        buses_supported = BUS_LPC | BUS_FWH;
+        internal_buses_supported = BUS_LPC | BUS_FWH;
 
         ret = sb600_probe_spi(dev);
@@ -917 +916 @@
         uint8_t tmp;
 
-        buses_supported = BUS_PARALLEL;
+        internal_buses_supported = BUS_PARALLEL;
 
         tmp = INB(0xc06);
@@ -1017 +1016 @@
         case 0x0:
                 ret = enable_flash_mcp55(dev, name);
-                buses_supported = BUS_LPC;
+                internal_buses_supported = BUS_LPC;
                 msg_pdbg("Flash bus type is LPC\n");
                 break;
@@ -1025 +1024 @@
                  * Do we really want to disable LPC in this case?
                  */
-                buses_supported = BUS_NONE;
+                internal_buses_supported = BUS_NONE;
                 msg_pdbg("Flash bus type is SPI\n");
                 msg_pinfo("SPI on this chipset is WIP. Please report any "
@@ -1033 +1032 @@
         default:
                 /* Should not happen. */
-                buses_supported = BUS_NONE;
+                internal_buses_supported = BUS_NONE;
                 msg_pdbg("Flash bus type is unknown (none)\n");
                 msg_pinfo("Something went wrong with bus type detection.\n");
@@ -1326 +1325 @@
         int ret = -2;           /* Nothing! */
         int i;
-        char *s;
 
         /* Now let's try to find the chipset we have... */
@@ -1378 +1376 @@
         }
 
-        s = flashbuses_to_text(buses_supported);
-        msg_pinfo("This chipset supports the following protocols: %s.\n", s);
-        free(s);
-
         return ret;
 }