Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2683e884 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 



Reverting c7afb48e since a better (but
more intrusive) fix is now merged upstream.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parents b07019f2 9f29333d

Documentation/sound/alsa/Audiophile-Usb.txt

+54 −27
Original line number Diff line number Diff line 
	Guide to using M-Audio Audiophile USB with ALSA and Jack	v1.2

	Guide to using M-Audio Audiophile USB with ALSA and Jack	v1.3

	========================================================



	    Thibault Le Meur <Thibault.LeMeur@supelec.fr>
@@ -22,7 +22,7 @@ The device has 4 audio interfaces, and 2 MIDI ports: 
 * Midi In (Mi)

 * Midi Out (Mo)



The internal DAC/ADC has the following caracteristics:

The internal DAC/ADC has the following characteristics:

* sample depth of 16 or 24 bits

* sample rate from 8kHz to 96kHz

* Two ports can't use different sample depths at the same time. Moreover, the
@@ -41,8 +41,8 @@ activated at the same time depending on the audio mode selected: 


Important facts about the Digital interface:

--------------------------------------------

 * The Do port additionnaly supports surround-encoded AC-3 and DTS passthrough, 

though I haven't tested it under linux

 * The Do port additionally supports surround-encoded AC-3 and DTS passthrough, 

though I haven't tested it under Linux

   - Note that in this setup only the Do interface can be enabled

 * Apart from recording an audio digital stream, enabling the Di port is a way 

to synchronize the device to an external sample clock
@@ -60,24 +60,23 @@ synchronization error (for instance sound played at an odd sample rate) 
The Audiophile USB MIDI ports will be automatically supported once the 

following modules have been loaded:

 * snd-usb-audio

 * snd-seq

 * snd-seq-midi



No additionnal setting is required.

No additional setting is required.



2.2 - Audio ports

-----------------



Audio functions of the Audiophile USB device are handled by the snd-usb-audio 

module. This module can work in a default mode (without any device-specific 

parameter), or in an advanced mode with the device-specific parameter called 

parameter), or in an "advanced" mode with the device-specific parameter called 

"device_setup".



2.2.1 - Default Alsa driver mode



The default behaviour of the snd-usb-audio driver is to parse the device 

The default behavior of the snd-usb-audio driver is to parse the device 

capabilities at startup and enable all functions inside the device (including 

all ports at any sample rates and any sample depths supported). This approach 

all ports at any supported sample rates and sample depths). This approach 

has the advantage to let the driver easily switch from sample rates/depths 

automatically according to the need of the application claiming the device.
@@ -114,9 +113,9 @@ gain). 
For people having this problem, the snd-usb-audio module has a new module 

parameter called "device_setup".



2.2.2.1 - Initializing the working mode of the Audiohile USB

2.2.2.1 - Initializing the working mode of the Audiophile USB



As far as the Audiohile USB device is concerned, this value let the user 

As far as the Audiophile USB device is concerned, this value let the user 

specify:

 * the sample depth

 * the sample rate
@@ -174,20 +173,20 @@ The parameter can be given: 


IMPORTANT NOTE WHEN SWITCHING CONFIGURATION:

-------------------------------------------

 * You may need to _first_ intialize the module with the correct device_setup 

 * You may need to _first_ initialize the module with the correct device_setup 

   parameter and _only_after_ turn on the Audiophile USB device

 * This is especially true when switching the sample depth:

   - first trun off the device

   - de-register the snd-usb-audio module

   - change the device_setup parameter (by either manually reprobing the module 

     or changing modprobe.conf)

   - first turn off the device

   - de-register the snd-usb-audio module (modprobe -r)

   - change the device_setup parameter by changing the device_setup

     option in /etc/modprobe.conf 

   - turn on the device



2.2.2.3 - Audiophile USB's device_setup structure



If you want to understand the device_setup magic numbers for the Audiophile 

USB, you need some very basic understanding of binary computation. However, 

this is not required to use the parameter and you may skip thi section.

this is not required to use the parameter and you may skip this section.



The device_setup is one byte long and its structure is the following:
@@ -231,11 +230,11 @@ Caution: 


2.2.3 -  USB implementation details for this device



You may safely skip this section if you're not interrested in driver 

You may safely skip this section if you're not interested in driver 

development.



This section describes some internals aspect of the device and summarize the 

data I got by usb-snooping the windows and linux drivers.

This section describes some internal aspects of the device and summarize the 

data I got by usb-snooping the windows and Linux drivers.



The M-Audio Audiophile USB has 7 USB Interfaces:

a "USB interface":
@@ -277,9 +276,9 @@ Here is a short description of the AltSettings capabilities: 
  - 16-bit depth, 8-48kHz sample mode

  - Synch playback (Do), audio format type III IEC1937_AC-3



In order to ensure a correct intialization of the device, the driver 

In order to ensure a correct initialization of the device, the driver 

_must_know_ how the device will be used:

 * if DTS is choosen, only Interface 2 with AltSet nb.6 must be

 * if DTS is chosen, only Interface 2 with AltSet nb.6 must be

   registered

 * if 96KHz only AltSets nb.1 of each interface must be selected

 * if samples are using 24bits/48KHz then AltSet 2 must me used if
@@ -290,7 +289,7 @@ _must_know_ how the device will be used: 
   is not connected



When device_setup is given as a parameter to the snd-usb-audio module, the 

parse_audio_enpoint function uses a quirk called 

parse_audio_endpoints function uses a quirk called 

"audiophile_skip_setting_quirk" in order to prevent AltSettings not 

corresponding to device_setup from being registered in the driver.
@@ -317,9 +316,8 @@ However you may see the following warning message: 
using the "default" ALSA device. This is less efficient than it could be. 

Consider using a hardware device instead rather than using the plug layer."





3.2 - Patching alsa to use direct pcm device

-------------------------------------------

--------------------------------------------

A patch for Jack by Andreas Steinmetz adds support for Big Endian devices. 

However it has not been included in the CVS tree.
@@ -331,3 +329,32 @@ After having applied the patch you can run jackd with the following command 
line:

  % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1



3.2 - Getting 2 input and/or output interfaces in Jack

------------------------------------------------------



As you can see, starting the Jack server this way will only enable 1 stereo

input (Di or Ai) and 1 stereo output (Ao or Do).



This is due to the following restrictions:

* Jack can only open one capture device and one playback device at a time

* The Audiophile USB is seen as 2 (or three) Alsa devices: hw:1,0, hw:1,1

  (and optionally hw:1,2)

If you want to get Ai+Di and/or Ao+Do support with Jack, you would need to

combine the Alsa devices into one logical "complex" device.



If you want to give it a try, I recommend reading the information from

this page: http://www.sound-man.co.uk/linuxaudio/ice1712multi.html

It is related to another device (ice1712) but can be adapted to suit

the Audiophile USB.



Enabling multiple Audiophile USB interfaces for Jackd will certainly require:

* patching Jack with the previously mentioned "Big Endian" patch

* patching Jackd with the MMAP_COMPLEX patch (see the ice1712 page)

* patching the alsa-lib/src/pcm/pcm_multi.c file (see the ice1712 page)

* define a multi device (combination of hw:1,0 and hw:1,1) in your .asoundrc

  file 

* start jackd with this device



I had no success in testing this for now, but this may be due to my OS

configuration. If you have any success with this kind of setup, please

drop me an email.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ 
  }        



  /* PCI IDs */

  static struct pci_device_id snd_mychip_ids[] = {

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....
@@ -1565,7 +1565,7 @@ 
        <informalexample>

          <programlisting>

<![CDATA[

  static struct pci_device_id snd_mychip_ids[] = {

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....

drivers/char/keyboard.c

+28 −10
Original line number Diff line number Diff line
@@ -860,9 +860,32 @@ static void k_slock(struct vc_data *vc, unsigned char value, char up_flag, struc 
}



/* by default, 300ms interval for combination release */

static long brl_timeout = 300;

MODULE_PARM_DESC(brl_timeout, "Braille keys release delay in ms (0 for combination on first release, < 0 for dead characters)");

module_param(brl_timeout, long, 0644);

static unsigned brl_timeout = 300;

MODULE_PARM_DESC(brl_timeout, "Braille keys release delay in ms (0 for commit on first key release)");

module_param(brl_timeout, uint, 0644);



static unsigned brl_nbchords = 1;

MODULE_PARM_DESC(brl_nbchords, "Number of chords that produce a braille pattern (0 for dead chords)");

module_param(brl_nbchords, uint, 0644);



static void k_brlcommit(struct vc_data *vc, unsigned int pattern, char up_flag, struct pt_regs *regs)

{

	static unsigned long chords;

	static unsigned committed;



	if (!brl_nbchords)

		k_deadunicode(vc, BRL_UC_ROW | pattern, up_flag, regs);

	else {

		committed |= pattern;

		chords++;

		if (chords == brl_nbchords) {

			k_unicode(vc, BRL_UC_ROW | committed, up_flag, regs);

			chords = 0;

			committed = 0;

		}

	}

}



static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)

{

	static unsigned pressed,committing;
@@ -882,11 +905,6 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct 
	if (value > 8)

		return;



	if (brl_timeout < 0) {

		k_deadunicode(vc, BRL_UC_ROW | (1 << (value - 1)), up_flag, regs);

		return;

	}



	if (up_flag) {

		if (brl_timeout) {

			if (!committing ||
@@ -897,13 +915,13 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct 
			pressed &= ~(1 << (value - 1));

			if (!pressed) {

				if (committing) {

					k_unicode(vc, BRL_UC_ROW | committing, 0, regs);

					k_brlcommit(vc, committing, 0, regs);

					committing = 0;

				}

			}

		} else {

			if (committing) {

				k_unicode(vc, BRL_UC_ROW | committing, 0, regs);

				k_brlcommit(vc, committing, 0, regs);

				committing = 0;

			}

			pressed &= ~(1 << (value - 1));

drivers/input/evdev.c

+21 −0
Original line number Diff line number Diff line
@@ -403,6 +403,27 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, 
		case EVIOCGID:

			if (copy_to_user(p, &dev->id, sizeof(struct input_id)))

				return -EFAULT;

			return 0;



		case EVIOCGREP:

			if (!test_bit(EV_REP, dev->evbit))

				return -ENOSYS;

			if (put_user(dev->rep[REP_DELAY], ip))

				return -EFAULT;

			if (put_user(dev->rep[REP_PERIOD], ip + 1))

				return -EFAULT;

			return 0;



		case EVIOCSREP:

			if (!test_bit(EV_REP, dev->evbit))

				return -ENOSYS;

			if (get_user(u, ip))

				return -EFAULT;

			if (get_user(v, ip + 1))

				return -EFAULT;



			input_event(dev, EV_REP, REP_DELAY, u);

			input_event(dev, EV_REP, REP_PERIOD, v);



			return 0;

drivers/input/input.c

+7 −4
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in 
			if (code > SND_MAX || !test_bit(code, dev->sndbit))

				return;



			if (!!test_bit(code, dev->snd) != !!value)

				change_bit(code, dev->snd);



			if (dev->event) dev->event(dev, type, code, value);



			break;
@@ -286,19 +289,19 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st 
	for (; id->flags || id->driver_info; id++) {



		if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)

			if (id->id.bustype != dev->id.bustype)

			if (id->bustype != dev->id.bustype)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)

			if (id->id.vendor != dev->id.vendor)

			if (id->vendor != dev->id.vendor)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)

			if (id->id.product != dev->id.product)

			if (id->product != dev->id.product)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)

			if (id->id.version != dev->id.version)

			if (id->version != dev->id.version)

				continue;



		MATCH_BIT(evbit,  EV_MAX);