Changeset 00aece0 in mainline for uspace/drv/char/xtkbd/xtkbd.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/drv/char/xtkbd/xtkbd.h (moved) (moved from uspace/srv/hw/char/i8042/i8042.h ) (2 diffs)

uspace/drv/char/xtkbd/xtkbd.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup kbd_port
- * @ingroup  kbd
+/** @addtogroup drvkbd
  * @{
  */
-
 /** @file
- * @brief i8042 port driver.
+ * @brief XT keyboard driver
  */
 
-#ifndef i8042_H_
-#define i8042_H_
+#ifndef _XT_KBD_H_
+#define _XT_KBD_H_
 
-#include <libarch/ddi.h>
-#include <libarch/types.h>
+#include <ddf/driver.h>
+#include <fibril.h>
 
-/** i8042 HW I/O interface */
-struct i8042 {
-        ioport8_t data;
-        uint8_t pad[3];
-        ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
+/** PC/XT keyboard driver structure. */
+typedef struct {
+        ddf_fun_t *kbd_fun;        /**< Keyboard function. */
+        async_sess_t *parent_sess; /**< Connection to device providing data. */
+        async_sess_t *client_sess; /**< Callback connection to client. */
+        fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
+} xt_kbd_t;
 
-/** Softstate structure, one for each serial port (primary and aux). */
-typedef struct {
-        service_id_t service_id;
-        int client_phone;
-} i8042_port_t;
+int xt_kbd_init(xt_kbd_t *, ddf_dev_t *);
 
 #endif
-
 /**
  * @}
- */ 
+ */