Changeset 32c2c8f in mainline

Timestamp:

2013-01-05T21:52:56Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1da979d

Parents:

b997e7b

Message:

libusbvirt: Add basic hub device implementation.

It takes care of descriptors, address, and state tracking.

Location:

uspace/lib

Files:

• usb/include/usb/classes/hub.h (modified) (3 diffs)
• usbvirt/Makefile (modified) (2 diffs)
• usbvirt/include/usbvirt/device.h (modified) (1 diff)
• usbvirt/include/usbvirt/virthub_base.h (added)
• usbvirt/src/stdreq.c (modified) (1 diff)
• usbvirt/src/virthub_base.c (added)
• usbvirt/src/virthub_descriptors.c (added)

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

@@ -73 +73 @@
         /** Characteristics bitmask. */
         uint8_t characteristics;
-#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
-#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
+#define HUB_CHAR_POWER_PER_PORT_FLAG    (1 << 0)
+#define HUB_CHAR_NO_POWER_SWITCH_FLAG   (1 << 1)
+#define HUB_CHAR_COMPUND_DEVICE         (1 << 2)
+#define HUB_CHAR_OC_PER_PORT_FLAG       (1 << 3)
+#define HUB_CHAR_NO_OC_FLAG             (1 << 4)
         /* Unused part of characteristics field */
         uint8_t characteristics_reserved;
@@ -83 +86 @@
 } __attribute__ ((packed)) usb_hub_descriptor_header_t;
 
+
+#if 0
 /**
  * @brief usb hub descriptor
@@ -169 +174 @@
     //uint8_t * port_pwr_ctrl_mask;
 } usb_hub_descriptor_t;
-
+#endif
 
 

uspace/lib/usbvirt/Makefile

@@ -34 +34 @@
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBUSBDEV_PREFIX)/include \
-        -Iinclude
+        -Iinclude \
+        -Iinclude/usbvirt
 
 SOURCES = \
@@ -42 +43 @@
         src/ipc_hc.c \
         src/stdreq.c \
-        src/transfer.c
+        src/transfer.c \
+        src/virthub_base.c \
+        src/virthub_descriptors.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbvirt/include/usbvirt/device.h

@@ -239 +239 @@
 };
 
+
+int req_nop(usbvirt_device_t *device,
+    const usb_device_request_setup_packet_t *setup_packet,
+    uint8_t *data, size_t *act_size);
+
 int usbvirt_device_plug(usbvirt_device_t *, const char *);
 void usbvirt_device_unplug(usbvirt_device_t *);

uspace/lib/usbvirt/src/stdreq.c

@@ -65 +65 @@
 }
 
+/** NOP handler */
+int req_nop(usbvirt_device_t *device,
+    const usb_device_request_setup_packet_t *setup_packet,
+    uint8_t *data, size_t *act_size)
+{
+        return EOK;
+}
+
 /** GET_DESCRIPTOR handler. */
 static int req_get_descriptor(usbvirt_device_t *device,