staging: line6 cleanups
cover staging: line6 cleanups
The following patches fix formatting and checkpatch errors/warnings for some of the files in the line6 driver.
Shawn Bohrer (13):
staging: line6: Lindent and fix checkpatch warnings in playback.c
staging: line6: Fix checkpatch errors in playback.c
staging: line6: Lindent and fix checkpatch warnings in capture.c
staging: line6: Fix checkpatch errors in capture.c
staging: line6: Lindent control.c
staging: line6: Fix some checkpatch warnings in control.c
staging: line6: Convert simple_strtoul() to strict_strtoul in
control.c
staging: line6: Fix checkpatch warnings in pcm.c
staging: line6: Lindent and fix some checkpatch warnings in
toneport.c
staging: line6: Convert simple_strtol to strict_strtol in toneport.c
staging: line6: Convert simple_strtoul to strict_strtoul in variax.c
staging: line6: Convert simple_strtoul to strict_strtoul in pod.c
staging: line6: Convert simple_strtoul to strict_strtoul in midi.c
drivers/staging/line6/capture.c | 98 +++++--- drivers/staging/line6/control.c | 493 +++++++++++++++++++++++++------------- drivers/staging/line6/midi.c | 16 +- drivers/staging/line6/pcm.c | 3 +- drivers/staging/line6/playback.c | 101 +++++--- drivers/staging/line6/pod.c | 56 ++++- drivers/staging/line6/toneport.c | 119 +++++---- drivers/staging/line6/variax.c | 31 ++- 8 files changed, 611 insertions(+), 306 deletions(-)
PATCH 1/13 staging: line6: Lindent and fix checkpatch warnings in playback.c
--- drivers/staging/line6/playback.c | 95 ++++++++++++++++++++++++------------- 1 files changed, 61 insertions(+), 34 deletions(-)
drivers/staging/line6/playback.c +61 -34
@@ -20,7 +20,6 @@#include "pod.h" #include "playback.h" -/* Software stereo volume control. */
@@ -30,7 +29,7 @@ static void change_volume(struct urb *urb_out, int volume[],int chn =0 ;if (volume[0 ] ==256 && volume[1 ] ==256 ) -return ;/* maximum volume - no change */ +return ;/* maximum volume - no change */ if (bytes_per_frame ==4 ) {short *p, *buf_end;
@@ -68,13 +67,17 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream)int i, urb_size, urb_frames;struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream);const int bytes_per_frame = line6pcm->properties->bytes_per_frame; -const int frame_increment = line6pcm->properties->snd_line6_rates.rats[0 ].num_min; -const int frame_factor = line6pcm->properties->snd_line6_rates.rats[0 ].den * (USB_INTERVALS_PER_SECOND /LINE6_ISO_INTERVAL ); +const int frame_increment = + line6pcm->properties->snd_line6_rates.rats[0 ].num_min; +const int frame_factor = + line6pcm->properties->snd_line6_rates.rats[0 ].den * + (USB_INTERVALS_PER_SECOND /LINE6_ISO_INTERVAL );struct snd_pcm_runtime *runtime = substream->runtime;struct urb *urb_out;spin_lock_irqsave (&line6pcm->lock_audio_out, flags); - index =find_first_zero_bit (&line6pcm->active_urb_out,LINE6_ISO_BUFFERS ); + index = +find_first_zero_bit (&line6pcm->active_urb_out,LINE6_ISO_BUFFERS );if (index <0 || index >=LINE6_ISO_BUFFERS ) {spin_unlock_irqrestore (&line6pcm->lock_audio_out, flags);
@@ -88,7 +91,8 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream)for (i =0 ; i <LINE6_ISO_PACKETS ; ++i) {/* compute frame size for given sampling rate */ int n, fs; -struct usb_iso_packet_descriptor *fout = &urb_out->iso_frame_desc[i]; +struct usb_iso_packet_descriptor *fout = + &urb_out->iso_frame_desc[i]; line6pcm->count_out += frame_increment; n = line6pcm->count_out / frame_factor; line6pcm->count_out -= n * frame_factor;
@@ -106,21 +110,31 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream) }else {if (line6pcm->pos_out + urb_frames > runtime->buffer_size) {/* -The transferred area goes over buffer boundary, -copy the data to the temp buffer. -*/ +The transferred area goes over buffer boundary, +copy the data to the temp buffer. +*/ int len; len = runtime->buffer_size - line6pcm->pos_out; urb_out->transfer_buffer = line6pcm->wrap_out;if (len >0 ) { -memcpy (line6pcm->wrap_out, runtime->dma_area + line6pcm->pos_out * bytes_per_frame, len * bytes_per_frame); -memcpy (line6pcm->wrap_out + len * bytes_per_frame, runtime->dma_area, (urb_frames - len) * bytes_per_frame); - }else -dev_err (s2m (substream),"driver bug: len = %d\n" , len);/* this is somewhat paranoid */ +memcpy (line6pcm->wrap_out, + runtime->dma_area + + line6pcm->pos_out * bytes_per_frame, + len * bytes_per_frame); +memcpy (line6pcm->wrap_out + + len * bytes_per_frame, runtime->dma_area, + (urb_frames - len) * bytes_per_frame); + }else { +/* this is somewhat paranoid */ +dev_err (s2m (substream), +"driver bug: len = %d\n" , len); + } }else {/* set the buffer pointer */ - urb_out->transfer_buffer = runtime->dma_area + line6pcm->pos_out * bytes_per_frame; + urb_out->transfer_buffer = + runtime->dma_area + + line6pcm->pos_out * bytes_per_frame; } }
@@ -133,15 +147,19 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream)#if DO_DUMP_PCM_SEND for (i =0 ; i <LINE6_ISO_PACKETS ; ++i) { -struct usb_iso_packet_descriptor *fout = &urb_out->iso_frame_desc[i]; -line6_write_hexdump (line6pcm->line6,'P' , urb_out->transfer_buffer + fout->offset, fout->length); +struct usb_iso_packet_descriptor *fout = + &urb_out->iso_frame_desc[i]; +line6_write_hexdump (line6pcm->line6,'P' , + urb_out->transfer_buffer + fout->offset, + fout->length); }#endif if (usb_submit_urb (urb_out,GFP_ATOMIC ) ==0 )set_bit (index, &line6pcm->active_urb_out);else -dev_err (s2m (substream),"URB out #%d submission failed\n" , index); +dev_err (s2m (substream),"URB out #%d submission failed\n" , + index);spin_unlock_irqrestore (&line6pcm->lock_audio_out, flags);return 0 ;
@@ -181,7 +199,7 @@ static void unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm) }/* -Wait until unlinking of all currently active playback URBs has been finished. +Wait until unlinking of all currently active playback URBs has been finished. */ static void wait_clear_audio_out_urbs (struct snd_line6_pcm *line6pcm) {
@@ -224,7 +242,8 @@ static void audio_out_callback(struct urb *urb)int i, index, length =0 , shutdown =0 ;unsigned long flags; -struct snd_pcm_substream *substream = (struct snd_pcm_substream *)urb->context; +struct snd_pcm_substream *substream = + (struct snd_pcm_substream *)urb->context;struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream);struct snd_pcm_runtime *runtime = substream->runtime;
@@ -234,13 +253,14 @@ static void audio_out_callback(struct urb *urb)break ;if (index <0 ) -return ;/* URB has been unlinked asynchronously */ +return ;/* URB has been unlinked asynchronously */ for (i =LINE6_ISO_PACKETS ; i--;) length += urb->iso_frame_desc[i].length;spin_lock_irqsave (&line6pcm->lock_audio_out, flags); - line6pcm->pos_out_done += length / line6pcm->properties->bytes_per_frame; + line6pcm->pos_out_done += + length / line6pcm->properties->bytes_per_frame;if (line6pcm->pos_out_done >= runtime->buffer_size) line6pcm->pos_out_done -= runtime->buffer_size;
@@ -276,7 +296,8 @@ static int snd_line6_playback_open(struct snd_pcm_substream *substream)struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); err =snd_pcm_hw_constraint_ratdens (runtime,0 ,SNDRV_PCM_HW_PARAM_RATE , - (&line6pcm->properties->snd_line6_rates)); + (&line6pcm->properties-> + snd_line6_rates));if (err <0 )return err;
@@ -291,7 +312,8 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream) }/* hw_params playback callback */ -static int snd_line6_playback_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *hw_params) +static int snd_line6_playback_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *hw_params) {int ret;struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream);
@@ -349,7 +371,8 @@ int snd_line6_playback_trigger(struct snd_pcm_substream *substream, int cmd) err =submit_audio_out_all_urbs (substream);if (err <0 ) { -clear_bit (BIT_RUNNING_PLAYBACK , &line6pcm->flags); +clear_bit (BIT_RUNNING_PLAYBACK , + &line6pcm->flags);return err; } }
@@ -387,14 +410,14 @@ snd_line6_playback_pointer(struct snd_pcm_substream *substream)/* playback operators */ struct snd_pcm_ops snd_line6_playback_ops = { - .open = snd_line6_playback_open, - .close = snd_line6_playback_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_line6_playback_hw_params, - .hw_free = snd_line6_playback_hw_free, - .prepare = snd_line6_prepare, - .trigger = snd_line6_trigger, - .pointer = snd_line6_playback_pointer, + .open = snd_line6_playback_open, + .close = snd_line6_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_line6_playback_hw_params, + .hw_free = snd_line6_playback_hw_free, + .prepare = snd_line6_prepare, + .trigger = snd_line6_trigger, + .pointer = snd_line6_playback_pointer, };int create_audio_out_urbs (struct snd_line6_pcm *line6pcm)
@@ -406,7 +429,8 @@ int create_audio_out_urbs(struct snd_line6_pcm *line6pcm)struct urb *urb;/* URB for audio out: */ - urb = line6pcm->urb_audio_out[i] =usb_alloc_urb (LINE6_ISO_PACKETS ,GFP_KERNEL ); + urb = line6pcm->urb_audio_out[i] = +usb_alloc_urb (LINE6_ISO_PACKETS ,GFP_KERNEL );if (urb ==NULL ) {dev_err (line6pcm->line6->ifcdev,"Out of memory\n" );
@@ -414,7 +438,10 @@ int create_audio_out_urbs(struct snd_line6_pcm *line6pcm) } urb->dev = line6pcm->line6->usbdev; - urb->pipe =usb_sndisocpipe (line6pcm->line6->usbdev, line6pcm->ep_audio_write &USB_ENDPOINT_NUMBER_MASK ); + urb->pipe = +usb_sndisocpipe (line6pcm->line6->usbdev, + line6pcm-> + ep_audio_write &USB_ENDPOINT_NUMBER_MASK ); urb->transfer_flags =URB_ISO_ASAP ; urb->start_frame =-1 ; urb->number_of_packets =LINE6_ISO_PACKETS ;
Signature · 1 line
1.6.5
PATCH 2/13 staging: line6: Fix checkpatch errors in playback.c
In reply to Shawn Bohrer--- drivers/staging/line6/playback.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/line6/playback.c +4 -2
@@ -138,7 +138,8 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream) } } -if ((line6pcm->pos_out += urb_frames) >= runtime->buffer_size) + line6pcm->pos_out += urb_frames; +if (line6pcm->pos_out >= runtime->buffer_size) line6pcm->pos_out -= runtime->buffer_size; urb_out->transfer_buffer_length = urb_size;
@@ -281,7 +282,8 @@ static void audio_out_callback(struct urb *urb)if (!shutdown) {submit_audio_out_urb (substream); -if ((line6pcm->bytes_out += length) >= line6pcm->period_out) { + line6pcm->bytes_out += length; +if (line6pcm->bytes_out >= line6pcm->period_out) { line6pcm->bytes_out -= line6pcm->period_out;snd_pcm_period_elapsed (substream); }
Signature · 1 line
1.6.5
PATCH 3/13 staging: line6: Lindent and fix checkpatch warnings in capture.c
In reply to Shawn Bohrer--- drivers/staging/line6/capture.c | 95 ++++++++++++++++++++++++++------------- 1 files changed, 63 insertions(+), 32 deletions(-)
drivers/staging/line6/capture.c +63 -32
@@ -20,7 +20,6 @@#include "pod.h" #include "capture.h" -/* Find a free URB and submit it. */
@@ -33,7 +32,8 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream)struct urb *urb_in;spin_lock_irqsave (&line6pcm->lock_audio_in, flags); - index =find_first_zero_bit (&line6pcm->active_urb_in,LINE6_ISO_BUFFERS ); + index = +find_first_zero_bit (&line6pcm->active_urb_in,LINE6_ISO_BUFFERS );if (index >=LINE6_ISO_BUFFERS ) {spin_unlock_irqrestore (&line6pcm->lock_audio_in, flags);
@@ -45,20 +45,24 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream) urb_size =0 ;for (i =0 ; i <LINE6_ISO_PACKETS ; ++i) { -struct usb_iso_packet_descriptor *fin = &urb_in->iso_frame_desc[i]; +struct usb_iso_packet_descriptor *fin = + &urb_in->iso_frame_desc[i]; fin->offset = urb_size; fin->length = line6pcm->max_packet_size; urb_size += line6pcm->max_packet_size; } - urb_in->transfer_buffer = line6pcm->buffer_in + index *LINE6_ISO_PACKETS * line6pcm->max_packet_size; + urb_in->transfer_buffer = + line6pcm->buffer_in + + index *LINE6_ISO_PACKETS * line6pcm->max_packet_size; urb_in->transfer_buffer_length = urb_size; urb_in->context = substream;if (usb_submit_urb (urb_in,GFP_ATOMIC ) ==0 )set_bit (index, &line6pcm->active_urb_in);else -dev_err (s2m (substream),"URB in #%d submission failed\n" , index); +dev_err (s2m (substream),"URB in #%d submission failed\n" , + index);spin_unlock_irqrestore (&line6pcm->lock_audio_in, flags);return 0 ;
@@ -143,7 +147,8 @@ static void audio_in_callback(struct urb *urb)int frames;unsigned long flags; -struct snd_pcm_substream *substream = (struct snd_pcm_substream *)urb->context; +struct snd_pcm_substream *substream = + (struct snd_pcm_substream *)urb->context;struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream);const int bytes_per_frame = line6pcm->properties->bytes_per_frame;struct snd_pcm_runtime *runtime = substream->runtime;
@@ -155,8 +160,11 @@ static void audio_in_callback(struct urb *urb)#if DO_DUMP_PCM_RECEIVE for (i =0 ; i <LINE6_ISO_PACKETS ; ++i) { -struct usb_iso_packet_descriptor *fout = &urb->iso_frame_desc[i]; -line6_write_hexdump (line6pcm->line6,'C' , urb->transfer_buffer + fout->offset, fout->length); +struct usb_iso_packet_descriptor *fout = + &urb->iso_frame_desc[i]; +line6_write_hexdump (line6pcm->line6,'C' , + urb->transfer_buffer + fout->offset, + fout->length); }#endif
@@ -179,25 +187,40 @@ static void audio_in_callback(struct urb *urb)if (fsize >0 ) { frames = fsize / bytes_per_frame; -if (line6pcm->pos_in_done + frames > runtime->buffer_size) { +if (line6pcm->pos_in_done + frames > + runtime->buffer_size) {/* -The transferred area goes over buffer boundary, -copy two separate chunks. -*/ +The transferred area goes over buffer +boundary, copy two separate chunks. +*/ int len; - len = runtime->buffer_size - line6pcm->pos_in_done; + len = + runtime->buffer_size - + line6pcm->pos_in_done;if (len >0 ) { -memcpy (runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, len * bytes_per_frame); -memcpy (runtime->dma_area, fbuf + len * bytes_per_frame, (frames - len) * bytes_per_frame); - }else -dev_err (s2m (substream),"driver bug: len = %d\n" , len);/* this is somewhat paranoid */ +memcpy (runtime->dma_area + + line6pcm->pos_in_done * + bytes_per_frame, fbuf, + len * bytes_per_frame); +memcpy (runtime->dma_area, + fbuf + len * bytes_per_frame, + (frames - + len) * bytes_per_frame); + }else { +/* this is somewhat paranoid */ +dev_err (s2m (substream), +"driver bug: len = %d\n" , len); + } }else {/* copy single chunk */ -memcpy (runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, fsize * bytes_per_frame); +memcpy (runtime->dma_area + + line6pcm->pos_in_done * bytes_per_frame, + fbuf, fsize * bytes_per_frame); } -if ((line6pcm->pos_in_done += frames) >= runtime->buffer_size) +if ((line6pcm->pos_in_done += + frames) >= runtime->buffer_size) line6pcm->pos_in_done -= runtime->buffer_size; } }
@@ -228,7 +251,8 @@ static int snd_line6_capture_open(struct snd_pcm_substream *substream) err =snd_pcm_hw_constraint_ratdens (runtime,0 ,SNDRV_PCM_HW_PARAM_RATE , - (&line6pcm->properties->snd_line6_rates)); + (&line6pcm->properties-> + snd_line6_rates));if (err <0 )return err;
@@ -267,7 +291,9 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream,return ret; line6pcm->period_in =params_period_bytes (hw_params); - line6pcm->buffer_in =kmalloc (LINE6_ISO_BUFFERS *LINE6_ISO_PACKETS *LINE6_ISO_PACKET_SIZE_MAX ,GFP_KERNEL ); + line6pcm->buffer_in = +kmalloc (LINE6_ISO_BUFFERS *LINE6_ISO_PACKETS * +LINE6_ISO_PACKET_SIZE_MAX ,GFP_KERNEL );if (!line6pcm->buffer_in) {dev_err (s2m (substream),"cannot malloc buffer_in\n" );
@@ -302,7 +328,8 @@ int snd_line6_capture_trigger(struct snd_pcm_substream *substream, int cmd) err =submit_audio_in_all_urbs (substream);if (err <0 ) { -clear_bit (BIT_RUNNING_CAPTURE , &line6pcm->flags); +clear_bit (BIT_RUNNING_CAPTURE , + &line6pcm->flags);return err; } }
@@ -332,14 +359,14 @@ snd_line6_capture_pointer(struct snd_pcm_substream *substream)/* capture operators */ struct snd_pcm_ops snd_line6_capture_ops = { - .open = snd_line6_capture_open, - .close = snd_line6_capture_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_line6_capture_hw_params, - .hw_free = snd_line6_capture_hw_free, - .prepare = snd_line6_prepare, - .trigger = snd_line6_trigger, - .pointer = snd_line6_capture_pointer, + .open = snd_line6_capture_open, + .close = snd_line6_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_line6_capture_hw_params, + .hw_free = snd_line6_capture_hw_free, + .prepare = snd_line6_prepare, + .trigger = snd_line6_trigger, + .pointer = snd_line6_capture_pointer, };int create_audio_in_urbs (struct snd_line6_pcm *line6pcm)
@@ -351,7 +378,8 @@ int create_audio_in_urbs(struct snd_line6_pcm *line6pcm)struct urb *urb;/* URB for audio in: */ - urb = line6pcm->urb_audio_in[i] =usb_alloc_urb (LINE6_ISO_PACKETS ,GFP_KERNEL ); + urb = line6pcm->urb_audio_in[i] = +usb_alloc_urb (LINE6_ISO_PACKETS ,GFP_KERNEL );if (urb ==NULL ) {dev_err (line6pcm->line6->ifcdev,"Out of memory\n" );
@@ -359,7 +387,10 @@ int create_audio_in_urbs(struct snd_line6_pcm *line6pcm) } urb->dev = line6pcm->line6->usbdev; - urb->pipe =usb_rcvisocpipe (line6pcm->line6->usbdev, line6pcm->ep_audio_read &USB_ENDPOINT_NUMBER_MASK ); + urb->pipe = +usb_rcvisocpipe (line6pcm->line6->usbdev, + line6pcm-> + ep_audio_read &USB_ENDPOINT_NUMBER_MASK ); urb->transfer_flags =URB_ISO_ASAP ; urb->start_frame =-1 ; urb->number_of_packets =LINE6_ISO_PACKETS ;
Signature · 1 line
1.6.5
PATCH 4/13 staging: line6: Fix checkpatch errors in capture.c
In reply to Shawn Bohrer--- drivers/staging/line6/capture.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/staging/line6/capture.c +4 -3
@@ -219,8 +219,8 @@ static void audio_in_callback(struct urb *urb) fbuf, fsize * bytes_per_frame); } -if ((line6pcm->pos_in_done += - frames) >= runtime->buffer_size) + line6pcm->pos_in_done += frames; +if (line6pcm->pos_in_done >= runtime->buffer_size) line6pcm->pos_in_done -= runtime->buffer_size; } }
@@ -235,7 +235,8 @@ static void audio_in_callback(struct urb *urb)if (!shutdown) {submit_audio_in_urb (substream); -if ((line6pcm->bytes_in += length) >= line6pcm->period_in) { + line6pcm->bytes_in += length; +if (line6pcm->bytes_in >= line6pcm->period_in) { line6pcm->bytes_in -= line6pcm->period_in;snd_pcm_period_elapsed (substream); }
Signature · 1 line
1.6.5
PATCH 5/13 staging: line6: Lindent control.c
In reply to Shawn Bohrer--- drivers/staging/line6/control.c | 471 ++++++++++++++++++++++++++------------- 1 files changed, 314 insertions(+), 157 deletions(-)
drivers/staging/line6/control.c +314 -157
@@ -41,7 +41,6 @@ static ssize_t prefix ## _set_ ## param(struct device *dev, \#define VARIAX_PARAM_R (type, param) LINE6_PARAM_R(VARIAX, variax, type, param)#define VARIAX_PARAM_RW (type, param) LINE6_PARAM_RW(VARIAX, variax, type, param) -static ssize_t pod_get_param_int (struct device *dev,char *buf,int param) {struct usb_interface *interface =to_usb_interface (dev);
@@ -52,7 +51,8 @@ static ssize_t pod_get_param_int(struct device *dev, char *buf, int param)return sprintf (buf,"%d\n" , pod->prog_data.control[param]); } -static ssize_t pod_set_param_int (struct device *dev,const char *buf,size_t count,int param) +static ssize_t pod_set_param_int (struct device *dev,const char *buf, +size_t count,int param) {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface);
@@ -74,13 +74,13 @@ static ssize_t variax_get_param_int(struct device *dev, char *buf, int param)static ssize_t variax_get_param_float (struct device *dev,char *buf,int param) {/* -We do our own floating point handling here since floats in the -kernel are problematic for at least two reasons: - many distros -are still shipped with binary kernels optimized for the ancient -80386 without FPU -- there isn't a printf("%f") -(see http://www.kernelthread.com/publications/faq/335.html) -*/ +We do our own floating point handling here since floats in the +kernel are problematic for at least two reasons: - many distros +are still shipped with binary kernels optimized for the ancient +80386 without FPU +- there isn't a printf("%f") +(see http://www.kernelthread.com/publications/faq/335.html) +*/ static const int BIAS =0x7f ;static const int OFFSET =0xf ;
@@ -110,10 +110,13 @@ static ssize_t variax_get_param_float(struct device *dev, char *buf, int param) part_frac = (mantissa << (32 + exponent)) &0xffffffff ; } - part_frac = (part_frac / ((1UL <<31 ) / (PRECISION /2 *10 )) +5 ) /10 ; + part_frac = + (part_frac / ((1UL <<31 ) / (PRECISION /2 *10 )) +5 ) /10 ; } - len +=sprintf (buf + len,"%s%d.%03d\n" , ((p[0 ] &0x80 ) ?"-" :"" ), part_int, part_frac); + len += +sprintf (buf + len,"%s%d.%03d\n" , ((p[0 ] &0x80 ) ?"-" :"" ), + part_int, part_frac);return len; }
@@ -260,127 +263,246 @@ VARIAX_PARAM_R(float, mix1);VARIAX_PARAM_R (int, pickup_wiring); static DEVICE_ATTR(tweak, S_IWUGO | S_IRUGO, pod_get_tweak, pod_set_tweak); -static DEVICE_ATTR(wah_position, S_IWUGO | S_IRUGO, pod_get_wah_position, pod_set_wah_position); -static DEVICE_ATTR(compression_gain, S_IWUGO | S_IRUGO, pod_get_compression_gain, pod_set_compression_gain); -static DEVICE_ATTR(vol_pedal_position, S_IWUGO | S_IRUGO, pod_get_vol_pedal_position, pod_set_vol_pedal_position); -static DEVICE_ATTR(compression_threshold, S_IWUGO | S_IRUGO, pod_get_compression_threshold, pod_set_compression_threshold); +static DEVICE_ATTR(wah_position, S_IWUGO | S_IRUGO, pod_get_wah_position, + pod_set_wah_position); +static DEVICE_ATTR(compression_gain, S_IWUGO | S_IRUGO, + pod_get_compression_gain, pod_set_compression_gain); +static DEVICE_ATTR(vol_pedal_position, S_IWUGO | S_IRUGO, + pod_get_vol_pedal_position, pod_set_vol_pedal_position); +static DEVICE_ATTR(compression_threshold, S_IWUGO | S_IRUGO, + pod_get_compression_threshold, + pod_set_compression_threshold); static DEVICE_ATTR(pan, S_IWUGO | S_IRUGO, pod_get_pan, pod_set_pan); -static DEVICE_ATTR(amp_model_setup, S_IWUGO | S_IRUGO, pod_get_amp_model_setup, pod_set_amp_model_setup); -static DEVICE_ATTR(amp_model, S_IWUGO | S_IRUGO, pod_get_amp_model, pod_set_amp_model); +static DEVICE_ATTR(amp_model_setup, S_IWUGO | S_IRUGO, pod_get_amp_model_setup, + pod_set_amp_model_setup); +static DEVICE_ATTR(amp_model, S_IWUGO | S_IRUGO, pod_get_amp_model, + pod_set_amp_model); static DEVICE_ATTR(drive, S_IWUGO | S_IRUGO, pod_get_drive, pod_set_drive); static DEVICE_ATTR(bass, S_IWUGO | S_IRUGO, pod_get_bass, pod_set_bass); static DEVICE_ATTR(mid, S_IWUGO | S_IRUGO, pod_get_mid, pod_set_mid); static DEVICE_ATTR(lowmid, S_IWUGO | S_IRUGO, pod_get_lowmid, pod_set_lowmid); static DEVICE_ATTR(treble, S_IWUGO | S_IRUGO, pod_get_treble, pod_set_treble); -static DEVICE_ATTR(highmid, S_IWUGO | S_IRUGO, pod_get_highmid, pod_set_highmid); -static DEVICE_ATTR(chan_vol, S_IWUGO | S_IRUGO, pod_get_chan_vol, pod_set_chan_vol); -static DEVICE_ATTR(reverb_mix, S_IWUGO | S_IRUGO, pod_get_reverb_mix, pod_set_reverb_mix); -static DEVICE_ATTR(effect_setup, S_IWUGO | S_IRUGO, pod_get_effect_setup, pod_set_effect_setup); -static DEVICE_ATTR(band_1_frequency, S_IWUGO | S_IRUGO, pod_get_band_1_frequency, pod_set_band_1_frequency); -static DEVICE_ATTR(presence, S_IWUGO | S_IRUGO, pod_get_presence, pod_set_presence); -static DEVICE_ATTR2(treble__bass, treble, S_IWUGO | S_IRUGO, pod_get_treble__bass, pod_set_treble__bass); -static DEVICE_ATTR(noise_gate_enable, S_IWUGO | S_IRUGO, pod_get_noise_gate_enable, pod_set_noise_gate_enable); -static DEVICE_ATTR(gate_threshold, S_IWUGO | S_IRUGO, pod_get_gate_threshold, pod_set_gate_threshold); -static DEVICE_ATTR(gate_decay_time, S_IWUGO | S_IRUGO, pod_get_gate_decay_time, pod_set_gate_decay_time); -static DEVICE_ATTR(stomp_enable, S_IWUGO | S_IRUGO, pod_get_stomp_enable, pod_set_stomp_enable); -static DEVICE_ATTR(comp_enable, S_IWUGO | S_IRUGO, pod_get_comp_enable, pod_set_comp_enable); -static DEVICE_ATTR(stomp_time, S_IWUGO | S_IRUGO, pod_get_stomp_time, pod_set_stomp_time); -static DEVICE_ATTR(delay_enable, S_IWUGO | S_IRUGO, pod_get_delay_enable, pod_set_delay_enable); -static DEVICE_ATTR(mod_param_1, S_IWUGO | S_IRUGO, pod_get_mod_param_1, pod_set_mod_param_1); -static DEVICE_ATTR(delay_param_1, S_IWUGO | S_IRUGO, pod_get_delay_param_1, pod_set_delay_param_1); -static DEVICE_ATTR(delay_param_1_note_value, S_IWUGO | S_IRUGO, pod_get_delay_param_1_note_value, pod_set_delay_param_1_note_value); -static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUGO | S_IRUGO, pod_get_band_2_frequency__bass, pod_set_band_2_frequency__bass); -static DEVICE_ATTR(delay_param_2, S_IWUGO | S_IRUGO, pod_get_delay_param_2, pod_set_delay_param_2); -static DEVICE_ATTR(delay_volume_mix, S_IWUGO | S_IRUGO, pod_get_delay_volume_mix, pod_set_delay_volume_mix); -static DEVICE_ATTR(delay_param_3, S_IWUGO | S_IRUGO, pod_get_delay_param_3, pod_set_delay_param_3); -static DEVICE_ATTR(reverb_enable, S_IWUGO | S_IRUGO, pod_get_reverb_enable, pod_set_reverb_enable); -static DEVICE_ATTR(reverb_type, S_IWUGO | S_IRUGO, pod_get_reverb_type, pod_set_reverb_type); -static DEVICE_ATTR(reverb_decay, S_IWUGO | S_IRUGO, pod_get_reverb_decay, pod_set_reverb_decay); -static DEVICE_ATTR(reverb_tone, S_IWUGO | S_IRUGO, pod_get_reverb_tone, pod_set_reverb_tone); -static DEVICE_ATTR(reverb_pre_delay, S_IWUGO | S_IRUGO, pod_get_reverb_pre_delay, pod_set_reverb_pre_delay); -static DEVICE_ATTR(reverb_pre_post, S_IWUGO | S_IRUGO, pod_get_reverb_pre_post, pod_set_reverb_pre_post); -static DEVICE_ATTR(band_2_frequency, S_IWUGO | S_IRUGO, pod_get_band_2_frequency, pod_set_band_2_frequency); -static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUGO | S_IRUGO, pod_get_band_3_frequency__bass, pod_set_band_3_frequency__bass); -static DEVICE_ATTR(wah_enable, S_IWUGO | S_IRUGO, pod_get_wah_enable, pod_set_wah_enable); -static DEVICE_ATTR(modulation_lo_cut, S_IWUGO | S_IRUGO, pod_get_modulation_lo_cut, pod_set_modulation_lo_cut); -static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUGO | S_IRUGO, pod_get_delay_reverb_lo_cut, pod_set_delay_reverb_lo_cut); -static DEVICE_ATTR(volume_pedal_minimum, S_IWUGO | S_IRUGO, pod_get_volume_pedal_minimum, pod_set_volume_pedal_minimum); -static DEVICE_ATTR(eq_pre_post, S_IWUGO | S_IRUGO, pod_get_eq_pre_post, pod_set_eq_pre_post); -static DEVICE_ATTR(volume_pre_post, S_IWUGO | S_IRUGO, pod_get_volume_pre_post, pod_set_volume_pre_post); -static DEVICE_ATTR(di_model, S_IWUGO | S_IRUGO, pod_get_di_model, pod_set_di_model); -static DEVICE_ATTR(di_delay, S_IWUGO | S_IRUGO, pod_get_di_delay, pod_set_di_delay); -static DEVICE_ATTR(mod_enable, S_IWUGO | S_IRUGO, pod_get_mod_enable, pod_set_mod_enable); -static DEVICE_ATTR(mod_param_1_note_value, S_IWUGO | S_IRUGO, pod_get_mod_param_1_note_value, pod_set_mod_param_1_note_value); -static DEVICE_ATTR(mod_param_2, S_IWUGO | S_IRUGO, pod_get_mod_param_2, pod_set_mod_param_2); -static DEVICE_ATTR(mod_param_3, S_IWUGO | S_IRUGO, pod_get_mod_param_3, pod_set_mod_param_3); -static DEVICE_ATTR(mod_param_4, S_IWUGO | S_IRUGO, pod_get_mod_param_4, pod_set_mod_param_4); -static DEVICE_ATTR(mod_param_5, S_IWUGO | S_IRUGO, pod_get_mod_param_5, pod_set_mod_param_5); -static DEVICE_ATTR(mod_volume_mix, S_IWUGO | S_IRUGO, pod_get_mod_volume_mix, pod_set_mod_volume_mix); -static DEVICE_ATTR(mod_pre_post, S_IWUGO | S_IRUGO, pod_get_mod_pre_post, pod_set_mod_pre_post); -static DEVICE_ATTR(modulation_model, S_IWUGO | S_IRUGO, pod_get_modulation_model, pod_set_modulation_model); -static DEVICE_ATTR(band_3_frequency, S_IWUGO | S_IRUGO, pod_get_band_3_frequency, pod_set_band_3_frequency); -static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUGO | S_IRUGO, pod_get_band_4_frequency__bass, pod_set_band_4_frequency__bass); -static DEVICE_ATTR(mod_param_1_double_precision, S_IWUGO | S_IRUGO, pod_get_mod_param_1_double_precision, pod_set_mod_param_1_double_precision); -static DEVICE_ATTR(delay_param_1_double_precision, S_IWUGO | S_IRUGO, pod_get_delay_param_1_double_precision, pod_set_delay_param_1_double_precision); -static DEVICE_ATTR(eq_enable, S_IWUGO | S_IRUGO, pod_get_eq_enable, pod_set_eq_enable); +static DEVICE_ATTR(highmid, S_IWUGO | S_IRUGO, pod_get_highmid, + pod_set_highmid); +static DEVICE_ATTR(chan_vol, S_IWUGO | S_IRUGO, pod_get_chan_vol, + pod_set_chan_vol); +static DEVICE_ATTR(reverb_mix, S_IWUGO | S_IRUGO, pod_get_reverb_mix, + pod_set_reverb_mix); +static DEVICE_ATTR(effect_setup, S_IWUGO | S_IRUGO, pod_get_effect_setup, + pod_set_effect_setup); +static DEVICE_ATTR(band_1_frequency, S_IWUGO | S_IRUGO, + pod_get_band_1_frequency, pod_set_band_1_frequency); +static DEVICE_ATTR(presence, S_IWUGO | S_IRUGO, pod_get_presence, + pod_set_presence); +static DEVICE_ATTR2(treble__bass, treble, S_IWUGO | S_IRUGO, + pod_get_treble__bass, pod_set_treble__bass); +static DEVICE_ATTR(noise_gate_enable, S_IWUGO | S_IRUGO, + pod_get_noise_gate_enable, pod_set_noise_gate_enable); +static DEVICE_ATTR(gate_threshold, S_IWUGO | S_IRUGO, pod_get_gate_threshold, + pod_set_gate_threshold); +static DEVICE_ATTR(gate_decay_time, S_IWUGO | S_IRUGO, pod_get_gate_decay_time, + pod_set_gate_decay_time); +static DEVICE_ATTR(stomp_enable, S_IWUGO | S_IRUGO, pod_get_stomp_enable, + pod_set_stomp_enable); +static DEVICE_ATTR(comp_enable, S_IWUGO | S_IRUGO, pod_get_comp_enable, + pod_set_comp_enable); +static DEVICE_ATTR(stomp_time, S_IWUGO | S_IRUGO, pod_get_stomp_time, + pod_set_stomp_time); +static DEVICE_ATTR(delay_enable, S_IWUGO | S_IRUGO, pod_get_delay_enable, + pod_set_delay_enable); +static DEVICE_ATTR(mod_param_1, S_IWUGO | S_IRUGO, pod_get_mod_param_1, + pod_set_mod_param_1); +static DEVICE_ATTR(delay_param_1, S_IWUGO | S_IRUGO, pod_get_delay_param_1, + pod_set_delay_param_1); +static DEVICE_ATTR(delay_param_1_note_value, S_IWUGO | S_IRUGO, + pod_get_delay_param_1_note_value, + pod_set_delay_param_1_note_value); +static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUGO | S_IRUGO, + pod_get_band_2_frequency__bass, + pod_set_band_2_frequency__bass); +static DEVICE_ATTR(delay_param_2, S_IWUGO | S_IRUGO, pod_get_delay_param_2, + pod_set_delay_param_2); +static DEVICE_ATTR(delay_volume_mix, S_IWUGO | S_IRUGO, + pod_get_delay_volume_mix, pod_set_delay_volume_mix); +static DEVICE_ATTR(delay_param_3, S_IWUGO | S_IRUGO, pod_get_delay_param_3, + pod_set_delay_param_3); +static DEVICE_ATTR(reverb_enable, S_IWUGO | S_IRUGO, pod_get_reverb_enable, + pod_set_reverb_enable); +static DEVICE_ATTR(reverb_type, S_IWUGO | S_IRUGO, pod_get_reverb_type, + pod_set_reverb_type); +static DEVICE_ATTR(reverb_decay, S_IWUGO | S_IRUGO, pod_get_reverb_decay, + pod_set_reverb_decay); +static DEVICE_ATTR(reverb_tone, S_IWUGO | S_IRUGO, pod_get_reverb_tone, + pod_set_reverb_tone); +static DEVICE_ATTR(reverb_pre_delay, S_IWUGO | S_IRUGO, + pod_get_reverb_pre_delay, pod_set_reverb_pre_delay); +static DEVICE_ATTR(reverb_pre_post, S_IWUGO | S_IRUGO, pod_get_reverb_pre_post, + pod_set_reverb_pre_post); +static DEVICE_ATTR(band_2_frequency, S_IWUGO | S_IRUGO, + pod_get_band_2_frequency, pod_set_band_2_frequency); +static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUGO | S_IRUGO, + pod_get_band_3_frequency__bass, + pod_set_band_3_frequency__bass); +static DEVICE_ATTR(wah_enable, S_IWUGO | S_IRUGO, pod_get_wah_enable, + pod_set_wah_enable); +static DEVICE_ATTR(modulation_lo_cut, S_IWUGO | S_IRUGO, + pod_get_modulation_lo_cut, pod_set_modulation_lo_cut); +static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUGO | S_IRUGO, + pod_get_delay_reverb_lo_cut, pod_set_delay_reverb_lo_cut); +static DEVICE_ATTR(volume_pedal_minimum, S_IWUGO | S_IRUGO, + pod_get_volume_pedal_minimum, pod_set_volume_pedal_minimum); +static DEVICE_ATTR(eq_pre_post, S_IWUGO | S_IRUGO, pod_get_eq_pre_post, + pod_set_eq_pre_post); +static DEVICE_ATTR(volume_pre_post, S_IWUGO | S_IRUGO, pod_get_volume_pre_post, + pod_set_volume_pre_post); +static DEVICE_ATTR(di_model, S_IWUGO | S_IRUGO, pod_get_di_model, + pod_set_di_model); +static DEVICE_ATTR(di_delay, S_IWUGO | S_IRUGO, pod_get_di_delay, + pod_set_di_delay); +static DEVICE_ATTR(mod_enable, S_IWUGO | S_IRUGO, pod_get_mod_enable, + pod_set_mod_enable); +static DEVICE_ATTR(mod_param_1_note_value, S_IWUGO | S_IRUGO, + pod_get_mod_param_1_note_value, + pod_set_mod_param_1_note_value); +static DEVICE_ATTR(mod_param_2, S_IWUGO | S_IRUGO, pod_get_mod_param_2, + pod_set_mod_param_2); +static DEVICE_ATTR(mod_param_3, S_IWUGO | S_IRUGO, pod_get_mod_param_3, + pod_set_mod_param_3); +static DEVICE_ATTR(mod_param_4, S_IWUGO | S_IRUGO, pod_get_mod_param_4, + pod_set_mod_param_4); +static DEVICE_ATTR(mod_param_5, S_IWUGO | S_IRUGO, pod_get_mod_param_5, + pod_set_mod_param_5); +static DEVICE_ATTR(mod_volume_mix, S_IWUGO | S_IRUGO, pod_get_mod_volume_mix, + pod_set_mod_volume_mix); +static DEVICE_ATTR(mod_pre_post, S_IWUGO | S_IRUGO, pod_get_mod_pre_post, + pod_set_mod_pre_post); +static DEVICE_ATTR(modulation_model, S_IWUGO | S_IRUGO, + pod_get_modulation_model, pod_set_modulation_model); +static DEVICE_ATTR(band_3_frequency, S_IWUGO | S_IRUGO, + pod_get_band_3_frequency, pod_set_band_3_frequency); +static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUGO | S_IRUGO, + pod_get_band_4_frequency__bass, + pod_set_band_4_frequency__bass); +static DEVICE_ATTR(mod_param_1_double_precision, S_IWUGO | S_IRUGO, + pod_get_mod_param_1_double_precision, + pod_set_mod_param_1_double_precision); +static DEVICE_ATTR(delay_param_1_double_precision, S_IWUGO | S_IRUGO, + pod_get_delay_param_1_double_precision, + pod_set_delay_param_1_double_precision); +static DEVICE_ATTR(eq_enable, S_IWUGO | S_IRUGO, pod_get_eq_enable, + pod_set_eq_enable); static DEVICE_ATTR(tap, S_IWUGO | S_IRUGO, pod_get_tap, pod_set_tap); -static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUGO | S_IRUGO, pod_get_volume_tweak_pedal_assign, pod_set_volume_tweak_pedal_assign); -static DEVICE_ATTR(band_5_frequency, S_IWUGO | S_IRUGO, pod_get_band_5_frequency, pod_set_band_5_frequency); +static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUGO | S_IRUGO, + pod_get_volume_tweak_pedal_assign, + pod_set_volume_tweak_pedal_assign); +static DEVICE_ATTR(band_5_frequency, S_IWUGO | S_IRUGO, + pod_get_band_5_frequency, pod_set_band_5_frequency); static DEVICE_ATTR(tuner, S_IWUGO | S_IRUGO, pod_get_tuner, pod_set_tuner); -static DEVICE_ATTR(mic_selection, S_IWUGO | S_IRUGO, pod_get_mic_selection, pod_set_mic_selection); -static DEVICE_ATTR(cabinet_model, S_IWUGO | S_IRUGO, pod_get_cabinet_model, pod_set_cabinet_model); -static DEVICE_ATTR(stomp_model, S_IWUGO | S_IRUGO, pod_get_stomp_model, pod_set_stomp_model); -static DEVICE_ATTR(roomlevel, S_IWUGO | S_IRUGO, pod_get_roomlevel, pod_set_roomlevel); -static DEVICE_ATTR(band_4_frequency, S_IWUGO | S_IRUGO, pod_get_band_4_frequency, pod_set_band_4_frequency); -static DEVICE_ATTR(band_6_frequency, S_IWUGO | S_IRUGO, pod_get_band_6_frequency, pod_set_band_6_frequency); -static DEVICE_ATTR(stomp_param_1_note_value, S_IWUGO | S_IRUGO, pod_get_stomp_param_1_note_value, pod_set_stomp_param_1_note_value); -static DEVICE_ATTR(stomp_param_2, S_IWUGO | S_IRUGO, pod_get_stomp_param_2, pod_set_stomp_param_2); -static DEVICE_ATTR(stomp_param_3, S_IWUGO | S_IRUGO, pod_get_stomp_param_3, pod_set_stomp_param_3); -static DEVICE_ATTR(stomp_param_4, S_IWUGO | S_IRUGO, pod_get_stomp_param_4, pod_set_stomp_param_4); -static DEVICE_ATTR(stomp_param_5, S_IWUGO | S_IRUGO, pod_get_stomp_param_5, pod_set_stomp_param_5); -static DEVICE_ATTR(stomp_param_6, S_IWUGO | S_IRUGO, pod_get_stomp_param_6, pod_set_stomp_param_6); -static DEVICE_ATTR(amp_switch_select, S_IWUGO | S_IRUGO, pod_get_amp_switch_select, pod_set_amp_switch_select); -static DEVICE_ATTR(delay_param_4, S_IWUGO | S_IRUGO, pod_get_delay_param_4, pod_set_delay_param_4); -static DEVICE_ATTR(delay_param_5, S_IWUGO | S_IRUGO, pod_get_delay_param_5, pod_set_delay_param_5); -static DEVICE_ATTR(delay_pre_post, S_IWUGO | S_IRUGO, pod_get_delay_pre_post, pod_set_delay_pre_post); -static DEVICE_ATTR(delay_model, S_IWUGO | S_IRUGO, pod_get_delay_model, pod_set_delay_model); -static DEVICE_ATTR(delay_verb_model, S_IWUGO | S_IRUGO, pod_get_delay_verb_model, pod_set_delay_verb_model); -static DEVICE_ATTR(tempo_msb, S_IWUGO | S_IRUGO, pod_get_tempo_msb, pod_set_tempo_msb); -static DEVICE_ATTR(tempo_lsb, S_IWUGO | S_IRUGO, pod_get_tempo_lsb, pod_set_tempo_lsb); -static DEVICE_ATTR(wah_model, S_IWUGO | S_IRUGO, pod_get_wah_model, pod_set_wah_model); -static DEVICE_ATTR(bypass_volume, S_IWUGO | S_IRUGO, pod_get_bypass_volume, pod_set_bypass_volume); -static DEVICE_ATTR(fx_loop_on_off, S_IWUGO | S_IRUGO, pod_get_fx_loop_on_off, pod_set_fx_loop_on_off); -static DEVICE_ATTR(tweak_param_select, S_IWUGO | S_IRUGO, pod_get_tweak_param_select, pod_set_tweak_param_select); -static DEVICE_ATTR(amp1_engage, S_IWUGO | S_IRUGO, pod_get_amp1_engage, pod_set_amp1_engage); -static DEVICE_ATTR(band_1_gain, S_IWUGO | S_IRUGO, pod_get_band_1_gain, pod_set_band_1_gain); -static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUGO | S_IRUGO, pod_get_band_2_gain__bass, pod_set_band_2_gain__bass); -static DEVICE_ATTR(band_2_gain, S_IWUGO | S_IRUGO, pod_get_band_2_gain, pod_set_band_2_gain); -static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUGO | S_IRUGO, pod_get_band_3_gain__bass, pod_set_band_3_gain__bass); -static DEVICE_ATTR(band_3_gain, S_IWUGO | S_IRUGO, pod_get_band_3_gain, pod_set_band_3_gain); -static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUGO | S_IRUGO, pod_get_band_4_gain__bass, pod_set_band_4_gain__bass); -static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUGO | S_IRUGO, pod_get_band_5_gain__bass, pod_set_band_5_gain__bass); -static DEVICE_ATTR(band_4_gain, S_IWUGO | S_IRUGO, pod_get_band_4_gain, pod_set_band_4_gain); -static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUGO | S_IRUGO, pod_get_band_6_gain__bass, pod_set_band_6_gain__bass); +static DEVICE_ATTR(mic_selection, S_IWUGO | S_IRUGO, pod_get_mic_selection, + pod_set_mic_selection); +static DEVICE_ATTR(cabinet_model, S_IWUGO | S_IRUGO, pod_get_cabinet_model, + pod_set_cabinet_model); +static DEVICE_ATTR(stomp_model, S_IWUGO | S_IRUGO, pod_get_stomp_model, + pod_set_stomp_model); +static DEVICE_ATTR(roomlevel, S_IWUGO | S_IRUGO, pod_get_roomlevel, + pod_set_roomlevel); +static DEVICE_ATTR(band_4_frequency, S_IWUGO | S_IRUGO, + pod_get_band_4_frequency, pod_set_band_4_frequency); +static DEVICE_ATTR(band_6_frequency, S_IWUGO | S_IRUGO, + pod_get_band_6_frequency, pod_set_band_6_frequency); +static DEVICE_ATTR(stomp_param_1_note_value, S_IWUGO | S_IRUGO, + pod_get_stomp_param_1_note_value, + pod_set_stomp_param_1_note_value); +static DEVICE_ATTR(stomp_param_2, S_IWUGO | S_IRUGO, pod_get_stomp_param_2, + pod_set_stomp_param_2); +static DEVICE_ATTR(stomp_param_3, S_IWUGO | S_IRUGO, pod_get_stomp_param_3, + pod_set_stomp_param_3); +static DEVICE_ATTR(stomp_param_4, S_IWUGO | S_IRUGO, pod_get_stomp_param_4, + pod_set_stomp_param_4); +static DEVICE_ATTR(stomp_param_5, S_IWUGO | S_IRUGO, pod_get_stomp_param_5, + pod_set_stomp_param_5); +static DEVICE_ATTR(stomp_param_6, S_IWUGO | S_IRUGO, pod_get_stomp_param_6, + pod_set_stomp_param_6); +static DEVICE_ATTR(amp_switch_select, S_IWUGO | S_IRUGO, + pod_get_amp_switch_select, pod_set_amp_switch_select); +static DEVICE_ATTR(delay_param_4, S_IWUGO | S_IRUGO, pod_get_delay_param_4, + pod_set_delay_param_4); +static DEVICE_ATTR(delay_param_5, S_IWUGO | S_IRUGO, pod_get_delay_param_5, + pod_set_delay_param_5); +static DEVICE_ATTR(delay_pre_post, S_IWUGO | S_IRUGO, pod_get_delay_pre_post, + pod_set_delay_pre_post); +static DEVICE_ATTR(delay_model, S_IWUGO | S_IRUGO, pod_get_delay_model, + pod_set_delay_model); +static DEVICE_ATTR(delay_verb_model, S_IWUGO | S_IRUGO, + pod_get_delay_verb_model, pod_set_delay_verb_model); +static DEVICE_ATTR(tempo_msb, S_IWUGO | S_IRUGO, pod_get_tempo_msb, + pod_set_tempo_msb); +static DEVICE_ATTR(tempo_lsb, S_IWUGO | S_IRUGO, pod_get_tempo_lsb, + pod_set_tempo_lsb); +static DEVICE_ATTR(wah_model, S_IWUGO | S_IRUGO, pod_get_wah_model, + pod_set_wah_model); +static DEVICE_ATTR(bypass_volume, S_IWUGO | S_IRUGO, pod_get_bypass_volume, + pod_set_bypass_volume); +static DEVICE_ATTR(fx_loop_on_off, S_IWUGO | S_IRUGO, pod_get_fx_loop_on_off, + pod_set_fx_loop_on_off); +static DEVICE_ATTR(tweak_param_select, S_IWUGO | S_IRUGO, + pod_get_tweak_param_select, pod_set_tweak_param_select); +static DEVICE_ATTR(amp1_engage, S_IWUGO | S_IRUGO, pod_get_amp1_engage, + pod_set_amp1_engage); +static DEVICE_ATTR(band_1_gain, S_IWUGO | S_IRUGO, pod_get_band_1_gain, + pod_set_band_1_gain); +static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUGO | S_IRUGO, + pod_get_band_2_gain__bass, pod_set_band_2_gain__bass); +static DEVICE_ATTR(band_2_gain, S_IWUGO | S_IRUGO, pod_get_band_2_gain, + pod_set_band_2_gain); +static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUGO | S_IRUGO, + pod_get_band_3_gain__bass, pod_set_band_3_gain__bass); +static DEVICE_ATTR(band_3_gain, S_IWUGO | S_IRUGO, pod_get_band_3_gain, + pod_set_band_3_gain); +static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUGO | S_IRUGO, + pod_get_band_4_gain__bass, pod_set_band_4_gain__bass); +static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUGO | S_IRUGO, + pod_get_band_5_gain__bass, pod_set_band_5_gain__bass); +static DEVICE_ATTR(band_4_gain, S_IWUGO | S_IRUGO, pod_get_band_4_gain, + pod_set_band_4_gain); +static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUGO | S_IRUGO, + pod_get_band_6_gain__bass, pod_set_band_6_gain__bass); static DEVICE_ATTR(body, S_IRUGO, variax_get_body, line6_nop_write); -static DEVICE_ATTR(pickup1_enable, S_IRUGO, variax_get_pickup1_enable, line6_nop_write); -static DEVICE_ATTR(pickup1_type, S_IRUGO, variax_get_pickup1_type, line6_nop_write); -static DEVICE_ATTR(pickup1_position, S_IRUGO, variax_get_pickup1_position, line6_nop_write); -static DEVICE_ATTR(pickup1_angle, S_IRUGO, variax_get_pickup1_angle, line6_nop_write); -static DEVICE_ATTR(pickup1_level, S_IRUGO, variax_get_pickup1_level, line6_nop_write); -static DEVICE_ATTR(pickup2_enable, S_IRUGO, variax_get_pickup2_enable, line6_nop_write); -static DEVICE_ATTR(pickup2_type, S_IRUGO, variax_get_pickup2_type, line6_nop_write); -static DEVICE_ATTR(pickup2_position, S_IRUGO, variax_get_pickup2_position, line6_nop_write); -static DEVICE_ATTR(pickup2_angle, S_IRUGO, variax_get_pickup2_angle, line6_nop_write); -static DEVICE_ATTR(pickup2_level, S_IRUGO, variax_get_pickup2_level, line6_nop_write); -static DEVICE_ATTR(pickup_phase, S_IRUGO, variax_get_pickup_phase, line6_nop_write); -static DEVICE_ATTR(capacitance, S_IRUGO, variax_get_capacitance, line6_nop_write); -static DEVICE_ATTR(tone_resistance, S_IRUGO, variax_get_tone_resistance, line6_nop_write); -static DEVICE_ATTR(volume_resistance, S_IRUGO, variax_get_volume_resistance, line6_nop_write); +static DEVICE_ATTR(pickup1_enable, S_IRUGO, variax_get_pickup1_enable, + line6_nop_write); +static DEVICE_ATTR(pickup1_type, S_IRUGO, variax_get_pickup1_type, + line6_nop_write); +static DEVICE_ATTR(pickup1_position, S_IRUGO, variax_get_pickup1_position, + line6_nop_write); +static DEVICE_ATTR(pickup1_angle, S_IRUGO, variax_get_pickup1_angle, + line6_nop_write); +static DEVICE_ATTR(pickup1_level, S_IRUGO, variax_get_pickup1_level, + line6_nop_write); +static DEVICE_ATTR(pickup2_enable, S_IRUGO, variax_get_pickup2_enable, + line6_nop_write); +static DEVICE_ATTR(pickup2_type, S_IRUGO, variax_get_pickup2_type, + line6_nop_write); +static DEVICE_ATTR(pickup2_position, S_IRUGO, variax_get_pickup2_position, + line6_nop_write); +static DEVICE_ATTR(pickup2_angle, S_IRUGO, variax_get_pickup2_angle, + line6_nop_write); +static DEVICE_ATTR(pickup2_level, S_IRUGO, variax_get_pickup2_level, + line6_nop_write); +static DEVICE_ATTR(pickup_phase, S_IRUGO, variax_get_pickup_phase, + line6_nop_write); +static DEVICE_ATTR(capacitance, S_IRUGO, variax_get_capacitance, + line6_nop_write); +static DEVICE_ATTR(tone_resistance, S_IRUGO, variax_get_tone_resistance, + line6_nop_write); +static DEVICE_ATTR(volume_resistance, S_IRUGO, variax_get_volume_resistance, + line6_nop_write); static DEVICE_ATTR(taper, S_IRUGO, variax_get_taper, line6_nop_write); static DEVICE_ATTR(tone_dump, S_IRUGO, variax_get_tone_dump, line6_nop_write); static DEVICE_ATTR(save_tone, S_IRUGO, variax_get_save_tone, line6_nop_write); -static DEVICE_ATTR(volume_dump, S_IRUGO, variax_get_volume_dump, line6_nop_write); -static DEVICE_ATTR(tuning_enable, S_IRUGO, variax_get_tuning_enable, line6_nop_write); +static DEVICE_ATTR(volume_dump, S_IRUGO, variax_get_volume_dump, + line6_nop_write); +static DEVICE_ATTR(tuning_enable, S_IRUGO, variax_get_tuning_enable, + line6_nop_write); static DEVICE_ATTR(tuning6, S_IRUGO, variax_get_tuning6, line6_nop_write); static DEVICE_ATTR(tuning5, S_IRUGO, variax_get_tuning5, line6_nop_write); static DEVICE_ATTR(tuning4, S_IRUGO, variax_get_tuning4, line6_nop_write);
@@ -399,7 +521,8 @@ static DEVICE_ATTR(mix4, S_IRUGO, variax_get_mix4, line6_nop_write); static DEVICE_ATTR(mix3, S_IRUGO, variax_get_mix3, line6_nop_write); static DEVICE_ATTR(mix2, S_IRUGO, variax_get_mix2, line6_nop_write); static DEVICE_ATTR(mix1, S_IRUGO, variax_get_mix1, line6_nop_write); -static DEVICE_ATTR(pickup_wiring, S_IRUGO, variax_get_pickup_wiring, line6_nop_write); +static DEVICE_ATTR(pickup_wiring, S_IRUGO, variax_get_pickup_wiring, + line6_nop_write);int pod_create_files (int firmware,int type,struct device *dev) {
@@ -407,7 +530,8 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_tweak));CHECK_RETURN (device_create_file (dev, &dev_attr_wah_position));if ((type & (LINE6_BITS_PODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_compression_gain)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_compression_gain));CHECK_RETURN (device_create_file (dev, &dev_attr_vol_pedal_position));CHECK_RETURN (device_create_file (dev, &dev_attr_compression_threshold));CHECK_RETURN (device_create_file (dev, &dev_attr_pan));
@@ -429,7 +553,8 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_reverb_mix));CHECK_RETURN (device_create_file (dev, &dev_attr_effect_setup));if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_1_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_1_frequency));if ((type & (LINE6_BITS_PODXTALL )) !=0 )CHECK_RETURN (device_create_file (dev, &dev_attr_presence));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )
@@ -443,10 +568,12 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_delay_enable));CHECK_RETURN (device_create_file (dev, &dev_attr_mod_param_1));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_1)); -CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_1_note_value)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_delay_param_1_note_value));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_2_frequency__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_2_frequency__bass));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_2));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_volume_mix));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_3));
@@ -459,26 +586,34 @@ int pod_create_files(int firmware, int type, struct device *dev)if ((type & (LINE6_BITS_PODXTALL )) !=0 )CHECK_RETURN (device_create_file (dev, &dev_attr_reverb_tone));if ((type & (LINE6_BITS_PODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_reverb_pre_delay)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_reverb_pre_delay));if ((type & (LINE6_BITS_PODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_reverb_pre_post)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_reverb_pre_post));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_2_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_2_frequency));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_3_frequency__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_3_frequency__bass));CHECK_RETURN (device_create_file (dev, &dev_attr_wah_enable));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_modulation_lo_cut)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_modulation_lo_cut));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_delay_reverb_lo_cut)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_delay_reverb_lo_cut));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_volume_pedal_minimum)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_volume_pedal_minimum));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_eq_pre_post)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_eq_pre_post));CHECK_RETURN (device_create_file (dev, &dev_attr_volume_pre_post));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )CHECK_RETURN (device_create_file (dev, &dev_attr_di_model));
@@ -496,19 +631,25 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_modulation_model));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_3_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_3_frequency));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_4_frequency__bass)); -CHECK_RETURN (device_create_file (dev, &dev_attr_mod_param_1_double_precision)); -CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_1_double_precision)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_4_frequency__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_mod_param_1_double_precision)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_delay_param_1_double_precision));if (firmware >=200 )CHECK_RETURN (device_create_file (dev, &dev_attr_eq_enable));CHECK_RETURN (device_create_file (dev, &dev_attr_tap)); -CHECK_RETURN (device_create_file (dev, &dev_attr_volume_tweak_pedal_assign)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_volume_tweak_pedal_assign));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_5_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_5_frequency));CHECK_RETURN (device_create_file (dev, &dev_attr_tuner));CHECK_RETURN (device_create_file (dev, &dev_attr_mic_selection));CHECK_RETURN (device_create_file (dev, &dev_attr_cabinet_model));
@@ -516,25 +657,30 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_roomlevel));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_4_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_4_frequency));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_6_frequency)); -CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_1_note_value)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_6_frequency)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_stomp_param_1_note_value));CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_2));CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_3));CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_4));CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_5));CHECK_RETURN (device_create_file (dev, &dev_attr_stomp_param_6));if ((type & (LINE6_BITS_LIVE )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_amp_switch_select)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_amp_switch_select));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_4));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_param_5));CHECK_RETURN (device_create_file (dev, &dev_attr_delay_pre_post));if ((type & (LINE6_BITS_PODXTALL )) !=0 )CHECK_RETURN (device_create_file (dev, &dev_attr_delay_model));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_delay_verb_model)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_delay_verb_model));CHECK_RETURN (device_create_file (dev, &dev_attr_tempo_msb));CHECK_RETURN (device_create_file (dev, &dev_attr_tempo_lsb));if (firmware >=300 )
@@ -549,29 +695,37 @@ int pod_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_band_1_gain));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_2_gain__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_2_gain__bass));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_2_gain)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_2_gain));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_3_gain__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_3_gain__bass));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_3_gain)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_3_gain));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_4_gain__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_4_gain__bass));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_5_gain__bass)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_5_gain__bass));if ((type & (LINE6_BITS_PODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_4_gain)); +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_4_gain));if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -CHECK_RETURN (device_create_file (dev, &dev_attr_band_6_gain__bass)); -return 0 ; +CHECK_RETURN (device_create_file + (dev, &dev_attr_band_6_gain__bass)); +return 0 ; }void pod_remove_files (int firmware,int type,struct device *dev)
@@ -618,7 +772,8 @@ void pod_remove_files(int firmware, int type, struct device *dev)device_remove_file (dev, &dev_attr_delay_param_1_note_value);if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -device_remove_file (dev, &dev_attr_band_2_frequency__bass); +device_remove_file (dev, + &dev_attr_band_2_frequency__bass);device_remove_file (dev, &dev_attr_delay_param_2);device_remove_file (dev, &dev_attr_delay_volume_mix);device_remove_file (dev, &dev_attr_delay_param_3);
@@ -639,7 +794,8 @@ void pod_remove_files(int firmware, int type, struct device *dev)device_remove_file (dev, &dev_attr_band_2_frequency);if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -device_remove_file (dev, &dev_attr_band_3_frequency__bass); +device_remove_file (dev, + &dev_attr_band_3_frequency__bass);device_remove_file (dev, &dev_attr_wah_enable);if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )device_remove_file (dev, &dev_attr_modulation_lo_cut);
@@ -671,7 +827,8 @@ void pod_remove_files(int firmware, int type, struct device *dev)device_remove_file (dev, &dev_attr_band_3_frequency);if ((type & (LINE6_BITS_BASSPODXTALL )) !=0 )if (firmware >=200 ) -device_remove_file (dev, &dev_attr_band_4_frequency__bass); +device_remove_file (dev, + &dev_attr_band_4_frequency__bass);device_remove_file (dev, &dev_attr_mod_param_1_double_precision);device_remove_file (dev, &dev_attr_delay_param_1_double_precision);if (firmware >=200 )
@@ -790,7 +947,7 @@ int variax_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_mix2));CHECK_RETURN (device_create_file (dev, &dev_attr_mix1));CHECK_RETURN (device_create_file (dev, &dev_attr_pickup_wiring)); -return 0 ; +return 0 ; }void variax_remove_files (int firmware,int type,struct device *dev)
Signature · 1 line
1.6.5
PATCH 6/13 staging: line6: Fix some checkpatch warnings in control.c
In reply to Shawn Bohrer--- drivers/staging/line6/control.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/line6/control.c +6 -8
@@ -22,18 +22,18 @@ struct device_attribute dev_attr_##_name1 = __ATTR(_name2, _mode, _show, _store)#define LINE6_PARAM_R (PREFIX , prefix, type, param) \ -static ssize_t prefix ## _get_ ## param(struct device *dev, \ +static ssize_t prefix##_get_##param(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ - return prefix ## _get_param_ ## type(dev, buf, PREFIX ## _ ## param); \ + return prefix##_get_param_##type(dev, buf, PREFIX##_##param); \ }#define LINE6_PARAM_RW (PREFIX , prefix, type, param) \ LINE6_PARAM_R(PREFIX, prefix, type, param); \ -static ssize_t prefix ## _set_ ## param(struct device *dev, \ +static ssize_t prefix##_set_##param(struct device *dev, \ struct device_attribute *attr, const char *buf, size_t count) \ { \ - return prefix ## _set_param_ ## type(dev, buf, count, PREFIX ## _ ## param); \ + return prefix##_set_param_##type(dev, buf, count, PREFIX##_##param); \ }#define POD_PARAM_R (type, param) LINE6_PARAM_R(POD, pod, type, param)
@@ -727,6 +727,7 @@ int pod_create_files(int firmware, int type, struct device *dev) (dev, &dev_attr_band_6_gain__bass));return 0 ; } +EXPORT_SYMBOL (pod_create_files);void pod_remove_files (int firmware,int type,struct device *dev) {
@@ -901,8 +902,6 @@ void pod_remove_files(int firmware, int type, struct device *dev)if (firmware >=200 )device_remove_file (dev, &dev_attr_band_6_gain__bass); } - -EXPORT_SYMBOL (pod_create_files);EXPORT_SYMBOL (pod_remove_files);int variax_create_files (int firmware,int type,struct device *dev)
@@ -949,6 +948,7 @@ int variax_create_files(int firmware, int type, struct device *dev)CHECK_RETURN (device_create_file (dev, &dev_attr_pickup_wiring));return 0 ; } +EXPORT_SYMBOL (variax_create_files);void variax_remove_files (int firmware,int type,struct device *dev) {
@@ -992,6 +992,4 @@ void variax_remove_files(int firmware, int type, struct device *dev)device_remove_file (dev, &dev_attr_mix1);device_remove_file (dev, &dev_attr_pickup_wiring); } - -EXPORT_SYMBOL (variax_create_files);EXPORT_SYMBOL (variax_remove_files);
Signature · 1 line
1.6.5
PATCH 7/13 staging: line6: Convert simple_strtoul() to strict_strtoul in control.c
In reply to Shawn Bohrer--- drivers/staging/line6/control.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
drivers/staging/line6/control.c +7 -1
@@ -56,7 +56,13 @@ static ssize_t pod_set_param_int(struct device *dev, const char *buf, {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int retval; + + retval =strict_strtoul (buf,10 , &value); +if (retval) +return retval; +pod_transmit_parameter (pod, param, value);return count; }
Signature · 1 line
1.6.5
PATCH 8/13 staging: line6: Fix checkpatch warnings in pcm.c
In reply to Shawn Bohrer--- drivers/staging/line6/pcm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/staging/line6/pcm.c +2 -1
@@ -156,7 +156,8 @@ static int snd_line6_new_pcm(struct snd_line6_pcm *line6pcm)strcpy (pcm->name, line6pcm->line6->properties->name);/* set operators */ -snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_line6_playback_ops); +snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , + &snd_line6_playback_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &snd_line6_capture_ops);/* pre-allocation of buffers */
Signature · 1 line
1.6.5
PATCH 9/13 staging: line6: Lindent and fix some checkpatch warnings in toneport.c
In reply to Shawn Bohrer--- drivers/staging/line6/toneport.c | 99 +++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 50 deletions(-)
drivers/staging/line6/toneport.c +49 -50
@@ -17,10 +17,8 @@#include "playback.h" #include "toneport.h" -static int toneport_send_cmd (struct usb_device *usbdev,int cmd1,int cmd2); -static struct snd_ratden toneport_ratden = { .num_min =44100 , .num_max =44100 ,
@@ -29,47 +27,44 @@ static struct snd_ratden toneport_ratden = { };static struct line6_pcm_properties toneport_pcm_properties = { - .snd_line6_playback_hw = { - .info = (SNDRV_PCM_INFO_MMAP | -SNDRV_PCM_INFO_INTERLEAVED | -SNDRV_PCM_INFO_BLOCK_TRANSFER | -SNDRV_PCM_INFO_MMAP_VALID | -SNDRV_PCM_INFO_PAUSE | -SNDRV_PCM_INFO_SYNC_START ), - .formats =SNDRV_PCM_FMTBIT_S16_LE , - .rates =SNDRV_PCM_RATE_KNOT , - .rate_min =44100 , - .rate_max =44100 , - .channels_min =2 , - .channels_max =2 , - .buffer_bytes_max =60000 , - .period_bytes_min =180 *4 , - .period_bytes_max =8192 , - .periods_min =1 , - .periods_max =1024 - }, - .snd_line6_capture_hw = { - .info = (SNDRV_PCM_INFO_MMAP | -SNDRV_PCM_INFO_INTERLEAVED | -SNDRV_PCM_INFO_BLOCK_TRANSFER | -SNDRV_PCM_INFO_MMAP_VALID | -SNDRV_PCM_INFO_SYNC_START ), - .formats =SNDRV_PCM_FMTBIT_S16_LE , - .rates =SNDRV_PCM_RATE_KNOT , - .rate_min =44100 , - .rate_max =44100 , - .channels_min =2 , - .channels_max =2 , - .buffer_bytes_max =60000 , - .period_bytes_min =188 *4 , - .period_bytes_max =8192 , - .periods_min =1 , - .periods_max =1024 - }, + .snd_line6_playback_hw = { + .info = (SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_BLOCK_TRANSFER | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_SYNC_START ), + .formats =SNDRV_PCM_FMTBIT_S16_LE , + .rates =SNDRV_PCM_RATE_KNOT , + .rate_min =44100 , + .rate_max =44100 , + .channels_min =2 , + .channels_max =2 , + .buffer_bytes_max =60000 , + .period_bytes_min =180 *4 , + .period_bytes_max =8192 , + .periods_min =1 , + .periods_max =1024 }, + .snd_line6_capture_hw = { + .info = (SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_BLOCK_TRANSFER | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_SYNC_START ), + .formats =SNDRV_PCM_FMTBIT_S16_LE , + .rates =SNDRV_PCM_RATE_KNOT , + .rate_min =44100 , + .rate_max =44100 , + .channels_min =2 , + .channels_max =2 , + .buffer_bytes_max =60000 , + .period_bytes_min =188 *4 , + .period_bytes_max =8192 , + .periods_min =1 , + .periods_max =1024 }, .snd_line6_rates = { - .nrats =1 , - .rats = &toneport_ratden - }, + .nrats =1 , + .rats = &toneport_ratden}, .bytes_per_frame =4 };
@@ -117,9 +112,10 @@ static ssize_t toneport_set_led_green(struct device *dev,return count; } -static DEVICE_ATTR(led_red, S_IWUGO | S_IRUGO, line6_nop_read, toneport_set_led_red); -static DEVICE_ATTR(led_green, S_IWUGO | S_IRUGO, line6_nop_read, toneport_set_led_green); - +static DEVICE_ATTR(led_red, S_IWUGO | S_IRUGO, line6_nop_read, + toneport_set_led_red); +static DEVICE_ATTR(led_green, S_IWUGO | S_IRUGO, line6_nop_read, + toneport_set_led_green);static int toneport_send_cmd (struct usb_device *usbdev,int cmd1,int cmd2) {
@@ -196,16 +192,18 @@ int toneport_init(struct usb_interface *interface,line6_write_data (line6,0x80c6 , &ticks,4 );/* -seems to work without the first two... -*/ +seems to work without the first two... +*/ /* toneport_send_cmd(usbdev, 0x0201, 0x0002); */ /* toneport_send_cmd(usbdev, 0x0801, 0x0000); */ /* only one that works for me; on GP, TP might be different? */ toneport_send_cmd (usbdev,0x0301 ,0x0000 );if (usbdev->descriptor.idProduct !=LINE6_DEVID_GUITARPORT ) { -CHECK_RETURN (device_create_file (&interface->dev, &dev_attr_led_red)); -CHECK_RETURN (device_create_file (&interface->dev, &dev_attr_led_green)); +CHECK_RETURN (device_create_file + (&interface->dev, &dev_attr_led_red)); +CHECK_RETURN (device_create_file + (&interface->dev, &dev_attr_led_green));toneport_update_led (&usbdev->dev); }
@@ -223,7 +221,8 @@ void toneport_disconnect(struct usb_interface *interface)return ; toneport =usb_get_intfdata (interface); -if (toneport->line6.usbdev->descriptor.idProduct !=LINE6_DEVID_GUITARPORT ) { +if (toneport->line6.usbdev->descriptor.idProduct != +LINE6_DEVID_GUITARPORT ) {device_remove_file (&interface->dev, &dev_attr_led_red);device_remove_file (&interface->dev, &dev_attr_led_green); }
Signature · 1 line
1.6.5
PATCH 10/13 staging: line6: Convert simple_strtol to strict_strtol in toneport.c
In reply to Shawn Bohrer--- drivers/staging/line6/toneport.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-)
drivers/staging/line6/toneport.c +16 -4
@@ -96,8 +96,14 @@ static ssize_t toneport_set_led_red(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - char *c; - led_red =simple_strtol (buf, &c,10 ); + int retval; +long value; + + retval =strict_strtol (buf,10 , &value); +if (retval) +return retval; + + led_red = value;toneport_update_led (dev);return count; }
@@ -106,8 +112,14 @@ static ssize_t toneport_set_led_green(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - char *c; - led_green =simple_strtol (buf, &c,10 ); + int retval; +long value; + + retval =strict_strtol (buf,10 , &value); +if (retval) +return retval; + + led_green = value;toneport_update_led (dev);return count; }
Signature · 1 line
1.6.5
PATCH 11/13 staging: line6: Convert simple_strtoul to strict_strtoul in variax.c
In reply to Shawn Bohrer--- drivers/staging/line6/variax.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-)
drivers/staging/line6/variax.c +26 -5
@@ -184,7 +184,12 @@ static ssize_t variax_set_volume(struct device *dev, const char *buf, size_t count) {struct usb_line6_variax *variax =usb_get_intfdata (to_usb_interface (dev)); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret;if (line6_transmit_parameter (&variax->line6, VARIAXMIDI_volume, value) ==0 )
@@ -211,7 +216,12 @@ static ssize_t variax_set_model(struct device *dev, const char *buf, size_t count) {struct usb_line6_variax *variax =usb_get_intfdata (to_usb_interface (dev)); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret;if (line6_send_program (&variax->line6, value) ==0 ) variax->model = value;
@@ -237,8 +247,14 @@ static ssize_t variax_set_active(struct device *dev, const char *buf, size_t count) {struct usb_line6_variax *variax =usb_get_intfdata (to_usb_interface (dev)); -int value =simple_strtoul (buf,NULL ,10 ) ?1 :0 ; - variax->buffer_activate[VARIAX_OFFSET_ACTIVATE ] = value; +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; + + variax->buffer_activate[VARIAX_OFFSET_ACTIVATE ] = value ?1 :0 ;line6_send_raw_message_async (&variax->line6, variax->buffer_activate,sizeof (variax_activate));return count;
@@ -262,7 +278,12 @@ static ssize_t variax_set_tone(struct device *dev, const char *buf, size_t count) {struct usb_line6_variax *variax =usb_get_intfdata (to_usb_interface (dev)); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret;if (line6_transmit_parameter (&variax->line6, VARIAXMIDI_tone, value) ==0 )
Signature · 1 line
1.6.5
PATCH 12/13 staging: line6: Convert simple_strtoul to strict_strtoul in pod.c
In reply to Shawn Bohrer--- drivers/staging/line6/pod.c | 56 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 47 insertions(+), 9 deletions(-)
drivers/staging/line6/pod.c +47 -9
@@ -422,13 +422,21 @@ void pod_transmit_parameter(struct usb_line6_pod *pod, int param, int value)/* Resolve value to memory location. */ -static void pod_resolve (const char *buf,short block0,short block1,unsigned char *location) +static int pod_resolve (const char *buf,short block0,short block1,unsigned char *location) { -int value =simple_strtoul (buf,NULL ,10 ); -short block = (value <0x40 ) ? block0 : block1; +unsigned long value; +short block; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; + + block = (value <0x40 ) ? block0 : block1; value &=0x3f ; location[0 ] = block >>7 ; location[1 ] = value | (block &0x7f ); +return 0 ; }/*
@@ -438,14 +446,20 @@ static ssize_t pod_send_store_command(struct device *dev, const char *buf, size_ {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface); - +int ret;int size =3 +sizeof (pod->prog_data_buf);char *sysex =pod_alloc_sysex_buffer (pod,POD_SYSEX_STORE , size); +if (!sysex)return 0 ; sysex[SYSEX_DATA_OFS ] =5 ;/* see pod_dump() */ -pod_resolve (buf, block0, block1, sysex +SYSEX_DATA_OFS +1 ); + ret =pod_resolve (buf, block0, block1, sysex +SYSEX_DATA_OFS +1 ); +if (ret) { +kfree (sysex); +return ret; + } +memcpy (sysex +SYSEX_DATA_OFS +3 , &pod->prog_data_buf,sizeof (pod->prog_data_buf));line6_send_sysex_message (&pod->line6, sysex, size);
@@ -461,13 +475,18 @@ static ssize_t pod_send_retrieve_command(struct device *dev, const char *buf, si {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface); +int ret;int size =4 ;char *sysex =pod_alloc_sysex_buffer (pod,POD_SYSEX_DUMPMEM , size);if (!sysex)return 0 ; -pod_resolve (buf, block0, block1, sysex +SYSEX_DATA_OFS ); + ret =pod_resolve (buf, block0, block1, sysex +SYSEX_DATA_OFS ); +if (ret) { +kfree (sysex); +return ret; + } sysex[SYSEX_DATA_OFS +2 ] =0 ; sysex[SYSEX_DATA_OFS +3 ] =0 ;line6_dump_started (&pod->dumpreq,POD_DUMP_MEMORY );
@@ -526,7 +545,13 @@ static ssize_t pod_set_channel(struct device *dev, {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; +pod_send_channel (pod, value);return count; }
@@ -645,6 +670,8 @@ static ssize_t pod_set_system_param(struct usb_line6_pod *pod, const char *buf,char *sysex;static const int size =5 ;unsigned short value; +unsigned long result; +int ret;if (((pod->prog_data.control[POD_tuner] &0x40 ) ==0 ) && tuner)return -EINVAL ;
@@ -653,7 +680,12 @@ static ssize_t pod_set_system_param(struct usb_line6_pod *pod, const char *buf, sysex =pod_alloc_sysex_buffer (pod,POD_SYSEX_SYSTEM , size);if (!sysex)return 0 ; - value =simple_strtoul (buf,NULL ,10 ) & mask; + + ret =strict_strtoul (buf,10 , &result); +if (ret) +return ret; + + value = result & mask; sysex[SYSEX_DATA_OFS ] = code; sysex[SYSEX_DATA_OFS +1 ] = (value >>12 ) &0x0f ; sysex[SYSEX_DATA_OFS +2 ] = (value >>8 ) &0x0f ;
@@ -812,7 +844,13 @@ static ssize_t pod_set_midi_postprocess(struct device *dev, {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6_pod *pod =usb_get_intfdata (interface); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; + pod->midi_postprocess = value ?1 :0 ;return count; }
Signature · 1 line
1.6.5
PATCH 13/13 staging: line6: Convert simple_strtoul to strict_strtoul in midi.c
In reply to Shawn Bohrer--- drivers/staging/line6/midi.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
drivers/staging/line6/midi.c +14 -2
@@ -318,7 +318,13 @@ static ssize_t midi_set_midi_mask_transmit(struct device *dev, {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6 *line6 =usb_get_intfdata (interface); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; + line6->line6midi->midi_mask_transmit = value;return count; }
@@ -344,7 +350,13 @@ static ssize_t midi_set_midi_mask_receive(struct device *dev, {struct usb_interface *interface =to_usb_interface (dev);struct usb_line6 *line6 =usb_get_intfdata (interface); -int value =simple_strtoul (buf,NULL ,10 ); +unsigned long value; +int ret; + + ret =strict_strtoul (buf,10 , &value); +if (ret) +return ret; + line6->line6midi->midi_mask_receive = value;return count; }
Signature · 1 line
1.6.5