[flashrom] [commit] r1813 - trunk

[repository service]

Author: stefanct
Date: Mon Jun  2 01:49:03 2014
New Revision: 1813
URL: http://flashrom.org/trac/flashrom/changeset/1813

Log:
Move global io_base_addr into compilation units.

Signed-off-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified:
   trunk/atahpt.c
   trunk/gfxnvidia.c
   trunk/it8212.c
   trunk/nic3com.c
   trunk/nicintel_spi.c
   trunk/nicnatsemi.c
   trunk/nicrealtek.c
   trunk/ogp_spi.c
   trunk/pcidev.c
   trunk/programmer.h

Modified: trunk/atahpt.c
==============================================================================
--- trunk/atahpt.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/atahpt.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -33,6 +33,8 @@
 
 #define PCI_VENDOR_ID_HPT	0x1103
 
+static uint32_t io_base_addr = 0;
+
 const struct dev_entry ata_hpt[] = {
 	{0x1103, 0x0004, NT, "Highpoint", "HPT366/368/370/370A/372/372N"},
 	{0x1103, 0x0005, NT, "Highpoint", "HPT372A/372N"},

Modified: trunk/gfxnvidia.c
==============================================================================
--- trunk/gfxnvidia.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/gfxnvidia.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -89,7 +89,7 @@
 	if (!dev)
 		return 1;
 
-	io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
+	uint32_t io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
 	if (!io_base_addr)
 		return 1;
 

Modified: trunk/it8212.c
==============================================================================
--- trunk/it8212.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/it8212.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -59,7 +59,7 @@
 		return 1;
 
 	/* Bit 0 is address decode enable, 17-31 the base address, everything else reserved/zero. */
-	io_base_addr = pcidev_readbar(dev, PCI_ROM_ADDRESS) & 0xFFFFFFFE;
+	uint32_t io_base_addr = pcidev_readbar(dev, PCI_ROM_ADDRESS) & 0xFFFFFFFE;
 	if (!io_base_addr)
 		return 1;
 

Modified: trunk/nic3com.c
==============================================================================
--- trunk/nic3com.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/nic3com.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -33,6 +33,7 @@
 
 #define PCI_VENDOR_ID_3COM	0x10b7
 
+static uint32_t io_base_addr = 0;
 static uint32_t internal_conf;
 static uint16_t id;
 

Modified: trunk/nicintel_spi.c
==============================================================================
--- trunk/nicintel_spi.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/nicintel_spi.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -179,7 +179,7 @@
 	if (!dev)
 		return 1;
 
-	io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
+	uint32_t io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
 	if (!io_base_addr)
 		return 1;
 

Modified: trunk/nicnatsemi.c
==============================================================================
--- trunk/nicnatsemi.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/nicnatsemi.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -30,6 +30,7 @@
 #define BOOT_ROM_ADDR		0x50
 #define BOOT_ROM_DATA		0x54
 
+static uint32_t io_base_addr = 0;
 const struct dev_entry nics_natsemi[] = {
 	{0x100b, 0x0020, NT, "National Semiconductor", "DP83815/DP83816"},
 	{0x100b, 0x0022, NT, "National Semiconductor", "DP83820"},

Modified: trunk/nicrealtek.c
==============================================================================
--- trunk/nicrealtek.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/nicrealtek.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -28,6 +28,7 @@
 #define PCI_VENDOR_ID_REALTEK	0x10ec
 #define PCI_VENDOR_ID_SMC1211	0x1113
 
+static uint32_t io_base_addr = 0;
 static int bios_rom_addr, bios_rom_data;
 
 const struct dev_entry nics_realtek[] = {

Modified: trunk/ogp_spi.c
==============================================================================
--- trunk/ogp_spi.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/ogp_spi.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -132,7 +132,7 @@
 	if (!dev)
 		return 1;
 
-	io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
+	uint32_t io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
 	if (!io_base_addr)
 		return 1;
 

Modified: trunk/pcidev.c
==============================================================================
--- trunk/pcidev.c	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/pcidev.c	Mon Jun  2 01:49:03 2014	(r1813)
@@ -25,7 +25,6 @@
 #include "programmer.h"
 #include "hwaccess.h"
 
-uint32_t io_base_addr;
 struct pci_access *pacc;
 
 enum pci_bartype {

Modified: trunk/programmer.h
==============================================================================
--- trunk/programmer.h	Mon Jun  2 01:48:31 2014	(r1812)
+++ trunk/programmer.h	Mon Jun  2 01:49:03 2014	(r1813)
@@ -173,8 +173,7 @@
 struct pci_dev;
 
 /* pcidev.c */
-// FIXME: These need to be local, not global
-extern uint32_t io_base_addr;
+// FIXME: This needs to be local, not global(?)
 extern struct pci_access *pacc;
 int pci_init_common(void);
 uintptr_t pcidev_readbar(struct pci_dev *dev, int bar);