Changes in / [3746bfe:eedac04] in mainline

Location:

uspace/drv/uhci-hcd

Files:

• transfers.c (deleted)
• uhci_struct/transfer_descriptor.c (modified) (2 diffs)
• utils/device_keeper.c (modified) (2 diffs)
• utils/malloc32.h (modified) (1 diff)

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -69 +69 @@
             || (pid == USB_PID_OUT));
 
+        const uint32_t next_pa = addr_to_phys(next);
+        assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa);
+
         instance->next = 0
             | LINK_POINTER_VERTICAL_FLAG
-            | ((next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG);
+            | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
 
         instance->status = 0
@@ -90 +93 @@
             | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
-        instance->buffer_ptr = 0;
-
-        if (size) {
-                instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
-        }
+        instance->buffer_ptr = addr_to_phys(buffer);
 
         usb_log_debug2("Created TD(%p): %X:%X:%X:%X(%p).\n",

uspace/drv/uhci-hcd/utils/device_keeper.c

@@ -179 +179 @@
         } else {
                 if (toggle) {
-                        instance->devices[target.address].toggle_status |= (1 << target.endpoint);
+                        instance->devices[target.address].toggle_status |=
+                            (1 << target.endpoint);
                 } else {
-                        instance->devices[target.address].toggle_status &= ~(1 << target.endpoint);
+                        instance->devices[target.address].toggle_status &=
+                            ~(1 << target.endpoint);
                 }
                 ret = EOK;
@@ -201 +203 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_address_t new_address = instance->last_address + 1;
-        while (instance->devices[new_address].occupied) {
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1;
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
                         return ENOSPC;
                 }
-                if (new_address == USB11_ADDRESS_MAX)
-                        new_address = 1;
-                ++new_address;
-        }
+        } while (instance->devices[new_address].occupied);
 
         assert(new_address != USB_ADDRESS_DEFAULT);

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -50 +50 @@
 static inline uintptr_t addr_to_phys(void *addr)
 {
+        if (addr == NULL)
+                return 0;
+
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);