Changeset aec2ad4 in mainline for uspace/drv/usbhid/layout.h

Timestamp:

2011-02-04T11:48:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

103a3626

Parents:

ba5ab09 (diff), 3597dab (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 from usb/development

File:

• uspace/drv/usbhid/layout.h (moved) (moved from uspace/drv/vhc/debug.c ) (2 diffs)

uspace/drv/usbhid/layout.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Lubos Slovak 
+ * (copied from /uspace/srv/hid/kbd/include/layout.h)
  * All rights reserved.
  *
@@ -27 +29 @@
  */
 
-/** @addtogroup drvusbvhc
+/** @addtogroup drvusbhid
  * @{
  */
 /** @file
- * @brief Debugging support.
+ * Keyboard layout.
  */
-#include <stdio.h>
-#include <ipc/ipc.h>
-#include <usb/debug.h>
 
-#include "vhcd.h"
+#ifndef USBHID_LAYOUT_H_
+#define USBHID_LAYOUT_H_
 
+#include <sys/types.h>
+#include <io/console.h>
 
-/** Debug print informing of invalid call.
- */
-void dprintf_inval_call(int level, ipc_call_t call, sysarg_t phone_hash)
-{
-        dprintf(level, "phone%#x: invalid call [%u (%u, %u, %u, %u, %u)]",
-            phone_hash,
-            IPC_GET_IMETHOD(call),
-            IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call),
-            IPC_GET_ARG4(call), IPC_GET_ARG5(call));
-}
+typedef struct {
+        void (*reset)(void);
+        wchar_t (*parse_ev)(console_event_t *);
+} layout_op_t;
+
+extern layout_op_t us_qwerty_op;
+extern layout_op_t us_dvorak_op;
+extern layout_op_t cz_op;
+
+#endif
 
 /**