Skip to content

Commit

Permalink
ALSA: snd-usb-caiaq: rename 'dev' to 'cdev'
Browse files Browse the repository at this point in the history 
This is needed in order to make the device namespace cleaner, and will
help when moving this driver over to dev_*() logging.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Mar 4, 2013
1 parent 6dbe51c commit 1c8470c
Show file tree
Hide file tree
Showing 10 changed files with 543 additions and 542 deletions.
410 changes: 205 additions & 205 deletions sound/usb/caiaq/audio.c
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sound/usb/caiaq/audio.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef CAIAQ_AUDIO_H
#define CAIAQ_AUDIO_H

int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev);
void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *dev);
int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev);
void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *cdev);

#endif /* CAIAQ_AUDIO_H */
66 changes: 33 additions & 33 deletions sound/usb/caiaq/control.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ static int control_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
int pos = kcontrol->private_value;
int is_intval = pos & CNT_INTVAL;
int maxval = 63;

uinfo->count = 1;
pos &= ~CNT_INTVAL;

switch (dev->chip.usb_id) {
switch (cdev->chip.usb_id) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
if (pos == 0) {
Expand Down Expand Up @@ -78,15 +78,15 @@ static int control_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
int pos = kcontrol->private_value;

if (pos & CNT_INTVAL)
ucontrol->value.integer.value[0]
= dev->control_state[pos & ~CNT_INTVAL];
= cdev->control_state[pos & ~CNT_INTVAL];
else
ucontrol->value.integer.value[0]
= !!(dev->control_state[pos / 8] & (1 << pos % 8));
= !!(cdev->control_state[pos / 8] & (1 << pos % 8));

return 0;
}
Expand All @@ -95,43 +95,43 @@ static int control_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
int pos = kcontrol->private_value;
int v = ucontrol->value.integer.value[0];
unsigned char cmd = EP1_CMD_WRITE_IO;

if (dev->chip.usb_id ==
if (cdev->chip.usb_id ==
USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1))
cmd = EP1_CMD_DIMM_LEDS;

if (pos & CNT_INTVAL) {
int i = pos & ~CNT_INTVAL;

dev->control_state[i] = v;
cdev->control_state[i] = v;

if (dev->chip.usb_id ==
if (cdev->chip.usb_id ==
USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4)) {
int actual_len;

dev->ep8_out_buf[0] = i;
dev->ep8_out_buf[1] = v;
cdev->ep8_out_buf[0] = i;
cdev->ep8_out_buf[1] = v;

usb_bulk_msg(dev->chip.dev,
usb_sndbulkpipe(dev->chip.dev, 8),
dev->ep8_out_buf, sizeof(dev->ep8_out_buf),
usb_bulk_msg(cdev->chip.dev,
usb_sndbulkpipe(cdev->chip.dev, 8),
cdev->ep8_out_buf, sizeof(cdev->ep8_out_buf),
&actual_len, 200);
} else {
snd_usb_caiaq_send_command(dev, cmd,
dev->control_state, sizeof(dev->control_state));
snd_usb_caiaq_send_command(cdev, cmd,
cdev->control_state, sizeof(cdev->control_state));
}
} else {
if (v)
dev->control_state[pos / 8] |= 1 << (pos % 8);
cdev->control_state[pos / 8] |= 1 << (pos % 8);
else
dev->control_state[pos / 8] &= ~(1 << (pos % 8));
cdev->control_state[pos / 8] &= ~(1 << (pos % 8));

snd_usb_caiaq_send_command(dev, cmd,
dev->control_state, sizeof(dev->control_state));
snd_usb_caiaq_send_command(cdev, cmd,
cdev->control_state, sizeof(cdev->control_state));
}

return 1;
Expand Down Expand Up @@ -490,67 +490,67 @@ static struct caiaq_controller kontrols4_controller[] = {
};

static int add_controls(struct caiaq_controller *c, int num,
struct snd_usb_caiaqdev *dev)
struct snd_usb_caiaqdev *cdev)
{
int i, ret;
struct snd_kcontrol *kc;

for (i = 0; i < num; i++, c++) {
kcontrol_template.name = c->name;
kcontrol_template.private_value = c->index;
kc = snd_ctl_new1(&kcontrol_template, dev);
ret = snd_ctl_add(dev->chip.card, kc);
kc = snd_ctl_new1(&kcontrol_template, cdev);
ret = snd_ctl_add(cdev->chip.card, kc);
if (ret < 0)
return ret;
}

return 0;
}

int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *cdev)
{
int ret = 0;

switch (dev->chip.usb_id) {
switch (cdev->chip.usb_id) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
ret = add_controls(ak1_controller,
ARRAY_SIZE(ak1_controller), dev);
ARRAY_SIZE(ak1_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
ret = add_controls(rk2_controller,
ARRAY_SIZE(rk2_controller), dev);
ARRAY_SIZE(rk2_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
ret = add_controls(rk3_controller,
ARRAY_SIZE(rk3_controller), dev);
ARRAY_SIZE(rk3_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
ret = add_controls(kore_controller,
ARRAY_SIZE(kore_controller), dev);
ARRAY_SIZE(kore_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
ret = add_controls(a8dj_controller,
ARRAY_SIZE(a8dj_controller), dev);
ARRAY_SIZE(a8dj_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
ret = add_controls(a4dj_controller,
ARRAY_SIZE(a4dj_controller), dev);
ARRAY_SIZE(a4dj_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
ret = add_controls(kontrolx1_controller,
ARRAY_SIZE(kontrolx1_controller), dev);
ARRAY_SIZE(kontrolx1_controller), cdev);
break;

case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
ret = add_controls(kontrols4_controller,
ARRAY_SIZE(kontrols4_controller), dev);
ARRAY_SIZE(kontrols4_controller), cdev);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion sound/usb/caiaq/control.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef CAIAQ_CONTROL_H
#define CAIAQ_CONTROL_H

int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev);
int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *cdev);

#endif /* CAIAQ_CONTROL_H */
Loading

0 comments on commit 1c8470c

Please sign in to comment.