Commit d9c28b28 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA update (0.9.0rc5)

  - ICE1712 - fixed Midiman M-audio Delta1010LT code
  - fixed typos in comments (es1938, intel8x0)
  - fixed quirks for Edirol UA-20 and UA-700 (USB driver)
parent 387d4324
/* include/version.h. Generated automatically by configure. */ /* include/version.h. Generated automatically by configure. */
#define CONFIG_SND_VERSION "0.9.0rc3" #define CONFIG_SND_VERSION "0.9.0rc5"
#define CONFIG_SND_DATE " (Sun Oct 27 07:55:05 2002 UTC)" #define CONFIG_SND_DATE " (Tue Oct 29 09:19:27 2002 UTC)"
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Abramo Bagnara <abramo@alsa-project.org>, * Abramo Bagnara <abramo@alsa-project.org>,
* Markus Gruber <gruber@eikon.tum.de> * Markus Gruber <gruber@eikon.tum.de>
* *
* Rewritted from sonicvibes.c source. * Rewritten from sonicvibes.c source.
* *
* TODO: * TODO:
* Rewrite better spinlocks * Rewrite better spinlocks
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
This is due to playback interrupts not generated. This is due to playback interrupts not generated.
I suspect a timing issue. I suspect a timing issue.
- Sometimes the interrupt handler is invoked wrongly during playback. - Sometimes the interrupt handler is invoked wrongly during playback.
This generate some harmless "Unexpected hw_pointer: wrong interrupt This generates some harmless "Unexpected hw_pointer: wrong interrupt
acknowledge". acknowledge".
I've seen that using small period sizes. I've seen that using small period sizes.
Reproducible with: Reproducible with:
...@@ -573,7 +573,7 @@ static int snd_es1938_playback1_trigger(snd_pcm_substream_t * substream, ...@@ -573,7 +573,7 @@ static int snd_es1938_playback1_trigger(snd_pcm_substream_t * substream,
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
/* According to the documentation this should be: /* According to the documentation this should be:
0x13 but that value may random swap stereo channels */ 0x13 but that value may randomly swap stereo channels */
snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x93); snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x93);
outb(0x0a, SLIO_REG(chip, AUDIO2MODE)); outb(0x0a, SLIO_REG(chip, AUDIO2MODE));
chip->active |= DAC2; chip->active |= DAC2;
......
...@@ -490,6 +490,7 @@ static int __devinit snd_ice1712_delta_add_controls(ice1712_t *ice) ...@@ -490,6 +490,7 @@ static int __devinit snd_ice1712_delta_add_controls(ice1712_t *ice)
/* ak4524 controls */ /* ak4524 controls */
switch (ice->eeprom.subvendor) { switch (ice->eeprom.subvendor) {
case ICE1712_SUBDEVICE_DELTA1010LT:
case ICE1712_SUBDEVICE_AUDIOPHILE: case ICE1712_SUBDEVICE_AUDIOPHILE:
case ICE1712_SUBDEVICE_DELTA44: case ICE1712_SUBDEVICE_DELTA44:
case ICE1712_SUBDEVICE_DELTA66: case ICE1712_SUBDEVICE_DELTA66:
......
...@@ -149,7 +149,7 @@ DEFINE_REGSET(PI, 0x00); /* PCM in */ ...@@ -149,7 +149,7 @@ DEFINE_REGSET(PI, 0x00); /* PCM in */
DEFINE_REGSET(PO, 0x10); /* PCM out */ DEFINE_REGSET(PO, 0x10); /* PCM out */
DEFINE_REGSET(MC, 0x20); /* Mic in */ DEFINE_REGSET(MC, 0x20); /* Mic in */
/* ICH4 busmater blocks */ /* ICH4 busmaster blocks */
DEFINE_REGSET(MC2, 0x40); /* Mic in 2 */ DEFINE_REGSET(MC2, 0x40); /* Mic in 2 */
DEFINE_REGSET(PI2, 0x50); /* PCM in 2 */ DEFINE_REGSET(PI2, 0x50); /* PCM in 2 */
DEFINE_REGSET(SP, 0x60); /* SPDIF out */ DEFINE_REGSET(SP, 0x60); /* SPDIF out */
......
...@@ -365,6 +365,20 @@ ...@@ -365,6 +365,20 @@
} }
} }
}, },
{
USB_DEVICE_VENDOR_SPEC(0x0582, 0x0025),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL",
.product_name = "UA-20",
.ifnum = 3,
.type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) {
.epnum = -1,
.out_cables = 0x0001,
.in_cables = 0x0001
}
}
},
{ {
USB_DEVICE(0x0582, 0x0027), USB_DEVICE(0x0582, 0x0027),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
...@@ -394,7 +408,7 @@ ...@@ -394,7 +408,7 @@
} }
}, },
{ {
USB_DEVICE(0x0582, 0x002b), USB_DEVICE_VENDOR_SPEC(0x0582, 0x002b),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL", .vendor_name = "EDIROL",
.product_name = "UA-700", .product_name = "UA-700",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment