Changeset 65b458c4 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-05-13T12:44:37Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

37f87fa

Parents:

97cb542

Message:

Subdriver-specific data moved to the subdriver structure.

+ DDF ops removed from hid_dev_t.

Should fix #225

File:

• uspace/drv/usbhid/usbhid.c (modified) (4 diffs)

uspace/drv/usbhid/usbhid.c

@@ -466 +466 @@
                         if (hid_dev->subdrivers[i].init != NULL) {
                                 usb_log_debug("Initializing subdriver %d.\n",i);
-                                rc = hid_dev->subdrivers[i].init(hid_dev);
+                                rc = hid_dev->subdrivers[i].init(hid_dev,
+                                    &hid_dev->subdrivers[i].data);
                                 if (rc != EOK) {
                                         usb_log_warning("Failed to initialize"
@@ -531 +532 @@
         for (i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll != NULL
-                    && hid_dev->subdrivers[i].poll(hid_dev, buffer, 
-                    buffer_size)) {
+                    && hid_dev->subdrivers[i].poll(hid_dev, 
+                        hid_dev->subdrivers[i].data, buffer, buffer_size)) {
                         cont = true;
                 }
@@ -555 +556 @@
         for (i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll_end != NULL) {
-                        hid_dev->subdrivers[i].poll_end(hid_dev, reason);
+                        hid_dev->subdrivers[i].poll_end(hid_dev,
+                            hid_dev->subdrivers[i].data, reason);
                 }
         }
@@ -636 +638 @@
         for (i = 0; i < (*hid_dev)->subdriver_count; ++i) {
                 if ((*hid_dev)->subdrivers[i].deinit != NULL) {
-                        (*hid_dev)->subdrivers[i].deinit(*hid_dev);
+                        (*hid_dev)->subdrivers[i].deinit(*hid_dev,
+                            (*hid_dev)->subdrivers[i].data);
                 }
         }