Changeset 8c9e71a in mainline for uspace/lib

Timestamp:

2011-09-27T15:55:27Z (15 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1069714

Parents:

d3a9ae74 (diff), 747a1e71 (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:

Merg with mainline

Location:

uspace/lib

Files:

• usb/include/usb/classes/hub.h (modified) (4 diffs)
• usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• usbdev/src/pipesio.c (modified) (2 diffs)

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

@@ -72 +72 @@
         uint8_t port_count;
         /** Characteristics bitmask. */
-        uint16_t characteristics;
+        uint8_t characteristics;
+#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
+#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
+        /* Unused part of characteristics field */
+        uint8_t characteristics_reserved;
         /** Time from power-on to stabilization of current on the port. */
         uint8_t power_good_time;
@@ -92 +96 @@
 
     /** Number of downstream ports that this hub supports */
-    uint8_t ports_count;
+    uint8_t port_count;
 
     /**
@@ -119 +123 @@
      */
     uint16_t hub_characteristics;
-#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
-#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
 
     /**
@@ -214 +216 @@
  *      Maximum size of usb hub descriptor in bytes
  */
-extern size_t USB_HUB_MAX_DESCRIPTOR_SIZE;
-
-
-
-
-
-
+/* 7 (basic size) + 2*32 (port bitmasks) */
+#define USB_HUB_MAX_DESCRIPTOR_SIZE 71
 
 #endif

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -183 +183 @@
 int usb_pipe_write(usb_pipe_t *, void *, size_t);
 
-int usb_pipe_control_read(usb_pipe_t *, void *, size_t,
+int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     void *, size_t, size_t *);
 int usb_pipe_control_write(usb_pipe_t *, void *, size_t,

uspace/lib/usbdev/src/pipesio.c

@@ -328 +328 @@
  */
 static int usb_pipe_control_read_no_check(usb_pipe_t *pipe,
-    void *setup_buffer, size_t setup_buffer_size,
+    const void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {
@@ -411 +411 @@
  */
 int usb_pipe_control_read(usb_pipe_t *pipe,
-    void *setup_buffer, size_t setup_buffer_size,
+    const void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {