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

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
+$Revision: 3626 $
 $Revision: 3589 $
 USE_COM_IRQ     equ 1      ; make irq 3 and irq 4 available for PCI devices
-USE_COM_IRQ     equ 1      ; make irq 3 and irq 4 available for PCI devices
+VESA_1_2_VIDEO  equ 0      ; enable vesa 1.2 bank switch functions
         dw     11011111b *256 +10010010b
         db     0x00
+include "data16.inc"
+if ~ lang eq sp
+diff16 "end of bootcode",0,$+0x10000
-include "data16.inc"
+end if
 use32
 org $+0x10000
         mov     [display_height_standard], eax
         dec     eax
         mov     [Screen_Max_Y], eax
         mov     [screen_workarea.bottom], eax
-        movzx   eax, word [BOOT_VAR+BOOT_VESA_MODE]; screen mode
+        movzx   eax, word [BOOT_VAR+BOOT_VESA_MODE] ; screen mode
-        mov     [SCR_MODE], eax
+        mov     dword [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
+        mov     eax, 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+BOOT_PITCH]      ; for other modes
-        mov     [BytesPerScanLine], ax
-        mov     [_display.pitch], eax
 @@:
+        mov     [_display.pitch], eax
         mov     eax, [_display.width]
         mul     [_display.height]
         mov     [_WinMapSize], eax
         mov     esi, boot_inittimer
         call    boot_log
 ; Initialize system timer (IRQ0)
         call    PIT_init
+; CALCULATE FAT CHAIN FOR RAMDISK
+        call    calculatefatchain
         mov     esi, boot_initapic
         call    boot_log
 ; Try to Initialize APIC
 ;!!!!!!!!!!!!!!!!!!!!!!!
 include 'boot/rdload.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!
 end if
 ;    mov    [dma_hdd],1
-; CALCULATE FAT CHAIN FOR RAMDISK
-        call    calculatefatchain
 if 0
         mov     ax, [OS_BASE+0x10000+bx_from_load]
         cmp     ax, 'r1'; if using not ram disk, then load librares and parameters {SPraid.simba}
         call    wakeup_osloop
         xor     eax, eax
-        mov     [BTN_ADDR], dword BUTTON_INFO ; address of button list
         mov     [BTN_ADDR], dword BUTTON_INFO ; address of button list
         mov     byte [MOUSE_BUFF_COUNT], al              ; mouse buffer
         mov     byte [KEY_COUNT], al              ; keyboard buffer
-        mov     byte [BTN_COUNT], al              ; button buffer
-;        mov   [MOUSE_X],dword 100*65536+100    ; mouse x/y
         mov     byte [BTN_COUNT], al              ; button buffer
-     ;!! IP 04.02.2005:
+;        mov   [MOUSE_X],dword 100*65536+100    ; mouse x/y
 ;        mov     byte [DONT_SWITCH], al; change task if possible
         pop     eax
         mov     eax, [TASK_BASE]
         mov     [eax+TASKDATA.state], 3; terminate this program
         call    wakeup_osloop
-    waitterm:            ; wait here for termination
-        mov     ebx, 100
+.waitterm:            ; wait here for termination
-        call    delay_hs
+        call    change_task
-        jmp     waitterm
+        jmp     .waitterm
 ;------------------------------------------------------------------------------
 align 4
 restore_default_cursor_before_killing:
   full_table:
 ;     cmp  ecx,2
         dec     ecx
         jnz     exit_for_anyone
         call    for_all_tables
-        mov     ecx, 16384
+        mov     ecx, DRIVE_DATA_SIZE/4
         cld
         rep movsd
         ret
 ;------------------------------------------------------------------------------
 sysfn_lastkey:          ; 18.12 = return 0 (backward compatibility)
         ja      .exit
         pushfd
         cli
         mov     eax, ecx
-        mov     ecx, [BytesPerScanLine]
+        mov     ecx, [_display.pitch]
         mov     [_display.width], eax
         dec     eax
         mov     [_display.height], edx
         dec     edx
         mov     eax, [BG_Rect_X_left_right]
         mov     edx, [BG_Rect_Y_top_bottom]
         cmp     [edi+SLOT_BASE+APPDATA.draw_bgr_x], 0
         jz      .set
 .join:
-        cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_x+2], ax
-        jbe     @f
-        mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_x+2], ax
-@@:
-        shr     eax, 16
         cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_x], ax
         jae     @f
         mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_x], ax
 @@:
+        shr     eax, 16
-        cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+        cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_x+2], ax
         jbe     @f
-        mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+        mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_x+2], ax
 @@:
-        shr     edx, 16
         cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_y], dx
         jae     @f
         mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_y], dx
 @@:
+        shr     edx, 16
+        cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+        jbe     @f
+        mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+@@:
         jmp     .common
 .set:
         mov     [edi+SLOT_BASE+APPDATA.draw_bgr_x], eax
         mov     [edi+SLOT_BASE+APPDATA.draw_bgr_y], edx
 .common:
         call    delay_hs
         call    protect_from_terminate
         ret
 endp
+if 1
+align 4
+delay_hs:     ; delay in 1/100 secs
+; ebx = delay time
+        pushad
+        push    ebx
+        xor     esi, esi
+        mov     ecx, MANUAL_DESTROY
+        call    create_event
+        test    eax, eax
+        jz      .done
+        mov     ebx, edx
+        mov     ecx, [esp]
+        push    edx
+        push    eax
+        call    wait_event_timeout
+        pop     eax
+        pop     ebx
+        call    destroy_event
+.done:
+        add     esp, 4
+        popad
+        ret
+else
 align 4
 delay_hs:     ; delay in 1/100 secs
 ; ebx = delay time
         push    ecx
 align 4
 zerodelay:
         pop     edx
         pop     ecx
         ret
+end if
 ;-----------------------------------------------------------------------------
 align 16        ;very often call this subrutine
 memmove:       ; memory move in bytes
 ; eax = from
 ; ebx = to
         pushad
    @@:
         cmp     [esi], byte 0
         je      @f
-        mov     eax, 1
+        mov     ebx, 1
-        movzx   ebx, byte [esi]
+        movzx   ecx, byte [esi]
         call    sys_msg_board
         inc     esi
         jmp     @b
    @@:
         push    eax
         and     al, 0xF
         cmp     al, 10
         sbb     al, 69h
         das
-        mov     bl, al
+        mov     cl, al
-        xor     eax, eax
+        xor     ebx, ebx
-        inc     eax
+        inc     ebx
         call    sys_msg_board
         pop     eax
         pop     ecx
         loop    @b
         popad
   msg_board_count dd 0x0
 endg
 sys_msg_board:
+; ebx=1 : write :  bl byte to write
+; ebx=2 :  read :  ebx=0 -> no data, ebx=1 -> data in al
+        push    eax ebx                 ; Save eax and ebx, since we're restoring their order required.
-; eax=1 : write :  bl byte to write
+        mov     eax, ebx
-; eax=2 :  read :  ebx=0 -> no data, ebx=1 -> data in al
+        mov     ebx, ecx
         add     word [msg_board_pos+2], 6
         cmp     bl, 10
         jnz     @f
         mov     word [msg_board_pos+2], 234
         add     word [msg_board_pos], 10
-        mov     ax, [Screen_Max_Y]
+        mov     ax, word [Screen_Max_Y]
         cmp     word [msg_board_pos], ax
         jbe     @f
         mov     word [msg_board_pos], 10
 @@:
 end if
         popa
 end if
         inc     ecx
         and     ecx, msg_board_data_size - 1
         mov     [msg_board_count], ecx
+        pop     ebx eax
         ret
 .smbl1:
         cmp     eax, 2
         jne     .smbl2
         test    ecx, ecx
         jz      .smbl21
+        add     esp, 8                  ; Returning data in ebx and eax, so no need to restore them.
         mov     eax, msg_board_data+1
         mov     ebx, msg_board_data
         movzx   edx, byte [ebx]
         call    memmove
         dec     [msg_board_count]
-        mov     [esp + 36], edx ;eax
+        mov     [esp + 32], edx ;eax
-        mov     [esp + 24], dword 1
+        mov     [esp + 20], dword 1
         ret
 .smbl21:
-        mov     [esp+36], ecx
+        mov     [esp+32], ecx
-        mov     [esp+24], ecx
+        mov     [esp+20], ecx
 .smbl2:
+        pop     ebx eax
         ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; 66 sys function.                                                ;;
 .1:                             ; resolution
         mov     eax, [Screen_Max_X]
         shl     eax, 16
-        mov     ax, [Screen_Max_Y]
+        mov     ax, word [Screen_Max_Y]
         add     eax, 0x00010001
         mov     [esp+32], eax
         ret
 .2:                             ; bits per pixel
         mov     eax, [_display.bpp]
         mov     [esp+32], eax
         ret
 .3:                             ; bytes per scanline
-        mov     eax, [BytesPerScanLine]
+        mov     eax, [_display.pitch]
         mov     [esp+32], eax
 .drectr:
         ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
-        mov     ax, [Screen_Max_X]
+        mov     ax, word [Screen_Max_X]
         shl     eax, 16
-        mov     ax, [Screen_Max_Y]
+        mov     ax, word [Screen_Max_Y]
         mov     [esp + 32], eax
         ret
         inc     ecx
         mov     edi, BPSLine_calc_area
         cld
 @@:
         stosd
-        add     eax, [BytesPerScanLine]
+        add     eax, [_display.pitch]
         dec     ecx
         jnz     @r
         ret
 ;------------------------------------------------------------------------------
 align 4
         pushfd
         cli
         mov     [Screen_Max_X], eax
         mov     [Screen_Max_Y], edx
-        mov     [BytesPerScanLine], ecx
+        mov     [_display.pitch], ecx
         mov     [screen_workarea.right], eax
         cmp     byte [BOOT_VAR+0x9030], 1
         jne     @F
         ret
 @@:
         call    stop_all_services
-        push    3                ; stop playing cd
-        pop     eax
+        movi    eax, 3
         call    sys_cd_audio
 yes_shutdown_param:
         cli
-if ~ defined extended_primary_loader
-        mov     eax, kernel_file ; load kernel.mnt to 0x7000:0
+if ~ defined extended_primary_loader
-        push    12
+        mov     eax, kernel_file ; load kernel.mnt to 0x7000:0
-        pop     esi
+        movi    esi, 12
         xor     ebx, ebx
         or      ecx, -1
         stc
 .ok:
         ret
 end if
+if ~ lang eq sp
+diff16 "end of .text segment",0,$
+end if
 include "data32.inc"

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm – Rev 3589 → 3626