Changeset c8bb7090 in mainline

Timestamp:

2017-07-16T17:24:42Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

37789b5f

Parents:

fe5db713

Message:

Corrected cstyle.

Location:

uspace/drv/bus/usb/xhci

Files:

• Makefile (modified) (1 diff)
• rh.c (modified) (1 diff)
• rh.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/Makefile

@@ -47 +47 @@
         scratchpad.c \
         commands.c \
-    rh.c \
+        rh.c \
         main.c
 

uspace/drv/bus/usb/xhci/rh.c

@@ -39 +39 @@
 #include "debug.h"
 #include "hc.h"
+#include "hw_struct/trb.h"
 #include "rh.h"
 
-#include "hw_struct/trb.h"
+static int handle_connected_device(xhci_hc_t* hc, xhci_port_regs_t* regs, uint8_t port_id)
+{
+        uint8_t link_state = XHCI_REG_RD(regs, XHCI_PORT_PLS);
+        if (link_state == 0) {
+                // USB3 is automatically advance to enabled   
+                uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
+                usb_log_debug2("Detected new device on port %u, port speed id %u.", port_id, port_speed);
+                // TODO: Assign device slot (specification 4.3.2) 
+        } else if (link_state == 5) {
+                // USB 3 failed to enable
+                usb_log_debug("USB 3 port couldn't be enabled.");
+        } else if (link_state == 7) {
+                usb_log_debug("USB 2 device attached, issuing reset.");
+                xhci_reset_hub_port(hc, port_id);
+        }
 
-static int handle_connected_device(xhci_hc_t* hc, xhci_port_regs_t* regs, uint8_t port_id) {
-    uint8_t link_state = XHCI_REG_RD(regs, XHCI_PORT_PLS);
-    if(link_state == 0) {
-        // USB3 is automatically advance to enabled   
-        uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
-        usb_log_debug2("Detected new device on port %u, port speed id %u.", port_id, port_speed);
-        // TODO: Assign device slot (specification 4.3.2) 
-    }
-    else if(link_state == 5) {
-        // USB 3 failed to enable
-        usb_log_debug("USB 3 port couldn't be enabled.");
-    }
-    else if(link_state == 7) {
-        usb_log_debug("USB 2 device attached, issuing reset.");
-        xhci_reset_hub_port(hc, port_id);
-    }
-
-    return EOK;
+        return EOK;
 }
 
-int xhci_handle_port_status_change_event(xhci_hc_t *hc, xhci_trb_t *trb) {
-    uint8_t port_id = xhci_get_hub_port(trb);
-    usb_log_debug("Port status change event detected for port %u.", port_id);
-    xhci_port_regs_t* regs = &hc->op_regs->portrs[port_id];
+int xhci_handle_port_status_change_event(xhci_hc_t *hc, xhci_trb_t *trb)
+{
+        uint8_t port_id = xhci_get_hub_port(trb);
+        usb_log_debug("Port status change event detected for port %u.", port_id);
+        xhci_port_regs_t* regs = &hc->op_regs->portrs[port_id];
 
-    // Port reset change
-    if(XHCI_REG_RD(regs, XHCI_PORT_PRC)) {
-        // Clear the flag
-        XHCI_REG_WR(regs, XHCI_PORT_PRC, 1);
+        // Port reset change
+        if (XHCI_REG_RD(regs, XHCI_PORT_PRC)) {
+                // Clear the flag
+                XHCI_REG_WR(regs, XHCI_PORT_PRC, 1);
 
-        uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
-        usb_log_debug2("Detected port reset on port %u, port speed id %u.", port_id, port_speed);
-        // TODO: Assign device slot (specification 4.3.2) 
-    }
+                uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
+                usb_log_debug2("Detected port reset on port %u, port speed id %u.", port_id, port_speed);
+                // TODO: Assign device slot (specification 4.3.2) 
+        }
 
-    // Connection status change
-    if(XHCI_REG_RD(regs, XHCI_PORT_CSC)) {
-        XHCI_REG_WR(regs, XHCI_PORT_CSC, 1);
+        // Connection status change
+        if (XHCI_REG_RD(regs, XHCI_PORT_CSC)) {
+                XHCI_REG_WR(regs, XHCI_PORT_CSC, 1);
 
-        if(XHCI_REG_RD(regs, XHCI_PORT_CCS) == 1) {
-            handle_connected_device(hc, regs, port_id);
-        }
-        else {
-            // Device disconnected
-        }
-    }
-    return EOK;
+                if (XHCI_REG_RD(regs, XHCI_PORT_CCS) == 1) {
+                        handle_connected_device(hc, regs, port_id);
+                } else {
+                        // Device disconnected
+                }
+        }
+
+        return EOK;
 }
 
-int xhci_get_hub_port(xhci_trb_t *trb) {
-    assert(trb);
-    uint8_t port_id = XHCI_QWORD_EXTRACT(trb->parameter, 63, 56);
-    return port_id;   
+int xhci_get_hub_port(xhci_trb_t *trb)
+{
+        assert(trb);
+        uint8_t port_id = XHCI_QWORD_EXTRACT(trb->parameter, 63, 56);
+
+        return port_id;   
 }
 
-int xhci_reset_hub_port(xhci_hc_t* hc, uint8_t port) {
-    usb_log_debug2("Resetting port %u.", port);
-    xhci_port_regs_t regs = hc->op_regs->portrs[port];
-    XHCI_REG_WR(&regs, XHCI_PORT_PR, 1);
-    return EOK;
+int xhci_reset_hub_port(xhci_hc_t* hc, uint8_t port)
+{
+        usb_log_debug2("Resetting port %u.", port);
+        xhci_port_regs_t regs = hc->op_regs->portrs[port];
+        XHCI_REG_WR(&regs, XHCI_PORT_PR, 1);
+
+        return EOK;
 }
 
+
+/**
+ * @}
+ */

uspace/drv/bus/usb/xhci/rh.h

@@ -42 +42 @@
 
 #endif
+
+/**
+ * @}
+ */