summaryrefslogtreecommitdiff
path: root/src/southbridge/intel/pxhd
diff options
context:
space:
mode:
authorLuc Verhaegen <libv@skynet.be>2009-06-03 14:19:33 +0000
committerLuc Verhaegen <libv@skynet.be>2009-06-03 14:19:33 +0000
commita9c5ea08d07d343d32d4c083a232107bd84d8064 (patch)
treefbe58f136039f1c35ab5fea76fcd7970b63a3a3e /src/southbridge/intel/pxhd
parent9efecc5408cb72d5e547736cba90c1814539a10c (diff)
Revert "CMOS: Add set_option and rework get_option."
This reverts commit eb7bb49eb5b48c39baf7a256b7c74e23e3da5660. Stepan pointed out that "s" means string, which makes the following statement in this commit message invalid: "Since we either have reserved space (which we shouldn't do anything with in these two functions), an enum or a hexadecimal value, unsigned int seemed like the way to go." Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Luc Verhaegen <libv@skynet.be> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4335 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge/intel/pxhd')
-rw-r--r--src/southbridge/intel/pxhd/pxhd_bridge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/southbridge/intel/pxhd/pxhd_bridge.c b/src/southbridge/intel/pxhd/pxhd_bridge.c
index fadbd15491..5913063606 100644
--- a/src/southbridge/intel/pxhd/pxhd_bridge.c
+++ b/src/southbridge/intel/pxhd/pxhd_bridge.c
@@ -38,12 +38,12 @@ static void pxhd_enable(device_t dev)
static unsigned int pxhd_scan_bridge(device_t dev, unsigned int max)
{
- uint32_t bus_100Mhz = 0;
+ int bus_100Mhz = 0;
dev->link[0].dev = dev;
dev->links = 1;
- get_option("pxhd_bus_speed_100", &bus_100Mhz);
+ get_option(&bus_100Mhz, "pxhd_bus_speed_100");
if(bus_100Mhz) {
uint16_t word;
@@ -66,7 +66,7 @@ static void pcix_init(device_t dev)
uint32_t dword;
uint16_t word;
uint8_t byte;
- uint32_t nmi_option;
+ int nmi_option;
/* Bridge control ISA enable */
pci_write_config8(dev, 0x3e, 0x07);
@@ -115,7 +115,7 @@ static void pcix_init(device_t dev)
/* NMI enable */
nmi_option = NMI_OFF;
- get_option("nmi", &nmi_option);
+ get_option(&nmi_option, "nmi");
if(nmi_option) {
dword = pci_read_config32(dev, 0x44);
dword |= (1<<0);