mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 07:10:50 +07:00
[PATCH] USB: remove OBSOLETE_OSS_USB_DRIVER drivers
This patch removes the obsolete USB_MIDI and USB_AUDIO drivers. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Adrian Bunk
Greg Kroah-Hartman
parent
29da7937a1
commit
9628416a54
@ -17,8 +17,6 @@ obj-$(CONFIG_USB_SL811_HCD) += host/
|
||||
obj-$(CONFIG_ETRAX_USB_HOST) += host/
|
||||
|
||||
obj-$(CONFIG_USB_ACM) += class/
|
||||
obj-$(CONFIG_USB_AUDIO) += class/
|
||||
obj-$(CONFIG_USB_MIDI) += class/
|
||||
obj-$(CONFIG_USB_PRINTER) += class/
|
||||
|
||||
obj-$(CONFIG_USB_STORAGE) += storage/
|
||||
|
||||
@ -4,53 +4,6 @@
|
||||
comment "USB Device Class drivers"
|
||||
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
|
||||
tristate "USB Modem (CDC ACM) support"
|
||||
depends on USB
|
||||
|
||||
@ -4,6 +4,4 @@
|
||||
#
|
||||
|
||||
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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,110 +0,0 @@
|
||||
#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
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,164 +0,0 @@
|
||||
/*
|
||||
usb-midi.h -- USB-MIDI driver
|
||||
|
||||
Copyright (C) 2001
|
||||
NAGANO Daisuke <breeze.nagano@nifty.ne.jp>
|
||||
|
||||
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; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#ifndef _USB_MIDI_H_
|
||||
#define _USB_MIDI_H_
|
||||
|
||||
#ifndef USB_SUBCLASS_MIDISTREAMING
|
||||
#define USB_SUBCLASS_MIDISTREAMING 3
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* Roland MIDI Devices */
|
||||
|
||||
#define USB_VENDOR_ID_ROLAND 0x0582
|
||||
#define USBMIDI_ROLAND_UA100G 0x0000
|
||||
#define USBMIDI_ROLAND_MPU64 0x0002
|
||||
#define USBMIDI_ROLAND_SC8850 0x0003
|
||||
#define USBMIDI_ROLAND_SC8820 0x0007
|
||||
#define USBMIDI_ROLAND_UM2 0x0005
|
||||
#define USBMIDI_ROLAND_UM1 0x0009
|
||||
#define USBMIDI_ROLAND_PC300 0x0008
|
||||
|
||||
/* YAMAHA MIDI Devices */
|
||||
#define USB_VENDOR_ID_YAMAHA 0x0499
|
||||
#define USBMIDI_YAMAHA_MU1000 0x1001
|
||||
|
||||
/* Steinberg MIDI Devices */
|
||||
#define USB_VENDOR_ID_STEINBERG 0x0763
|
||||
#define USBMIDI_STEINBERG_USB2MIDI 0x1001
|
||||
|
||||
/* Mark of the Unicorn MIDI Devices */
|
||||
#define USB_VENDOR_ID_MOTU 0x07fd
|
||||
#define USBMIDI_MOTU_FASTLANE 0x0001
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* Supported devices */
|
||||
|
||||
struct usb_midi_endpoint {
|
||||
int endpoint;
|
||||
int cableId; /* if bit-n == 1 then cableId-n is enabled (n: 0 - 15) */
|
||||
};
|
||||
|
||||
struct usb_midi_device {
|
||||
char *deviceName;
|
||||
|
||||
u16 idVendor;
|
||||
u16 idProduct;
|
||||
int interface;
|
||||
int altSetting; /* -1: auto detect */
|
||||
|
||||
struct usb_midi_endpoint in[15];
|
||||
struct usb_midi_endpoint out[15];
|
||||
};
|
||||
|
||||
static struct usb_midi_device usb_midi_devices[] = {
|
||||
{ /* Roland UM-1 */
|
||||
"Roland UM-1",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UM1, 2, -1,
|
||||
{ { 0x81, 1 }, {-1, -1} },
|
||||
{ { 0x01, 1,}, {-1, -1} },
|
||||
},
|
||||
|
||||
{ /* Roland UM-2 */
|
||||
"Roland UM-2" ,
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UM2, 2, -1,
|
||||
{ { 0x81, 3 }, {-1, -1} },
|
||||
{ { 0x01, 3,}, {-1, -1} },
|
||||
},
|
||||
|
||||
/** Next entry courtesy research by Michael Minn <michael@michaelminn.com> **/
|
||||
{ /* Roland UA-100 */
|
||||
"Roland UA-100",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UA100G, 2, -1,
|
||||
{ { 0x82, 7 }, {-1, -1} }, /** cables 0,1 and 2 for SYSEX **/
|
||||
{ { 0x02, 7 }, {-1, -1} },
|
||||
},
|
||||
|
||||
/** Next entry courtesy research by Michael Minn <michael@michaelminn.com> **/
|
||||
{ /* Roland SC8850 */
|
||||
"Roland SC8850",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8850, 2, -1,
|
||||
{ { 0x81, 0x3f }, {-1, -1} },
|
||||
{ { 0x01, 0x3f }, {-1, -1} },
|
||||
},
|
||||
|
||||
{ /* Roland SC8820 */
|
||||
"Roland SC8820",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8820, 2, -1,
|
||||
{ { 0x81, 0x13 }, {-1, -1} },
|
||||
{ { 0x01, 0x13 }, {-1, -1} },
|
||||
},
|
||||
|
||||
{ /* Roland SC8820 */
|
||||
"Roland SC8820",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8820, 2, -1,
|
||||
{ { 0x81, 17 }, {-1, -1} },
|
||||
{ { 0x01, 17 }, {-1, -1} },
|
||||
},
|
||||
|
||||
{ /* YAMAHA MU1000 */
|
||||
"YAMAHA MU1000",
|
||||
USB_VENDOR_ID_YAMAHA, USBMIDI_YAMAHA_MU1000, 0, -1,
|
||||
{ { 0x81, 1 }, {-1, -1} },
|
||||
{ { 0x01, 15 }, {-1, -1} },
|
||||
},
|
||||
{ /* Roland PC-300 */
|
||||
"Roland PC-300",
|
||||
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_PC300, 2, -1,
|
||||
{ { 0x81, 1 }, {-1, -1} },
|
||||
{ { 0x01, 1 }, {-1, -1} },
|
||||
},
|
||||
{ /* MOTU Fastlane USB */
|
||||
"MOTU Fastlane USB",
|
||||
USB_VENDOR_ID_MOTU, USBMIDI_MOTU_FASTLANE, 1, 0,
|
||||
{ { 0x82, 3 }, {-1, -1} },
|
||||
{ { 0x02, 3 }, {-1, -1} },
|
||||
}
|
||||
};
|
||||
|
||||
#define VENDOR_SPECIFIC_USB_MIDI_DEVICES (sizeof(usb_midi_devices)/sizeof(struct usb_midi_device))
|
||||
|
||||
/* for Hot-Plugging */
|
||||
|
||||
static struct usb_device_id usb_midi_ids [] = {
|
||||
{ .match_flags = (USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS),
|
||||
.bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_MIDISTREAMING},
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UM1 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UM2 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UA100G ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_PC300 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8850 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8820 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_YAMAHA, USBMIDI_YAMAHA_MU1000 ) },
|
||||
{ USB_DEVICE( USB_VENDOR_ID_MOTU, USBMIDI_MOTU_FASTLANE ) },
|
||||
/* { USB_DEVICE( USB_VENDOR_ID_STEINBERG, USBMIDI_STEINBERG_USB2MIDI ) },*/
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE (usb, usb_midi_ids);
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
#endif /* _USB_MIDI_H_ */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user