Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccddbe4a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Split to each driver 



Split to each individual driver for POD, PODHD, TonePort and Variax
with a core LINE6 helper module.  The new modules follow the standard
ALSA naming rule with snd prefix: snd-usb-pod, snd-usb-podhd,
snd-usb-toneport and snd-usb-variax, together with the corresponding
CONFIG_SND_USB_* Kconfig items.

Tested-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0f2524b3

sound/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,4 +25,4 @@ obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o 
obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o



obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/

obj-$(CONFIG_LINE6_USB)		+= line6/
 
obj-$(CONFIG_SND_USB_LINE6)	+= line6/

sound/usb/line6/Kconfig

+25 −11
Original line number Diff line number Diff line 
menuconfig LINE6_USB

	tristate "Line6 USB support"

	depends on USB && SND

config SND_USB_LINE6

	tristate

	select SND_RAWMIDI

	select SND_PCM



config SND_USB_POD

	tristate "Line6 POD USB support"

	select SND_USB_LINE6

	help

	  This is a driver for the guitar amp, cab, and effects modeller

	  PODxt Pro by Line6 (and similar devices), supporting the

	  following features:

	  This is a driver for PODxt and other similar devices,

	  supporting the following features:

	    * Reading/writing individual parameters

	    * Reading/writing complete channel, effects setup, and amp

	      setup data
@@ -18,14 +20,27 @@ menuconfig LINE6_USB 
	    * Signal routing (record clean/processed guitar signal,

	      re-amping)



	  Preliminary support for the Variax Workbench and TonePort

	  devices is included.

config SND_USB_PODHD

	tristate "Line6 POD HD300/400/500 USB support"

	select SND_USB_LINE6

	help

	  This is a driver for POD HD300, 400 and 500 devices.



if LINE6_USB

config SND_USB_TONEPORT

	tristate "TonePort GX, UX1 and UX2 USB support"

	select SND_USB_LINE6

	help

	  This is a driver for TonePort GX, UX1 and UX2 devices.



config SND_USB_VARIAX

	tristate "Variax Workbench USB support"

	select SND_USB_LINE6

	help

	  This is a driver for Variax Workbench device.



config LINE6_USB_IMPULSE_RESPONSE

	bool "measure impulse response"

	default n

	depends on SND_USB_LINE6

	help

	  Say Y here to add code to measure the impulse response of a Line6

	  device. This is more accurate than user-space methods since it
@@ -35,4 +50,3 @@ config LINE6_USB_IMPULSE_RESPONSE 


	  If unsure, say N.

endif # LINE6_USB

sound/usb/line6/Makefile

+13 −8
Original line number Diff line number Diff line 
obj-$(CONFIG_LINE6_USB)		+= line6usb.o



line6usb-y := 		\

snd-usb-line6-y := 		\

		audio.o		\

		capture.o	\

		driver.o	\

		midi.o		\

		midibuf.o	\

		pcm.o		\

		playback.o	\

		pod.o		\

		toneport.o	\

		variax.o	\

		podhd.o
 
		playback.o



snd-usb-pod-y := pod.o

snd-usb-podhd-y := podhd.o

snd-usb-toneport-y := toneport.o

snd-usb-variax-y := variax.o



obj-$(CONFIG_SND_USB_LINE6)	+= snd-usb-line6.o

obj-$(CONFIG_SND_USB_POD)	+= snd-usb-pod.o

obj-$(CONFIG_SND_USB_PODHD)	+= snd-usb-podhd.o

obj-$(CONFIG_SND_USB_TONEPORT)	+= snd-usb-toneport.o

obj-$(CONFIG_SND_USB_VARIAX)	+= snd-usb-variax.o

sound/usb/line6/audio.c

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int line6_init_audio(struct usb_line6 *line6) 
		dev_name(line6->ifcdev));

	return 0;

}

EXPORT_SYMBOL_GPL(line6_init_audio);



/*

	Register the Line6 USB audio system.
@@ -54,6 +55,7 @@ int line6_register_audio(struct usb_line6 *line6) 


	return 0;

}

EXPORT_SYMBOL_GPL(line6_register_audio);



/*

	Cleanup the Line6 USB audio system.
@@ -69,3 +71,4 @@ void line6_cleanup_audio(struct usb_line6 *line6) 
	snd_card_free(card);

	line6->card = NULL;

}

EXPORT_SYMBOL_GPL(line6_cleanup_audio);

sound/usb/line6/capture.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "capture.h"

#include "driver.h"

#include "pcm.h"

#include "pod.h"



/*

	Find a free URB and submit it.