public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-28 14:50:08 +01:00
parent fd9301d33f
commit 129b3be689
9 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sound/usb/line6/driver.c
View file

@ -22,7 +22,6 @@
#include "driver.h" #include "driver.h"
#include "midi.h" #include "midi.h"
#include "playback.h" #include "playback.h"
#include "usbdefs.h"
#define DRIVER_AUTHOR "Markus Grabner <grabner@icg.tugraz.at>" #define DRIVER_AUTHOR "Markus Grabner <grabner@icg.tugraz.at>"
#define DRIVER_DESC "Line 6 USB Driver" #define DRIVER_DESC "Line 6 USB Driver"

16
sound/usb/line6/driver.h
View file

@ -20,6 +20,12 @@
#define DRIVER_NAME "line6usb" #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_TIMEOUT 1
#define LINE6_BUFSIZE_LISTEN 32 #define LINE6_BUFSIZE_LISTEN 32
#define LINE6_MESSAGE_MAXLEN 256 #define LINE6_MESSAGE_MAXLEN 256
@ -84,6 +90,16 @@ struct line6_properties {
unsigned ep_audio_w; 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. Common data shared by all Line 6 devices.
Corresponds to a pair of USB endpoints. Corresponds to a pair of USB endpoints.

1
sound/usb/line6/midi.c
View file

@ -17,7 +17,6 @@
#include "driver.h" #include "driver.h"
#include "midi.h" #include "midi.h"
#include "usbdefs.h"
#define line6_rawmidi_substream_midi(substream) \ #define line6_rawmidi_substream_midi(substream) \
((struct snd_line6_midi *)((substream)->rmidi->private_data)) ((struct snd_line6_midi *)((substream)->rmidi->private_data))

1
sound/usb/line6/pcm.h
View file

@ -19,7 +19,6 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include "driver.h" #include "driver.h"
#include "usbdefs.h"
/* number of URBs */ /* number of URBs */
#define LINE6_ISO_BUFFERS 2 #define LINE6_ISO_BUFFERS 2

1
sound/usb/line6/pod.c
View file

@ -21,7 +21,6 @@
#include "capture.h" #include "capture.h"
#include "driver.h" #include "driver.h"
#include "playback.h" #include "playback.h"
#include "usbdefs.h"
/* /*
Locate name in binary program dump Locate name in binary program dump

1
sound/usb/line6/podhd.c
View file

@ -17,7 +17,6 @@
#include "driver.h" #include "driver.h"
#include "pcm.h" #include "pcm.h"
#include "usbdefs.h"
enum { enum {
LINE6_PODHD300, LINE6_PODHD300,

1
sound/usb/line6/toneport.c
View file

@ -21,7 +21,6 @@
#include "capture.h" #include "capture.h"
#include "driver.h" #include "driver.h"
#include "playback.h" #include "playback.h"
#include "usbdefs.h"
enum line6_device_type { enum line6_device_type {
LINE6_GUITARPORT, LINE6_GUITARPORT,

27
sound/usb/line6/usbdefs.h
View file

@ -1,27 +0,0 @@
/*
* Line 6 Linux USB driver
*
* Copyright (C) 2005-2008 Markus Grabner (grabner@icg.tugraz.at)
*
* 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

1
sound/usb/line6/variax.c
View file

@ -17,7 +17,6 @@
#include <sound/core.h> #include <sound/core.h>
#include "driver.h" #include "driver.h"
#include "usbdefs.h"
#define VARIAX_STARTUP_DELAY1 1000 #define VARIAX_STARTUP_DELAY1 1000
#define VARIAX_STARTUP_DELAY3 100 #define VARIAX_STARTUP_DELAY3 100