summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-05-23 14:22:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-31 15:14:16 +1000
commite6ca6521b4e880c6a314a880e73039e574a02c28 (patch)
tree569c0ec631e3180c216d27dc365a1247f0211427 /src
parent9ae890cf4e5df184f68799d534fa6aa67c36301b (diff)
Un-typedef model_lookup_t
Long-term, structs will be structs without typedef. This one is the easiest one to convert, the rest follows later. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'src')
-rw-r--r--src/eventcomm.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 6cfbcc7..0dd789a 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -274,15 +274,16 @@ event_query_is_touchpad(int fd, BOOL test_grab)
return (ret == TRUE);
}
-typedef struct {
+#define PRODUCT_ANY 0x0000
+
+struct model_lookup_t {
short vendor;
short product;
enum TouchpadModel model;
-} model_lookup_t;
+};
-#define PRODUCT_ANY 0x0000
-static model_lookup_t model_lookup_table[] = {
+static struct model_lookup_t model_lookup_table[] = {
{0x0002, 0x0007, MODEL_SYNAPTICS},
{0x0002, 0x0008, MODEL_ALPS},
{0x05ac, PRODUCT_ANY, MODEL_APPLETOUCH},
@@ -306,7 +307,7 @@ event_query_model(int fd, enum TouchpadModel *model_out,
{
struct input_id id;
int rc;
- model_lookup_t *model_lookup;
+ struct model_lookup_t *model_lookup;
SYSCALL(rc = ioctl(fd, EVIOCGID, &id));
if (rc < 0)