[coreboot-gerrit] Patch set updated for coreboot: 4204f40 x86 I/O APIC: Make functions `io_apic_{read, write}()` public
Paul Menzel (paulepanter@users.sourceforge.net)
gerrit at coreboot.org
Sat May 4 17:11:10 CEST 2013
Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3180
-gerrit
commit 4204f40942661cdbae0c2695e523d0944ffaebd9
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date: Tue Apr 23 14:34:43 2013 +0200
x86 I/O APIC: Make functions `io_apic_{read,write}()` public
Some LPC initialiation can save some lines of code when being able
to use the functions `io_apic_read()` and `io_apic_write()`.
Change-Id: Id600007573ff011576967339cc66e6c883a2ed5a
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
src/arch/x86/include/arch/ioapic.h | 2 ++
src/arch/x86/lib/ioapic.c | 4 ++--
src/drivers/generic/ioapic/Kconfig | 3 +++
src/drivers/generic/ioapic/ioapic.c | 4 ++--
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h
index b989e52..7ff47bb 100644
--- a/src/arch/x86/include/arch/ioapic.h
+++ b/src/arch/x86/include/arch/ioapic.h
@@ -39,6 +39,8 @@
#define SMI (2 << 8)
#define INT (1 << 8)
+u32 io_apic_read(u32 ioapic_base, u32 reg);
+void io_apic_write(u32 ioapic_base, u32 reg, u32 value);
void set_ioapic_id(u32 ioapic_base, u8 ioapic_id);
void setup_ioapic(u32 ioapic_base, u8 ioapic_id);
void clear_ioapic(u32 ioapic_base);
diff --git a/src/arch/x86/lib/ioapic.c b/src/arch/x86/lib/ioapic.c
index 389c48c..4964af6 100644
--- a/src/arch/x86/lib/ioapic.c
+++ b/src/arch/x86/lib/ioapic.c
@@ -22,13 +22,13 @@
#include <console/console.h>
#include <cpu/x86/lapic.h>
-static u32 io_apic_read(u32 ioapic_base, u32 reg)
+u32 io_apic_read(u32 ioapic_base, u32 reg)
{
write32(ioapic_base, reg);
return read32(ioapic_base + 0x10);
}
-static void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
+void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
{
write32(ioapic_base, reg);
write32(ioapic_base + 0x10, value);
diff --git a/src/drivers/generic/ioapic/Kconfig b/src/drivers/generic/ioapic/Kconfig
index f8b46cb..b78b93b 100644
--- a/src/drivers/generic/ioapic/Kconfig
+++ b/src/drivers/generic/ioapic/Kconfig
@@ -1,2 +1,5 @@
config DRIVERS_GENERIC_IOAPIC
bool
+
+if DRIVERS_GENERIC_IOAPIC
+ IOAPIC = n
diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c
index 9a93c78..379a415 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -12,13 +12,13 @@
#include <arch/io.h>
#include <cpu/x86/lapic.h>
-static u32 io_apic_read(u32 ioapic_base, u32 reg)
+u32 io_apic_read(u32 ioapic_base, u32 reg)
{
write32(ioapic_base, reg);
return read32(ioapic_base + 0x10);
}
-static void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
+void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
{
write32(ioapic_base, reg);
write32(ioapic_base + 0x10, value);
More information about the coreboot-gerrit
mailing list