Changeset eb522e8 in mainline for uspace/drv/ohci/utils/malloc32.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/drv/ohci/utils/malloc32.h (moved) (moved from uspace/srv/net/il/ip/ip_module.c ) (2 diffs)

uspace/drv/ohci/utils/malloc32.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2010 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup ip
+/** @addtogroup drvusbohci
  * @{
  */
+/** @file
+ * @brief OHCI driver
+ */
+#ifndef DRV_OHCI_UTILS_MALLOC32_H
+#define DRV_OHCI_UTILS_MALLOC32_H
 
-/** @file
- * IP standalone module implementation.
- * Contains skeleton module functions mapping.
- * The functions are used by the module skeleton as module specific entry
- * points.
+#include <assert.h>
+#include <malloc.h>
+#include <errno.h>
+#include <mem.h>
+#include <as.h>
+
+/** Get physical address translation
  *
- * @see module.c
+ * @param[in] addr Virtual address to translate
+ * @return Physical address if exists, NULL otherwise.
  */
+static inline uintptr_t addr_to_phys(void *addr)
+{
+        uintptr_t result;
+        int ret = as_get_physical_mapping(addr, &result);
 
-#include <async.h>
-#include <stdio.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <errno.h>
-
-#include <net/modules.h>
-#include <net_interface.h>
-#include <net/packet.h>
-#include <il_local.h>
-
-#include "ip.h"
-#include "ip_module.h"
-
-/** IP module global data. */
-extern ip_globals_t ip_globals;
-
-int
-il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
-        return ip_message_standalone(callid, call, answer, answer_count);
+        if (ret != EOK)
+                return 0;
+        return (result | ((uintptr_t)addr & 0xfff));
 }
-
-int il_module_start_standalone(async_client_conn_t client_connection)
-{
-        ipcarg_t phonehash;
-        int rc;
-        
-        async_set_client_connection(client_connection);
-        ip_globals.net_phone = net_connect_module();
-
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
-        
-        rc = ip_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-        
-        rc = REGISTER_ME(SERVICE_IP, &phonehash);
-        if (rc != EOK)
-                goto out;
-        
-        async_manager();
-
-out:
-        pm_destroy();
-        return rc;
-}
-
-/** @}
+/*----------------------------------------------------------------------------*/
+/** Physical mallocator simulator
+ *
+ * @param[in] size Size of the required memory space
+ * @return Address of the aligned and big enough memory place, NULL on failure.
  */
+static inline void * malloc32(size_t size)
+        { return memalign(size, size); }
+/*----------------------------------------------------------------------------*/
+/** Physical mallocator simulator
+ *
+ * @param[in] addr Address of the place allocated by malloc32
+ */
+static inline void free32(void *addr)
+        { if (addr) free(addr); }
+#endif
+/**
+ * @}
+ */