Changeset 3401 for trunk/util/flashrom/spi.c

Timestamp:

07/01/08 01:45:22 (5 months ago)

Author:

stepan

Message:

First attempt to clean up SPI probing and create a common
construct: the flash bus.

At some point the flash bus will be part of struct flashchip.

Pardon me for pushing this in, but I think it is important to beware of further
decay and it will improve things for other developers in the short run.

Carl-Daniel, I will consider your suggestions in another patch. I want to keep
things from getting too much for now. The patch includes Rudolf's VIA SPI
changes though.

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

Files:

• trunk/util/flashrom/spi.c (modified) (5 diffs)

trunk/util/flashrom/spi.c

@@ -35 +35 @@
 int spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr)
 {
-        if (it8716f_flashport)
+        switch (flashbus) {
+        case BUS_TYPE_IT87XX_SPI:
                 return it8716f_spi_command(writecnt, readcnt, writearr, readarr);
-        else if ((ich7_detected) || (viaspi_detected))
-                return ich_spi_command(writecnt, readcnt, writearr, readarr);
-        else if (ich9_detected)
-                return ich_spi_command(writecnt, readcnt, writearr, readarr);
-        printf_debug("%s called, but no SPI chipset detected\n", __FUNCTION__);
+        case BUS_TYPE_ICH7_SPI:
+        case BUS_TYPE_ICH9_SPI:
+        case BUS_TYPE_VIA_SPI:
+               return ich_spi_command(writecnt, readcnt, writearr, readarr);
+        default:
+                printf_debug("%s called, but no SPI chipset/strapping detected\n", __FUNCTION__);
+        }
         return 1;
 }
@@ -136 +139 @@
 
         /* only some SPI chipsets support 4 bytes commands */
-        if (!((ich7_detected) || (ich9_detected) || (viaspi_detected)))
-                return 0;
-        return probe_spi_rdid_generic(flash, 4);
+        switch (flashbus) {
+        case BUS_TYPE_ICH7_SPI:
+        case BUS_TYPE_ICH9_SPI:
+        case BUS_TYPE_VIA_SPI:
+                return probe_spi_rdid_generic(flash, 4);
+        default:
+                printf_debug("4b ID not supported on this SPI controller\n");
+        }
+
+        return 0;
 }
 
@@ -317 +327 @@
 void spi_page_program(int block, uint8_t *buf, uint8_t *bios)
 {
-        if (it8716f_flashport) {
+        switch (flashbus) {
+        case BUS_TYPE_IT87XX_SPI:
                 it8716f_spi_page_program(block, buf, bios);
-                return;
-        }
-        printf_debug("%s called, but no SPI chipset detected\n", __FUNCTION__);
+                break;
+        case BUS_TYPE_ICH7_SPI:
+        case BUS_TYPE_ICH9_SPI:
+                printf_debug("%s called, but not implemented for ICH\n", __FUNCTION__);
+                break;
+        default:
+                printf_debug("%s called, but no SPI chipset/strapping detected\n", __FUNCTION__);
+        }
 }
 
@@ -376 +392 @@
 int spi_chip_read(struct flashchip *flash, uint8_t *buf)
 {
-        if (it8716f_flashport)
+
+        switch (flashbus) {
+        case BUS_TYPE_IT87XX_SPI:
                 return it8716f_spi_chip_read(flash, buf);
-        else if ((ich7_detected) || (viaspi_detected))
+        case BUS_TYPE_ICH7_SPI:
+        case BUS_TYPE_ICH9_SPI:
+        case BUS_TYPE_VIA_SPI:
                 return ich_spi_read(flash, buf);
-        else if (ich9_detected)
-                return ich_spi_read(flash, buf);
-        printf_debug("%s called, but no SPI chipset detected\n", __FUNCTION__);
+        default:
+                printf_debug("%s called, but no SPI chipset/strapping detected\n", __FUNCTION__);
+        }
+
         return 1;
 }
@@ -388 +409 @@
 int spi_chip_write(struct flashchip *flash, uint8_t *buf)
 {
-        if (it8716f_flashport)
+        switch (flashbus) {
+        case BUS_TYPE_IT87XX_SPI:
                 return it8716f_spi_chip_write(flash, buf);
-        else if ((ich7_detected) || (viaspi_detected))
+        case BUS_TYPE_ICH7_SPI:
+        case BUS_TYPE_ICH9_SPI:
+        case BUS_TYPE_VIA_SPI:
                 return ich_spi_write(flash, buf);
-        else if (ich9_detected)
-                return ich_spi_write(flash, buf);
-        printf_debug("%s called, but no SPI chipset detected\n", __FUNCTION__);
+        default:
+                printf_debug("%s called, but no SPI chipset/strapping detected\n", __FUNCTION__);
+        }
+
         return 1;
 }