Changeset 58563585 in mainline for uspace/lib/usb/include

Timestamp:

2016-08-31T11:15:39Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10cb47e

Parents:

7a67416

Message:

code review and cstyle cleanup (no change in functionality)

Location:

uspace/lib/usb/include/usb

Files:

• classes/hub.h (modified) (2 diffs)
• debug.h (modified) (1 diff)
• descriptor.h (modified) (3 diffs)
• dev.h (modified) (2 diffs)
• usb.h (modified) (5 diffs)

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

@@ -110 +110 @@
          */
         uint8_t characteristics;
+
 #define HUB_CHAR_POWER_PER_PORT_FLAG    (1 << 0)
 #define HUB_CHAR_NO_POWER_SWITCH_FLAG   (1 << 1)
@@ -196 +197 @@
  */
 /* 7 (basic size) + 2*32 (port bitmasks) */
-#define USB_HUB_MAX_DESCRIPTOR_SIZE (7 + 2 * 32)
+#define USB_HUB_MAX_DESCRIPTOR_SIZE  (7 + 2 * 32)
 
 #endif

uspace/lib/usb/include/usb/debug.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <io/log.h>
-
 
 void usb_dump_standard_descriptor(FILE *, const char *, const char *,

uspace/lib/usb/include/usb/descriptor.h

@@ -45 +45 @@
         USB_DESCTYPE_INTERFACE = 4,
         USB_DESCTYPE_ENDPOINT = 5,
-        /* New in USB2.0 */
+        /* New in USB 2.0 */
         USB_DESCTYPE_DEVICE_QUALIFIER = 6,
         USB_DESCTYPE_OTHER_SPEED_CONFIGURATION = 7,
@@ -202 +202 @@
          * HS INT and ISO transfers. */
         uint16_t max_packet_size;
+
 #define ED_MPS_PACKET_SIZE_MASK  0x3ff
 #define ED_MPS_PACKET_SIZE_GET(value) \
@@ -207 +208 @@
 #define ED_MPS_TRANS_OPPORTUNITIES_GET(value) \
         ((((value) >> 10) & 0x3) + 1)
+
         /** Polling interval in milliseconds.
          * Ignored for bulk and control endpoints.

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusb
  * @{
  */
+
 /** @file
  * Common USB types and functions.
  */
+
 #ifndef LIBUSB_DEV_H_
 #define LIBUSB_DEV_H_
@@ -37 +40 @@
 #include <devman.h>
 
-int usb_resolve_device_handle(const char *, devman_handle_t *);
+extern int usb_resolve_device_handle(const char *, devman_handle_t *);
+
 #endif
+
 /**
  * @}

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

@@ -114 +114 @@
 /** Default USB address. */
 #define USB_ADDRESS_DEFAULT 0
+
 /** Maximum address number in USB 1.1. */
 #define USB11_ADDRESS_MAX 127
@@ -121 +122 @@
  *
  * @param ep USB address.
+ *
  * @return True, if value is wihtin limits, false otherwise.
+ *
  */
 static inline bool usb_address_is_valid(usb_address_t a)
@@ -135 +138 @@
 /** Default control endpoint */
 #define USB_ENDPOINT_DEFAULT_CONTROL 0
+
 /** Maximum endpoint number in USB 1.1. */
 #define USB11_ENDPOINT_MAX 16
@@ -141 +145 @@
  *
  * @param ep USB endpoint number.
+ *
  * @return True, if value is wihtin limits, false otherwise.
+ *
  */
 static inline bool usb_endpoint_is_valid(usb_endpoint_t ep)
@@ -160 +166 @@
         uint32_t packed;
 } usb_target_t;
-
 
 /** Check USB target for allowed values (address and endpoint).