Ignore:
Timestamp:
2011-12-23T16:42:22Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7e1b130
Parents:
4291215 (diff), 2f0dd2a (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:

Mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/uhci/utils/malloc32.h

    r4291215 r153cc76a  
    5454        if (addr == NULL)
    5555                return 0;
    56 
     56       
    5757        uintptr_t result;
    5858        const int ret = as_get_physical_mapping(addr, &result);
    5959        if (ret != EOK)
    6060                return 0;
    61         return (result | ((uintptr_t)addr & 0xfff));
     61       
     62        return result;
    6263}
    6364/*----------------------------------------------------------------------------*/
     
    9798static inline void * get_page(void)
    9899{
    99         void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
    100         if (free_address == 0)
     100        void *address = as_area_create((void *) -1, UHCI_REQUIRED_PAGE_SIZE,
     101            AS_AREA_READ | AS_AREA_WRITE);
     102        if (address == (void *) -1)
    101103                return NULL;
    102         void *address = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
    103                   AS_AREA_READ | AS_AREA_WRITE);
    104         if (address != free_address)
    105                 return NULL;
     104       
    106105        return address;
    107106}
Note: See TracChangeset for help on using the changeset viewer.