diff options
| author | Eric Biederman <ebiederm@xmission.com> | 2003-06-12 19:23:51 +0000 |
|---|---|---|
| committer | Eric Biederman <ebiederm@xmission.com> | 2003-06-12 19:23:51 +0000 |
| commit | 7a5416af9574095c6df28fb8192fe4c063afa8da (patch) | |
| tree | 66cc3bb27f8319255ebab48ba774d584693d4c22 /src/southbridge/amd/amd8111 | |
| parent | 540ae01cd341de75f5eb57906699ca24667d71cc (diff) | |
- Modify the freebios tree so the pci config space api is mostly in sync between
code that runs without ram and code that runs with ram.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@869 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge/amd/amd8111')
| -rw-r--r-- | src/southbridge/amd/amd8111/amd8111_ide.c | 12 | ||||
| -rw-r--r-- | src/southbridge/amd/amd8111/amd8111_lpc.c | 15 | ||||
| -rw-r--r-- | src/southbridge/amd/amd8111/amd8111_usb.c | 4 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/southbridge/amd/amd8111/amd8111_ide.c b/src/southbridge/amd/amd8111/amd8111_ide.c index f351606989..8e034493e8 100644 --- a/src/southbridge/amd/amd8111/amd8111_ide.c +++ b/src/southbridge/amd/amd8111/amd8111_ide.c @@ -14,7 +14,7 @@ static void ide_init(struct device *dev) printk_debug("ide_init\n"); - pci_read_config_word(dev, 0x40, &word); + word = pci_read_config16(dev, 0x40); /* Ensure prefetch is disabled */ word &= ~((1 << 15) | (1 << 13)); if (enable_b) { @@ -31,10 +31,10 @@ static void ide_init(struct device *dev) word |= (1<<12); word |= (1<<14); - pci_write_config_word(dev, 0x40, word); + pci_write_config16(dev, 0x40, word); word = 0x0f; - pci_write_config_word(dev, 0x42, word); + pci_write_config16(dev, 0x42, word); /* The AMD768 has a bug where the BM DMA address must be * 256 byte aligned while it is only 16 bytes long. @@ -43,11 +43,11 @@ static void ide_init(struct device *dev) * FIXME: I assume the 8111 does the same thing. We should * clarify. stepan@suse.de */ - pci_write_config_dword(dev, 0x20, 0xf01); + pci_write_config32(dev, 0x20, 0xf01); - pci_write_config_dword(dev, 0x48, 0x205e5e5e); + pci_write_config32(dev, 0x48, 0x205e5e5e); word = 0x06a; - pci_write_config_word(dev, 0x4c, word); + pci_write_config16(dev, 0x4c, word); } static struct device_operations ide_ops = { diff --git a/src/southbridge/amd/amd8111/amd8111_lpc.c b/src/southbridge/amd/amd8111/amd8111_lpc.c index d8b4ba1b77..f098bfa2b4 100644 --- a/src/southbridge/amd/amd8111/amd8111_lpc.c +++ b/src/southbridge/amd/amd8111/amd8111_lpc.c @@ -1,3 +1,6 @@ +/* + * (C) 2003 Linux Networx + */ #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -94,24 +97,24 @@ static void lpc_init(struct device *dev) #if 0 /* IO APIC initialization */ - pci_read_config_byte(dev, 0x4B, &byte); + byte = pci_read_config8(dev, 0x4B); byte |= 1; - pci_write_config_byte(dev, 0x4B, byte); + pci_write_config8(dev, 0x4B, byte); setup_ioapic(); #endif /* posted memory write enable */ - pci_read_config_byte(dev, 0x46, &byte); - pci_write_config_byte(dev, 0x46, byte | (1<<0)); + byte = pci_read_config8(dev, 0x46); + pci_write_config8(dev, 0x46, byte | (1<<0)); /* power after power fail */ - pci_read_config_byte(dev, 0x43, &byte); + byte = pci_read_config8(dev, 0x43); if (pwr_on) { byte &= ~(1<<6); } else { byte |= (1<<6); } - pci_write_config_byte(dev, 0x43, byte); + pci_write_config8(dev, 0x43, byte); } diff --git a/src/southbridge/amd/amd8111/amd8111_usb.c b/src/southbridge/amd/amd8111/amd8111_usb.c index a6d3c4e9e1..467e907a99 100644 --- a/src/southbridge/amd/amd8111/amd8111_usb.c +++ b/src/southbridge/amd/amd8111/amd8111_usb.c @@ -9,8 +9,8 @@ static void usb_init(struct device *dev) uint32_t cmd; printk_debug("USB: Setting up controller.. "); - pci_read_config_dword(dev, PCI_COMMAND, &cmd); - pci_write_config_dword(dev, PCI_COMMAND, + cmd = pci_read_config32(dev, PCI_COMMAND); + pci_write_config32(dev, PCI_COMMAND, cmd | PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE); |