Commit 129b3be6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Move the contents of usbdefs.h into driver.h 



Most of them are rather relevant with the definitions in driver.h,
and there are only a few lines, so just rip it off.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fd9301d3

sound/usb/line6/driver.c

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

#include "midi.h"

#include "playback.h"

#include "usbdefs.h"



#define DRIVER_AUTHOR  "Markus Grabner <grabner@icg.tugraz.at>"

#define DRIVER_DESC    "Line 6 USB Driver"

sound/usb/line6/driver.h

+16 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "capture.h"

#include "driver.h"

#include "playback.h"

#include "usbdefs.h"



/*

	Locate name in binary program dump