ALSA: usb-audio: header file cleanups
Rename snd-usb-lib to snd-usbmidi-lib as MIDI functions are the only thing it actually contains. Introduce a new header file to only declare these functions. Introduced usbmixer.h for all functions exported by usbmixer.c. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
bc700ab140
commit
3e1aebef6f
@ -3,12 +3,13 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
snd-usb-audio-objs := usbaudio.o usbmixer.o
|
snd-usb-audio-objs := usbaudio.o usbmixer.o
|
||||||
snd-usb-lib-objs := usbmidi.o
|
snd-usbmidi-lib-objs := usbmidi.o
|
||||||
|
|
||||||
# Toplevel Module Dependency
|
# Toplevel Module Dependency
|
||||||
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o
|
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o
|
||||||
obj-$(CONFIG_SND_USB_UA101) += snd-usb-lib.o
|
|
||||||
obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o
|
obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o
|
||||||
obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o
|
obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
|
||||||
|
obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
|
||||||
|
|
||||||
obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/
|
obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include <sound/pcm.h>
|
#include <sound/pcm.h>
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
#include "../usbaudio.h"
|
#include "../usbaudio.h"
|
||||||
|
#include "../usbmidi.h"
|
||||||
|
|
||||||
MODULE_DESCRIPTION("Edirol UA-101/1000 driver");
|
MODULE_DESCRIPTION("Edirol UA-101/1000 driver");
|
||||||
MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
|
MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
|
||||||
|
@ -56,7 +56,8 @@
|
|||||||
#include <sound/initval.h>
|
#include <sound/initval.h>
|
||||||
|
|
||||||
#include "usbaudio.h"
|
#include "usbaudio.h"
|
||||||
|
#include "usbmidi.h"
|
||||||
|
#include "usbmixer.h"
|
||||||
|
|
||||||
MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
|
MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
|
||||||
MODULE_DESCRIPTION("USB Audio");
|
MODULE_DESCRIPTION("USB Audio");
|
||||||
|
@ -21,9 +21,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* maximum number of endpoints per interface */
|
|
||||||
#define MIDI_MAX_ENDPOINTS 2
|
|
||||||
|
|
||||||
/* handling of USB vendor/product ID pairs as 32-bit numbers */
|
/* handling of USB vendor/product ID pairs as 32-bit numbers */
|
||||||
#define USB_ID(vendor, product) (((vendor) << 16) | (product))
|
#define USB_ID(vendor, product) (((vendor) << 16) | (product))
|
||||||
#define USB_ID_VENDOR(id) ((id) >> 16)
|
#define USB_ID_VENDOR(id) ((id) >> 16)
|
||||||
@ -89,39 +86,6 @@ struct snd_usb_audio_quirk {
|
|||||||
const void *data;
|
const void *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* data for QUIRK_MIDI_FIXED_ENDPOINT */
|
|
||||||
struct snd_usb_midi_endpoint_info {
|
|
||||||
int8_t out_ep; /* ep number, 0 autodetect */
|
|
||||||
uint8_t out_interval; /* interval for interrupt endpoints */
|
|
||||||
int8_t in_ep;
|
|
||||||
uint8_t in_interval;
|
|
||||||
uint16_t out_cables; /* bitmask */
|
|
||||||
uint16_t in_cables; /* bitmask */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* for QUIRK_MIDI_YAMAHA, data is NULL */
|
|
||||||
|
|
||||||
/* for QUIRK_MIDI_MIDIMAN, data points to a snd_usb_midi_endpoint_info
|
|
||||||
* structure (out_cables and in_cables only) */
|
|
||||||
|
|
||||||
/* for QUIRK_COMPOSITE, data points to an array of snd_usb_audio_quirk
|
|
||||||
* structures, terminated with .ifnum = -1 */
|
|
||||||
|
|
||||||
/* for QUIRK_AUDIO_FIXED_ENDPOINT, data points to an audioformat structure */
|
|
||||||
|
|
||||||
/* for QUIRK_AUDIO/MIDI_STANDARD_INTERFACE, data is NULL */
|
|
||||||
|
|
||||||
/* for QUIRK_AUDIO_EDIROL_UAXX, data is NULL */
|
|
||||||
|
|
||||||
/* for QUIRK_IGNORE_INTERFACE, data is NULL */
|
|
||||||
|
|
||||||
/* for QUIRK_MIDI_NOVATION and _RAW, data is NULL */
|
|
||||||
|
|
||||||
/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info
|
|
||||||
* structure (out_cables and in_cables only) */
|
|
||||||
|
|
||||||
/* for QUIRK_MIDI_CME, data is NULL */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -148,21 +112,6 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe,
|
|||||||
__u8 request, __u8 requesttype, __u16 value, __u16 index,
|
__u8 request, __u8 requesttype, __u16 value, __u16 index,
|
||||||
void *data, __u16 size, int timeout);
|
void *data, __u16 size, int timeout);
|
||||||
|
|
||||||
int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
|
|
||||||
int ignore_error);
|
|
||||||
void snd_usb_mixer_disconnect(struct list_head *p);
|
|
||||||
|
|
||||||
int snd_usbmidi_create(struct snd_card *card,
|
|
||||||
struct usb_interface *iface,
|
|
||||||
struct list_head *midi_list,
|
|
||||||
const struct snd_usb_audio_quirk *quirk);
|
|
||||||
void snd_usbmidi_input_stop(struct list_head* p);
|
|
||||||
void snd_usbmidi_input_start(struct list_head* p);
|
|
||||||
void snd_usbmidi_disconnect(struct list_head *p);
|
|
||||||
|
|
||||||
void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
|
|
||||||
unsigned char samplerate_id);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* retrieve usb_interface descriptor from the host interface
|
* retrieve usb_interface descriptor from the host interface
|
||||||
* (conditional for compatibility with the older API)
|
* (conditional for compatibility with the older API)
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
#include <sound/rawmidi.h>
|
#include <sound/rawmidi.h>
|
||||||
#include <sound/asequencer.h>
|
#include <sound/asequencer.h>
|
||||||
#include "usbaudio.h"
|
#include "usbaudio.h"
|
||||||
|
#include "usbmidi.h"
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
48
sound/usb/usbmidi.h
Normal file
48
sound/usb/usbmidi.h
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
#ifndef __USBMIDI_H
|
||||||
|
#define __USBMIDI_H
|
||||||
|
|
||||||
|
/* maximum number of endpoints per interface */
|
||||||
|
#define MIDI_MAX_ENDPOINTS 2
|
||||||
|
|
||||||
|
/* data for QUIRK_MIDI_FIXED_ENDPOINT */
|
||||||
|
struct snd_usb_midi_endpoint_info {
|
||||||
|
int8_t out_ep; /* ep number, 0 autodetect */
|
||||||
|
uint8_t out_interval; /* interval for interrupt endpoints */
|
||||||
|
int8_t in_ep;
|
||||||
|
uint8_t in_interval;
|
||||||
|
uint16_t out_cables; /* bitmask */
|
||||||
|
uint16_t in_cables; /* bitmask */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* for QUIRK_MIDI_YAMAHA, data is NULL */
|
||||||
|
|
||||||
|
/* for QUIRK_MIDI_MIDIMAN, data points to a snd_usb_midi_endpoint_info
|
||||||
|
* structure (out_cables and in_cables only) */
|
||||||
|
|
||||||
|
/* for QUIRK_COMPOSITE, data points to an array of snd_usb_audio_quirk
|
||||||
|
* structures, terminated with .ifnum = -1 */
|
||||||
|
|
||||||
|
/* for QUIRK_AUDIO_FIXED_ENDPOINT, data points to an audioformat structure */
|
||||||
|
|
||||||
|
/* for QUIRK_AUDIO/MIDI_STANDARD_INTERFACE, data is NULL */
|
||||||
|
|
||||||
|
/* for QUIRK_AUDIO_EDIROL_UA700_UA25/UA1000, data is NULL */
|
||||||
|
|
||||||
|
/* for QUIRK_IGNORE_INTERFACE, data is NULL */
|
||||||
|
|
||||||
|
/* for QUIRK_MIDI_NOVATION and _RAW, data is NULL */
|
||||||
|
|
||||||
|
/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info
|
||||||
|
* structure (out_cables and in_cables only) */
|
||||||
|
|
||||||
|
/* for QUIRK_MIDI_CME, data is NULL */
|
||||||
|
|
||||||
|
int snd_usbmidi_create(struct snd_card *card,
|
||||||
|
struct usb_interface *iface,
|
||||||
|
struct list_head *midi_list,
|
||||||
|
const struct snd_usb_audio_quirk *quirk);
|
||||||
|
void snd_usbmidi_input_stop(struct list_head* p);
|
||||||
|
void snd_usbmidi_input_start(struct list_head* p);
|
||||||
|
void snd_usbmidi_disconnect(struct list_head *p);
|
||||||
|
|
||||||
|
#endif /* __USBMIDI_H */
|
@ -41,6 +41,7 @@
|
|||||||
#include <sound/tlv.h>
|
#include <sound/tlv.h>
|
||||||
|
|
||||||
#include "usbaudio.h"
|
#include "usbaudio.h"
|
||||||
|
#include "usbmixer.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*/
|
*/
|
||||||
|
11
sound/usb/usbmixer.h
Normal file
11
sound/usb/usbmixer.h
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#ifndef __USBMIXER_H
|
||||||
|
#define __USBMIXER_H
|
||||||
|
|
||||||
|
int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
|
||||||
|
int ignore_error);
|
||||||
|
void snd_usb_mixer_disconnect(struct list_head *p);
|
||||||
|
|
||||||
|
void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
|
||||||
|
unsigned char samplerate_id);
|
||||||
|
|
||||||
|
#endif /* __USBMIXER_H */
|
@ -25,6 +25,7 @@
|
|||||||
#define MODNAME "US122L"
|
#define MODNAME "US122L"
|
||||||
#include "usb_stream.c"
|
#include "usb_stream.c"
|
||||||
#include "../usbaudio.h"
|
#include "../usbaudio.h"
|
||||||
|
#include "../usbmidi.h"
|
||||||
#include "us122l.h"
|
#include "us122l.h"
|
||||||
|
|
||||||
MODULE_AUTHOR("Karsten Wiese <fzu@wemgehoertderstaat.de>");
|
MODULE_AUTHOR("Karsten Wiese <fzu@wemgehoertderstaat.de>");
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef USBUSX2Y_H
|
#ifndef USBUSX2Y_H
|
||||||
#define USBUSX2Y_H
|
#define USBUSX2Y_H
|
||||||
#include "../usbaudio.h"
|
#include "../usbaudio.h"
|
||||||
|
#include "../usbmidi.h"
|
||||||
#include "usbus428ctldefs.h"
|
#include "usbus428ctldefs.h"
|
||||||
|
|
||||||
#define NRURBS 2
|
#define NRURBS 2
|
||||||
|
Loading…
Reference in New Issue
Block a user