norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uterm_input: change device 'feature' to device 'capability'

Browse Source 
'capability' seems to be the common terminology for this, and it sounds
better - so use it.

We also move the enum definition to the header, because otherwise the
'capabilities' field there doesn't make sense.

Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
Ran Benita 2012-10-26 17:38:19 +02:00 committed by David Herrmann
parent 874bbbe17a
commit 28c8d07109
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/uterm_input.c
View File

@ -48,11 +48,6 @@
/* How many longs are needed to hold \n bits. */
#define NLONGS(n) (((n) + LONG_BIT - 1) / LONG_BIT)
enum device_feature {
FEATURE_HAS_KEYS = 0x01,
FEATURE_HAS_LEDS = 0x02,
};
static void input_free_dev(struct uterm_input_dev *dev);
static void notify_key(struct uterm_input_dev *dev,
@ -115,7 +110,7 @@ static int input_wake_up_dev(struct uterm_input_dev *dev)
return -EFAULT;
}
if (dev->features & FEATURE_HAS_KEYS) {
if (dev->capabilities & UTERM_DEVICE_HAS_KEYS) {
/* rediscover the keyboard state if sth changed during sleep */
uxkb_dev_reset(dev);
@ -145,7 +140,7 @@ static void input_sleep_dev(struct uterm_input_dev *dev)
static void input_new_dev(struct uterm_input *input,
const char *node,
unsigned int features)
unsigned int capabilities)
{
struct uterm_input_dev *dev;
int ret;
@ -156,7 +151,7 @@ static void input_new_dev(struct uterm_input *input,
memset(dev, 0, sizeof(*dev));
dev->input = input;
dev->rfd = -1;
dev->features = features;
dev->capabilities = capabilities;
dev->node = strdup(node);
if (!dev->node)
@ -305,12 +300,13 @@ void uterm_input_unref(struct uterm_input *input)
/*
* See if the device has anything useful to offer.
* We go over the desired features and return a mask of enum device_feature's.
* We go over the possible capabilities and return a mask of enum
* uterm_input_device_capability's.
*/
static unsigned int probe_device_features(const char *node)
static unsigned int probe_device_capabilities(const char *node)
{
int i, fd, ret;
unsigned int features = 0;
unsigned int capabilities = 0;
unsigned long evbits[NLONGS(EV_CNT)] = { 0 };
unsigned long keybits[NLONGS(KEY_CNT)] = { 0 };
@ -336,38 +332,39 @@ static unsigned int probe_device_features(const char *node)
*/
for (i = KEY_RESERVED; i <= KEY_MIN_INTERESTING; i++) {
if (input_bit_is_set(keybits, i)) {
features |= FEATURE_HAS_KEYS;
capabilities |= UTERM_DEVICE_HAS_KEYS;
break;
}
}
}
if (input_bit_is_set(evbits, EV_LED))
features |= FEATURE_HAS_LEDS;
capabilities |= UTERM_DEVICE_HAS_LEDS;
close(fd);
return features;
return capabilities;
err_ioctl:
log_warn("cannot probe features of device %s (%d): %m", node, errno);
log_warn("cannot probe capabilities of device %s (%d): %m",
node, errno);
close(fd);
return 0;
}
void uterm_input_add_dev(struct uterm_input *input, const char *node)
{
unsigned int features;
unsigned int capabilities;
if (!input || !node)
return;
features = probe_device_features(node);
if (!(features & FEATURE_HAS_KEYS)) {
capabilities = probe_device_capabilities(node);
if (!(capabilities & UTERM_DEVICE_HAS_KEYS)) {
log_debug("ignoring non-useful device %s", node);
return;
}
input_new_dev(input, node, features);
input_new_dev(input, node, capabilities);
}
void uterm_input_remove_dev(struct uterm_input *input, const char *node)

7
src/uterm_input.h
View File

@ -37,11 +37,16 @@
#include "shl_dlist.h"
#include "uterm.h"
enum uterm_input_device_capability {
UTERM_DEVICE_HAS_KEYS = (1 << 0),
UTERM_DEVICE_HAS_LEDS = (1 << 1),
};
struct uterm_input_dev {
struct shl_dlist list;
struct uterm_input *input;
unsigned int features;
unsigned int capabilities;
int rfd;
char *node;
struct ev_fd *fd;