Changeset e1dbcbc in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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/main.c (modified) (7 diffs)

uspace/drv/usbhid/main.c

@@ -42 +42 @@
 
 #include <usb/devdrv.h>
+#include <usb/devpoll.h>
 
 #include "usbhid.h"
@@ -74 +75 @@
 static int usb_hid_try_add_device(usb_device_t *dev)
 {
+        assert(dev != NULL);
+        
         /* 
          * Initialize device (get and process descriptors, get address, etc.)
@@ -98 +101 @@
         /* Create the function exposed under /dev/devices. */
         ddf_fun_t *hid_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, 
-            usb_hid_get_function_name(hid_dev->device_type));
+            usb_hid_get_function_name(hid_dev));
         if (hid_fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
@@ -111 +114 @@
         hid_fun->ops = &hid_dev->ops;
         hid_fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+        
+        /*
+         * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
+         *    do nej.
+         * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi 
+         *    vyplnenu strukturu usbhid_iface_t.
+         * 3) klientska aplikacia - musi si rucne vytvorit telefon
+         *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az 
+         *    k tej fcii.
+         *    pouzit usb/classes/hid/iface.h - prvy int je telefon
+         */
 
         rc = ddf_fun_bind(hid_fun);
@@ -122 +136 @@
         }
         
-        rc = ddf_fun_add_to_class(hid_fun, 
-            usb_hid_get_class_name(hid_dev->device_type));
+        rc = ddf_fun_add_to_class(hid_fun, usb_hid_get_class_name(hid_dev));
         if (rc != EOK) {
                 usb_log_error(
@@ -142 +155 @@
            hid_dev->poll_pipe_index,
            /* Callback when data arrives. */
-           hid_dev->poll_callback,
+           usb_hid_polling_callback,
            /* How much data to request. */
            dev->pipes[hid_dev->poll_pipe_index].pipe->max_packet_size,
@@ -178 +191 @@
         usb_log_debug("usb_hid_add_device()\n");
         
+        if (dev == NULL) {
+                usb_log_warning("Wrong parameter given for add_device().\n");
+                return EINVAL;
+        }
+        
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported HID device.\n");