[flashrom] [commit] r1011 - trunk

[repository service]

Author: uwe
Date: Mon May 24 19:39:14 2010
New Revision: 1011
URL: http://flashrom.org/trac/coreboot/changeset/1011

Log:
Various nicrealtek fixes:

- Add missing entries for 'flashrom -L' output and wiki output.

- Add missing entries in the manpage.

- nicrealtek.c: Coding style fixes and cosmetics.

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

Modified:
   trunk/flashrom.8
   trunk/nicrealtek.c
   trunk/print.c
   trunk/print_wiki.c

Modified: trunk/flashrom.8
==============================================================================
--- trunk/flashrom.8	Mon May 24 18:03:57 2010	(r1010)
+++ trunk/flashrom.8	Mon May 24 19:39:14 2010	(r1011)
@@ -152,6 +152,10 @@
 .sp
 .BR "* nic3com" " (for flash ROMs on 3COM network cards)"
 .sp
+.BR "* nicrealtek" " (for flash ROMs on Realtek network cards)"
+.sp
+.BR "* nicsmc1211" " (for flash ROMs on RTL8139-compatible SMC2 network cards)"
+.sp
 .BR "* gfxnvidia" " (for flash ROMs on NVIDIA graphics cards)"
 .sp
 .BR "* drkaiser" " (for flash ROMs on Dr. Kaiser PC-Waechter PCI cards)"
@@ -276,7 +280,7 @@
 Example:
 .B "flashrom -p dummy:lpc,fwh"
 .TP
-.BR "nic3com" , " gfxnvidia" , " satasii " and " atahpt " programmers
+.BR "nic3com" , " nicrealtek" , " nicsmc1211" , " gfxnvidia" , " satasii " and " atahpt " programmers
 These programmers have an option to specify the PCI address of the card
 your want to use, which must be specified if more than one card supported
 by the selected programmer is installed in your system. The syntax is

Modified: trunk/nicrealtek.c
==============================================================================
--- trunk/nicrealtek.c	Mon May 24 18:03:57 2010	(r1010)
+++ trunk/nicrealtek.c	Mon May 24 19:39:14 2010	(r1011)
@@ -30,34 +30,34 @@
 #define BIOS_ROM_DATA		0xD7

struct pcidev_status nics_realtek[] = {
-	{0x10ec, 0x8139, OK, "Realtek","rtl8139b/c PCI 10/100 Mbps"},
+	{0x10ec, 0x8139, OK, "Realtek", "RTL8139/8139C/8139C+"},
    {},
 };

struct pcidev_status nics_realteksmc1211[] = {
-	{0x1113, 0x1211, OK, "SMC", "SMC 1211TX rtl8139 clone 10/100 Mbps"},
-	{}
+	{0x1113, 0x1211, OK, "SMC2", "1211TX"}, /* RTL8139 clone */
+	{},
 };

-
 int nicrealtek_init(void)
 {
    get_io_perms();
+
    io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0,
-			nics_realtek, programmer_param);
-	
+				   nics_realtek, programmer_param);
+
    buses_supported = CHIP_BUSTYPE_PARALLEL;

return 0;
 }

-
 int nicsmc1211_init(void)
 {
    get_io_perms();
+
    io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0,
-			nics_realteksmc1211, programmer_param);
-	
+				   nics_realteksmc1211, programmer_param);
+
    buses_supported = CHIP_BUSTYPE_PARALLEL;

return 0;
@@ -73,17 +73,23 @@

void nicrealtek_chip_writeb(uint8_t val, chipaddr addr)
 {
-	OUTL(((uint32_t)addr &0x01FFFF)|0x0A0000| (val << 24), io_base_addr + BIOS_ROM_ADDR);
-	OUTL(((uint32_t)addr &0x01FFFF)|0x1E0000| (val << 24), io_base_addr + BIOS_ROM_ADDR);
+	OUTL(((uint32_t)addr & 0x01FFFF) | 0x0A0000 | (val << 24),
+	     io_base_addr + BIOS_ROM_ADDR);
+	OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24),
+	     io_base_addr + BIOS_ROM_ADDR);
 }

uint8_t nicrealtek_chip_readb(const chipaddr addr)
-
 {
-	uint8_t val=INB(io_base_addr + BIOS_ROM_DATA);
-	OUTL(((uint32_t)addr & 0x01FFFF) | 0x060000 | (val << 24), io_base_addr + BIOS_ROM_ADDR);
-	val=INB(io_base_addr + BIOS_ROM_DATA);
-	OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24), io_base_addr + BIOS_ROM_ADDR);
-	return val ;
+	uint8_t val;
+
+	val = INB(io_base_addr + BIOS_ROM_DATA);
+	OUTL(((uint32_t)addr & 0x01FFFF) | 0x060000 | (val << 24),
+	     io_base_addr + BIOS_ROM_ADDR);
+
+	val = INB(io_base_addr + BIOS_ROM_DATA);
+	OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24),
+	     io_base_addr + BIOS_ROM_ADDR);

+	return val;
 }

Modified: trunk/print.c
==============================================================================
--- trunk/print.c	Mon May 24 18:03:57 2010	(r1010)
+++ trunk/print.c	Mon May 24 19:39:14 2010	(r1011)
@@ -238,6 +238,10 @@
 #if NIC3COM_SUPPORT == 1
    	print_supported_pcidevs(nics_3com);
 #endif
+#if NICREALTEK_SUPPORT == 1
+		print_supported_pcidevs(nics_realtek);
+		print_supported_pcidevs(nics_realteksmc1211);
+#endif
 #if GFXNVIDIA_SUPPORT == 1
    	print_supported_pcidevs(gfx_nvidia);
 #endif

Modified: trunk/print_wiki.c
==============================================================================
--- trunk/print_wiki.c	Mon May 24 18:03:57 2010	(r1010)
+++ trunk/print_wiki.c	Mon May 24 19:39:14 2010	(r1011)
@@ -592,6 +592,10 @@
 #if NIC3COM_SUPPORT == 1
    print_supported_pcidevs_wiki(nics_3com);
 #endif
+#if NICREALTEK_SUPPORT == 1
+	print_supported_pcidevs_wiki(nics_realtek);
+	print_supported_pcidevs_wiki(nics_realteksmc1211);
+#endif
 #if GFXNVIDIA_SUPPORT == 1
    print_supported_pcidevs_wiki(gfx_nvidia);
 #endif