Commit 21796b39 authored by Jiri Kosina's avatar Jiri Kosina

Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus

...@@ -12,7 +12,7 @@ Description: Make it possible to set/get current led state. Reading from it ...@@ -12,7 +12,7 @@ Description: Make it possible to set/get current led state. Reading from it
What: /sys/bus/hid/drivers/wiimote/<dev>/extension What: /sys/bus/hid/drivers/wiimote/<dev>/extension
Date: August 2011 Date: August 2011
KernelVersion: 3.2 KernelVersion: 3.2
Contact: David Herrmann <dh.herrmann@googlemail.com> Contact: David Herrmann <dh.herrmann@gmail.com>
Description: This file contains the currently connected and initialized Description: This file contains the currently connected and initialized
extensions. It can be one of: none, motionp, nunchuck, classic, extensions. It can be one of: none, motionp, nunchuck, classic,
motionp+nunchuck, motionp+classic motionp+nunchuck, motionp+classic
...@@ -20,3 +20,40 @@ Description: This file contains the currently connected and initialized ...@@ -20,3 +20,40 @@ Description: This file contains the currently connected and initialized
the official Nintendo Nunchuck extension and classic is the the official Nintendo Nunchuck extension and classic is the
Nintendo Classic Controller extension. The motionp extension can Nintendo Classic Controller extension. The motionp extension can
be combined with the other two. be combined with the other two.
Starting with kernel-version 3.11 Motion Plus hotplugging is
supported and if detected, it's no longer reported as static
extension. You will get uevent notifications for the motion-plus
device then.
What: /sys/bus/hid/drivers/wiimote/<dev>/devtype
Date: May 2013
KernelVersion: 3.11
Contact: David Herrmann <dh.herrmann@gmail.com>
Description: While a device is initialized by the wiimote driver, we perform
a device detection and signal a "change" uevent after it is
done. This file shows the detected device type. "pending" means
that the detection is still ongoing, "unknown" means, that the
device couldn't be detected or loaded. "generic" means, that the
device couldn't be detected but supports basic Wii Remote
features and can be used.
Other strings for each device-type are available and may be
added if new device-specific detections are added.
Currently supported are:
gen10: First Wii Remote generation
gen20: Second Wii Remote Plus generation (builtin MP)
balanceboard: Wii Balance Board
What: /sys/bus/hid/drivers/wiimote/<dev>/bboard_calib
Date: May 2013
KernelVersion: 3.11
Contact: David Herrmann <dh.herrmann@gmail.com>
Description: This attribute is only provided if the device was detected as a
balance board. It provides a single line with 3 calibration
values for all 4 sensors. The values are separated by colons and
are each 2 bytes long (encoded as 4 digit hexadecimal value).
First, 0kg values for all 4 sensors are written, followed by the
17kg values for all 4 sensors and last the 34kg values for all 4
sensors.
Calibration data is already applied by the kernel to all input
values but may be used by user-space to perform other
transformations.
...@@ -719,22 +719,29 @@ config HID_WACOM ...@@ -719,22 +719,29 @@ config HID_WACOM
Support for Wacom Graphire Bluetooth and Intuos4 WL tablets. Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
config HID_WIIMOTE config HID_WIIMOTE
tristate "Nintendo Wii Remote support" tristate "Nintendo Wii / Wii U peripherals"
depends on HID depends on HID
depends on LEDS_CLASS depends on LEDS_CLASS
select POWER_SUPPLY select POWER_SUPPLY
select INPUT_FF_MEMLESS select INPUT_FF_MEMLESS
---help--- ---help---
Support for the Nintendo Wii Remote bluetooth device. Support for Nintendo Wii and Wii U Bluetooth peripherals. Supported
devices are the Wii Remote and its extension devices, but also devices
based on the Wii Remote like the Wii U Pro Controller or the
Wii Balance Board.
config HID_WIIMOTE_EXT Support for all official Nintendo extensions is available, however, 3rd
bool "Nintendo Wii Remote Extension support" party extensions might not be supported. Please report these devices to:
depends on HID_WIIMOTE http://github.com/dvdhrm/xwiimote/issues
default HID_WIIMOTE
---help--- Other Nintendo Wii U peripherals that are IEEE 802.11 based (including
Support for extension controllers of the Nintendo Wii Remote. Say yes the Wii U Gamepad) might be supported in the future. But currently
here if you want to use the Nintendo Motion+, Nunchuck or Classic support is limited to Bluetooth based devices.
extension controllers with your Wii Remote.
If unsure, say N.
To compile this driver as a module, choose M here: the
module will be called hid-wiimote.
config HID_ZEROPLUS config HID_ZEROPLUS
tristate "Zeroplus based game controller support" tristate "Zeroplus based game controller support"
......
...@@ -28,10 +28,7 @@ ifdef CONFIG_LOGIWHEELS_FF ...@@ -28,10 +28,7 @@ ifdef CONFIG_LOGIWHEELS_FF
hid-logitech-y += hid-lg4ff.o hid-logitech-y += hid-lg4ff.o
endif endif
hid-wiimote-y := hid-wiimote-core.o hid-wiimote-y := hid-wiimote-core.o hid-wiimote-modules.o
ifdef CONFIG_HID_WIIMOTE_EXT
hid-wiimote-y += hid-wiimote-ext.o
endif
ifdef CONFIG_DEBUG_FS ifdef CONFIG_DEBUG_FS
hid-wiimote-y += hid-wiimote-debug.o hid-wiimote-y += hid-wiimote-debug.o
endif endif
......
...@@ -46,6 +46,7 @@ struct wacom_data { ...@@ -46,6 +46,7 @@ struct wacom_data {
__u8 battery_capacity; __u8 battery_capacity;
__u8 power_raw; __u8 power_raw;
__u8 ps_connected; __u8 ps_connected;
__u8 bat_charging;
struct power_supply battery; struct power_supply battery;
struct power_supply ac; struct power_supply ac;
__u8 led_selector; __u8 led_selector;
...@@ -62,6 +63,7 @@ static enum power_supply_property wacom_battery_props[] = { ...@@ -62,6 +63,7 @@ static enum power_supply_property wacom_battery_props[] = {
POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_PRESENT,
POWER_SUPPLY_PROP_CAPACITY, POWER_SUPPLY_PROP_CAPACITY,
POWER_SUPPLY_PROP_SCOPE, POWER_SUPPLY_PROP_SCOPE,
POWER_SUPPLY_PROP_STATUS,
}; };
static enum power_supply_property wacom_ac_props[] = { static enum power_supply_property wacom_ac_props[] = {
...@@ -287,6 +289,15 @@ static int wacom_battery_get_property(struct power_supply *psy, ...@@ -287,6 +289,15 @@ static int wacom_battery_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_CAPACITY: case POWER_SUPPLY_PROP_CAPACITY:
val->intval = wdata->battery_capacity; val->intval = wdata->battery_capacity;
break; break;
case POWER_SUPPLY_PROP_STATUS:
if (wdata->bat_charging)
val->intval = POWER_SUPPLY_STATUS_CHARGING;
else
if (wdata->battery_capacity == 100 && wdata->ps_connected)
val->intval = POWER_SUPPLY_STATUS_FULL;
else
val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
break;
default: default:
ret = -EINVAL; ret = -EINVAL;
break; break;
...@@ -727,7 +738,8 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, ...@@ -727,7 +738,8 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,
if (power_raw != wdata->power_raw) { if (power_raw != wdata->power_raw) {
wdata->power_raw = power_raw; wdata->power_raw = power_raw;
wdata->battery_capacity = batcap_i4[power_raw & 0x07]; wdata->battery_capacity = batcap_i4[power_raw & 0x07];
wdata->ps_connected = power_raw & 0x08; wdata->bat_charging = (power_raw & 0x08) ? 1 : 0;
wdata->ps_connected = (power_raw & 0x10) ? 1 : 0;
} }
break; break;
......
This diff is collapsed.
/* /*
* Debug support for HID Nintendo Wiimote devices * Debug support for HID Nintendo Wii / Wii U peripherals
* Copyright (c) 2011 David Herrmann * Copyright (c) 2011-2013 David Herrmann <dh.herrmann@gmail.com>
*/ */
/* /*
...@@ -127,7 +127,8 @@ static int wiidebug_drm_open(struct inode *i, struct file *f) ...@@ -127,7 +127,8 @@ static int wiidebug_drm_open(struct inode *i, struct file *f)
static ssize_t wiidebug_drm_write(struct file *f, const char __user *u, static ssize_t wiidebug_drm_write(struct file *f, const char __user *u,
size_t s, loff_t *off) size_t s, loff_t *off)
{ {
struct wiimote_debug *dbg = f->private_data; struct seq_file *sf = f->private_data;
struct wiimote_debug *dbg = sf->private;
unsigned long flags; unsigned long flags;
char buf[16]; char buf[16];
ssize_t len; ssize_t len;
...@@ -140,7 +141,7 @@ static ssize_t wiidebug_drm_write(struct file *f, const char __user *u, ...@@ -140,7 +141,7 @@ static ssize_t wiidebug_drm_write(struct file *f, const char __user *u,
if (copy_from_user(buf, u, len)) if (copy_from_user(buf, u, len))
return -EFAULT; return -EFAULT;
buf[15] = 0; buf[len] = 0;
for (i = 0; i < WIIPROTO_REQ_MAX; ++i) { for (i = 0; i < WIIPROTO_REQ_MAX; ++i) {
if (!wiidebug_drmmap[i]) if (!wiidebug_drmmap[i])
...@@ -150,10 +151,13 @@ static ssize_t wiidebug_drm_write(struct file *f, const char __user *u, ...@@ -150,10 +151,13 @@ static ssize_t wiidebug_drm_write(struct file *f, const char __user *u,
} }
if (i == WIIPROTO_REQ_MAX) if (i == WIIPROTO_REQ_MAX)
i = simple_strtoul(buf, NULL, 10); i = simple_strtoul(buf, NULL, 16);
spin_lock_irqsave(&dbg->wdata->state.lock, flags); spin_lock_irqsave(&dbg->wdata->state.lock, flags);
dbg->wdata->state.flags &= ~WIIPROTO_FLAG_DRM_LOCKED;
wiiproto_req_drm(dbg->wdata, (__u8) i); wiiproto_req_drm(dbg->wdata, (__u8) i);
if (i != WIIPROTO_REQ_NULL)
dbg->wdata->state.flags |= WIIPROTO_FLAG_DRM_LOCKED;
spin_unlock_irqrestore(&dbg->wdata->state.lock, flags); spin_unlock_irqrestore(&dbg->wdata->state.lock, flags);
return len; return len;
......
This diff is collapsed.
This diff is collapsed.
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define __HID_WIIMOTE_H #define __HID_WIIMOTE_H
/* /*
* HID driver for Nintendo Wiimote devices * HID driver for Nintendo Wii / Wii U peripherals
* Copyright (c) 2011 David Herrmann * Copyright (c) 2011-2013 David Herrmann <dh.herrmann@gmail.com>
*/ */
/* /*
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/timer.h>
#define WIIMOTE_NAME "Nintendo Wii Remote" #define WIIMOTE_NAME "Nintendo Wii Remote"
#define WIIMOTE_BUFSIZE 32 #define WIIMOTE_BUFSIZE 32
...@@ -35,6 +36,17 @@ ...@@ -35,6 +36,17 @@
#define WIIPROTO_FLAG_IR_BASIC 0x40 #define WIIPROTO_FLAG_IR_BASIC 0x40
#define WIIPROTO_FLAG_IR_EXT 0x80 #define WIIPROTO_FLAG_IR_EXT 0x80
#define WIIPROTO_FLAG_IR_FULL 0xc0 /* IR_BASIC | IR_EXT */ #define WIIPROTO_FLAG_IR_FULL 0xc0 /* IR_BASIC | IR_EXT */
#define WIIPROTO_FLAG_EXT_PLUGGED 0x0100
#define WIIPROTO_FLAG_EXT_USED 0x0200
#define WIIPROTO_FLAG_EXT_ACTIVE 0x0400
#define WIIPROTO_FLAG_MP_PLUGGED 0x0800
#define WIIPROTO_FLAG_MP_USED 0x1000
#define WIIPROTO_FLAG_MP_ACTIVE 0x2000
#define WIIPROTO_FLAG_EXITING 0x4000
#define WIIPROTO_FLAG_DRM_LOCKED 0x8000
#define WIIPROTO_FLAG_BUILTIN_MP 0x010000
#define WIIPROTO_FLAG_NO_MP 0x020000
#define WIIPROTO_FLAGS_LEDS (WIIPROTO_FLAG_LED1 | WIIPROTO_FLAG_LED2 | \ #define WIIPROTO_FLAGS_LEDS (WIIPROTO_FLAG_LED1 | WIIPROTO_FLAG_LED2 | \
WIIPROTO_FLAG_LED3 | WIIPROTO_FLAG_LED4) WIIPROTO_FLAG_LED3 | WIIPROTO_FLAG_LED4)
#define WIIPROTO_FLAGS_IR (WIIPROTO_FLAG_IR_BASIC | WIIPROTO_FLAG_IR_EXT | \ #define WIIPROTO_FLAGS_IR (WIIPROTO_FLAG_IR_BASIC | WIIPROTO_FLAG_IR_EXT | \
...@@ -43,16 +55,71 @@ ...@@ -43,16 +55,71 @@
/* return flag for led \num */ /* return flag for led \num */
#define WIIPROTO_FLAG_LED(num) (WIIPROTO_FLAG_LED1 << (num - 1)) #define WIIPROTO_FLAG_LED(num) (WIIPROTO_FLAG_LED1 << (num - 1))
enum wiiproto_keys {
WIIPROTO_KEY_LEFT,
WIIPROTO_KEY_RIGHT,
WIIPROTO_KEY_UP,
WIIPROTO_KEY_DOWN,
WIIPROTO_KEY_PLUS,
WIIPROTO_KEY_MINUS,
WIIPROTO_KEY_ONE,
WIIPROTO_KEY_TWO,
WIIPROTO_KEY_A,
WIIPROTO_KEY_B,
WIIPROTO_KEY_HOME,
WIIPROTO_KEY_COUNT
};
enum wiimote_devtype {
WIIMOTE_DEV_PENDING,
WIIMOTE_DEV_UNKNOWN,
WIIMOTE_DEV_GENERIC,
WIIMOTE_DEV_GEN10,
WIIMOTE_DEV_GEN20,
WIIMOTE_DEV_BALANCE_BOARD,
WIIMOTE_DEV_PRO_CONTROLLER,
WIIMOTE_DEV_NUM,
};
enum wiimote_exttype {
WIIMOTE_EXT_NONE,
WIIMOTE_EXT_UNKNOWN,
WIIMOTE_EXT_NUNCHUK,
WIIMOTE_EXT_CLASSIC_CONTROLLER,
WIIMOTE_EXT_BALANCE_BOARD,
WIIMOTE_EXT_PRO_CONTROLLER,
WIIMOTE_EXT_NUM,
};
enum wiimote_mptype {
WIIMOTE_MP_NONE,
WIIMOTE_MP_UNKNOWN,
WIIMOTE_MP_SINGLE,
WIIMOTE_MP_PASSTHROUGH_NUNCHUK,
WIIMOTE_MP_PASSTHROUGH_CLASSIC,
};
struct wiimote_buf { struct wiimote_buf {
__u8 data[HID_MAX_BUFFER_SIZE]; __u8 data[HID_MAX_BUFFER_SIZE];
size_t size; size_t size;
}; };
struct wiimote_queue {
spinlock_t lock;
struct work_struct worker;
__u8 head;
__u8 tail;
struct wiimote_buf outq[WIIMOTE_BUFSIZE];
};
struct wiimote_state { struct wiimote_state {
spinlock_t lock; spinlock_t lock;
__u8 flags; __u32 flags;
__u8 accel_split[2]; __u8 accel_split[2];
__u8 drm; __u8 drm;
__u8 devtype;
__u8 exttype;
__u8 mp;
/* synchronous cmd requests */ /* synchronous cmd requests */
struct mutex sync; struct mutex sync;
...@@ -65,6 +132,9 @@ struct wiimote_state { ...@@ -65,6 +132,9 @@ struct wiimote_state {
__u8 cmd_err; __u8 cmd_err;
__u8 *cmd_read_buf; __u8 *cmd_read_buf;
__u8 cmd_read_size; __u8 cmd_read_size;
/* calibration data */
__u16 calib_bboard[4][3];
}; };
struct wiimote_data { struct wiimote_data {
...@@ -74,18 +144,63 @@ struct wiimote_data { ...@@ -74,18 +144,63 @@ struct wiimote_data {
struct input_dev *accel; struct input_dev *accel;
struct input_dev *ir; struct input_dev *ir;
struct power_supply battery; struct power_supply battery;
struct wiimote_ext *ext; struct input_dev *mp;
struct timer_list timer;
struct wiimote_debug *debug; struct wiimote_debug *debug;
spinlock_t qlock; union {
__u8 head; struct input_dev *input;
__u8 tail; } extension;
struct wiimote_buf outq[WIIMOTE_BUFSIZE];
struct work_struct worker;
struct wiimote_queue queue;
struct wiimote_state state; struct wiimote_state state;
struct work_struct init_worker;
};
/* wiimote modules */
enum wiimod_module {
WIIMOD_KEYS,
WIIMOD_RUMBLE,
WIIMOD_BATTERY,
WIIMOD_LED1,
WIIMOD_LED2,
WIIMOD_LED3,
WIIMOD_LED4,
WIIMOD_ACCEL,
WIIMOD_IR,
WIIMOD_BUILTIN_MP,
WIIMOD_NO_MP,
WIIMOD_NUM,
WIIMOD_NULL = WIIMOD_NUM,
};
#define WIIMOD_FLAG_INPUT 0x0001
#define WIIMOD_FLAG_EXT8 0x0002
#define WIIMOD_FLAG_EXT16 0x0004
struct wiimod_ops {
__u16 flags;
unsigned long arg;
int (*probe) (const struct wiimod_ops *ops,
struct wiimote_data *wdata);
void (*remove) (const struct wiimod_ops *ops,
struct wiimote_data *wdata);
void (*in_keys) (struct wiimote_data *wdata, const __u8 *keys);
void (*in_accel) (struct wiimote_data *wdata, const __u8 *accel);
void (*in_ir) (struct wiimote_data *wdata, const __u8 *ir, bool packed,
unsigned int id);
void (*in_mp) (struct wiimote_data *wdata, const __u8 *mp);
void (*in_ext) (struct wiimote_data *wdata, const __u8 *ext);
}; };
extern const struct wiimod_ops *wiimod_table[WIIMOD_NUM];
extern const struct wiimod_ops *wiimod_ext_table[WIIMOTE_EXT_NUM];
extern const struct wiimod_ops wiimod_mp;
/* wiimote requests */
enum wiiproto_reqs { enum wiiproto_reqs {
WIIPROTO_REQ_NULL = 0x0, WIIPROTO_REQ_NULL = 0x0,
WIIPROTO_REQ_RUMBLE = 0x10, WIIPROTO_REQ_RUMBLE = 0x10,
...@@ -99,24 +214,55 @@ enum wiiproto_reqs { ...@@ -99,24 +214,55 @@ enum wiiproto_reqs {
WIIPROTO_REQ_STATUS = 0x20, WIIPROTO_REQ_STATUS = 0x20,
WIIPROTO_REQ_DATA = 0x21, WIIPROTO_REQ_DATA = 0x21,
WIIPROTO_REQ_RETURN = 0x22, WIIPROTO_REQ_RETURN = 0x22,
/* DRM_K: BB*2 */
WIIPROTO_REQ_DRM_K = 0x30, WIIPROTO_REQ_DRM_K = 0x30,
/* DRM_KA: BB*2 AA*3 */
WIIPROTO_REQ_DRM_KA = 0x31, WIIPROTO_REQ_DRM_KA = 0x31,
/* DRM_KE: BB*2 EE*8 */
WIIPROTO_REQ_DRM_KE = 0x32, WIIPROTO_REQ_DRM_KE = 0x32,
/* DRM_KAI: BB*2 AA*3 II*12 */
WIIPROTO_REQ_DRM_KAI = 0x33, WIIPROTO_REQ_DRM_KAI = 0x33,
/* DRM_KEE: BB*2 EE*19 */
WIIPROTO_REQ_DRM_KEE = 0x34, WIIPROTO_REQ_DRM_KEE = 0x34,
/* DRM_KAE: BB*2 AA*3 EE*16 */
WIIPROTO_REQ_DRM_KAE = 0x35, WIIPROTO_REQ_DRM_KAE = 0x35,
/* DRM_KIE: BB*2 II*10 EE*9 */
WIIPROTO_REQ_DRM_KIE = 0x36, WIIPROTO_REQ_DRM_KIE = 0x36,
/* DRM_KAIE: BB*2 AA*3 II*10 EE*6 */
WIIPROTO_REQ_DRM_KAIE = 0x37, WIIPROTO_REQ_DRM_KAIE = 0x37,
/* DRM_E: EE*21 */
WIIPROTO_REQ_DRM_E = 0x3d, WIIPROTO_REQ_DRM_E = 0x3d,
/* DRM_SKAI1: BB*2 AA*1 II*18 */
WIIPROTO_REQ_DRM_SKAI1 = 0x3e, WIIPROTO_REQ_DRM_SKAI1 = 0x3e,
/* DRM_SKAI2: BB*2 AA*1 II*18 */
WIIPROTO_REQ_DRM_SKAI2 = 0x3f, WIIPROTO_REQ_DRM_SKAI2 = 0x3f,
WIIPROTO_REQ_MAX WIIPROTO_REQ_MAX
}; };
#define dev_to_wii(pdev) hid_get_drvdata(container_of(pdev, struct hid_device, \ #define dev_to_wii(pdev) hid_get_drvdata(container_of(pdev, struct hid_device, \
dev)) dev))
void __wiimote_schedule(struct wiimote_data *wdata);
extern void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm); extern void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm);
extern void wiiproto_req_rumble(struct wiimote_data *wdata, __u8 rumble);
extern void wiiproto_req_leds(struct wiimote_data *wdata, int leds);
extern void wiiproto_req_status(struct wiimote_data *wdata);
extern void wiiproto_req_accel(struct wiimote_data *wdata, __u8 accel);
extern void wiiproto_req_ir1(struct wiimote_data *wdata, __u8 flags);
extern void wiiproto_req_ir2(struct wiimote_data *wdata, __u8 flags);
extern int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset, extern int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset,
const __u8 *wmem, __u8 size); const __u8 *wmem, __u8 size);
extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset, extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset,
...@@ -129,24 +275,6 @@ extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset, ...@@ -129,24 +275,6 @@ extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset,
extern void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom, extern void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom,
__u32 offset, __u16 size); __u32 offset, __u16 size);
#ifdef CONFIG_HID_WIIMOTE_EXT
extern int wiiext_init(struct wiimote_data *wdata);
extern void wiiext_deinit(struct wiimote_data *wdata);
extern void wiiext_event(struct wiimote_data *wdata, bool plugged);
extern bool wiiext_active(struct wiimote_data *wdata);
extern void wiiext_handle(struct wiimote_data *wdata, const __u8 *payload);
#else
static inline int wiiext_init(void *u) { return 0; }
static inline void wiiext_deinit(void *u) { }
static inline void wiiext_event(void *u, bool p) { }
static inline bool wiiext_active(void *u) { return false; }
static inline void wiiext_handle(void *u, const __u8 *p) { }
#endif
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
extern int wiidebug_init(struct wiimote_data *wdata); extern int wiidebug_init(struct wiimote_data *wdata);
...@@ -173,11 +301,26 @@ static inline void wiimote_cmd_complete(struct wiimote_data *wdata) ...@@ -173,11 +301,26 @@ static inline void wiimote_cmd_complete(struct wiimote_data *wdata)
complete(&wdata->state.ready); complete(&wdata->state.ready);
} }
/* requires the state.lock spinlock to be held */
static inline void wiimote_cmd_abort(struct wiimote_data *wdata)
{
/* Abort synchronous request by waking up the sleeping caller. But
* reset the state.cmd field to an invalid value so no further event
* handlers will work with it. */
wdata->state.cmd = WIIPROTO_REQ_MAX;
complete(&wdata->state.ready);
}
static inline int wiimote_cmd_acquire(struct wiimote_data *wdata) static inline int wiimote_cmd_acquire(struct wiimote_data *wdata)
{ {
return mutex_lock_interruptible(&wdata->state.sync) ? -ERESTARTSYS : 0; return mutex_lock_interruptible(&wdata->state.sync) ? -ERESTARTSYS : 0;
} }
static inline void wiimote_cmd_acquire_noint(struct wiimote_data *wdata)
{
mutex_lock(&wdata->state.sync);
}
/* requires the state.lock spinlock to be held */ /* requires the state.lock spinlock to be held */
static inline void wiimote_cmd_set(struct wiimote_data *wdata, int cmd, static inline void wiimote_cmd_set(struct wiimote_data *wdata, int cmd,
__u32 opt) __u32 opt)
...@@ -196,11 +339,31 @@ static inline int wiimote_cmd_wait(struct wiimote_data *wdata) ...@@ -196,11 +339,31 @@ static inline int wiimote_cmd_wait(struct wiimote_data *wdata)
{ {
int ret; int ret;
/* The completion acts as implicit memory barrier so we can safely
* assume that state.cmd is set on success/failure and isn't accessed
* by any other thread, anymore. */
ret = wait_for_completion_interruptible_timeout(&wdata->state.ready, HZ); ret = wait_for_completion_interruptible_timeout(&wdata->state.ready, HZ);
if (ret < 0) if (ret < 0)
return -ERESTARTSYS; return -ERESTARTSYS;
else if (ret == 0) else if (ret == 0)
return -EIO; return -EIO;
else if (wdata->state.cmd != WIIPROTO_REQ_NULL)
return -EIO;
else
return 0;
}
static inline int wiimote_cmd_wait_noint(struct wiimote_data *wdata)
{
unsigned long ret;
/* no locking needed; see wiimote_cmd_wait() */
ret = wait_for_completion_timeout(&wdata->state.ready, HZ);
if (!ret)
return -EIO;
else if (wdata->state.cmd != WIIPROTO_REQ_NULL)
return -EIO;
else else
return 0; return 0;
} }
......
...@@ -506,11 +506,15 @@ struct input_keymap_entry { ...@@ -506,11 +506,15 @@ struct input_keymap_entry {
#define BTN_DEAD 0x12f #define BTN_DEAD 0x12f
#define BTN_GAMEPAD 0x130 #define BTN_GAMEPAD 0x130
#define BTN_A 0x130 #define BTN_SOUTH 0x130
#define BTN_B 0x131 #define BTN_A BTN_SOUTH
#define BTN_EAST 0x131
#define BTN_B BTN_EAST
#define BTN_C 0x132 #define BTN_C 0x132
#define BTN_X 0x133 #define BTN_NORTH 0x133
#define BTN_Y 0x134 #define BTN_X BTN_NORTH
#define BTN_WEST 0x134
#define BTN_Y BTN_WEST
#define BTN_Z 0x135 #define BTN_Z 0x135
#define BTN_TL 0x136 #define BTN_TL 0x136
#define BTN_TR 0x137 #define BTN_TR 0x137
...@@ -707,6 +711,11 @@ struct input_keymap_entry { ...@@ -707,6 +711,11 @@ struct input_keymap_entry {
#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ #define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */
#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ #define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */
#define BTN_DPAD_UP 0x220
#define BTN_DPAD_DOWN 0x221
#define BTN_DPAD_LEFT 0x222
#define BTN_DPAD_RIGHT 0x223
#define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1 #define BTN_TRIGGER_HAPPY2 0x2c1
......
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