Changeset f9014bc in mainline

Timestamp:

2011-02-09T10:27:44Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f96aefc

Parents:

2964aa87

Message:

Fixes: is_active should compare to 0 conversion to bool does not work as expected

minor refactoring

Location:

uspace/drv/uhci-hcd/uhci_struct

Files:

• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

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

@@ -44 +44 @@
         assert(instance);
 
-        instance->next =
-          0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
 
-        assert(size < 1024);
         instance->status = 0
           | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
           | TD_STATUS_ERROR_ACTIVE;
 
+        assert(size < 1024);
         instance->device = 0
                 | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)

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

@@ -101 +101 @@
 {
         assert(instance);
-        return instance->status & TD_STATUS_ERROR_ACTIVE;
+        return (instance->status & TD_STATUS_ERROR_ACTIVE) != 0;
 }
 #endif