i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now uses the new smp_apic.h header file.

Browse Source 
Changed apic_read()/apic_write() to accept offsets not addresses as register
parameter.
Cleanups.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2605 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-01-30 21:22:03 +00:00
parent 9175b5a5e0
commit 7870c58c18
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/arch/x86/arch_smp.c
+8 -6
View File
@@ -18,6 +18,7 @@
#include <arch/smp.h> #include <arch/smp.h>
#include <arch/x86/smp_priv.h> #include <arch/x86/smp_priv.h>
#include <arch/x86/smp_apic.h>
#include <arch/x86/timer.h> #include <arch/x86/timer.h>
#include <string.h> #include <string.h>
@@ -75,15 +76,16 @@ i386_smp_error_interrupt(void *data)
static uint32 static uint32
apic_read(uint32 *addr) apic_read(uint32 offset)
{ {
return *addr; return *(uint32 *)((uint32)apic + offset);
} }
static void static void
apic_write(uint32 *addr, uint32 data) apic_write(uint32 offset, uint32 data)
{ {
uint32 *addr = (uint32 *)((uint32)apic + offset);
*addr = data; *addr = data;
} }
@@ -120,7 +122,7 @@ arch_smp_init(kernel_args *ka)
void void
arch_smp_send_broadcast_ici(void) arch_smp_send_broadcast_ici(void)
{ {
int config; uint32 config;
int state = disable_interrupts(); int state = disable_interrupts();
config = apic_read(APIC_ICR1) & APIC_ICR1_WRITE_MASK; config = apic_read(APIC_ICR1) & APIC_ICR1_WRITE_MASK;
@@ -133,7 +135,7 @@ arch_smp_send_broadcast_ici(void)
void void
arch_smp_send_ici(int target_cpu) arch_smp_send_ici(int target_cpu)
{ {
int config; uint32 config;
int state = disable_interrupts(); int state = disable_interrupts();
config = apic_read(APIC_ICR2) & APIC_ICR2_MASK; config = apic_read(APIC_ICR2) & APIC_ICR2_MASK;
@@ -191,7 +193,7 @@ arch_smp_set_apic_timer(bigtime_t relative_timeout)
int int
arch_smp_clear_apic_timer(void) arch_smp_clear_apic_timer(void)
{ {
unsigned int config; uint32 config;
int state; int state;
if (apic == NULL) if (apic == NULL)