Changeset 6843a9c in mainline for kernel/arch/arm32/include/mm/km.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/arm32/include/mm/km.h (moved) (moved from uspace/lib/net/include/tl_remote.h ) (2 diffs)

kernel/arch/arm32/include/mm/km.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup arm32mm
  * @{
  */
-
 /** @file
- * Transport layer module interface for the underlying internetwork layer.
  */
 
-#ifndef LIBNET_TL_REMOTE_H_
-#define LIBNET_TL_REMOTE_H_
+#ifndef KERN_arm32_KM_H_
+#define KERN_arm32_KM_H_
 
-#include <ipc/services.h>
-#include <ipc/tl.h>
-#include <generic.h>
-#include <net/device.h>
-#include <net/packet.h>
-#include <packet_client.h>
-#include <async.h>
+#include <typedefs.h>
 
-/** @name Transport layer module interface
- * This interface is used by other modules.
+#define KM_ARM32_IDENTITY_START         UINT32_C(0x80000000)
+#define KM_ARM32_IDENTITY_SIZE          UINT32_C(0x70000000)
+
+#define KM_ARM32_NON_IDENTITY_START     UINT32_C(0xf0000000)
+/*
+ * The last virtual megabyte contains the high exception vectors (0xFFFF0000).
+ * Do not include this range into kernel non-identity.
  */
-/*@{*/
+#define KM_ARM32_NON_IDENTITY_SIZE      UINT32_C(0x0ff00000)
 
-extern int tl_received_msg(async_sess_t *, nic_device_id_t, packet_t *,
-    services_t, services_t);
-
-/*@}*/
+extern void km_identity_arch_init(void);
+extern void km_non_identity_arch_init(void);
+extern bool km_is_non_identity_arch(uintptr_t);
 
 #endif