Changes in uspace/drv/bus/usb/uhci/utils/malloc32.h [8064c2f6:bf9cb2f] in mainline

File:

• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (4 diffs)

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

@@ -36 +36 @@
 
 #include <as.h>
+#include <assert.h>
 #include <ddi.h>
 #include <errno.h>
 #include <malloc.h>
-#include <sys/types.h>
+#include <mem.h>
+#include <unistd.h>
 
-#define UHCI_STRUCTURES_ALIGNMENT 16
+#define UHCI_STRCUTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
 
@@ -54 +56 @@
         if (addr == NULL)
                 return 0;
-
+        
         uintptr_t result;
         const int ret = as_get_physical_mapping(addr, &result);
         if (ret != EOK)
                 return 0;
-
+        
         return result;
 }
@@ -79 +81 @@
         /* Calculate alignment to make sure the block won't cross page
          * boundary */
-        size_t alignment = UHCI_STRUCTURES_ALIGNMENT;
+        size_t alignment = UHCI_STRCUTURES_ALIGNMENT;
         while (alignment < size)
                 alignment *= 2;
@@ -101 +103 @@
 {
         uintptr_t phys;
-        void *address;
-
+        void *address = AS_AREA_ANY;
+        
         const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
             &address);
-
+        
         return ((ret == EOK) ? address : NULL);
 }