mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-07 18:14:04 +00:00
staging: line6: drop variax model_data field
The sysfs attrs to access the model dump have been removed so it's safe to drop the model_data field. The next step will be to simplify the startup process since we no longer need to fetch this data via dump requests, but that will be done in a later patch. Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3fb7991319
commit
81804c54db
@ -70,21 +70,6 @@ static void variax_startup2(unsigned long data);
|
||||
static void variax_startup4(unsigned long data);
|
||||
static void variax_startup5(unsigned long data);
|
||||
|
||||
/*
|
||||
Decode data transmitted by workbench.
|
||||
*/
|
||||
static void variax_decode(const unsigned char *raw_data, unsigned char *data,
|
||||
int raw_size)
|
||||
{
|
||||
for (; raw_size > 0; raw_size -= 6) {
|
||||
data[2] = raw_data[0] | (raw_data[1] << 4);
|
||||
data[1] = raw_data[2] | (raw_data[3] << 4);
|
||||
data[0] = raw_data[4] | (raw_data[5] << 4);
|
||||
raw_data += 6;
|
||||
data += 3;
|
||||
}
|
||||
}
|
||||
|
||||
static void variax_activate_async(struct usb_line6_variax *variax, int a)
|
||||
{
|
||||
variax->buffer_activate[VARIAX_OFFSET_ACTIVATE] = a;
|
||||
@ -214,18 +199,6 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
|
||||
break;
|
||||
|
||||
case VARIAX_DUMP_PASS2:
|
||||
/* model name is transmitted twice, so skip it here: */
|
||||
variax_decode(buf +
|
||||
VARIAX_MODEL_HEADER_LENGTH,
|
||||
(unsigned char *)
|
||||
&variax->
|
||||
model_data.control +
|
||||
sizeof(variax->model_data.
|
||||
control)
|
||||
/ 2,
|
||||
sizeof(variax->model_data.
|
||||
control)
|
||||
/ 2 * 2);
|
||||
line6_dump_request_async
|
||||
(&variax->dumpreq, &variax->line6,
|
||||
2, VARIAX_DUMP_PASS3);
|
||||
|
@ -44,21 +44,6 @@ enum {
|
||||
VARIAX_DUMP_PASS3
|
||||
};
|
||||
|
||||
/**
|
||||
Binary Variax model dump
|
||||
*/
|
||||
struct variax_model {
|
||||
/**
|
||||
Header information (including program name).
|
||||
*/
|
||||
unsigned char name[18];
|
||||
|
||||
/**
|
||||
Model parameters.
|
||||
*/
|
||||
unsigned char control[78 * 2];
|
||||
};
|
||||
|
||||
struct usb_line6_variax {
|
||||
/**
|
||||
Generic Line6 USB data.
|
||||
@ -77,11 +62,6 @@ struct usb_line6_variax {
|
||||
*/
|
||||
unsigned char *buffer_activate;
|
||||
|
||||
/**
|
||||
Current model settings.
|
||||
*/
|
||||
struct variax_model model_data;
|
||||
|
||||
/**
|
||||
Handler for device initializaton.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user