WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1220 $
+$Revision: 1232 $
      ;!! IP 04.02.2005:
         mov   byte [DONT_SWITCH], 0 ; change task if possible
-        ret
-;* mouse centered - start code- Mario79
-mouse_centered:
-        push  eax
-        mov   eax,[Screen_Max_X]
-        shr   eax,1
-        mov   [MOUSE_X],ax
-        mov   eax,[Screen_Max_Y]
-        shr   eax,1
-        mov   [MOUSE_Y],ax
-        pop   eax
-        ret
-;* mouse centered - end code- Mario79
+        ret
 align 4
 ;  SAVE ramdisk to /hd/1/menuet.img
 ;!!!!!!!!!!!!!!!!!!!!!!!!
    include 'blkdev/rdsave.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!!
 align 4
 sysfn_getactive:        ; 18.7 = get active window
      mov  eax, [TASK_COUNT]
    movzx  eax, word [WIN_POS + eax*2]
      mov  [esp+32],eax
      ret
+sysfn_sound_flag:       ; 18.8 = get/set sound_flag
-sysfn_sound_flag:       ; 18.8 = get/set sound_flag
+;     cmp  ecx,1
-     cmp  ecx,1
+     dec  ecx
-     jne  nogetsoundflag
+     jnz  nogetsoundflag
      movzx  eax,byte [sound_flag] ; get sound_flag
      mov  [esp+32],eax
      ret
+ nogetsoundflag:
- nogetsoundflag:
+;     cmp  ecx,2
-     cmp  ecx,2
+     dec  ecx
      jnz  nosoundflag
      xor  byte [sound_flag], 1
  nosoundflag:
      ret
 sysfn_minimize:         ; 18.10 = minimize window
      mov   [window_minimize],1
      ret
+align 4
 sysfn_getdiskinfo:      ; 18.11 = get disk info table
-sysfn_getdiskinfo:      ; 18.11 = get disk info table
+;     cmp  ecx,1
-     cmp  ecx,1
+     dec  ecx
      jnz  full_table
   small_table:
    for_all_tables:
      mov edi,edx
      mov esi,DRIVE_DATA
      ret
   full_table:
-     cmp  ecx,2
+;     cmp  ecx,2
+     dec  ecx
      jnz  exit_for_anyone
      call for_all_tables
      mov ecx,16384
      cld
      rep movsd
      test al,1000b
      jz WaitRetrace_loop
      and [esp+32],dword 0
      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
+;mouse_centered:
+;        push  eax
-     call  mouse_centered
+        mov   eax,[Screen_Max_X]
+        shr   eax,1
+        mov   [MOUSE_X],ax
+        mov   eax,[Screen_Max_Y]
+        shr   eax,1
-     and [esp+32],dword 0
+        mov   [MOUSE_Y],ax
+;        ret
+;* mouse centered - end code- Mario79
+	xor   eax,eax
+        and   [esp+32],eax
+;        pop   eax
      ret
+align 4
 sysfn_mouse_acceleration: ; 18.19 = set/get mouse features
-     cmp  ecx,0  ; get mouse speed factor
+     test ecx,ecx  ; get mouse speed factor
      jnz  .set_mouse_acceleration
      xor  eax,eax
      mov  ax,[mouse_speed_factor]
      mov  [esp+32],eax
      ret
+ .set_mouse_acceleration:
- .set_mouse_acceleration:
+;     cmp  ecx,1  ; set mouse speed factor
-     cmp  ecx,1  ; set mouse speed factor
+     dec  ecx
      jnz  .get_mouse_delay
      mov  [mouse_speed_factor],dx
      ret
+ .get_mouse_delay:
- .get_mouse_delay:
+;     cmp  ecx,2  ; get mouse delay
-     cmp  ecx,2  ; get mouse delay
+     dec  ecx
      jnz  .set_mouse_delay
      mov  eax,[mouse_delay]
      mov  [esp+32],eax
      ret
+ .set_mouse_delay:
- .set_mouse_delay:
+;     cmp  ecx,3  ; set mouse delay
-     cmp  ecx,3  ; set mouse delay
+     dec  ecx
      jnz  .set_pointer_position
      mov  [mouse_delay],edx
      ret
+ .set_pointer_position:
- .set_pointer_position:
+;     cmp  ecx,4  ; set mouse pointer position
-     cmp  ecx,4  ; set mouse pointer position
+     dec   ecx
      jnz  .set_mouse_button
      mov   [MOUSE_Y],dx    ;y
      ror   edx,16
      mov   [MOUSE_X],dx    ;x
      rol   edx,16
      ret
+ .set_mouse_button:
- .set_mouse_button:
+;     cmp   ecx,5  ; set mouse button features
-     cmp   ecx,5  ; set mouse button features
+     dec   ecx
      jnz  .end
      mov   [BTN_DOWN],dl
      mov   [mouse_active],1
 sys_background:
+    cmp   ebx,1                            ; BACKGROUND SIZE
-    cmp   ebx,1                            ; BACKGROUND SIZE
+    jnz   nosb1
-    jnz   nosb1
+    test  ecx,ecx
+;    cmp   ecx,0
-    cmp   ecx,0
+    jz    sbgrr
-    je    sbgrr
+    test  edx,edx
-    cmp   edx,0
+;    cmp   edx,0
-    je    sbgrr
+    jz    sbgrr
 @@:
 ;;Maxis use atomic bts for mutexes  4.4.2009
         bts     dword [bgrlock], 0
 ;     add   edi,eax
 ;     mov   ebx,1
+;     shl   ebx,cl
-;     shl   ebx,cl
+     test  ebp,ebp
-     cmp   ebp,0                ; enable access - ebp = 0
+;     cmp   ebp,0                ; enable access - ebp = 0
-     jne   siar1
+     jnz   siar1

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 1220 → 1232