Changes in uspace/drv/uhci-hcd/hc.c [563ead9:02cacce] in mainline

File:

• uspace/drv/uhci-hcd/hc.c (modified) (6 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -39 +39 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
+#include <usb_iface.h>
 
 #include "hc.h"
@@ -83 +85 @@
         /* allow access to hc control registers */
         regs_t *io;
-        ret = pio_enable(regs, reg_size, (void **)&io);
+        ret = pio_enable(regs, reg_size, (void**)&io);
         CHECK_RET_RETURN(ret,
             "Failed(%d) to gain access to registers at %p: %s.\n",
@@ -141 +143 @@
         }
 
-        const uint16_t status = pio_read_16(&registers->usbcmd);
+        uint16_t status = pio_read_16(&registers->usbcmd);
         if (status != 0)
                 usb_log_warning("Previous command value: %x.\n", status);
@@ -210 +212 @@
         /* Init USB frame list page*/
         instance->frame_list = get_page();
-        ret = instance->frame_list ? EOK : ENOMEM;
+        ret = instance ? EOK : ENOMEM;
         CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
         usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
@@ -275 +277 @@
                 &instance->transfers_control_slow);
 
-        /*FSBR, This feature is not needed (adds no benefit) and is supposedly
-         * buggy on certain hw, enable at your own risk. */
+        /*FSBR*/
 #ifdef FSBR
         transfer_list_set_next(&instance->transfers_bulk_full,
@@ -427 +428 @@
                 }
 
-                const uintptr_t frame_list =
+                uintptr_t frame_list =
                     pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
                 if (frame_list != addr_to_phys(instance->frame_list)) {