Changeset 153cc76a in mainline for uspace/drv/bus/usb/uhci/utils/malloc32.h
- Timestamp:
- 2011-12-23T16:42:22Z (13 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/uhci/utils/malloc32.h
r4291215 r153cc76a 54 54 if (addr == NULL) 55 55 return 0; 56 56 57 57 uintptr_t result; 58 58 const int ret = as_get_physical_mapping(addr, &result); 59 59 if (ret != EOK) 60 60 return 0; 61 return (result | ((uintptr_t)addr & 0xfff)); 61 62 return result; 62 63 } 63 64 /*----------------------------------------------------------------------------*/ … … 97 98 static inline void * get_page(void) 98 99 { 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) 101 103 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 106 105 return address; 107 106 }
Note:
See TracChangeset
for help on using the changeset viewer.