Changeset ff8ed06 in mainline for uspace/drv

Timestamp:

2011-01-15T10:33:29Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

13101d06

Parents:

c9d5577 (diff), fbddf94 (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

Location:

uspace/drv

Files:

• usbhub/main.c (modified) (1 diff)
• usbhub/usbhub.c (modified) (16 diffs)
• usbhub/usbhub_private.h (modified) (6 diffs)
• usbkbd/Makefile (modified) (1 diff)
• usbkbd/descdump.c (added)
• usbkbd/descdump.h (added)
• usbkbd/descparser.c (added)
• usbkbd/descparser.h (added)
• usbkbd/main.c (modified) (8 diffs)
• vhc/hcd.c (modified) (1 diff)

uspace/drv/usbhub/main.c

@@ -52 +52 @@
         while(true){
                 usb_hub_check_hub_changes();
-                async_usleep(1000 * 1000);
+                async_usleep(1000 * 1000 );/// \TODO proper number once
         }
         return 0;

uspace/drv/usbhub/usbhub.c

@@ -46 +46 @@
 #include "usbhub_private.h"
 #include "port_status.h"
+#include "usb/usb.h"
 
 static usb_iface_t hub_usb_iface = {
@@ -85 +86 @@
 
         // get hub descriptor
-        usb_target_t target;
-        target.address = addr;
-        target.endpoint = 0;
-        usb_device_request_setup_packet_t request;
-        //printf("[usb_hub] creating descriptor request\n");
-        usb_hub_set_descriptor_request(&request);
 
         //printf("[usb_hub] creating serialized descriptor\n");
@@ -98 +93 @@
         int opResult;
         //printf("[usb_hub] starting control transaction\n");
-        opResult = usb_drv_sync_control_read(
-                        hc, target, &request, serialized_descriptor,
+        
+        opResult = usb_drv_req_get_descriptor(hc, addr,
+                        USB_REQUEST_TYPE_CLASS,
+                        USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
+
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] failed when receiving hub descriptor, badcode = %d",opResult);
@@ -155 +153 @@
         int port;
         int opResult;
-        usb_device_request_setup_packet_t request;
         usb_target_t target;
         target.address = hub_info->usb_device->address;
@@ -173 +170 @@
         if(std_descriptor.configuration_count<1){
                 dprintf(1,"[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE");
+                //shouldn`t I return?
         }
         /// \TODO check other configurations
@@ -184 +182 @@
         }
         //set configuration
-        request.request_type = 0;
-        request.request = USB_DEVREQ_SET_CONFIGURATION;
-        request.index=0;
-        request.length=0;
-        request.value_high=0;
-        request.value_low = config_descriptor.configuration_number;
-        opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
+        opResult = usb_drv_req_set_configuration(hc, target.address,
+    config_descriptor.configuration_number);
+
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub]something went wrong when setting hub`s configuration, %d", opResult);
         }
 
+        usb_device_request_setup_packet_t request;
         for (port = 1; port < hub_info->port_count+1; ++port) {
                 usb_hub_set_power_port_request(&request, port);
@@ -229 +224 @@
 
 
-
 //*********************************************
 //
@@ -237 +231 @@
 
 /**
- * convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again)
+ * Convenience function for releasing default address and writing debug info
+ * (these few lines are used too often to be written again and again).
  * @param hc
  * @return
@@ -253 +247 @@
 
 /**
- * reset the port with new device and reserve the default address
+ * Reset the port with new device and reserve the default address.
  * @param hc
  * @param port
@@ -282 +276 @@
 
 /**
- * finalize adding new device after port reset
+ * Finalize adding new device after port reset
  * @param hc
  * @param port
@@ -345 +339 @@
 
 /**
- * unregister device address in hc
+ * Unregister device address in hc
  * @param hc
  * @param port
@@ -355 +349 @@
         int opResult;
         
-        /// \TODO remove device
+        /** \TODO remove device from device manager - not yet implemented in
+         * devide manager
+         */
 
         hub->attached_devs[port].devman_handle=0;
@@ -376 +372 @@
 
 /**
- * process interrupts on given hub port
+ * Process interrupts on given hub port
  * @param hc
  * @param port
@@ -434 +430 @@
         usb_port_set_reset_completed(&status, false);
         usb_port_set_dev_connected(&status, false);
-        if (status) {
-                dprintf(1,"[usb_hub]there was some unsupported change on port %d",port);
+        if (status>>16) {
+                dprintf(1,"[usb_hub]there was some unsupported change on port %d: %X",port,status);
+
         }
         /// \TODO handle other changes
@@ -442 +439 @@
 }
 
-/* Check changes on all known hubs.
+/**
+ * Check changes on all known hubs.
  */
 void usb_hub_check_hub_changes(void) {
@@ -462 +460 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
-                dprintf(1,"[usb_hub] checking changes for hub at addr %d",
-                    target.address);
+                /*dprintf(1,"[usb_hub] checking changes for hub at addr %d",
+                    target.address);*/
 
                 size_t port_count = hub_info->port_count;

uspace/drv/usbhub/usbhub_private.h

@@ -31 +31 @@
  */
 /** @file
- * @brief Hub driver.
+ * @brief Hub driver private definitions
  */
 
@@ -68 +68 @@
 
 /**
- * create hub structure instance
+ * Create hub structure instance
  *
  * Set the address and port count information most importantly.
@@ -78 +78 @@
 usb_hub_info_t * usb_create_hub_info(device_t * device, int hc);
 
-/** list of hubs maanged by this driver */
+/** List of hubs maanged by this driver */
 extern usb_general_list_t usb_hub_list;
 
-/** lock for hub list*/
+/** Lock for hub list*/
 extern futex_t usb_hub_list_lock;
 
 
 /**
- * perform complete control read transaction
+ * Perform complete control read transaction
  *
- * manages all three steps of transaction: setup, read and finalize
+ * Manages all three steps of transaction: setup, read and finalize
  * @param phone
  * @param target
- * @param request request for data
- * @param rcvd_buffer received data
+ * @param request Request packet
+ * @param rcvd_buffer Received data
  * @param rcvd_size
- * @param actual_size actual size of received data
+ * @param actual_size Actual size of received data
  * @return error code
  */
@@ -104 +104 @@
 
 /**
- * perform complete control write transaction
+ * Perform complete control write transaction
  *
- * manages all three steps of transaction: setup, write and finalize
+ * Manages all three steps of transaction: setup, write and finalize
  * @param phone
  * @param target
- * @param request request to send data
+ * @param request Request packet to send data
  * @param sent_buffer
  * @param sent_size
@@ -121 +121 @@
 
 /**
- * set the device request to be a get hub descriptor request.
+ * Set the device request to be a get hub descriptor request.
  * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE
  * @param request
@@ -137 +137 @@
 }
 
+/**
+ * Clear feature on hub port.
+ *
+ * @param hc Host controller telephone
+ * @param address Hub address
+ * @param port_index Port
+ * @param feature Feature selector
+ * @return Operation result
+ */
 static inline int usb_hub_clear_port_feature(int hc, usb_address_t address,
     int port_index,

uspace/drv/usbkbd/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        main.c
+        main.c \
+        descparser.c \
+        descdump.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/usbkbd/main.c

@@ -38 +38 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
+#include "descparser.h"
+#include "descdump.h"
 
 #define BUFFER_SIZE 32
@@ -88 +90 @@
  * Callbacks for parser
  */
-static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
-                                    void *arg)
-{
-
+static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
+                                    uint8_t modifiers, void *arg)
+{
+        printf("Got keys: ");
+        unsigned i;
+        for (i = 0; i < count; ++i) {
+                printf("%d ", key_codes[i]);
+        }
+        printf("\n");
 }
 
@@ -97 +104 @@
  * Kbd functions
  */
-static int usbkbd_parse_descriptors(usb_hid_dev_kbd_t *kbd_dev,
-                                    const uint8_t *data, size_t size)
-{
-//      const uint8_t *pos = data;
-        
-//      // get the configuration descriptor (should be first)
-//      if (*pos != sizeof(usb_standard_configuration_descriptor_t)
-//          || *(pos + 1) != USB_DESCTYPE_CONFIGURATION) {
-//              fprintf(stderr, "Wrong format of configuration descriptor");
-//              return EINVAL;
-//      }
-        
-//      usb_standard_configuration_descriptor_t config_descriptor;
-//      memcpy(&config_descriptor, pos, 
-//          sizeof(usb_standard_configuration_descriptor_t));
-//      pos += sizeof(usb_standard_configuration_descriptor_t);
-        
-//      // parse other descriptors
-//      while (pos - data < size) {
-//              //uint8_t desc_size = *pos;
-//              uint8_t desc_type = *(pos + 1);
-//              switch (desc_type) {
-//              case USB_DESCTYPE_INTERFACE:
-//                      break;
-//              case USB_DESCTYPE_ENDPOINT:
-//                      break;
-//              case USB_DESCTYPE_HID:
-//                      break;
-//              case USB_DESCTYPE_HID_REPORT:
-//                      break;
-//              case USB_DESCTYPE_HID_PHYSICAL:
-//                      break;
-//              }
-//      }
-        
+static int usbkbd_get_report_descriptor(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // iterate over all configurations and interfaces
+        // TODO: more configurations!!
+        unsigned i;
+        for (i = 0; i < kbd_dev->conf->config_descriptor.interface_count; ++i) {
+                // TODO: endianness
+                uint16_t length = 
+                    kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.length;
+                size_t actual_size = 0;
+
+                // allocate space for the report descriptor
+                kbd_dev->conf->interfaces[i].report_desc = (uint8_t *)malloc(length);
+                
+                // get the descriptor from the device
+                int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
+                    kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 
+                    0, i, kbd_dev->conf->interfaces[i].report_desc, length, 
+                    &actual_size);
+
+                if (rc != EOK) {
+                        return rc;
+                }
+
+                assert(actual_size == length);
+
+                //dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
+                //    kbd_dev->conf->interfaces[i].report_desc, length);
+        }
+
         return EOK;
 }
 
-static int usbkbd_get_descriptors(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // get the first configuration descriptor (TODO: or some other??)
+static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // get the first configuration descriptor (TODO: parse also other!)
         usb_standard_configuration_descriptor_t config_desc;
         
@@ -166 +168 @@
         }
         
-        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
+        kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, 
+            sizeof(usb_hid_configuration_t));
+        if (kbd_dev->conf == NULL) {
+                free(descriptors);
+                return ENOMEM;
+        }
+        
+        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         free(descriptors);
-        
-        return rc;
+        if (rc != EOK) {
+                printf("Problem with parsing standard descriptors.\n");
+                return rc;
+        }
+
+        // get and report descriptors
+        rc = usbkbd_get_report_descriptor(kbd_dev);
+        if (rc != EOK) {
+                printf("Problem with parsing HID REPORT descriptor.\n");
+                return rc;
+        }
+        
+        //usbkbd_print_config(kbd_dev->conf);
+
+        /*
+         * TODO: 
+         * 1) select one configuration (lets say the first)
+         * 2) how many interfaces?? how to select one??
+     *    ("The default setting for an interface is always alternate setting zero.")
+         * 3) find endpoint which is IN and INTERRUPT (parse), save its number
+     *    as the endpoint for polling
+         */
+        
+        return EOK;
 }
 
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
-                        sizeof(usb_hid_dev_kbd_t));
+        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
+            sizeof(usb_hid_dev_kbd_t));
 
         if (kbd_dev == NULL) {
@@ -186 +217 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
-
-        kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
-            dev);
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                free(kbd_dev);
+                return NULL;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                free(kbd_dev);
+                return NULL;
+        }
 
         // doesn't matter now that we have no address
@@ -208 +248 @@
          */
 
-        // TODO: get descriptors
-        usbkbd_get_descriptors(kbd_dev);
-        // TODO: parse descriptors and save endpoints
+        // TODO: get descriptors, parse descriptors and save endpoints
+        usbkbd_process_descriptors(kbd_dev);
 
         return kbd_dev;
@@ -218 +257 @@
                                         uint8_t *buffer, size_t actual_size)
 {
-        /*
-         * here, the parser will be called, probably with some callbacks
-         * now only take last 6 bytes and process, i.e. send to kbd
-         */
-
         usb_hid_report_in_callbacks_t *callbacks =
             (usb_hid_report_in_callbacks_t *)malloc(
@@ -228 +262 @@
         callbacks->keyboard = usbkbd_process_keycodes;
 
-        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
-            NULL);
+        //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+        //    NULL);
+        printf("Calling usb_hid_boot_keyboard_input_report()...\n)");
+        usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, NULL);
 }
 
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
+        return;
+        
         int rc;
         usb_handle_t handle;

uspace/drv/vhc/hcd.c

@@ -116 +116 @@
         sleep(5);
 
-        usb_dprintf_enable(NAME, 0);
+        usb_dprintf_enable(NAME, -1);
 
         printf(NAME ": virtual USB host controller driver.\n");