Fix r8111 for APIC mode: Don't skip LAPIC initialization if already mapped.
git-svn-id: svn://kolibrios.org@8120 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
1919b8efdc
commit
609e822a2b
@ -155,11 +155,12 @@ end if
|
|||||||
align 4
|
align 4
|
||||||
LAPIC_init:
|
LAPIC_init:
|
||||||
|
|
||||||
cmp [LAPIC_BASE], 0
|
mov eax, [LAPIC_BASE]
|
||||||
jne .done
|
test eax, eax
|
||||||
|
jnz @f
|
||||||
stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_GLOBAL+PG_NOCACHE+PG_SWR
|
stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_GLOBAL+PG_NOCACHE+PG_SWR
|
||||||
mov [LAPIC_BASE], eax
|
mov [LAPIC_BASE], eax
|
||||||
|
@@:
|
||||||
mov esi, eax
|
mov esi, eax
|
||||||
|
|
||||||
; Program Destination Format Register for Flat mode.
|
; Program Destination Format Register for Flat mode.
|
||||||
|
Loading…
Reference in New Issue
Block a user