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

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 665 $
+$Revision: 671 $
         mov  [irq_owner+4*6], 1    ; floppy diskette
         mov  [irq_owner+4*13], 1   ; math co-pros
         mov  [irq_owner+4*14], 1   ; ide I
         mov  [irq_owner+4*15], 1   ; ide II
-;        movzx eax,byte [0xf604]        ; mouse irq
-;        dec   eax
-;        add   eax,mouseirqtable
-;        movzx eax,byte [eax]
-;        shl   eax,2
-;        mov   [irq_owner+eax],byte 1
-                                       ; RESERVE PORTS
+	; RESERVE PORTS
         mov   edi,1                    ; 0x00-0x2d
         mov   [RESERVED_PORTS],edi
         shl   edi,4
         shl   edi,4
         mov   [RESERVED_PORTS+edi+0],dword 1
         mov   [RESERVED_PORTS+edi+4],dword 0xe5
         mov   [RESERVED_PORTS+edi+8],dword 0xff
-;        cmp   [0xf604],byte 2          ; com1 mouse -> 0x3f0-0x3ff
-;        jne   ripl1
-;        inc   dword [0x2d0000]
-;        mov   edi,[0x2d0000]
-;        shl   edi,4
-;        mov   [0x2d0000+edi+0],dword 1
-;        mov   [0x2d0000+edi+4],dword 0x3f0
-;        mov   [0x2d0000+edi+8],dword 0x3ff
-;      ripl1:
-;        cmp   [0xf604],byte 3          ; com2 mouse -> 0x2f0-0x2ff
-;        jne   ripl2
-;        inc   dword [0x2d0000]
-;        mov   edi,[0x2d0000]
-;        shl   edi,4
-;        mov   [0x2d0000+edi+0],dword 1
-;        mov   [0x2d0000+edi+4],dword 0x2f0
-;        mov   [0x2d0000+edi+8],dword 0x2ff
-;      ripl2:
         popad
         ret
      pop   eax
 .continue:
      ret
-draw_num_text:
-     ; dtext
-     ;
-     ; eax x & y
-     ; ebx color
-     ; ecx start of text
-     ; edx length
-     ; edi 1 force
-;        mov     edi,[CURRENT_TASK]
-;        shl     edi,8
-;        add     ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
-;        rol     eax,16
-;        add     ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
-;        rol     eax,16
 draw_num_text:
      mov   edx,eax
      mov   ecx,64+4
      sub   ecx,eax
      add   ecx,esp
         and     ebx, not 0x80000000     ; force counted string
         mov     esi, [esp+64+4+4]
         mov     edi, [esp+64+4]
      jmp   dtext
-read_string:
-    ; eax  read_area
-    ; ebx  color of letter
-    ; ecx  color of background
-    ; edx  number of letters to read
-    ; esi  [x start]*65536 + [y_start]
-    ret
 align 4
 UID_NONE=0
 UID_MENUETOS=1   ;official
 UID_KOLIBRI=2    ;russian
-sys_cachetodiskette:
-;    pushad
-;    cmp  eax,1
-;    jne  no_write_all_of_ramdisk
-;    call fdc_writeramdisk
-;    popad
-;    ret
-;  no_write_all_of_ramdisk:
-;    cmp eax,2
-;    jne no_write_part_of_ramdisk
-;    call fdc_commitflush
-;    popad
-;    ret
-;  no_write_part_of_ramdisk:
-;    cmp  eax,3
-;    jne  no_set_fdc
-;    call fdc_set
-;    popad
-;    ret
-;  no_set_fdc:
-;    cmp  eax,4
-;    jne  no_get_fdc
-;    popad
-;    call fdc_get
-;    mov    [esp+36],ecx
-;    ret
-;  no_get_fdc:
-;    popad
-;    ret
+sys_cachetodiskette:
-    cmp eax,1
+	cmp	ebx, 1
-    jne no_floppy_a_save
+	jne	.no_floppy_a_save
-    mov   [flp_number],1
+	mov	[flp_number], 1
-    jmp save_image_on_floppy
+	jmp	.save_image_on_floppy
-  no_floppy_a_save:
+.no_floppy_a_save:
-    cmp eax,2
+	cmp	ebx, 2
-    jne no_floppy_b_save
+	jne	.no_floppy_b_save
-    mov   [flp_number],2
+	mov	[flp_number], 2
-  save_image_on_floppy:
+.save_image_on_floppy:
-    call save_image
+	call	save_image
-    mov  [esp+36],dword 0
+	mov	[esp + 32], dword 0
-    cmp  [FDC_Status],0
+	cmp	[FDC_Status], 0
-    je   yes_floppy_save
+	je	.yes_floppy_save
-  no_floppy_b_save:
+.no_floppy_b_save:
-    mov [esp+36],dword 1
+	mov	[esp + 32], dword 1
-  yes_floppy_save:
+.yes_floppy_save:
-    ret
+	ret
 uglobal
 align 4
 sys_getkey:
-    mov   [esp+36],dword 1
+	mov	[esp + 32],dword 1
-; test main buffer
+	; test main buffer
-    mov   ebx, [CURRENT_TASK]                          ; TOP OF WINDOW STACK
+	mov	ebx, [CURRENT_TASK]                          ; TOP OF WINDOW STACK
-    push  eax
+	push	eax
-    dec   byte [KEY_COUNT]
+	dec	byte [KEY_COUNT]
-    and   byte [KEY_COUNT],127
+	and	byte [KEY_COUNT], 127
-    movzx ecx,byte [KEY_COUNT]
+	movzx	ecx, byte [KEY_COUNT]
-    add   ecx,2
+	add	ecx, 2
- ;   mov   esi,0xf402
- ;   mov   edi,0xf401
- ;   cld
- ;  rep   movsb
-    mov   eax, KEY_BUFF+1
+	mov	eax, KEY_BUFF + 1
-    mov   ebx, KEY_BUFF
+	mov	ebx, KEY_BUFF
-    call  memmove
+	call	memmove
-    pop   eax
+	pop	eax
 .ret_eax:
-    mov   [esp+36],eax
+	mov	[esp + 32], eax
-    ret
+	ret
- .finish:
+.finish:
 ; test hotkeys buffer
-        mov     ecx, hotkey_buffer
+	mov	ecx, hotkey_buffer
 @@:
 align 4
 sys_getbutton:
-    mov   ebx, [CURRENT_TASK]                         ; TOP OF WINDOW STACK
+	mov	ebx, [CURRENT_TASK]                         ; TOP OF WINDOW STACK
-    mov   [esp+36],dword 1
+	mov	[esp + 32], dword 1
-    movzx ecx, word [WIN_STACK + ebx * 2]
+	movzx	ecx, word [WIN_STACK + ebx * 2]
-    mov   edx, [TASK_COUNT] ; less than 256 processes
+	mov	edx, [TASK_COUNT] ; less than 256 processes
-    cmp   ecx,edx
+	cmp	ecx, edx
-    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
+	shl	eax, 8
-    mov   [BTN_COUNT],byte 0
+	mov	[BTN_COUNT], byte 0
-    mov   [esp+36],eax
+	mov	[esp + 32], eax
- .exit:
+.exit:
         in    al,0x71
         add   ecx,edx
         movzx edx,al
         add   ecx,edx
         sti
-        mov   [esp+36],ecx
+	mov	[esp + 32], ecx
         ret
 align 4
 sys_date:
 sys_date:
         cli
         cli
   @@:   mov   al, 10
         mov     al,9            ; year
         out     0x70,al
         in      al,0x71
         mov     cl,al
         sti
-        mov     [esp+36],ecx
+        mov     [esp+32], ecx
         ret
-; redraw status
+; redraw status
 sys_redrawstat:
-    cmp  eax,1
+sys_redrawstat:
-    jne  no_widgets_away
 	cmp	ebx, 1
-    ; buttons away
 	jne	no_widgets_away
-    mov   ecx,[CURRENT_TASK]
 	; buttons away
-  sys_newba2:
+	mov	ecx,[CURRENT_TASK]
   sys_newba2:
-    mov   edi,[BTN_ADDR]
-    cmp   [edi],dword 0  ; empty button list ?
+	mov	edi,[BTN_ADDR]
-    je    end_of_buttons_away
+	cmp	[edi], dword 0  ; empty button list ?
-    movzx ebx,word [edi]
+	je	end_of_buttons_away
-    inc   ebx
 	movzx	ebx, word [edi]
-    mov   eax,edi
 	inc	ebx
-  sys_newba:
+	mov	eax,edi
   sys_newba:
-    dec   ebx
+	dec	ebx
-    ret
+	ret
   no_widgets_away:
-    cmp   eax,2
+	cmp	ebx, 2
-    jnz   srl1
+	jnz	srl1
-    mov   eax,[ScreenHeight]
+	mov	eax, [ScreenHeight]
-    mov   [edx+RECT.bottom],eax
+	mov	[edx + RECT.bottom], eax
-    mov   edi,[TASK_BASE]
+	mov	edi, [TASK_BASE]
-    or    [edi-twdw+WDATA.fl_wdrawn], 1   ; no new position & buttons from app
 	or	[edi - twdw + WDATA.fl_wdrawn], 1   ; no new position & buttons from app
-    call  sys_window_mouse
 	call	sys_window_mouse
-    ret
+	ret
   srl1:
   srl1:
         ret
 set_app_param:
-        push edi
-        mov  edi,[TASK_BASE]
-        mov  [edi+TASKDATA.event_mask],eax
+set_app_param:
         mov	edi, [TASK_BASE]
        ret
 align 4
-syscall_putimage:                       ; PutImage
-     mov   edx,ecx
-     mov   ecx,ebx
      mov   ebx, eax
 syscall_putimage:                       ; PutImage
 sys_putimage:
      test  ecx,0x80008000
      jnz   .exit
 ; eax=1 : write :  bl byte to write
 ; eax=2 :  read :  ebx=0 -> no data, ebx=1 -> data in al
-     mov  ecx,[msg_board_count]
+	mov	ecx, [msg_board_count]
-     cmp  eax, 1
+	cmp	eax, 1
-     jne  smbl1
+	jne	.smbl1
-     mov  [msg_board_data+ecx],bl
+	mov	[msg_board_data+ecx],bl
-     inc  ecx
+	inc	ecx
-     and  ecx, 4095
+	and	ecx, 4095
-     mov  [msg_board_count], ecx
+	mov	[msg_board_count], ecx
-     mov  [check_idle_semaphore], 5
-     ret
+	mov	[check_idle_semaphore], 5
-   smbl1:
+	ret
 .smbl1:
-     cmp   eax, 2
+	cmp	eax, 2
-     jne   smbl2
-     test  ecx, ecx
-     jz    smbl21
-;     mov   edi, msg_board_data
+	jne	.smbl2
-;     mov   esi, msg_board_data+1
+	test	ecx, ecx
-;     movzx eax, byte [edi]
+	jz	.smbl21
-     mov   eax, msg_board_data+1
+	mov	eax, msg_board_data+1
-     mov   ebx, msg_board_data
-     movzx edx, byte [ebx]
-     call  memmove
-;     push  ecx
-;     shr   ecx, 2
-;     cld
-;     rep   movsd
-;     pop   ecx
+	mov	ebx, msg_board_data
-;     and   ecx, 3
+	movzx	edx, byte [ebx]
-;     rep   movsb
+	call	memmove
-     dec   [msg_board_count]
+	dec	[msg_board_count]
-     mov   [esp+36], edx ;eax
+	mov	[esp + 36], edx ;eax
-     mov   [esp+24], dword 1
+	mov	[esp + 24], dword 1
-     ret
+	ret
-   smbl21:
-     mov   [esp+36], ecx
+.smbl21:
-     mov   [esp+24], ecx
+	mov	[esp+36], ecx
 	mov	[esp+24], ecx
 align 4
 syscall_drawrect:                       ; DrawRect
-     mov   edi,ecx
+	mov	edi, edx ; color + gradient
-     and   edi,0x80FFFFFF
+	and	edi, 0x80FFFFFF
-     test  ax,ax
+	test	bx, bx	; x.size
+	je	.drectr
+	test	cx, cx ; y.size
-     je    drectr
+	je	.drectr
+	mov	eax, ebx ; bad idea
-     test  bx,bx
+	mov	ebx, ecx
-     je    drectr
-     movzx ecx,ax
+	movzx	ecx, ax ; ecx - x.size
-     shr   eax,16
+	shr	eax, 16 ; eax - x.coord
+	movzx	edx, bx ; edx - y.size
-     movzx edx,bx
+	shr	ebx, 16 ; ebx - y.coord
-     shr   ebx,16
+	mov	esi, [current_slot]
         mov     esi,[current_slot]
-        add     eax,[esi+APPDATA.wnd_clientbox.left]
+	add	eax, [esi + APPDATA.wnd_clientbox.left]
-        add     ebx,[esi+APPDATA.wnd_clientbox.top]
+	add	ebx, [esi + APPDATA.wnd_clientbox.top]
-     add   ecx,eax
+	add	ecx, eax
-     add   edx,ebx
+	add	edx, ebx
-     jmp   [drawbar]
+	jmp	[drawbar]
-    drectr:
-     ret
+.drectr:
-align 4
+	ret
-syscall_getscreensize:                  ; GetScreenSize
+align 4
+syscall_getscreensize:                  ; GetScreenSize
-     movzx eax,word[ScreenWidth]
+	mov	ax, [ScreenWidth]
-     shl   eax,16
+	shl	eax, 16
-     mov   ax,[ScreenHeight]
+	mov	ax, [ScreenHeight]
 syscall_getpixel:                       ; GetPixel
-     mov   ecx,[ScreenWidth]
+     mov   ecx, [ScreenWidth]
      inc   ecx
+     xor   edx, edx
-     xor   edx,edx
+     mov   eax, ebx
      div   ecx
-     mov   ebx,edx
+     mov   ebx, edx
-     xchg  eax,ebx
+     xchg  eax, ebx
-     call  dword [GETPIXEL]
+     call  dword [GETPIXEL] ; eax - x, ebx - y
-     mov   [esp+36],ecx
+     mov   [esp + 32], ecx
-     ret
-align 4
-syscall_readstring:                     ; ReadString
-     mov   edi,[TASK_BASE]
-     add   edi,TASKDATA.mem_start
-     add   eax,[edi]
-     call  read_string
-     mov   [esp+36],eax
+     ret
      ret
      mov   [esp+24],ebx
      ret
-align 4
-user_events:                            ; User event times
-     mov   eax,0x12345678
-     mov   [esp+36],eax
-     ret
 align 4
 read_from_hd:                           ; Read from hd - fn not in use
 ; -----------------------------------------
 align 4
-undefined_syscall:                      ; Undefined system call
 undefined_syscall:                      ; Undefined system call
-     mov   [esp+36],dword -1
+     mov   [esp + 32], dword -1
      ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm @ 681 – Rev 665 → 671