Changeset 3facf63a in mainline

Timestamp:

2011-05-03T09:48:35Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4bfd85b, 8cbd512

Parents:

31cfee16

Message:

DFF function for generic HID subdriver.

• Changed usbhid interface - sending only the raw buffer.
• Implemented interface in generic HID subdriver.

Just a proof-of-concept, this implementation has many issues
(e.g. synchronization, reporting old events, etc.).

Location:

uspace

Files:

• drv/usbhid/generic/hiddev.c (modified) (2 diffs)
• drv/usbhid/generic/hiddev.h (modified) (1 diff)
• drv/usbhid/usbhid.c (modified) (1 diff)
• lib/drv/include/usbhid_iface.h (modified) (1 diff)

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 <usbhid_iface.h>
 
 #include "hiddev.h"
@@ -55 +59 @@
 /*----------------------------------------------------------------------------*/
 
+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 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
+};
+
+/*----------------------------------------------------------------------------*/
+
+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. */
+        memcpy(buffer, hid_dev->input_report, hid_dev->input_report_size);
+        *act_size = hid_dev->input_report_size;
+        
+        // clear the buffer so that it will not be received twice
+        memset(hid_dev->input_report, 0, hid_dev->input_report_size);
+        
+        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)

uspace/drv/usbhid/generic/hiddev.h

@@ -46 +46 @@
 const char *HID_GENERIC_CLASS_NAME;
 
+/*----------------------------------------------------------------------------*/
+
+int usb_generic_hid_init(struct usb_hid_dev *hid_dev);
+
 bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev,
     uint8_t *buffer, size_t buffer_size);

uspace/drv/usbhid/usbhid.c

@@ -136 +136 @@
         
         // set the init callback
-        hid_dev->subdrivers[0].init = NULL;
+        hid_dev->subdrivers[0].init = usb_generic_hid_init;
         
         // set the polling callback

uspace/lib/drv/include/usbhid_iface.h

@@ -72 +72 @@
 /** USB HID device communication interface. */
 typedef struct {
-        /** Get number of items in the event.
+        /** Get size of the event in bytes.
          *
          * @param[in] fun DDF function answering the request.
          * @return Number of events or error code.
          */
-        int (*get_event_length)(ddf_fun_t *fun);
+        size_t (*get_event_length)(ddf_fun_t *fun);
 
         /** Get single event from the HID device.
          *
          * @param[in] fun DDF function answering the request.
-         * @param[out] usage_page Array of usage pages and usages.
-         * @param[out] usage Array of data (1:1 with @p usage).
-         * @param[in] size Size of @p usage and @p data arrays.
+         * @param[out] buffer Buffer with raw data from the device.
          * @param[out] act_size Actual number of returned events.
          * @param[in] flags Flags (see USBHID_IFACE_FLAG_*).
          * @return Error code.
          */
-        int (*get_event)(ddf_fun_t *fun,
-            uint16_t *usage_page, uint16_t *usage, size_t size, size_t *act_size,
-            unsigned int flags);
+        int (*get_event)(ddf_fun_t *fun, int32_t *buffer, size_t size,
+            size_t *act_size, unsigned int flags);
 } usbhid_iface_t;