intel_hda: Convert to PE. Apply source format rules. Some changes to get/set master volume. Enable unsolicited events.

git-svn-id: svn://kolibrios.org@5048 a494cfbc-eb01-0410-851d-a64ba20cac60

data/common/Makefile.main

@@ -131,7 +131,6 @@ FASM_PROGRAMS:=\
  drivers/emu10k1x.obj:DRIVERS/EMU10K1X.OBJ:$(KERNEL)/drivers/emu10k1x.asm \
  drivers/fm801.obj:DRIVERS/FM801.OBJ:$(KERNEL)/drivers/fm801.asm \
  drivers/infinity.obj:DRIVERS/INFINITY.OBJ:$(KERNEL)/drivers/infinity.asm \
- drivers/intel_hda.obj:DRIVERS/intel_hda.obj:$(REPOSITORY)/drivers/audio/intel_hda/intel_hda.asm \
  drivers/sb16.obj:DRIVERS/SB16.OBJ:$(KERNEL)/drivers/sb16/sb16.asm \
  drivers/sound.obj:DRIVERS/SOUND.OBJ:$(KERNEL)/drivers/sound.asm \
  drivers/intelac97.obj:DRIVERS/INTELAC97.OBJ:$(KERNEL)/drivers/intelac97.asm \
@@ -230,6 +229,7 @@ FASM_PROGRAMS_PESTRIP:=\
  drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  drivers/ps2mouse.sys:DRIVERS/PS2MOUSE.SYS:$(REPOSITORY)/drivers/mouse/ps2mouse4d/trunk/ps2mouse.asm \
  drivers/tmpdisk.sys:DRIVERS/TMPDISK.SYS:$(REPOSITORY)/drivers/disk/tmpdisk.asm \
+ drivers/intel_hda.sys:DRIVERS/intel_hda.sys:$(REPOSITORY)/drivers/audio/intel_hda/intel_hda.asm \
 # end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
@@ -876,4 +876,4 @@ $(REPOSITORY)/drivers/ddk/libddk.a: \
  $(REPOSITORY)/drivers/include/*/*/*.h \
  $(REPOSITORY)/drivers/include/*/*/*/*.h
 $(REPOSITORY)/drivers/ddk/libcore.a: \
- $(REPOSITORY)/drivers/ddk/core.S
+ $(REPOSITORY)/drivers/ddk/core.S

drivers/audio/intel_hda/CODEC_H.INC

@@ -475,15 +475,15 @@ HDA_MAX_PCMS		equ 10
 ; Structures
 
 ; direction
-HDA_INPUT	  equ 0x0
+HDA_INPUT	   equ 0x0
-HDA_OUTPUT	  equ 0x1
+HDA_OUTPUT	   equ 0x1
 
 
 struc HDA_VERB
 {
-	.nid	  dw ?
+	.nid	   dw ?
-	.verb	  dd ?
+	.verb	   dd ?
-	.param	  dd ?
+	.param	   dd ?
 }
 
 virtual at 0
@@ -508,9 +508,9 @@ end virtual
 
 ;(...)
 ; amp value bits
-HDA_AMP_MUTE	  equ 0x80
+HDA_AMP_MUTE	   equ 0x80
-HDA_AMP_UNMUTE	  equ 0x00
+HDA_AMP_UNMUTE	   equ 0x00
-HDA_AMP_VOLMASK   equ 0x7F
+HDA_AMP_VOLMASK    equ 0x7F
 ;(...)
 
 
@@ -598,51 +598,46 @@ PIN_HP_AMP		equ (AC_PINCTL_HP_EN)
 
 
 ; get widget capabilities
-;static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
 proc  get_wcaps stdcall, nid:dword
-     push    ebx ecx edx
+	push	ebx ecx edx
-     xor     eax, eax
+	xor	eax, eax
-     movzx   ebx, [codec.start_nid]
+	movzx	ebx, [codec.start_nid]
-     movzx   ecx, [codec.num_nodes]
+	movzx	ecx, [codec.num_nodes]
-     mov     edx, [nid]
+	mov	edx, [nid]
 
-     cmp     edx, ebx
+	cmp	edx, ebx
-     jl      .out
+	jl	.out
 
-     add     ecx, ebx
+	add	ecx, ebx
-     cmp     edx, ecx
+	cmp	edx, ecx
-     jge     .out
+	jge	.out
 
-     sub     edx, ebx
+	sub	edx, ebx
-     shl     edx, 2
+	shl	edx, 2
-     add     edx, [codec.wcaps]
+	add	edx, [codec.wcaps]
-     mov     eax, [edx]
+	mov	eax, [edx]
-  .out:
+.out:
-     pop     edx ecx ebx
+	pop	edx ecx ebx
-     ret
+	ret
 endp
 
 ; get the widget type from widget capability bits
-;#define get_wcaps_type(wcaps) (((wcaps) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT)
 proc  get_wcaps_type stdcall, wcaps:dword
-     mov     eax, [wcaps]
+	mov	eax, [wcaps]
-     and     eax, AC_WCAP_TYPE
+	and	eax, AC_WCAP_TYPE
-     shr     eax, AC_WCAP_TYPE_SHIFT
+	shr	eax, AC_WCAP_TYPE_SHIFT
-     ret
+	ret
 endp
 
 ;static inline unsigned int get_wcaps_channels(u32 wcaps)
 proc  get_wcaps_channels stdcall, wcaps:dword
-;        chans = (wcaps & AC_WCAP_CHAN_CNT_EXT) >> 13;
+	mov	eax, [wcaps]
-;        chans = ((chans << 1) | 1) + 1;
+	and	eax, AC_WCAP_CHAN_CNT_EXT
-     mov     eax, [wcaps]
+	shr	eax, 13
-     and     eax, AC_WCAP_CHAN_CNT_EXT
+	shl	eax, 1
-     shr     eax, 13
+	or	eax, 1
-     shl     eax, 1
+	inc	eax
-     or      eax, 1
+	ret
-     inc     eax
-     ret
 endp
 
-
 ;Asper ]

drivers/audio/intel_hda/IMPORTS.INC

@@ -1,89 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-macro kernel_export [name]{
-forward
-  if used name
-	if DEBUG
-	display 'uses: ',`name,#13,#10
-	end if
-    extrn name
-  end if
-}
-; all exported kernel functions and data
-
-
-kernel_export \
-	      RegService,\
-	      GetService,\
-	      ServiceHandler,\
-	      AttachIntHandler,\
-	      GetIntHandler,\
-	      FpuSave,\
-	      FpuRestore,\
-	      ReservePortArea,\
-	      Boot_Log,\
-\
-	      PciApi,\
-	      PciRead32,\
-	      PciRead16,\
-	      PciRead8,\
-	      PciWrite8,\
-	      PciWrite16,\
-	      PciWrite32,\
-\
-	      AllocPage,\
-	      AllocPages,\
-	      FreePage,\
-	      MapPage,\
-	      MapSpace,\
-	      MapIoMem,\
-	      GetPgAddr,\
-	      CommitPages,\
-	      ReleasePages,\
-\
-	      AllocKernelSpace,\
-	      FreeKernelSpace,\
-	      KernelAlloc,\
-	      KernelFree,\
-	      UserAlloc,\
-	      UserFree,\
-	      Kmalloc,\
-	      Kfree,\
-	      CreateRingBuffer,\
-\
-	      GetPid,\
-	      CreateObject,\
-	      DestroyObject,\
-	      CreateEvent,\
-	      RaiseEvent,\
-	      WaitEvent,\
-	      DestroyEvent,\
-	      ClearEvent,\
-\
-	      LoadCursor,\
-	      SelectHwCursor,\
-	      SetHwCursor,\
-	      HwCursorRestore,\
-	      HwCursorCreate,\
-\
-	      SysMsgBoardStr,\
-	      SysMsgBoard,\
-	      GetCurrentTask,\
-	      LoadFile,\
-	      SendEvent,\
-	      SetMouseData,\
-	      Sleep,\
-	      GetTimerTicks,\
-\
-	      strncat,\
-	      strncpy,\
-	      strncmp,\
-	      strnlen,\
-	      strchr,\
-	      strrchr,\
-\
-	      LFBAddress

drivers/audio/intel_hda/PROC32.INC

@@ -1,268 +0,0 @@
-
-; Macroinstructions for defining and calling procedures
-
-macro stdcall proc,[arg]		; directly call STDCALL procedure
- { common
-    if ~ arg eq
-   reverse
-    pushd arg
-   common
-    end if
-    call proc }
-
-macro invoke proc,[arg] 		; indirectly call STDCALL procedure
- { common
-    if ~ arg eq
-   reverse
-     pushd arg
-   common
-    end if
-    call [proc] }
-
-macro ccall proc,[arg]			; directly call CDECL procedure
- { common
-    size@ccall = 0
-    if ~ arg eq
-   reverse
-    pushd arg
-    size@ccall = size@ccall+4
-   common
-    end if
-    call proc
-    if size@ccall
-    add esp,size@ccall
-    end if }
-
-macro cinvoke proc,[arg]		; indirectly call CDECL procedure
- { common
-    size@ccall = 0
-    if ~ arg eq
-   reverse
-    pushd arg
-    size@ccall = size@ccall+4
-   common
-    end if
-    call [proc]
-    if size@ccall
-    add esp,size@ccall
-    end if }
-
-macro proc [args]			; define procedure
- { common
-    match name params, args>
-    \{ define@proc name,<params \} }
-
-prologue@proc equ prologuedef
-
-macro prologuedef procname,flag,parmbytes,localbytes,reglist
- { if parmbytes | localbytes
-    push ebp
-    mov ebp,esp
-    if localbytes
-     sub esp,localbytes
-    end if
-   end if
-   irps reg, reglist \{ push reg \} }
-
-epilogue@proc equ epiloguedef
-
-macro epiloguedef procname,flag,parmbytes,localbytes,reglist
- { irps reg, reglist \{ reverse pop reg \}
-   if parmbytes | localbytes
-    leave
-   end if
-   if flag and 10000b
-    retn
-   else
-    retn parmbytes
-   end if }
-
-macro define@proc name,statement
- { local params,flag,regs,parmbytes,localbytes,current
-   if used name
-   name:
-   match =stdcall args, statement \{ params equ args
-				     flag = 11b \}
-   match =stdcall, statement \{ params equ
-				flag = 11b \}
-   match =c args, statement \{ params equ args
-			       flag = 10001b \}
-   match =c, statement \{ params equ
-			  flag = 10001b \}
-   match =params, params \{ params equ statement
-			    flag = 0 \}
-   virtual at ebp+8
-   match =uses reglist=,args, params \{ regs equ reglist
-					params equ args \}
-   match =regs =uses reglist, regs params \{ regs equ reglist
-					     params equ \}
-   match =regs, regs \{ regs equ \}
-   match =,args, params \{ defargs@proc args \}
-   match =args@proc args, args@proc params \{ defargs@proc args \}
-   parmbytes = $ - (ebp+8)
-   end virtual
-   name # % = parmbytes/4
-   all@vars equ
-   current = 0
-   match prologue:reglist, prologue@proc:<regs> \{ prologue name,flag,parmbytes,localbytes,reglist \}
-   macro locals
-   \{ virtual at ebp-localbytes+current
-      macro label . \\{ deflocal@proc .,:, \\}
-      struc db [val] \\{ \common deflocal@proc .,db,val \\}
-      struc dw [val] \\{ \common deflocal@proc .,dw,val \\}
-      struc dp [val] \\{ \common deflocal@proc .,dp,val \\}
-      struc dd [val] \\{ \common deflocal@proc .,dd,val \\}
-      struc dt [val] \\{ \common deflocal@proc .,dt,val \\}
-      struc dq [val] \\{ \common deflocal@proc .,dq,val \\}
-      struc rb cnt \\{ deflocal@proc .,rb cnt, \\}
-      struc rw cnt \\{ deflocal@proc .,rw cnt, \\}
-      struc rp cnt \\{ deflocal@proc .,rp cnt, \\}
-      struc rd cnt \\{ deflocal@proc .,rd cnt, \\}
-      struc rt cnt \\{ deflocal@proc .,rt cnt, \\}
-      struc rq cnt \\{ deflocal@proc .,rq cnt, \\} \}
-   macro endl
-   \{ purge label
-      restruc db,dw,dp,dd,dt,dq
-      restruc rb,rw,rp,rd,rt,rq
-      restruc byte,word,dword,pword,tword,qword
-      current = $-(ebp-localbytes)
-      end virtual \}
-   macro ret operand
-   \{ match any, operand \\{ retn operand \\}
-      match , operand \\{ match epilogue:reglist, epilogue@proc:<regs>
-			  \\\{ epilogue name,flag,parmbytes,localbytes,reglist \\\} \\} \}
-   macro finish@proc \{ localbytes = (((current-1) shr 2)+1) shl 2
-			end if \} }
-
-macro defargs@proc [arg]
- { common
-    if ~ arg eq
-   forward
-     local ..arg,current@arg
-     match argname:type, arg
-      \{ current@arg equ argname
-	 label ..arg type
-	 argname equ ..arg
-	 if dqword eq type
-	   dd ?,?,?,?
-	 else if tbyte eq type
-	   dd ?,?,?
-	 else if qword eq type | pword eq type
-	   dd ?,?
-	 else
-	   dd ?
-	 end if \}
-     match =current@arg,current@arg
-      \{ current@arg equ arg
-	 arg equ ..arg
-	 ..arg dd ? \}
-   common
-     args@proc equ current@arg
-   forward
-     restore current@arg
-   common
-    end if }
-
-macro deflocal@proc name,def,[val]
- { common
-    match vars, all@vars \{ all@vars equ all@vars, \}
-    all@vars equ all@vars name
-   forward
-    local ..var,..tmp
-    ..var def val
-    match =?, val \{ ..tmp equ \}
-    match any =dup (=?), val \{ ..tmp equ \}
-    match tmp : value, ..tmp : val
-     \{ tmp: end virtual
-	initlocal@proc ..var,def value
-	virtual at tmp\}
-   common
-    match first rest, ..var, \{ name equ first \} }
-
-macro initlocal@proc name,def
- { virtual at name
-    def
-    size@initlocal = $ - name
-   end virtual
-   position@initlocal = 0
-   while size@initlocal > position@initlocal
-    virtual at name
-     def
-     if size@initlocal - position@initlocal < 2
-      current@initlocal = 1
-      load byte@initlocal byte from name+position@initlocal
-     else if size@initlocal - position@initlocal < 4
-      current@initlocal = 2
-      load word@initlocal word from name+position@initlocal
-     else
-      current@initlocal = 4
-      load dword@initlocal dword from name+position@initlocal
-     end if
-    end virtual
-    if current@initlocal = 1
-     mov byte [name+position@initlocal],byte@initlocal
-    else if current@initlocal = 2
-     mov word [name+position@initlocal],word@initlocal
-    else
-     mov dword [name+position@initlocal],dword@initlocal
-    end if
-    position@initlocal = position@initlocal + current@initlocal
-   end while }
-
-macro endp
- { purge ret,locals,endl
-   finish@proc
-   purge finish@proc
-   restore regs@proc
-   match all,args@proc \{ restore all \}
-   restore args@proc
-   match all,all@vars \{ restore all \} }
-
-macro local [var]
- { common
-    locals
-   forward done@local equ
-    match varname[count]:vartype, var
-    \{ match =BYTE, vartype \\{ varname rb count
-				restore done@local \\}
-       match =WORD, vartype \\{ varname rw count
-				restore done@local \\}
-       match =DWORD, vartype \\{ varname rd count
-				 restore done@local \\}
-       match =PWORD, vartype \\{ varname rp count
-				 restore done@local \\}
-       match =QWORD, vartype \\{ varname rq count
-				 restore done@local \\}
-       match =TBYTE, vartype \\{ varname rt count
-				 restore done@local \\}
-       match =DQWORD, vartype \\{ label varname dqword
-				  rq count+count
-				  restore done@local \\}
-       match , done@local \\{ virtual
-			       varname vartype
-			      end virtual
-			      rb count*sizeof.\#vartype
-			      restore done@local \\} \}
-    match :varname:vartype, done@local:var
-    \{ match =BYTE, vartype \\{ varname db ?
-				restore done@local \\}
-       match =WORD, vartype \\{ varname dw ?
-				restore done@local \\}
-       match =DWORD, vartype \\{ varname dd ?
-				 restore done@local \\}
-       match =PWORD, vartype \\{ varname dp ?
-				 restore done@local \\}
-       match =QWORD, vartype \\{ varname dq ?
-				 restore done@local \\}
-       match =TBYTE, vartype \\{ varname dt ?
-				 restore done@local \\}
-       match =DQWORD, vartype \\{ label varname dqword
-				  dq ?,?
-				  restore done@local \\}
-       match , done@local \\{ varname vartype
-			      restore done@local \\} \}
-    match ,done@local
-    \{ var
-       restore done@local \}
-   common
-    endl }