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

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 3500 $
+$Revision: 3555 $
+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
+; Enabling the next line will enable serial output console
 debug_com_base  equ 0x3f8  ; 0x3f8 is com1, 0x2f8 is com2, 0x3e8 is com3, 0x2e8 is com4, no irq's are used
+; The following constant, if nonzero, duplicates debug output to the screen.
-; Enabling the next line will enable serial output console
+debug_direct_print equ 0
 ;debug_com_base  equ 0x3f8  ; 0x3f8 is com1, 0x2f8 is com2, 0x3e8 is com3, 0x2e8 is com4, no irq's are used
 include "proc32.inc"
 include "boot/bootcode.inc"    ; 16 bit system boot code
 include "bus/pci/pci16.inc"
+include "detect/biosdisk.inc"
+FDD_BUFF            equ (OS_BASE+0x000D000)
+sys_pgdir           equ (OS_BASE+0x006F000)
+VGABasePtr          equ (OS_BASE+0x00A0000)
+RAMDISK             equ (OS_BASE+0x0100000)
+CLEAN_ZONE          equ 0x284000
+IDE_DMA             equ 0x284000
+BOOT_VAR            equ (OS_BASE+0x02E0000)
+TASK_COUNT          equ (CURRENT_TASK+0x04)
+TASK_BASE           equ (CURRENT_TASK+0x10)
+TASK_DATA           equ (CURRENT_TASK+0x20)
+TASK_EVENT          equ (CURRENT_TASK+0x20)
+BPSLine_calc_area   equ (OS_BASE+0x02C4000)
+d_width_calc_area   equ (OS_BASE+0x02CA000)
+stack_data_start    equ (OS_BASE+0x02F0000)
+eth_data_start      equ (OS_BASE+0x02F0000)
+stack_data          equ (OS_BASE+0x02F4000)
+stack_data_end      equ (OS_BASE+0x030ffff)
+resendQ             equ (OS_BASE+0x0310000)
 include "detect/biosdisk.inc"
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                      ;;
 ;;                  SWITCH TO 32 BIT PROTECTED MODE                     ;;
         call    mutex_init
         mov     ecx, unpack_mutex
+        call    mutex_init
+        mov     ecx, application_table_mutex
         call    mutex_init
 ; SAVE REAL MODE VARIABLES
         mov     ax, [BOOT_VAR + BOOT_IDE_BASE_ADDR]
         mov     [apm_vf], eax
 ; -----------------------------------------
         mov     al, [BOOT_VAR+BOOT_DMA]            ; DMA access
         mov     [allow_dma_access], al
         movzx   eax, byte [BOOT_VAR+BOOT_BPP]      ; bpp
-        mov     [ScreenBPP], al
         mov     [_display.bpp], eax
         mov     [_display.vrefresh], 60
         movzx   eax, word [BOOT_VAR+BOOT_X_RES]; X max
         mov     [_display.height], eax
         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
+        mov     ax, word [BOOT_VAR+BOOT_VESA_MODE]  ; screen mode
-        mov     [SCR_MODE], eax
+        mov     [SCR_MODE], ax
-;        mov     eax, [BOOT_VAR+0x9014]    ; Vesa 1.2 bnk sw add
-;        mov     [BANK_SWITCH], eax
-        mov     [BytesPerScanLine], word 640*4      ; Bytes PerScanLine
+        mov     [BytesPerScanLine], 640*4           ; Bytes PerScanLine
-        cmp     [SCR_MODE], word 0x13       ; 320x200
+        cmp     [SCR_MODE], 0x13                    ; 320x200
         je      @f
-        cmp     [SCR_MODE], word 0x12       ; VGA 640x480
+        cmp     [SCR_MODE], 0x12                    ; VGA 640x480
         je      @f
-        movzx   eax, word[BOOT_VAR+BOOT_PITCH]   ; for other modes
+        movzx   eax, word[BOOT_VAR+BOOT_PITCH]      ; for other modes
-        mov     [BytesPerScanLine], ax
+        mov     [BytesPerScanLine], eax
         mov     [_display.pitch], eax
 @@:
         mov     eax, [_display.width]
         mul     [_display.height]
         mov     [_WinMapSize], eax
         jmp     v20ga24
 setvesa20:
         mov     [PUTPIXEL], dword Vesa20_putpixel24 ; Vesa 2.0
         mov     [GETPIXEL], dword Vesa20_getpixel24
-        cmp     [ScreenBPP], byte 24
+        cmp     byte [_display.bpp], 24
         jz      v20ga24
 v20ga32:
         mov     [PUTPIXEL], dword Vesa20_putpixel32
         mov     [GETPIXEL], dword Vesa20_getpixel32
         or      eax, 1 ; bit_0 - System Call Extension (SCE)
         wrmsr
         ; !!!! It`s dirty hack, fix it !!!
         ; Bits of EDX :
-        ; Bit 3116 During the SYSRET instruction, this field is copied into the CS register
+        ; Bit 31–16 During the SYSRET instruction, this field is copied into the CS register
         ;  and the contents of this field, plus 8, are copied into the SS register.
-        ; Bit 150 During the SYSCALL instruction, this field is copied into the CS register
+        ; Bit 15–0 During the SYSCALL instruction, this field is copied into the CS register
         ;  and the contents of this field, plus 8, are copied into the SS register.
 .noSYSCALL:
 ; -----------------------------------------
         stdcall alloc_page
         stdcall map_page, tss-0xF80, eax, PG_SW
         stdcall alloc_page
-        inc     eax
-        mov     [SLOT_BASE+256+APPDATA.io_map], eax
         stdcall map_page, tss+0x80, eax, PG_SW
         stdcall alloc_page
-        inc     eax
-        mov     dword [SLOT_BASE+256+APPDATA.io_map+4], eax
         stdcall map_page, tss+0x1080, eax, PG_SW
 ; LOAD IDT
         call    build_interrupt_table ;lidt is executed
           ;lidt [idtreg]
         call    init_kernel_heap
-        stdcall kernel_alloc, RING0_STACK_SIZE+512
+        stdcall kernel_alloc, (RING0_STACK_SIZE+512) * 2
         stdcall kernel_alloc, [_WinMapSize]
         mov     [_WinMapAddress], eax
         xor     eax, eax
-        inc     eax
-        mov     [CURRENT_TASK], eax     ;dword 1
-        mov     [TASK_COUNT], eax       ;dword 1
-        mov     [TASK_BASE], dword TASK_DATA
-        mov     [current_slot], SLOT_BASE+256
+        inc     eax
 ; set background
 ; SET UP OS TASK
         mov     esi, boot_setostask
         call    boot_log
-        xor     eax, eax
-        mov     dword [SLOT_BASE+APPDATA.fpu_state], fpu_data
-        mov     dword [SLOT_BASE+APPDATA.exc_handler], eax
-        mov     dword [SLOT_BASE+APPDATA.except_mask], eax
-        ; name for OS/IDLE process
-        mov     dword [SLOT_BASE+256+APPDATA.app_name], dword 'OS/I'
-        mov     dword [SLOT_BASE+256+APPDATA.app_name+4], dword 'DLE '
+        mov     edx, SLOT_BASE+256
-        mov     edi, [os_stack_seg]
+        mov     ebx, [os_stack_seg]
-        mov     dword [SLOT_BASE+256+APPDATA.pl0_stack], edi
+        add     ebx, 0x2000
-        add     edi, 0x2000-512
+        call    setup_os_slot
-        mov     dword [SLOT_BASE+256+APPDATA.fpu_state], edi
+        mov     dword [edx], 'IDLE'
-        mov     dword [SLOT_BASE+256+APPDATA.saved_esp0], edi; just for case
-        mov     dword [SLOT_BASE+256+APPDATA.terminate_protection], 80000001h
+        sub     [edx+APPDATA.saved_esp], 4
+        mov     eax, [edx+APPDATA.saved_esp]
-        mov     esi, fpu_data
-        mov     ecx, 512/4
+        mov     dword [eax], idle_thread
-        cld
+        mov     ecx, IDLE_PRIORITY
-        rep movsd
+        call    scheduler_add_thread
-        mov     dword [SLOT_BASE+256+APPDATA.exc_handler], eax
-        mov     dword [SLOT_BASE+256+APPDATA.except_mask], eax
+        mov     edx, SLOT_BASE+256*2
+        mov     ebx, [os_stack_seg]
-        mov     ebx, SLOT_BASE+256+APP_OBJ_OFFSET
+        call    setup_os_slot
-        mov     dword [SLOT_BASE+256+APPDATA.fd_obj], ebx
-        mov     dword [SLOT_BASE+256+APPDATA.bk_obj], ebx
+        mov     dword [edx], 'OS'
-        mov     dword [SLOT_BASE+256+APPDATA.cur_dir], sysdir_path
-        mov     dword [SLOT_BASE+256+APPDATA.tls_base], eax
-        ; task list
+        xor     ecx, ecx
-        mov     dword [TASK_DATA+TASKDATA.mem_start], eax; process base address
+        call    scheduler_add_thread
-        inc     eax
-        mov     dword [CURRENT_TASK], eax
+        mov     dword [CURRENT_TASK], 2
-        mov     dword [TASK_COUNT], eax
-        mov     [current_slot], SLOT_BASE+256
-        mov     [TASK_BASE], dword TASK_DATA
-        mov     byte[TASK_DATA+TASKDATA.wnd_number], al ; on screen number
-        mov     dword [TASK_DATA+TASKDATA.pid], eax     ; process id number
-        mov     [SLOT_BASE + 256 + APPDATA.dir_table], sys_pgdir - OS_BASE
-        stdcall kernel_alloc, 0x10000/8
-        mov     edi, eax
-        mov     [network_free_ports], eax
+        mov     dword [TASK_COUNT], 2
-        or      eax, -1
+        mov     dword [current_slot], SLOT_BASE + 256*2
-        mov     ecx, 0x10000/32
+        mov     dword [TASK_BASE], CURRENT_TASK + 32*2
         rep stosd
 ;        call    boot_log
         mov     [pci_access_enabled], 1
+        call    pci_enum
+        stdcall load_driver, szVidintel
-        call    pci_enum
+        call    usb_init
 ; SET PRELIMINARY WINDOW STACK AND POSITIONS
         call    boot_log
         call    reserve_irqs_ports
         call    init_display
-        mov     eax, [def_cursor]
-        mov     [SLOT_BASE+APPDATA.cursor], eax
+        mov     eax, [def_cursor]
+        mov     [SLOT_BASE+APPDATA.cursor+256], eax
-        mov     [SLOT_BASE+APPDATA.cursor+256], eax
+        mov     [SLOT_BASE+APPDATA.cursor+256*2], eax
-  ; READ TSC / SECOND
+; PRINT CPU FREQUENCY
+        mov     esi, boot_cpufreq
-        mov     esi, boot_tsc
+        call    boot_log
         call    boot_log
-        cli
+        cli                         ;FIXME check IF
-        rdtsc   ;call  _rdtsc
+        rdtsc
-        mov     ecx, eax
-        mov     esi, 250            ; wait 1/4 a second
+        mov     ecx, eax
+        mov     esi, 250            ; wait 1/4 a second
         call    delay_ms
-        rdtsc   ;call  _rdtsc
+        rdtsc
         sti
         sub     eax, ecx
         xor     edx, edx
         shld    edx, eax, 2
         shl     eax, 2
         mov     dword [cpu_freq], eax
         mov     dword [cpu_freq+4], edx
-; PRINT CPU FREQUENCY
-        mov     esi, boot_cpufreq
+        mov     ebx, 1000000
-        call    boot_log
+        div     ebx
+        mov     ebx, eax
         mov     ebx, edx
         movzx   ecx, word [boot_y]
         if lang eq ru
-        add     ecx, (10+19*6) shl 16 - 10         ; 'Determining amount of memory'
+        add     ecx, (10+19*6) shl 16 - 10
         else if lang eq sp
+        add     ecx, (10+25*6) shl 16 - 10
-        add     ecx, (10+25*6) shl 16 - 10         ; 'Determining amount of memory'
+                else
-                else
+        add     ecx, (10+17*6) shl 16 - 10
-        add     ecx, (10+17*6) shl 16 - 10         ; 'Determining amount of memory'
+                end if
                 end if
         mov     edx, 0xFFFFFF
         stdcall map_page, tss._io_map_0, \
                 [SLOT_BASE+256+APPDATA.io_map], PG_MAP
         stdcall map_page, tss._io_map_1, \
                 [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
-        mov     ax, [OS_BASE+0x10000+bx_from_load]
-        cmp     ax, 'r1'; if not rused ram disk - load network configuration from files {SPraid.simba}
-        je      no_st_network
-        call    set_network_conf
-  no_st_network:
 ; LOAD FIRST APPLICATION
         cli
 first_app_found:
-        cli
-        ;mov   [TASK_COUNT],dword 2
         push    1
-        pop     dword [CURRENT_TASK]    ; set OS task fisrt
+        cli
 ; SET KEYBOARD PARAMETERS
         mov     al, 0xf6       ; reset keyboard, scan enabled
         jnz     @F
         mov     al, 1                             ; at least one CPU
 @@:
         DEBUGF  1, "K : %d CPU detected\n", eax
-;        call    print_mem
 ; START MULTITASKING
 ; A 'All set - press ESC to start' messages if need
         cmp     [IDEContrRegsBaseAddr], 0
         setnz   [dma_hdd]
         mov     [timer_ticks_enable], 1         ; for cd driver
         sti
-        call    change_task
+;        call    change_task
         popad
+        ret
+; in: edx -> APPDATA for OS/IDLE slot
+; in: ebx = stack base
+proc setup_os_slot
+        xor     eax, eax
+        mov     ecx, 256/4
+        mov     edi, edx
+        rep stosd
+        mov     eax, tss+0x80
+        call    get_pg_addr
+        inc     eax
+        mov     [edx+APPDATA.io_map], eax
+        mov     eax, tss+0x1080
+        call    get_pg_addr
+        inc     eax
+        mov     [edx+APPDATA.io_map+4], eax
+        mov     dword [edx+APPDATA.pl0_stack], ebx
+        lea     edi, [ebx+0x2000-512]
+        mov     dword [edx+APPDATA.fpu_state], edi
+        mov     dword [edx+APPDATA.saved_esp0], edi
+        mov     dword [edx+APPDATA.saved_esp], edi
+        mov     dword [edx+APPDATA.terminate_protection], 1 ; make unkillable
+        mov     esi, fpu_data
+        mov     ecx, 512/4
+        cld
+        rep movsd
+        lea     eax, [edx+APP_OBJ_OFFSET]
+        mov     dword [edx+APPDATA.fd_obj], eax
+        mov     dword [edx+APPDATA.bk_obj], eax
+        mov     dword [edx+APPDATA.cur_dir], sysdir_path
+        mov     [edx + APPDATA.dir_table], sys_pgdir - OS_BASE
+        mov     eax, edx
+        shr     eax, 3
+        add     eax, CURRENT_TASK - (SLOT_BASE shr 3)
+        mov     [eax+TASKDATA.wnd_number], dh
+        mov     byte [eax+TASKDATA.pid], dh
         ret
-        ret
+endp
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                                                    ;
 ;                    MAIN OS LOOP START                              ;
 ;                                                                    ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+align 32
+osloop:
+        mov     edx, osloop_has_work?
+        xor     ecx, ecx
+        call    Wait_events
+        xor     eax, eax
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        xchg    eax, [osloop_nonperiodic_work]
-align 32
+        test    eax, eax
-osloop:
+        jz      .no_periodic
 ;        call    [draw_pointer]
         call    __sys_draw_pointer
         call    window_check_events
+        call    mouse_check_events
-        call    mouse_check_events
+        call    checkmisc
-        call    checkmisc
         call    checkVga_N13
-        call    stack_handler
+.no_periodic:
-        call    checkidle
+        call    stack_handler
         call    check_fdd_motor_status
         call    check_ATAPI_device_event
         call    check_lights_state
         call    check_timers
         jmp     osloop
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                                                    ;
-;                      MAIN OS LOOP END                              ;
-;                                                                    ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;                      MAIN OS LOOP END                              ;
-align 4
+;                                                                    ;
-checkidle:
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-        pushad
-        call    change_task
+proc osloop_has_work?
-        jmp     idle_loop_entry
+        cmp     [osloop_nonperiodic_work], 0
-  idle_loop:
+        jnz     .yes
-        cmp     eax, [idlemem]    ; eax == [timer_ticks]
+        call    stack_handler_has_work?
-        jne     idle_exit
-        rdtsc   ;call _rdtsc
+        jnz     .yes
-        mov     ecx, eax
+        call    check_fdd_motor_status_has_work?
-        hlt
+        jnz     .yes
-        rdtsc   ;call _rdtsc
+        call    check_ATAPI_device_event_has_work?
-        sub     eax, ecx
-        add     [idleuse], eax
+        jnz     .yes
-  idle_loop_entry:
+        call    check_lights_state_has_work?
+        jnz     .yes
-        mov     eax, [timer_ticks]; eax =  [timer_ticks]
+        call    check_timers_has_work?
-        cmp     [check_idle_semaphore], 0
+        jnz     .yes
+.no:
-        je      idle_loop
+        xor     eax, eax
-        dec     [check_idle_semaphore]
+        ret
-  idle_exit:
+.yes:
+        xor     eax, eax
+        inc     eax
+        ret
+endp
+proc wakeup_osloop
-        mov     [idlemem], eax    ; eax == [timer_ticks]
+        mov     [osloop_nonperiodic_work], 1
-        popad
-        ret
+        ret
-uglobal
+endp
   idlemem               dd   0x0
+uglobal
+align 4
+osloop_nonperiodic_work dd      ?
+endg
+align 4
+idle_thread:
-  idleuse               dd   0x0
+        sti
-  idleusesec            dd   0x0
+idle_loop:
-  check_idle_semaphore  dd   0x0
+        hlt
         ret
 iglobal
-  process_number dd 0x1
+  process_number dd 0x2
         shr     ax, 1
         shl     eax, 16
         mov     ax, [BOOT_VAR+BOOT_X_RES]
         shr     ax, 1
         mov     [MOUSE_X], eax
+        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
      ;!! IP 04.02.2005:
-        mov     byte [DONT_SWITCH], al; change task if possible
+;        mov     byte [DONT_SWITCH], al; change task if possible
         pop     eax
         mov     ecx, [current_slot]
         call    restore_default_cursor_before_killing
         popa
 @@:
 ;--------------------------------------
+; kill all sockets this process owns
+        pusha
+        mov     edx, [TASK_BASE]
+        mov     edx, [edx+TASKDATA.pid]
+        call    SOCKET_process_end
+        popa
+;--------------------------------------
         mov     ecx, [current_slot]
         mov     eax, [ecx+APPDATA.tls_base]
         test    eax, eax
         jz      @F
         stdcall user_free, eax
 @@:
+        mov     eax, [TASK_BASE]
-        mov     eax, [TASK_BASE]
+        mov     [eax+TASKDATA.state], 3; terminate this program
-        mov     [eax+TASKDATA.state], 3; terminate this program
+        call    wakeup_osloop
     waitterm:            ; wait here for termination
         push    esi
         call    [_display.select_cursor]
         mov     [current_cursor], esi
 @@:
         mov     [redrawmouse_unconditional], 1
+        call    wakeup_osloop
         popfd
         ret
 ;------------------------------------------------------------------------------
 iglobal
 align 4
         mov     [BOOT_VAR+0x9030], cl
         mov     eax, [TASK_COUNT]
         mov     [SYS_SHUTDOWN], al
+        mov     [shutdown_processes], eax
-        mov     [shutdown_processes], eax
+        call    wakeup_osloop
         and     dword [esp+32], 0
  exit_for_anyone:
         ret
   uglobal
         call    request_terminate
         pop     edx ecx
         test    eax, eax
         jz      noprocessterminate
 ;--------------------------------------
+; terminate all network sockets it used
+        pusha
+        mov     eax, edx
+        call    SOCKET_process_end
+        popa
+;--------------------------------------
         cmp     [_display.select_cursor], 0
         je      .restore_end
 ; restore default cursor before killing
         pusha
         mov     ecx, [esp+32]
         popa
 .restore_end:
 ;--------------------------------------
      ;call MEM_Heap_Lock      ;guarantee that process isn't working with heap
         mov     [ecx], byte 3; clear possible i40's
+        call    wakeup_osloop
      ;call MEM_Heap_UnLock
-        cmp     edx, [application_table_status]; clear app table stat
+        cmp     edx, [application_table_owner]; clear app table stat
         jne     noatsc
-        and     [application_table_status], 0
+        call    unlock_application_table
 noatsc:
 noprocessterminate:
         add     esp, 4
         ret
 ;------------------------------------------------------------------------------
 sysfn_terminate2:
 ;lock application_table_status mutex
-.table_status:
-        cli
-        cmp     [application_table_status], 0
-        je      .stf
-        sti
-        call    change_task
-        jmp     .table_status
-.stf:
+.table_status:
-        call    set_application_table_status
+        call    lock_application_table
         mov     eax, ecx
         call    pid_to_slot
         test    eax, eax
         jz      .not_found
         mov     ecx, eax
         cli
         call    sysfn_terminate
-        and     [application_table_status], 0
+        call    unlock_application_table
         sti
         and     dword [esp+32], 0
         ret
 .not_found:
-        mov     [application_table_status], 0
+        call    unlock_application_table
         or      dword [esp+32], -1
         ret
 ;------------------------------------------------------------------------------
 sysfn_deactivate:         ; 18.1 = DEACTIVATE WINDOW
         add     edi, window_data
         movzx   esi, word [WIN_STACK + ecx * 2]
         lea     esi, [WIN_POS + esi * 2]
         call    window._.window_deactivate
-        xor     eax, eax
-        mov     byte[MOUSE_BACKGROUND], al
-        mov     byte[DONT_DRAW_MOUSE], al
-        mov     byte[MOUSE_DOWN], 0
         call    syscall_display_settings._.calculate_whole_screen
         call    syscall_display_settings._.redraw_whole_screen
 .nowindowdeactivate:
         ret
         call    change_task
         jmp     @b
 @@:
 ;-------------------------------------
         mov     [window_minimize], 2; restore window if minimized
+        call    wakeup_osloop
         movzx   esi, word [WIN_STACK + ecx*2]
         cmp     esi, [TASK_COUNT]
         call    waredraw
 .nowindowactivate:
         ret
 ;------------------------------------------------------------------------------
 sysfn_getidletime:              ; 18.4 = GET IDLETIME
-        mov     eax, [idleusesec]
+        mov     eax, [CURRENT_TASK+32+TASKDATA.cpu_usage]
         mov     [esp+32], eax
         ret
 ;------------------------------------------------------------------------------
 sysfn_getcpuclock:              ; 18.5 = GET TSC/SEC
         mov     eax, dword [cpu_freq]
  nosoundflag:
         ret
 ;------------------------------------------------------------------------------
 sysfn_minimize:         ; 18.10 = minimize window
         mov     [window_minimize], 1
+        call    wakeup_osloop
         ret
 ;------------------------------------------------------------------------------
 align 4
 sysfn_getdiskinfo:      ; 18.11 = get disk info table
 ;     cmp  ecx,1
         shr     eax, 1
         mov     [MOUSE_X], ax
         mov     eax, [Screen_Max_Y]
         shr     eax, 1
         mov     [MOUSE_Y], ax
+        call    wakeup_osloop
 ;        ret
 ;* mouse centered - end code- Mario79
         xor     eax, eax
         and     [esp+32], eax
 ;        pop   eax
         ja      .end
         rol     edx, 16
         cmp     dx, word[Screen_Max_X]
         ja      .end
         mov     [MOUSE_X], edx
+        call    wakeup_osloop
         ret
  .set_mouse_button:
 ;     cmp   ecx,5  ; set mouse button features
         dec     ecx
         jnz     .end
         mov     [BTN_DOWN], dl
         mov     [mouse_active], 1
+        call    wakeup_osloop
  .end:
         ret
 ;------------------------------------------------------------------------------
 sysfn_getfreemem:
         mov     eax, [pg_data.pages_free]
 align 4
 nosb7:
         cmp     ebx, 8
         jnz     nosb8
+        mov     ecx, [current_slot]
+        xor     eax, eax
-        mov     eax, [BG_Rect_X_left_right]
+        xchg    eax, [ecx+APPDATA.draw_bgr_x]
+        mov     [esp + 32], eax ; eax = [left]*65536 + [right]
-        mov     [esp + 32], eax ; eax = [left]*65536 + [right]
+        xor     eax, eax
-        mov     eax, [BG_Rect_Y_top_bottom]
+        xchg    eax, [ecx+APPDATA.draw_bgr_y]
         mov     [esp + 20], eax ; ebx = [top]*65536 + [bottom]
         ret
 ;------------------------------------------------------------------------------
 align 4
         mov     [draw_data+32 + RECT.right], ecx
         mov     [draw_data+32 + RECT.bottom], edx
         inc     byte[REDRAW_BACKGROUND]
-        inc     byte[REDRAW_BACKGROUND]
+        call    wakeup_osloop
 ;--------------------------------------
 align 4
 .exit:
         mov     ebx, [Screen_Max_Y]
         mov     [draw_data+32 + RECT.right], eax
         mov     [draw_data+32 + RECT.bottom], ebx
         pop     ebx eax
         inc     byte[REDRAW_BACKGROUND]
+        call    wakeup_osloop
         ret
 ;------------------------------------------------------------------------------
 align 4
 sys_getbackground:
 ;    cmp   eax,1                                  ; SIZE
         dec     ebx
         jnz     nogb1
         mov     eax, [BgrDataWidth]
         shl     eax, 16
-        mov     ax, [BgrDataHeight]
+        mov     ax, word [BgrDataHeight]
         mov     [esp+32], eax
         ret
 ;------------------------------------------------------------------------------
 align 4
 nogb1:
 .04:
 ;.wrmsr_instr:
 ;now counter in ecx
 ;(edx:eax) esi:edi => edx:esi
         ; Fast Call MSR can't be destroy
-        ; ® MSR_AMD_EFER ¬®¦® ¨§¬¥ïâì, â.ª. ¢ íâ®¬ à¥£¨áâà¥ «¨è
+        ; Но MSR_AMD_EFER можно изменять, т.к. в этом регистре лиш
-        ; ¢ª«îç îâáï/¢ëª«îç îâáï à áè¨à¥ë¥ ¢®§¬®¦®áâ¨
+        ; включаются/выключаются расширенные возможности
         cmp     edx, MSR_SYSENTER_CS
         je      @f
         cmp     edx, MSR_SYSENTER_ESP
         je      @f
         cmp     edx, MSR_SYSENTER_EIP
         cmp     [background_defined], 0
         jz      nobackgr
 ;--------------------------------------
 align 4
-@@:
-        push    eax
+backgr:
         mov     eax, [draw_data+32 + RECT.left]
         shl     eax, 16
         add     eax, [draw_data+32 + RECT.right]
         mov     [BG_Rect_X_left_right], eax ; [left]*65536 + [right]
         mov     eax, [draw_data+32 + RECT.top]
         shl     eax, 16
-        add     eax, [draw_data+32 + RECT.bottom]
-        mov     [BG_Rect_Y_top_bottom], eax ; [top]*65536 + [bottom]
+        add     eax, [draw_data+32 + RECT.bottom]
-        pop     eax
+        mov     [BG_Rect_Y_top_bottom], eax ; [top]*65536 + [bottom]
         call    drawbackground
         mov     ecx, [TASK_COUNT]
 ;--------------------------------------
 align 4
 set_bgr_event:
         add     edi, 256
+        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
+@@:
+        cmp     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+        jbe     @f
+        mov     word [edi+SLOT_BASE+APPDATA.draw_bgr_y+2], dx
+@@:
+        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
+@@:
+        jmp     .common
+.set:
+        mov     [edi+SLOT_BASE+APPDATA.draw_bgr_x], eax
+        mov     [edi+SLOT_BASE+APPDATA.draw_bgr_y], edx
+.common:
         or      [edi+SLOT_BASE+APPDATA.event_mask], 10000b  ; set event 5
         loop    set_bgr_event
         pop     edi ecx
-; call change_task - because the application must have time to call f.15.8
-        call    change_task
 ;--------- set event 5 stop -----------
         dec     byte[REDRAW_BACKGROUND]    ; got new update request?
-        jnz     @b
+        jnz     backgr
         xor     eax, eax
         mov     [draw_data+32 + RECT.left], eax
         mov     [draw_data+32 + RECT.top], eax
         mov     [draw_data+32 + RECT.right], eax
-        mov     [draw_data+32 + RECT.bottom], eax
-        mov     [MOUSE_BACKGROUND], byte 0
+        mov     [draw_data+32 + RECT.bottom], eax
 ;--------------------------------------
 align 4
 nobackgr:
 ; system shutdown request
         jz      @f
         mov     [edx+TASKDATA.state], byte 3
 @@:
         add     edx, 0x20
         loop    markz
+        call    wakeup_osloop
 ;--------------------------------------
 align 4
 @@:
 no_mark_system_shutdown:
         dec     byte [SYS_SHUTDOWN]
         mov     dl, 1
 ;--------------------------------------
 align 4
 @@:
         add     byte[REDRAW_BACKGROUND], dl
+        call    wakeup_osloop
         jmp     newdw8
 ;--------------------------------------
 align 4
 .az:
         mov     eax, edi
         sub     eax, draw_data-window_data
         cmp     dword [esp], 1
         jne     nobgrd
+        inc     byte[REDRAW_BACKGROUND]
-        inc     byte[REDRAW_BACKGROUND]
+        call    wakeup_osloop
 ;--------------------------------------
 align 4
 newdw8:
         pop     ax dx
 end if
+        mov     [msg_board_data+ecx], bl
+if debug_direct_print
+        pusha
+iglobal
+msg_board_pos   dd      234*65536+10
+endg
+        lea     edx, [msg_board_data+ecx]
+        mov     ecx, 0x40FFFFFF
+        mov     ebx, [msg_board_pos]
+        mov     edi, 1
+        mov     esi, 1
+        call    dtext
+        popa
+        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]
+        cmp     word [msg_board_pos], ax
+        jbe     @f
+        mov     word [msg_board_pos], 10
+@@:
+end if
+if 0
+        pusha
+        mov     al, bl
+        mov     edx, 402h
+        out     dx, al
         popa
-        mov     [msg_board_data+ecx], bl
+end if
         inc     ecx
-        and     ecx, msg_board_data_size - 1
-        mov     [msg_board_count], ecx
+        and     ecx, msg_board_data_size - 1
-        mov     [check_idle_semaphore], 5
+        mov     [msg_board_count], ecx
         ret
 .smbl1:
         cmp     eax, 2
 .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
-        movzx   eax, byte [ScreenBPP]
+        mov     eax, [_display.bpp]
         mov     [esp+32], eax
         ret
 .3:                             ; bytes per scanline
 .drectr:
         ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
-        mov     ax, [Screen_Max_X]
+        mov     eax, [Screen_Max_X]
         shl     eax, 16
-        mov     ax, [Screen_Max_Y]
+        mov     ax, word [Screen_Max_Y]
         mov     [esp + 32], eax
         ret
         mov     [esp+32], eax
         ret
-align 4
-stack_driver_stat:
-        call    app_stack_handler       ; Stack status
-;     mov   [check_idle_semaphore],5    ; enable these for zero delay
-;     call  change_task                 ; between sent packet
-        mov     [esp+32], eax
-        ret
-align 4
-socket:                                 ; Socket interface
-        call    app_socket_handler
-;     mov   [check_idle_semaphore],5    ; enable these for zero delay
-;     call  change_task                 ; between sent packet
-        mov     [esp+36], eax
-        mov     [esp+24], ebx
-        ret
+align 4
 paleholder:
         ret
 ;------------------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm – Rev 3500 → 3555