[flashrom] r567 - trunk

Author: uwe
Date: 2009-06-02 21:54:22 +0200 (Tue, 02 Jun 2009)
New Revision: 567

Modified:
   trunk/chipset_enable.c
   trunk/dummyflasher.c
   trunk/flash.h
   trunk/flashrom.8
   trunk/nic3com.c
Log:
Mark the 10b7:9058 3COM card (3C905B: Cyclone 10/100/BNC) as "OK", forgot
this in the last commit. Also do some random cleanups while I'm at it.

Signed-off-by: Uwe Hermann 
Acked-by: Uwe Hermann

Modified: trunk/chipset_enable.c
===================================================================
--- trunk/chipset_enable.c	2009-06-02 16:45:59 UTC (rev 566)
+++ trunk/chipset_enable.c	2009-06-02 19:54:22 UTC (rev 567)
@@ -781,15 +781,15 @@

static int enable_flash_nvidia_nforce2(struct pci_dev *dev, const char *name)
 {
-    uint8_t tmp;
+	uint8_t tmp;

-    pci_write_byte(dev, 0x92, 0);
+	pci_write_byte(dev, 0x92, 0);

-    tmp = pci_read_byte(dev, 0x6d);
-    tmp |= 0x01;
-    pci_write_byte(dev, 0x6d, tmp);
+	tmp = pci_read_byte(dev, 0x6d);
+	tmp |= 0x01;
+	pci_write_byte(dev, 0x6d, tmp);

-    return 0;
+	return 0;
 }

static int enable_flash_ck804(struct pci_dev *dev, const char *name)

Modified: trunk/dummyflasher.c
===================================================================
--- trunk/dummyflasher.c	2009-06-02 16:45:59 UTC (rev 566)
+++ trunk/dummyflasher.c	2009-06-02 19:54:22 UTC (rev 567)
@@ -66,7 +66,7 @@
    if (buses_supported == CHIP_BUSTYPE_NONE)
    	printf_debug("Support for all flash bus types disabled.\n");
    free(dummytype);
-	return 0; 
+	return 0;
 }

int dummy_shutdown(void)

Modified: trunk/flash.h
===================================================================
--- trunk/flash.h	2009-06-02 16:45:59 UTC (rev 566)
+++ trunk/flash.h	2009-06-02 19:54:22 UTC (rev 567)
@@ -346,8 +346,8 @@
 #define EN_29F040A		0x7F04
 #define EN_29LV010		0x7F6E
 #define EN_29LV040A		0x7F4F	/* EN_29LV040(A) */
-#define EN_29F002T		0x7F92
-#define EN_29F002B		0x7F97
+#define EN_29F002T		0x7F92	/* Also EN29F002A */
+#define EN_29F002B		0x7F97	/* Also EN29F002AN */

#define FUJITSU_ID		0x04	/* Fujitsu */
 #define MBM29F400BC		0xAB

Modified: trunk/flashrom.8
===================================================================
--- trunk/flashrom.8	2009-06-02 16:45:59 UTC (rev 566)
+++ trunk/flashrom.8	2009-06-02 19:54:22 UTC (rev 567)
@@ -133,7 +133,7 @@
 .sp
 .BR "* satasii" " (for flash ROMs on Silicon Image SATA/IDE controllers)"
 .sp
-.BR "* it87spi" " (for flash ROMs behind a IT87xx SuperI/O LPC/SPI translation unit)"
+.BR "* it87spi" " (for flash ROMs behind an ITE IT87xx Super I/O LPC/SPI translation unit)"
 .sp
 The dummy programmer has an optional parameter specifying the bus types it
 should support. For that you have to use the

Modified: trunk/nic3com.c
===================================================================
--- trunk/nic3com.c	2009-06-02 16:45:59 UTC (rev 566)
+++ trunk/nic3com.c	2009-06-02 19:54:22 UTC (rev 567)
@@ -46,7 +46,7 @@
    {0x10b7, 0x9006, PCI_NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2 (TPC)" },
    {0x10b7, 0x900a, PCI_NT, "3COM", "3C90xB: PCI 10BASE-FL" },
    {0x10b7, 0x905a, PCI_NT, "3COM", "3C90xB: PCI 10BASE-FX" },
-	{0x10b7, 0x9058, PCI_NT, "3COM", "3C905B: Cyclone 10/100/BNC" },
+	{0x10b7, 0x9058, PCI_OK, "3COM", "3C905B: Cyclone 10/100/BNC" },

/* 3C905C */
    {0x10b7, 0x9200, PCI_OK, "3COM", "3C905C: EtherLink 10/100 PCI (TX)" },