Changes in / [b53ca1e:54d9058] in mainline

Location:

uspace

Files:

• app/tester/adt/usbaddrkeep.c (modified) (1 diff)
• app/virtusbkbd/kbdconfig.c (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (5 diffs)
• drv/usbhub/usbhub.h (modified) (2 diffs)
• drv/vhc/conn.h (modified) (2 diffs)
• drv/vhc/connhost.c (modified) (1 diff)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/addrkeep.h (modified) (1 diff, 1 prop)
• lib/usb/include/usb/classes/hub.h (modified) (3 diffs)
• lib/usb/include/usb/hcd.h (added)
• lib/usb/include/usb/hcdhubd.h (added)
• lib/usb/src/addrkeep.c (modified) (1 diff)
• lib/usb/src/dump.c (modified) (1 diff)
• lib/usb/src/hcdhubd.c (added)
• lib/usb/src/hcdrv.c (added)
• lib/usb/src/localdrv.c (added)
• lib/usb/src/remotedrv.c (added)

uspace/app/tester/adt/usbaddrkeep.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <usb/addrkeep.h>
+#include <usb/hcd.h>
 #include <errno.h>
 #include "../tester.h"

uspace/app/virtusbkbd/kbdconfig.c

@@ -61 +61 @@
         .endpoint_count = 1,
         .interface_class = USB_CLASS_HID,
-        .interface_subclass = USB_HID_SUBCLASS_BOOT,
+        .interface_subclass = 0,
         .interface_protocol = USB_HID_PROTOCOL_KEYBOARD,
         .str_interface = 0

uspace/drv/usbhub/usbhub.c

@@ -84 +84 @@
         }*/
 
-        result->address = addr;
+        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
+        result->usb_device->address = addr;
 
         // get hub descriptor
@@ -154 +155 @@
         int opResult;
         usb_target_t target;
-        target.address = hub_info->address;
+        target.address = hub_info->usb_device->address;
         target.endpoint = 0;
 
@@ -215 +216 @@
         dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
         dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-                        hub_info->address,
+                        hub_info->usb_device->address,
                         hub_info->port_count);
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
@@ -464 +465 @@
 
                 usb_target_t target;
-                target.address = hub_info->address;
+                target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
                 dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d",
@@ -506 +507 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
-                                        hub_info, hc, port, hub_info->address);
+                                        hub_info, hc, port, hub_info->usb_device->address);
                         }
                 }

uspace/drv/usbhub/usbhub.h

@@ -36 +36 @@
 #define DRV_USBHUB_USBHUB_H
 
-#include <ipc/devman.h>
-#include <usb/usb.h>
-#include <driver.h>
+#define NAME "usbhub"
 
-#define NAME "usbhub"
+#include "usb/hcdhubd.h"
 
 /** basic information about device attached to hub */
@@ -54 +52 @@
         /** attached device handles */
         usb_hub_attached_device_t * attached_devs;
-        /** USB address of the hub. */
-        usb_address_t address;
+        /** General usb device info. */
+        usb_hcd_attached_device_info_t * usb_device;
         /** General device info*/
         device_t * device;
+
 } usb_hub_info_t;
 

uspace/drv/vhc/conn.h

@@ -37 +37 @@
 
 #include <usb/usb.h>
+#include <usb/hcdhubd.h>
 #include <usbhc_iface.h>
 #include "vhcd.h"
@@ -43 +44 @@
 void connection_handler_host(sysarg_t);
 
+usb_hcd_transfer_ops_t vhc_transfer_ops;
 usbhc_iface_t vhc_iface;
 

uspace/drv/vhc/connhost.c

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/usb.h>
-#include <usb/addrkeep.h>
+#include <usb/hcd.h>
 
 #include "vhcd.h"

uspace/lib/usb/Makefile

@@ -39 +39 @@
         src/drvpsync.c \
         src/dump.c \
+        src/hcdhubd.c \
+        src/hcdrv.c \
         src/hidparser.c \
+        src/localdrv.c \
         src/pipes.c \
         src/pipesinit.c \
         src/pipesio.c \
         src/recognise.c \
+        src/remotedrv.c \
         src/request.c \
         src/usb.c \

uspace/lib/usb/include/usb/addrkeep.h

@@ -1 @@
-/*
- * Copyright (c) 2010 Vojtech Horky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libusb
- * @{
- */
-/** @file
- * USB address keeping for host controller drivers.
- */
-#ifndef LIBUSB_ADDRKEEP_H_
-#define LIBUSB_ADDRKEEP_H_
-
-#include <usb/usb.h>
-#include <fibril_synch.h>
-#include <devman.h>
-
-/** Info about used address. */
-typedef struct {
-        /** Linked list member. */
-        link_t link;
-        /** Address. */
-        usb_address_t address;
-        /** Corresponding devman handle. */
-        devman_handle_t devman_handle;
-} usb_address_keeping_used_t;
-
-/** Structure for keeping track of free and used USB addresses. */
-typedef struct {
-        /** Head of list of used addresses. */
-        link_t used_addresses;
-        /** Upper bound for USB addresses. */
-        usb_address_t max_address;
-        /** Mutex protecting used address. */
-        fibril_mutex_t used_addresses_guard;
-        /** Condition variable for used addresses. */
-        fibril_condvar_t used_addresses_condvar;
-
-        /** Condition variable mutex for default address. */
-        fibril_mutex_t default_condvar_guard;
-        /** Condition variable for default address. */
-        fibril_condvar_t default_condvar;
-        /** Whether is default address available. */
-        bool default_available;
-} usb_address_keeping_t;
-
-void usb_address_keeping_init(usb_address_keeping_t *, usb_address_t);
-
-void usb_address_keeping_reserve_default(usb_address_keeping_t *);
-void usb_address_keeping_release_default(usb_address_keeping_t *);
-
-usb_address_t usb_address_keeping_request(usb_address_keeping_t *);
-int usb_address_keeping_release(usb_address_keeping_t *, usb_address_t);
-void usb_address_keeping_devman_bind(usb_address_keeping_t *, usb_address_t,
-    devman_handle_t);
-usb_address_t usb_address_keeping_find(usb_address_keeping_t *,
-    devman_handle_t);
-
-#endif
-/**
- * @}
- */
+hcd.h

uspace/lib/usb/include/usb/classes/hub.h

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <usb/hcdhubd.h>
+
 
 /** Hub class feature selector.
@@ -78 +80 @@
     /**
             D1...D0: Logical Power Switching Mode
-            00: Ganged power switching (all ports power at
+            00: Ganged power switching (all ports’ power at
             once)
             01: Individual port power switching
@@ -89 +91 @@
             00: Global Over-current Protection. The hub
             reports over-current as a summation of all
-            ports current draw, without a breakdown of
+            ports’ current draw, without a breakdown of
             individual port over-current status.
             01: Individual Port Over-current Protection. The

uspace/lib/usb/src/addrkeep.c

@@ -33 +33 @@
  * @brief Address keeping.
  */
-#include <usb/addrkeep.h>
+#include <usb/hcd.h>
 #include <errno.h>
 #include <assert.h>

uspace/lib/usb/src/dump.c

@@ -147 +147 @@
         PRINTLINE("bDeviceProtocol = 0x%02x", d->device_protocol);
         PRINTLINE("bMaxPacketSize0 = %d", d->max_packet_size);
-        PRINTLINE("idVendor = 0x%04x", d->vendor_id);
-        PRINTLINE("idProduct = 0x%04x", d->product_id);
+        PRINTLINE("idVendor = %d", d->vendor_id);
+        PRINTLINE("idProduct = %d", d->product_id);
         PRINTLINE("bcdDevice = %d", d->device_version);
         PRINTLINE("iManufacturer = %d", d->str_manufacturer);