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

Commit f09d045e authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

Merge branch 'topic/usb' of... 

Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
parents dc57da38 27762b2c

include/linux/usb/audio-v2.h

0 → 100644
+366 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Daniel Mack <daniel@caiaq.de>

 *

 * This software is distributed under the terms of the GNU General Public

 * License ("GPL") version 2, as published by the Free Software Foundation.

 *

 * This file holds USB constants and structures defined

 * by the USB Device Class Definition for Audio Devices in version 2.0.

 * Comments below reference relevant sections of the documents contained

 * in http://www.usb.org/developers/devclass_docs/Audio2.0_final.zip

 */



#ifndef __LINUX_USB_AUDIO_V2_H

#define __LINUX_USB_AUDIO_V2_H



#include <linux/types.h>



/* v1.0 and v2.0 of this standard have many things in common. For the rest

 * of the definitions, please refer to audio.h */



/* 4.7.2.1 Clock Source Descriptor */



struct uac_clock_source_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bClockID;

	__u8 bmAttributes;

	__u8 bmControls;

	__u8 bAssocTerminal;

	__u8 iClockSource;

} __attribute__((packed));



/* 4.7.2.2 Clock Source Descriptor */



struct uac_clock_selector_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bClockID;

	__u8 bNrInPins;

	__u8 bmControls;

	__u8 baCSourceID[];

} __attribute__((packed));



/* 4.7.2.4 Input terminal descriptor */



struct uac2_input_terminal_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalID;

	__u16 wTerminalType;

	__u8 bAssocTerminal;

	__u8 bCSourceID;

	__u8 bNrChannels;

	__u32 bmChannelConfig;

	__u8 iChannelNames;

	__u16 bmControls;

	__u8 iTerminal;

} __attribute__((packed));



/* 4.7.2.5 Output terminal descriptor */



struct uac2_output_terminal_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalID;

	__u16 wTerminalType;

	__u8 bAssocTerminal;

	__u8 bSourceID;

	__u8 bCSourceID;

	__u16 bmControls;

	__u8 iTerminal;

} __attribute__((packed));







/* 4.7.2.8 Feature Unit Descriptor */



struct uac2_feature_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u8 bSourceID;

	/* bmaControls is actually u32,

	 * but u8 is needed for the hybrid parser */

	__u8 bmaControls[0]; /* variable length */

} __attribute__((packed));



/* 4.9.2 Class-Specific AS Interface Descriptor */



struct uac_as_header_descriptor_v2 {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalLink;

	__u8 bmControls;

	__u8 bFormatType;

	__u32 bmFormats;

	__u8 bNrChannels;

	__u32 bmChannelConfig;

	__u8 iChannelNames;

} __attribute__((packed));





/* A.7 Audio Function Category Codes */

#define UAC2_FUNCTION_SUBCLASS_UNDEFINED	0x00

#define UAC2_FUNCTION_DESKTOP_SPEAKER		0x01

#define UAC2_FUNCTION_HOME_THEATER		0x02

#define UAC2_FUNCTION_MICROPHONE		0x03

#define UAC2_FUNCTION_HEADSET			0x04

#define UAC2_FUNCTION_TELEPHONE			0x05

#define UAC2_FUNCTION_CONVERTER			0x06

#define UAC2_FUNCTION_SOUND_RECORDER		0x07

#define UAC2_FUNCTION_IO_BOX			0x08

#define UAC2_FUNCTION_MUSICAL_INSTRUMENT	0x09

#define UAC2_FUNCTION_PRO_AUDIO			0x0a

#define UAC2_FUNCTION_AUDIO_VIDEO		0x0b

#define UAC2_FUNCTION_CONTROL_PANEL		0x0c

#define UAC2_FUNCTION_OTHER			0xff



/* A.9 Audio Class-Specific AC Interface Descriptor Subtypes */

/* see audio.h for the rest, which is identical to v1 */

#define UAC2_EFFECT_UNIT			0x07

#define UAC2_PROCESSING_UNIT_V2		0x08

#define UAC2_EXTENSION_UNIT_V2		0x09

#define UAC2_CLOCK_SOURCE		0x0a

#define UAC2_CLOCK_SELECTOR		0x0b

#define UAC2_CLOCK_MULTIPLIER		0x0c

#define UAC2_SAMPLE_RATE_CONVERTER	0x0d



/* A.10 Audio Class-Specific AS Interface Descriptor Subtypes */

/* see audio.h for the rest, which is identical to v1 */

#define UAC2_ENCODER			0x03

#define UAC2_DECODER			0x04



/* A.11 Effect Unit Effect Types */

#define UAC2_EFFECT_UNDEFINED		0x00

#define UAC2_EFFECT_PARAM_EQ		0x01

#define UAC2_EFFECT_REVERB		0x02

#define UAC2_EFFECT_MOD_DELAY		0x03

#define UAC2_EFFECT_DYN_RANGE_COMP	0x04



/* A.12 Processing Unit Process Types */

#define UAC2_PROCESS_UNDEFINED		0x00

#define UAC2_PROCESS_UP_DOWNMIX		0x01

#define UAC2_PROCESS_DOLBY_PROLOCIC	0x02

#define UAC2_PROCESS_STEREO_EXTENDER	0x03



/* A.14 Audio Class-Specific Request Codes */

#define UAC2_CS_CUR			0x01

#define UAC2_CS_RANGE			0x02



/* A.15 Encoder Type Codes */

#define UAC2_ENCODER_UNDEFINED		0x00

#define UAC2_ENCODER_OTHER		0x01

#define UAC2_ENCODER_MPEG		0x02

#define UAC2_ENCODER_AC3		0x03

#define UAC2_ENCODER_WMA		0x04

#define UAC2_ENCODER_DTS		0x05



/* A.16 Decoder Type Codes */

#define UAC2_DECODER_UNDEFINED		0x00

#define UAC2_DECODER_OTHER		0x01

#define UAC2_DECODER_MPEG		0x02

#define UAC2_DECODER_AC3		0x03

#define UAC2_DECODER_WMA		0x04

#define UAC2_DECODER_DTS		0x05



/* A.17.1 Clock Source Control Selectors */

#define UAC2_CS_UNDEFINED		0x00

#define UAC2_CS_CONTROL_SAM_FREQ	0x01

#define UAC2_CS_CONTROL_CLOCK_VALID	0x02



/* A.17.2 Clock Selector Control Selectors */

#define UAC2_CX_UNDEFINED		0x00

#define UAC2_CX_CLOCK_SELECTOR		0x01



/* A.17.3 Clock Multiplier Control Selectors */

#define UAC2_CM_UNDEFINED		0x00

#define UAC2_CM_NUMERATOR		0x01

#define UAC2_CM_DENOMINTATOR		0x02



/* A.17.4 Terminal Control Selectors */

#define UAC2_TE_UNDEFINED		0x00

#define UAC2_TE_COPY_PROTECT		0x01

#define UAC2_TE_CONNECTOR		0x02

#define UAC2_TE_OVERLOAD		0x03

#define UAC2_TE_CLUSTER			0x04

#define UAC2_TE_UNDERFLOW		0x05

#define UAC2_TE_OVERFLOW		0x06

#define UAC2_TE_LATENCY			0x07



/* A.17.5 Mixer Control Selectors */

#define UAC2_MU_UNDEFINED		0x00

#define UAC2_MU_MIXER			0x01

#define UAC2_MU_CLUSTER			0x02

#define UAC2_MU_UNDERFLOW		0x03

#define UAC2_MU_OVERFLOW		0x04

#define UAC2_MU_LATENCY			0x05



/* A.17.6 Selector Control Selectors */

#define UAC2_SU_UNDEFINED		0x00

#define UAC2_SU_SELECTOR		0x01

#define UAC2_SU_LATENCY			0x02



/* A.17.7 Feature Unit Control Selectors */

/* see audio.h for the rest, which is identical to v1 */

#define UAC2_FU_INPUT_GAIN		0x0b

#define UAC2_FU_INPUT_GAIN_PAD		0x0c

#define UAC2_FU_PHASE_INVERTER		0x0d

#define UAC2_FU_UNDERFLOW		0x0e

#define UAC2_FU_OVERFLOW		0x0f

#define UAC2_FU_LATENCY			0x10



/* A.17.8.1 Parametric Equalizer Section Effect Unit Control Selectors */

#define UAC2_PE_UNDEFINED		0x00

#define UAC2_PE_ENABLE			0x01

#define UAC2_PE_CENTERFREQ		0x02

#define UAC2_PE_QFACTOR			0x03

#define UAC2_PE_GAIN			0x04

#define UAC2_PE_UNDERFLOW		0x05

#define UAC2_PE_OVERFLOW		0x06

#define UAC2_PE_LATENCY			0x07



/* A.17.8.2 Reverberation Effect Unit Control Selectors */

#define UAC2_RV_UNDEFINED		0x00

#define UAC2_RV_ENABLE			0x01

#define UAC2_RV_TYPE			0x02

#define UAC2_RV_LEVEL			0x03

#define UAC2_RV_TIME			0x04

#define UAC2_RV_FEEDBACK		0x05

#define UAC2_RV_PREDELAY		0x06

#define UAC2_RV_DENSITY			0x07

#define UAC2_RV_HIFREQ_ROLLOFF		0x08

#define UAC2_RV_UNDERFLOW		0x09

#define UAC2_RV_OVERFLOW		0x0a

#define UAC2_RV_LATENCY			0x0b



/* A.17.8.3 Modulation Delay Effect Control Selectors */

#define UAC2_MD_UNDEFINED		0x00

#define UAC2_MD_ENABLE			0x01

#define UAC2_MD_BALANCE			0x02

#define UAC2_MD_RATE			0x03

#define UAC2_MD_DEPTH			0x04

#define UAC2_MD_TIME			0x05

#define UAC2_MD_FEEDBACK		0x06

#define UAC2_MD_UNDERFLOW		0x07

#define UAC2_MD_OVERFLOW		0x08

#define UAC2_MD_LATENCY			0x09



/* A.17.8.4 Dynamic Range Compressor Effect Unit Control Selectors */

#define UAC2_DR_UNDEFINED		0x00

#define UAC2_DR_ENABLE			0x01

#define UAC2_DR_COMPRESSION_RATE	0x02

#define UAC2_DR_MAXAMPL			0x03

#define UAC2_DR_THRESHOLD		0x04

#define UAC2_DR_ATTACK_TIME		0x05

#define UAC2_DR_RELEASE_TIME		0x06

#define UAC2_DR_UNDEFLOW		0x07

#define UAC2_DR_OVERFLOW		0x08

#define UAC2_DR_LATENCY			0x09



/* A.17.9.1 Up/Down-mix Processing Unit Control Selectors */

#define UAC2_UD_UNDEFINED		0x00

#define UAC2_UD_ENABLE			0x01

#define UAC2_UD_MODE_SELECT		0x02

#define UAC2_UD_CLUSTER			0x03

#define UAC2_UD_UNDERFLOW		0x04

#define UAC2_UD_OVERFLOW		0x05

#define UAC2_UD_LATENCY			0x06



/* A.17.9.2 Dolby Prologic[tm] Processing Unit Control Selectors */

#define UAC2_DP_UNDEFINED		0x00

#define UAC2_DP_ENABLE			0x01

#define UAC2_DP_MODE_SELECT		0x02

#define UAC2_DP_CLUSTER			0x03

#define UAC2_DP_UNDERFFLOW		0x04

#define UAC2_DP_OVERFLOW		0x05

#define UAC2_DP_LATENCY			0x06



/* A.17.9.3 Stereo Expander Processing Unit Control Selectors */

#define UAC2_ST_EXT_UNDEFINED		0x00

#define UAC2_ST_EXT_ENABLE		0x01

#define UAC2_ST_EXT_WIDTH		0x02

#define UAC2_ST_EXT_UNDEFLOW		0x03

#define UAC2_ST_EXT_OVERFLOW		0x04

#define UAC2_ST_EXT_LATENCY		0x05



/* A.17.10 Extension Unit Control Selectors */

#define UAC2_XU_UNDEFINED		0x00

#define UAC2_XU_ENABLE			0x01

#define UAC2_XU_CLUSTER			0x02

#define UAC2_XU_UNDERFLOW		0x03

#define UAC2_XU_OVERFLOW		0x04

#define UAC2_XU_LATENCY			0x05



/* A.17.11 AudioStreaming Interface Control Selectors */

#define UAC2_AS_UNDEFINED		0x00

#define UAC2_AS_ACT_ALT_SETTING		0x01

#define UAC2_AS_VAL_ALT_SETTINGS	0x02

#define UAC2_AS_AUDIO_DATA_FORMAT	0x03



/* A.17.12 Encoder Control Selectors */

#define UAC2_EN_UNDEFINED		0x00

#define UAC2_EN_BIT_RATE		0x01

#define UAC2_EN_QUALITY			0x02

#define UAC2_EN_VBR			0x03

#define UAC2_EN_TYPE			0x04

#define UAC2_EN_UNDERFLOW		0x05

#define UAC2_EN_OVERFLOW		0x06

#define UAC2_EN_ENCODER_ERROR		0x07

#define UAC2_EN_PARAM1			0x08

#define UAC2_EN_PARAM2			0x09

#define UAC2_EN_PARAM3			0x0a

#define UAC2_EN_PARAM4			0x0b

#define UAC2_EN_PARAM5			0x0c

#define UAC2_EN_PARAM6			0x0d

#define UAC2_EN_PARAM7			0x0e

#define UAC2_EN_PARAM8			0x0f



/* A.17.13.1 MPEG Decoder Control Selectors */

#define UAC2_MPEG_UNDEFINED		0x00

#define UAC2_MPEG_DUAL_CHANNEL		0x01

#define UAC2_MPEG_SECOND_STEREO		0x02

#define UAC2_MPEG_MULTILINGUAL		0x03

#define UAC2_MPEG_DYN_RANGE		0x04

#define UAC2_MPEG_SCALING		0x05

#define UAC2_MPEG_HILO_SCALING		0x06

#define UAC2_MPEG_UNDERFLOW		0x07

#define UAC2_MPEG_OVERFLOW		0x08

#define UAC2_MPEG_DECODER_ERROR		0x09



/* A17.13.2 AC3 Decoder Control Selectors */

#define UAC2_AC3_UNDEFINED		0x00

#define UAC2_AC3_MODE			0x01

#define UAC2_AC3_DYN_RANGE		0x02

#define UAC2_AC3_SCALING		0x03

#define UAC2_AC3_HILO_SCALING		0x04

#define UAC2_AC3_UNDERFLOW		0x05

#define UAC2_AC3_OVERFLOW		0x06

#define UAC2_AC3_DECODER_ERROR		0x07



/* A17.13.3 WMA Decoder Control Selectors */

#define UAC2_WMA_UNDEFINED		0x00

#define UAC2_WMA_UNDERFLOW		0x01

#define UAC2_WMA_OVERFLOW		0x02

#define UAC2_WMA_DECODER_ERROR		0x03



/* A17.13.4 DTS Decoder Control Selectors */

#define UAC2_DTS_UNDEFINED		0x00

#define UAC2_DTS_UNDERFLOW		0x01

#define UAC2_DTS_OVERFLOW		0x02

#define UAC2_DTS_DECODER_ERROR		0x03



/* A17.14 Endpoint Control Selectors */

#define UAC2_EP_CS_UNDEFINED		0x00

#define UAC2_EP_CS_PITCH		0x01

#define UAC2_EP_CS_DATA_OVERRUN		0x02

#define UAC2_EP_CS_DATA_UNDERRUN	0x03



#endif /* __LINUX_USB_AUDIO_V2_H */

include/linux/usb/audio.h

+157 −53
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
 * Comments below reference relevant sections of that document:

 *

 * http://www.usb.org/developers/devclass_docs/audio10.pdf

 *

 * Types and defines in this file are either specific to version 1.0 of

 * this standard or common for newer versions.

 */



#ifndef __LINUX_USB_AUDIO_H
@@ -20,14 +23,15 @@ 


#include <linux/types.h>



/* bInterfaceProtocol values to denote the version of the standard used */

#define UAC_VERSION_1			0x00

#define UAC_VERSION_2			0x20



/* A.2 Audio Interface Subclass Codes */

#define USB_SUBCLASS_AUDIOCONTROL	0x01

#define USB_SUBCLASS_AUDIOSTREAMING	0x02

#define USB_SUBCLASS_MIDISTREAMING	0x03



#define UAC_VERSION_1			0x00

#define UAC_VERSION_2			0x20



/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */

#define UAC_HEADER			0x01

#define UAC_INPUT_TERMINAL		0x02
@@ -38,15 +42,6 @@ 
#define UAC_PROCESSING_UNIT_V1		0x07

#define UAC_EXTENSION_UNIT_V1		0x08



/* UAC v2.0 types */

#define UAC_EFFECT_UNIT			0x07

#define UAC_PROCESSING_UNIT_V2		0x08

#define UAC_EXTENSION_UNIT_V2		0x09

#define UAC_CLOCK_SOURCE		0x0a

#define UAC_CLOCK_SELECTOR		0x0b

#define UAC_CLOCK_MULTIPLIER		0x0c

#define UAC_SAMPLE_RATE_CONVERTER	0x0d



/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */

#define UAC_AS_GENERAL			0x01

#define UAC_FORMAT_TYPE			0x02
@@ -78,10 +73,6 @@ 


#define UAC_GET_STAT			0xff



/* Audio class v2.0 handles all the parameter calls differently */

#define UAC2_CS_CUR			0x01

#define UAC2_CS_RANGE			0x02



/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */

#define UAC_MS_HEADER			0x01

#define UAC_MIDI_IN_JACK		0x02
@@ -190,6 +181,156 @@ struct uac_feature_unit_descriptor_##ch { \ 
	__u8  iFeature;						\

} __attribute__ ((packed))



/* 4.3.2.3 Mixer Unit Descriptor */

struct uac_mixer_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u8 bNrInPins;

	__u8 baSourceID[];

} __attribute__ ((packed));



static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)

{

	return desc->baSourceID[desc->bNrInPins];

}



static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,

						  int protocol)

{

	if (protocol == UAC_VERSION_1)

		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |

			desc->baSourceID[desc->bNrInPins + 1];

	else

		return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |

			(desc->baSourceID[desc->bNrInPins + 3] << 16) |

			(desc->baSourceID[desc->bNrInPins + 2] << 8)  |

			(desc->baSourceID[desc->bNrInPins + 1]);

}



static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,

						int protocol)

{

	return (protocol == UAC_VERSION_1) ?

		desc->baSourceID[desc->bNrInPins + 3] :

		desc->baSourceID[desc->bNrInPins + 5];

}



static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,

					      int protocol)

{

	return (protocol == UAC_VERSION_1) ?

		&desc->baSourceID[desc->bNrInPins + 4] :

		&desc->baSourceID[desc->bNrInPins + 6];

}



static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)

{

	__u8 *raw = (__u8 *) desc;

	return raw[desc->bLength - 1];

}



/* 4.3.2.4 Selector Unit Descriptor */

struct uac_selector_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUintID;

	__u8 bNrInPins;

	__u8 baSourceID[];

} __attribute__ ((packed));



static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)

{

	__u8 *raw = (__u8 *) desc;

	return raw[desc->bLength - 1];

}



/* 4.3.2.5 Feature Unit Descriptor */

struct uac_feature_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u8 bSourceID;

	__u8 bControlSize;

	__u8 bmaControls[0]; /* variable length */

} __attribute__((packed));



static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)

{

	__u8 *raw = (__u8 *) desc;

	return raw[desc->bLength - 1];

}



/* 4.3.2.6 Processing Unit Descriptors */

struct uac_processing_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u16 wProcessType;

	__u8 bNrInPins;

	__u8 baSourceID[];

} __attribute__ ((packed));



static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)

{

	return desc->baSourceID[desc->bNrInPins];

}



static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,

						       int protocol)

{

	if (protocol == UAC_VERSION_1)

		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |

			desc->baSourceID[desc->bNrInPins + 1];

	else

		return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |

			(desc->baSourceID[desc->bNrInPins + 3] << 16) |

			(desc->baSourceID[desc->bNrInPins + 2] << 8)  |

			(desc->baSourceID[desc->bNrInPins + 1]);

}



static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,

						     int protocol)

{

	return (protocol == UAC_VERSION_1) ?

		desc->baSourceID[desc->bNrInPins + 3] :

		desc->baSourceID[desc->bNrInPins + 5];

}



static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,

						    int protocol)

{

	return (protocol == UAC_VERSION_1) ?

		desc->baSourceID[desc->bNrInPins + 4] :

		desc->baSourceID[desc->bNrInPins + 6];

}



static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,

						   int protocol)

{

	return (protocol == UAC_VERSION_1) ?

		&desc->baSourceID[desc->bNrInPins + 5] :

		&desc->baSourceID[desc->bNrInPins + 7];

}



static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,

						   int protocol)

{

	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);

	return desc->baSourceID[desc->bNrInPins + control_size];

}



static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,

						 int protocol)

{

	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);

	return &desc->baSourceID[desc->bNrInPins + control_size + 1];

}



/* 4.5.2 Class-Specific AS Interface Descriptor */

struct uac_as_header_descriptor_v1 {

	__u8  bLength;			/* in bytes: 7 */
@@ -200,19 +341,6 @@ struct uac_as_header_descriptor_v1 { 
	__le16 wFormatTag;		/* The Audio Data Format */

} __attribute__ ((packed));



struct uac_as_header_descriptor_v2 {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalLink;

	__u8 bmControls;

	__u8 bFormatType;

	__u32 bmFormats;

	__u8 bNrChannels;

	__u32 bmChannelConfig;

	__u8 iChannelNames;

} __attribute__((packed));



#define UAC_DT_AS_HEADER_SIZE		7



/* Formats - A.1.1 Audio Data Format Type I Codes */
@@ -277,7 +405,6 @@ struct uac_format_type_i_ext_descriptor { 
	__u8 bSideBandProtocol;

} __attribute__((packed));





/* Formats - Audio Data Format Type I Codes */



#define UAC_FORMAT_TYPE_II_MPEG	0x1001
@@ -336,31 +463,8 @@ struct uac_iso_endpoint_descriptor { 
#define UAC_EP_CS_ATTR_PITCH_CONTROL	0x02

#define UAC_EP_CS_ATTR_FILL_MAX		0x80



/* Audio class v2.0: CLOCK_SOURCE descriptor */



struct uac_clock_source_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bClockID;

	__u8 bmAttributes;

	__u8 bmControls;

	__u8 bAssocTerminal;

	__u8 iClockSource;

} __attribute__((packed));



/* A.10.2 Feature Unit Control Selectors */



struct uac_feature_unit_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u8 bSourceID;

	__u8 bControlSize;

	__u8 controls[0]; /* variable length */

} __attribute__((packed));



#define UAC_FU_CONTROL_UNDEFINED	0x00

#define UAC_MUTE_CONTROL		0x01

#define UAC_VOLUME_CONTROL		0x02

sound/usb/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ config SND_USB_AUDIO 
	  will be called snd-usb-audio.



config SND_USB_UA101

	tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	tristate "Edirol UA-101/UA-1000 driver"

	select SND_PCM

	select SND_RAWMIDI

	help
@@ -65,6 +64,7 @@ config SND_USB_CAIAQ 
	    * Native Instruments Audio 8 DJ

	    * Native Instruments Guitar Rig Session I/O

	    * Native Instruments Guitar Rig mobile

	    * Native Instruments Traktor Kontrol X1



	   To compile this driver as a module, choose M here: the module

	   will be called snd-usb-caiaq.

sound/usb/Makefile

+18 −8
Original line number Diff line number Diff line
@@ -2,14 +2,24 @@ 
# Makefile for ALSA

#



snd-usb-audio-objs := usbaudio.o usbmixer.o

snd-usb-lib-objs := usbmidi.o

snd-ua101-objs := ua101.o

snd-usb-audio-objs := 	card.o \

			mixer.o \

			mixer_quirks.o \

			proc.o \

			quirks.o \

			format.o \

			endpoint.o \

			urb.o \

			pcm.o \

			helper.o



snd-usbmidi-lib-objs := midi.o



# Toplevel Module Dependency

obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o

obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o snd-usb-lib.o

obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o

obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o

obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o



obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o

obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o

obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o



obj-$(CONFIG_SND) += usx2y/ caiaq/
 
obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/

sound/usb/caiaq/control.c

+78 −21
Original line number Diff line number Diff line
@@ -35,33 +35,41 @@ static int control_info(struct snd_kcontrol *kcontrol, 
	struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);

	int pos = kcontrol->private_value;

	int is_intval = pos & CNT_INTVAL;

	unsigned int id = dev->chip.usb_id;

	int maxval = 63;



	uinfo->count = 1;

	pos &= ~CNT_INTVAL;



	if (id == USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ)

		&& (pos == 0)) {

	switch (dev->chip.usb_id) {

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):

		if (pos == 0) {

			/* current input mode of A8DJ */

			uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

			uinfo->value.integer.min = 0;

			uinfo->value.integer.max = 2;

			return 0;

		}

		break;



	if (id == USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ)

		&& (pos == 0)) {

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):

		if (pos == 0) {

			/* current input mode of A4DJ */

			uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

			uinfo->value.integer.min = 0;

			uinfo->value.integer.max = 1;

			return 0;

		}

		break;



	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):

		maxval = 127;

		break;

	}



	if (is_intval) {

		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

		uinfo->value.integer.min = 0;

		uinfo->value.integer.max = 64;

		uinfo->value.integer.max = maxval;

	} else {

		uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

		uinfo->value.integer.min = 0;
@@ -102,9 +110,10 @@ static int control_put(struct snd_kcontrol *kcontrol, 
	struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);

	struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);

	int pos = kcontrol->private_value;

	unsigned char cmd = EP1_CMD_WRITE_IO;



	if (dev->chip.usb_id ==

		USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ)) {

	switch (dev->chip.usb_id) {

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ): {

		/* A4DJ has only one control */

		/* do not expose hardware input mode 0 */

		dev->control_state[0] = ucontrol->value.integer.value[0] + 1;
@@ -113,10 +122,15 @@ static int control_put(struct snd_kcontrol *kcontrol, 
		return 1;

	}



	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):

		cmd = EP1_CMD_DIMM_LEDS;

		break;

	}



	if (pos & CNT_INTVAL) {

		dev->control_state[pos & ~CNT_INTVAL]

			= ucontrol->value.integer.value[0];

		snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO,

		snd_usb_caiaq_send_command(dev, cmd,

				dev->control_state, sizeof(dev->control_state));

	} else {

		if (ucontrol->value.integer.value[0])
@@ -124,7 +138,7 @@ static int control_put(struct snd_kcontrol *kcontrol, 
		else

			dev->control_state[pos / 8] &= ~(1 << (pos % 8));



		snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO,

		snd_usb_caiaq_send_command(dev, cmd,

				dev->control_state, sizeof(dev->control_state));

	}
@@ -273,6 +287,43 @@ static struct caiaq_controller a4dj_controller[] = { 
	{ "Current input mode",	0 | CNT_INTVAL 	}

};



static struct caiaq_controller kontrolx1_controller[] = {

	{ "LED FX A: ON",		7 | CNT_INTVAL	},

	{ "LED FX A: 1",		6 | CNT_INTVAL	},

	{ "LED FX A: 2",		5 | CNT_INTVAL	},

	{ "LED FX A: 3",		4 | CNT_INTVAL	},

	{ "LED FX B: ON",		3 | CNT_INTVAL	},

	{ "LED FX B: 1",		2 | CNT_INTVAL	},

	{ "LED FX B: 2",		1 | CNT_INTVAL	},

	{ "LED FX B: 3",		0 | CNT_INTVAL	},



	{ "LED Hotcue",			28 | CNT_INTVAL	},

	{ "LED Shift (white)",		29 | CNT_INTVAL	},

	{ "LED Shift (green)",		30 | CNT_INTVAL	},



	{ "LED Deck A: FX1",		24 | CNT_INTVAL	},

	{ "LED Deck A: FX2",		25 | CNT_INTVAL	},

	{ "LED Deck A: IN",		17 | CNT_INTVAL	},

	{ "LED Deck A: OUT",		16 | CNT_INTVAL	},

	{ "LED Deck A: < BEAT",		19 | CNT_INTVAL	},

	{ "LED Deck A: BEAT >",		18 | CNT_INTVAL	},

	{ "LED Deck A: CUE/ABS",	21 | CNT_INTVAL	},

	{ "LED Deck A: CUP/REL",	20 | CNT_INTVAL	},

	{ "LED Deck A: PLAY",		23 | CNT_INTVAL	},

	{ "LED Deck A: SYNC",		22 | CNT_INTVAL	},



	{ "LED Deck B: FX1",		26 | CNT_INTVAL	},

	{ "LED Deck B: FX2",		27 | CNT_INTVAL	},

	{ "LED Deck B: IN",		15 | CNT_INTVAL	},

	{ "LED Deck B: OUT",		14 | CNT_INTVAL	},

	{ "LED Deck B: < BEAT",		13 | CNT_INTVAL	},

	{ "LED Deck B: BEAT >",		12 | CNT_INTVAL	},

	{ "LED Deck B: CUE/ABS",	11 | CNT_INTVAL	},

	{ "LED Deck B: CUP/REL",	10 | CNT_INTVAL	},

	{ "LED Deck B: PLAY",		9  | CNT_INTVAL	},

	{ "LED Deck B: SYNC",		8  | CNT_INTVAL	},

};



static int __devinit add_controls(struct caiaq_controller *c, int num,

				  struct snd_usb_caiaqdev *dev)

{
@@ -321,10 +372,16 @@ int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev) 
		ret = add_controls(a8dj_controller,

			ARRAY_SIZE(a8dj_controller), dev);

		break;



	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):

		ret = add_controls(a4dj_controller,

			ARRAY_SIZE(a4dj_controller), dev);

		break;



	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):

		ret = add_controls(kontrolx1_controller,

			ARRAY_SIZE(kontrolx1_controller), dev);

		break;

	}



	return ret;