Skip to content

L
linux
Commit 7c68d6b7 authored by David Täht's avatar David Täht Committed by Greg Kroah-Hartman
Browse files
Options

Staging: frontier: Make checkpatch.pl considerably happier with tranzport driver. 

Signed-off-by: default avatarDavid Täht <d@teklibre.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d44ca7af
Hide whitespace changes
Inline Side-by-side
Showing with 414 additions and 315 deletions
drivers/staging/frontier/tranzport.c
View file @ 7c68d6b7
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
*/ */
/** /*
* This driver uses a ring buffer for time critical reading of * This driver uses a ring buffer for time critical reading of
* interrupt in reports and provides read and write methods for * interrupt in reports and provides read and write methods for
* raw interrupt reports. * raw interrupt reports.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* as we only have 17 commands for the tranzport. In particular this is * as we only have 17 commands for the tranzport. In particular this is
* key for getting lights to flash in time as otherwise many commands * key for getting lights to flash in time as otherwise many commands
* can be buffered up before the light change makes it to the interface. * can be buffered up before the light change makes it to the interface.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -40,56 +40,47 @@ ...@@ -40,56 +40,47 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/version.h> #include <linux/version.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/poll.h> #include <linux/poll.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
#include frontier_compat.h
#endif
/* Define these values to match your devices */ /* Define these values to match your devices */
#define VENDOR_ID 0x165b #define VENDOR_ID 0x165b
#define PRODUCT_ID 0x8101 #define PRODUCT_ID 0x8101
#ifdef CONFIG_USB_DYNAMIC_MINORS #ifdef CONFIG_USB_DYNAMIC_MINORS
#define USB_TRANZPORT_MINOR_BASE 0 #define USB_TRANZPORT_MINOR_BASE 0
#else #else /* FIXME 176 - is the ldusb driver's minor - apply for a minor soon */
// FIXME 176 - is the ldusb driver's minor - apply for a minor soon
#define USB_TRANZPORT_MINOR_BASE 177 #define USB_TRANZPORT_MINOR_BASE 177
#endif #endif
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id usb_tranzport_table [] = { static struct usb_device_id usb_tranzport_table[] = {
{ USB_DEVICE(VENDOR_ID, PRODUCT_ID) }, {USB_DEVICE(VENDOR_ID, PRODUCT_ID)},
{ } /* Terminating entry */ {} /* Terminating entry */
}; };
MODULE_DEVICE_TABLE(usb, usb_tranzport_table); MODULE_DEVICE_TABLE(usb, usb_tranzport_table);
MODULE_VERSION("0.33"); MODULE_VERSION("0.34");
MODULE_AUTHOR("Mike Taht <m@taht.net>"); MODULE_AUTHOR("Mike Taht <m@taht.net>");
MODULE_DESCRIPTION("Tranzport USB Driver"); MODULE_DESCRIPTION("Tranzport USB Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("Frontier Designs Tranzport Control Surface"); MODULE_SUPPORTED_DEVICE("Frontier Designs Tranzport Control Surface");
/* These two aren't done yet */
#define SUPPRESS_EXTRA_ONLINE_EVENTS 0
#define BUFFERED_WRITES 0
#define SUPPRESS_EXTRA_OFFLINE_EVENTS 1 #define SUPPRESS_EXTRA_OFFLINE_EVENTS 1
#define COMPRESS_WHEEL_EVENTS 1 #define COMPRESS_WHEEL_EVENTS 1
#define BUFFERED_READS 1 #define BUFFERED_READS 1
#define RING_BUFFER_SIZE 1000 #define RING_BUFFER_SIZE 1000
#define WRITE_BUFFER_SIZE 34 #define WRITE_BUFFER_SIZE 34
#define TRANZPORT_USB_TIMEOUT 10 #define TRANZPORT_USB_TIMEOUT 10
#define TRANZPORT_DEBUG 0
static int debug = TRANZPORT_DEBUG;
static int debug = 0;
/* Use our own dbg macro */ /* Use our own dbg macro */
#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0) #define dbg_info(dev, format, arg...) do \
{ if (debug) dev_info(dev , format , ## arg); } while (0)
/* Module parameters */ /* Module parameters */
...@@ -102,13 +93,13 @@ MODULE_PARM_DESC(debug, "Debug enabled or not"); ...@@ -102,13 +93,13 @@ MODULE_PARM_DESC(debug, "Debug enabled or not");
static int ring_buffer_size = RING_BUFFER_SIZE; static int ring_buffer_size = RING_BUFFER_SIZE;
module_param(ring_buffer_size, int, S_IRUGO); module_param(ring_buffer_size, int, S_IRUGO);
MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size in reports"); MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size in reports");
/* The write_buffer can one day contain more than one interrupt out transfer. /* The write_buffer can one day contain more than one interrupt out transfer.
*/ */
static int write_buffer_size = WRITE_BUFFER_SIZE; static int write_buffer_size = WRITE_BUFFER_SIZE;
module_param(write_buffer_size, int, S_IRUGO); module_param(write_buffer_size, int, S_IRUGO);
MODULE_PARM_DESC(write_buffer_size, "Write buffer size"); MODULE_PARM_DESC(write_buffer_size, "Write buffer size");
/* /*
...@@ -118,14 +109,16 @@ MODULE_PARM_DESC(write_buffer_size, "Write buffer size"); ...@@ -118,14 +109,16 @@ MODULE_PARM_DESC(write_buffer_size, "Write buffer size");
static int min_interrupt_in_interval = TRANZPORT_USB_TIMEOUT; static int min_interrupt_in_interval = TRANZPORT_USB_TIMEOUT;
module_param(min_interrupt_in_interval, int, 0); module_param(min_interrupt_in_interval, int, 0);
MODULE_PARM_DESC(min_interrupt_in_interval, "Minimum interrupt in interval in ms"); MODULE_PARM_DESC(min_interrupt_in_interval,
"Minimum interrupt in interval in ms");
static int min_interrupt_out_interval = TRANZPORT_USB_TIMEOUT; static int min_interrupt_out_interval = TRANZPORT_USB_TIMEOUT;
module_param(min_interrupt_out_interval, int, 0); module_param(min_interrupt_out_interval, int, 0);
MODULE_PARM_DESC(min_interrupt_out_interval, "Minimum interrupt out interval in ms"); MODULE_PARM_DESC(min_interrupt_out_interval,
"Minimum interrupt out interval in ms");
struct tranzport_cmd { struct tranzport_cmd {
unsigned char cmd[8]; unsigned char cmd[8];
}; };
enum LightID { enum LightID {
...@@ -136,50 +129,45 @@ enum LightID { ...@@ -136,50 +129,45 @@ enum LightID {
LightAnysolo, LightAnysolo,
LightLoop, LightLoop,
LightPunch LightPunch
}; };
/* Structure to hold all of our device specific stuff */ /* Structure to hold all of our device specific stuff */
struct usb_tranzport { struct usb_tranzport {
struct semaphore sem; /* locks this structure */ struct semaphore sem; /* locks this structure */
struct usb_interface* intf; /* save off the usb interface pointer */ struct usb_interface *intf; /* save off the usb interface pointer */
int open_count; /* number of times this port opened */
int open_count; /* number of times this port has been opened */ struct tranzport_cmd (*ring_buffer)[RING_BUFFER_SIZE];
unsigned int ring_head;
struct tranzport_cmd (*ring_buffer)[RING_BUFFER_SIZE]; /* just make c happy */ unsigned int ring_tail;
unsigned int ring_head; wait_queue_head_t read_wait;
unsigned int ring_tail; wait_queue_head_t write_wait;
unsigned char *interrupt_in_buffer;
wait_queue_head_t read_wait; struct usb_endpoint_descriptor *interrupt_in_endpoint;
wait_queue_head_t write_wait; struct urb *interrupt_in_urb;
int interrupt_in_interval;
unsigned char* interrupt_in_buffer; size_t interrupt_in_endpoint_size;
struct usb_endpoint_descriptor* interrupt_in_endpoint; int interrupt_in_running;
struct urb* interrupt_in_urb; int interrupt_in_done;
int interrupt_in_interval; char *interrupt_out_buffer;
size_t interrupt_in_endpoint_size; struct usb_endpoint_descriptor *interrupt_out_endpoint;
int interrupt_in_running; struct urb *interrupt_out_urb;
int interrupt_in_done; int interrupt_out_interval;
size_t interrupt_out_endpoint_size;
char* interrupt_out_buffer; int interrupt_out_busy;
struct usb_endpoint_descriptor* interrupt_out_endpoint;
struct urb* interrupt_out_urb;
int interrupt_out_interval;
size_t interrupt_out_endpoint_size;
int interrupt_out_busy;
/* Sysfs and translation support */ /* Sysfs and translation support */
int event; /* alternate interface to events */ int event; /* alternate interface to events */
int wheel; /* - for negative, 0 for none, + for positive */ int wheel; /* - for negative, 0 for none, + for positive */
unsigned char dump_state; /* 0 if disabled 1 if enabled */ unsigned char dump_state; /* 0 if disabled 1 if enabled */
unsigned char enable; /* 0 if disabled 1 if enabled */ unsigned char enable; /* 0 if disabled 1 if enabled */
unsigned char offline; /* if the device is out of range or asleep */ unsigned char offline; /* if the device is out of range or asleep */
unsigned char compress_wheel; /* flag to compress wheel events */ unsigned char compress_wheel; /* flag to compress wheel events */
unsigned char light; /* 7 bits used */ unsigned char light; /* 7 bits used */
unsigned char last_cmd[8]; unsigned char last_cmd[8];
unsigned char last_input[8]; unsigned char last_input[8];
unsigned char screen[40]; // We'll also have cells unsigned char screen[40]; /* We'll also have cells */
}; };
...@@ -205,27 +193,30 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev) ...@@ -205,27 +193,30 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev)
usb_kill_urb(dev->interrupt_out_urb); usb_kill_urb(dev->interrupt_out_urb);
} }
// FIXME ~light not good enough or correct - need atomic set_bit /* FIXME ~light not good enough or correct - need atomic set_bit */
#define show_set_light(value) \ #define show_set_light(value) \
static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ static ssize_t show_##value( \
{ \ struct device *dev, struct device_attribute *attr, char *buf) \
struct usb_interface *intf = to_usb_interface(dev); \ { \
struct usb_tranzport *t = usb_get_intfdata(intf); \ struct usb_interface *intf = to_usb_interface(dev); \
enum LightID light = value; \ struct usb_tranzport *t = usb_get_intfdata(intf); \
int temp = (1 && (t->light & (1 << light))); \ enum LightID light = value; \
return sprintf(buf, "%d\n", temp ); \ int temp = (1 && (t->light & (1 << light))); \
} \ return sprintf(buf, "%d\n", temp); \
static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ } \
{ \ static ssize_t set_##value( \
struct usb_interface *intf = to_usb_interface(dev); \ struct device *dev, struct device_attribute *attr, \
struct usb_tranzport *t = usb_get_intfdata(intf); \ const char *buf, size_t count) \
int temp = simple_strtoul(buf, NULL, 10); \ { \
enum LightID light = (temp << value) & (t->light << value); \ struct usb_interface *intf = to_usb_interface(dev); \
t->light = (t->light & ~light) ; \ struct usb_tranzport *t = usb_get_intfdata(intf); \
return count; \ int temp = simple_strtoul(buf, NULL, 10); \
} \ enum LightID light = (temp << value) & (t->light << value); \
static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); t->light = (t->light & ~light) ; \
return count; \
} \
static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
show_set_light(LightRecord); show_set_light(LightRecord);
show_set_light(LightTrackrec); show_set_light(LightTrackrec);
...@@ -235,25 +226,25 @@ show_set_light(LightAnysolo); ...@@ -235,25 +226,25 @@ show_set_light(LightAnysolo);
show_set_light(LightLoop); show_set_light(LightLoop);
show_set_light(LightPunch); show_set_light(LightPunch);
#define show_set_int(value) \
#define show_set_int(value) \ static ssize_t show_##value(struct device *dev, \
static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct usb_tranzport *t = usb_get_intfdata(intf); \ struct usb_tranzport *t = usb_get_intfdata(intf); \
\ return sprintf(buf, "%d\n", t->value); \
return sprintf(buf, "%d\n", t->value); \ } \
} \ static ssize_t set_##value(struct device *dev, \
static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ struct device_attribute *attr, \
{ \ const char *buf, size_t count) \
struct usb_interface *intf = to_usb_interface(dev); \ { \
struct usb_tranzport *t = usb_get_intfdata(intf); \ struct usb_interface *intf = to_usb_interface(dev); \
int temp = simple_strtoul(buf, NULL, 10); \ struct usb_tranzport *t = usb_get_intfdata(intf); \
\ int temp = simple_strtoul(buf, NULL, 10); \
t->value = temp; \ t->value = temp; \
return count; \ return count; \
} \ } \
static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
show_set_int(enable); show_set_int(enable);
show_set_int(offline); show_set_int(offline);
...@@ -262,27 +253,27 @@ show_set_int(dump_state); ...@@ -262,27 +253,27 @@ show_set_int(dump_state);
show_set_int(wheel); show_set_int(wheel);
show_set_int(event); show_set_int(event);
#define show_set_cmd(value) \ #define show_set_cmd(value) \
static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ static ssize_t show_##value(struct device *dev, \
{ \ struct device_attribute *attr, char *buf) \
struct usb_interface *intf = to_usb_interface(dev); \ { \
struct usb_tranzport *t = usb_get_intfdata(intf); \ struct usb_interface *intf = to_usb_interface(dev); \
struct usb_tranzport *t = usb_get_intfdata(intf); \
\ \
return sprintf(buf, "%d\n", t->value); \ return sprintf(buf, "%d\n", t->value); \
} \ } \
static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ static ssize_t set_##value(struct device *dev, \
{ \ struct device_attribute *attr, \
struct usb_interface *intf = to_usb_interface(dev); \ const char *buf, size_t count) \
struct usb_tranzport *t = usb_get_intfdata(intf); \ { \
int temp = simple_strtoul(buf, NULL, 10); \ struct usb_interface *intf = to_usb_interface(dev); \
struct usb_tranzport *t = usb_get_intfdata(intf); \
int temp = simple_strtoul(buf, NULL, 10); \
\ \
t->value = temp; \ t->value = temp; \
return count; \ return count; \
} \ } \
static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
/** /**
* usb_tranzport_delete * usb_tranzport_delete
...@@ -291,22 +282,21 @@ static void usb_tranzport_delete(struct usb_tranzport *dev) ...@@ -291,22 +282,21 @@ static void usb_tranzport_delete(struct usb_tranzport *dev)
{ {
usb_tranzport_abort_transfers(dev); usb_tranzport_abort_transfers(dev);
/* This is just too twisted to be correct */ /* This is just too twisted to be correct */
if(dev->intf != NULL) { if (dev->intf != NULL) {
device_remove_file(&dev->intf->dev, &dev_attr_LightRecord); device_remove_file(&dev->intf->dev, &dev_attr_LightRecord);
device_remove_file(&dev->intf->dev, &dev_attr_LightTrackrec); device_remove_file(&dev->intf->dev, &dev_attr_LightTrackrec);
device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute); device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute);
device_remove_file(&dev->intf->dev, &dev_attr_LightTracksolo); device_remove_file(&dev->intf->dev, &dev_attr_LightTracksolo);
device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute); device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute);
device_remove_file(&dev->intf->dev, &dev_attr_LightAnysolo); device_remove_file(&dev->intf->dev, &dev_attr_LightAnysolo);
device_remove_file(&dev->intf->dev, &dev_attr_LightLoop); device_remove_file(&dev->intf->dev, &dev_attr_LightLoop);
device_remove_file(&dev->intf->dev, &dev_attr_LightPunch); device_remove_file(&dev->intf->dev, &dev_attr_LightPunch);
device_remove_file(&dev->intf->dev, &dev_attr_wheel); device_remove_file(&dev->intf->dev, &dev_attr_wheel);
device_remove_file(&dev->intf->dev, &dev_attr_enable); device_remove_file(&dev->intf->dev, &dev_attr_enable);
device_remove_file(&dev->intf->dev, &dev_attr_event); device_remove_file(&dev->intf->dev, &dev_attr_event);
device_remove_file(&dev->intf->dev, &dev_attr_offline); device_remove_file(&dev->intf->dev, &dev_attr_offline);
device_remove_file(&dev->intf->dev, &dev_attr_compress_wheel); device_remove_file(&dev->intf->dev, &dev_attr_compress_wheel);
device_remove_file(&dev->intf->dev, &dev_attr_dump_state);
device_remove_file(&dev->intf->dev, &dev_attr_dump_state);
} }
/* free data structures */ /* free data structures */
...@@ -330,37 +320,56 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) ...@@ -330,37 +320,56 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
if (urb->status) { if (urb->status) {
if (urb->status == -ENOENT || if (urb->status == -ENOENT ||
urb->status == -ECONNRESET || urb->status == -ECONNRESET ||
urb->status == -ESHUTDOWN) { urb->status == -ESHUTDOWN) {
goto exit; goto exit;
} else { } else {
dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", dbg_info(&dev->intf->dev,
"%s: nonzero status received: %d\n",
__func__, urb->status); __func__, urb->status);
goto resubmit; /* maybe we can recover */ goto resubmit; /* maybe we can recover */
} }
} }
if (urb->actual_length != 8) { if (urb->actual_length != 8) {
dev_warn(&dev->intf->dev, dev_warn(&dev->intf->dev,
"Urb length was %d bytes!! Do something intelligent \n", urb->actual_length); "Urb length was %d bytes!!"
"Do something intelligent \n",
urb->actual_length);
} else { } else {
dbg_info(&dev->intf->dev, "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n", dbg_info(&dev->intf->dev,
__func__, dev->interrupt_in_buffer[0],dev->interrupt_in_buffer[1],dev->interrupt_in_buffer[2],dev->interrupt_in_buffer[3],dev->interrupt_in_buffer[4],dev->interrupt_in_buffer[5],dev->interrupt_in_buffer[6],dev->interrupt_in_buffer[7]); "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n",
__func__, dev->interrupt_in_buffer[0],
dev->interrupt_in_buffer[1],
dev->interrupt_in_buffer[2],
dev->interrupt_in_buffer[3],
dev->interrupt_in_buffer[4],
dev->interrupt_in_buffer[5],
dev->interrupt_in_buffer[6],
dev->interrupt_in_buffer[7]);
#if SUPPRESS_EXTRA_OFFLINE_EVENTS #if SUPPRESS_EXTRA_OFFLINE_EVENTS
if(dev->offline == 2 && dev->interrupt_in_buffer[1] == 0xff) { goto resubmit; } if (dev->offline == 2 && dev->interrupt_in_buffer[1] == 0xff)
if(dev->offline == 1 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 2; goto resubmit; } goto resubmit;
if (dev->offline == 1 && dev->interrupt_in_buffer[1] == 0xff) {
dev->offline = 2;
goto resubmit;
}
/* Always pass one offline event up the stack */ /* Always pass one offline event up the stack */
if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; } if (dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff)
if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; } dev->offline = 0;
if (dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff)
dev->offline = 1;
#endif #endif /* SUPPRESS_EXTRA_OFFLINE_EVENTS */
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail); dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n",
__func__, dev->ring_head, dev->ring_tail);
next_ring_head = (dev->ring_head+1) % ring_buffer_size; next_ring_head = (dev->ring_head + 1) % ring_buffer_size;
if (next_ring_head != dev->ring_tail) { if (next_ring_head != dev->ring_tail) {
memcpy(&((*dev->ring_buffer)[dev->ring_head]), dev->interrupt_in_buffer, urb->actual_length); memcpy(&((*dev->ring_buffer)[dev->ring_head]),
dev->interrupt_in_buffer, urb->actual_length);
dev->ring_head = next_ring_head; dev->ring_head = next_ring_head;
retval = 0; retval = 0;
memset(dev->interrupt_in_buffer, 0, urb->actual_length); memset(dev->interrupt_in_buffer, 0, urb->actual_length);
...@@ -373,7 +382,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) ...@@ -373,7 +382,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
} }
resubmit: resubmit:
/* resubmit if we're still running */ /* resubmit if we're still running */
if (dev->interrupt_in_running && dev->intf) { if (dev->interrupt_in_running && dev->intf) {
retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC); retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC);
if (retval) if (retval)
...@@ -392,19 +401,17 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) ...@@ -392,19 +401,17 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
static void usb_tranzport_interrupt_out_callback(struct urb *urb) static void usb_tranzport_interrupt_out_callback(struct urb *urb)
{ {
struct usb_tranzport *dev = urb->context; struct usb_tranzport *dev = urb->context;
/* sync/async unlink faults aren't errors */ /* sync/async unlink faults aren't errors */
if (urb->status && !(urb->status == -ENOENT || if (urb->status && !(urb->status == -ENOENT ||
urb->status == -ECONNRESET || urb->status == -ECONNRESET ||
urb->status == -ESHUTDOWN)) urb->status == -ESHUTDOWN))
dbg_info(&dev->intf->dev, dbg_info(&dev->intf->dev,
"%s - nonzero write interrupt status received: %d\n", "%s - nonzero write interrupt status received: %d\n",
__func__, urb->status); __func__, urb->status);
dev->interrupt_out_busy = 0; dev->interrupt_out_busy = 0;
wake_up_interruptible(&dev->write_wait); wake_up_interruptible(&dev->write_wait);
} }
/** /**
* usb_tranzport_open * usb_tranzport_open
*/ */
...@@ -424,7 +431,7 @@ static int usb_tranzport_open(struct inode *inode, struct file *file) ...@@ -424,7 +431,7 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
if (!interface) { if (!interface) {
err("%s - error, can't find device for minor %d\n", err("%s - error, can't find device for minor %d\n",
__func__, subminor); __func__, subminor);
retval = -ENODEV; retval = -ENODEV;
goto unlock_disconnect_exit; goto unlock_disconnect_exit;
} }
...@@ -453,14 +460,14 @@ static int usb_tranzport_open(struct inode *inode, struct file *file) ...@@ -453,14 +460,14 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
dev->ring_head = 0; dev->ring_head = 0;
dev->ring_tail = 0; dev->ring_tail = 0;
usb_fill_int_urb(dev->interrupt_in_urb, usb_fill_int_urb(dev->interrupt_in_urb,
interface_to_usbdev(interface), interface_to_usbdev(interface),
usb_rcvintpipe(interface_to_usbdev(interface), usb_rcvintpipe(interface_to_usbdev(interface),
dev->interrupt_in_endpoint->bEndpointAddress), dev->interrupt_in_endpoint->
dev->interrupt_in_buffer, bEndpointAddress),
dev->interrupt_in_endpoint_size, dev->interrupt_in_buffer,
usb_tranzport_interrupt_in_callback, dev->interrupt_in_endpoint_size,
dev, usb_tranzport_interrupt_in_callback, dev,
dev->interrupt_in_interval); dev->interrupt_in_interval);
dev->interrupt_in_running = 1; dev->interrupt_in_running = 1;
dev->interrupt_in_done = 0; dev->interrupt_in_done = 0;
...@@ -470,7 +477,8 @@ static int usb_tranzport_open(struct inode *inode, struct file *file) ...@@ -470,7 +477,8 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
if (retval) { if (retval) {
dev_err(&interface->dev, "Couldn't submit interrupt_in_urb %d\n", retval); dev_err(&interface->dev,
"Couldn't submit interrupt_in_urb %d\n", retval);
dev->interrupt_in_running = 0; dev->interrupt_in_running = 0;
dev->open_count = 0; dev->open_count = 0;
goto unlock_exit; goto unlock_exit;
...@@ -479,7 +487,6 @@ static int usb_tranzport_open(struct inode *inode, struct file *file) ...@@ -479,7 +487,6 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
/* save device in the file's private structure */ /* save device in the file's private structure */
file->private_data = dev; file->private_data = dev;
unlock_exit: unlock_exit:
up(&dev->sem); up(&dev->sem);
...@@ -525,7 +532,9 @@ static int usb_tranzport_release(struct inode *inode, struct file *file) ...@@ -525,7 +532,9 @@ static int usb_tranzport_release(struct inode *inode, struct file *file)
/* wait until write transfer is finished */ /* wait until write transfer is finished */
if (dev->interrupt_out_busy) if (dev->interrupt_out_busy)
wait_event_interruptible_timeout(dev->write_wait, !dev->interrupt_out_busy, 2 * HZ); wait_event_interruptible_timeout(dev->write_wait,
!dev->interrupt_out_busy,
2 * HZ);
usb_tranzport_abort_transfers(dev); usb_tranzport_abort_transfers(dev);
dev->open_count = 0; dev->open_count = 0;
...@@ -539,37 +548,31 @@ static int usb_tranzport_release(struct inode *inode, struct file *file) ...@@ -539,37 +548,31 @@ static int usb_tranzport_release(struct inode *inode, struct file *file)
/** /**
* usb_tranzport_poll * usb_tranzport_poll
*/ */
static unsigned int usb_tranzport_poll(struct file *file, poll_table *wait) static unsigned int usb_tranzport_poll(struct file *file, poll_table * wait)
{ {
struct usb_tranzport *dev; struct usb_tranzport *dev;
unsigned int mask = 0; unsigned int mask = 0;
dev = file->private_data; dev = file->private_data;
poll_wait(file, &dev->read_wait, wait); poll_wait(file, &dev->read_wait, wait);
poll_wait(file, &dev->write_wait, wait); poll_wait(file, &dev->write_wait, wait);
if (dev->ring_head != dev->ring_tail) if (dev->ring_head != dev->ring_tail)
mask |= POLLIN | POLLRDNORM; mask |= POLLIN | POLLRDNORM;
if (!dev->interrupt_out_busy) if (!dev->interrupt_out_busy)
mask |= POLLOUT | POLLWRNORM; mask |= POLLOUT | POLLWRNORM;
return mask; return mask;
} }
/** /**
* usb_tranzport_read * usb_tranzport_read
*/ */
static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t count,
loff_t *ppos) static ssize_t usb_tranzport_read(struct file *file, char __user *buffer,
size_t count, loff_t *ppos)
{ {
struct usb_tranzport *dev; struct usb_tranzport *dev;
int retval = 0; int retval = 0;
#if BUFFERED_READS #if BUFFERED_READS
int c = 0; int c = 0;
#endif #endif
#if COMPRESS_WHEEL_EVENTS #if COMPRESS_WHEEL_EVENTS
signed char oldwheel; signed char oldwheel;
signed char newwheel; signed char newwheel;
...@@ -577,7 +580,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t ...@@ -577,7 +580,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
int next_tail; int next_tail;
#endif #endif
/* do I have such a thing as a null event? */ /* do I have such a thing as a null event? */
dev = file->private_data; dev = file->private_data;
...@@ -591,8 +594,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t ...@@ -591,8 +594,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
goto exit; goto exit;
} }
/* verify that the device wasn't unplugged */ /* verify that the device wasn't unplugged */ if (dev->intf == NULL) {
if (dev->intf == NULL) {
retval = -ENODEV; retval = -ENODEV;
err("No device or device unplugged %d\n", retval); err("No device or device unplugged %d\n", retval);
goto unlock_exit; goto unlock_exit;
...@@ -604,104 +606,149 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t ...@@ -604,104 +606,149 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
retval = -EAGAIN; retval = -EAGAIN;
goto unlock_exit; goto unlock_exit;
} }
// atomic_cmp_exchange(&dev->interrupt_in_done,0,0); /* tiny race - FIXME: make atomic? */
dev->interrupt_in_done = 0 ; /* tiny race - FIXME: make atomic? */ /* atomic_cmp_exchange(&dev->interrupt_in_done,0,0); */
retval = wait_event_interruptible(dev->read_wait, dev->interrupt_in_done); dev->interrupt_in_done = 0;
if (retval < 0) { retval = wait_event_interruptible(dev->read_wait,
dev->interrupt_in_done);
if (retval < 0)
goto unlock_exit; goto unlock_exit;
}
} }
dbg_info(&dev->intf->dev, "%s: copying to userspace: %02x%02x%02x%02x%02x%02x%02x%02x\n", dbg_info(&dev->intf->dev,
__func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); "%s: copying to userspace: "
"%02x%02x%02x%02x%02x%02x%02x%02x\n",
__func__,
(*dev->ring_buffer)[dev->ring_tail].cmd[0],
(*dev->ring_buffer)[dev->ring_tail].cmd[1],
(*dev->ring_buffer)[dev->ring_tail].cmd[2],
(*dev->ring_buffer)[dev->ring_tail].cmd[3],
(*dev->ring_buffer)[dev->ring_tail].cmd[4],
(*dev->ring_buffer)[dev->ring_tail].cmd[5],
(*dev->ring_buffer)[dev->ring_tail].cmd[6],
(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
#if BUFFERED_READS #if BUFFERED_READS
c = 0; c = 0;
while((c < count) && (dev->ring_tail != dev->ring_head)) { while ((c < count) && (dev->ring_tail != dev->ring_head)) {
/* This started off in the lower level service routine, and I moved it here. Then my brain died. Not done yet. */
#if COMPRESS_WHEEL_EVENTS #if COMPRESS_WHEEL_EVENTS
next_tail = (dev->ring_tail+1) % ring_buffer_size; next_tail = (dev->ring_tail+1) % ring_buffer_size;
if(dev->compress_wheel) cancompress = 1; if (dev->compress_wheel)
while(dev->ring_head != next_tail && cancompress == 1 ) { cancompress = 1;
while (dev->ring_head != next_tail && cancompress == 1) {
newwheel = (*dev->ring_buffer)[next_tail].cmd[6]; newwheel = (*dev->ring_buffer)[next_tail].cmd[6];
oldwheel = (*dev->ring_buffer)[dev->ring_tail].cmd[6]; oldwheel = (*dev->ring_buffer)[dev->ring_tail].cmd[6];
// if both are wheel events, and no buttons have changes (FIXME, do I have to check?), /* if both are wheel events, and
// and we are the same sign, we can compress +- 7F no buttons have changes (FIXME, do I have to check?),
// FIXME: saner check for overflow! - max of +- 7F and we are the same sign, we can compress +- 7F
// FIXME the math is wrong for going in reverse, actually, as the midi spec doesn't allow signed chars */
dbg_info(&dev->intf->dev,
dbg_info(&dev->intf->dev, "%s: trying to compress: %02x%02x%02x%02x%02x %02x %02x %02x\n", "%s: trying to compress: "
__func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); "%02x%02x%02x%02x%02x%02x%02x%02x\n",
__func__,
(*dev->ring_buffer)[dev->ring_tail].cmd[0],
if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 && (*dev->ring_buffer)[dev->ring_tail].cmd[1],
(*dev->ring_buffer)[next_tail].cmd[6] != 0 ) && (*dev->ring_buffer)[dev->ring_tail].cmd[2],
(*dev->ring_buffer)[dev->ring_tail].cmd[3],
(*dev->ring_buffer)[dev->ring_tail].cmd[4],
(*dev->ring_buffer)[dev->ring_tail].cmd[5],
(*dev->ring_buffer)[dev->ring_tail].cmd[6],
(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
if (((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 &&
(*dev->ring_buffer)[next_tail].cmd[6] != 0) &&
((newwheel > 0 && oldwheel > 0) || ((newwheel > 0 && oldwheel > 0) ||
(newwheel < 0 && oldwheel < 0)) && (newwheel < 0 && oldwheel < 0)) &&
((*dev->ring_buffer)[dev->ring_tail].cmd[2] == (*dev->ring_buffer)[next_tail].cmd[2]) && ((*dev->ring_buffer)[dev->ring_tail].cmd[2] ==
((*dev->ring_buffer)[dev->ring_tail].cmd[3] == (*dev->ring_buffer)[next_tail].cmd[3]) && (*dev->ring_buffer)[next_tail].cmd[2]) &&
((*dev->ring_buffer)[dev->ring_tail].cmd[4] == (*dev->ring_buffer)[next_tail].cmd[4]) && ((*dev->ring_buffer)[dev->ring_tail].cmd[3] ==
((*dev->ring_buffer)[dev->ring_tail].cmd[5] == (*dev->ring_buffer)[next_tail].cmd[5])) (*dev->ring_buffer)[next_tail].cmd[3]) &&
{ ((*dev->ring_buffer)[dev->ring_tail].cmd[4] ==
dbg_info(&dev->intf->dev, "%s: should compress: %02x%02x%02x%02x%02x%02x%02x%02x\n", (*dev->ring_buffer)[next_tail].cmd[4]) &&
__func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); ((*dev->ring_buffer)[dev->ring_tail].cmd[5] ==
(*dev->ring_buffer)[next_tail].cmd[5])) {
dbg_info(&dev->intf->dev,
"%s: should compress: "
"%02x%02x%02x%02x%02x%02x%02x%02x\n",
__func__,
(*dev->ring_buffer)[dev->ring_tail].
cmd[0],
(*dev->ring_buffer)[dev->ring_tail].
cmd[1],
(*dev->ring_buffer)[dev->ring_tail].
cmd[2],
(*dev->ring_buffer)[dev->ring_tail].
cmd[3],
(*dev->ring_buffer)[dev->ring_tail].
cmd[4],
(*dev->ring_buffer)[dev->ring_tail].
cmd[5],
(*dev->ring_buffer)[dev->ring_tail].
cmd[6],
(*dev->ring_buffer)[dev->ring_tail].
cmd[7]);
newwheel += oldwheel; newwheel += oldwheel;
if(oldwheel > 0 && !(newwheel > 0)) { if (oldwheel > 0 && !(newwheel > 0)) {
newwheel = 0x7f; newwheel = 0x7f;
cancompress = 0; cancompress = 0;
} }
if(oldwheel < 0 && !(newwheel < 0)) { if (oldwheel < 0 && !(newwheel < 0)) {
newwheel = 0x80; newwheel = 0x80;
cancompress = 0; cancompress = 0;
} }
(*dev->ring_buffer)[next_tail].cmd[6] = newwheel; (*dev->ring_buffer)[next_tail].cmd[6] =
newwheel;
dev->ring_tail = next_tail; dev->ring_tail = next_tail;
next_tail = (dev->ring_tail+1) % ring_buffer_size; next_tail =
(dev->ring_tail + 1) % ring_buffer_size;
} else { } else {
cancompress = 0; cancompress = 0;
} }
} }
#endif /* COMPRESS_WHEEL_EVENTS */ #endif /* COMPRESS_WHEEL_EVENTS */
if (copy_to_user(
if (copy_to_user(&buffer[c], &(*dev->ring_buffer)[dev->ring_tail], 8)) { &buffer[c],
&(*dev->ring_buffer)[dev->ring_tail], 8)) {
retval = -EFAULT; retval = -EFAULT;
goto unlock_exit; goto unlock_exit;
} }
dev->ring_tail = (dev->ring_tail + 1) % ring_buffer_size;
dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size; c += 8;
c+=8; dbg_info(&dev->intf->dev,
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail); "%s: head, tail are %x, %x\n",
} __func__, dev->ring_head, dev->ring_tail);
retval = c; }
retval = c;
#else #else
if (copy_to_user(buffer, &(*dev->ring_buffer)[dev->ring_tail], 8)) { /* if (copy_to_user(buffer, &(*dev->ring_buffer)[dev->ring_tail], 8)) { */
retval = -EFAULT; retval = -EFAULT;
goto unlock_exit; goto unlock_exit;
} }
dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size; dev->ring_tail = (dev->ring_tail + 1) % ring_buffer_size;
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail); dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n",
__func__, dev->ring_head, dev->ring_tail);
retval = 8; retval = 8;
#endif /* BUFFERED_READS */ #endif /* BUFFERED_READS */
unlock_exit: unlock_exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); up(&dev->sem);
exit: exit:
return retval; return retval;
} }
/** /**
* usb_tranzport_write * usb_tranzport_write
*/ */
static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer, static ssize_t usb_tranzport_write(struct file *file,
size_t count, loff_t *ppos) const char __user *buffer, size_t count,
loff_t *ppos)
{ {
struct usb_tranzport *dev; struct usb_tranzport *dev;
size_t bytes_to_write; size_t bytes_to_write;
...@@ -718,7 +765,6 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer, ...@@ -718,7 +765,6 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
goto exit; goto exit;
} }
/* verify that the device wasn't unplugged */ /* verify that the device wasn't unplugged */
if (dev->intf == NULL) { if (dev->intf == NULL) {
retval = -ENODEV; retval = -ENODEV;
...@@ -732,18 +778,24 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer, ...@@ -732,18 +778,24 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
retval = -EAGAIN; retval = -EAGAIN;
goto unlock_exit; goto unlock_exit;
} }
retval = wait_event_interruptible(dev->write_wait, !dev->interrupt_out_busy); retval = wait_event_interruptible(dev->write_wait,
if (retval < 0) { !dev->interrupt_out_busy);
if (retval < 0)
goto unlock_exit; goto unlock_exit;
}
} }
/* write the data into interrupt_out_buffer from userspace */ /* write the data into interrupt_out_buffer from userspace */
bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size); bytes_to_write = min(count,
write_buffer_size *
dev->interrupt_out_endpoint_size);
if (bytes_to_write < count) if (bytes_to_write < count)
dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); dev_warn(&dev->intf->dev,
"Write buffer overflow, %zd bytes dropped\n",
count - bytes_to_write);
dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write); dbg_info(&dev->intf->dev,
"%s: count = %zd, bytes_to_write = %zd\n", __func__,
count, bytes_to_write);
if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
retval = -EFAULT; retval = -EFAULT;
...@@ -757,14 +809,13 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer, ...@@ -757,14 +809,13 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
/* send off the urb */ /* send off the urb */
usb_fill_int_urb(dev->interrupt_out_urb, usb_fill_int_urb(dev->interrupt_out_urb,
interface_to_usbdev(dev->intf), interface_to_usbdev(dev->intf),
usb_sndintpipe(interface_to_usbdev(dev->intf), usb_sndintpipe(interface_to_usbdev(dev->intf),
dev->interrupt_out_endpoint->bEndpointAddress), dev->interrupt_out_endpoint->
dev->interrupt_out_buffer, bEndpointAddress),
bytes_to_write, dev->interrupt_out_buffer, bytes_to_write,
usb_tranzport_interrupt_out_callback, usb_tranzport_interrupt_out_callback, dev,
dev, dev->interrupt_out_interval);
dev->interrupt_out_interval);
dev->interrupt_out_busy = 1; dev->interrupt_out_busy = 1;
wmb(); wmb();
...@@ -787,12 +838,12 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer, ...@@ -787,12 +838,12 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
/* file operations needed when we register this driver */ /* file operations needed when we register this driver */
static const struct file_operations usb_tranzport_fops = { static const struct file_operations usb_tranzport_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = usb_tranzport_read, .read = usb_tranzport_read,
.write = usb_tranzport_write, .write = usb_tranzport_write,
.open = usb_tranzport_open, .open = usb_tranzport_open,
.release = usb_tranzport_release, .release = usb_tranzport_release,
.poll = usb_tranzport_poll, .poll = usb_tranzport_poll,
}; };
/* /*
...@@ -800,20 +851,19 @@ static const struct file_operations usb_tranzport_fops = { ...@@ -800,20 +851,19 @@ static const struct file_operations usb_tranzport_fops = {
* and to have the device registered with the driver core * and to have the device registered with the driver core
*/ */
static struct usb_class_driver usb_tranzport_class = { static struct usb_class_driver usb_tranzport_class = {
.name = "tranzport%d", .name = "tranzport%d",
.fops = &usb_tranzport_fops, .fops = &usb_tranzport_fops,
.minor_base = USB_TRANZPORT_MINOR_BASE, .minor_base = USB_TRANZPORT_MINOR_BASE,
}; };
/** /**
* usb_tranzport_probe * usb_tranzport_probe
* *
* Called by the usb core when a new device is connected that it thinks * Called by the usb core when a new device is connected that it thinks
* this driver might be interested in. * this driver might be interested in.
*/ */
static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_device_id *id) static int usb_tranzport_probe(struct usb_interface *intf,
{ const struct usb_device_id *id) {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
struct usb_tranzport *dev = NULL; struct usb_tranzport *dev = NULL;
struct usb_host_interface *iface_desc; struct usb_host_interface *iface_desc;
...@@ -824,7 +874,7 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi ...@@ -824,7 +874,7 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi
/* allocate memory for our device state and intialize it */ /* allocate memory for our device state and intialize it */
dev = kzalloc(sizeof(*dev), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (dev == NULL) { if (dev == NULL) {
dev_err(&intf->dev, "Out of memory\n"); dev_err(&intf->dev, "Out of memory\n");
goto exit; goto exit;
...@@ -851,25 +901,33 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi ...@@ -851,25 +901,33 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi
goto error; goto error;
} }
if (dev->interrupt_out_endpoint == NULL) if (dev->interrupt_out_endpoint == NULL)
dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n"); dev_warn(&intf->dev,
"Interrupt out endpoint not found"
"(using control endpoint instead)\n");
dev->interrupt_in_endpoint_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize); dev->interrupt_in_endpoint_size =
le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize);
if (dev->interrupt_in_endpoint_size != 8) if (dev->interrupt_in_endpoint_size != 8)
dev_warn(&intf->dev, "Interrupt in endpoint size is not 8!\n"); dev_warn(&intf->dev, "Interrupt in endpoint size is not 8!\n");
if(ring_buffer_size == 0) { ring_buffer_size = RING_BUFFER_SIZE; } if (ring_buffer_size == 0)
true_size = min(ring_buffer_size,RING_BUFFER_SIZE); ring_buffer_size = RING_BUFFER_SIZE;
/* FIXME - there are more usb_alloc routines for dma correctness. Needed? */ true_size = min(ring_buffer_size, RING_BUFFER_SIZE);
dev->ring_buffer = kmalloc((true_size*sizeof(struct tranzport_cmd))+8, GFP_KERNEL); /* FIXME - there are more usb_alloc routines for dma correctness.
Needed? */
dev->ring_buffer =
kmalloc((true_size * sizeof(struct tranzport_cmd)) + 8, GFP_KERNEL);
if (!dev->ring_buffer) { if (!dev->ring_buffer) {
dev_err(&intf->dev, "Couldn't allocate ring_buffer of size %d\n",true_size); dev_err(&intf->dev,
"Couldn't allocate ring_buffer size %d\n", true_size);
goto error; goto error;
} }
dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL); dev->interrupt_in_buffer =
kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL);
if (!dev->interrupt_in_buffer) { if (!dev->interrupt_in_buffer) {
dev_err(&intf->dev, "Couldn't allocate interrupt_in_buffer\n"); dev_err(&intf->dev, "Couldn't allocate interrupt_in_buffer\n");
goto error; goto error;
...@@ -879,13 +937,18 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi ...@@ -879,13 +937,18 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi
dev_err(&intf->dev, "Couldn't allocate interrupt_in_urb\n"); dev_err(&intf->dev, "Couldn't allocate interrupt_in_urb\n");
goto error; goto error;
} }
dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize) : dev->interrupt_out_endpoint_size =
udev->descriptor.bMaxPacketSize0; dev->interrupt_out_endpoint ?
le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize) :
if (dev->interrupt_out_endpoint_size !=8) udev->descriptor.bMaxPacketSize0;
dev_warn(&intf->dev, "Interrupt out endpoint size is not 8!)\n");
if (dev->interrupt_out_endpoint_size != 8)
dev->interrupt_out_buffer = kmalloc(write_buffer_size*dev->interrupt_out_endpoint_size, GFP_KERNEL); dev_warn(&intf->dev,
"Interrupt out endpoint size is not 8!)\n");
dev->interrupt_out_buffer =
kmalloc(write_buffer_size * dev->interrupt_out_endpoint_size,
GFP_KERNEL);
if (!dev->interrupt_out_buffer) { if (!dev->interrupt_out_buffer) {
dev_err(&intf->dev, "Couldn't allocate interrupt_out_buffer\n"); dev_err(&intf->dev, "Couldn't allocate interrupt_out_buffer\n");
goto error; goto error;
...@@ -895,9 +958,18 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi ...@@ -895,9 +958,18 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi
dev_err(&intf->dev, "Couldn't allocate interrupt_out_urb\n"); dev_err(&intf->dev, "Couldn't allocate interrupt_out_urb\n");
goto error; goto error;
} }
dev->interrupt_in_interval = min_interrupt_in_interval > dev->interrupt_in_endpoint->bInterval ? min_interrupt_in_interval : dev->interrupt_in_endpoint->bInterval; dev->interrupt_in_interval =
if (dev->interrupt_out_endpoint) min_interrupt_in_interval >
dev->interrupt_out_interval = min_interrupt_out_interval > dev->interrupt_out_endpoint->bInterval ? min_interrupt_out_interval : dev->interrupt_out_endpoint->bInterval; dev->interrupt_in_endpoint->bInterval ? min_interrupt_in_interval
: dev->interrupt_in_endpoint->bInterval;
if (dev->interrupt_out_endpoint) {
dev->interrupt_out_interval =
min_interrupt_out_interval >
dev->interrupt_out_endpoint->bInterval ?
min_interrupt_out_interval :
dev->interrupt_out_endpoint->bInterval;
}
/* we can register the device now, as it is ready */ /* we can register the device now, as it is ready */
usb_set_intfdata(intf, dev); usb_set_intfdata(intf, dev);
...@@ -905,35 +977,63 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi ...@@ -905,35 +977,63 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi
retval = usb_register_dev(intf, &usb_tranzport_class); retval = usb_register_dev(intf, &usb_tranzport_class);
if (retval) { if (retval) {
/* something prevented us from registering this driver */ /* something prevented us from registering this driver */
dev_err(&intf->dev, "Not able to get a minor for this device.\n"); dev_err(&intf->dev,
"Not able to get a minor for this device.\n");
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
goto error; goto error;
} }
if((retval = device_create_file(&intf->dev, &dev_attr_LightRecord))) goto error; retval = device_create_file(&intf->dev, &dev_attr_LightRecord);
if((retval = device_create_file(&intf->dev, &dev_attr_LightTrackrec))) goto error; if (retval)
if((retval = device_create_file(&intf->dev, &dev_attr_LightTrackmute))) goto error; goto error;
if((retval = device_create_file(&intf->dev, &dev_attr_LightTracksolo))) goto error; retval = device_create_file(&intf->dev, &dev_attr_LightTrackrec);
if((retval = device_create_file(&intf->dev, &dev_attr_LightAnysolo))) goto error; if (retval)
if((retval = device_create_file(&intf->dev, &dev_attr_LightLoop))) goto error; goto error;
if((retval = device_create_file(&intf->dev, &dev_attr_LightPunch))) goto error; retval = device_create_file(&intf->dev, &dev_attr_LightTrackmute);
if((retval = device_create_file(&intf->dev, &dev_attr_wheel))) goto error; if (retval)
if((retval = device_create_file(&intf->dev, &dev_attr_event))) goto error; goto error;
if((retval = device_create_file(&intf->dev, &dev_attr_dump_state))) goto error; retval = device_create_file(&intf->dev, &dev_attr_LightTracksolo);
if((retval = device_create_file(&intf->dev, &dev_attr_compress_wheel))) goto error; if (retval)
if((retval = device_create_file(&intf->dev, &dev_attr_enable))) goto error; goto error;
if((retval = device_create_file(&intf->dev, &dev_attr_offline))) goto error; retval = device_create_file(&intf->dev, &dev_attr_LightAnysolo);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_LightLoop);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_LightPunch);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_wheel);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_event);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_dump_state);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_compress_wheel);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_enable);
if (retval)
goto error;
retval = device_create_file(&intf->dev, &dev_attr_offline);
if (retval)
goto error;
/* let the user know what node this device is now attached to */ /* let the user know what node this device is now attached to */
dev_info(&intf->dev, "Tranzport Device #%d now attached to major %d minor %d\n", dev_info(&intf->dev,
(intf->minor - USB_TRANZPORT_MINOR_BASE), USB_MAJOR, intf->minor); "Tranzport Device #%d now attached to major %d minor %d\n",
(intf->minor - USB_TRANZPORT_MINOR_BASE), USB_MAJOR,
intf->minor);
exit: exit:
return retval; return retval;
error: error:
usb_tranzport_delete(dev); usb_tranzport_delete(dev);
return retval; return retval;
} }
...@@ -966,15 +1066,15 @@ static void usb_tranzport_disconnect(struct usb_interface *intf) ...@@ -966,15 +1066,15 @@ static void usb_tranzport_disconnect(struct usb_interface *intf)
mutex_unlock(&disconnect_mutex); mutex_unlock(&disconnect_mutex);
dev_info(&intf->dev, "Tranzport Surface #%d now disconnected\n", dev_info(&intf->dev, "Tranzport Surface #%d now disconnected\n",
(minor - USB_TRANZPORT_MINOR_BASE)); (minor - USB_TRANZPORT_MINOR_BASE));
} }
/* usb specific object needed to register this driver with the usb subsystem */ /* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver usb_tranzport_driver = { static struct usb_driver usb_tranzport_driver = {
.name = "tranzport", .name = "tranzport",
.probe = usb_tranzport_probe, .probe = usb_tranzport_probe,
.disconnect = usb_tranzport_disconnect, .disconnect = usb_tranzport_disconnect,
.id_table = usb_tranzport_table, .id_table = usb_tranzport_table,
}; };
/** /**
...@@ -987,14 +1087,14 @@ static int __init usb_tranzport_init(void) ...@@ -987,14 +1087,14 @@ static int __init usb_tranzport_init(void)
/* register this driver with the USB subsystem */ /* register this driver with the USB subsystem */
retval = usb_register(&usb_tranzport_driver); retval = usb_register(&usb_tranzport_driver);
if (retval) if (retval)
err("usb_register failed for the "__FILE__" driver. Error number %d\n", retval); err("usb_register failed for the " __FILE__
" driver. Error number %d\n", retval);
return retval; return retval;
} }
/** /**
* usb_tranzport_exit * usb_tranzport_exit
*/ */
static void __exit usb_tranzport_exit(void) static void __exit usb_tranzport_exit(void)
{ {
/* deregister this driver with the USB subsystem */ /* deregister this driver with the USB subsystem */
...@@ -1003,4 +1103,3 @@ static void __exit usb_tranzport_exit(void) ...@@ -1003,4 +1103,3 @@ static void __exit usb_tranzport_exit(void)
module_init(usb_tranzport_init); module_init(usb_tranzport_init);
module_exit(usb_tranzport_exit); module_exit(usb_tranzport_exit);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7