Changeset a81a1d09 in mainline for uspace/drv/usbhid/generic/hiddev.c

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/usbhid/generic/hiddev.c (modified) (2 diffs)

uspace/drv/usbhid/generic/hiddev.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
+#include <errno.h>
+#include <str_error.h>
+#include <bool.h>
+
+#include <usbhid_iface.h>
 
 #include "hiddev.h"
@@ -55 +60 @@
 /*----------------------------------------------------------------------------*/
 
+static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun);
+
+static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer, 
+    size_t size, size_t *act_size, unsigned int flags);
+
+static int usb_generic_hid_client_connected(ddf_fun_t *fun);
+
+/*----------------------------------------------------------------------------*/
+
+static usbhid_iface_t usb_generic_iface = {
+        .get_event = usb_generic_hid_get_event,
+        .get_event_length = usb_generic_hid_get_event_length
+};
+
+static ddf_dev_ops_t usb_generic_hid_ops = {
+        .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface,
+        .open = usb_generic_hid_client_connected
+};
+
+/*----------------------------------------------------------------------------*/
+
+static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
+{
+        if (fun == NULL || fun->driver_data) {
+                return 0;
+        }
+
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        return hid_dev->input_report_size;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer, 
+    size_t size, size_t *act_size, unsigned int flags)
+{
+        if (fun == NULL || fun->driver_data) {
+                return EINVAL;
+        }
+
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (hid_dev->input_report_size > size) {
+                return EINVAL;  // TODO: other error code
+        }
+        
+        /*! @todo This should probably be atomic. */
+        if (usb_hid_report_ready()) {
+                memcpy(buffer, hid_dev->input_report, 
+                    hid_dev->input_report_size);
+                *act_size = hid_dev->input_report_size;
+                usb_hid_report_received();
+        }
+        
+        // clear the buffer so that it will not be received twice
+        //memset(hid_dev->input_report, 0, hid_dev->input_report_size);
+        
+        // note that we already received this report
+//      report_received = true;
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_client_connected(ddf_fun_t *fun)
+{
+        usb_hid_report_received();
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
+{       
+        /* Create the function exposed under /dev/devices. */
+        /** @todo Generate numbers for the devices? */
+        usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
+        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
+            HID_GENERIC_FUN_NAME);
+        if (fun == NULL) {
+                usb_log_error("Could not create DDF function node.\n");
+                return ENOMEM;
+        }
+
+        int rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+        
+        fun->ops = &usb_generic_hid_ops;
+        fun->driver_data = hid_dev;
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usb_generic_hid_init(usb_hid_dev_t *hid_dev)
+{
+        if (hid_dev == NULL) {
+                return EINVAL;
+        }
+        
+        return usb_generic_hid_create_function(hid_dev);
+}
+
+/*----------------------------------------------------------------------------*/
+
 bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, 
     uint8_t *buffer, size_t buffer_size)