Yet another line6 cleanups
cover Yet another line6 cleanups
OK, I did enough for this month.
The only real fix is the first patch for big-endianess. The rest are rather cleanups and beautifying the code.
As usual, the latest code is found in test/line6 branch.
thanks,
Takashi
===
Takashi Iwai (7):
ALSA: line6: Fix volume calculation for big-endian
ALSA: line6: Tidy up and typo fixes in comments
ALSA: line6: Remove revision.h
ALSA: line6: Move the contents of usbdefs.h into driver.h
ALSA: line6: Remove struct usb_line6_podhd
ALSA: line6: Remove invalid capability bits for PODxt Live Variax
ALSA: line6: Remove snd_line6_ prefix of pcm property fields
sound/usb/line6/capture.c | 5 ++- sound/usb/line6/driver.c | 4 +-- sound/usb/line6/driver.h | 89 ++++++++++++++++++++-------------------------- sound/usb/line6/midi.c | 1 - sound/usb/line6/midi.h | 32 +++++------------ sound/usb/line6/pcm.h | 57 +++++++++-------------------- sound/usb/line6/playback.c | 24 +++++++------ sound/usb/line6/pod.c | 39 ++++++-------------- sound/usb/line6/podhd.c | 16 +++------ sound/usb/line6/revision.h | 4 --- sound/usb/line6/toneport.c | 31 +++++----------- sound/usb/line6/usbdefs.h | 27 -------------- sound/usb/line6/variax.c | 25 ++++--------- 13 files changed, 109 insertions(+), 245 deletions(-) delete mode 100644 sound/usb/line6/revision.h delete mode 100644 sound/usb/line6/usbdefs.h
Signature · 1 line
2.2.2
PATCH 1/7 ALSA: line6: Fix volume calculation for big-endian
--- sound/usb/line6/playback.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
sound/usb/line6/playback.c +9 -4
@@ -37,8 +37,10 @@ static void change_volume(struct urb *urb_out, int volume[], buf_end = p + urb_out->transfer_buffer_length /sizeof (*p);for (; p < buf_end; ++p) { -int val = (*p * volume[chn &1 ]) >>8 ; - *p =clamp (val,0x7fff ,-0x8000 ); +short pv =le16_to_cpu (*p); +int val = (pv * volume[chn &1 ]) >>8 ; + pv =clamp (val,0x7fff ,-0x8000 ); + *p =cpu_to_le16 (pv); ++chn; } }else if (bytes_per_frame ==6 ) {
@@ -121,8 +123,11 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal, buf_end = po + urb_out->transfer_buffer_length /sizeof (*po);for (; po < buf_end; ++pi, ++po) { -int val = *po + ((*pi * volume) >>8 ); - *po =clamp (val,0x7fff ,-0x8000 ); +short pov =le16_to_cpu (*po); +short piv =le16_to_cpu (*pi); +int val = pov + ((piv * volume) >>8 ); + pov =clamp (val,0x7fff ,-0x8000 ); + *po =cpu_to_le16 (pov); } }
Signature · 1 line
2.2.2
PATCH v2 1/7 ALSA: line6: Fix volume calculation for big-endian
---v1->v2: fix the type to __le16, as sparse warns
sound/usb/line6/playback.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
sound/usb/line6/playback.c +11 -6
@@ -31,14 +31,16 @@ static void change_volume(struct urb *urb_out, int volume[],return ;/* maximum volume - no change */ if (bytes_per_frame ==4 ) { -short *p, *buf_end; +__le16 *p, *buf_end; p = (short *)urb_out->transfer_buffer; buf_end = p + urb_out->transfer_buffer_length /sizeof (*p);for (; p < buf_end; ++p) { -int val = (*p * volume[chn &1 ]) >>8 ; - *p =clamp (val,0x7fff ,-0x8000 ); +short pv =le16_to_cpu (*p); +int val = (pv * volume[chn &1 ]) >>8 ; + pv =clamp (val,0x7fff ,-0x8000 ); + *p =cpu_to_le16 (pv); ++chn; } }else if (bytes_per_frame ==6 ) {
@@ -114,15 +116,18 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal,return ;/* zero volume - no change */ if (bytes_per_frame ==4 ) { -short *pi, *po, *buf_end; +__le16 *pi, *po, *buf_end; pi = (short *)signal; po = (short *)urb_out->transfer_buffer; buf_end = po + urb_out->transfer_buffer_length /sizeof (*po);for (; po < buf_end; ++pi, ++po) { -int val = *po + ((*pi * volume) >>8 ); - *po =clamp (val,0x7fff ,-0x8000 ); +short pov =le16_to_cpu (*po); +short piv =le16_to_cpu (*pi); +int val = pov + ((piv * volume) >>8 ); + pov =clamp (val,0x7fff ,-0x8000 ); + *po =cpu_to_le16 (pov); } }
Signature · 1 line
2.2.2
PATCH 2/7 ALSA: line6: Tidy up and typo fixes in comments
In reply to Takashi IwaiJust reformatting the comments and typos fixed, no functional changes. Particularly,
- avoid the kerneldoc marker "/**",
- reduce multiple comment lines into single lines,
- corrected wrongly referred function names
--- sound/usb/line6/driver.c | 2 +- sound/usb/line6/driver.h | 73 ++++++++++++++-------------------------------- sound/usb/line6/midi.h | 32 +++++--------------- sound/usb/line6/pcm.h | 52 +++++++++------------------------ sound/usb/line6/pod.c | 32 +++++--------------- sound/usb/line6/podhd.c | 4 +-- sound/usb/line6/toneport.c | 24 ++++----------- sound/usb/line6/variax.c | 20 ++++--------- 8 files changed, 65 insertions(+), 174 deletions(-)
sound/usb/line6/driver.c +1 -1
@@ -44,7 +44,7 @@ static const char line6_request_version[] = {0xf0 ,0x7e ,0x7f ,0x06 ,0x01 ,0xf7 }; -/** +/* Class for asynchronous messages. */ struct message {
sound/usb/line6/driver.h +22 -51
118 lines not on this page · raw message
sound/usb/line6/midi.h +8 -24
@@ -19,44 +19,28 @@#define MIDI_BUFFER_SIZE 1024struct snd_line6_midi { -/** -Pointer back to the Line 6 driver data structure. -*/ +/* Pointer back to the Line 6 driver data structure */ struct usb_line6 *line6; -/** -MIDI substream for receiving (or NULL if not active). -*/ +/* MIDI substream for receiving (or NULL if not active) */ struct snd_rawmidi_substream *substream_receive; -/** -MIDI substream for transmitting (or NULL if not active). -*/ +/* MIDI substream for transmitting (or NULL if not active) */ struct snd_rawmidi_substream *substream_transmit; -/** -Number of currently active MIDI send URBs. -*/ +/* Number of currently active MIDI send URBs */ int num_active_send_urbs; -/** -Spin lock to protect MIDI buffer handling. -*/ +/* Spin lock to protect MIDI buffer handling */ spinlock_t lock; -/** -Wait queue for MIDI transmission. -*/ +/* Wait queue for MIDI transmission */ wait_queue_head_t send_wait; -/** -Buffer for incoming MIDI stream. -*/ +/* Buffer for incoming MIDI stream */ struct midi_buffer midibuf_in; -/** -Buffer for outgoing MIDI stream. -*/ +/* Buffer for outgoing MIDI stream */ struct midi_buffer midibuf_out; };
sound/usb/line6/pcm.h +14 -38
90 lines not on this page · raw message
sound/usb/line6/pod.c +8 -24
@@ -58,44 +58,28 @@ enum { };struct usb_line6_pod { -/** -Generic Line 6 USB data. -*/ +/* Generic Line 6 USB data */ struct usb_line6 line6; -/** -Instrument monitor level. -*/ +/* Instrument monitor level */ int monitor_level; -/** -Timer for device initializaton. -*/ +/* Timer for device initialization */ struct timer_list startup_timer; -/** -Work handler for device initializaton. -*/ +/* Work handler for device initialization */ struct work_struct startup_work; -/** -Current progress in startup procedure. -*/ +/* Current progress in startup procedure */ int startup_progress; -/** -Serial number of device. -*/ +/* Serial number of device */ int serial_number; -/** -Firmware version (x 100). -*/ +/* Firmware version (x 100) */ int firmware_version; -/** -Device ID. -*/ +/* Device ID */ int device_id; };
sound/usb/line6/podhd.c +1 -3
@@ -27,9 +27,7 @@ enum { };struct usb_line6_podhd { -/** -Generic Line 6 USB data. -*/ +/* Generic Line 6 USB data */ struct usb_line6 line6; };
sound/usb/line6/toneport.c +6 -18
@@ -43,34 +43,22 @@ struct toneport_led { };struct usb_line6_toneport { -/** -Generic Line 6 USB data. -*/ +/* Generic Line 6 USB data */ struct usb_line6 line6; -/** -Source selector. -*/ +/* Source selector */ int source; -/** -Serial number of device. -*/ +/* Serial number of device */ int serial_number; -/** -Firmware version (x 100). -*/ +/* Firmware version (x 100) */ int firmware_version; -/** -Timer for delayed PCM startup. -*/ +/* Timer for delayed PCM startup */ struct timer_list timer; -/** -Device type. -*/ +/* Device type */ enum line6_device_type type;/* LED instances */
sound/usb/line6/variax.c +5 -15
@@ -42,30 +42,20 @@ enum { };struct usb_line6_variax { -/** -Generic Line 6 USB data. -*/ +/* Generic Line 6 USB data */ struct usb_line6 line6; -/** -Buffer for activation code. -*/ +/* Buffer for activation code */ unsigned char *buffer_activate; -/** -Handler for device initializaton. -*/ +/* Handler for device initialization */ struct work_struct startup_work; -/** -Timers for device initializaton. -*/ +/* Timers for device initialization */ struct timer_list startup_timer1;struct timer_list startup_timer2; -/** -Current progress in startup procedure. -*/ +/* Current progress in startup procedure */ int startup_progress; };
Signature · 1 line
2.2.2
PATCH 3/7 ALSA: line6: Remove revision.h
In reply to Takashi IwaiThe definition is no longer used.
--- sound/usb/line6/driver.c | 1 - sound/usb/line6/revision.h | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 sound/usb/line6/revision.h
sound/usb/line6/driver.c +0 -1
@@ -22,7 +22,6 @@#include "driver.h" #include "midi.h" #include "playback.h" -#include "revision.h" #include "usbdefs.h" #define DRIVER_AUTHOR "Markus Grabner <[email protected]>"
sound/usb/line6/revision.h deleted +0 -4
@@ -1,4 +0,0 @@ -#ifndef DRIVER_REVISION -/* current subversion revision */ -#define DRIVER_REVISION " (904)" -#endif
Signature · 1 line
2.2.2
PATCH 4/7 ALSA: line6: Move the contents of usbdefs.h into driver.h
In reply to Takashi IwaiMost of them are rather relevant with the definitions in driver.h, and there are only a few lines, so just rip it off.
--- sound/usb/line6/driver.c | 1 - sound/usb/line6/driver.h | 16 ++++++++++++++++ sound/usb/line6/midi.c | 1 - sound/usb/line6/pcm.h | 1 - sound/usb/line6/pod.c | 1 - sound/usb/line6/podhd.c | 1 - sound/usb/line6/toneport.c | 1 - sound/usb/line6/usbdefs.h | 27 --------------------------- sound/usb/line6/variax.c | 1 - 9 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 sound/usb/line6/usbdefs.h
sound/usb/line6/driver.c +0 -1
@@ -22,7 +22,6 @@#include "driver.h" #include "midi.h" #include "playback.h" -#include "usbdefs.h" #define DRIVER_AUTHOR "Markus Grabner <[email protected]>"#define DRIVER_DESC "Line 6 USB Driver"
sound/usb/line6/driver.h +16 -0
@@ -20,6 +20,12 @@#define DRIVER_NAME "line6usb" +#define USB_INTERVALS_PER_SECOND 1000 + +/* Fallback USB interval and max packet size values */ +#define LINE6_FALLBACK_INTERVAL 10 +#define LINE6_FALLBACK_MAXPACKETSIZE 16 +#define LINE6_TIMEOUT 1#define LINE6_BUFSIZE_LISTEN 32#define LINE6_MESSAGE_MAXLEN 256
@@ -84,6 +90,16 @@ struct line6_properties {unsigned ep_audio_w; }; +/* Capability bits */ +enum { +/* device supports settings parameter via USB */ +LINE6_CAP_CONTROL =1 <<0 , +/* device supports PCM input/output via USB */ +LINE6_CAP_PCM =1 <<1 , +/* device support hardware monitoring */ +LINE6_CAP_HWMON =1 <<2 , +}; +/* Common data shared by all Line 6 devices. Corresponds to a pair of USB endpoints.
sound/usb/line6/midi.c +0 -1
@@ -17,7 +17,6 @@#include "driver.h" #include "midi.h" -#include "usbdefs.h" #define line6_rawmidi_substream_midi (substream) \ ((struct snd_line6_midi *)((substream)->rmidi->private_data))
sound/usb/line6/pcm.h +0 -1
@@ -19,7 +19,6 @@#include <sound/pcm.h> #include "driver.h" -#include "usbdefs.h" /* number of URBs */ #define LINE6_ISO_BUFFERS 2
sound/usb/line6/pod.c +0 -1
@@ -21,7 +21,6 @@#include "capture.h" #include "driver.h" #include "playback.h" -#include "usbdefs.h" /* Locate name in binary program dump
sound/usb/line6/podhd.c +0 -1
@@ -17,7 +17,6 @@#include "driver.h" #include "pcm.h" -#include "usbdefs.h" enum {LINE6_PODHD300 ,
sound/usb/line6/toneport.c +0 -1
@@ -21,7 +21,6 @@#include "capture.h" #include "driver.h" #include "playback.h" -#include "usbdefs.h" enum line6_device_type {LINE6_GUITARPORT ,
sound/usb/line6/usbdefs.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* -* Line 6 Linux USB driver -* -* Copyright (C) 2005-2008 Markus Grabner ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation, version 2. -* -*/ - -#ifndef USBDEFS_H -#define USBDEFS_H - -#define USB_INTERVALS_PER_SECOND 1000 - -/* device supports settings parameter via USB */ -#define LINE6_CAP_CONTROL (1 << 0) -/* device supports PCM input/output via USB */ -#define LINE6_CAP_PCM (1 << 1) -/* device support hardware monitoring */ -#define LINE6_CAP_HWMON (1 << 2) - -#define LINE6_FALLBACK_INTERVAL 10 -#define LINE6_FALLBACK_MAXPACKETSIZE 16 - -#endif
sound/usb/line6/variax.c +0 -1
@@ -17,7 +17,6 @@#include <sound/core.h> #include "driver.h" -#include "usbdefs.h" #define VARIAX_STARTUP_DELAY1 1000#define VARIAX_STARTUP_DELAY3 100
Signature · 1 line
2.2.2
PATCH 5/7 ALSA: line6: Remove struct usb_line6_podhd
In reply to Takashi IwaiIt's identical with struct usb_line6.
--- sound/usb/line6/podhd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
sound/usb/line6/podhd.c +1 -6
@@ -25,11 +25,6 @@ enum { LINE6_PODHD500_1, }; -struct usb_line6_podhd { -/* Generic Line 6 USB data */ -struct usb_line6 line6; -}; -#define PODHD_BYTES_PER_FRAME 6/* 24bit audio (stereo) */ static struct snd_ratden podhd_ratden = {
@@ -176,7 +171,7 @@ static int podhd_probe(struct usb_interface *interface, {return line6_probe (interface, id, &podhd_properties_table[id->driver_info], - podhd_init,sizeof (struct usb_line6_podhd )); + podhd_init,sizeof (struct usb_line6 )); }static struct usb_driver podhd_driver = {
Signature · 1 line
2.2.2
PATCH 6/7 ALSA: line6: Remove invalid capability bits for PODxt Live Variax
In reply to Takashi IwaiPODxt Live Variax doesn't have PCM and HWMON but only MIDI.
--- sound/usb/line6/variax.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/usb/line6/variax.c +1 -3
@@ -259,9 +259,7 @@ static const struct line6_properties variax_properties_table[] = { [LINE6_PODXTLIVE_VARIAX] = { .id = "PODxtLive", .name = "PODxt Live", - .capabilities =LINE6_CAP_CONTROL - |LINE6_CAP_PCM - | LINE6_CAP_HWMON, + .capabilities = LINE6_CAP_CONTROL, .altsetting = 1, .ep_ctrl_r = 0x86, .ep_ctrl_w = 0x05,
Signature · 1 line
2.2.2
PATCH 7/7 ALSA: line6: Remove snd_line6_ prefix of pcm property fields
In reply to Takashi IwaiIt's just superfluous and doesn't give any better readability.
--- sound/usb/line6/capture.c | 5 ++--- sound/usb/line6/pcm.h | 4 ++-- sound/usb/line6/playback.c | 11 +++++------ sound/usb/line6/pod.c | 6 +++--- sound/usb/line6/podhd.c | 6 +++--- sound/usb/line6/toneport.c | 6 +++--- 6 files changed, 18 insertions(+), 20 deletions(-)
sound/usb/line6/capture.c +2 -3
@@ -216,12 +216,11 @@ 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->rates);if (err <0 )return err; - runtime->hw = line6pcm->properties->snd_line6_capture_hw; + runtime->hw = line6pcm->properties->capture_hw;return 0 ; }
sound/usb/line6/pcm.h +2 -2
@@ -83,8 +83,8 @@ enum { };struct line6_pcm_properties { -struct snd_pcm_hardware snd_line6_playback_hw, snd_line6_capture_hw; -struct snd_pcm_hw_constraint_ratdens snd_line6_rates; +struct snd_pcm_hardware playback_hw, capture_hw; +struct snd_pcm_hw_constraint_ratdens rates;int bytes_per_frame; };
sound/usb/line6/playback.c +5 -6
@@ -148,10 +148,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)int ret;const int bytes_per_frame = line6pcm->properties->bytes_per_frame;const int frame_increment = - line6pcm->properties->snd_line6_rates.rats[0 ].num_min; + line6pcm->properties->rates.rats[0 ].num_min;const int frame_factor = - line6pcm->properties->snd_line6_rates.rats[0 ].den * - (USB_INTERVALS_PER_SECOND /LINE6_ISO_INTERVAL ); + line6pcm->properties->rates.rats[0 ].den * + (USB_INTERVALS_PER_SECOND /LINE6_ISO_INTERVAL );struct urb *urb_out; index =
@@ -370,12 +370,11 @@ 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->rates);if (err <0 )return err; - runtime->hw = line6pcm->properties->snd_line6_playback_hw; + runtime->hw = line6pcm->properties->playback_hw;return 0 ; }
sound/usb/line6/pod.c +3 -3
@@ -129,7 +129,7 @@ static struct snd_ratden pod_ratden = { };static struct line6_pcm_properties pod_pcm_properties = { - .snd_line6_playback_hw = { + .playback_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -147,7 +147,7 @@ static struct line6_pcm_properties pod_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_capture_hw = { + .capture_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -164,7 +164,7 @@ static struct line6_pcm_properties pod_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_rates = { + .rates = { .nrats = 1, .rats = &pod_ratden}, .bytes_per_frame =POD_BYTES_PER_FRAME
sound/usb/line6/podhd.c +3 -3
@@ -35,7 +35,7 @@ static struct snd_ratden podhd_ratden = { };static struct line6_pcm_properties podhd_pcm_properties = { - .snd_line6_playback_hw = { + .playback_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -53,7 +53,7 @@ static struct line6_pcm_properties podhd_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_capture_hw = { + .capture_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -70,7 +70,7 @@ static struct line6_pcm_properties podhd_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_rates = { + .rates = { .nrats = 1, .rats = &podhd_ratden}, .bytes_per_frame =PODHD_BYTES_PER_FRAME
sound/usb/line6/toneport.c +3 -3
@@ -76,7 +76,7 @@ static struct snd_ratden toneport_ratden = { };static struct line6_pcm_properties toneport_pcm_properties = { - .snd_line6_playback_hw = { + .playback_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -94,7 +94,7 @@ static struct line6_pcm_properties toneport_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_capture_hw = { + .capture_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -111,7 +111,7 @@ static struct line6_pcm_properties toneport_pcm_properties = { .period_bytes_max = 8192, .periods_min = 1, .periods_max = 1024}, - .snd_line6_rates = { + .rates = { .nrats = 1, .rats = &toneport_ratden}, .bytes_per_frame =4
Signature · 1 line
2.2.2