Skip to content

C
clone-Linux

gsplhtlxg / clone-Linux

通知 2
Star 0
Fork 1
C
clone-Linux

体验新版 GitCode，发现更多精彩内容 >>

提交 ab2f06cb 编写于 作者: T Takashi Iwai
浏览文件
操作

Merge branch 'topic/caiaq' into for-linus 

* topic/caiaq:
  ALSA: snd_usb_caiaq: bump version number
  ALSA: snd_usb_caiaq: give better shortname
  ALSA: Core - add snd_card_set_id() function
  ALSA: snd_usb_caiaq: give better longname
  ALSA: snd_usb_caiaq: use strlcpy
  ALSA: snd_usb_caiaq: clean whitespaces
上级 a963203c c6e24d4d
隐藏空白更改
内联 并排
Showing with 152 addition and 132 deletion
include/sound/core.h
浏览文件 @ ab2f06cb
...@@ -313,6 +313,7 @@ struct snd_card *snd_card_new(int idx, const char *id, ...@@ -313,6 +313,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
int snd_card_disconnect(struct snd_card *card); int snd_card_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card); int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(struct snd_card *card); int snd_card_free_when_closed(struct snd_card *card);
void snd_card_set_id(struct snd_card *card, const char *id);
int snd_card_register(struct snd_card *card); int snd_card_register(struct snd_card *card);
int snd_card_info_init(void); int snd_card_info_init(void);
int snd_card_info_done(void); int snd_card_info_done(void);
......
sound/core/init.c
浏览文件 @ ab2f06cb
...@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid, ...@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid,
card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL); card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
if (!card) if (!card)
return -ENOMEM; return -ENOMEM;
if (xid) { if (xid)
if (!snd_info_check_reserved_words(xid)) { snd_card_set_id(card, xid);
snd_printk(KERN_ERR
"given id string '%s' is reserved.\n", xid);
err = -EBUSY;
goto __error;
}
strlcpy(card->id, xid, sizeof(card->id));
}
err = 0; err = 0;
mutex_lock(&snd_card_mutex); mutex_lock(&snd_card_mutex);
if (idx < 0) { if (idx < 0) {
...@@ -483,22 +476,39 @@ int snd_card_free(struct snd_card *card) ...@@ -483,22 +476,39 @@ int snd_card_free(struct snd_card *card)
EXPORT_SYMBOL(snd_card_free); EXPORT_SYMBOL(snd_card_free);
static void choose_default_id(struct snd_card *card) /**
* snd_card_set_id - set card identification name
* @card: soundcard structure
* @nid: new identification string
*
* This function sets the card identification and checks for name
* collisions.
*/
void snd_card_set_id(struct snd_card *card, const char *nid)
{ {
int i, len, idx_flag = 0, loops = SNDRV_CARDS; int i, len, idx_flag = 0, loops = SNDRV_CARDS;
char *id, *spos; const char *spos, *src;
char *id;
id = spos = card->shortname; /* check if user specified own card->id */
while (*id != '\0') { if (card->id[0] != '\0')
if (*id == ' ') return;
spos = id + 1; if (nid == NULL) {
id++; id = card->shortname;
spos = src = id;
while (*id != '\0') {
if (*id == ' ')
spos = id + 1;
id++;
}
} else {
spos = src = nid;
} }
id = card->id; id = card->id;
while (*spos != '\0' && !isalnum(*spos)) while (*spos != '\0' && !isalnum(*spos))
spos++; spos++;
if (isdigit(*spos)) if (isdigit(*spos))
*id++ = isalpha(card->shortname[0]) ? card->shortname[0] : 'D'; *id++ = isalpha(src[0]) ? src[0] : 'D';
while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) { while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) {
if (isalnum(*spos)) if (isalnum(*spos))
*id++ = *spos; *id++ = *spos;
...@@ -513,16 +523,20 @@ static void choose_default_id(struct snd_card *card) ...@@ -513,16 +523,20 @@ static void choose_default_id(struct snd_card *card)
while (1) { while (1) {
if (loops-- == 0) { if (loops-- == 0) {
snd_printk(KERN_ERR "unable to choose default card id (%s)\n", id); snd_printk(KERN_ERR "unable to set card id (%s)\n", id);
strcpy(card->id, card->proc_root->name); strcpy(card->id, card->proc_root->name);
return; return;
} }
if (!snd_info_check_reserved_words(id)) if (!snd_info_check_reserved_words(id))
goto __change; goto __change;
mutex_lock(&snd_card_mutex);
for (i = 0; i < snd_ecards_limit; i++) { for (i = 0; i < snd_ecards_limit; i++) {
if (snd_cards[i] && !strcmp(snd_cards[i]->id, id)) if (snd_cards[i] && !strcmp(snd_cards[i]->id, id)) {
mutex_unlock(&snd_card_mutex);
goto __change; goto __change;
}
} }
mutex_unlock(&snd_card_mutex);
break; break;
__change: __change:
...@@ -539,14 +553,16 @@ static void choose_default_id(struct snd_card *card) ...@@ -539,14 +553,16 @@ static void choose_default_id(struct snd_card *card)
spos = id + len - 2; spos = id + len - 2;
if ((size_t)len <= sizeof(card->id) - 2) if ((size_t)len <= sizeof(card->id) - 2)
spos++; spos++;
*spos++ = '_'; *(char *)spos++ = '_';
*spos++ = '1'; *(char *)spos++ = '1';
*spos++ = '\0'; *(char *)spos++ = '\0';
idx_flag++; idx_flag++;
} }
} }
} }
EXPORT_SYMBOL(snd_card_set_id);
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
static ssize_t static ssize_t
card_id_show_attr(struct device *dev, card_id_show_attr(struct device *dev,
...@@ -641,7 +657,7 @@ int snd_card_register(struct snd_card *card) ...@@ -641,7 +657,7 @@ int snd_card_register(struct snd_card *card)
return 0; return 0;
} }
if (card->id[0] == '\0') if (card->id[0] == '\0')
choose_default_id(card); snd_card_set_id(card, NULL);
snd_cards[card->number] = card; snd_cards[card->number] = card;
mutex_unlock(&snd_card_mutex); mutex_unlock(&snd_card_mutex);
init_info_for_card(card); init_info_for_card(card);
......
sound/usb/caiaq/audio.c
浏览文件 @ ab2f06cb
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
(stream << 1) | (~(i / (dev->n_streams * BYTES_PER_SAMPLE_USB)) & 1) (stream << 1) | (~(i / (dev->n_streams * BYTES_PER_SAMPLE_USB)) & 1)
static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = { static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER), SNDRV_PCM_INFO_BLOCK_TRANSFER),
.formats = SNDRV_PCM_FMTBIT_S24_3BE, .formats = SNDRV_PCM_FMTBIT_S24_3BE,
.rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_96000), SNDRV_PCM_RATE_96000),
.rate_min = 44100, .rate_min = 44100,
.rate_max = 0, /* will overwrite later */ .rate_max = 0, /* will overwrite later */
...@@ -68,7 +68,7 @@ activate_substream(struct snd_usb_caiaqdev *dev, ...@@ -68,7 +68,7 @@ activate_substream(struct snd_usb_caiaqdev *dev,
dev->sub_capture[sub->number] = sub; dev->sub_capture[sub->number] = sub;
} }
static void static void
deactivate_substream(struct snd_usb_caiaqdev *dev, deactivate_substream(struct snd_usb_caiaqdev *dev,
struct snd_pcm_substream *sub) struct snd_pcm_substream *sub)
{ {
...@@ -118,7 +118,7 @@ static int stream_start(struct snd_usb_caiaqdev *dev) ...@@ -118,7 +118,7 @@ static int stream_start(struct snd_usb_caiaqdev *dev)
return -EPIPE; return -EPIPE;
} }
} }
return 0; return 0;
} }
...@@ -129,7 +129,7 @@ static void stream_stop(struct snd_usb_caiaqdev *dev) ...@@ -129,7 +129,7 @@ static void stream_stop(struct snd_usb_caiaqdev *dev)
debug("%s(%p)\n", __func__, dev); debug("%s(%p)\n", __func__, dev);
if (!dev->streaming) if (!dev->streaming)
return; return;
dev->streaming = 0; dev->streaming = 0;
for (i = 0; i < N_URBS; i++) { for (i = 0; i < N_URBS; i++) {
...@@ -154,7 +154,7 @@ static int snd_usb_caiaq_substream_close(struct snd_pcm_substream *substream) ...@@ -154,7 +154,7 @@ static int snd_usb_caiaq_substream_close(struct snd_pcm_substream *substream)
debug("%s(%p)\n", __func__, substream); debug("%s(%p)\n", __func__, substream);
if (all_substreams_zero(dev->sub_playback) && if (all_substreams_zero(dev->sub_playback) &&
all_substreams_zero(dev->sub_capture)) { all_substreams_zero(dev->sub_capture)) {
/* when the last client has stopped streaming, /* when the last client has stopped streaming,
* all sample rates are allowed again */ * all sample rates are allowed again */
stream_stop(dev); stream_stop(dev);
dev->pcm_info.rates = dev->samplerates; dev->pcm_info.rates = dev->samplerates;
...@@ -194,7 +194,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -194,7 +194,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
debug("%s(%p)\n", __func__, substream); debug("%s(%p)\n", __func__, substream);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dev->period_out_count[index] = BYTES_PER_SAMPLE + 1; dev->period_out_count[index] = BYTES_PER_SAMPLE + 1;
dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1; dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
...@@ -205,19 +205,19 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -205,19 +205,19 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
if (dev->streaming) if (dev->streaming)
return 0; return 0;
/* the first client that opens a stream defines the sample rate /* the first client that opens a stream defines the sample rate
* setting for all subsequent calls, until the last client closed. */ * setting for all subsequent calls, until the last client closed. */
for (i=0; i < ARRAY_SIZE(rates); i++) for (i=0; i < ARRAY_SIZE(rates); i++)
if (runtime->rate == rates[i]) if (runtime->rate == rates[i])
dev->pcm_info.rates = 1 << i; dev->pcm_info.rates = 1 << i;
snd_pcm_limit_hw_rates(runtime); snd_pcm_limit_hw_rates(runtime);
bytes_per_sample = BYTES_PER_SAMPLE; bytes_per_sample = BYTES_PER_SAMPLE;
if (dev->spec.data_alignment == 2) if (dev->spec.data_alignment == 2)
bytes_per_sample++; bytes_per_sample++;
bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE) bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE)
* bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams; * bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams;
...@@ -232,7 +232,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -232,7 +232,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
ret = stream_start(dev); ret = stream_start(dev);
if (ret) if (ret)
return ret; return ret;
dev->output_running = 0; dev->output_running = 0;
wait_event_timeout(dev->prepare_wait_queue, dev->output_running, HZ); wait_event_timeout(dev->prepare_wait_queue, dev->output_running, HZ);
if (!dev->output_running) { if (!dev->output_running) {
...@@ -273,7 +273,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub) ...@@ -273,7 +273,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
return SNDRV_PCM_POS_XRUN; return SNDRV_PCM_POS_XRUN;
if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
return bytes_to_frames(sub->runtime, return bytes_to_frames(sub->runtime,
dev->audio_out_buf_pos[index]); dev->audio_out_buf_pos[index]);
else else
return bytes_to_frames(sub->runtime, return bytes_to_frames(sub->runtime,
...@@ -291,7 +291,7 @@ static struct snd_pcm_ops snd_usb_caiaq_ops = { ...@@ -291,7 +291,7 @@ static struct snd_pcm_ops snd_usb_caiaq_ops = {
.trigger = snd_usb_caiaq_pcm_trigger, .trigger = snd_usb_caiaq_pcm_trigger,
.pointer = snd_usb_caiaq_pcm_pointer .pointer = snd_usb_caiaq_pcm_pointer
}; };
static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev, static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev,
struct snd_pcm_substream **subs) struct snd_pcm_substream **subs)
{ {
...@@ -333,7 +333,7 @@ static void read_in_urb_mode0(struct snd_usb_caiaqdev *dev, ...@@ -333,7 +333,7 @@ static void read_in_urb_mode0(struct snd_usb_caiaqdev *dev,
struct snd_pcm_runtime *rt = sub->runtime; struct snd_pcm_runtime *rt = sub->runtime;
char *audio_buf = rt->dma_area; char *audio_buf = rt->dma_area;
int sz = frames_to_bytes(rt, rt->buffer_size); int sz = frames_to_bytes(rt, rt->buffer_size);
audio_buf[dev->audio_in_buf_pos[stream]++] audio_buf[dev->audio_in_buf_pos[stream]++]
= usb_buf[i]; = usb_buf[i];
dev->period_in_count[stream]++; dev->period_in_count[stream]++;
if (dev->audio_in_buf_pos[stream] == sz) if (dev->audio_in_buf_pos[stream] == sz)
...@@ -354,14 +354,14 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev, ...@@ -354,14 +354,14 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev,
for (i = 0; i < iso->actual_length;) { for (i = 0; i < iso->actual_length;) {
if (i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == 0) { if (i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == 0) {
for (stream = 0; for (stream = 0;
stream < dev->n_streams; stream < dev->n_streams;
stream++, i++) { stream++, i++) {
if (dev->first_packet) if (dev->first_packet)
continue; continue;
check_byte = MAKE_CHECKBYTE(dev, stream, i); check_byte = MAKE_CHECKBYTE(dev, stream, i);
if ((usb_buf[i] & 0x3f) != check_byte) if ((usb_buf[i] & 0x3f) != check_byte)
dev->input_panic = 1; dev->input_panic = 1;
...@@ -410,21 +410,21 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev, ...@@ -410,21 +410,21 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev,
} }
if ((dev->input_panic || dev->output_panic) && !dev->warned) { if ((dev->input_panic || dev->output_panic) && !dev->warned) {
debug("streaming error detected %s %s\n", debug("streaming error detected %s %s\n",
dev->input_panic ? "(input)" : "", dev->input_panic ? "(input)" : "",
dev->output_panic ? "(output)" : ""); dev->output_panic ? "(output)" : "");
dev->warned = 1; dev->warned = 1;
} }
} }
static void fill_out_urb(struct snd_usb_caiaqdev *dev, static void fill_out_urb(struct snd_usb_caiaqdev *dev,
struct urb *urb, struct urb *urb,
const struct usb_iso_packet_descriptor *iso) const struct usb_iso_packet_descriptor *iso)
{ {
unsigned char *usb_buf = urb->transfer_buffer + iso->offset; unsigned char *usb_buf = urb->transfer_buffer + iso->offset;
struct snd_pcm_substream *sub; struct snd_pcm_substream *sub;
int stream, i; int stream, i;
for (i = 0; i < iso->length;) { for (i = 0; i < iso->length;) {
for (stream = 0; stream < dev->n_streams; stream++, i++) { for (stream = 0; stream < dev->n_streams; stream++, i++) {
sub = dev->sub_playback[stream]; sub = dev->sub_playback[stream];
...@@ -444,7 +444,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, ...@@ -444,7 +444,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev,
/* fill in the check bytes */ /* fill in the check bytes */
if (dev->spec.data_alignment == 2 && if (dev->spec.data_alignment == 2 &&
i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == i % (dev->n_streams * BYTES_PER_SAMPLE_USB) ==
(dev->n_streams * CHANNELS_PER_STREAM)) (dev->n_streams * CHANNELS_PER_STREAM))
for (stream = 0; stream < dev->n_streams; stream++, i++) for (stream = 0; stream < dev->n_streams; stream++, i++)
usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i); usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i);
...@@ -453,7 +453,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, ...@@ -453,7 +453,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev,
static void read_completed(struct urb *urb) static void read_completed(struct urb *urb)
{ {
struct snd_usb_caiaq_cb_info *info = urb->context; struct snd_usb_caiaq_cb_info *info = urb->context;
struct snd_usb_caiaqdev *dev; struct snd_usb_caiaqdev *dev;
struct urb *out; struct urb *out;
int frame, len, send_it = 0, outframe = 0; int frame, len, send_it = 0, outframe = 0;
...@@ -478,7 +478,7 @@ static void read_completed(struct urb *urb) ...@@ -478,7 +478,7 @@ static void read_completed(struct urb *urb)
out->iso_frame_desc[outframe].length = len; out->iso_frame_desc[outframe].length = len;
out->iso_frame_desc[outframe].actual_length = 0; out->iso_frame_desc[outframe].actual_length = 0;
out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame; out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame;
if (len > 0) { if (len > 0) {
spin_lock(&dev->spinlock); spin_lock(&dev->spinlock);
fill_out_urb(dev, out, &out->iso_frame_desc[outframe]); fill_out_urb(dev, out, &out->iso_frame_desc[outframe]);
...@@ -497,14 +497,14 @@ static void read_completed(struct urb *urb) ...@@ -497,14 +497,14 @@ static void read_completed(struct urb *urb)
out->transfer_flags = URB_ISO_ASAP; out->transfer_flags = URB_ISO_ASAP;
usb_submit_urb(out, GFP_ATOMIC); usb_submit_urb(out, GFP_ATOMIC);
} }
/* re-submit inbound urb */ /* re-submit inbound urb */
for (frame = 0; frame < FRAMES_PER_URB; frame++) { for (frame = 0; frame < FRAMES_PER_URB; frame++) {
urb->iso_frame_desc[frame].offset = BYTES_PER_FRAME * frame; urb->iso_frame_desc[frame].offset = BYTES_PER_FRAME * frame;
urb->iso_frame_desc[frame].length = BYTES_PER_FRAME; urb->iso_frame_desc[frame].length = BYTES_PER_FRAME;
urb->iso_frame_desc[frame].actual_length = 0; urb->iso_frame_desc[frame].actual_length = 0;
} }
urb->number_of_packets = FRAMES_PER_URB; urb->number_of_packets = FRAMES_PER_URB;
urb->transfer_flags = URB_ISO_ASAP; urb->transfer_flags = URB_ISO_ASAP;
usb_submit_urb(urb, GFP_ATOMIC); usb_submit_urb(urb, GFP_ATOMIC);
...@@ -528,7 +528,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret) ...@@ -528,7 +528,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
struct usb_device *usb_dev = dev->chip.dev; struct usb_device *usb_dev = dev->chip.dev;
unsigned int pipe; unsigned int pipe;
pipe = (dir == SNDRV_PCM_STREAM_PLAYBACK) ? pipe = (dir == SNDRV_PCM_STREAM_PLAYBACK) ?
usb_sndisocpipe(usb_dev, ENDPOINT_PLAYBACK) : usb_sndisocpipe(usb_dev, ENDPOINT_PLAYBACK) :
usb_rcvisocpipe(usb_dev, ENDPOINT_CAPTURE); usb_rcvisocpipe(usb_dev, ENDPOINT_CAPTURE);
...@@ -547,25 +547,25 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret) ...@@ -547,25 +547,25 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
return urbs; return urbs;
} }
urbs[i]->transfer_buffer = urbs[i]->transfer_buffer =
kmalloc(FRAMES_PER_URB * BYTES_PER_FRAME, GFP_KERNEL); kmalloc(FRAMES_PER_URB * BYTES_PER_FRAME, GFP_KERNEL);
if (!urbs[i]->transfer_buffer) { if (!urbs[i]->transfer_buffer) {
log("unable to kmalloc() transfer buffer, OOM!?\n"); log("unable to kmalloc() transfer buffer, OOM!?\n");
*ret = -ENOMEM; *ret = -ENOMEM;
return urbs; return urbs;
} }
for (frame = 0; frame < FRAMES_PER_URB; frame++) { for (frame = 0; frame < FRAMES_PER_URB; frame++) {
struct usb_iso_packet_descriptor *iso = struct usb_iso_packet_descriptor *iso =
&urbs[i]->iso_frame_desc[frame]; &urbs[i]->iso_frame_desc[frame];
iso->offset = BYTES_PER_FRAME * frame; iso->offset = BYTES_PER_FRAME * frame;
iso->length = BYTES_PER_FRAME; iso->length = BYTES_PER_FRAME;
} }
urbs[i]->dev = usb_dev; urbs[i]->dev = usb_dev;
urbs[i]->pipe = pipe; urbs[i]->pipe = pipe;
urbs[i]->transfer_buffer_length = FRAMES_PER_URB urbs[i]->transfer_buffer_length = FRAMES_PER_URB
* BYTES_PER_FRAME; * BYTES_PER_FRAME;
urbs[i]->context = &dev->data_cb_info[i]; urbs[i]->context = &dev->data_cb_info[i];
urbs[i]->interval = 1; urbs[i]->interval = 1;
...@@ -589,7 +589,7 @@ static void free_urbs(struct urb **urbs) ...@@ -589,7 +589,7 @@ static void free_urbs(struct urb **urbs)
for (i = 0; i < N_URBS; i++) { for (i = 0; i < N_URBS; i++) {
if (!urbs[i]) if (!urbs[i])
continue; continue;
usb_kill_urb(urbs[i]); usb_kill_urb(urbs[i]);
kfree(urbs[i]->transfer_buffer); kfree(urbs[i]->transfer_buffer);
usb_free_urb(urbs[i]); usb_free_urb(urbs[i]);
...@@ -602,11 +602,11 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -602,11 +602,11 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
{ {
int i, ret; int i, ret;
dev->n_audio_in = max(dev->spec.num_analog_audio_in, dev->n_audio_in = max(dev->spec.num_analog_audio_in,
dev->spec.num_digital_audio_in) / dev->spec.num_digital_audio_in) /
CHANNELS_PER_STREAM; CHANNELS_PER_STREAM;
dev->n_audio_out = max(dev->spec.num_analog_audio_out, dev->n_audio_out = max(dev->spec.num_analog_audio_out,
dev->spec.num_digital_audio_out) / dev->spec.num_digital_audio_out) /
CHANNELS_PER_STREAM; CHANNELS_PER_STREAM;
dev->n_streams = max(dev->n_audio_in, dev->n_audio_out); dev->n_streams = max(dev->n_audio_in, dev->n_audio_out);
...@@ -619,7 +619,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -619,7 +619,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
return -EINVAL; return -EINVAL;
} }
ret = snd_pcm_new(dev->chip.card, dev->product_name, 0, ret = snd_pcm_new(dev->chip.card, dev->product_name, 0,
dev->n_audio_out, dev->n_audio_in, &dev->pcm); dev->n_audio_out, dev->n_audio_in, &dev->pcm);
if (ret < 0) { if (ret < 0) {
...@@ -632,7 +632,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -632,7 +632,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
memset(dev->sub_playback, 0, sizeof(dev->sub_playback)); memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
memset(dev->sub_capture, 0, sizeof(dev->sub_capture)); memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
memcpy(&dev->pcm_info, &snd_usb_caiaq_pcm_hardware, memcpy(&dev->pcm_info, &snd_usb_caiaq_pcm_hardware,
sizeof(snd_usb_caiaq_pcm_hardware)); sizeof(snd_usb_caiaq_pcm_hardware));
...@@ -651,9 +651,9 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -651,9 +651,9 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
break; break;
} }
snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
&snd_usb_caiaq_ops); &snd_usb_caiaq_ops);
snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE,
&snd_usb_caiaq_ops); &snd_usb_caiaq_ops);
snd_pcm_lib_preallocate_pages_for_all(dev->pcm, snd_pcm_lib_preallocate_pages_for_all(dev->pcm,
...@@ -662,7 +662,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -662,7 +662,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
MAX_BUFFER_SIZE, MAX_BUFFER_SIZE); MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
dev->data_cb_info = dev->data_cb_info =
kmalloc(sizeof(struct snd_usb_caiaq_cb_info) * N_URBS, kmalloc(sizeof(struct snd_usb_caiaq_cb_info) * N_URBS,
GFP_KERNEL); GFP_KERNEL);
if (!dev->data_cb_info) if (!dev->data_cb_info)
...@@ -672,14 +672,14 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) ...@@ -672,14 +672,14 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
dev->data_cb_info[i].dev = dev; dev->data_cb_info[i].dev = dev;
dev->data_cb_info[i].index = i; dev->data_cb_info[i].index = i;
} }
dev->data_urbs_in = alloc_urbs(dev, SNDRV_PCM_STREAM_CAPTURE, &ret); dev->data_urbs_in = alloc_urbs(dev, SNDRV_PCM_STREAM_CAPTURE, &ret);
if (ret < 0) { if (ret < 0) {
kfree(dev->data_cb_info); kfree(dev->data_cb_info);
free_urbs(dev->data_urbs_in); free_urbs(dev->data_urbs_in);
return ret; return ret;
} }
dev->data_urbs_out = alloc_urbs(dev, SNDRV_PCM_STREAM_PLAYBACK, &ret); dev->data_urbs_out = alloc_urbs(dev, SNDRV_PCM_STREAM_PLAYBACK, &ret);
if (ret < 0) { if (ret < 0) {
kfree(dev->data_cb_info); kfree(dev->data_cb_info);
......
sound/usb/caiaq/device.c
浏览文件 @ ab2f06cb
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "input.h" #include "input.h"
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.14"); MODULE_DESCRIPTION("caiaq USB audio, version 1.3.15");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"
...@@ -79,7 +79,7 @@ static struct usb_device_id snd_usb_id_table[] = { ...@@ -79,7 +79,7 @@ static struct usb_device_id snd_usb_id_table[] = {
{ {
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
.idVendor = USB_VID_NATIVEINSTRUMENTS, .idVendor = USB_VID_NATIVEINSTRUMENTS,
.idProduct = USB_PID_RIGKONTROL2 .idProduct = USB_PID_RIGKONTROL2
}, },
{ {
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
...@@ -197,7 +197,7 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev, ...@@ -197,7 +197,7 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev,
if (buffer && len > 0) if (buffer && len > 0)
memcpy(dev->ep1_out_buf+1, buffer, len); memcpy(dev->ep1_out_buf+1, buffer, len);
dev->ep1_out_buf[0] = command; dev->ep1_out_buf[0] = command;
return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1), return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1),
dev->ep1_out_buf, len+1, &actual_len, 200); dev->ep1_out_buf, len+1, &actual_len, 200);
...@@ -208,7 +208,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -208,7 +208,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
{ {
int ret; int ret;
char tmp[5]; char tmp[5];
switch (rate) { switch (rate) {
case 44100: tmp[0] = SAMPLERATE_44100; break; case 44100: tmp[0] = SAMPLERATE_44100; break;
case 48000: tmp[0] = SAMPLERATE_48000; break; case 48000: tmp[0] = SAMPLERATE_48000; break;
...@@ -237,12 +237,12 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -237,12 +237,12 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
if (ret) if (ret)
return ret; return ret;
if (!wait_event_timeout(dev->ep1_wait_queue, if (!wait_event_timeout(dev->ep1_wait_queue,
dev->audio_parm_answer >= 0, HZ)) dev->audio_parm_answer >= 0, HZ))
return -EPIPE; return -EPIPE;
if (dev->audio_parm_answer != 1) if (dev->audio_parm_answer != 1)
debug("unable to set the device's audio params\n"); debug("unable to set the device's audio params\n");
else else
dev->bpp = bpp; dev->bpp = bpp;
...@@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
return dev->audio_parm_answer == 1 ? 0 : -EINVAL; return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
} }
int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev, int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
int digital, int analog, int erp) int digital, int analog, int erp)
{ {
char tmp[3] = { digital, analog, erp }; char tmp[3] = { digital, analog, erp };
return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG, return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG,
...@@ -262,7 +262,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -262,7 +262,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
{ {
int ret; int ret;
char val[4]; char val[4];
/* device-specific startup specials */ /* device-specific startup specials */
switch (dev->chip.usb_id) { switch (dev->chip.usb_id) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
...@@ -314,7 +314,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -314,7 +314,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
dev->control_state, 1); dev->control_state, 1);
break; break;
} }
if (dev->spec.num_analog_audio_out + if (dev->spec.num_analog_audio_out +
dev->spec.num_analog_audio_in + dev->spec.num_analog_audio_in +
dev->spec.num_digital_audio_out + dev->spec.num_digital_audio_out +
...@@ -323,7 +323,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -323,7 +323,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
if (ret < 0) if (ret < 0)
log("Unable to set up audio system (ret=%d)\n", ret); log("Unable to set up audio system (ret=%d)\n", ret);
} }
if (dev->spec.num_midi_in + if (dev->spec.num_midi_in +
dev->spec.num_midi_out > 0) { dev->spec.num_midi_out > 0) {
ret = snd_usb_caiaq_midi_init(dev); ret = snd_usb_caiaq_midi_init(dev);
...@@ -363,7 +363,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) ...@@ -363,7 +363,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
if (devnum >= SNDRV_CARDS) if (devnum >= SNDRV_CARDS)
return -ENODEV; return -ENODEV;
err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
sizeof(struct snd_usb_caiaqdev), &card); sizeof(struct snd_usb_caiaqdev), &card);
if (err < 0) if (err < 0)
return err; return err;
...@@ -382,11 +382,11 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) ...@@ -382,11 +382,11 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
static int __devinit init_card(struct snd_usb_caiaqdev *dev) static int __devinit init_card(struct snd_usb_caiaqdev *dev)
{ {
char *c; char *c, usbpath[32];
struct usb_device *usb_dev = dev->chip.dev; struct usb_device *usb_dev = dev->chip.dev;
struct snd_card *card = dev->chip.card; struct snd_card *card = dev->chip.card;
int err, len; int err, len;
if (usb_set_interface(usb_dev, 0, 1) != 0) { if (usb_set_interface(usb_dev, 0, 1) != 0) {
log("can't set alt interface.\n"); log("can't set alt interface.\n");
return -EIO; return -EIO;
...@@ -395,19 +395,19 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -395,19 +395,19 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
usb_init_urb(&dev->ep1_in_urb); usb_init_urb(&dev->ep1_in_urb);
usb_init_urb(&dev->midi_out_urb); usb_init_urb(&dev->midi_out_urb);
usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev, usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev,
usb_rcvbulkpipe(usb_dev, 0x1), usb_rcvbulkpipe(usb_dev, 0x1),
dev->ep1_in_buf, EP1_BUFSIZE, dev->ep1_in_buf, EP1_BUFSIZE,
usb_ep1_command_reply_dispatch, dev); usb_ep1_command_reply_dispatch, dev);
usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev, usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev,
usb_sndbulkpipe(usb_dev, 0x1), usb_sndbulkpipe(usb_dev, 0x1),
dev->midi_out_buf, EP1_BUFSIZE, dev->midi_out_buf, EP1_BUFSIZE,
snd_usb_caiaq_midi_output_done, dev); snd_usb_caiaq_midi_output_done, dev);
init_waitqueue_head(&dev->ep1_wait_queue); init_waitqueue_head(&dev->ep1_wait_queue);
init_waitqueue_head(&dev->prepare_wait_queue); init_waitqueue_head(&dev->prepare_wait_queue);
if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0) if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0)
return -EIO; return -EIO;
...@@ -420,47 +420,51 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -420,47 +420,51 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
usb_string(usb_dev, usb_dev->descriptor.iManufacturer, usb_string(usb_dev, usb_dev->descriptor.iManufacturer,
dev->vendor_name, CAIAQ_USB_STR_LEN); dev->vendor_name, CAIAQ_USB_STR_LEN);
usb_string(usb_dev, usb_dev->descriptor.iProduct, usb_string(usb_dev, usb_dev->descriptor.iProduct,
dev->product_name, CAIAQ_USB_STR_LEN); dev->product_name, CAIAQ_USB_STR_LEN);
usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, strlcpy(card->driver, MODNAME, sizeof(card->driver));
dev->serial, CAIAQ_USB_STR_LEN); strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
/* terminate serial string at first white space occurence */ /* if the id was not passed as module option, fill it with a shortened
c = strchr(dev->serial, ' '); * version of the product string which does not contain any
if (c) * whitespaces */
*c = '\0';
if (*card->id == '\0') {
strcpy(card->driver, MODNAME); char id[sizeof(card->id)];
strcpy(card->shortname, dev->product_name);
memset(id, 0, sizeof(id));
len = snprintf(card->longname, sizeof(card->longname),
"%s %s (serial %s, ", for (c = card->shortname, len = 0;
dev->vendor_name, dev->product_name, dev->serial); *c && len < sizeof(card->id); c++)
if (*c != ' ')
if (len < sizeof(card->longname) - 2) id[len++] = *c;
len += usb_make_path(usb_dev, card->longname + len,
sizeof(card->longname) - len); snd_card_set_id(card, id);
}
card->longname[len++] = ')';
card->longname[len] = '\0'; usb_make_path(usb_dev, usbpath, sizeof(usbpath));
snprintf(card->longname, sizeof(card->longname),
"%s %s (%s)",
dev->vendor_name, dev->product_name, usbpath);
setup_card(dev); setup_card(dev);
return 0; return 0;
} }
static int __devinit snd_probe(struct usb_interface *intf, static int __devinit snd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
int ret; int ret;
struct snd_card *card; struct snd_card *card;
struct usb_device *device = interface_to_usbdev(intf); struct usb_device *device = interface_to_usbdev(intf);
ret = create_card(device, &card); ret = create_card(device, &card);
if (ret < 0) if (ret < 0)
return ret; return ret;
usb_set_intfdata(intf, card); usb_set_intfdata(intf, card);
ret = init_card(caiaqdev(card)); ret = init_card(caiaqdev(card));
if (ret < 0) { if (ret < 0) {
...@@ -468,7 +472,7 @@ static int __devinit snd_probe(struct usb_interface *intf, ...@@ -468,7 +472,7 @@ static int __devinit snd_probe(struct usb_interface *intf,
snd_card_free(card); snd_card_free(card);
return ret; return ret;
} }
return 0; return 0;
} }
...@@ -489,10 +493,10 @@ static void snd_disconnect(struct usb_interface *intf) ...@@ -489,10 +493,10 @@ static void snd_disconnect(struct usb_interface *intf)
snd_usb_caiaq_input_free(dev); snd_usb_caiaq_input_free(dev);
#endif #endif
snd_usb_caiaq_audio_free(dev); snd_usb_caiaq_audio_free(dev);
usb_kill_urb(&dev->ep1_in_urb); usb_kill_urb(&dev->ep1_in_urb);
usb_kill_urb(&dev->midi_out_urb); usb_kill_urb(&dev->midi_out_urb);
snd_card_free(card); snd_card_free(card);
usb_reset_device(interface_to_usbdev(intf)); usb_reset_device(interface_to_usbdev(intf));
} }
......
sound/usb/caiaq/device.h
浏览文件 @ ab2f06cb
...@@ -81,7 +81,6 @@ struct snd_usb_caiaqdev { ...@@ -81,7 +81,6 @@ struct snd_usb_caiaqdev {
char vendor_name[CAIAQ_USB_STR_LEN]; char vendor_name[CAIAQ_USB_STR_LEN];
char product_name[CAIAQ_USB_STR_LEN]; char product_name[CAIAQ_USB_STR_LEN];
char serial[CAIAQ_USB_STR_LEN];
int n_streams, n_audio_in, n_audio_out; int n_streams, n_audio_in, n_audio_out;
int streaming, first_packet, output_running; int streaming, first_packet, output_running;
......
sound/usb/caiaq/midi.c
浏览文件 @ ab2f06cb
...@@ -40,7 +40,7 @@ static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *subst ...@@ -40,7 +40,7 @@ static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *subst
if (!dev) if (!dev)
return; return;
dev->midi_receive_substream = up ? substream : NULL; dev->midi_receive_substream = up ? substream : NULL;
} }
...@@ -64,18 +64,18 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -64,18 +64,18 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
struct snd_rawmidi_substream *substream) struct snd_rawmidi_substream *substream)
{ {
int len, ret; int len, ret;
dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE; dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE;
dev->midi_out_buf[1] = 0; /* port */ dev->midi_out_buf[1] = 0; /* port */
len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3, len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3,
EP1_BUFSIZE - 3); EP1_BUFSIZE - 3);
if (len <= 0) if (len <= 0)
return; return;
dev->midi_out_buf[2] = len; dev->midi_out_buf[2] = len;
dev->midi_out_urb.transfer_buffer_length = len+3; dev->midi_out_urb.transfer_buffer_length = len+3;
ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC); ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC);
if (ret < 0) if (ret < 0)
log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed," log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed,"
...@@ -88,7 +88,7 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -88,7 +88,7 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
struct snd_usb_caiaqdev *dev = substream->rmidi->private_data; struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
if (up) { if (up) {
dev->midi_out_substream = substream; dev->midi_out_substream = substream;
if (!dev->midi_out_active) if (!dev->midi_out_active)
...@@ -113,12 +113,12 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input = ...@@ -113,12 +113,12 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input =
.trigger = snd_usb_caiaq_midi_input_trigger, .trigger = snd_usb_caiaq_midi_input_trigger,
}; };
void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev, void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev,
int port, const char *buf, int len) int port, const char *buf, int len)
{ {
if (!dev->midi_receive_substream) if (!dev->midi_receive_substream)
return; return;
snd_rawmidi_receive(dev->midi_receive_substream, buf, len); snd_rawmidi_receive(dev->midi_receive_substream, buf, len);
} }
...@@ -142,16 +142,16 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) ...@@ -142,16 +142,16 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
if (device->spec.num_midi_out > 0) { if (device->spec.num_midi_out > 0) {
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
&snd_usb_caiaq_midi_output); &snd_usb_caiaq_midi_output);
} }
if (device->spec.num_midi_in > 0) { if (device->spec.num_midi_in > 0) {
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
&snd_usb_caiaq_midi_input); &snd_usb_caiaq_midi_input);
} }
device->rmidi = rmidi; device->rmidi = rmidi;
return 0; return 0;
...@@ -160,7 +160,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) ...@@ -160,7 +160,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
void snd_usb_caiaq_midi_output_done(struct urb* urb) void snd_usb_caiaq_midi_output_done(struct urb* urb)
{ {
struct snd_usb_caiaqdev *dev = urb->context; struct snd_usb_caiaqdev *dev = urb->context;
dev->midi_out_active = 0; dev->midi_out_active = 0;
if (urb->status != 0) if (urb->status != 0)
return; return;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或