WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 2439 $
+$Revision: 2441 $
 tmp_page_tabs   dd ?
+__DEBUG__       fix 1
+__DEBUG_LEVEL__ fix 1
-__DEBUG__ fix 1
+include 'fdo.inc'
 __DEBUG_LEVEL__ fix 1
 include 'init.inc'
         mov     ecx, disk_list_mutex
         call    mutex_init
 ; SAVE REAL MODE VARIABLES
-        mov     ax, [BOOT_VAR + 0x9031]
+        mov     ax, [BOOT_VAR + BOOT_IDE_BASE_ADDR]
         mov     [IDEContrRegsBaseAddr], ax
 ; --------------- APM ---------------------
 ; init selectors
-        mov     ebx, [BOOT_VAR+0x9040]          ; offset of APM entry point
+        mov     ebx, [BOOT_VAR+BOOT_APM_ENTRY]        ; offset of APM entry point
-        movzx   eax, word [BOOT_VAR+0x9050]; real-mode segment base address of
+        movzx   eax, word [BOOT_VAR+BOOT_APM_CODE_32] ; real-mode segment base address of
-                                                                                ; protected-mode 32-bit code segment
+                                                      ; protected-mode 32-bit code segment
-        movzx   ecx, word [BOOT_VAR+0x9052]; real-mode segment base address of
+        movzx   ecx, word [BOOT_VAR+BOOT_APM_CODE_16]; real-mode segment base address of
-                                                                                ; protected-mode 16-bit code segment
+                                               ; protected-mode 16-bit code segment
-        movzx   edx, word [BOOT_VAR+0x9054]; real-mode segment base address of
+        movzx   edx, word [BOOT_VAR+BOOT_APM_DATA_16]; real-mode segment base address of
                                                                                 ; protected-mode 16-bit data segment
         mov     [dword apm_data_16 + 4], dl
         mov     dword[apm_entry], ebx
         mov     word [apm_entry + 4], apm_code_32 - gdts
-        mov     eax, [BOOT_VAR + 0x9044]; version & flags
+        mov     eax, [BOOT_VAR + BOOT_APM_VERSION] ; version & flags
-        mov     [apm_vf], eax
-; -----------------------------------------
-;        movzx eax,byte [BOOT_VAR+0x9010]       ; mouse port
+        mov     [apm_vf], eax
-;        mov   [0xF604],byte 1  ;al
+; -----------------------------------------
-        mov     al, [BOOT_VAR+0x901F]                   ; DMA access
+        mov     al, [BOOT_VAR+BOOT_DMA]            ; DMA access
         mov     [allow_dma_access], al
-        movzx   eax, byte [BOOT_VAR+0x9000]      ; bpp
+        movzx   eax, byte [BOOT_VAR+BOOT_BPP]      ; bpp
         mov     [ScreenBPP], al
         mov     [_display.bpp], eax
         mov     [_display.vrefresh], 60
-        movzx   eax, word [BOOT_VAR+0x900A]; X max
+        movzx   eax, word [BOOT_VAR+BOOT_X_RES]; X max
         mov     [_display.width], eax
         dec     eax
         mov     [Screen_Max_X], eax
         mov     [screen_workarea.right], eax
-        movzx   eax, word [BOOT_VAR+0x900C]; Y max
+        movzx   eax, word [BOOT_VAR+BOOT_Y_RES]; Y max
         mov     [_display.height], eax
         dec     eax
         mov     [Screen_Max_Y], eax
         mov     [screen_workarea.bottom], eax
-        movzx   eax, word [BOOT_VAR+0x9008]; screen mode
+        movzx   eax, word [BOOT_VAR+BOOT_VESA_MODE]; screen mode
         mov     [SCR_MODE], eax
 ;        mov     eax, [BOOT_VAR+0x9014]    ; Vesa 1.2 bnk sw add
 ;        mov     [BANK_SWITCH], eax
         mov     [BytesPerScanLine], word 640*4      ; Bytes PerScanLine
         cmp     [SCR_MODE], word 0x13       ; 320x200
         je      @f
         cmp     [SCR_MODE], word 0x12       ; VGA 640x480
         je      @f
-        movzx   eax, word[BOOT_VAR+0x9001]      ; for other modes
+        movzx   eax, word[BOOT_VAR+BOOT_PITCH]   ; for other modes
         mov     [BytesPerScanLine], ax
         mov     edi, BiosDisksData
         rep movsd
-; GRAPHICS ADDRESSES
+; GRAPHICS ADDRESSES
         and     byte [BOOT_VAR+0x901e], 0x0
-        mov     eax, [BOOT_VAR+0x9018]
+        mov     eax, [BOOT_VAR+BOOT_LFB]
         mov     [LFBAddress], eax
         mov     al, 0x7 + 1 shl 5
         out     dx, al
+end if
+        mov     eax, [cpu_count]
+        test    eax, eax
+        jnz     @F
+        mov al, 1                               ; at least one CPU
 @@:
-end if
+        DEBUGF  1, "K : %d CPU detected\n", eax
-        ; Fly :)
         ; Fly :)
 include 'unpacker.inc'
-include 'fdo.inc'
+include 'unpacker.inc'
 .fl60:
         in      al, 0x60
         loop    .fl60
         push    eax
-        mov     ax, [BOOT_VAR+0x900c]
+        mov     ax, [BOOT_VAR+BOOT_Y_RES]
         shr     ax, 1
         shl     eax, 16
-        mov     ax, [BOOT_VAR+0x900A]
+        mov     ax, [BOOT_VAR+BOOT_X_RES]
         shr     ax, 1
         mov     [MOUSE_X], eax

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm @ 4288 – Rev 2439 → 2441