Changeset 46d12fb in mainline

Timestamp:

2011-03-18T21:27:19Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eedac04

Parents:

171cd88

Message:

Refactoring

Don't call addr_to_phys syscall on NULL pointer.

Location:

uspace/drv/uhci-hcd

Files:

• uhci_struct/transfer_descriptor.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/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);