diff --git a/drivers/audio/intel_hda/intel_hda.asm b/drivers/audio/intel_hda/intel_hda.asm index 07f084b758..f3d607494c 100644 --- a/drivers/audio/intel_hda/intel_hda.asm +++ b/drivers/audio/intel_hda/intel_hda.asm @@ -52,24 +52,37 @@ VID_VMWARE equ 0x15AD ; Devices ; Intel -CTRL_INTEL_SCH2 equ 0x080a -CTRL_INTEL_HPT equ 0x0c0c -CTRL_INTEL_CPT equ 0x1c20 -CTRL_INTEL_PGB equ 0x1d20 -CTRL_INTEL_PPT1 equ 0x1e20 -CTRL_INTEL_82801F equ 0x2668 -CTRL_INTEL_63XXESB equ 0x269a -CTRL_INTEL_82801G equ 0x27d8 -CTRL_INTEL_82801H equ 0x284b -CTRL_INTEL_82801_UNK1 equ 0x2911 -CTRL_INTEL_82801I equ 0x293e -CTRL_INTEL_82801_UNK2 equ 0x293f -CTRL_INTEL_82801JI equ 0x3a3e -CTRL_INTEL_82801JD equ 0x3a6e -CTRL_INTEL_PCH equ 0x3b56 -CTRL_INTEL_PCH2 equ 0x3b57 -CTRL_INTEL_SCH equ 0x811b -CTRL_INTEL_LPT equ 0x8c20 +CTRL_INTEL_SCH2 equ 0x080a +CTRL_INTEL_HPT equ 0x0c0c +CTRL_INTEL_0F04 equ 0x0F04 +CTRL_INTEL_CPT equ 0x1c20 +CTRL_INTEL_PGB equ 0x1d20 +CTRL_INTEL_PPT1 equ 0x1e20 +CTRL_INTEL_2284 equ 0x2284 +CTRL_INTEL_ICH6 equ 0x2668 +CTRL_INTEL_63XXESB equ 0x269a +CTRL_INTEL_ICH7 equ 0x27d8 +CTRL_INTEL_ICH8 equ 0x284b +CTRL_INTEL_82801_UNK1 equ 0x2911 +CTRL_INTEL_ICH9 equ 0x293e +CTRL_INTEL_ICH9_2 equ 0x293f +CTRL_INTEL_ICH10 equ 0x3a3e +CTRL_INTEL_ICH10_2 equ 0x3a6e +CTRL_INTEL_PCH equ 0x3b56 +CTRL_INTEL_PCH2 equ 0x3b57 +CTRL_INTEL_SCH equ 0x811b +CTRL_INTEL_LPT equ 0x8c20 +CTRL_INTEL_8ca0 equ 0x8cA0 +CTRL_INTEL_8d20 equ 0x8d20 +CTRL_INTEL_8d21 equ 0x8d21 +CTRL_INTEL_A1F0 equ 0xA1F0 +CTRL_INTEL_A270 equ 0xA270 +CTRL_INTEL_9C20 equ 0x9c20 +CTRL_INTEL_9C21 equ 0x9c21 +CTRL_INTEL_9CA0 equ 0x9cA0 +CTRL_INTEL_A170 equ 0xA170 +CTRL_INTEL_9D70 equ 0x9D70 +CTRL_INTEL_5A98 equ 0x5A98 ; Nvidia CTRL_NVIDIA_MCP51 equ 0x026c CTRL_NVIDIA_MCP55 equ 0x0371 @@ -2677,19 +2690,33 @@ devices: dd (CTRL_INTEL_CPT shl 16)+VID_INTEL,msg_INTEL_CPT, AZX_DRIVER_PCH dd (CTRL_INTEL_PGB shl 16)+VID_INTEL,msg_INTEL_PGB, AZX_DRIVER_PCH dd (CTRL_INTEL_PPT1 shl 16)+VID_INTEL,msg_INTEL_PPT1, AZX_DRIVER_PCH - dd (CTRL_INTEL_82801F shl 16)+VID_INTEL,msg_INTEL_82801F, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH6 shl 16)+VID_INTEL,msg_INTEL_ICH6, AZX_DRIVER_ICH dd (CTRL_INTEL_63XXESB shl 16)+VID_INTEL,msg_INTEL_63XXESB, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801G shl 16)+VID_INTEL,msg_INTEL_82801G, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801H shl 16)+VID_INTEL,msg_INTEL_82801H, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH7 shl 16)+VID_INTEL,msg_INTEL_ICH7, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH8 shl 16)+VID_INTEL,msg_INTEL_ICH8, AZX_DRIVER_ICH dd (CTRL_INTEL_82801_UNK1 shl 16)+VID_INTEL,msg_INTEL_82801_UNK1, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801I shl 16)+VID_INTEL,msg_INTEL_82801I, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801_UNK2 shl 16)+VID_INTEL,msg_INTEL_82801_UNK2, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801JI shl 16)+VID_INTEL,msg_INTEL_82801JI, AZX_DRIVER_ICH - dd (CTRL_INTEL_82801JD shl 16)+VID_INTEL,msg_INTEL_82801JD, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH9 shl 16)+VID_INTEL,msg_INTEL_ICH9, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH9_2 shl 16)+VID_INTEL,msg_INTEL_ICH9, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH10 shl 16)+VID_INTEL,msg_INTEL_ICH10, AZX_DRIVER_ICH + dd (CTRL_INTEL_ICH10_2 shl 16)+VID_INTEL,msg_INTEL_ICH10, AZX_DRIVER_ICH dd (CTRL_INTEL_PCH shl 16)+VID_INTEL,msg_INTEL_PCH, AZX_DRIVER_PCH dd (CTRL_INTEL_PCH2 shl 16)+VID_INTEL,msg_INTEL_PCH2, AZX_DRIVER_PCH dd (CTRL_INTEL_SCH shl 16)+VID_INTEL,msg_INTEL_SCH, AZX_DRIVER_SCH dd (CTRL_INTEL_LPT shl 16)+VID_INTEL,msg_INTEL_LPT, AZX_DRIVER_PCH + dd (CTRL_INTEL_0F04 shl 16)+VID_INTEL,msg_INTEL_BAYTRAIL, AZX_DRIVER_PCH + dd (CTRL_INTEL_2284 shl 16)+VID_INTEL,msg_INTEL_BRASWELL, AZX_DRIVER_PCH + dd (CTRL_INTEL_8ca0 shl 16)+VID_INTEL,msg_INTEL_9SERIES, AZX_DRIVER_PCH + dd (CTRL_INTEL_8d20 shl 16)+VID_INTEL,msg_INTEL_WELLSBURG, AZX_DRIVER_PCH + dd (CTRL_INTEL_8d21 shl 16)+VID_INTEL,msg_INTEL_WELLSBURG, AZX_DRIVER_PCH + dd (CTRL_INTEL_A1F0 shl 16)+VID_INTEL,msg_INTEL_LEWISBURG, AZX_DRIVER_PCH + dd (CTRL_INTEL_A270 shl 16)+VID_INTEL,msg_INTEL_LEWISBURG, AZX_DRIVER_PCH + dd (CTRL_INTEL_9C20 shl 16)+VID_INTEL,msg_INTEL_LYNX_LP, AZX_DRIVER_PCH + dd (CTRL_INTEL_9C21 shl 16)+VID_INTEL,msg_INTEL_LYNX_LP, AZX_DRIVER_PCH + dd (CTRL_INTEL_9CA0 shl 16)+VID_INTEL,msg_INTEL_WILD_LP, AZX_DRIVER_PCH + dd (CTRL_INTEL_A170 shl 16)+VID_INTEL,msg_INTEL_SUNRISE, AZX_DRIVER_PCH + dd (CTRL_INTEL_9D70 shl 16)+VID_INTEL,msg_INTEL_SUN_LP, AZX_DRIVER_PCH + dd (CTRL_INTEL_5A98 shl 16)+VID_INTEL,msg_INTEL_BROXTON, AZX_DRIVER_PCH + ; Nvidia dd (CTRL_NVIDIA_MCP51 shl 16)+VID_NVIDIA,msg_NVIDIA_MCP51, AZX_DRIVER_NVIDIA dd (CTRL_NVIDIA_MCP55 shl 16)+VID_NVIDIA,msg_NVIDIA_MCP55, AZX_DRIVER_NVIDIA @@ -2773,19 +2800,28 @@ msg_INTEL_PGB db 'Patsburg',13,10,0 msg_INTEL_PPT1 db 'Panther Point',13,10,0 msg_INTEL_LPT db 'Lynx Point',13,10,0 msg_INTEL_HPT db 'Haswell',13,10,0 -msg_INTEL_82801F db '82801F',13,10,0 +msg_INTEL_ICH6 db 'ICH6',13,10,0 msg_INTEL_63XXESB db '631x/632xESB',13,10,0 -msg_INTEL_82801G db '82801G', 13,10,0 -msg_INTEL_82801H db '82801H', 13,10,0 -msg_INTEL_82801I db '82801I', 13,10,0 -msg_INTEL_82801JI db '82801JI',13,10,0 -msg_INTEL_82801JD db '82801JD',13,10,0 +msg_INTEL_ICH7 db 'ICH7', 13,10,0 +msg_INTEL_ICH8 db 'ICH8', 13,10,0 +msg_INTEL_ICH9 db 'ICH9', 13,10,0 +msg_INTEL_ICH10 db 'ICH10',13,10,0 msg_INTEL_PCH db 'PCH',13,10,0 msg_INTEL_PCH2 db 'PCH2',13,10,0 msg_INTEL_SCH db 'Poulsbo',13,10,0 msg_INTEL_SCH2 db 'Oaktrail',13,10,0 +msg_INTEL_BAYTRAIL db 'BayTrail', 13,10,0 +msg_INTEL_BRASWELL db 'Braswell', 13,10,0 +msg_INTEL_9SERIES db '9 Series', 13,10,0 +msg_INTEL_WELLSBURG db 'Wellsburg', 13,10,0 +msg_INTEL_LEWISBURG db 'Lewisburg', 13,10,0 +msg_INTEL_LYNX_LP db 'Lynx Point-LP',13,10,0 +msg_INTEL_WILD_LP db 'Wildcat Point-LP',13,10,0 +msg_INTEL_SUNRISE db 'Sunrise Point',13,10,0 +msg_INTEL_SUN_LP db 'Sunrise Point-LP',13,10,0 +msg_INTEL_BROXTON db 'Broxton-P',13,10,0 + msg_INTEL_82801_UNK1 db '82801_UNK1', 13,10,0 -msg_INTEL_82801_UNK2 db '82801_UNK2', 13,10,0 msg_NVidia db 'NVidia ',0 msg_NVIDIA_MCP51 db 'MCP51', 13,10,0 diff --git a/drivers/audio/sound.asm b/drivers/audio/sound.asm index 4e33f2f2bc..e14834dac9 100644 --- a/drivers/audio/sound.asm +++ b/drivers/audio/sound.asm @@ -59,9 +59,11 @@ CTRL_CT0200 = 0x0006 ; Dell OEM version (EMU10K1X) CTRL_INTEL_SCH2 = 0x080a CTRL_INTEL_HPT = 0x0c0c +CTRL_INTEL_0F04 = 0x0F04 CTRL_INTEL_CPT = 0x1c20 CTRL_INTEL_PGB = 0x1d20 CTRL_INTEL_PPT1 = 0x1e20 +CTRL_INTEL_2284 = 0x2284 CTRL_INTEL_82801F = 0x2668 CTRL_INTEL_63XXESB = 0x269a CTRL_INTEL_82801G = 0x27d8 @@ -75,6 +77,18 @@ CTRL_INTEL_PCH = 0x3b56 CTRL_INTEL_PCH2 = 0x3b57 CTRL_INTEL_SCH = 0x811b CTRL_INTEL_LPT = 0x8c20 +CTRL_INTEL_8ca0 = 0x8cA0 +CTRL_INTEL_8d20 = 0x8d20 +CTRL_INTEL_8d21 = 0x8d21 +CTRL_INTEL_A1F0 = 0xA1F0 +CTRL_INTEL_A270 = 0xA270 +CTRL_INTEL_9C20 = 0x9c20 +CTRL_INTEL_9C21 = 0x9c21 +CTRL_INTEL_9CA0 = 0x9cA0 +CTRL_INTEL_A170 = 0xA170 +CTRL_INTEL_9D70 = 0x9D70 +CTRL_INTEL_5A98 = 0x5A98 + CTRL_NVIDIA_MCP51 = 0x026c CTRL_NVIDIA_MCP55 = 0x0371 @@ -293,25 +307,39 @@ devices dd (CTRL_ICH shl 16)+VID_INTEL, intelac97 dd (0x5880 shl 16)+0x1274, ensoniq dd (CTRL_CT0200 shl 16)+VID_CREATIVE, emu10k1x -; Intel - dd (CTRL_INTEL_SCH2 shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_HPT shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_CPT shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_PGB shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_PPT1 shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801F shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_63XXESB shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801G shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801H shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801_UNK1 shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801I shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801_UNK2 shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801JI shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_82801JD shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_PCH shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_PCH2 shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_SCH shl 16)+VID_INTEL, intelhda - dd (CTRL_INTEL_LPT shl 16)+VID_INTEL, intelhda +; Intel HDA + dd (CTRL_INTEL_SCH2 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_HPT shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_0F04 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_CPT shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_PGB shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_PPT1 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_2284 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801F shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_63XXESB shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801G shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801H shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801_UNK1 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801I shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801_UNK2 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801JI shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_82801JD shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_PCH shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_PCH2 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_SCH shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_LPT shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_8ca0 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_8d20 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_8d21 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_A1F0 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_A270 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_9C20 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_9C21 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_9CA0 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_A170 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_9D70 shl 16)+VID_INTEL, intelhda + dd (CTRL_INTEL_5A98 shl 16)+VID_INTEL, intelhda + ; Nvidia dd (CTRL_NVIDIA_MCP51 shl 16)+VID_NVIDIA, intelhda dd (CTRL_NVIDIA_MCP55 shl 16)+VID_NVIDIA, intelhda