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

Commit 9628416a authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: remove OBSOLETE_OSS_USB_DRIVER drivers 



This patch removes the obsolete USB_MIDI and USB_AUDIO drivers.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 29da7937

drivers/usb/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ obj-$(CONFIG_USB_SL811_HCD) += host/ 
obj-$(CONFIG_ETRAX_USB_HOST)	+= host/

obj-$(CONFIG_ETRAX_USB_HOST)	+= host/





obj-$(CONFIG_USB_ACM)		+= class/

obj-$(CONFIG_USB_ACM)		+= class/

obj-$(CONFIG_USB_AUDIO)		+= class/

obj-$(CONFIG_USB_MIDI)		+= class/

obj-$(CONFIG_USB_PRINTER)	+= class/

obj-$(CONFIG_USB_PRINTER)	+= class/





obj-$(CONFIG_USB_STORAGE)	+= storage/

obj-$(CONFIG_USB_STORAGE)	+= storage/

drivers/usb/class/Kconfig

+0 −47
Original line number Original line Diff line number Diff line
@@ -4,53 +4,6 @@ 
comment "USB Device Class drivers"

comment "USB Device Class drivers"

	depends on USB

	depends on USB





config OBSOLETE_OSS_USB_DRIVER

	bool "Obsolete OSS USB drivers"

	depends on USB && SOUND

	help

	  This option enables support for the obsolete USB Audio and Midi

	  drivers that are scheduled for removal in the near future since

	  there are ALSA drivers for the same hardware.



	  Please contact Adrian Bunk <bunk@stusta.de> if you had to

	  say Y here because of missing support in the ALSA drivers.



	  If unsure, say N.



config USB_AUDIO

	tristate "USB Audio support"

	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER

	help

	  Say Y here if you want to connect USB audio equipment such as

	  speakers to your computer's USB port. You only need this if you use

	  the OSS sound driver; ALSA has its own option for usb audio support.



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

	  module will be called audio.



config USB_MIDI

	tristate "USB MIDI support"

	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER

	---help---

	  Say Y here if you want to connect a USB MIDI device to your

	  computer's USB port.  You only need this if you use the OSS

	  sound system; USB MIDI devices are supported by ALSA's USB

	  audio driver. This driver is for devices that comply with

	  'Universal Serial Bus Device Class Definition for MIDI Device'.



	  The following devices are known to work:

	  * Steinberg USB2MIDI

	  * Roland MPU64

	  * Roland PC-300

	  * Roland SC8850

	  * Roland UM-1

	  * Roland UM-2

	  * Roland UA-100

	  * Yamaha MU1000



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

	  module will be called usb-midi.



config USB_ACM

config USB_ACM

	tristate "USB Modem (CDC ACM) support"

	tristate "USB Modem (CDC ACM) support"

	depends on USB

	depends on USB

drivers/usb/class/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -4,6 +4,4 @@ 
#

#





obj-$(CONFIG_USB_ACM)		+= cdc-acm.o

obj-$(CONFIG_USB_ACM)		+= cdc-acm.o

obj-$(CONFIG_USB_AUDIO)		+= audio.o

obj-$(CONFIG_USB_MIDI)		+= usb-midi.o

obj-$(CONFIG_USB_PRINTER)	+= usblp.o
 
obj-$(CONFIG_USB_PRINTER)	+= usblp.o

drivers/usb/class/audio.c

deleted100644 → 0
+0 −3869

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/usb/class/audio.h

deleted100644 → 0
+0 −110
Original line number Original line Diff line number Diff line 
#define CS_AUDIO_UNDEFINED		0x20

#define CS_AUDIO_DEVICE			0x21

#define CS_AUDIO_CONFIGURATION		0x22

#define CS_AUDIO_STRING			0x23

#define CS_AUDIO_INTERFACE		0x24

#define CS_AUDIO_ENDPOINT		0x25



#define HEADER				0x01

#define INPUT_TERMINAL			0x02

#define OUTPUT_TERMINAL			0x03

#define MIXER_UNIT			0x04

#define SELECTOR_UNIT			0x05

#define FEATURE_UNIT			0x06

#define PROCESSING_UNIT			0x07

#define EXTENSION_UNIT			0x08



#define AS_GENERAL			0x01

#define FORMAT_TYPE			0x02

#define FORMAT_SPECIFIC			0x03



#define EP_GENERAL			0x01



#define MAX_CHAN			9

#define MAX_FREQ			16

#define MAX_IFACE			8

#define MAX_FORMAT			8

#define MAX_ALT				32 	/* Sorry, we need quite a few for the Philips webcams */



struct usb_audio_terminal

{	

	u8	flags;

	u8	assoc;

	u16	type;			/* Mic etc */

	u8	channels;

	u8	source;

	u16	chancfg;

};



struct usb_audio_format

{

	u8	type;

	u8	channels;

	u8	num_freq;

	u8	sfz;

	u8	bits;

	u16	freq[MAX_FREQ];

};



struct usb_audio_interface

{

	u8	terminal;

	u8	delay;

	u16	num_formats;

	u16	format_type;

	u8	flags;

	u8	idleconf;	/* Idle config */

#define AU_IFACE_FOUND	1

	struct  usb_audio_format format[MAX_FORMAT];

};



struct usb_audio_device

{

	struct list_head list;

	u8	mixer;

	u8	selector;

	void	*irq_handle;

	u8	num_channels;

	u8	num_dsp_iface;

	u8	channel_map[MAX_CHAN];

	struct usb_audio_terminal terminal[MAX_CHAN];

	struct usb_audio_interface interface[MAX_IFACE][MAX_ALT];

};







/* Audio Class specific Request Codes */



#define SET_CUR    0x01

#define GET_CUR    0x81

#define SET_MIN    0x02

#define GET_MIN    0x82

#define SET_MAX    0x03

#define GET_MAX    0x83

#define SET_RES    0x04

#define GET_RES    0x84

#define SET_MEM    0x05

#define GET_MEM    0x85

#define GET_STAT   0xff



/* Terminal Control Selectors */



#define COPY_PROTECT_CONTROL       0x01



/* Feature Unit Control Selectors */



#define MUTE_CONTROL               0x01

#define VOLUME_CONTROL             0x02

#define BASS_CONTROL               0x03

#define MID_CONTROL                0x04

#define TREBLE_CONTROL             0x05

#define GRAPHIC_EQUALIZER_CONTROL  0x06

#define AUTOMATIC_GAIN_CONTROL     0x07

#define DELAY_CONTROL              0x08

#define BASS_BOOST_CONTROL         0x09

#define LOUDNESS_CONTROL           0x0a



/* Endpoint Control Selectors */



#define SAMPLING_FREQ_CONTROL      0x01

#define PITCH_CONTROL              0x02