acpi: read ioapic & local apic bases

git-svn-id: svn://kolibrios.org@2212 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/branches/net/blkdev/hd_drv.inc

@@ -49,6 +49,12 @@ hd_read:
 ; Read through BIOS?
         cmp     [hdpos], 0x80
         jae     .bios
+; hd_read_{dma,pio} use old ATA with 28 bit for sector number
+        cmp     eax, 0x10000000
+        jb      @f
+        inc     [hd_error]
+        jmp     return_01
+@@:
 ; DMA read is permitted if [allow_dma_access]=1 or 2
         cmp     [allow_dma_access], 2
         ja      .nodma
@@ -235,6 +241,8 @@ hd_write:
 
 align 4
 cache_write_pio:
+    cmp   dword[esi],0x10000000
+    jae   .bad
 ;    call  disable_ide_int
 
     call  wait_for_hd_idle
@@ -295,6 +303,9 @@ cache_write_pio:
     pop   esi ecx
 
     ret
+.bad:
+    inc   [hd_error]
+    ret
 
 save_hd_wait_timeout:
 
@@ -686,6 +697,9 @@ write_cache_sector:
 write_cache_chain:
         cmp     [hdpos], 0x80
         jae     bd_write_cache_chain
+        mov     eax,[cache_chain_ptr]
+        cmp     dword[eax],0x10000000
+        jae     .bad
         push    esi
         mov     eax, IDE_descriptor_table
         mov     edx,eax
@@ -779,6 +793,9 @@ write_cache_chain:
         jnz     hd_write_error_dma
         pop     esi
         ret
+.bad:
+        inc     [hd_error]
+        ret
 
 uglobal
 IDEContrRegsBaseAddr    dw      ?
@@ -882,11 +899,11 @@ int13_call:
 ; Because this code uses fixed addresses,
 ; it can not be run simultaniously by many threads.
 ; In current implementation it is protected by common mutex 'hd1_status'
-        mov     word [BOOT_VAR + 510h], 10h             ; packet length
-        mov     word [BOOT_VAR + 512h], cx              ; number of sectors
-        mov     dword [BOOT_VAR + 514h], 9A000000h      ; buffer 9A00:0000
-        mov     dword [BOOT_VAR + 518h], eax
-        and     dword [BOOT_VAR + 51Ch], 0
+        mov     word [OS_BASE + 510h], 10h             ; packet length
+        mov     word [OS_BASE + 512h], cx              ; number of sectors
+        mov     dword [OS_BASE + 514h], 9A000000h      ; buffer 9A00:0000
+        mov     dword [OS_BASE + 518h], eax
+        and     dword [OS_BASE + 51Ch], 0
         push    ebx ecx esi edi
         mov     ebx, int13_regs_in
         mov     edi, ebx
@@ -916,10 +933,12 @@ int13_call:
         mov     [ebx+v86_regs.eflags], 20200h
         mov     esi, [sys_v86_machine]
         mov     ecx, 0x502
+        push fs
         call    v86_start
+        pop  fs
         and     [bios_hdpos], 0
         pop     edi esi ecx ebx
-        movzx   edx, byte [BOOT_VAR + 512h]
+        movzx   edx, byte [OS_BASE + 512h]
         test    byte [int13_regs_out+v86_regs.eflags], 1
         jnz     @f
         mov     edx, ecx