Changeset 6991188 in mainline for uspace/drv/ohci/hw_struct

Timestamp:

2011-04-11T13:40:00Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d91645ab

Parents:

1a46610 (diff), 9f104af4 (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:

OHCI prototype works (INT transfers too)

Tested on vbox 4.0.4, MS mouse and Logitech keyboard work

Location:

uspace/drv/ohci/hw_struct

Files:

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

uspace/drv/ohci/hw_struct/hcca.h

@@ -43 +43 @@
         uint32_t done_head;
         uint32_t reserved[29];
-} __attribute__((packed)) hcca_t;
+} __attribute__((packed, aligned)) hcca_t;
 
 #endif

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -53 +53 @@
         }
         if (buffer != NULL) {
+                assert(size != 0);
                 instance->cbp = addr_to_phys(buffer);
                 instance->be = addr_to_phys(buffer + size - 1);

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -86 +86 @@
         int cc = (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         /* something went wrong, error code is set */
-        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2 && cc != CC_NOERROR) {
+        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2) {
                 return true;
         }