Date: Fri, 5 Jun 2009 20:58:16 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163608 for review Message-ID: <200906052058.n55KwGHr067764@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163608 Change 163608 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 20:57:38 Forced integrate over more merge issues in USB-related code. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/chip.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbusreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/i2s.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/snapper.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/tumbler.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmireg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csareg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csavar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1-fw.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/apcdmareg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.h#4 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio_pcm.c#4 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/version.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/chip.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/driver.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/gusc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sbc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sndbuf_dma.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbus.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbusreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/i2s.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/snapper.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/tumbler.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.c#3 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midiq.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.c#3 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpufoi_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.c#5 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/synth_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmi.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmireg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csareg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csavar.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1-fw.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10k1.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-midi.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-pcm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro3.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro_reg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic-coeff.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/solo.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/fake.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_fmt.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_rate.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_volume.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sndstat.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/apcdmareg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudioreg.h#4 (text+ko) ==== @@ -31,30 +31,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define UAUDIO_VERSION 0x100 +#define UAUDIO_VERSION 0x100 -#define UDESC_CS_CONFIG 0x22 -#define UDESC_CS_STRING 0x23 -#define UDESC_CS_INTERFACE 0x24 -#define UDESC_CS_ENDPOINT 0x25 +#define UDESC_CS_CONFIG 0x22 +#define UDESC_CS_STRING 0x23 +#define UDESC_CS_INTERFACE 0x24 +#define UDESC_CS_ENDPOINT 0x25 -#define UDESCSUB_AC_HEADER 1 -#define UDESCSUB_AC_INPUT 2 -#define UDESCSUB_AC_OUTPUT 3 -#define UDESCSUB_AC_MIXER 4 -#define UDESCSUB_AC_SELECTOR 5 -#define UDESCSUB_AC_FEATURE 6 -#define UDESCSUB_AC_PROCESSING 7 -#define UDESCSUB_AC_EXTENSION 8 +#define UDESCSUB_AC_HEADER 1 +#define UDESCSUB_AC_INPUT 2 +#define UDESCSUB_AC_OUTPUT 3 +#define UDESCSUB_AC_MIXER 4 +#define UDESCSUB_AC_SELECTOR 5 +#define UDESCSUB_AC_FEATURE 6 +#define UDESCSUB_AC_PROCESSING 7 +#define UDESCSUB_AC_EXTENSION 8 /* The first fields are identical to struct usb_endpoint_descriptor */ typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bEndpointAddress; - uByte bmAttributes; - uWord wMaxPacketSize; - uByte bInterval; + uByte bLength; + uByte bDescriptorType; + uByte bEndpointAddress; + uByte bmAttributes; + uWord wMaxPacketSize; + uByte bInterval; /* * The following two entries are only used by the Audio Class. * And according to the specs the Audio Class is the only one @@ -62,60 +62,62 @@ * Who knows what goes on in the minds of the people in the USB * standardization? :-( */ - uByte bRefresh; - uByte bSynchAddress; -} UPACKED usb_endpoint_descriptor_audio_t; + uByte bRefresh; + uByte bSynchAddress; +} __packed usb2_endpoint_descriptor_audio_t; -struct usb_audio_control_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uWord bcdADC; - uWord wTotalLength; - uByte bInCollection; - uByte baInterfaceNr[1]; -} UPACKED; +struct usb2_audio_control_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uWord bcdADC; + uWord wTotalLength; + uByte bInCollection; + uByte baInterfaceNr[1]; +} __packed; -struct usb_audio_streaming_interface_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalLink; - uByte bDelay; - uWord wFormatTag; -} UPACKED; +struct usb2_audio_streaming_interface_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalLink; + uByte bDelay; + uWord wFormatTag; +} __packed; -struct usb_audio_streaming_endpoint_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bmAttributes; -#define UA_SED_FREQ_CONTROL 0x01 -#define UA_SED_PITCH_CONTROL 0x02 -#define UA_SED_MAXPACKETSONLY 0x80 - uByte bLockDelayUnits; - uWord wLockDelay; -} UPACKED; +struct usb2_audio_streaming_endpoint_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bmAttributes; +#define UA_SED_FREQ_CONTROL 0x01 +#define UA_SED_PITCH_CONTROL 0x02 +#define UA_SED_MAXPACKETSONLY 0x80 + uByte bLockDelayUnits; + uWord wLockDelay; +} __packed; -struct usb_audio_streaming_type1_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bFormatType; - uByte bNrChannels; - uByte bSubFrameSize; - uByte bBitResolution; - uByte bSamFreqType; -#define UA_SAMP_CONTNUOUS 0 - uByte tSamFreq[3*2]; /* room for low and high */ -#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16)) -#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) -#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) -} UPACKED; +struct usb2_audio_streaming_type1_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bFormatType; + uByte bNrChannels; + uByte bSubFrameSize; + uByte bBitResolution; + uByte bSamFreqType; +#define UA_SAMP_CONTNUOUS 0 + uByte tSamFreq[0]; +#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \ + ((p)->tSamFreq[((n)*3)+1] << 8) | \ + ((p)->tSamFreq[((n)*3)+2] << 16)) +#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) +#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) +} __packed; -struct usb_audio_cluster { - uByte bNrChannels; - uWord wChannelConfig; +struct usb2_audio_cluster { + uByte bNrChannels; + uWord wChannelConfig; #define UA_CHANNEL_LEFT 0x0001 #define UA_CHANNEL_RIGHT 0x0002 #define UA_CHANNEL_CENTER 0x0004 @@ -128,270 +130,270 @@ #define UA_CHANNEL_L_SIDE 0x0200 #define UA_CHANNEL_R_SIDE 0x0400 #define UA_CHANNEL_TOP 0x0800 - uByte iChannelNames; -} UPACKED; + uByte iChannelNames; +} __packed; /* Shared by all units and terminals */ -struct usb_audio_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; +struct usb2_audio_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; }; /* UDESCSUB_AC_INPUT */ -struct usb_audio_input_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte iTerminal; -} UPACKED; +struct usb2_audio_input_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; +/* uByte iTerminal; */ +} __packed; /* UDESCSUB_AC_OUTPUT */ -struct usb_audio_output_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bSourceId; - uByte iTerminal; -} UPACKED; +struct usb2_audio_output_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bSourceId; + uByte iTerminal; +} __packed; /* UDESCSUB_AC_MIXER */ -struct usb_audio_mixer_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_mixer_unit_1 */ -} UPACKED; -struct usb_audio_mixer_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bmControls[255]; /* [bNrChannels] */ - /*uByte iMixer;*/ -} UPACKED; +struct usb2_audio_mixer_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_mixer_unit_1 */ +} __packed; +struct usb2_audio_mixer_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bmControls[0]; /* [see source code] */ + /* uByte iMixer; */ +} __packed; /* UDESCSUB_AC_SELECTOR */ -struct usb_audio_selector_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ +struct usb2_audio_selector_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ /* uByte iSelector; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_FEATURE */ -struct usb_audio_feature_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bSourceId; - uByte bControlSize; - uByte bmaControls[255]; /* size for more than enough */ +struct usb2_audio_feature_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bSourceId; + uByte bControlSize; + uByte bmaControls[0]; /* [bControlSize * x] */ /* uByte iFeature; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_PROCESSING */ -struct usb_audio_processing_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wProcessType; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_processing_unit_1 */ -} UPACKED; -struct usb_audio_processing_unit_1{ - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_PROC_ENABLE_MASK 1 -} UPACKED; +struct usb2_audio_processing_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wProcessType; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_processing_unit_1 */ +} __packed; +struct usb2_audio_processing_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_PROC_ENABLE_MASK 1 +} __packed; -struct usb_audio_processing_unit_updown { - uByte iProcessing; - uByte bNrModes; - uWord waModes[255]; /* [bNrModes] */ -} UPACKED; +struct usb2_audio_processing_unit_updown { + uByte iProcessing; + uByte bNrModes; + uWord waModes[0]; /* [bNrModes] */ +} __packed; /* UDESCSUB_AC_EXTENSION */ -struct usb_audio_extension_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wExtensionCode; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_extension_unit_1 */ -} UPACKED; -struct usb_audio_extension_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_EXT_ENABLE_MASK 1 -#define UA_EXT_ENABLE 1 - /*uByte iExtension;*/ -} UPACKED; +struct usb2_audio_extension_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wExtensionCode; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_extension_unit_1 */ +} __packed; +struct usb2_audio_extension_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_EXT_ENABLE_MASK 1 +#define UA_EXT_ENABLE 1 + /* uByte iExtension; */ +} __packed; /* USB terminal types */ -#define UAT_UNDEFINED 0x0100 -#define UAT_STREAM 0x0101 -#define UAT_VENDOR 0x01ff +#define UAT_UNDEFINED 0x0100 +#define UAT_STREAM 0x0101 +#define UAT_VENDOR 0x01ff /* input terminal types */ -#define UATI_UNDEFINED 0x0200 -#define UATI_MICROPHONE 0x0201 -#define UATI_DESKMICROPHONE 0x0202 -#define UATI_PERSONALMICROPHONE 0x0203 -#define UATI_OMNIMICROPHONE 0x0204 -#define UATI_MICROPHONEARRAY 0x0205 -#define UATI_PROCMICROPHONEARR 0x0206 +#define UATI_UNDEFINED 0x0200 +#define UATI_MICROPHONE 0x0201 +#define UATI_DESKMICROPHONE 0x0202 +#define UATI_PERSONALMICROPHONE 0x0203 +#define UATI_OMNIMICROPHONE 0x0204 +#define UATI_MICROPHONEARRAY 0x0205 +#define UATI_PROCMICROPHONEARR 0x0206 /* output terminal types */ -#define UATO_UNDEFINED 0x0300 -#define UATO_SPEAKER 0x0301 -#define UATO_HEADPHONES 0x0302 -#define UATO_DISPLAYAUDIO 0x0303 -#define UATO_DESKTOPSPEAKER 0x0304 -#define UATO_ROOMSPEAKER 0x0305 -#define UATO_COMMSPEAKER 0x0306 -#define UATO_SUBWOOFER 0x0307 +#define UATO_UNDEFINED 0x0300 +#define UATO_SPEAKER 0x0301 +#define UATO_HEADPHONES 0x0302 +#define UATO_DISPLAYAUDIO 0x0303 +#define UATO_DESKTOPSPEAKER 0x0304 +#define UATO_ROOMSPEAKER 0x0305 +#define UATO_COMMSPEAKER 0x0306 +#define UATO_SUBWOOFER 0x0307 /* bidir terminal types */ -#define UATB_UNDEFINED 0x0400 -#define UATB_HANDSET 0x0401 -#define UATB_HEADSET 0x0402 -#define UATB_SPEAKERPHONE 0x0403 -#define UATB_SPEAKERPHONEESUP 0x0404 -#define UATB_SPEAKERPHONEECANC 0x0405 +#define UATB_UNDEFINED 0x0400 +#define UATB_HANDSET 0x0401 +#define UATB_HEADSET 0x0402 +#define UATB_SPEAKERPHONE 0x0403 +#define UATB_SPEAKERPHONEESUP 0x0404 +#define UATB_SPEAKERPHONEECANC 0x0405 /* telephony terminal types */ -#define UATT_UNDEFINED 0x0500 -#define UATT_PHONELINE 0x0501 -#define UATT_TELEPHONE 0x0502 -#define UATT_DOWNLINEPHONE 0x0503 +#define UATT_UNDEFINED 0x0500 +#define UATT_PHONELINE 0x0501 +#define UATT_TELEPHONE 0x0502 +#define UATT_DOWNLINEPHONE 0x0503 /* external terminal types */ -#define UATE_UNDEFINED 0x0600 -#define UATE_ANALOGCONN 0x0601 -#define UATE_DIGITALAUIFC 0x0602 -#define UATE_LINECONN 0x0603 -#define UATE_LEGACYCONN 0x0604 -#define UATE_SPDIF 0x0605 -#define UATE_1394DA 0x0606 -#define UATE_1394DV 0x0607 +#define UATE_UNDEFINED 0x0600 +#define UATE_ANALOGCONN 0x0601 +#define UATE_DIGITALAUIFC 0x0602 +#define UATE_LINECONN 0x0603 +#define UATE_LEGACYCONN 0x0604 +#define UATE_SPDIF 0x0605 +#define UATE_1394DA 0x0606 +#define UATE_1394DV 0x0607 /* embedded function terminal types */ -#define UATF_UNDEFINED 0x0700 -#define UATF_CALIBNOISE 0x0701 -#define UATF_EQUNOISE 0x0702 -#define UATF_CDPLAYER 0x0703 -#define UATF_DAT 0x0704 -#define UATF_DCC 0x0705 -#define UATF_MINIDISK 0x0706 -#define UATF_ANALOGTAPE 0x0707 -#define UATF_PHONOGRAPH 0x0708 -#define UATF_VCRAUDIO 0x0709 -#define UATF_VIDEODISCAUDIO 0x070a -#define UATF_DVDAUDIO 0x070b -#define UATF_TVTUNERAUDIO 0x070c -#define UATF_SATELLITE 0x070d -#define UATF_CABLETUNER 0x070e -#define UATF_DSS 0x070f -#define UATF_RADIORECV 0x0710 -#define UATF_RADIOXMIT 0x0711 -#define UATF_MULTITRACK 0x0712 -#define UATF_SYNTHESIZER 0x0713 +#define UATF_UNDEFINED 0x0700 +#define UATF_CALIBNOISE 0x0701 +#define UATF_EQUNOISE 0x0702 +#define UATF_CDPLAYER 0x0703 +#define UATF_DAT 0x0704 +#define UATF_DCC 0x0705 +#define UATF_MINIDISK 0x0706 +#define UATF_ANALOGTAPE 0x0707 +#define UATF_PHONOGRAPH 0x0708 +#define UATF_VCRAUDIO 0x0709 +#define UATF_VIDEODISCAUDIO 0x070a +#define UATF_DVDAUDIO 0x070b +#define UATF_TVTUNERAUDIO 0x070c +#define UATF_SATELLITE 0x070d +#define UATF_CABLETUNER 0x070e +#define UATF_DSS 0x070f +#define UATF_RADIORECV 0x0710 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906052058.n55KwGHr067764>