git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
hid
/
hid-input.c
diff --git
a/drivers/hid/hid-input.c
b/drivers/hid/hid-input.c
index
33b1126
..
25d180a
100644
(file)
--- a/
drivers/hid/hid-input.c
+++ b/
drivers/hid/hid-input.c
@@
-31,9
+31,8
@@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/kernel.h>
-#undef DEBUG
-
#include <linux/hid.h>
#include <linux/hid.h>
+#include <linux/hid-debug.h>
static int hid_pb_fnmode = 1;
module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
static int hid_pb_fnmode = 1;
module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
@@
-252,9
+251,9
@@
static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
field->hidinput = hidinput;
field->hidinput = hidinput;
-#ifdef DEBUG
+#ifdef
CONFIG_HID_
DEBUG
printk(KERN_DEBUG "Mapping: ");
printk(KERN_DEBUG "Mapping: ");
- resolv_usage(usage->hid);
+
hid_
resolv_usage(usage->hid);
printk(" ---> ");
#endif
printk(" ---> ");
#endif
@@
-682,14
+681,14
@@
static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
field->dpad = usage->code;
}
field->dpad = usage->code;
}
-#ifdef DEBUG
- resolv_event(usage->type, usage->code);
+ hid_resolv_event(usage->type, usage->code);
+#ifdef CONFIG_HID_DEBUG
printk("\n");
#endif
return;
ignore:
printk("\n");
#endif
return;
ignore:
-#ifdef DEBUG
+#ifdef
CONFIG_HID_
DEBUG
printk("IGNORED\n");
#endif
return;
printk("IGNORED\n");
#endif
return;
@@
-804,6
+803,18
@@
int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int
}
EXPORT_SYMBOL_GPL(hidinput_find_field);
}
EXPORT_SYMBOL_GPL(hidinput_find_field);
+static int hidinput_open(struct input_dev *dev)
+{
+ struct hid_device *hid = dev->private;
+ return hid->hid_open(hid);
+}
+
+static void hidinput_close(struct input_dev *dev)
+{
+ struct hid_device *hid = dev->private;
+ hid->hid_close(hid);
+}
+
/*
* Register the input device; print a message.
* Configure the input layer interface
/*
* Register the input device; print a message.
* Configure the input layer interface
@@
-850,8
+861,8
@@
int hidinput_connect(struct hid_device *hid)
input_dev->private = hid;
input_dev->event = hid->hidinput_input_event;
input_dev->private = hid;
input_dev->event = hid->hidinput_input_event;
- input_dev->open = hid
->hid
input_open;
- input_dev->close = hid
->hid
input_close;
+ input_dev->open = hidinput_open;
+ input_dev->close = hidinput_close;
input_dev->name = hid->name;
input_dev->phys = hid->phys;
input_dev->name = hid->name;
input_dev->phys = hid->phys;