Changeset 7943c43 in mainline for uspace/drv/bus/usb/uhci/utils/malloc32.h

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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:

Merge mainline changes.

File:

• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (1 diff)

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -98 +98 @@
 static inline void * get_page(void)
 {
-        void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
-        if (free_address == 0)
+        void *address = as_area_create((void *) -1, UHCI_REQUIRED_PAGE_SIZE,
+            AS_AREA_READ | AS_AREA_WRITE);
+        if (address == (void *) -1)
                 return NULL;
-        void *address = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
-                  AS_AREA_READ | AS_AREA_WRITE);
-        if (address != free_address)
-                return NULL;
+        
         return address;
 }