Changeset b4b534ac in mainline for uspace/lib/usbhost/include/usb/host/utils/malloc32.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbhost/include/usb/host/utils/malloc32.h (moved) (moved from uspace/drv/bus/usb/ohci/utils/malloc32.h ) (5 diffs)

uspace/lib/usbhost/include/usb/host/utils/malloc32.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jan Vesely
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbohci
+/** @addtogroup drvusbehci
  * @{
  */
 /** @file
- * @brief OHCI driver
+ * @brief EHCI driver
  */
-#ifndef DRV_OHCI_UTILS_MALLOC32_H
-#define DRV_OHCI_UTILS_MALLOC32_H
+#ifndef DRV_EHCI_UTILS_MALLOC32_H
+#define DRV_EHCI_UTILS_MALLOC32_H
 
-#include <assert.h>
-#include <malloc.h>
-#include <unistd.h>
+#include <align.h>
+#include <as.h>
+#include <ddi.h>
 #include <errno.h>
-#include <mem.h>
-#include <as.h>
+#include <stdlib.h>
+#include <sys/types.h>
 
 /* Generic TDs and EDs require 16byte alignment,
@@ -46 +46 @@
  * buffers do not have to be aligned.
  */
-#define OHCI_ALIGN 32
+#define EHCI_ALIGN   32
+
+#define EHCI_REQUIRED_PAGE_SIZE   4096
 
 /** Get physical address translation
@@ -70 +72 @@
  */
 static inline void * malloc32(size_t size)
-        { return memalign(OHCI_ALIGN, size); }
+{
+        uintptr_t phys;
+        void *address = AS_AREA_ANY;
+        size_t real_size = ALIGN_UP(size, PAGE_SIZE);
+
+        const int ret = dmamem_map_anonymous(real_size,
+            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
+            &address);
+
+        if (ret == EOK) {
+                /* Poison, accessing it should be enough to make sure
+                 * the location is mapped, but poison works better */
+                memset(address, 0x5, real_size);
+                return address;
+        }
+        return NULL;
+}
 
 /** Physical mallocator simulator
@@ -77 +95 @@
  */
 static inline void free32(void *addr)
-        { free(addr); }
+{
+        dmamem_unmap_anonymous(addr);
+}
+
+/** Create 4KB page mapping
+ *
+ * @return Address of the mapped page, NULL on failure.
+ */
+static inline void *get_page()
+{
+        return malloc32(PAGE_SIZE);
+}
+
+static inline void return_page(void *page)
+{
+        free32(page);
+}
+
+
 #endif
 /**