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

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 774 $
+$Revision: 802 $
 	mov	al, [BOOT_VAR+0x901F]	; DMA access
 	mov	[allow_dma_access], al
 	mov   al,[BOOT_VAR+0x9000]	  ; bpp
 	mov   [ScreenBPP],al
-	xchg bx, bx
 	movzx eax,word [BOOT_VAR+0x900A]  ; X max
 	dec   eax
 	mov   [Screen_Max_X],eax
 	mov   [screen_workarea.right],eax
 	pushad
-	mov  [irq_owner+4*0], 1    ; timer
-	;mov  [irq_owner+4*1], 1    ; keyboard
+	mov  [irq_owner+4*0], 1    ; timer
-	mov  [irq_owner+4*5], 1    ; sound blaster
+	;mov  [irq_owner+4*1], 1    ; keyboard
 	mov  [irq_owner+4*6], 1    ; floppy diskette
 	mov  [irq_owner+4*13], 1   ; math co-pros
 	mov   ax,[BOOT_VAR+0x900A]
 	shr   ax,1
 	mov   [MOUSE_X],eax
 	pop   eax
 	mov   byte [SB16_Status],0	      ; Minazzi Paolo
-	mov   [BTN_ADDR],dword BUTTON_INFO    ; address of button list
+        mov   [BTN_ADDR],dword BUTTON_INFO    ; address of button list
      ;!! IP 04.02.2005:
     and   eax,0xff
     mov   [esp+36],dword 0
     mov   [esp+24],eax
     ret
-align 4
-sys_sb16:
-     cmp  word [sb16],word 0
-     jnz  sb16l1
-     mov  [esp+36],dword 1
-     ret
-   sb16l1:
-     mov  [esp+36],dword 0
-     cmp  eax,1    ; set volume - main
-     jnz  sb16l2
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x22
-     out  dx,al
-     mov  esi,1
-     call delay_ms
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     ret
-   sb16l2:
-     cmp  eax,2    ; set volume - cd
-     jnz  sb16l3
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x28
-     out  dx,al
-     mov  esi,1
-     call delay_ms
-     mov  eax,ebx
-     add  edx,1
-     out  dx,al
-     ret
-   sb16l3:
-      mov  [esp+36],dword 2
-      ret
-align 4
-sys_sb16II:
-     cmp  word [sb16],word 0
-     jnz  IIsb16l1
-     mov  [esp+36],dword 1
-     ret
-   IIsb16l1:
-     cmp  eax,1    ; set volume - main
-     jnz  IIsb16l2
-     ; L
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x30
-     out  dx,al
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     ; R
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x31
-     out  dx,al
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     mov  [esp+36],dword 0
-     ret
-   IIsb16l2:
-     cmp  eax,2    ; set volume - cd
-     jnz  IIsb16l3
-     ; L
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x36
-     out  dx,al
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     ; R
-     mov  dx,word [sb16]
-     add  dx,4
-     mov  al,0x37
-     out  dx,al
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     mov  [esp+36],dword 0
-     ret
-   IIsb16l3:
-     mov  [esp+36],dword 2
-     ret
 display_number:
 ; eax = print type, al=0 -> ebx is number
 sys_setup:
 ; 1=roland mpu midi base , base io address
 ; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
-; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
-; 4=sb16 base , base io address
+; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 5=system language, 1eng 2fi 3ger 4rus
 ; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 8=fat32 partition in hd
 ; 9
    kbnocountry:
      mov  [esp+36],dword 1
      ret
    nsyse2:
      cmp  eax,3 		     ; CD
-     jnz  nsyse3
+     jnz  nsyse4
      test ebx,ebx
      jz   nosesl
      cmp  ebx, 4
      ja   nosesl
      mov  [cd_base],bl
    nosesl:
      ret
-cd_base db 0
-   nsyse3:
-     cmp  eax,4 		     ; SB
-     jnz  nsyse4
-     cmp  ebx,0x100
-     jb   nsyse4
-     mov  edx,65535
-     cmp  edx,ebx
-     jb   nsyse4
-     mov  word [sb16],bx
+cd_base db 0
      ret
    nsyse4:
      pusha
      call  choice_necessity_partition_1
      popa
     mov   [hd1_status],0	; free
      ret
-   nsyse8:
-     cmp  eax,10		     ; SOUND DMA CHANNEL
-     jne  no_set_sound_dma
-     cmp  ebx,3
-     ja   sys_setup_err
-     mov  [sound_dma],ebx
-     ret
-   no_set_sound_dma:
 nsyse8:
      cmp  eax,11		     ; ENABLE LBA READ
      jne  no_set_lba_read
      and  ebx,1
      mov  [lba_read_enabled],ebx
-     ret
+     ret
    no_set_lba_read:
 no_set_lba_read:
-     cmp  eax,12		     ; ENABLE PCI ACCESS
+     cmp  eax,12                     ; ENABLE PCI ACCESS
      jne  no_set_pci_access
      and  ebx,1
 sys_getsetup:
 ; 1=roland mpu midi base , base io address
 ; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
-; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
-; 4=sb16 base , base io address
+; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 5=system language, 1eng 2fi 3ger 4rus
 ; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 8=fat32 partition in hd
-     jnz  ngsyse3
+         jnz  ngsyse3
-     movzx eax,[cd_base]
+         movzx eax,[cd_base]
-     mov  [esp+36],eax
+         mov  [esp+36],eax
-     ret
+         ret
-   ngsyse3:
+ngsyse3:
-     cmp  eax,4
-     jne  ngsyse4
-     mov  eax,[sb16]
-     mov  [esp+36],eax
-     ret
-   ngsyse4:
-     cmp  eax,5
+         cmp  eax,5
-     jnz  ngsyse5
+         jnz  ngsyse5
-     mov  eax,[syslang]
+         mov  eax,[syslang]
-     mov  [esp+36],eax
+         mov  [esp+36],eax
-     ret
+         ret
      jne  ngsyse9
      mov  eax,[timer_ticks] ;[0xfdf0]
      mov  [esp+36],eax
      ret
-   ngsyse9:
+ngsyse9:
-     cmp  eax,10
-     jnz  ngsyse10
-     mov eax,[sound_dma]
-     mov  [esp+36],eax
-     ret
-   ngsyse10:
      cmp  eax,11
      jnz  ngsyse11
      mov eax,[lba_read_enabled]
      mov  [esp+36],eax
      ret
 	shr	ecx, 12
 @@:
 	and	dword [page_tabs+eax*4], 0
 	mov	edx, eax
 	shl	edx, 12
+        push eax
 	invlpg	[edx]
+        pop eax
 	inc	eax
 	loop	@b
 	pop	eax
 	and	dword [page_tabs+(eax-1)*4], not DONT_FREE_BLOCK
 	stdcall user_free, ebx

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 774 → 802