Changeset 56b962d in mainline for uspace/app

Timestamp:

2010-11-26T11:26:35Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

84439d7

Parents:

0eddb76

Message:

Standard request callbacks use array in libusbvirt

Location:

uspace/app/virtusbkbd

Files:

• stdreq.c (modified) (1 diff)
• stdreq.h (modified) (1 diff)
• virtusbkbd.c (modified) (1 diff)

uspace/app/virtusbkbd/stdreq.c

@@ -39 +39 @@
 #include "kbdconfig.h"
 
-static int on_get_descriptor(struct usbvirt_device *dev,
-    usb_device_request_setup_packet_t *request, uint8_t *data);
-
-usbvirt_standard_device_request_ops_t standard_request_ops = {
-        .on_get_status = NULL,
-        .on_clear_feature = NULL,
-        .on_set_feature = NULL,
-        .on_set_address = NULL,
-        .on_get_descriptor = on_get_descriptor,
-        .on_set_descriptor = NULL,
-        .on_get_configuration = NULL,
-        .on_set_configuration = NULL,
-        .on_get_interface = NULL,
-        .on_set_interface = NULL,
-        .on_synch_frame = NULL
-};
-
-
-static int on_get_descriptor(struct usbvirt_device *dev,
+int stdreq_on_get_descriptor(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data)
 {

uspace/app/virtusbkbd/stdreq.h

@@ -38 +38 @@
 #include <usbvirt/device.h>
 
-extern usbvirt_standard_device_request_ops_t standard_request_ops;
+int stdreq_on_get_descriptor(usbvirt_device_t *,
+    usb_device_request_setup_packet_t *, uint8_t *);
 
 #endif

uspace/app/virtusbkbd/virtusbkbd.c

@@ -111 +111 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .standard_request_ops = &standard_request_ops,
+        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR]
+            = stdreq_on_get_descriptor,
         .on_class_device_request = on_class_request,
         .on_data = on_incoming_data,