On Mon, Dec 15, 2008 at 07:09:22AM +0000, Jacob Meuser wrote:
> this is another important step toward better names for azalia
> mixer items.
> please give this a try on all azalia. also check for "u-" in
> mixerctl output and let me know of any such cases.
Applied, playback still works (recording not tested).
I have a "u-" now.
Before:
$ cat mixerctl-nopatch
outputs.dac_source=
outputs.line_source=dac2
outputs.line_mute=off
outputs.line=248,248
inputs.line=85,85
outputs.line_dir=output
outputs.line_boost=off
outputs.line_eapd=on
inputs.mic=85,85
inputs.sel_source=dac2
outputs.sel3_mute=off
outputs.sel3=120,120
outputs.sel4_mute=off
outputs.sel4=120,120
record.sel6_source=mix
outputs.sel6_mute=off
outputs.sel6=119,119
outputs.sel7_mute=off
outputs.sel7=120,120
outputs.sel10_mute=off
outputs.sel10=120,120
outputs.sel11_mute=off
After:
$ diff -u mixerctl-nopatch mixerctl-patch
--- mixerctl-nopatch Mon Dec 15 14:48:33 2008
+++ mixerctl-patch Mon Dec 15 15:09:17 2008
@@ -1,5 +1,5 @@
-outputs.dac_source=
-outputs.line_source=dac2
+outputs.u-dac02_source=
+outputs.line_source=dac
outputs.line_mute=off
outputs.line=248,248
inputs.line=85,85
@@ -7,12 +7,12 @@
outputs.line_boost=off
outputs.line_eapd=on
inputs.mic=85,85
-inputs.sel_source=dac2
+inputs.sel_source=dac
outputs.sel3_mute=off
outputs.sel3=120,120
outputs.sel4_mute=off
outputs.sel4=120,120
-record.sel6_source=mix
+record.adc_source=mix
outputs.sel6_mute=off
outputs.sel6=119,119
outputs.sel7_mute=off
The dmesg has no related changes:
$ diff -u dmesg-nopatch dmesg-patch
--- dmesg-nopatch Mon Dec 15 14:48:42 2008
+++ dmesg-patch Mon Dec 15 15:09:24 2008
@@ -1,9 +1,9 @@
-OpenBSD 4.4-current (GENERIC.MP) #16: Thu Dec 11 15:43:18 GMT 2008
+OpenBSD 4.4-current (GENERIC.MP) #17: Mon Dec 15 14:48:13 GMT 2008
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Genuine Intel(R) CPU L2400 @ 1.66GHz ("GenuineIntel" 686-class) 1.67 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,VMX,EST,TM2,xTPR
real mem = 1063677952 (1014MB)
-avail mem = 1020186624 (972MB)
+avail mem = 1020182528 (972MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 03/31/08, BIOS32 rev. 0 @ 0xfd690,
SMBIOS rev. 2.4 @ 0xe0010 (67 entries)
bios0: vendor LENOVO version "7BETD5WW (2.16 )" date 03/31/2008
@@ -38,15 +38,15 @@
acpibat0 at acpi0: BAT0 model "92P1163" serial 1585 type LION oem "SANYO"
acpibat1 at acpi0: BAT1 not present
acpibat2 at acpi0: BAT2 not present
-acpiac0 at acpi0: AC unit offline
+acpiac0 at acpi0: AC unit online
acpithinkpad0 at acpi0
acpidock at acpi0 not configured
acpivideo at acpi0 not configured
acpivideo at acpi0 not configured
bios0: ROM list: 0xc0000/0xea00! 0xcf000/0x1000 0xd0000/0x1000 0xdc000/0x4000!
0xe0000/0x10000!
-cpu0: unknown Enhanced SpeedStep CPU, msr 0x06130a2206000613
+cpu0: unknown Enhanced SpeedStep CPU, msr 0x06130a2206000a22
cpu0: using only highest and lowest power states
-cpu0: Enhanced SpeedStep 1000 MHz (1004 mV): speeds: 1667, 1000 MHz
+cpu0: Enhanced SpeedStep 1667 MHz (1244 mV): speeds: 1667, 1000 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "Intel 82945GM Host" rev 0x03
vga1 at pci0 dev 2 function 0 "Intel 82945GM Video" rev 0x03
Full dmesg:
OpenBSD 4.4-current (GENERIC.MP) #17: Mon Dec 15 14:48:13 GMT 2008
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Genuine Intel(R) CPU L2400 @ 1.66GHz ("GenuineIntel" 686-class) 1.67 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,VMX,EST,TM2,xTPR
real mem = 1063677952 (1014MB)
avail mem = 1020182528 (972MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 03/31/08, BIOS32 rev. 0 @ 0xfd690, SMBIOS
rev. 2.4 @ 0xe0010 (67 entries)
bios0: vendor LENOVO version "7BETD5WW (2.16 )" date 03/31/2008
bios0: LENOVO 170255G
acpi0 at bios0: rev 2
acpi0: tables DSDT FACP SSDT ECDT TCPA APIC MCFG HPET BOOT SSDT SSDT SSDT SSDT
acpi0: wakeup devices LID_(S3) SLPB(S3) DURT(S3) EXP0(S4) EXP1(S4) EXP2(S4)
EXP3(S4) PCI1(S4) USB0(S3) USB1(S3) USB2(S3) USB7(S3) HDEF(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: apic clock running at 166MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Genuine Intel(R) CPU L2400 @ 1.66GHz ("GenuineIntel" 686-class) 1.67 GHz
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,VMX,EST,TM2,xTPR
ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
ioapic0: misconfigured as apic 2, remapped to apid 1
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (AGP_)
acpiprt2 at acpi0: bus 2 (EXP0)
acpiprt3 at acpi0: bus 3 (EXP1)
acpiprt4 at acpi0: bus 4 (EXP2)
acpiprt5 at acpi0: bus 12 (EXP3)
acpiprt6 at acpi0: bus 21 (PCI1)
acpiec0 at acpi0
acpicpu0 at acpi0: C3, C2
acpicpu1 at acpi0: C3, C2
acpitz0 at acpi0: critical temperature 127 degC
acpitz1 at acpi0: critical temperature 97 degC
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
acpibat0 at acpi0: BAT0 model "92P1163" serial 1585 type LION oem "SANYO"
acpibat1 at acpi0: BAT1 not present
acpibat2 at acpi0: BAT2 not present
acpiac0 at acpi0: AC unit online
acpithinkpad0 at acpi0
acpidock at acpi0 not configured
acpivideo at acpi0 not configured
acpivideo at acpi0 not configured
bios0: ROM list: 0xc0000/0xea00! 0xcf000/0x1000 0xd0000/0x1000 0xdc000/0x4000!
0xe0000/0x10000!
cpu0: unknown Enhanced SpeedStep CPU, msr 0x06130a2206000a22
cpu0: using only highest and lowest power states
cpu0: Enhanced SpeedStep 1667 MHz (1244 mV): speeds: 1667, 1000 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "Intel 82945GM Host" rev 0x03
vga1 at pci0 dev 2 function 0 "Intel 82945GM Video" rev 0x03
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
intagp0 at vga1
agp0 at intagp0: aperture at 0xd0000000, size 0x10000000
inteldrm0 at vga1: apic 1 int 16 (irq 11)
drm0 at inteldrm0
"Intel 82945GM Video" rev 0x03 at pci0 dev 2 function 1 not configured
azalia0 at pci0 dev 27 function 0 "Intel 82801GB HD Audio" rev 0x02: apic 1 int
17 (irq 11)
azalia0: codecs: Analog Devices/0x1981, Conexant/0x2bfa, using Analog
Devices/0x1981
audio0 at azalia0
ppb0 at pci0 dev 28 function 0 "Intel 82801GB PCIE" rev 0x02: apic 1 int 20
(irq 11)
pci1 at ppb0 bus 2
em0 at pci1 dev 0 function 0 "Intel PRO/1000MT (82573L)" rev 0x00: apic 1 int
16 (irq 11), address 00:0a:e4:3e:f1:4e
ppb1 at pci0 dev 28 function 1 "Intel 82801GB PCIE" rev 0x02: apic 1 int 21
(irq 11)
pci2 at ppb1 bus 3
wpi0 at pci2 dev 0 function 0 "Intel PRO/Wireless 3945ABG" rev 0x02: apic 1 int
17 (irq 11), MoW2, address 00:13:02:03:a5:e7
ppb2 at pci0 dev 28 function 2 "Intel 82801GB PCIE" rev 0x02: apic 1 int 22
(irq 11)
pci3 at ppb2 bus 4
ppb3 at pci0 dev 28 function 3 "Intel 82801GB PCIE" rev 0x02: apic 1 int 23
(irq 11)
pci4 at ppb3 bus 12
uhci0 at pci0 dev 29 function 0 "Intel 82801GB USB" rev 0x02: apic 1 int 16
(irq 11)
uhci1 at pci0 dev 29 function 1 "Intel 82801GB USB" rev 0x02: apic 1 int 17
(irq 11)
uhci2 at pci0 dev 29 function 2 "Intel 82801GB USB" rev 0x02: apic 1 int 18
(irq 11)
uhci3 at pci0 dev 29 function 3 "Intel 82801GB USB" rev 0x02: apic 1 int 19
(irq 11)
ehci0 at pci0 dev 29 function 7 "Intel 82801GB USB" rev 0x02: apic 1 int 19
(irq 11)
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
ppb4 at pci0 dev 30 function 0 "Intel 82801BAM Hub-to-PCI" rev 0xe2
pci5 at ppb4 bus 21
cbb0 at pci5 dev 0 function 0 "Ricoh 5C476 CardBus" rev 0xb4: apic 1 int 16
(irq 11)
"Ricoh 5C552 Firewire" rev 0x09 at pci5 dev 0 function 1 not configured
sdhc0 at pci5 dev 0 function 2 "Ricoh 5C822 SD/MMC" rev 0x18: apic 1 int 18
(irq 11)
sdmmc0 at sdhc0
cardslot0 at cbb0 slot 0 flags 0
cardbus0 at cardslot0: bus 22 device 0 cacheline 0x0, lattimer 0xb0
pcmcia0 at cardslot0
ichpcib0 at pci0 dev 31 function 0 "Intel 82801GBM LPC" rev 0x02: PM disabled
pciide0 at pci0 dev 31 function 1 "Intel 82801GB IDE" rev 0x02: DMA, channel 0
configured to compatibility, channel 1 configured to compatibility
pciide0: channel 0 disabled (no drives)
pciide0: channel 1 ignored (disabled)
ahci0 at pci0 dev 31 function 2 "Intel 82801GBM AHCI" rev 0x02: apic 1 int 16
(irq 11), AHCI 1.1
scsibus0 at ahci0: 32 targets, initiator 32
sd0 at scsibus0 targ 0 lun 0: <ATA, FUJITSU MHV2080B, 0084> SCSI3 0/direct fixed
sd0: 76319MB, 512 bytes/sec, 156301488 sec total
ichiic0 at pci0 dev 31 function 3 "Intel 82801GB SMBus" rev 0x02: apic 1 int 23
(irq 11)
iic0 at ichiic0
usb1 at uhci0: USB revision 1.0
uhub1 at usb1 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb2 at uhci1: USB revision 1.0
uhub2 at usb2 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb3 at uhci2: USB revision 1.0
uhub3 at usb3 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb4 at uhci3: USB revision 1.0
uhub4 at usb4 "Intel UHCI root hub" rev 1.00/1.00 addr 1
isa0 at ichpcib0
isadma0 at isa0
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
pckbc0: using irq 12 for aux slot
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
midi0 at pcppi0: <PC speaker>
spkr0 at pcppi0
aps0 at isa0 port 0x1600/31
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
mtrr: Pentium Pro MTRR support
ubt0 at uhub4 port 1 "Broadcom Corp BCM2045B" rev 2.00/1.00 addr 2
ugen0 at uhub4 port 2 "STMicroelectronics Biometric Coprocessor" rev 1.00/0.01
addr 3
softraid0 at root
root on sd0a swap on sd0b dump on sd0b
