Changeset b8cab5c in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-05-27T07:10:12Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

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"
@@ -85 +83 @@
         /* 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",
@@ -143 +141 @@
         }
 
-        uint16_t status = pio_read_16(&registers->usbcmd);
+        const uint16_t status = pio_read_16(&registers->usbcmd);
         if (status != 0)
                 usb_log_warning("Previous command value: %x.\n", status);
@@ -212 +210 @@
         /* Init USB frame list page*/
         instance->frame_list = get_page();
-        ret = instance ? EOK : ENOMEM;
+        ret = instance->frame_list ? 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);
@@ -277 +275 @@
                 &instance->transfers_control_slow);
 
-        /*FSBR*/
+        /*FSBR, This feature is not needed (adds no benefit) and is supposedly
+         * buggy on certain hw, enable at your own risk. */
 #ifdef FSBR
         transfer_list_set_next(&instance->transfers_bulk_full,
@@ -428 +427 @@
                 }
 
-                uintptr_t frame_list =
+                const uintptr_t frame_list =
                     pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
                 if (frame_list != addr_to_phys(instance->frame_list)) {