285,9 → 285,9 |
call init_controller |
test eax, eax |
jz .fail |
|
jmp .fail ;force fail |
|
|
if DEBUG |
mov esi, msgInitCodec |
call SysMsgBoardStr |
609,13 → 609,13 |
call SysMsgBoardStr |
|
stdcall PciRead32, [ctrl.bus], [ctrl.devfn], dword 0x10 |
and eax,0xFFFE |
mov [ctrl.codec_io_base], eax |
; and eax, -16 |
mov [ctrl.ctrl_io_base], eax |
|
call dword2str |
call SysMsgBoardStr |
|
mov esi, msgIntline |
mov esi, msgIRQline |
call SysMsgBoardStr |
|
stdcall PciRead32, [ctrl.bus], [ctrl.devfn], dword 0x3C |
646,10 → 646,6 |
ret |
endp |
|
PG_SW equ 0x003 |
PG_NOCACHE equ 0x018 |
|
|
align 4 |
proc reset_controller |
|
1057,60 → 1053,52 |
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
|
align 4 |
proc codec_io_r16 |
codec_io_r16: |
add edx, [ctrl.codec_io_base] |
in ax, dx |
ret |
endp |
|
align 4 |
proc codec_io_w16 |
codec_io_w16: |
add edx, [ctrl.codec_io_base] |
out dx, ax |
ret |
endp |
|
align 4 |
proc ctrl_io_r8 |
ctrl_io_r8: |
add edx, [ctrl.ctrl_io_base] |
in al, dx |
ret |
endp |
|
align 4 |
proc ctrl_io_r16 |
ctrl_io_r16: |
add edx, [ctrl.ctrl_io_base] |
in ax, dx |
ret |
endp |
|
align 4 |
proc ctrl_io_r32 |
ctrl_io_r32: |
add edx, [ctrl.ctrl_io_base] |
in eax, dx |
ret |
endp |
|
align 4 |
proc ctrl_io_w8 |
ctrl_io_w8: |
add edx, [ctrl.ctrl_io_base] |
out dx, al |
ret |
endp |
|
align 4 |
proc ctrl_io_w16 |
ctrl_io_w16: |
add edx, [ctrl.ctrl_io_base] |
out dx, ax |
ret |
endp |
|
align 4 |
proc ctrl_io_w32 |
ctrl_io_w32: |
add edx, [ctrl.ctrl_io_base] |
out dx, eax |
ret |
endp |
|
|
align 4 |
1138,10 → 1126,10 |
dd (0x5880 shl 16)+0x1274,msgVibra128,set_ICH |
dd 0 ;terminator |
|
version dd 0x00040000 |
version dd 0x00040004 |
|
msgEnsoniq db 'Ensonic 1371',0 |
msgVibra128 db 'Sound Blaster AudioPCI Vibra 128',0 |
msgEnsoniq db 'Ensonic 1371',13,10,0 |
msgVibra128 db 'Sound Blaster AudioPCI Vibra 128',13,10,0 |
|
sz_sound_srv db 'SOUND',0 |
|
1168,7 → 1156,7 |
msgControl db 'global control ',0 |
msgPCIcmd db 'PCI command ',0 |
msgIObase db 'IO base ',0 |
msgIntline db 'Interrupt line ',0 |
msgIRQline db 'IRQ line ',0 |
|
section '.data' data readable writable align 16 |
|