WebSVN – Kolibri OS – Diff – /kernel/branches/net/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; Copyright (C) KolibriOS team 2004-2010. All rights reserved.
+;; Copyright (C) KolibriOS team 2004-2011. All rights reserved.
 ;; PROGRAMMING:
 ;; Ivan Poddubny
 ;; Marat Zakiyanov (Mario79)
 ;; VaStaNi
 ;; Trans
 ;; Sergey Semyonov (Serge)
 ;; Johnny_B
 ;; SPraid (simba)
 ;; Hidnplayr
 ;; Alexey Teplov ()
+;; Rus
+;; Nable
+;; shurf
+;; Alver
+;; Maxis
+;; Galkov
+;; CleverMouse
+;; tsdima
+;; turbanoff
+;; Asper
+;; art_zh
 ;;
 ;; Data in this file was originally part of MenuetOS project which is
 ;; distributed under the terms of GNU GPL. It is modified and redistributed as
 ;; part of KolibriOS project under the terms of GNU GPL.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 2305 $
+$Revision: 2382 $
-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
+;debug_com_base  equ 0x3f8  ; 0x3f8 is com1, 0x2f8 is com2, 0x3e8 is com3, 0x2e8 is com4, no irq's are used
-	cli				; disable all irqs
+        cli                             ; disable all irqs
-	cld
+        cld
-	mov	al,255			; mask all irqs
+        mov     al, 255                 ; mask all irqs
-	out	0xa1,al
+        out     0xa1, al
-	out	0x21,al
+        out     0x21, al
+   l.5:
-   l.5: in	al, 0x64		; Enable A20
+        in      al, 0x64                ; Enable A20
-	test	al, 2
+        test    al, 2
-	jnz	l.5
+        jnz     l.5
-	mov	al, 0xD1
+        mov     al, 0xD1
-	out	0x64, al
+        out     0x64, al
+   l.6:
-   l.6: in	al, 0x64
+        in      al, 0x64
-	test	al, 2
+        test    al, 2
-	jnz	l.6
+        jnz     l.6
-	mov	al, 0xDF
+        mov     al, 0xDF
-	out	0x60, al
+        out     0x60, al
+   l.7:
-   l.7: in	al, 0x64
+        in      al, 0x64
-	test	al, 2
+        test    al, 2
-	jnz	l.7
+        jnz     l.7
-	mov	al, 0xFF
+        mov     al, 0xFF
-	out	0x64, al
+        out     0x64, al
-	   mov	 ds,ax
+        mov     ds, ax
-	   mov	 es,ax
+        mov     es, ax
-	   mov	 fs,ax
+        mov     fs, ax
-	   mov	 gs,ax
+        mov     gs, ax
-	   mov	 ss,ax
+        mov     ss, ax
-	   mov	 esp,0x3ec00	   ; Set stack
+        mov     esp, 0x006CC00       ; Set stack
 ; CLEAR 0x280000 - HEAP_BASE
-	   xor	 eax,eax
+        xor     eax, eax
-	   mov	 edi,0x280000
+        mov     edi, CLEAN_ZONE
-	   mov	 ecx,(HEAP_BASE-OS_BASE-0x280000) / 4
+        mov     ecx, (HEAP_BASE-OS_BASE-CLEAN_ZONE) / 4
-	   cld
-	   rep	 stosd
-	   mov	 edi,0x40000
-	   mov	 ecx,(0x90000-0x40000)/4
+        cld
-	   rep	 stosd
+        rep stosd
+; CLEAR KERNEL UNDEFINED GLOBALS
+        mov     edi, endofcode-OS_BASE
-; CLEAR KERNEL UNDEFINED GLOBALS
+        mov     ecx, 0x90000
-	   mov	 edi, endofcode-OS_BASE
+        sub     ecx, edi
-	   mov	 ecx, (uglobals_size/4)+4
+        shr     ecx, 2
-	   rep	 stosd
+        rep stosd
 ; SAVE & CLEAR 0-0xffff
-	   xor	 esi, esi
+        xor     esi, esi
-	   mov	 edi,0x2F0000
+        mov     edi, (BOOT_VAR-OS_BASE)
-	   mov	 ecx,0x10000 / 4
+        mov     ecx, 0x10000 / 4
-	   rep	 movsd
+        rep movsd
+        mov     edi, 0x1000
-	   mov	 edi,0x1000
+        mov     ecx, 0xf000 / 4
-	   mov	 ecx,0xf000 / 4
+        rep stosd
 	   rep	 stosd
         call    test_cpu
-	   call test_cpu
+        bts     [cpu_caps-OS_BASE], CAPS_TSC    ;force use rdtsc
-	   mov dword [sys_pgdir+4], eax
+        mov     dword [sys_pgdir+4], eax
-	   mov eax, cr3
+        mov     eax, cr3
+        mov     cr3, eax          ; flush TLB
+        mov     ecx, pg_data.mutex
+        call    mutex_init
+        mov     ecx, disk_list_mutex
-	   mov cr3, eax 	  ; flush TLB
+        call    mutex_init
 ; SAVE REAL MODE VARIABLES
-	mov	ax, [BOOT_VAR + 0x9031]
+        mov     ax, [BOOT_VAR + 0x9031]
-	   call init_events
+        call    init_events
-	   mov eax, srv.fd-SRV_FD_OFFSET
+        mov     eax, srv.fd-SRV_FD_OFFSET
-	   mov [srv.fd], eax
+        mov     [srv.fd], eax
-	   mov [srv.bk], eax
+        mov     [srv.bk], eax
-	   mov edi, irq_tab
-	   xor eax, eax
-	   mov ecx, 16
-	   rep stosd
 ;Set base of graphic segment to linear address of LFB
-	mov	eax,[LFBAddress]	  ; set for gs
+        mov     eax, [LFBAddress]         ; set for gs
-	mov	[graph_data_l+2],ax
+        mov     [graph_data_l+2], ax
-	shr	eax,16
+        shr     eax, 16
-	mov	[SLOT_BASE + 256 + APPDATA.dir_table], sys_pgdir - OS_BASE
+        mov     [SLOT_BASE + 256 + APPDATA.dir_table], sys_pgdir - OS_BASE
+; REDIRECT ALL IRQ'S TO INT'S 0x20-0x2f
 ; REDIRECT ALL IRQ'S TO INT'S 0x20-0x2f
         call    init_irqs
+        call    PIC_init
-	call  rerouteirqs
-; Initialize system V86 machine
-	call	init_sys_v86
+; Initialize system V86 machine
-; TIMER SET TO 1/100 S
+        call    init_sys_v86
 	mov   al,0x34		   ; set to 100Hz
-	out   0x43,al
+; Initialize system timer (IRQ0)
+        call    PIT_init
-	mov   al,0x9b		   ; lsb    1193180 / 1193
+; Try to Initialize APIC
-	out   0x40,al
+        call    APIC_init
+; Enable timer IRQ (IRQ0) and hard drives IRQs (IRQ14, IRQ15)
+; they are used: when partitions are scanned, hd_read relies on timer
+        call    unmask_timer
+        stdcall enable_irq, 2               ; @#$%! PIC
-	mov   al,0x2e		   ; msb
+        stdcall enable_irq, 6               ; FDD
-	out   0x40,al
+        stdcall enable_irq, 13              ; co-processor
+        stdcall enable_irq, 14
-; Enable timer IRQ (IRQ0) and hard drives IRQs (IRQ14, IRQ15)
+        stdcall enable_irq, 15
 ; they are used: when partitions are scanned, hd_read relies on timer
-; Also enable IRQ2, because in some configurations
+; Enable interrupts in IDE controller
-; IRQs from slave controller are not delivered until IRQ2 on master is enabled
+        mov     al, 0
-	mov	al, 0xFA
+        mov     dx, 0x3F6
+        out     dx, al
+        mov     dl, 0x76
-	out	0x21, al
+        out     dx, al
 	mov	al, 0x3F
-	out	0xA1, al
+;!!!!!!!!!!!!!!!!!!!!!!!!!!
 include 'detect/disks.inc'
+;!!!!!!!!!!!!!!!!!!!!!!!!!!
 ;!!!!!!!!!!!!!!!!!!!!!!!!!!
-include 'detect/disks.inc'
+        call    Parser_params
 ;!!!!!!!!!!!!!!!!!!!!!!!!!!
-  call Parser_params
-; READ RAMDISK IMAGE FROM HD
-;!!!!!!!!!!!!!!!!!!!!!!!
-include 'boot/rdload.inc'
+if ~ defined extended_primary_loader
-;!!!!!!!!!!!!!!!!!!!!!!!
+; ramdisk image should be loaded by extended primary loader if it exists
-;    mov    [dma_hdd],1
+; READ RAMDISK IMAGE FROM HD
 ; CALCULATE FAT CHAIN FOR RAMDISK
 ;!!!!!!!!!!!!!!!!!!!!!!!
-	stdcall read_file, char2, FONT_II, 0, 2560
+        stdcall read_file, char2, FONT_II, 0, 2560
-	mov   esi,boot_fonts
+        mov     esi, boot_fonts
+        call    boot_log
+; Display APIC status
+        mov     esi, boot_APIC_found
+        cmp     [irq_mode], IRQ_APIC
+        je      @f
+        mov     esi, boot_APIC_nfound
-	call  boot_log
+@@:
 ; PRINT AMOUNT OF MEMORY
-	mov	esi, boot_memdetect
+        mov     esi, boot_memdetect
+        call    boot_log
+        movzx   ecx, word [boot_y]
-	call	boot_log
+        if lang eq ru
+        or      ecx, (10+30*6) shl 16
                 else
-	movzx	ecx, word [boot_y]
+        or      ecx, (10+29*6) shl 16
-	or	ecx, (10+29*6) shl 16 ; "Determining amount of memory"
+                end if
-	sub	ecx, 10
+        sub     ecx, 10
-	mov	edx, 0xFFFFFF
+        mov     edx, 0xFFFFFF
-	mov   esi,boot_resirqports
+        mov     esi, boot_resirqports
-	call  boot_log
+        call    boot_log
-	call  reserve_irqs_ports
-; SET PORTS FOR IRQ HANDLERS
-	mov  esi,boot_setrports
-	call boot_log
-	;call setirqreadports
+        call    reserve_irqs_ports
 ; SET UP OS TASK
-	mov	esi, boot_cpufreq
+        mov     esi, boot_cpufreq
-	call	boot_log
+        call    boot_log
-	mov	ebx, edx
+        mov     ebx, edx
+        movzx   ecx, word [boot_y]
+        if lang eq ru
+        add     ecx, (10+19*6) shl 16 - 10         ; 'Determining amount of memory'
-	movzx	ecx, word [boot_y]
+                else
+        add     ecx, (10+17*6) shl 16 - 10         ; 'Determining amount of memory'
-	add	ecx, (10+17*6) shl 16 - 10 ; 'CPU frequency is '
+                end if
-	mov	edx, 0xFFFFFF
+        mov     edx, 0xFFFFFF
-	xor	edi,edi
+        xor     edi, edi
-	mov	eax, 0x00040000
+        mov     eax, 0x00040000
-		inc		edi
+        inc     edi
-	call	display_number_force
+        call    display_number_force
-; SET VARIABLES
-	call  set_variables
-; SET MOUSE
-	;call   detect_devices
-	stdcall load_driver, szPS2MDriver
-;        stdcall load_driver, szCOM_MDriver
-	mov   esi,boot_setmouse
-	call  boot_log
+; SET VARIABLES
 	call  setmouse
         call    set_variables
-	   stdcall map_page,tss._io_map_0,\
+        stdcall map_page, tss._io_map_0, \
-		   [SLOT_BASE+256+APPDATA.io_map], PG_MAP
+                [SLOT_BASE+256+APPDATA.io_map], PG_MAP
-	   stdcall map_page,tss._io_map_1,\
+        stdcall map_page, tss._io_map_1, \
-		   [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
+                [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
+        mov     ax, [OS_BASE+0x10000+bx_from_load]
 ; LOAD FIRST APPLICATION
-	cli
+        cli
-	cmp   byte [BOOT_VAR+0x9030],1
-	jne   no_load_vrr_m
-	mov	ebp, vrr_m
-	call	fs_execute_from_sysdir
-;        cmp   eax,2                  ; if vrr_m app found (PID=2)
+;        cmp   byte [BOOT_VAR+0x9030],1
+;        jne   no_load_vrr_m
+;        mov     ebp, vrr_m
+;        call    fs_execute_from_sysdir
+;
+;;        cmp   eax,2                  ; if vrr_m app found (PID=2)
-	sub   eax,2
+;       sub   eax,2
-	jz    first_app_found
+;        jz    first_app_found
+;
-no_load_vrr_m:
+;no_load_vrr_m:
       @@:
-	in     al,64h
+        in      al, 64h
-	and    al,00000010b
+        and     al, 00000010b
-	loopnz @b
+        loopnz  @b
-       ; mov   al, 0xED       ; svetodiody - only for testing!
+       ; mov   al, 0xED       ; Keyboard LEDs - only for testing!
        ; call  kb_write
        ; call  kb_read
        ; mov   al, 111b
        ; call  kb_write
-	call  kb_write
+        call    kb_write
 ;        call  kb_read
      ;// mike.dld [
-	call  set_lights
+        call    set_lights
      ;// mike.dld ]
+        stdcall attach_int_handler, 1, irq1, 0
+; SET MOUSE
+        stdcall load_driver, szPS2MDriver
+;        stdcall load_driver, szCOM_MDriver
+        mov     esi, boot_setmouse
+        call    boot_log
         call    setmouse
 end if
 ; START MULTITASKING
 ; START MULTITASKING
 ; A 'All set - press ESC to start' messages if need
+if preboot_blogesc
-if preboot_blogesc
+        mov     esi, boot_tasking
-	mov	esi, boot_tasking
+        call    boot_log
-	call	boot_log
+.bll1:
-.bll1:	in	al, 0x60	; wait for ESC key press
+        in      al, 0x60        ; wait for ESC key press
-	cmp	al, 129
-	jne	.bll1
-end if
-;       mov   [ENABLE_TASKSWITCH],byte 1        ; multitasking enabled
-; UNMASK ALL IRQ'S
-	mov   esi,boot_allirqs
-	call  boot_log
-	cli			     ;guarantee forbidance of interrupts.
-	mov   al,0		     ; unmask all irq's
-	out   0xA1,al
-	out   0x21,al
-	mov   ecx,32
-     ready_for_irqs:
-	mov   al,0x20		     ; ready for irqs
-	out   0x20,al
-	out   0xa0,al
-	loop  ready_for_irqs	     ; flush the queue
         cmp     al, 129
-	stdcall attach_int_handler, dword 1, irq1, dword 0
+        jne     .bll1
 end if
 ;        mov    [dma_hdd],1
-	cmp	[IDEContrRegsBaseAddr], 0
+        cmp     [IDEContrRegsBaseAddr], 0
-	setnz	[dma_hdd]
+        setnz   [dma_hdd]
-	mov [timer_ticks_enable],1		; for cd driver
         mov     [timer_ticks_enable], 1         ; for cd driver
 	sti
-	call change_task
+        sti
 ;                                                                    ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 32
 osloop:
-	call   [draw_pointer]
+        call    [draw_pointer]
-	call   check_buttons
+        call    window_check_events
-	call   checkwindows
-;       call   check_window_move_request
+        call    mouse_check_events
-	call   checkmisc
+        call    checkmisc
-	call   checkVga_N13
+        call    checkVga_N13
-	call   stack_handler
+        call    stack_handler
-	call   checkidle
+        call    checkidle
-	call   check_fdd_motor_status
+        call    check_fdd_motor_status
-	call   check_ATAPI_device_event
+        call    check_ATAPI_device_event
+        call    check_timers
-	jmp    osloop
+        jmp     osloop
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                                                    ;
 ;                      MAIN OS LOOP END                              ;
 ;                                                                    ;
 ;                                                                      ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-reserve_irqs_ports:
-	push eax
-	xor	eax,eax
-		inc	eax
-	mov  byte [irq_owner+4*0],al		;1    ; timer
-	;mov  [irq_owner+4*1], 1    ; keyboard
-	mov  byte [irq_owner+4*6],al		;1    ; floppy diskette
-	mov  byte [irq_owner+4*13],al	;1   ; math co-pros
-	mov  byte [irq_owner+4*14],al	;1   ; ide I
-	mov  byte [irq_owner+4*15],al	;1   ; ide II
+reserve_irqs_ports:
-	pop  eax
-; RESERVE PORTS
-	push  4
-	pop   dword [RESERVED_PORTS]	;,edi
-	push  1
-	pop   dword [RESERVED_PORTS+16+0]	;,dword 1
-	and   dword [RESERVED_PORTS+16+4],0	;,dword 0x0
+; RESERVE PORTS
-	mov   dword [RESERVED_PORTS+16+8],0x2d	;,dword 0x2d
-	push  1
-	pop   dword [RESERVED_PORTS+32+0]	;,dword 1
-	push  0x30
-	pop   dword [RESERVED_PORTS+32+4]	;,dword 0x30
-	push  0x4d
-	pop   dword [RESERVED_PORTS+32+8]	;,dword 0x4d
-	push  1
-	pop   dword [RESERVED_PORTS+48+0]	;,dword 1
-	push  0x50
-	pop   dword [RESERVED_PORTS+48+4]	;,dword 0x50
+        mov     eax, RESERVED_PORTS
+        mov     ecx, 1
+        mov     [eax], dword 4
+        mov     [eax+16], ecx
+        mov     [eax+16+4], dword 0
+        mov     [eax+16+4], dword 0x2D
+        mov     [eax+32], ecx
+        mov     [eax+32+4], dword 0x30
+        mov     [eax+32+8], dword 0x4D
-	mov   dword [RESERVED_PORTS+48+8],0xdf	;,dword 0xdf
+        mov     [eax+48], ecx
+        mov     [eax+48+4], dword 0x50
-	push  1
+        mov     [eax+28+8], dword 0xDF
-	pop   dword [RESERVED_PORTS+64+0]	;,dword 1
-	mov   dword [RESERVED_PORTS+64+4],0xe5	;,dword 0xe5
-	mov   dword [RESERVED_PORTS+64+8],0xff	;,dword 0xff
-	ret
-setirqreadports:
-	mov   [irq12read+0],dword 0x60 + 0x01000000  ; read port 0x60 , byte
-	    and   dword [irq12read+4],0 		  ; end of port list
 ;        mov   [irq12read+4],dword 0                  ; end of port list
-	;mov   [irq04read+0],dword 0x3f8 + 0x01000000 ; read port 0x3f8 , byte
+        mov     [eax+64], ecx
-	;mov   [irq04read+4],dword 0                  ; end of port list
+        mov     [eax+64+4], dword 0xE5
-	;mov   [irq03read+0],dword 0x2f8 + 0x01000000 ; read port 0x2f8 , byte
+        mov     [eax+64+8], dword 0xFF
-	;mov   [irq03read+4],dword 0                  ; end of port list
+        ret
 	ret
 iglobal
-iglobal
+  process_number dd 0x1
-  process_number dd 0x1
+endg
-	ret
+        ret
 no_set_lba_read:
 ;     cmp  eax,12                     ; ENABLE PCI ACCESS
-	dec  ebx
+        dec     ebx
-	jnz  no_set_pci_access
+        jnz     sys_setup_err
-	mov  [pci_access_enabled],ecx
+        mov     [pci_access_enabled], ecx
-	ret
-no_set_pci_access:
-;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-include 'vmodeint.inc'
-;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        ret
 sys_setup_err:
-     jmp   waitterm
+        jmp     waitterm
 iglobal
 align 4
 sys_system_table:
-	dd	exit_for_anyone 	; 1 = obsolete
+        dd      sysfn_deactivate        ; 1 = deactivate window
-	dd	sysfn_terminate 	; 2 = terminate thread
+        dd      sysfn_terminate         ; 2 = terminate thread
-	dd	sysfn_activate		; 3 = activate window
+        dd      sysfn_activate          ; 3 = activate window
-	dd	sysfn_getidletime	; 4 = get idle time
+        dd      sysfn_getidletime       ; 4 = get idle time
-	dd	sysfn_getcpuclock	; 5 = get cpu clock
+        dd      sysfn_getcpuclock       ; 5 = get cpu clock
-	dd	sysfn_meminfo		; 20 = get extended memory info
+        dd      sysfn_meminfo           ; 20 = get extended memory info
-	dd	sysfn_pid_to_slot	; 21 = get slot number for pid
+        dd      sysfn_pid_to_slot       ; 21 = get slot number for pid
-	dd	sysfn_min_rest_window	; 22 = minimize and restore any window
+        dd      sysfn_min_rest_window   ; 22 = minimize and restore any window
 sysfn_num = ($ - sys_system_table)/4
 endg
+;------------------------------------------------------------------------------
 sys_system:
-	dec	ebx
+        dec     ebx
-	cmp	ebx, sysfn_num
+        cmp     ebx, sysfn_num
-	jae	@f
+        jae     @f
-	jmp	dword [sys_system_table + ebx*4]
+        jmp     dword [sys_system_table + ebx*4]
 @@:
-	ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_shutdown: 	 ; 18.9 = system shutdown
+sysfn_shutdown:          ; 18.9 = system shutdown
-     cmp  ecx,1
+        cmp     ecx, 1
-     jl   exit_for_anyone
+        jl      exit_for_anyone
-     cmp  ecx,4
+        cmp     ecx, 4
-     jg   exit_for_anyone
+        jg      exit_for_anyone
-     mov  [shutdown_processes],eax
+        mov     [shutdown_processes], eax
-     and  dword [esp+32], 0
+        and     dword [esp+32], 0
  exit_for_anyone:
-     ret
+        ret
   uglobal
-   shutdown_processes: dd 0x0
+   shutdown_processes:
+                       dd 0x0
   endg
+;------------------------------------------------------------------------------
-sysfn_terminate:	; 18.2 = TERMINATE
+sysfn_terminate:        ; 18.2 = TERMINATE
-     cmp  ecx,2
+        cmp     ecx, 2
-     jb   noprocessterminate
+        jb      noprocessterminate
-     mov  edx,[TASK_COUNT]
+        mov     edx, [TASK_COUNT]
-     cmp  ecx,edx
+        cmp     ecx, edx
-     jne  noatsc
+        jne     noatsc
-     and  [application_table_status],0
+        and     [application_table_status], 0
    noatsc:
    noprocessterminate:
-     ret
+        ret
+;------------------------------------------------------------------------------
 sysfn_terminate2:
 ;lock application_table_status mutex
 .table_status:
-    cli
+        cli
-    cmp    [application_table_status],0
+        cmp     [application_table_status], 0
-    ret
+        ret
 .not_found:
-    mov    [application_table_status],0
+        mov     [application_table_status], 0
-    or	   dword [esp+32],-1
+        or      dword [esp+32], -1
-    ret
+        ret
+;------------------------------------------------------------------------------
+sysfn_deactivate:         ; 18.1 = DEACTIVATE WINDOW
+        cmp     ecx, 2
+        jb      .nowindowdeactivate
+        cmp     ecx, [TASK_COUNT]
+        ja      .nowindowdeactivate
+        movzx   esi, word [WIN_STACK + ecx*2]
+        cmp     esi, 1
+        je      .nowindowdeactivate ; already deactive
+        mov     edi, ecx
+        shl     edi, 5
+        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
  ;------------------------------------------------------------------------------
-sysfn_activate: 	; 18.3 = ACTIVATE WINDOW
+sysfn_activate:         ; 18.3 = ACTIVATE WINDOW
-     cmp  ecx,2
+        cmp     ecx, 2
-     jb   .nowindowactivate
+        jb      .nowindowactivate
-     cmp  ecx,[TASK_COUNT]
+        cmp     ecx, [TASK_COUNT]
-     movzx esi, word [WIN_STACK + ecx * 2]
+        movzx   esi, word [WIN_STACK + ecx * 2]
-     lea   esi, [WIN_POS + esi * 2]
+        lea     esi, [WIN_POS + esi * 2]
-     call  waredraw
+        call    waredraw
 .nowindowactivate:
-     ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_getidletime:		; 18.4 = GET IDLETIME
+sysfn_getidletime:              ; 18.4 = GET IDLETIME
-     mov  eax,[idleusesec]
+        mov     eax, [idleusesec]
-     mov  [esp+32], eax
+        mov     [esp+32], eax
-     ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_getcpuclock:		; 18.5 = GET TSC/SEC
+sysfn_getcpuclock:              ; 18.5 = GET TSC/SEC
-     mov  eax,[CPU_FREQ]
+        mov     eax, [CPU_FREQ]
-     mov  [esp+32], eax
+        mov     [esp+32], eax
-     ret
+        ret
+;------------------------------------------------------------------------------
 ;  SAVE ramdisk to /hd/1/menuet.img
 ;!!!!!!!!!!!!!!!!!!!!!!!!
    include 'blkdev/rdsave.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!!
+;------------------------------------------------------------------------------
 align 4
-sysfn_getactive:	; 18.7 = get active window
+sysfn_getactive:        ; 18.7 = get active window
-     mov  eax, [TASK_COUNT]
+        mov     eax, [TASK_COUNT]
-   movzx  eax, word [WIN_POS + eax*2]
+        movzx   eax, word [WIN_POS + eax*2]
-     mov  [esp+32],eax
+        mov     [esp+32], eax
-     ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_sound_flag:	; 18.8 = get/set sound_flag
+sysfn_sound_flag:       ; 18.8 = get/set sound_flag
 ;     cmp  ecx,1
-     dec  ecx
+        dec     ecx
-     jnz  nogetsoundflag
+        jnz     nogetsoundflag
-     movzx  eax,byte [sound_flag] ; get sound_flag
+        movzx   eax, byte [sound_flag]; get sound_flag
-     dec  ecx
+        dec     ecx
-     jnz  nosoundflag
+        jnz     nosoundflag
-     xor  byte [sound_flag], 1
+        xor     byte [sound_flag], 1
  nosoundflag:
-     ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_minimize: 	; 18.10 = minimize window
+sysfn_minimize:         ; 18.10 = minimize window
-     mov   [window_minimize],1
+        mov     [window_minimize], 1
-     ret
+        ret
+;------------------------------------------------------------------------------
 align 4
-sysfn_getdiskinfo:	; 18.11 = get disk info table
+sysfn_getdiskinfo:      ; 18.11 = get disk info table
 ;     cmp  ecx,1
-     dec  ecx
+        dec     ecx
-     jnz  full_table
+        jnz     full_table
-     call for_all_tables
+        call    for_all_tables
-     mov ecx,16384
+        mov     ecx, 16384
-     cld
+        cld
-     rep movsd
+        rep movsd
-     ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_lastkey:		; 18.12 = return 0 (backward compatibility)
+sysfn_lastkey:          ; 18.12 = return 0 (backward compatibility)
-	and	dword [esp+32], 0
+        and     dword [esp+32], 0
-	ret
+        ret
+;------------------------------------------------------------------------------
-sysfn_getversion:	; 18.13 = get kernel ID and version
+sysfn_getversion:       ; 18.13 = get kernel ID and version
-     mov edi,ebx
+        mov     edi, ecx
-     mov esi,version_inf
+        mov     esi, version_inf
-     mov ecx,version_end-version_inf
+        mov     ecx, version_end-version_inf
-     rep movsb
+        rep movsb
-     ret
+        ret
+;------------------------------------------------------------------------------
 sysfn_waitretrace:     ; 18.14 = sys wait retrace
      ;wait retrace functions
  sys_wait_retrace:
-     mov edx,0x3da
+        mov     edx, 0x3da
  WaitRetrace_loop:
-     in al,dx
+        in      al, dx
-     test al,1000b
+        test    al, 1000b
-     jz WaitRetrace_loop
+        jz      WaitRetrace_loop
-     and [esp+32],dword 0
+        and     [esp+32], dword 0
-     ret
+        ret
+;------------------------------------------------------------------------------
 align 4
-sysfn_centermouse:	; 18.15 = mouse centered
+sysfn_centermouse:      ; 18.15 = mouse centered
 ; removed here by
 ;     call  mouse_centered
 ;* mouse centered - start code- Mario79
 ;        ret
 ;* mouse centered - end code- Mario79
-	xor   eax,eax
+        xor     eax, eax
-	and   [esp+32],eax
+        and     [esp+32], eax
 ;        pop   eax
-     ret
+        ret
+;------------------------------------------------------------------------------
 align 4
 sysfn_mouse_acceleration: ; 18.19 = set/get mouse features
-     test ecx,ecx  ; get mouse speed factor
+        test    ecx, ecx; get mouse speed factor
-     jnz  .set_mouse_acceleration
+        jnz     .set_mouse_acceleration
-     xor  eax,eax
+        xor     eax, eax
-     ret
+        ret
  .set_pointer_position:
 ;     cmp  ecx,4  ; set mouse pointer position
-     dec   ecx
+        dec     ecx
-     jnz  .set_mouse_button
+        jnz     .set_mouse_button
-     mov   [MOUSE_Y],dx    ;y
+        cmp     dx, word[Screen_Max_Y]
-     ror   edx,16
+        ja      .end
-     mov   [MOUSE_X],dx    ;x
-     rol   edx,16
+        rol     edx, 16
+        cmp     dx, word[Screen_Max_X]
+        ja      .end
+        mov     [MOUSE_X], edx
-     ret
+        ret
  .set_mouse_button:
 ;     cmp   ecx,5  ; set mouse button features
-     dec   ecx
+        dec     ecx
-     jnz  .end
+        jnz     .end
-     mov   [BTN_DOWN],dl
+        mov     [BTN_DOWN], dl
-     mov   [mouse_active],1
+        mov     [mouse_active], 1
  .end:
-     ret
+        ret
+;------------------------------------------------------------------------------
 sysfn_getfreemem:
-     mov eax, [pg_data.pages_free]
+        mov     eax, [pg_data.pages_free]
-     shl eax, 2
+        shl     eax, 2
-     mov [esp+32],eax
+        mov     [esp+32], eax
-     ret
+        ret
 ;// mike.dld, 2006-29-01 ]
 window_minimize db 0
-sound_flag	db 0
+sound_flag      db 0
 endg
+UID_NONE=0
+UID_MENUETOS=1   ;official
+UID_KOLIBRI=2    ;russian
 iglobal
 version_inf:
   db 0,7,7,0  ; version 0.7.7.0
-  db UID_KOLIBRI
+  db 0
   dd __REV__
 version_end:
-endg
-UID_NONE=0
-UID_MENUETOS=1	 ;official
-UID_KOLIBRI=2	 ;russian
+endg
 sys_cachetodiskette:
-	cmp	ebx, 1
+        cmp     ebx, 1
-	jne	.no_floppy_a_save
+        jne     .no_floppy_a_save
 ;    cmp   [bgrchanged],1 ;0
 ;    je    nosb31
 ;draw_background_temp:
 ;    mov   [bgrchanged],1 ;0
-    mov    [background_defined], 1
+        mov     [background_defined], 1
+        mov     byte[BACKGROUND_CHANGED], 1
-    call  force_redraw_background
+        call    force_redraw_background
-    mov    [REDRAW_BACKGROUND], byte 2
    nosb31:
-    ret
+        ret
   nosb3:
 nosb7:
-    ret
+        ret
 force_redraw_background:
-    and   [draw_data+32 + RECT.left],dword 0
+        and     [draw_data+32 + RECT.left], 0
-    and   [draw_data+32 + RECT.top],dword 0
+        and     [draw_data+32 + RECT.top], 0
-    push  eax ebx
+        push    eax ebx
-    mov   eax,[Screen_Max_X]
+        mov     eax, [Screen_Max_X]
-    mov   ebx,[Screen_Max_Y]
+        mov     ebx, [Screen_Max_Y]
-    mov   [draw_data+32 + RECT.right],eax
+        mov     [draw_data+32 + RECT.right], eax
-    mov   [draw_data+32 + RECT.bottom],ebx
+        mov     [draw_data+32 + RECT.bottom], ebx
-    pop   ebx eax
+        pop     ebx eax
-    mov   byte [REDRAW_BACKGROUND], 1
+        inc     byte[REDRAW_BACKGROUND]
-    ret
+        ret
-	jne	.exit
+        jne     .exit
-	movzx	eax, byte [BTN_COUNT]
+        movzx   eax, byte [BTN_COUNT]
-	test	eax, eax
+        test    eax, eax
-	jz	.exit
+        jz      .exit
-	mov	eax, [BTN_BUFF]
+        mov     eax, [BTN_BUFF]
-	shl	eax, 8
-; // Alver 22.06.2008 // {
-	mov	  al, byte [btn_down_determ]
-	and	  al,0xFE					; delete left button bit
+        and     al, 0xFE                                    ; delete left button bit
-; } \\ Alver \\
-	mov	[BTN_COUNT], byte 0
+        mov     [BTN_COUNT], byte 0
-	mov	[esp + 32], eax
+        mov     [esp + 32], eax
 .exit:
-	ret
+        ret
     ; Window state
-	mov	al, [ecx+window_data+WDATA.fl_wstate]
+        mov     al, [ecx+window_data+WDATA.fl_wstate]
+        stosb
+    ; Event mask (+71)
+        mov     EAX, dword [ECX+CURRENT_TASK+TASKDATA.event_mask]
-	stosb
+        stosd
-	pop	esi
+        pop     esi
-	pop	edi
+        pop     edi
 align 4
 sys_clock:
-	cli
+        cli
+  ; Mikhail Lisovin  xx Jan 2005
-  ; Mikhail Lisovin  xx Jan 2005
+  @@:
-  @@:	mov   al, 10
+        mov     al, 10
-	out   0x70, al
+        out     0x70, al
-	in    al, 0x71
+        in      al, 0x71
-	test  al, al
+        test    al, al
-	jns   @f
+        jns     @f
 align 4
 sys_date:
+        cli
-	cli
+  @@:
-  @@:	mov   al, 10
+        mov     al, 10
-	out   0x70, al
+        out     0x70, al
-	in    al, 0x71
+        in      al, 0x71
-	test  al, al
+        test    al, al
-	mov	eax, [Screen_Max_X]
+        mov     eax, [Screen_Max_X]
-	mov	[edx + RECT.right], eax
+        mov     [edx + RECT.right], eax
-	mov	eax, [Screen_Max_Y]
+        mov     eax, [Screen_Max_Y]
-	mov	[edx + RECT.bottom], eax
+        mov     [edx + RECT.bottom], eax
-	mov	edi, [TASK_BASE]
-	or	[edi - twdw + WDATA.fl_wdrawn], 1   ; no new position & buttons from app
-	call	sys_window_mouse
-	ret
   srl1:
-	ret
-sys_drawwindow:
-    mov   eax,edx
-    shr   eax,16+8
-    and   eax,15
-;    cmp   eax,0   ; type I    - original style
-    jne   nosyswI
-    inc   [mouse_pause]
-    call  [_display.disable_mouse]
-    call  sys_set_window
-    call  [_display.disable_mouse]
-    call  drawwindow_I
-    ;dec   [mouse_pause]
-    ;call   [draw_pointer]
-    ;ret
-    jmp   draw_window_caption.2
-  nosyswI:
-    cmp   al,1	  ; type II   - only reserve area, no draw
-    jne   nosyswII
-    inc   [mouse_pause]
-    call  [_display.disable_mouse]
-    call  sys_set_window
-    call  [_display.disable_mouse]
-    call  sys_window_mouse
-    dec   [mouse_pause]
-    call   [draw_pointer]
-    ret
-  nosyswII:
-    cmp   al,2	  ; type III  - new style
-    jne   nosyswIII
-    inc   [mouse_pause]
-    call  [_display.disable_mouse]
-    call  sys_set_window
-    call  [_display.disable_mouse]
-    call  drawwindow_III
-    ;dec   [mouse_pause]
-    ;call   [draw_pointer]
-    ;ret
-    jmp   draw_window_caption.2
-  nosyswIII:
-    cmp   al,3	  ; type IV - skinned window
-    je	  draw_skin_window
-    cmp   al,4	  ; type V - skinned window not sized! {not_sized_skin_window}
-    jne   nosyswV
-  draw_skin_window:
-    inc   [mouse_pause]
-    call  [_display.disable_mouse]
-    call  sys_set_window
-    call  [_display.disable_mouse]
-    mov   eax, [TASK_COUNT]
-    movzx eax, word [WIN_POS + eax*2]
-    cmp   eax, [CURRENT_TASK]
-    setz  al
-    movzx eax, al
-    push  eax
-    call  drawwindow_IV
-    ;dec   [mouse_pause]
-    ;call   [draw_pointer]
-    ;ret
-    jmp   draw_window_caption.2
-  nosyswV:
-    ret
-draw_window_caption:
-	inc	[mouse_pause]
-	call	[_display.disable_mouse]
-	xor	eax,eax
-	mov	edx,[TASK_COUNT]
-	movzx	edx,word[WIN_POS+edx*2]
-	cmp	edx,[CURRENT_TASK]
-	jne	@f
-	inc	eax
-    @@: mov	edx,[CURRENT_TASK]
-	shl	edx,5
-	add	edx,window_data
-	movzx	ebx,[edx+WDATA.fl_wstyle]
-	and	bl,0x0F
-	cmp	bl,3
-	je	.draw_caption_style_3		;{for 3 and 4 style write caption}
-	cmp	bl,4
-	je	.draw_caption_style_3
-	jmp	.not_style_3
-  .draw_caption_style_3:
-	push	edx
-	call	drawwindow_IV_caption
-	add	esp,4
-	jmp	.2
-  .not_style_3:
-	cmp	bl,2
-	jne	.not_style_2
-	call	drawwindow_III_caption
-	jmp	.2
-  .not_style_2:
-	cmp	bl,0
-	jne	.2
-	call	drawwindow_I_caption
-;--------------------------------------------------------------
-  .2:	;jmp     @f
-	mov	edi,[CURRENT_TASK]
-	shl	edi,5
-	test	[edi+window_data+WDATA.fl_wstyle],WSTYLE_HASCAPTION
-	jz	@f
-	mov	edx,[edi*8+SLOT_BASE+APPDATA.wnd_caption]
-	or	edx,edx
-	jz	@f
-	movzx	eax,[edi+window_data+WDATA.fl_wstyle]
-	and	al,0x0F
-	cmp	al,3
-	je	.skinned
-	cmp	al,4
-	je	.skinned
-	jmp	.not_skinned
-  .skinned:
-	mov	ebp,[edi+window_data+WDATA.box.left-2]
-	mov	bp,word[edi+window_data+WDATA.box.top]
-	movzx	eax,word[edi+window_data+WDATA.box.width]
-	sub	ax,[_skinmargins.left]
-	sub	ax,[_skinmargins.right]
-	push	edx
-	cwde
-	cdq
-	mov	ebx,6
-	idiv	ebx
-	pop	edx
-	or	eax,eax
-	js	@f
-	mov	esi,eax
-	mov	ebx,dword[_skinmargins.left-2]
-	mov	bx,word[_skinh]
-	sub	bx,[_skinmargins.bottom]
-	sub	bx,[_skinmargins.top]
-	sar	bx,1
-	adc	bx,0
-	add	bx,[_skinmargins.top]
-	add	bx,-3
-	add	ebx,ebp
-	jmp	.dodraw
-  .not_skinned:
-	cmp	al,1
-	je	@f
-	mov	ebp,[edi+window_data+WDATA.box.left-2]
-	mov	bp,word[edi+window_data+WDATA.box.top]
-	movzx	eax,word[edi+window_data+WDATA.box.width]
-	sub	eax,16
-	push	edx
-	cwde
-	cdq
-	mov	ebx,6
-	idiv	ebx
-	pop	edx
-	or	eax,eax
-	js	@f
-	mov	esi,eax
-	mov	ebx,0x00080007
-	add	ebx,ebp
-.dodraw:
-	mov	ecx,[common_colours+16];0x00FFFFFF
-	or	ecx, 0x80000000
-	xor	edi,edi
-; // Alver 22.06.2008 // {
-;       call    dtext
-	call dtext_asciiz_esi
-; } \\ Alver \\
-    @@:
-;--------------------------------------------------------------
-	dec	[mouse_pause]
-	call	[draw_pointer]
-	ret
-iglobal
-align 4
-window_topleft dd \
-, 21,\		;type 0
-,  0,\	;type 1
-, 20,\	;type 2
-,  ?,\	;type 3 {set by skin}
-,  ? 	;type 4 {set by skin}
-endg
-set_window_clientbox:
-	push	eax ecx edi
-	mov	eax,[_skinh]
-	mov	[window_topleft+4*7],eax
-	mov	[window_topleft+4*9],eax
-	mov	ecx,edi
-	sub	edi,window_data
-	shl	edi,3
-	test	[ecx+WDATA.fl_wstyle],WSTYLE_CLIENTRELATIVE
-	jz	@f
-	movzx	eax,[ecx+WDATA.fl_wstyle]
-	and	eax,0x0F
-	mov	eax,[eax*8+window_topleft+0]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.left],eax
-	shl	eax,1
-	neg	eax
-	add	eax,[ecx+WDATA.box.width]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.width],eax
-	movzx	eax,[ecx+WDATA.fl_wstyle]
-	and	eax,0x0F
-	push	[eax*8+window_topleft+0]
-	mov	eax,[eax*8+window_topleft+4]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.top],eax
-	neg	eax
-	sub	eax,[esp]
-	add	eax,[ecx+WDATA.box.height]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.height],eax
-	add	esp,4
-	pop	edi ecx eax
-	ret
-    @@:
-	xor	eax,eax
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.left],eax
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.top],eax
-	mov	eax,[ecx+WDATA.box.width]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.width],eax
-	mov	eax,[ecx+WDATA.box.height]
-	mov	[edi+SLOT_BASE+APPDATA.wnd_clientbox.height],eax
-	pop	edi ecx eax
-	ret
-sys_set_window:
-    mov   eax,[CURRENT_TASK]
-    shl   eax,5
-    add   eax,window_data
-    ; colors
-    mov   [eax+WDATA.cl_workarea],edx
-    mov   [eax+WDATA.cl_titlebar],esi
-    mov   [eax+WDATA.cl_frames],edi
-    mov   edi, eax
-    ; check flag (?)
-    test  [edi+WDATA.fl_wdrawn],1
-    jnz   newd
-    mov   eax,[timer_ticks] ;[0xfdf0]
-    add   eax,100
-    mov   [new_window_starting],eax
-    movsx eax,bx
-    mov   [edi+WDATA.box.width],eax
-    movsx eax,cx
-    mov   [edi+WDATA.box.height],eax
-    sar   ebx,16
-    sar   ecx,16
-    mov   [edi+WDATA.box.left],ebx
-    mov   [edi+WDATA.box.top],ecx
-    call  check_window_position
-    push  ecx esi edi		    ; save for window fullscreen/resize
-    ;mov   esi,edi
-	mov	cl, [edi+WDATA.fl_wstyle]
-	mov	eax, [edi+WDATA.cl_frames]
-    sub   edi,window_data
-    shl   edi,3
-    add   edi,SLOT_BASE
-	and	cl,0x0F
-	mov	[edi+APPDATA.wnd_caption],0
-	cmp	cl,3
-	je	set_APPDATA_wnd_caption
-	cmp	cl,4								; {SPraid.simba}
-	je	set_APPDATA_wnd_caption
-	jmp	@f
-    set_APPDATA_wnd_caption:
-	mov	[edi+APPDATA.wnd_caption],eax
-    @@: mov	esi,[esp+0]
-    add   edi, APPDATA.saved_box
-	movsd
-	movsd
-	movsd
-	movsd
-    pop   edi esi ecx
-	mov	esi, [CURRENT_TASK]
-	movzx	esi, word [WIN_STACK+esi*2]
-	lea	esi, [WIN_POS+esi*2]
-	call	waredraw
-;;;    mov   ebx, 1
-;;;    call  delay_hs
-    mov   eax, [edi+WDATA.box.left]
-    mov   ebx, [edi+WDATA.box.top]
-    mov   ecx, [edi+WDATA.box.width]
-    mov   edx, [edi+WDATA.box.height]
-    add   ecx, eax
-    add   edx, ebx
-    call  calculatescreen
-    mov   [KEY_COUNT],byte 0	       ; empty keyboard buffer
-    mov   [BTN_COUNT],byte 0	       ; empty button buffer
-  newd:
-    call  set_window_clientbox
-    mov   [edi+WDATA.fl_redraw],byte 0	 ; no redraw
-    mov   edx,edi
-    ret
-syscall_windowsettings:
-  .set_window_caption:
-	dec	ebx	; subfunction #1 - set window caption
-	jnz	.exit_fail
-	; NOTE: only window owner thread can set its caption,
-	;       so there's no parameter for PID/TID
-	mov	edi,[CURRENT_TASK]
-	shl	edi,5
-	; have to check if caption is within application memory limit
-	; check is trivial, and if application resizes its memory,
-	;   caption still can become over bounds
-; diamond, 31.10.2006: check removed because with new memory manager
-; there can be valid data after APPDATA.mem_size bound
-;        mov     ecx,[edi*8+SLOT_BASE+APPDATA.mem_size]
-;        add     ecx,255 ; max caption length
-;        cmp     ebx,ecx
-;        ja      .exit_fail
-	mov	[edi*8+SLOT_BASE+APPDATA.wnd_caption],ecx
-	or	[edi+window_data+WDATA.fl_wstyle],WSTYLE_HASCAPTION
-	call	draw_window_caption
-	xor	eax,eax ; eax = 0 (success)
-	ret
-;  .get_window_caption:
-;        dec     eax     ; subfunction #2 - get window caption
-;        jnz     .exit_fail
-	; not implemented yet
-  .exit_fail:
-	xor	eax,eax
-	inc	eax	; eax = 1 (fail)
-	ret
-sys_window_move:
-	mov	edi,[CURRENT_TASK]
-	shl	edi,5
-	add	edi,window_data
-	test	[edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
-	jnz	.window_move_return
-	push	dword [edi + WDATA.box.left]  ; save old coordinates
-	push	dword [edi + WDATA.box.top]
-	push	dword [edi + WDATA.box.width]
-	push	dword [edi + WDATA.box.height]
-	cmp   eax,-1		      ; set new position and size
-	je    .no_x_reposition
-	mov	[edi + WDATA.box.left], eax
-      .no_x_reposition:
-	cmp   ebx,-1
-	je    .no_y_reposition
-	mov	[edi + WDATA.box.top], ebx
-      .no_y_reposition:
-	test	[edi+WDATA.fl_wstate],WSTATE_ROLLEDUP
-	jnz	.no_y_resizing
-	cmp   ecx,-1
-	je    .no_x_resizing
-	mov	[edi + WDATA.box.width], ecx
-      .no_x_resizing:
-	cmp   edx,-1
-	je    .no_y_resizing
-	mov	[edi + WDATA.box.height], edx
-      .no_y_resizing:
-	call  check_window_position
-	call  set_window_clientbox
-	pushad			     ; save for window fullscreen/resize
-	mov   esi,edi
-	sub   edi,window_data
-	shr   edi,5
-	shl   edi,8
-	add   edi, SLOT_BASE + APPDATA.saved_box
-	mov   ecx,4
-	cld
-	rep   movsd
-	popad
-	pushad			     ; calculcate screen at new position
-	mov   eax, [edi + WDATA.box.left]
-	mov   ebx, [edi + WDATA.box.top]
-	mov   ecx, [edi + WDATA.box.width]
-	mov   edx, [edi + WDATA.box.height]
-	add   ecx,eax
-	add   edx,ebx
-	call  calculatescreen
-	popad
-	pop   edx		    ; calculcate screen at old position
-	pop   ecx
-	pop   ebx
-	pop   eax
-	add   ecx,eax
-	add   edx,ebx
-	mov   [draw_limits.left],eax		 ; save for drawlimits
-	mov   [draw_limits.top],ebx
-	mov   [draw_limits.right],ecx
-	mov   [draw_limits.bottom],edx
-	call  calculatescreen
-	mov   [edi + WDATA.fl_redraw], 1 ; flag the process as redraw
-	mov   eax,edi		    ; redraw screen at old position
-	xor   esi,esi
-	call  redrawscreen
-	mov   [DONT_DRAW_MOUSE],byte 0 ; mouse pointer
-	mov   [MOUSE_BACKGROUND],byte 0 ; no mouse under
-	mov   [MOUSE_DOWN],byte 0 ; react to mouse up/down
-	call  [draw_pointer]
-	mov   [window_move_pr],0
-      .window_move_return:
-	ret
-uglobal
-  window_move_pr   dd  0x0
-  window_move_eax  dd  0x0
-  window_move_ebx  dd  0x0
-  window_move_ecx  dd  0x0
-  window_move_edx  dd  0x0
-endg
+        ret
 ;ok - 100% work
 ;nt - not tested
 ;---------------------------------------------------------------------------------------------
-    add   edi, 256
+        add     edi, 256
-    or	  [edi+SLOT_BASE+APPDATA.event_mask], dword 100000b
+        or      [edi+SLOT_BASE+APPDATA.event_mask], dword 100000b
-    loop  set_mouse_event
+        loop    set_mouse_event
-mouse_not_active:
-    cmp   [REDRAW_BACKGROUND],byte 0		   ; background update ?
-    jz	  nobackgr
-    cmp    [background_defined], 0
-    jz	  nobackgr
+mouse_not_active:
-    cmp   [REDRAW_BACKGROUND], byte 2
+        cmp     byte[BACKGROUND_CHANGED], 0
-    jnz   no_set_bgr_event
+        jz      no_set_bgr_event
-    xor   edi, edi
+        xor     edi, edi
-    mov   ecx,	[TASK_COUNT]
+        mov     ecx, [TASK_COUNT]
 set_bgr_event:
-    add   edi, 256
+        add     edi, 256
-    or	  [edi+SLOT_BASE+APPDATA.event_mask], 16
+        or      [edi+SLOT_BASE+APPDATA.event_mask], 16
+        loop    set_bgr_event
-    loop  set_bgr_event
+        mov     byte[BACKGROUND_CHANGED], 0
+no_set_bgr_event:
+        cmp     byte[REDRAW_BACKGROUND], 0         ; background update ?
+        jz      nobackgr
+        cmp     [background_defined], 0
-no_set_bgr_event:
+        jz      nobackgr
 ;    mov   [draw_data+32 + RECT.left],dword 0
 ;    mov   [draw_data+32 + RECT.top],dword 0
 ;    mov   eax,[Screen_Max_X]
 ;    mov   ebx,[Screen_Max_Y]
 ;    mov   [draw_data+32 + RECT.right],eax
+;    mov   [draw_data+32 + RECT.bottom],ebx
-;    mov   [draw_data+32 + RECT.bottom],ebx
+@@:
+        call    drawbackground
-    call  drawbackground
+        xor     eax, eax
+        xchg    al, [REDRAW_BACKGROUND]
+        test    al, al                             ; got new update request?
+        jnz     @b
+        mov     [draw_data+32 + RECT.left], eax
+        mov     [draw_data+32 + RECT.top], eax
+        mov     [draw_data+32 + RECT.right], eax
-    mov   [REDRAW_BACKGROUND],byte 0
+        mov     [draw_data+32 + RECT.bottom], eax
-    mov   [MOUSE_BACKGROUND],byte 0
+        mov     [MOUSE_BACKGROUND], byte 0
-	 cmp   ecx,eax
+        cmp     ecx, eax
-	 jb    ricino
+        jb      ricino
-	bgli:
+        bgli:
-	 cmp   ecx,1
+        cmp     dword[esp], 1
-	 jnz   .az
-	 mov   al,[REDRAW_BACKGROUND]
+        jnz     .az
-	 cmp   al,2
+;         cmp   byte[BACKGROUND_CHANGED], 0
-	 jz    newdw8
+;         jnz   newdw8
+        cmp     byte[REDRAW_BACKGROUND], 0
-	 test  al,al
+        jz      .az
-	 jz    .az
+        mov     dl, 0
-	 lea   eax,[edi+draw_data-window_data]
+        lea     eax, [edi+draw_data-window_data]
-	 mov   ebx,[draw_limits.left]
+        mov     ebx, [draw_limits.left]
-	 cmp   ebx,[eax+RECT.left]
+        cmp     ebx, [eax+RECT.left]
+        jae     @f
-	 jae   @f
+        mov     [eax+RECT.left], ebx
-	 mov   [eax+RECT.left],ebx
+        mov     dl, 1
-	@@:
+        @@:
-	 mov   ebx,[draw_limits.top]
+        mov     ebx, [draw_limits.top]
-	 cmp   ebx,[eax+RECT.top]
+        cmp     ebx, [eax+RECT.top]
+        jae     @f
-	 jae   @f
+        mov     [eax+RECT.top], ebx
-	 mov   [eax+RECT.top],ebx
+        mov     dl, 1
-	@@:
+        @@:
-	 mov   ebx,[draw_limits.right]
+        mov     ebx, [draw_limits.right]
-	 cmp   ebx,[eax+RECT.right]
+        cmp     ebx, [eax+RECT.right]
+        jbe     @f
-	 jbe   @f
+        mov     [eax+RECT.right], ebx
-	 mov   [eax+RECT.right],ebx
+        mov     dl, 1
-	@@:
+        @@:
-	 mov   ebx,[draw_limits.bottom]
+        mov     ebx, [draw_limits.bottom]
-	 cmp   ebx,[eax+RECT.bottom]
+        cmp     ebx, [eax+RECT.bottom]
+        jbe     @f
-	 jbe   @f
+        mov     [eax+RECT.bottom], ebx
+        mov     dl, 1
-	 mov   [eax+RECT.bottom],ebx
+        @@:
-	@@:
+        add     byte[REDRAW_BACKGROUND], dl
-	 jmp   newdw8
+        jmp     newdw8
-	.az:
+        .az:
-	 sub   eax,draw_data-window_data
+        sub     eax, draw_data-window_data
-	 cmp   dword [esp],1
+        cmp     dword [esp], 1
-	 jne   nobgrd
+        jne     nobgrd
-	 mov   byte [REDRAW_BACKGROUND], 1
+        inc     byte[REDRAW_BACKGROUND]
-	mov   ecx, [_WinMapSize]
+        mov     ecx, [_WinMapSize]
-	shr   ecx, 2
+        shr     ecx, 2
-	rep   stosd
+        rep stosd
+        mov     byte[REDRAW_BACKGROUND], 0            ; do not draw background!
-	mov   byte [REDRAW_BACKGROUND], 0	       ; do not draw background!
+        mov     byte[BACKGROUND_CHANGED], 0
-	ret
+        ret
-	in    al,0x61
+        in      al, 0x61
-	and   al,0x10
+        and     al, 0x10
-	mov   ah,al
+        mov     ah, al
-	cld
+        cld
+ cnt1:
- cnt1:	in    al,0x61
+        in      al, 0x61
-	and   al,0x10
+        and     al, 0x10
-	cmp   al,ah
+        cmp     al, ah
-	jz    cnt1
+        jz      cnt1
 ;     ret
-align 4
-sys_programirq:
-    mov   eax, [TASK_BASE]
-    add   ebx, [eax + TASKDATA.mem_start]
-    cmp   ecx, 16
-    jae   .not_owner
-    mov   edi, [eax + TASKDATA.pid]
-    cmp   edi, [irq_owner + 4 * ecx]
-    je	  .spril1
-.not_owner:
-    xor   ecx, ecx
-    inc   ecx
-    jmp   .end
-  .spril1:
-    shl   ecx, 6
-    mov   esi, ebx
-    lea   edi, [irq00read + ecx]
-    push  16
-    pop   ecx
-    cld
-    rep   movsd
-  .end:
-    mov   [esp+32], ecx
-    ret
-align 4
-get_irq_data:
-     movzx esi, bh			 ; save number of subfunction, if bh = 1, return data size, otherwise, read data
-     xor   bh, bh
-     cmp   ebx, 16
-     jae   .not_owner
-     mov   edx, [4 * ebx + irq_owner]	 ; check for irq owner
-     mov   eax,[TASK_BASE]
-     cmp   edx,[eax+TASKDATA.pid]
-     je    gidril1
-.not_owner:
-     xor   edx, edx
-     dec   edx
-     jmp   gid1
-  gidril1:
-     shl   ebx, 12
-     lea   eax, [ebx + IRQ_SAVE]	 ; calculate address of the beginning of buffer + 0x0 - data size
-     mov   edx, [eax]			 ;                                              + 0x4 - data offset
-     dec   esi
-     jz    gid1
-     test  edx, edx			 ; check if buffer is empty
-     jz    gid1
-     mov   ebx, [eax + 0x4]
-     mov   edi, ecx
-     mov   ecx, 4000			 ; buffer size, used frequently
-     cmp   ebx, ecx			 ; check for the end of buffer, if end of buffer, begin cycle again
-     jb    @f
-     xor   ebx, ebx
-   @@:
-     lea   esi, [ebx + edx]		 ; calculate data size and offset
-     cld
-     cmp   esi, ecx			 ; if greater than the buffer size, begin cycle again
-     jbe   @f
-     sub   ecx, ebx
-     sub   edx, ecx
-     lea   esi, [eax + ebx + 0x10]
-     rep   movsb
-     xor   ebx, ebx
-   @@:
-     lea   esi, [eax + ebx + 0x10]
-     mov   ecx, edx
-     add   ebx, edx
-     rep   movsb
-     mov   edx, [eax]
-     mov   [eax], ecx			 ; set data size to zero
-     mov   [eax + 0x4], ebx		 ; set data offset
-   gid1:
-     mov   [esp+32], edx		 ; eax
      ret
 align 4
 set_io_access_rights:
-      push edi eax
+        push    edi eax
 ;     add   edi,eax
 ;     mov   ebx,1
 ;     shl   ebx,cl
-     test  ebp,ebp
+        test    ebp, ebp
 ;     cmp   ebp,0                ; enable access - ebp = 0
-     jnz   siar1
+        jnz     .siar1
 ;     not   ebx
 ;     and   [edi],byte bl
-     btr [edi], eax
+        btr     [edi], eax
-     pop eax edi
+        pop     eax edi
-     ret
+        ret
-siar1:
+.siar1:
-     bts [edi], eax
+        bts     [edi], eax
   ;  or    [edi],byte bl        ; disable access - ebp = 1
-     pop eax edi
+        pop     eax edi
-     ret
+        ret
 ;reserve/free group of ports
 ;     popad                         ; end disable io map
-     xor   eax, eax
+        xor     eax, eax
-     ret
+        ret
-reserve_free_irq:
-     xor   esi, esi
-     inc   esi
-     cmp   ecx, 16
-     jae   ril1
-     push  ecx
-     lea   ecx, [irq_owner + 4 * ecx]
-     mov   edx, [ecx]
-     mov   eax, [TASK_BASE]
-     mov   edi, [eax + TASKDATA.pid]
-     pop   eax
-     dec   ebx
-     jnz   reserve_irq
-     cmp   edx, edi
-     jne   ril1
-     dec   esi
-     mov   [ecx], esi
-     jmp   ril1
-  reserve_irq:
-     cmp   dword [ecx], 0
-     jne   ril1
-     mov   ebx, [f_irqs + 4 * eax]
-     stdcall attach_int_handler, eax, ebx, dword 0
-     mov   [ecx], edi
-     dec   esi
-   ril1:
-     mov   [esp+32], esi ; return in eax
-     ret
-iglobal
-f_irqs:
-     dd 0x0
-     dd 0x0
-     dd p_irq2
-     dd p_irq3
-     dd p_irq4
-     dd p_irq5
-     dd p_irq6
-     dd p_irq7
-     dd p_irq8
-     dd p_irq9
-     dd p_irq10
-     dd p_irq11
-     dd 0x0
-     dd 0x0
-     dd p_irq14
-     dd p_irq15
 endg
 align 4
 drawbackground:
-       inc   [mouse_pause]
+        inc     [mouse_pause]
-       cmp   [SCR_MODE],word 0x12
+        cmp     [SCR_MODE], word 0x12
-	inc	[mouse_pause]
+        inc     [mouse_pause]
-	call	eax
+        call    eax
-	dec	[mouse_pause]
+        dec     [mouse_pause]
-	pop	ebp esi ebp
+        pop     ebp esi ebp
-	jmp	[draw_pointer]
+        jmp     [draw_pointer]
-syscall_putimage_palette:
-	mov	edi, esi
-	mov	esi, edx
-	mov	edx, ecx
-	mov	ecx, ebx
-	mov	ebx, eax
+align 4
 sys_putimage_palette:
 ; ebx = pointer to image
 ; ecx = [xsize]*65536 + [ysize]
 ; edx = [xstart]*65536 + [ystart]
 ; esi = number of bits per pixel, must be 8, 24 or 32
-     mov   edx,0xffffffff
+        mov     edx, 0xffffffff
-     mov   eax,0xffffffff
+        mov     eax, 0xffffffff
-     ret
+        ret
 end if
-rerouteirqs:
-	cli
-	mov	al,0x11 	;  icw4, edge triggered
-	out	0x20,al
-	call	pic_delay
-	out	0xA0,al
-	call	pic_delay
-	mov	al,0x20 	;  generate 0x20 +
-	out	0x21,al
-	call	pic_delay
-	mov	al,0x28 	;  generate 0x28 +
-	out	0xA1,al
-	call	pic_delay
-	mov	al,0x04 	;  slave at irq2
-	out	0x21,al
-	call	pic_delay
-	mov	al,0x02 	;  at irq9
-	out	0xA1,al
-	call	pic_delay
-	mov	al,0x01 	;  8086 mode
-	out	0x21,al
-	call	pic_delay
-	out	0xA1,al
-	call	pic_delay
-	mov	al,255		; mask all irq's
-	out	0xA1,al
-	call	pic_delay
-	out	0x21,al
-	call	pic_delay
-	mov	ecx,0x1000
-	cld
-picl1:	call	pic_delay
-	loop	picl1
-	mov	al,255		; mask all irq's
-	out	0xA1,al
-	call	pic_delay
-	out	0x21,al
-	call	pic_delay
-	cli
-	ret
-pic_delay:
-	jmp	pdl1
-pdl1:	ret
 sys_msg_board_str:
-     pushad
+        pushad
-	loop	@b
+        loop    @b
-	popad
+        popad
-	ret
+        ret
+uglobal
-uglobal
+  msg_board_data:
-  msg_board_data: times 4096 db 0
+                  times 4096 db 0
   msg_board_count dd 0x0
 endg
-	mov	[esp+36], ecx
+        mov     [esp+36], ecx
-	mov	[esp+24], ecx
+        mov     [esp+24], ecx
 .smbl2:
-	ret
+        ret
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 66 sys function.                                                ;;
+;; in eax=66,ebx in [0..5],ecx,edx                                 ;;
+;; out eax                                                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+iglobal
+align 4
+f66call:
+           dd sys_process_def.1   ; 1 = set keyboard mode
+           dd sys_process_def.2   ; 2 = get keyboard mode
+           dd sys_process_def.3   ; 3 = get keyboard ctrl, alt, shift
+           dd sys_process_def.4
+           dd sys_process_def.5
+endg
+sys_process_def:
+        dec     ebx
         cmp     ebx, 5
+        jae     .not_support    ;if >=6 then or eax,-1
+        mov     edi, [CURRENT_TASK]
-sys_process_def:
+        jmp     dword [f66call+ebx*4]
-	mov	edi, [CURRENT_TASK]
+.not_support:
+        or      eax, -1
-	dec	eax		; 1 = set keyboard mode
+        ret
-     jne   no_set_keyboard_setup
-     shl   edi,8
-     mov   [edi+SLOT_BASE + APPDATA.keyboard_mode],bl
-     ret
+.1:
         shl     edi, 8
-   no_set_keyboard_setup:
+        mov     [edi+SLOT_BASE + APPDATA.keyboard_mode], cl
-	dec	eax		; 2 = get keyboard mode
      jne   no_get_keyboard_setup
-     shl   edi,8
-     movzx eax, byte [SLOT_BASE+edi + APPDATA.keyboard_mode]
-     mov   [esp+36],eax
-     ret
+        ret
-   no_get_keyboard_setup:
+.2:                             ; 2 = get keyboard mode
         shl     edi, 8
-	dec	eax		; 3 = get keyboard ctrl, alt, shift
+        movzx   eax, byte [SLOT_BASE+edi + APPDATA.keyboard_mode]
-     jne   no_get_keyboard_cas
+        mov     [esp+32], eax
         ret
 ;     xor   eax,eax
-;     movzx eax,byte [shift]
+;     movzx eax,byte [shift]
 ;     movzx ebx,byte [ctrl]
 ;     shl   ebx,2
 ;     add   eax,ebx
-;     movzx ebx,byte [alt]
-;     shl   ebx,3
+;     movzx ebx,byte [alt]
-;     add   eax,ebx
 ;     shl   ebx,3
- ;// mike.dld [
-     mov   eax, [kb_state]
- ;// mike.dld ]
-     mov   [esp+36],eax
+;     add   eax,ebx
 .3:                             ;3 = get keyboard ctrl, alt, shift
-     ret
+ ;// mike.dld [
         mov     eax, [kb_state]
-   no_get_keyboard_cas:
+ ;// mike.dld ]
         mov     [esp+32], eax
-	dec	eax
+        ret
 	jnz	no_add_keyboard_hotkey
+.4:
-	mov	eax, hotkey_list
+        mov     eax, hotkey_list
 @@:
-	cmp	dword [eax+8], 0
+        cmp     dword [eax+8], 0
-	jz	.found_free
+        jz      .found_free
-	add	eax, 16
+        add     eax, 16
-	cmp	eax, hotkey_list+16*256
+        cmp     eax, hotkey_list+16*256
-	jb	@b
+        jb      @b
-	mov	dword [esp+36], 1
+        mov     dword [esp+32], 1
-	ret
+        ret
 .found_free:
-	mov	[eax+8], edi
+        mov     [eax+8], edi
-	mov	[eax+4], ecx
+        mov     [eax+4], edx
-	movzx	ebx, bl
+        movzx   ecx, cl
-	lea	ebx, [hotkey_scancodes+ebx*4]
+        lea     ecx, [hotkey_scancodes+ecx*4]
-	mov	ecx, [ebx]
+        mov     edx, [ecx]
-	mov	[eax], ecx
-	mov	[ebx], eax
-	mov	[eax+12], ebx
-	jecxz	@f
-	mov	[ecx+12], eax
+        mov     [eax], edx
-@@:
+        mov     [ecx], eax
-	and	dword [esp+36], 0
+        mov     [eax+12], ecx
-	ret
+        jecxz   @f
         mov     [edx+12], eax
-no_add_keyboard_hotkey:
+@@:
         and     dword [esp+32], 0
-	dec	eax
+        ret
 	jnz	no_del_keyboard_hotkey
+.5:
-	movzx	ebx, bl
+        movzx   ebx, cl
-	lea	ebx, [hotkey_scancodes+ebx*4]
+        lea     ebx, [hotkey_scancodes+ebx*4]
-	mov	eax, [ebx]
+        mov     eax, [ebx]
 .scan:
-	test	eax, eax
+        test    eax, eax
-	jz	.notfound
+        jz      .notfound
-	cmp	[eax+8], edi
+        cmp     [eax+8], edi
-	jnz	.next
+        jnz     .next
-	cmp	[eax+4], ecx
+        cmp     [eax+4], edx
-	jz	.found
+        jz      .found
 .next:
-	xor	edx, edx
+        xor     edx, edx
-	mov	[eax+4], edx
+        mov     [eax+4], edx
-	mov	[eax+8], edx
+        mov     [eax+8], edx
-	mov	[eax+12], edx
+        mov     [eax+12], edx
-	mov	[eax], edx
+        mov     [eax], edx
-	mov	[esp+36], edx
+        mov     [esp+32], edx
-	ret
+        ret
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 61 sys function.                                                ;;
+;; in eax=61,ebx in [1..3]                                         ;;
+;; out eax                                                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+iglobal
-no_del_keyboard_hotkey:
+align 4
+f61call:
+           dd sys_gs.1   ; resolution
+           dd sys_gs.2   ; bits per pixel
+           dd sys_gs.3   ; bytes per scanline
-     ret
+endg
+align 4
+sys_gs:                         ; direct screen access
+        dec     ebx
+        cmp     ebx, 2
+        ja      .not_support
+        jmp     dword [f61call+ebx*4]
+.not_support:
-align 4
         or      [esp+32], dword -1
-sys_gs: 			; direct screen access
+        ret
      cmp  eax,1 		; resolution
-     jne  no_gs1
+.1:                             ; resolution
-     mov  eax,[Screen_Max_X]
+        mov     eax, [Screen_Max_X]
-     shl  eax,16
-     mov  ax,[Screen_Max_Y]
-     add  eax,0x00010001
+        shl     eax, 16
-     mov  [esp+36],eax
-     ret
+        mov     ax, [Screen_Max_Y]
-   no_gs1:
+        add     eax, 0x00010001
         mov     [esp+32], eax
-     cmp   eax,2		; bits per pixel
-     jne   no_gs2
-     movzx eax,byte [ScreenBPP]
+        ret
-     mov   [esp+36],eax
-     ret
+.2:                             ; bits per pixel
-   no_gs2:
+        movzx   eax, byte [ScreenBPP]
-     cmp   eax,3		; bytes per scanline
-     jne   no_gs3
-     mov   eax,[BytesPerScanLine]
-     mov   [esp+36],eax
-     ret
-   no_gs3:
-     or  [esp+36],dword -1
-     ret
-align 4 ; PCI functions
         mov     [esp+32], eax
-sys_pci:
         ret
-     call  pci_api
+.3:                             ; bytes per scanline
-     mov   [esp+36],eax
+        mov     eax, [BytesPerScanLine]
-	xor	edi, edi
+        xor     edi, edi
-	add	ebx, ebp
+        add     ebx, ebp
-	mov	ecx, edx
+        mov     ecx, edx
-	jmp	[draw_line]
+        jmp     [draw_line]
-align 4
-syscall_getirqowner:			; GetIrqOwner
-     cmp   ebx,16
-     jae   .err
-     cmp   [irq_rights + 4 * ebx], dword 2
-     je    .err
-     mov   eax,[4 * ebx + irq_owner]
-     mov   [esp+32],eax
-     ret
-.err:
      or    dword [esp+32], -1
-     ret
 align 4
 align 4
-syscall_reserveportarea:		; ReservePortArea and FreePortArea
+syscall_reserveportarea:                ; ReservePortArea and FreePortArea
-     call  r_f_port_area
-     mov   [esp+32],eax
+        call    r_f_port_area
-     ret
+        mov     [esp+32], eax
         ret
 align 4
 align 4
-	   call sys_cd_audio
+        call    sys_cd_audio
 yes_shutdown_param:
+        cli
 	   cli
 if ~ defined extended_primary_loader
-	   mov	eax, kernel_file ; load kernel.mnt to 0x7000:0
+        mov     eax, kernel_file ; load kernel.mnt to 0x7000:0
-	   push 12
+        push    12
-	   pop	esi
+        pop     esi
-	   mov	esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
+        mov     esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
-	   mov	edi,OS_BASE+0x40000
+        mov     edi, OS_BASE+0x40000
-	   mov	ecx,1000
+        mov     ecx, 1000
+        rep movsb
-	   rep	movsb
+end if
-	   mov	esi,OS_BASE+0x2F0000	; restore 0x0 - 0xffff
+        mov     esi, BOOT_VAR    ; restore 0x0 - 0xffff
-	   mov	edi, OS_BASE
+        mov     edi, OS_BASE
-	   mov	ecx,0x10000/4
+        mov     ecx, 0x10000/4
-	   cld
+        cld
-	   rep movsd
-	   call restorefatchain
+        rep movsd
-	   mov al, 0xFF
+        call    restorefatchain
 	   out 0x21, al

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/kernel.asm – Rev 2305 → 2382