Index: uspace/lib/usb/include/usb/classes/hub.h
===================================================================
--- uspace/lib/usb/include/usb/classes/hub.h	(revision e0a5d4cfd543daee5dd5a861793ddd18dcb32c0b)
+++ uspace/lib/usb/include/usb/classes/hub.h	(revision b2dca8de8634dcb5e4d4674aa9007210da4bc6a4)
@@ -178,5 +178,5 @@
 	 */
 	uint8_t max_current;
-} __attribute__ ((packed)) usb_hub_descriptor_header_t;
+} __attribute__((packed)) usb_hub_descriptor_header_t;
 
 /** One bit for the device and one bit for every port */
@@ -187,63 +187,55 @@
  */
 typedef enum {
-    /** This request resets a value reported in the hub status. */
-    USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE = 0x20,
-    /** This request resets a value reported in the port status. */
-    USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE = 0x23,
-    /**
-     * This is an optional per-port diagnostic request that returns the bus
-     * state value, as sampled at the last EOF2 point.
-     */
-    USB_HUB_REQ_TYPE_GET_STATE = 0xA3,
-    /** This request returns the hub descriptor. */
-    USB_HUB_REQ_TYPE_GET_DESCRIPTOR = 0xA0,
-    /**
-     * This request returns the current hub status and the states that have
-     * changed since the previous acknowledgment.
-     */
-    USB_HUB_REQ_TYPE_GET_HUB_STATUS = 0xA0,
-    /**
-     * This request returns the current port status and the current value of the
-     * port status change bits.
-     */
-    USB_HUB_REQ_TYPE_GET_PORT_STATUS = 0xA3,
-    /** This request overwrites the hub descriptor. */
-    USB_HUB_REQ_TYPE_SET_DESCRIPTOR = 0x20,
-    /** This request sets a value reported in the hub status. */
-    USB_HUB_REQ_TYPE_SET_HUB_FEATURE = 0x20,
-    /**
-     * This request sets the value that the hub uses to determine the index
-     * into the Route String Index for the hub.
-     */
-    USB_HUB_REQ_TYPE_SET_HUB_DEPTH = 0x20,
-    /** This request sets a value reported in the port status. */
-    USB_HUB_REQ_TYPE_SET_PORT_FEATURE = 0x23,
+	/** This request resets a value reported in the hub status. */
+	USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE = 0x20,
+	/** This request resets a value reported in the port status. */
+	USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE = 0x23,
+	/**
+	 * This is an optional per-port diagnostic request that returns the bus
+	 * state value, as sampled at the last EOF2 point.
+	 */
+	USB_HUB_REQ_TYPE_GET_STATE = 0xA3,
+	/** This request returns the hub descriptor. */
+	USB_HUB_REQ_TYPE_GET_DESCRIPTOR = 0xA0,
+	/**
+	 * This request returns the current hub status and the states that have
+	 * changed since the previous acknowledgment.
+	 */
+	USB_HUB_REQ_TYPE_GET_HUB_STATUS = 0xA0,
+	/**
+	 * This request returns the current port status and the current value of the
+	 * port status change bits.
+	 */
+	USB_HUB_REQ_TYPE_GET_PORT_STATUS = 0xA3,
+	/** This request overwrites the hub descriptor. */
+	USB_HUB_REQ_TYPE_SET_DESCRIPTOR = 0x20,
+	/** This request sets a value reported in the hub status. */
+	USB_HUB_REQ_TYPE_SET_HUB_FEATURE = 0x20,
+	/**
+	 * This request sets the value that the hub uses to determine the index
+	 * into the Route String Index for the hub.
+	 */
+	USB_HUB_REQ_TYPE_SET_HUB_DEPTH = 0x20,
+	/** This request sets a value reported in the port status. */
+	USB_HUB_REQ_TYPE_SET_PORT_FEATURE = 0x23,
 } usb_hub_bm_request_type_t;
 
-/** @brief hub class request codes*/
-/// \TODO these are duplicit to standart descriptors
+/**
+ * @brief hub class request codes
+ */
 typedef enum {
-    /**  */
-    USB_HUB_REQUEST_GET_STATUS = 0,
-    /** */
-    USB_HUB_REQUEST_CLEAR_FEATURE = 1,
-    /** USB 1.0 only */
-    USB_HUB_REQUEST_GET_STATE = 2,
-    /** */
-    USB_HUB_REQUEST_SET_FEATURE = 3,
-    /** */
-    USB_HUB_REQUEST_GET_DESCRIPTOR = 6,
-    /** */
-    USB_HUB_REQUEST_SET_DESCRIPTOR = 7,
-    /** */
-    USB_HUB_REQUEST_CLEAR_TT_BUFFER = 8,
-    /** */
-    USB_HUB_REQUEST_RESET_TT = 9,
-    /** */
-    USB_HUB_GET_TT_STATE = 10,
-    /** */
-    USB_HUB_STOP_TT = 11,
-    /** USB 3+ only */
-    USB_HUB_REQUEST_SET_HUB_DEPTH = 12,
+	USB_HUB_REQUEST_GET_STATUS = 0,
+	USB_HUB_REQUEST_CLEAR_FEATURE = 1,
+	/** USB 1.0 only */
+	USB_HUB_REQUEST_GET_STATE = 2,
+	USB_HUB_REQUEST_SET_FEATURE = 3,
+	USB_HUB_REQUEST_GET_DESCRIPTOR = 6,
+	USB_HUB_REQUEST_SET_DESCRIPTOR = 7,
+	USB_HUB_REQUEST_CLEAR_TT_BUFFER = 8,
+	USB_HUB_REQUEST_RESET_TT = 9,
+	USB_HUB_GET_TT_STATE = 10,
+	USB_HUB_STOP_TT = 11,
+	/** USB 3+ only */
+	USB_HUB_REQUEST_SET_HUB_DEPTH = 12,
 } usb_hub_request_t;
 
Index: uspace/lib/usb/include/usb/descriptor.h
===================================================================
--- uspace/lib/usb/include/usb/descriptor.h	(revision e0a5d4cfd543daee5dd5a861793ddd18dcb32c0b)
+++ uspace/lib/usb/include/usb/descriptor.h	(revision b2dca8de8634dcb5e4d4674aa9007210da4bc6a4)
@@ -101,5 +101,5 @@
 	/** Number of possible configurations. */
 	uint8_t configuration_count;
-} __attribute__ ((packed)) usb_standard_device_descriptor_t;
+} __attribute__((packed)) usb_standard_device_descriptor_t;
 
 /** USB device qualifier decriptor is basically a cut down version of the device
@@ -129,5 +129,5 @@
 	uint8_t configuration_count;
 	uint8_t reserved;
-} __attribute__ ((packed)) usb_standard_device_qualifier_descriptor_t;
+} __attribute__((packed)) usb_standard_device_qualifier_descriptor_t;
 
 /** Standard USB configuration descriptor.
@@ -156,5 +156,5 @@
 	 */
 	uint8_t max_power;
-} __attribute__ ((packed)) usb_standard_configuration_descriptor_t;
+} __attribute__((packed)) usb_standard_configuration_descriptor_t;
 
 /** USB Other Speed Configuration descriptor shows values that would change
@@ -191,5 +191,5 @@
 	/** String descriptor describing this interface. */
 	uint8_t str_interface;
-} __attribute__ ((packed)) usb_standard_interface_descriptor_t;
+} __attribute__((packed)) usb_standard_interface_descriptor_t;
 
 /** Standard USB endpoint descriptor.
@@ -223,5 +223,5 @@
 	 */
 	uint8_t poll_interval;
-} __attribute__ ((packed)) usb_standard_endpoint_descriptor_t;
+} __attribute__((packed)) usb_standard_endpoint_descriptor_t;
 
 /** Superspeed USB endpoint companion descriptor.
@@ -254,5 +254,5 @@
 	 */
 	uint16_t bytes_per_interval;
-} __attribute__ ((packed)) usb_superspeed_endpoint_companion_descriptor_t;
+} __attribute__((packed)) usb_superspeed_endpoint_companion_descriptor_t;
 
 /** Part of standard USB HID descriptor specifying one class descriptor.
@@ -265,5 +265,5 @@
 	/** Length of class-specific descriptor in bytes. */
 	uint16_t length;
-} __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t;
+} __attribute__((packed)) usb_standard_hid_class_descriptor_info_t;
 
 /** Standard USB HID descriptor.
@@ -296,5 +296,5 @@
 	/** First mandatory class descriptor (Report) info. */
 	usb_standard_hid_class_descriptor_info_t report_desc_info;
-} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
+} __attribute__((packed)) usb_standard_hid_descriptor_t;
 
 #endif
Index: uspace/lib/usb/include/usb/port.h
===================================================================
--- uspace/lib/usb/include/usb/port.h	(revision e0a5d4cfd543daee5dd5a861793ddd18dcb32c0b)
+++ uspace/lib/usb/include/usb/port.h	(revision b2dca8de8634dcb5e4d4674aa9007210da4bc6a4)
@@ -90,5 +90,6 @@
 
 /* And these are to be called from the connected handler. */
-int usb_port_condvar_wait_timeout(usb_port_t *port, fibril_condvar_t *, suseconds_t);
+int usb_port_condvar_wait_timeout(usb_port_t *port,
+    fibril_condvar_t *, suseconds_t);
 
 /**
Index: uspace/lib/usb/include/usb/usb.h
===================================================================
--- uspace/lib/usb/include/usb/usb.h	(revision e0a5d4cfd543daee5dd5a861793ddd18dcb32c0b)
+++ uspace/lib/usb/include/usb/usb.h	(revision b2dca8de8634dcb5e4d4674aa9007210da4bc6a4)
@@ -54,6 +54,6 @@
 #define uint32_usb2host(n) uint32_t_le2host((n))
 
-const char * usb_str_transfer_type(usb_transfer_type_t t);
-const char * usb_str_transfer_type_short(usb_transfer_type_t t);
+const char *usb_str_transfer_type(usb_transfer_type_t);
+const char *usb_str_transfer_type_short(usb_transfer_type_t);
 
 const char *usb_str_direction(usb_direction_t);
@@ -149,6 +149,5 @@
 static inline bool usb_target_same(usb_target_t a, usb_target_t b)
 {
-	return (a.address == b.address)
-	    && (a.endpoint == b.endpoint);
+	return (a.address == b.address) && (a.endpoint == b.endpoint);
 }
 
@@ -167,12 +166,12 @@
 	USB_PID_SETUP = _MAKE_PID(3, 1),
 
-	USB_PID_DATA0 = _MAKE_PID(0 ,3),
-	USB_PID_DATA1 = _MAKE_PID(2 ,3),
+	USB_PID_DATA0 = _MAKE_PID(0, 3),
+	USB_PID_DATA1 = _MAKE_PID(2, 3),
 
-	USB_PID_ACK = _MAKE_PID(0 ,2),
-	USB_PID_NAK = _MAKE_PID(2 ,2),
-	USB_PID_STALL = _MAKE_PID(3 ,2),
+	USB_PID_ACK = _MAKE_PID(0, 2),
+	USB_PID_NAK = _MAKE_PID(2, 2),
+	USB_PID_STALL = _MAKE_PID(3, 2),
 
-	USB_PID_PRE = _MAKE_PID(3 ,0),
+	USB_PID_PRE = _MAKE_PID(3, 0),
 	/* USB_PID_ = _MAKE_PID( ,), */
 #undef _MAKE_PID