Changes in / [103a3626:78d1525] in mainline

Location:

uspace

Files:

• drv/usbhid/hid.h (modified) (1 diff)
• drv/usbhid/main.c (modified) (8 diffs)
• lib/usb/src/addrkeep.c (modified) (1 diff)
• lib/usb/src/debug.c (modified) (4 diffs)

uspace/drv/usbhid/hid.h

@@ -69 +69 @@
         device_t *device;
         usb_hid_configuration_t *conf;
+        usb_address_t address;
         usb_hid_report_parser_t *parser;
 
         usb_device_connection_t wire;
-        usb_endpoint_pipe_t ctrl_pipe;
         usb_endpoint_pipe_t poll_pipe;
 } usb_hid_dev_kbd_t;

uspace/drv/usbhid/main.c

@@ -47 +47 @@
 #include <usb/classes/hid.h>
 #include <usb/classes/hidparser.h>
-#include <usb/request.h>
+#include <usb/devreq.h>
 #include <usb/descriptor.h>
 #include <io/console.h>
@@ -280 +280 @@
                 
                 // get the descriptor from the device
-                int rc = usb_request_get_descriptor(&kbd_dev->ctrl_pipe,
-                    USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT,
-                    i, 0,
-                    kbd_dev->conf->interfaces[i].report_desc, length,
+                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);
 
@@ -304 +303 @@
         usb_standard_configuration_descriptor_t config_desc;
         
-        int rc;
-        rc = usb_request_get_bare_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, &config_desc);
+        int rc = usb_drv_req_get_bare_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc);
         
         if (rc != EOK) {
@@ -320 +318 @@
         size_t transferred = 0;
         // get full configuration descriptor
-        rc = usb_request_get_full_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, descriptors,
+        rc = usb_drv_req_get_full_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, descriptors,
             config_desc.total_length, &transferred);
         
@@ -368 +366 @@
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        int rc;
-
         usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
             sizeof(usb_hid_dev_kbd_t));
@@ -380 +376 @@
         kbd_dev->device = dev;
 
+        // 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
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                goto error_leave;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                goto error_leave;
+        }
+
+        // doesn't matter now that we have no address
+//      if (kbd_dev->address < 0) {
+//              fprintf(stderr, NAME ": No device address!\n");
+//              free(kbd_dev);
+//              return NULL;
+//      }
+
+        /*
+         * will need all descriptors:
+         * 1) choose one configuration from configuration descriptors 
+         *    (set it to the device)
+         * 2) set endpoints from endpoint descriptors
+         */
+
+        // TODO: get descriptors, parse descriptors and save endpoints
+        usbkbd_process_descriptors(kbd_dev);
+
+
+
         /*
          * Initialize the backing connection to the host controller.
@@ -393 +422 @@
          * Initialize device pipes.
          */
-        rc = usb_endpoint_pipe_initialize_default_control(&kbd_dev->ctrl_pipe,
-            &kbd_dev->wire);
-        if (rc != EOK) {
-                printf("Failed to initialize default control pipe: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
         rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
             GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN);
@@ -409 +430 @@
         }
 
-        /*
-         * will need all descriptors:
-         * 1) choose one configuration from configuration descriptors
-         *    (set it to the device)
-         * 2) set endpoints from endpoint descriptors
-         */
-
-        // TODO: get descriptors, parse descriptors and save endpoints
-        usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
-        usbkbd_process_descriptors(kbd_dev);
-        usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
 
         return kbd_dev;

uspace/lib/usb/src/addrkeep.c

@@ -149 +149 @@
                         &addresses->default_condvar_guard);
         }
+        addresses->default_available = false;
         fibril_mutex_unlock(&addresses->default_condvar_guard);
 }

uspace/lib/usb/src/debug.c

@@ -67 +67 @@
 /** Serialization mutex for logging functions. */
 static FIBRIL_MUTEX_INITIALIZE(log_serializer);
+static FILE *log_stream = NULL;
 
 /** Find or create new tag with given name.
@@ -171 +172 @@
         log_prefix = message_prefix;
         log_level = level;
+        if (log_stream == NULL) {
+                char *fname;
+                int rc = asprintf(&fname, "/log/%s", message_prefix);
+                if (rc > 0) {
+                        log_stream = fopen(fname, "w");
+                        free(fname);
+                }
+        }
 }
 
@@ -197 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        if (level > log_level) {
-                return;
-        }
-
         FILE *stream = NULL;
         switch (level) {
@@ -216 +221 @@
         va_start(args, format);
 
+        /*
+         * Serialize access to log files.
+         * Always print to log file, to screen print only when the enabled
+         * log level is high enough.
+         */
         fibril_mutex_lock(&log_serializer);
-        fprintf(stream, "[%s]%s: ", log_prefix, log_level_name(level));
-        vfprintf(stream, format, args);
+
+        const char *level_name = log_level_name(level);
+
+        if (log_stream != NULL) {
+                fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(log_stream, format, args);
+        }
+
+        if (level <= log_level) {
+                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(stream, format, args);
+        }
+
         fibril_mutex_unlock(&log_serializer);