Changeset 132ab5d1 in mainline for uspace/srv/hid/isdv4_tablet/isdv4.h

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/hid/isdv4_tablet/isdv4.h (modified) (3 diffs)

uspace/srv/hid/isdv4_tablet/isdv4.h

@@ -27 +27 @@
  */
 
-#ifndef __ISDV4_H__
-#define __ISDV4_H__
+#ifndef ISDV4_H_
+#define ISDV4_H_
+
+#include <async.h>
+#include <io/chardev.h>
 
 typedef struct isdv4_event isdv4_event_t;
@@ -56 +59 @@
         bool finger1_pressed; /* Reported as touch button 1 */
 
-        /* Session to the serial device */
+        /** Session with the serial device */
         async_sess_t *sess;
+        /** Character device */
+        chardev_t *chardev;
 
         /* Receive buffer state */
@@ -64 +69 @@
         size_t buf_end;
 
-        /* Callbacks */
+        /** Callbacks */
         isdv4_event_fn emit_event_fn;
 } isdv4_state_t;