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

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/main.c (moved) (moved from uspace/drv/bus/usb/usbmouse/main.c ) (2 diffs)

uspace/drv/char/xtkbd/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup drvusbmouse
+/** @addtogroup drvkbd
  * @{
  */
-/**
- * @file
- * Main routines of USB boot protocol mouse driver.
+/** @file
+ * @brief XT keyboard driver
  */
 
-#include "mouse.h"
-#include <usb/debug.h>
-#include <usb/dev/poll.h>
+#include <libarch/inttypes.h>
+#include <ddf/driver.h>
+#include <devman.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <str_error.h>
+#include <ddf/log.h>
+#include <stdio.h>
 
-#define NAME  "usbmouse"
+#include "xtkbd.h"
 
-/** Callback when new mouse device is attached and recognised by DDF.
+#define NAME "xtkbd"
+
+static int xt_kbd_add(ddf_dev_t *device);
+
+/** DDF driver ops. */
+static driver_ops_t kbd_driver_ops = {
+        .dev_add = xt_kbd_add,
+};
+
+/** DDF driver structure. */
+static driver_t kbd_driver = {
+        .name = NAME,
+        .driver_ops = &kbd_driver_ops
+};
+
+/** Initialize global driver structures (NONE).
  *
- * @param dev Representation of a generic DDF device.
- *
+ * @param[in] argc Nmber of arguments in argv vector (ignored).
+ * @param[in] argv Cmdline argument vector (ignored).
  * @return Error code.
  *
+ * Driver debug level is set here.
  */
-static int usbmouse_add_device(usb_device_t *dev)
+int main(int argc, char *argv[])
 {
-        int rc = usb_mouse_create(dev);
-        if (rc != EOK) {
-                usb_log_error("Failed to initialize device driver: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        usb_log_debug("Polling pipe at endpoint %d.\n",
-            dev->pipes[0].pipe->endpoint_no);
-        
-        rc = usb_device_auto_poll(dev, 0, usb_mouse_polling_callback,
-            dev->pipes[0].pipe->max_packet_size,
-            usb_mouse_polling_ended_callback, dev->driver_data);
-        
-        if (rc != EOK) {
-                usb_log_error("Failed to start polling fibril: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        usb_log_info("controlling new mouse (handle %" PRIun ").\n",
-            dev->ddf_dev->handle);
-        
+        printf(NAME ": HelenOS XT keyboard driver.\n");
+        ddf_log_init(NAME, LVL_NOTE);
+        return ddf_driver_main(&kbd_driver);
+}
+
+/** Initialize a new ddf driver instance of the driver
+ *
+ * @param[in] device DDF instance of the device to initialize.
+ * @return Error code.
+ */
+static int xt_kbd_add(ddf_dev_t *device)
+{
+        if (!device)
+                return EINVAL;
+
+#define CHECK_RET_RETURN(ret, message...) \
+if (ret != EOK) { \
+        ddf_msg(LVL_ERROR, message); \
+        return ret; \
+} else (void)0
+
+        xt_kbd_t *kbd = ddf_dev_data_alloc(device, sizeof(xt_kbd_t));
+        int ret = (kbd == NULL) ? ENOMEM : EOK;
+        CHECK_RET_RETURN(ret, "Failed to allocate XT/KBD driver instance.");
+
+        ret = xt_kbd_init(kbd, device);
+        CHECK_RET_RETURN(ret,
+            "Failed to initialize XT_KBD driver: %s.", str_error(ret));
+
+        ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
+            device->name, device->handle);
         return EOK;
 }
-
-/** USB mouse driver ops. */
-static usb_driver_ops_t mouse_driver_ops = {
-        .add_device = usbmouse_add_device,
-};
-
-static usb_endpoint_description_t *endpoints[] = {
-        &poll_endpoint_description,
-        NULL
-};
-
-/** USB mouse driver. */
-static usb_driver_t mouse_driver = {
-        .name = NAME,
-        .ops = &mouse_driver_ops,
-        .endpoints = endpoints
-};
-
-int main(int argc, char *argv[])
-{
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
-        return usb_driver_main(&mouse_driver);
-}
-
 /**
  * @}