Changeset 11658b64 in mainline for uspace/app

Timestamp:

2010-12-16T11:54:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

557c7d0, 5863a95, 82122f3, a8b7dfd, f2962621

Parents:

a9b6bec (diff), 70e5ad5 (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:

Merged vojtechhorky/ - libusbvirt clean-up

Location:

uspace/app/virtusbkbd

Files:

• Makefile (modified) (1 diff)
• stdreq.c (modified) (1 diff)
• stdreq.h (modified) (1 diff)
• virtusbkbd.c (modified) (4 diffs)

uspace/app/virtusbkbd/Makefile

@@ -33 +33 @@
 
 LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIB_PREFIX) -I$(LIBDRV_PREFIX)/include
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \

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

@@ -76 +76 @@
 }
 
-static int on_class_request(struct usbvirt_device *dev,
-    usb_device_request_setup_packet_t *request, uint8_t *data)
-{       
-        printf("%s: class request (%d)\n", NAME, (int) request->request);
-        
-        return EOK;
-}
 
 /** Compares current and last status of pressed keys.
@@ -138 +131 @@
 }
 
+static usbvirt_control_transfer_handler_t endpoint_zero_handlers[] = {
+        {
+                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
+                    USB_DIRECTION_IN,
+                    USBVIRT_REQUEST_TYPE_STANDARD,
+                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .name = "GetDescriptor",
+                .callback = stdreq_on_get_descriptor
+        },
+        {
+                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
+                    USB_DIRECTION_IN,
+                    USBVIRT_REQUEST_TYPE_CLASS,
+                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .name = "GetDescriptor",
+                .callback = stdreq_on_get_descriptor
+        },
+        USBVIRT_CONTROL_TRANSFER_HANDLER_LAST
+};
 
 /** Keyboard callbacks.
@@ -143 +157 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .standard_request_ops = &standard_request_ops,
-        .on_class_device_request = on_class_request,
+        .control_transfer_handlers = endpoint_zero_handlers,
         .on_data = on_incoming_data,
         .on_data_request = on_request_for_data
@@ -257 +270 @@
         
         printf("%s: Simulating keyboard events...\n", NAME);
+        fibril_sleep(10);
         while (1) {
                 kb_process_events(&status, keyboard_events, keyboard_events_count,