Skip to content

Commit

Permalink
ALSA: usx2y: Avoid camelCase
Browse files Browse the repository at this point in the history 
[ Upstream commit bae3ce4 ]

For improving readability, convert camelCase fields, variables and
functions to the plain names with underscore.  Also align the macros
to be capital letters.

All done via sed, no functional changes.

Note that you'll still see many coding style issues even after this
patch; the fixes will follow.

Link: https://lore.kernel.org/r/20210517131545.27252-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
@tiwai @gregkh
tiwai authored and gregkh committed Jul 20, 2021
1 parent c31e22b commit 6c9a4c6
Show file tree
Hide file tree
Showing 8 changed files with 649 additions and 649 deletions.
56 changes: 28 additions & 28 deletions sound/usb/usx2y/usX2Yhwdep.c
View file
Expand Up @@ -29,7 +29,7 @@ static vm_fault_t snd_us428ctls_vm_fault(struct vm_fault *vmf)
vmf->pgoff);

offset = vmf->pgoff << PAGE_SHIFT;
vaddr = (char *)((struct usX2Ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset;
vaddr = (char *)((struct usx2ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset;
page = virt_to_page(vaddr);
get_page(page);
vmf->page = page;
Expand All @@ -47,7 +47,7 @@ static const struct vm_operations_struct us428ctls_vm_ops = {
static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct vm_area_struct *area)
{
unsigned long size = (unsigned long)(area->vm_end - area->vm_start);
struct usX2Ydev *us428 = hw->private_data;
struct usx2ydev *us428 = hw->private_data;

// FIXME this hwdep interface is used twice: fpga download and mmap for controlling Lights etc. Maybe better using 2 hwdep devs?
// so as long as the device isn't fully initialised yet we return -EBUSY here.
Expand All @@ -66,7 +66,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
if (!us428->us428ctls_sharedmem)
return -ENOMEM;
memset(us428->us428ctls_sharedmem, -1, sizeof(struct us428ctls_sharedmem));
us428->us428ctls_sharedmem->CtlSnapShotLast = -2;
us428->us428ctls_sharedmem->ctl_snapshot_last = -2;
}
area->vm_ops = &us428ctls_vm_ops;
area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
Expand All @@ -77,29 +77,29 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
static __poll_t snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll_table *wait)
{
__poll_t mask = 0;
struct usX2Ydev *us428 = hw->private_data;
struct usx2ydev *us428 = hw->private_data;
struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;
if (us428->chip_status & USX2Y_STAT_CHIP_HUP)
return EPOLLHUP;

poll_wait(file, &us428->us428ctls_wait_queue_head, wait);

if (shm != NULL && shm->CtlSnapShotLast != shm->CtlSnapShotRed)
if (shm != NULL && shm->ctl_snapshot_last != shm->ctl_snapshot_red)
mask |= EPOLLIN;

return mask;
}


static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
static int snd_usx2y_hwdep_dsp_status(struct snd_hwdep *hw,
struct snd_hwdep_dsp_status *info)
{
static const char * const type_ids[USX2Y_TYPE_NUMS] = {
[USX2Y_TYPE_122] = "us122",
[USX2Y_TYPE_224] = "us224",
[USX2Y_TYPE_428] = "us428",
};
struct usX2Ydev *us428 = hw->private_data;
struct usx2ydev *us428 = hw->private_data;
int id = -1;

switch (le16_to_cpu(us428->dev->descriptor.idProduct)) {
Expand All @@ -124,7 +124,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
}


static int usX2Y_create_usbmidi(struct snd_card *card)
static int usx2y_create_usbmidi(struct snd_card *card)
{
static const struct snd_usb_midi_endpoint_info quirk_data_1 = {
.out_ep = 0x06,
Expand Down Expand Up @@ -152,28 +152,28 @@ static int usX2Y_create_usbmidi(struct snd_card *card)
.type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = &quirk_data_2
};
struct usb_device *dev = usX2Y(card)->dev;
struct usb_device *dev = usx2y(card)->dev;
struct usb_interface *iface = usb_ifnum_to_if(dev, 0);
const struct snd_usb_audio_quirk *quirk =
le16_to_cpu(dev->descriptor.idProduct) == USB_ID_US428 ?
&quirk_2 : &quirk_1;

snd_printdd("usX2Y_create_usbmidi \n");
return snd_usbmidi_create(card, iface, &usX2Y(card)->midi_list, quirk);
snd_printdd("usx2y_create_usbmidi \n");
return snd_usbmidi_create(card, iface, &usx2y(card)->midi_list, quirk);
}

static int usX2Y_create_alsa_devices(struct snd_card *card)
static int usx2y_create_alsa_devices(struct snd_card *card)
{
int err;

do {
if ((err = usX2Y_create_usbmidi(card)) < 0) {
snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
if ((err = usx2y_create_usbmidi(card)) < 0) {
snd_printk(KERN_ERR "usx2y_create_alsa_devices: usx2y_create_usbmidi error %i \n", err);
break;
}
if ((err = usX2Y_audio_create(card)) < 0)
if ((err = usx2y_audio_create(card)) < 0)
break;
if ((err = usX2Y_hwdep_pcm_new(card)) < 0)
if ((err = usx2y_hwdep_pcm_new(card)) < 0)
break;
if ((err = snd_card_register(card)) < 0)
break;
Expand All @@ -182,10 +182,10 @@ static int usX2Y_create_alsa_devices(struct snd_card *card)
return err;
}

static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
static int snd_usx2y_hwdep_dsp_load(struct snd_hwdep *hw,
struct snd_hwdep_dsp_image *dsp)
{
struct usX2Ydev *priv = hw->private_data;
struct usx2ydev *priv = hw->private_data;
struct usb_device* dev = priv->dev;
int lret, err;
char *buf;
Expand All @@ -206,19 +206,19 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
return err;
if (dsp->index == 1) {
msleep(250); // give the device some time
err = usX2Y_AsyncSeq04_init(priv);
err = usx2y_async_seq04_init(priv);
if (err) {
snd_printk(KERN_ERR "usX2Y_AsyncSeq04_init error \n");
snd_printk(KERN_ERR "usx2y_async_seq04_init error \n");
return err;
}
err = usX2Y_In04_init(priv);
err = usx2y_in04_init(priv);
if (err) {
snd_printk(KERN_ERR "usX2Y_In04_init error \n");
snd_printk(KERN_ERR "usx2y_in04_init error \n");
return err;
}
err = usX2Y_create_alsa_devices(hw->card);
err = usx2y_create_alsa_devices(hw->card);
if (err) {
snd_printk(KERN_ERR "usX2Y_create_alsa_devices error %i \n", err);
snd_printk(KERN_ERR "usx2y_create_alsa_devices error %i \n", err);
snd_card_free(hw->card);
return err;
}
Expand All @@ -229,7 +229,7 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
}


int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
int usx2y_hwdep_new(struct snd_card *card, struct usb_device* device)
{
int err;
struct snd_hwdep *hw;
Expand All @@ -238,9 +238,9 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
return err;

hw->iface = SNDRV_HWDEP_IFACE_USX2Y;
hw->private_data = usX2Y(card);
hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status;
hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load;
hw->private_data = usx2y(card);
hw->ops.dsp_status = snd_usx2y_hwdep_dsp_status;
hw->ops.dsp_load = snd_usx2y_hwdep_dsp_load;
hw->ops.mmap = snd_us428ctls_mmap;
hw->ops.poll = snd_us428ctls_poll;
hw->exclusive = 1;
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/usx2y/usX2Yhwdep.h
View file
Expand Up @@ -2,6 +2,6 @@
#ifndef USX2YHWDEP_H
#define USX2YHWDEP_H

int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device);
int usx2y_hwdep_new(struct snd_card *card, struct usb_device* device);

#endif
102 changes: 51 additions & 51 deletions sound/usb/usx2y/usbus428ctldefs.h
View file
Expand Up @@ -4,28 +4,28 @@
* Copyright (c) 2003 by Karsten Wiese <annabellesgarden@yahoo.de>
*/

enum E_In84{
eFader0 = 0,
eFader1,
eFader2,
eFader3,
eFader4,
eFader5,
eFader6,
eFader7,
eFaderM,
eTransport,
eModifier = 10,
eFilterSelect,
eSelect,
eMute,
enum E_IN84 {
E_FADER_0 = 0,
E_FADER_1,
E_FADER_2,
E_FADER_3,
E_FADER_4,
E_FADER_5,
E_FADER_6,
E_FADER_7,
E_FADER_M,
E_TRANSPORT,
E_MODIFIER = 10,
E_FILTER_SELECT,
E_SELECT,
E_MUTE,

eSwitch = 15,
eWheelGain,
eWheelFreq,
eWheelQ,
eWheelPan,
eWheel = 20
E_SWITCH = 15,
E_WHEEL_GAIN,
E_WHEEL_FREQ,
E_WHEEL_Q,
E_WHEEL_PAN,
E_WHEEL = 20
};

#define T_RECORD 1
Expand All @@ -39,53 +39,53 @@ enum E_In84{


struct us428_ctls {
unsigned char Fader[9];
unsigned char Transport;
unsigned char Modifier;
unsigned char FilterSelect;
unsigned char Select;
unsigned char Mute;
unsigned char UNKNOWN;
unsigned char Switch;
unsigned char Wheel[5];
unsigned char fader[9];
unsigned char transport;
unsigned char modifier;
unsigned char filters_elect;
unsigned char select;
unsigned char mute;
unsigned char unknown;
unsigned char wswitch;
unsigned char wheel[5];
};

struct us428_setByte {
unsigned char Offset,
Value;
struct us428_set_byte {
unsigned char offset,
value;
};

enum {
eLT_Volume = 0,
eLT_Light
ELT_VOLUME = 0,
ELT_LIGHT
};

struct usX2Y_volume {
unsigned char Channel,
LH,
LL,
RH,
RL;
struct usx2y_volume {
unsigned char channel,
lh,
ll,
rh,
rl;
};

struct us428_lights {
struct us428_setByte Light[7];
struct us428_set_byte light[7];
};

struct us428_p4out {
char type;
union {
struct usX2Y_volume vol;
struct usx2y_volume vol;
struct us428_lights lights;
} val;
};

#define N_us428_ctl_BUFS 16
#define N_us428_p4out_BUFS 16
struct us428ctls_sharedmem{
struct us428_ctls CtlSnapShot[N_us428_ctl_BUFS];
int CtlSnapShotDiffersAt[N_us428_ctl_BUFS];
int CtlSnapShotLast, CtlSnapShotRed;
struct us428_p4out p4out[N_us428_p4out_BUFS];
int p4outLast, p4outSent;
#define N_US428_CTL_BUFS 16
#define N_US428_P4OUT_BUFS 16
struct us428ctls_sharedmem {
struct us428_ctls ctl_snapshot[N_US428_CTL_BUFS];
int ctl_snapshot_differs_at[N_US428_CTL_BUFS];
int ctl_snapshot_last, ctl_snapshot_red;
struct us428_p4out p4out[N_US428_P4OUT_BUFS];
int p4out_last, p4out_sent;
};

0 comments on commit 6c9a4c6

Please sign in to comment.