WebSVN – Kolibri OS – Diff – /drivers/audio/intel_hda/intel_hda.asm

 FDEBUG		equ 1
 DEBUG_IRQ	equ 0
 USE_SINGLE_MODE   equ  0   ; 1 = Single mode; 0 = Normal mode.
-TEST_VERSION_NUMBER  equ '018b'
+TEST_VERSION_NUMBER  equ '018d'
 ;Asper+ [
   IOCTL IOCTL
 end virtual
+EVENT_NOTIFY	equ 0x00000200
+; Macroses by CleverMouse
+; The following macro assume that we are on uniprocessor machine.
+; Serious work is needed for multiprocessor machines.
+macro spin_lock_irqsave spinlock
+{
+	pushf
+	cli
+}
+macro spin_unlock_irqrestore spinlock
+{
+	popf
+}
+macro spin_lock_irq spinlock
+{
+	cli
+}
+macro spin_unlock_irq spinlock
+{
+	sti
+}
+SPINLOCK_BUSY = 1
+SPINLOCK_FREE = 0
+macro spin_lock
+{
+	push	eax ebx
+	mov	eax, aspinlock
+	mov	ebx, SPINLOCK_BUSY
+  @@:
+	lock	xchg [eax], ebx
+	cmp	ebx, SPINLOCK_FREE
+	jnz	@b
+	pop	ebx eax
+}
+macro spin_unlock
+{
+	push	eax ebx
+	mov	eax, aspinlock
+	mov	eax, aspinlock
+	mov	ebx, SPINLOCK_FREE
+lock	xchg	[eax], ebx
+	pop	ebx eax
 EVENT_NOTIFY	equ 0x00000200
 public START
 public service_proc
 .reg:
 	   stdcall RegService, sz_sound_srv, service_proc
 	   ret
-.fail:
-     if DEBUG
+.fail:
-	   mov esi, msgFail
-	   call SysMsgBoardStr
-     end if
-	   xor eax, eax
-	   ret
+	   mov esi, msgFail
 .fail_msg:
 	   call SysMsgBoardStr
 	   xor eax, eax
 	   ret
-	   call stop
+	   call    stop
-	   xor	    eax, eax
+	   xor	   eax, eax
 	   ret
 @@:
-	   cmp eax, DEV_CALLBACK
+	   cmp	   eax, DEV_CALLBACK
-	   jne @F
+	   jne	   @f
-	   mov ebx, [edi+input]
+	   mov	   ebx, [edi+input]
-	   stdcall  set_callback, [ebx]
+	   stdcall set_callback, [ebx]
-	   xor	    eax, eax
+	   xor	   eax, eax
 	   ret
 @@:
-	   cmp eax, DEV_SET_MASTERVOL
+	   cmp	   eax, DEV_SET_MASTERVOL
-	   jne @F
+	   jne	   @f
-	   mov	    eax, [edi+input]
+	   mov	   eax, [edi+input]
-	   mov	    eax, [eax]
+	   mov	   eax, [eax]
-	   call     set_master_vol
+	   call    set_master_vol
-	   xor	    eax, eax
+	   xor	   eax, eax
 	   ret
 @@:
-	   cmp eax, DEV_GET_MASTERVOL
+	   cmp	   eax, DEV_GET_MASTERVOL
-	   jne @F
+	   jne	   @f
-	   mov	    ebx, [edi+output]
+	   mov	   ebx, [edi+output]
-	   stdcall  get_master_vol, ebx
+	   stdcall get_master_vol, ebx
-	   xor	    eax, eax
+	   xor	   eax, eax
 	   ret
 ;@@:
-;           cmp eax, DEV_GET_INFO
+;           cmp     eax, DEV_GET_INFO
-;           jne @F
+;           jne     @f
-;           mov      ebx, [edi+output]
+;           mov     ebx, [edi+output]
-;           stdcall  get_dev_info, ebx
+;           stdcall get_dev_info, ebx
-;           xor      eax, eax
+;           xor     eax, eax
 ;           ret
 @@:
-	   cmp eax, DEV_GET_POS
+	   cmp	   eax, DEV_GET_POS
-	   jne @F
+	   jne	   @f
-	   stdcall  azx_get_position
+	   stdcall azx_get_position
-	   shr	    eax, 2
+	   shr	   eax, 2
-	   mov	    ebx, [edi+output]
+	   mov	   ebx, [edi+output]
-	   mov	    [ebx], eax
+	   mov	   [ebx], eax
-	   xor	    eax, eax
+	   xor	   eax, eax
 	   ret
 @@:
 ;           cmp eax, DEV_SET_CHANNEL_VOLUME
-;           jne @F
+;           jne @f
 ;     if DEBUG
 ;           mov esi, msgSetChannelVolume
 ;           call SysMsgBoardStr
 ;     end if
 ;           mov      ebx, [edi+input]
-;           call     set_channel_volume
+;           call    set_channel_volume
-;           xor      eax, eax
+;           xor     eax, eax
 ;           ret
 ;@@:
-;           cmp eax, DEV_GET_CHANNEL_VOLUME
+;           cmp     eax, DEV_GET_CHANNEL_VOLUME
-;           jne @F
+;           jne     @f
-;           mov      cl,  byte [edi+input]  ; cl=channel
+;           mov     cl,  byte [edi+input]  ; cl=channel
-;           call     get_channel_volume
+;           call    get_channel_volume
-;           mov      ebx, [edi+output]
+;           mov     ebx, [edi+output]
-;           mov      [ebx], eax
+;           mov     [ebx], eax
-;           xor      eax, eax
+;           xor     eax, eax
 restore   out_size
+align 4
-align 4
+proc hda_irq   ;+
-proc hda_irq   ;+
+	   spin_lock
      if DEBUG_IRQ
 	   push eax esi
 	   ;mov esi, msgIRQ
      end if
 	   mov	 edx, ICH6_REG_INTSTS
 	   call  azx_readl
 	   test  eax, eax
 	   jnz	 @f
+	   spin_unlock
 	   ret
   @@:
 	   mov	 ebx, eax ; status
 	   mov	 eax, SDO_INT
 	   test  ebx, eax
 	   mov	 edx, ICH6_REG_STATESTS
 	   call  azx_writeb
   @@:
 ;end if
 	   or	 eax, 1
+	   spin_unlock
 	   ret
 endp
 	   loop @B
 	   ; wallclk has 24Mhz clock source
 	   mov [ctrl.period_wallclk], ((0x4000 * 24000) / 48000) * 1000
-	   ;-call  azx_stream_reset
+	   call  azx_stream_reset
 	   call  azx_setup_controller
 	   ret
 endp
+align 4
-align 4
+play:
-play:
+	   spin_lock
 	   mov	 edx, ICH6_REG_WALLCLK
 	   call  azx_readl
 	   mov	 [ctrl.start_wallclk], eax
 	   call  azx_stream_start
-	   call  azx_stream_start
+	   xor	 eax, eax
-	   xor	 eax, eax
+	   spin_unlock
+	   ret
 	   ret
 align 4
-align 4
+stop:
-stop:
+	     spin_lock
 ;*           call  azx_stream_stop        ;Asper: Hangs system
 ;*
 ;*           pop   edx ecx ebx
 ;Asper ]
+	   xor	 eax, eax
-	   xor	 eax, eax
+	   spin_unlock
 	   ret
 ;align 4
 	   pop	 edx ecx eax
 	   ret
 endp
+proc  azx_init_cmd_io
-proc  azx_init_cmd_io
+	   spin_lock_irq
 	   pusha
 	   ; CORB set up
 	   mov	 eax, [ctrl.rb]
 	   mov	 ebx, eax
 	   mov	  al, ICH6_RBCTL_DMA_EN or ICH6_RBCTL_IRQ_EN
 	   mov	 edx, ICH6_REG_RIRBCTL
 	   call  azx_writeb
+	   popa
-	   popa
+	   spin_unlock_irq
 	   ret
 endp
 proc  azx_free_cmd_io
-proc  azx_free_cmd_io
+	   spin_lock_irq
 	   push  eax edx
 	   ; disable ringbuffer DMAs
 	   xor	  al, al
 	   mov	 edx, ICH6_REG_RIRBCTL
 	   call  azx_writeb
 	   mov	 edx, ICH6_REG_CORBCTL
+	   call  azx_writeb
-	   call  azx_writeb
+	   pop	 edx eax
-	   pop	 edx eax
+	   spin_unlock_irq
 	   ret
 endp
 ; send a command
-; send a command
+proc  azx_corb_send_cmd  stdcall, val:dword
-proc  azx_corb_send_cmd  stdcall, val:dword
+	   spin_lock_irq
 	   push  edx edi
 	   mov	 edx, ICH6_REG_CORBWP
 	   call  azx_writel
 	   pop	 edi edx
+	   xor	 eax, eax ;Asper+
-	   xor	 eax, eax ;Asper+
+	   spin_unlock_irq
 	   ret
 endp
       jnz     .poll
       mov     ah, [do_poll]
       test    ah, ah
       jz      @f
   .poll:
+      spin_lock_irq
       call    azx_update_rirb
+      spin_unlock_irq
   @@:
       mov     eax, [ctrl.rirb_cmd]
       test    eax, eax
       jnz     .l1
       mov     [ctrl.rirb_error], 0
-	   pop	 edx ecx eax
+	pop	edx ecx eax
-	   ret
+	ret
 align 4
-proc StallExec
-	   push ecx
-	   push edx
-	   push ebx
+proc StallExec
-	   push eax
+	push	ecx edx ebx eax
-	   mov ecx, CPU_FREQ
+	mov	ecx, CPU_FREQ
-	   mul ecx
+	mul	ecx
-	   rdtsc
+	rdtsc
-	   sub eax, ebx
+	sub	eax, ebx
-	   sbb edx, ecx
+	sbb	edx, ecx
-	   js @B
+	js	@B
-	   pop eax
-	   pop ebx
-	   pop edx
-	   pop ecx
+	pop	eax ebx edx ecx
-	   ret
+	ret
 endp
-      mov ebx, eax
+	mov	ebx, eax
-      and ebx, 0x0F
+	and	ebx, 0x0F
-      mov bl, [ebx+hexletters]
+	mov	bl, [ebx+hexletters]
-      mov [8+esi+ecx], bl
+	mov	[8+esi+ecx], bl
-      inc ecx
+	inc	ecx
-      jnz @B
+	jnz	@b
-      pop eax
+	pop	eax
-      mov  dword [esi+8], 0
+	mov	dword [esi+8], 0
-      test [flags], 0x2 ; new line ?
+	test	[flags], 0x2 ; new line ?
 ;] Asper
 section '.data' data readable writable align 16
 section '.data' data readable writable align 16
 aspinlock	 dd SPINLOCK_FREE

Subversion Repositories Kolibri OS

(root)/drivers/audio/intel_hda/intel_hda.asm @ 6299 – Rev 3170 → 3496