forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Cc: Clemens Ladisch <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
- Loading branch information
Showing
10 changed files
with
72 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
#include <sound/pcm.h> | ||
#include <sound/pcm_params.h> | ||
#include "../usbaudio.h" | ||
#include "../usbmidi.h" | ||
|
||
MODULE_DESCRIPTION("Edirol UA-101/1000 driver"); | ||
MODULE_AUTHOR("Clemens Ladisch <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,8 @@ | |
#include <sound/initval.h> | ||
|
||
#include "usbaudio.h" | ||
|
||
#include "usbmidi.h" | ||
#include "usbmixer.h" | ||
|
||
MODULE_AUTHOR("Takashi Iwai <[email protected]>"); | ||
MODULE_DESCRIPTION("USB Audio"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,6 +41,7 @@ | |
#include <sound/tlv.h> | ||
|
||
#include "usbaudio.h" | ||
#include "usbmixer.h" | ||
|
||
/* | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,7 @@ | |
#define MODNAME "US122L" | ||
#include "usb_stream.c" | ||
#include "../usbaudio.h" | ||
#include "../usbmidi.h" | ||
#include "us122l.h" | ||
|
||
MODULE_AUTHOR("Karsten Wiese <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters