Changeset 58563585 in mainline for uspace/drv/bus/usb/usbhub

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/drv/bus/usb/usbhub

Files:

• port.c (modified) (3 diffs)
• port.h (modified) (6 diffs)
• status.h (modified) (2 diffs)
• usbhub.c (modified) (4 diffs)
• usbhub.h (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/port.c

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -175 +176 @@
                 } else {
                         /* Handle the case we were in reset */
-                        //usb_hub_port_reset_fail(port);
+                        // FIXME: usb_hub_port_reset_fail(port);
                         /* If enabled change was reported leave the removal
                          * to that handler, it shall ACK the change too. */
@@ -186 +187 @@
         /* Enable change, ports are automatically disabled on errors. */
         if (status & USB_HUB_PORT_C_STATUS_ENABLED) {
-                //TODO: maybe HS reset failed?
+                // TODO: maybe HS reset failed?
                 usb_log_info("(%p-%u): Port disabled because of errors.\n", hub,
                    port->port_number);

uspace/drv/bus/usb/usbhub/port.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -33 +34 @@
  * Hub ports related functions.
  */
+
 #ifndef DRV_USBHUB_PORT_H
 #define DRV_USBHUB_PORT_H
@@ -45 +47 @@
 typedef struct {
         /** Port number as reported in descriptors. */
-        unsigned port_number;
+        unsigned int port_number;
         /** Device communication pipe. */
         usb_pipe_t *control_pipe;
@@ -69 +71 @@
  * @param port Port to be initialized.
  */
-static inline void usb_hub_port_init(usb_hub_port_t *port, unsigned port_number,
-    usb_pipe_t *control_pipe)
+static inline void usb_hub_port_init(usb_hub_port_t *port,
+    unsigned int port_number, usb_pipe_t *control_pipe)
 {
         assert(port);
@@ -80 +82 @@
         fibril_condvar_initialize(&port->reset_cv);
 }
+
 int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
 int usb_hub_port_clear_feature(
@@ -89 +92 @@
 
 #endif
+
 /**
  * @}

uspace/drv/bus/usb/usbhub/status.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -114 +115 @@
 }
 
-#endif  /* HUB_STATUS_H */
+#endif
+
 /**
  * @}

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -56 +57 @@
 
 #define HUB_FNC_NAME "hub"
+
 /** Hub status-change endpoint description.
  *
@@ -229 +231 @@
     uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
 {
-//      usb_log_debug("hub_port_changes_callback\n");
         usb_hub_dev_t *hub = arg;
         assert(hub);
@@ -314 +315 @@
             hub_dev->per_port_power ? "per port" : "ganged");
 
-        for (unsigned port = 0; port < hub_dev->port_count; ++port) {
+        for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
                 usb_log_debug("(%p): Powering port %u.", hub_dev, port);
                 const int ret = usb_hub_port_set_feature(

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -33 +34 @@
  * @brief Hub driver.
  */
+
 #ifndef DRV_USBHUB_USBHUB_H
 #define DRV_USBHUB_USBHUB_H
@@ -82 +84 @@
 extern const usb_endpoint_description_t hub_status_change_endpoint_description;
 
-int usb_hub_device_add(usb_device_t *usb_dev);
-int usb_hub_device_remove(usb_device_t *usb_dev);
-int usb_hub_device_gone(usb_device_t *usb_dev);
+extern int usb_hub_device_add(usb_device_t *);
+extern int usb_hub_device_remove(usb_device_t *);
+extern int usb_hub_device_gone(usb_device_t *);
 
-bool hub_port_changes_callback(usb_device_t *dev,
-    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg);
+extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t,
+    void *);
 
 #endif
+
 /**
  * @}