#include <linux/module.h>
#include <linux/usb.h>
+#include "phidget.h"
+
#define DRIVER_AUTHOR "Sean Young <sean@mess.org>"
#define DRIVER_DESC "USB PhidgetInterfaceKit Driver"
ifkit(0, 8, 8, 1);
ifkit(0, 16, 16, 0);
+static unsigned long device_no;
+
struct interfacekit {
struct usb_device *udev;
struct usb_interface *intf;
struct driver_interfacekit *ifkit;
+ struct device *dev;
unsigned long outputs;
+ int dev_no;
u8 inputs[MAX_INTERFACES];
u16 sensors[MAX_INTERFACES];
u8 lcd_files_on;
}
#define set_lcd_line(number) \
-static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct interfacekit *kit = usb_get_intfdata(intf); \
- change_string(kit, buf, number - 1); \
- return count; \
-} \
+static ssize_t lcd_line_##number(struct device *dev, \
+ struct device_attribute *attr, \
+ const char *buf, size_t count) \
+{ \
+ struct interfacekit *kit = dev_get_drvdata(dev); \
+ change_string(kit, buf, number - 1); \
+ return count; \
+} \
static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number);
set_lcd_line(1);
set_lcd_line(2);
static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
- struct usb_interface *intf = to_usb_interface(dev);
- struct interfacekit *kit = usb_get_intfdata(intf);
+ struct interfacekit *kit = dev_get_drvdata(dev);
int enabled;
unsigned char *buffer;
int retval = -ENOMEM;
{
if (kit->lcd_files_on) {
dev_dbg(&kit->udev->dev, "Removing lcd files\n");
- device_remove_file(&kit->intf->dev, &dev_attr_lcd_line_1);
- device_remove_file(&kit->intf->dev, &dev_attr_lcd_line_2);
- device_remove_file(&kit->intf->dev, &dev_attr_backlight);
+ device_remove_file(kit->dev, &dev_attr_lcd_line_1);
+ device_remove_file(kit->dev, &dev_attr_lcd_line_2);
+ device_remove_file(kit->dev, &dev_attr_backlight);
}
}
static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
- struct usb_interface *intf = to_usb_interface(dev);
- struct interfacekit *kit = usb_get_intfdata(intf);
+ struct interfacekit *kit = dev_get_drvdata(dev);
int enable;
if (kit->ifkit->has_lcd == 0)
if (enable) {
if (!kit->lcd_files_on) {
dev_dbg(&kit->udev->dev, "Adding lcd files\n");
- device_create_file(&kit->intf->dev, &dev_attr_lcd_line_1);
- device_create_file(&kit->intf->dev, &dev_attr_lcd_line_2);
- device_create_file(&kit->intf->dev, &dev_attr_backlight);
+ device_create_file(kit->dev, &dev_attr_lcd_line_1);
+ device_create_file(kit->dev, &dev_attr_lcd_line_2);
+ device_create_file(kit->dev, &dev_attr_backlight);
kit->lcd_files_on = 1;
}
} else {
for (i=0; i<kit->ifkit->inputs; i++) {
if (test_and_clear_bit(i, &kit->input_events)) {
sprintf(sysfs_file, "input%d", i + 1);
- sysfs_notify(&kit->intf->dev.kobj, NULL, sysfs_file);
+ sysfs_notify(&kit->dev->kobj, NULL, sysfs_file);
}
}
for (i=0; i<kit->ifkit->sensors; i++) {
if (test_and_clear_bit(i, &kit->sensor_events)) {
sprintf(sysfs_file, "sensor%d", i + 1);
- sysfs_notify(&kit->intf->dev.kobj, NULL, sysfs_file);
+ sysfs_notify(&kit->dev->kobj, NULL, sysfs_file);
}
}
}
#define show_set_output(value) \
-static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf, \
- size_t count) \
+static ssize_t set_output##value(struct device *dev, \
+ struct device_attribute *attr, \
+ const char *buf, size_t count) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct interfacekit *kit = usb_get_intfdata(intf); \
+ struct interfacekit *kit = dev_get_drvdata(dev); \
int enabled; \
int retval; \
\
return retval ? retval : count; \
} \
\
-static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf) \
+static ssize_t show_output##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct interfacekit *kit = usb_get_intfdata(intf); \
+ struct interfacekit *kit = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", !!test_bit(value - 1, &kit->outputs));\
} \
#define show_input(value) \
static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct interfacekit *kit = usb_get_intfdata(intf); \
+ struct interfacekit *kit = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", (int)kit->inputs[value - 1]); \
} \
show_input(16);
#define show_sensor(value) \
-static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf) \
+static ssize_t show_sensor##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct interfacekit *kit = usb_get_intfdata(intf); \
+ struct interfacekit *kit = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", (int)kit->sensors[value - 1]); \
} \
struct interfacekit *kit;
struct driver_interfacekit *ifkit;
int pipe, maxp, rc = -ENOMEM;
+ int bit, value;
ifkit = (struct driver_interfacekit *)id->driver_info;
if (!ifkit)
if (!kit)
goto out;
+ kit->dev_no = -1;
kit->ifkit = ifkit;
kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &kit->data_dma);
if (!kit->data)
usb_set_intfdata(intf, kit);
+ do {
+ bit = find_first_zero_bit(&device_no, sizeof(device_no));
+ value = test_and_set_bit(bit, &device_no);
+ } while(value);
+ kit->dev_no = bit;
+
+ kit->dev = device_create(phidget_class, &kit->udev->dev, 0,
+ "interfacekit%d", kit->dev_no);
+ if (IS_ERR(kit->dev)) {
+ rc = PTR_ERR(kit->dev);
+ kit->dev = NULL;
+ goto out;
+ }
+ dev_set_drvdata(kit->dev, kit);
+
if (usb_submit_urb(kit->irq, GFP_KERNEL)) {
rc = -EIO;
goto out;
}
if (ifkit->outputs >= 4) {
- device_create_file(&intf->dev, &dev_attr_output1);
- device_create_file(&intf->dev, &dev_attr_output2);
- device_create_file(&intf->dev, &dev_attr_output3);
- device_create_file(&intf->dev, &dev_attr_output4);
+ device_create_file(kit->dev, &dev_attr_output1);
+ device_create_file(kit->dev, &dev_attr_output2);
+ device_create_file(kit->dev, &dev_attr_output3);
+ device_create_file(kit->dev, &dev_attr_output4);
}
if (ifkit->outputs >= 8) {
- device_create_file(&intf->dev, &dev_attr_output5);
- device_create_file(&intf->dev, &dev_attr_output6);
- device_create_file(&intf->dev, &dev_attr_output7);
- device_create_file(&intf->dev, &dev_attr_output8);
+ device_create_file(kit->dev, &dev_attr_output5);
+ device_create_file(kit->dev, &dev_attr_output6);
+ device_create_file(kit->dev, &dev_attr_output7);
+ device_create_file(kit->dev, &dev_attr_output8);
}
if (ifkit->outputs == 16) {
- device_create_file(&intf->dev, &dev_attr_output9);
- device_create_file(&intf->dev, &dev_attr_output10);
- device_create_file(&intf->dev, &dev_attr_output11);
- device_create_file(&intf->dev, &dev_attr_output12);
- device_create_file(&intf->dev, &dev_attr_output13);
- device_create_file(&intf->dev, &dev_attr_output14);
- device_create_file(&intf->dev, &dev_attr_output15);
- device_create_file(&intf->dev, &dev_attr_output16);
+ device_create_file(kit->dev, &dev_attr_output9);
+ device_create_file(kit->dev, &dev_attr_output10);
+ device_create_file(kit->dev, &dev_attr_output11);
+ device_create_file(kit->dev, &dev_attr_output12);
+ device_create_file(kit->dev, &dev_attr_output13);
+ device_create_file(kit->dev, &dev_attr_output14);
+ device_create_file(kit->dev, &dev_attr_output15);
+ device_create_file(kit->dev, &dev_attr_output16);
}
if (ifkit->inputs >= 4) {
- device_create_file(&intf->dev, &dev_attr_input1);
- device_create_file(&intf->dev, &dev_attr_input2);
- device_create_file(&intf->dev, &dev_attr_input3);
- device_create_file(&intf->dev, &dev_attr_input4);
+ device_create_file(kit->dev, &dev_attr_input1);
+ device_create_file(kit->dev, &dev_attr_input2);
+ device_create_file(kit->dev, &dev_attr_input3);
+ device_create_file(kit->dev, &dev_attr_input4);
}
if (ifkit->inputs >= 8) {
- device_create_file(&intf->dev, &dev_attr_input5);
- device_create_file(&intf->dev, &dev_attr_input6);
- device_create_file(&intf->dev, &dev_attr_input7);
- device_create_file(&intf->dev, &dev_attr_input8);
+ device_create_file(kit->dev, &dev_attr_input5);
+ device_create_file(kit->dev, &dev_attr_input6);
+ device_create_file(kit->dev, &dev_attr_input7);
+ device_create_file(kit->dev, &dev_attr_input8);
}
if (ifkit->inputs == 16) {
- device_create_file(&intf->dev, &dev_attr_input9);
- device_create_file(&intf->dev, &dev_attr_input10);
- device_create_file(&intf->dev, &dev_attr_input11);
- device_create_file(&intf->dev, &dev_attr_input12);
- device_create_file(&intf->dev, &dev_attr_input13);
- device_create_file(&intf->dev, &dev_attr_input14);
- device_create_file(&intf->dev, &dev_attr_input15);
- device_create_file(&intf->dev, &dev_attr_input16);
+ device_create_file(kit->dev, &dev_attr_input9);
+ device_create_file(kit->dev, &dev_attr_input10);
+ device_create_file(kit->dev, &dev_attr_input11);
+ device_create_file(kit->dev, &dev_attr_input12);
+ device_create_file(kit->dev, &dev_attr_input13);
+ device_create_file(kit->dev, &dev_attr_input14);
+ device_create_file(kit->dev, &dev_attr_input15);
+ device_create_file(kit->dev, &dev_attr_input16);
}
if (ifkit->sensors >= 4) {
- device_create_file(&intf->dev, &dev_attr_sensor1);
- device_create_file(&intf->dev, &dev_attr_sensor2);
- device_create_file(&intf->dev, &dev_attr_sensor3);
- device_create_file(&intf->dev, &dev_attr_sensor4);
+ device_create_file(kit->dev, &dev_attr_sensor1);
+ device_create_file(kit->dev, &dev_attr_sensor2);
+ device_create_file(kit->dev, &dev_attr_sensor3);
+ device_create_file(kit->dev, &dev_attr_sensor4);
}
if (ifkit->sensors >= 7) {
- device_create_file(&intf->dev, &dev_attr_sensor5);
- device_create_file(&intf->dev, &dev_attr_sensor6);
- device_create_file(&intf->dev, &dev_attr_sensor7);
+ device_create_file(kit->dev, &dev_attr_sensor5);
+ device_create_file(kit->dev, &dev_attr_sensor6);
+ device_create_file(kit->dev, &dev_attr_sensor7);
}
if (ifkit->sensors == 8)
- device_create_file(&intf->dev, &dev_attr_sensor8);
+ device_create_file(kit->dev, &dev_attr_sensor8);
if (ifkit->has_lcd)
- device_create_file(&intf->dev, &dev_attr_lcd);
+ device_create_file(kit->dev, &dev_attr_lcd);
dev_info(&intf->dev, "USB PhidgetInterfaceKit %d/%d/%d attached\n",
ifkit->sensors, ifkit->inputs, ifkit->outputs);
usb_free_urb(kit->irq);
if (kit->data)
usb_buffer_free(dev, URB_INT_SIZE, kit->data, kit->data_dma);
+ if (kit->dev)
+ device_unregister(kit->dev);
+ if (kit->dev_no >= 0)
+ clear_bit(kit->dev_no, &device_no);
+
kfree(kit);
}
cancel_delayed_work(&kit->do_notify);
if (kit->ifkit->outputs >= 4) {
- device_remove_file(&interface->dev, &dev_attr_output1);
- device_remove_file(&interface->dev, &dev_attr_output2);
- device_remove_file(&interface->dev, &dev_attr_output3);
- device_remove_file(&interface->dev, &dev_attr_output4);
+ device_remove_file(kit->dev, &dev_attr_output1);
+ device_remove_file(kit->dev, &dev_attr_output2);
+ device_remove_file(kit->dev, &dev_attr_output3);
+ device_remove_file(kit->dev, &dev_attr_output4);
}
if (kit->ifkit->outputs >= 8) {
- device_remove_file(&interface->dev, &dev_attr_output5);
- device_remove_file(&interface->dev, &dev_attr_output6);
- device_remove_file(&interface->dev, &dev_attr_output7);
- device_remove_file(&interface->dev, &dev_attr_output8);
+ device_remove_file(kit->dev, &dev_attr_output5);
+ device_remove_file(kit->dev, &dev_attr_output6);
+ device_remove_file(kit->dev, &dev_attr_output7);
+ device_remove_file(kit->dev, &dev_attr_output8);
}
if (kit->ifkit->outputs == 16) {
- device_remove_file(&interface->dev, &dev_attr_output9);
- device_remove_file(&interface->dev, &dev_attr_output10);
- device_remove_file(&interface->dev, &dev_attr_output11);
- device_remove_file(&interface->dev, &dev_attr_output12);
- device_remove_file(&interface->dev, &dev_attr_output13);
- device_remove_file(&interface->dev, &dev_attr_output14);
- device_remove_file(&interface->dev, &dev_attr_output15);
- device_remove_file(&interface->dev, &dev_attr_output16);
+ device_remove_file(kit->dev, &dev_attr_output9);
+ device_remove_file(kit->dev, &dev_attr_output10);
+ device_remove_file(kit->dev, &dev_attr_output11);
+ device_remove_file(kit->dev, &dev_attr_output12);
+ device_remove_file(kit->dev, &dev_attr_output13);
+ device_remove_file(kit->dev, &dev_attr_output14);
+ device_remove_file(kit->dev, &dev_attr_output15);
+ device_remove_file(kit->dev, &dev_attr_output16);
}
if (kit->ifkit->inputs >= 4) {
- device_remove_file(&interface->dev, &dev_attr_input1);
- device_remove_file(&interface->dev, &dev_attr_input2);
- device_remove_file(&interface->dev, &dev_attr_input3);
- device_remove_file(&interface->dev, &dev_attr_input4);
+ device_remove_file(kit->dev, &dev_attr_input1);
+ device_remove_file(kit->dev, &dev_attr_input2);
+ device_remove_file(kit->dev, &dev_attr_input3);
+ device_remove_file(kit->dev, &dev_attr_input4);
}
if (kit->ifkit->inputs >= 8) {
- device_remove_file(&interface->dev, &dev_attr_input5);
- device_remove_file(&interface->dev, &dev_attr_input6);
- device_remove_file(&interface->dev, &dev_attr_input7);
- device_remove_file(&interface->dev, &dev_attr_input8);
+ device_remove_file(kit->dev, &dev_attr_input5);
+ device_remove_file(kit->dev, &dev_attr_input6);
+ device_remove_file(kit->dev, &dev_attr_input7);
+ device_remove_file(kit->dev, &dev_attr_input8);
}
if (kit->ifkit->inputs == 16) {
- device_remove_file(&interface->dev, &dev_attr_input9);
- device_remove_file(&interface->dev, &dev_attr_input10);
- device_remove_file(&interface->dev, &dev_attr_input11);
- device_remove_file(&interface->dev, &dev_attr_input12);
- device_remove_file(&interface->dev, &dev_attr_input13);
- device_remove_file(&interface->dev, &dev_attr_input14);
- device_remove_file(&interface->dev, &dev_attr_input15);
- device_remove_file(&interface->dev, &dev_attr_input16);
+ device_remove_file(kit->dev, &dev_attr_input9);
+ device_remove_file(kit->dev, &dev_attr_input10);
+ device_remove_file(kit->dev, &dev_attr_input11);
+ device_remove_file(kit->dev, &dev_attr_input12);
+ device_remove_file(kit->dev, &dev_attr_input13);
+ device_remove_file(kit->dev, &dev_attr_input14);
+ device_remove_file(kit->dev, &dev_attr_input15);
+ device_remove_file(kit->dev, &dev_attr_input16);
}
if (kit->ifkit->sensors >= 4) {
- device_remove_file(&interface->dev, &dev_attr_sensor1);
- device_remove_file(&interface->dev, &dev_attr_sensor2);
- device_remove_file(&interface->dev, &dev_attr_sensor3);
- device_remove_file(&interface->dev, &dev_attr_sensor4);
+ device_remove_file(kit->dev, &dev_attr_sensor1);
+ device_remove_file(kit->dev, &dev_attr_sensor2);
+ device_remove_file(kit->dev, &dev_attr_sensor3);
+ device_remove_file(kit->dev, &dev_attr_sensor4);
}
if (kit->ifkit->sensors >= 7) {
- device_remove_file(&interface->dev, &dev_attr_sensor5);
- device_remove_file(&interface->dev, &dev_attr_sensor6);
- device_remove_file(&interface->dev, &dev_attr_sensor7);
+ device_remove_file(kit->dev, &dev_attr_sensor5);
+ device_remove_file(kit->dev, &dev_attr_sensor6);
+ device_remove_file(kit->dev, &dev_attr_sensor7);
}
if (kit->ifkit->sensors == 8)
- device_remove_file(&interface->dev, &dev_attr_sensor8);
+ device_remove_file(kit->dev, &dev_attr_sensor8);
if (kit->ifkit->has_lcd)
- device_remove_file(&interface->dev, &dev_attr_lcd);
+ device_remove_file(kit->dev, &dev_attr_lcd);
+
+ device_unregister(kit->dev);
dev_info(&interface->dev, "USB PhidgetInterfaceKit %d/%d/%d detached\n",
kit->ifkit->sensors, kit->ifkit->inputs, kit->ifkit->outputs);
usb_put_dev(kit->udev);
+ clear_bit(kit->dev_no, &device_no);
+
kfree(kit);
}
#include <linux/module.h>
#include <linux/usb.h>
+#include "phidget.h"
+
#define DRIVER_AUTHOR "Sean Young <sean@mess.org>"
#define DRIVER_DESC "USB PhidgetMotorControl Driver"
#define URB_INT_SIZE 8
+static unsigned long device_no;
+
struct motorcontrol {
struct usb_device *udev;
struct usb_interface *intf;
+ struct device *dev;
+ int dev_no;
u8 inputs[4];
s8 desired_speed[2];
s8 speed[2];
for (i=0; i<4; i++) {
if (test_and_clear_bit(i, &mc->input_events)) {
sprintf(sysfs_file, "input%d", i);
- sysfs_notify(&mc->intf->dev.kobj, NULL, sysfs_file);
+ sysfs_notify(&mc->dev->kobj, NULL, sysfs_file);
}
}
for (i=0; i<2; i++) {
if (test_and_clear_bit(i, &mc->speed_events)) {
sprintf(sysfs_file, "speed%d", i);
- sysfs_notify(&mc->intf->dev.kobj, NULL, sysfs_file);
+ sysfs_notify(&mc->dev->kobj, NULL, sysfs_file);
}
}
}
#define show_set_speed(value) \
-static ssize_t set_speed##value(struct device *dev, \
- struct device_attribute *attr, const char *buf, size_t count) \
+static ssize_t set_speed##value(struct device *dev, \
+ struct device_attribute *attr, \
+ const char *buf, size_t count) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
int speed; \
int retval; \
\
return retval ? retval : count; \
} \
\
-static ssize_t show_speed##value(struct device *dev, \
- struct device_attribute *attr, char *buf) \
+static ssize_t show_speed##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", mc->speed[value]); \
} \
#define show_set_acceleration(value) \
static ssize_t set_acceleration##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 motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
int acceleration; \
int retval; \
\
return retval ? retval : count; \
} \
\
-static ssize_t show_acceleration##value(struct device *dev, \
- struct device_attribute *attr, char *buf) \
+static ssize_t show_acceleration##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", mc->acceleration[value]); \
} \
show_set_acceleration(1);
#define show_current(value) \
-static ssize_t show_current##value(struct device *dev, \
- struct device_attribute *attr, char *buf) \
+static ssize_t show_current##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
\
return sprintf(buf, "%dmA\n", (int)mc->_current[value]); \
} \
show_current(1);
#define show_input(value) \
-static ssize_t show_input##value(struct device *dev, \
- struct device_attribute *attr, char *buf) \
+static ssize_t show_input##value(struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface(dev); \
- struct motorcontrol *mc = usb_get_intfdata(intf); \
+ struct motorcontrol *mc = dev_get_drvdata(dev); \
\
return sprintf(buf, "%d\n", (int)mc->inputs[value]); \
} \
struct usb_endpoint_descriptor *endpoint;
struct motorcontrol *mc;
int pipe, maxp, rc = -ENOMEM;
+ int bit, value;
interface = intf->cur_altsetting;
if (interface->desc.bNumEndpoints != 1)
if (!mc)
goto out;
+ mc->dev_no = -1;
mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &mc->data_dma);
if (!mc->data)
goto out;
usb_set_intfdata(intf, mc);
+ do {
+ bit = find_first_zero_bit(&device_no, sizeof(device_no));
+ value = test_and_set_bit(bit, &device_no);
+ } while(value);
+ mc->dev_no = bit;
+
+ mc->dev = device_create(phidget_class, &mc->udev->dev, 0,
+ "motorcontrol%d", mc->dev_no);
+ if (IS_ERR(mc->dev)) {
+ rc = PTR_ERR(mc->dev);
+ mc->dev = NULL;
+ goto out;
+ }
+
+ dev_set_drvdata(mc->dev, mc);
+
if (usb_submit_urb(mc->irq, GFP_KERNEL)) {
rc = -EIO;
goto out;
}
- device_create_file(&intf->dev, &dev_attr_input0);
- device_create_file(&intf->dev, &dev_attr_input1);
- device_create_file(&intf->dev, &dev_attr_input2);
- device_create_file(&intf->dev, &dev_attr_input3);
+ device_create_file(mc->dev, &dev_attr_input0);
+ device_create_file(mc->dev, &dev_attr_input1);
+ device_create_file(mc->dev, &dev_attr_input2);
+ device_create_file(mc->dev, &dev_attr_input3);
- device_create_file(&intf->dev, &dev_attr_speed0);
- device_create_file(&intf->dev, &dev_attr_speed1);
+ device_create_file(mc->dev, &dev_attr_speed0);
+ device_create_file(mc->dev, &dev_attr_speed1);
- device_create_file(&intf->dev, &dev_attr_acceleration0);
- device_create_file(&intf->dev, &dev_attr_acceleration1);
+ device_create_file(mc->dev, &dev_attr_acceleration0);
+ device_create_file(mc->dev, &dev_attr_acceleration1);
- device_create_file(&intf->dev, &dev_attr_current0);
- device_create_file(&intf->dev, &dev_attr_current1);
+ device_create_file(mc->dev, &dev_attr_current0);
+ device_create_file(mc->dev, &dev_attr_current1);
- dev_info(&intf->dev, "USB Phidget MotorControl attached\n");
+ dev_info(&intf->dev, "USB PhidgetMotorControl attached\n");
return 0;
usb_free_urb(mc->irq);
if (mc->data)
usb_buffer_free(dev, URB_INT_SIZE, mc->data, mc->data_dma);
+ if (mc->dev)
+ device_unregister(mc->dev);
+ if (mc->dev_no >= 0)
+ clear_bit(mc->dev_no, &device_no);
+
kfree(mc);
}
cancel_delayed_work(&mc->do_notify);
- device_remove_file(&interface->dev, &dev_attr_input0);
- device_remove_file(&interface->dev, &dev_attr_input1);
- device_remove_file(&interface->dev, &dev_attr_input2);
- device_remove_file(&interface->dev, &dev_attr_input3);
+ device_remove_file(mc->dev, &dev_attr_input0);
+ device_remove_file(mc->dev, &dev_attr_input1);
+ device_remove_file(mc->dev, &dev_attr_input2);
+ device_remove_file(mc->dev, &dev_attr_input3);
- device_remove_file(&interface->dev, &dev_attr_speed0);
- device_remove_file(&interface->dev, &dev_attr_speed1);
+ device_remove_file(mc->dev, &dev_attr_speed0);
+ device_remove_file(mc->dev, &dev_attr_speed1);
- device_remove_file(&interface->dev, &dev_attr_acceleration0);
- device_remove_file(&interface->dev, &dev_attr_acceleration1);
+ device_remove_file(mc->dev, &dev_attr_acceleration0);
+ device_remove_file(mc->dev, &dev_attr_acceleration1);
- device_remove_file(&interface->dev, &dev_attr_current0);
- device_remove_file(&interface->dev, &dev_attr_current1);
+ device_remove_file(mc->dev, &dev_attr_current0);
+ device_remove_file(mc->dev, &dev_attr_current1);
- dev_info(&interface->dev, "USB Phidget MotorControl disconnected\n");
+ device_unregister(mc->dev);
usb_put_dev(mc->udev);
+ clear_bit(mc->dev_no, &device_no);
kfree(mc);
+
+ dev_info(&interface->dev, "USB PhidgetMotorControl detached\n");
}
static struct usb_driver motorcontrol_driver = {
*
* CAUTION: Generally you should use 0 < degrees < 180 as anything else
* is probably beyond the range of your servo and may damage it.
- *
- * Jun 16, 2004: Sean Young <sean@mess.org>
- * - cleanups
- * - was using memory after kfree()
- * Aug 8, 2004: Sean Young <sean@mess.org>
- * - set the highest angle as high as the hardware allows, there are
- * some odd servos out there
- *
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/usb.h>
+#include "phidget.h"
+
#define DRIVER_AUTHOR "Sean Young <sean@mess.org>"
#define DRIVER_DESC "USB PhidgetServo Driver"
MODULE_DEVICE_TABLE(usb, id_table);
+static int unsigned long device_no;
+
struct phidget_servo {
struct usb_device *udev;
+ struct device *dev;
+ int dev_no;
ulong type;
int pulse[4];
int degrees[4];
}
#define show_set(value) \
-static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr, \
+static ssize_t set_servo##value (struct device *dev, \
+ struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
int degrees, minutes, retval; \
- struct usb_interface *intf = to_usb_interface (dev); \
- struct phidget_servo *servo = usb_get_intfdata (intf); \
+ struct phidget_servo *servo = dev_get_drvdata(dev); \
\
minutes = 0; \
/* must at least convert degrees */ \
- if (sscanf (buf, "%d.%d", °rees, &minutes) < 1) { \
+ if (sscanf(buf, "%d.%d", °rees, &minutes) < 1) { \
return -EINVAL; \
} \
\
return -EINVAL; \
\
if (servo->type & SERVO_VERSION_30) \
- retval = change_position_v30 (servo, value, degrees, \
+ retval = change_position_v30(servo, value, degrees, \
minutes); \
else \
- retval = change_position_v20 (servo, value, degrees, \
+ retval = change_position_v20(servo, value, degrees, \
minutes); \
\
return retval < 0 ? retval : count; \
} \
\
-static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf) \
+static ssize_t show_servo##value (struct device *dev, \
+ struct device_attribute *attr, \
+ char *buf) \
{ \
- struct usb_interface *intf = to_usb_interface (dev); \
- struct phidget_servo *servo = usb_get_intfdata (intf); \
+ struct phidget_servo *servo = dev_get_drvdata(dev); \
\
- return sprintf (buf, "%d.%02d\n", servo->degrees[value], \
+ return sprintf(buf, "%d.%02d\n", servo->degrees[value], \
servo->minutes[value]); \
} \
static DEVICE_ATTR(servo##value, S_IWUGO | S_IRUGO, \
{
struct usb_device *udev = interface_to_usbdev(interface);
struct phidget_servo *dev;
+ int bit, value;
dev = kzalloc(sizeof (struct phidget_servo), GFP_KERNEL);
if (dev == NULL) {
dev->type = id->driver_info;
usb_set_intfdata(interface, dev);
- device_create_file(&interface->dev, &dev_attr_servo0);
+ do {
+ bit = find_first_zero_bit(&device_no, sizeof(device_no));
+ value = test_and_set_bit(bit, &device_no);
+ } while(value);
+ dev->dev_no = bit;
+
+ dev->dev = device_create(phidget_class, &dev->udev->dev, 0,
+ "servo%d", dev->dev_no);
+ if (IS_ERR(dev->dev)) {
+ int rc = PTR_ERR(dev->dev);
+ clear_bit(dev->dev_no, &device_no);
+ kfree(dev);
+ return rc;
+ }
+
+ device_create_file(dev->dev, &dev_attr_servo0);
if (dev->type & SERVO_COUNT_QUAD) {
- device_create_file(&interface->dev, &dev_attr_servo1);
- device_create_file(&interface->dev, &dev_attr_servo2);
- device_create_file(&interface->dev, &dev_attr_servo3);
+ device_create_file(dev->dev, &dev_attr_servo1);
+ device_create_file(dev->dev, &dev_attr_servo2);
+ device_create_file(dev->dev, &dev_attr_servo3);
}
dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 attached\n",
dev->type & SERVO_COUNT_QUAD ? 4 : 1,
dev->type & SERVO_VERSION_30 ? 3 : 2);
- if(!(dev->type & SERVO_VERSION_30))
+ if (!(dev->type & SERVO_VERSION_30))
dev_info(&interface->dev,
"WARNING: v2.0 not tested! Please report if it works.\n");
dev = usb_get_intfdata(interface);
usb_set_intfdata(interface, NULL);
- device_remove_file(&interface->dev, &dev_attr_servo0);
+ device_remove_file(dev->dev, &dev_attr_servo0);
if (dev->type & SERVO_COUNT_QUAD) {
- device_remove_file(&interface->dev, &dev_attr_servo1);
- device_remove_file(&interface->dev, &dev_attr_servo2);
- device_remove_file(&interface->dev, &dev_attr_servo3);
+ device_remove_file(dev->dev, &dev_attr_servo1);
+ device_remove_file(dev->dev, &dev_attr_servo2);
+ device_remove_file(dev->dev, &dev_attr_servo3);
}
+ device_unregister(dev->dev);
usb_put_dev(dev->udev);
dev_info(&interface->dev, "USB %d-Motor PhidgetServo v%d.0 detached\n",
dev->type & SERVO_COUNT_QUAD ? 4 : 1,
dev->type & SERVO_VERSION_30 ? 3 : 2);
+ clear_bit(dev->dev_no, &device_no);
kfree(dev);
}
git.openpandora.org / pandora-kernel.git / commitdiff