Changeset fd153d3 in mainline


Ignore:
Timestamp:
2011-04-11T13:07:45Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aa9ccf7
Parents:
26d46d2
Message:

OHCI structures use different alignment from OHCI

Location:
uspace/drv/ohci
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/hw_struct/hcca.h

    r26d46d2 rfd153d3  
    4343        uint32_t done_head;
    4444        uint32_t reserved[29];
    45 } __attribute__((packed)) hcca_t;
     45} __attribute__((packed, aligned)) hcca_t;
    4646
    4747#endif

  • uspace/drv/ohci/hw_struct/transfer_descriptor.c

    r26d46d2 rfd153d3  
    5353        }
    5454        if (buffer != NULL) {
     55                assert(size != 0);
    5556                instance->cbp = addr_to_phys(buffer);
    5657                instance->be = addr_to_phys(buffer + size - 1);

  • uspace/drv/ohci/utils/malloc32.h

    r26d46d2 rfd153d3  
    4141#include <as.h>
    4242
    43 #define UHCI_STRCUTURES_ALIGNMENT 16
    4443#define UHCI_REQUIRED_PAGE_SIZE 4096
    4544
    … …  
    6564 */
    6665static inline void * malloc32(size_t size)
    67         { return memalign(UHCI_STRCUTURES_ALIGNMENT, size); }
     66        { return memalign(size, size); }
    6867/*----------------------------------------------------------------------------*/
    6968/** Physical mallocator simulator
Note: See TracChangeset for help on using the changeset viewer.