Changeset 6843a9c in mainline for kernel/arch/sparc64/include/mm/sun4u/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/sparc64/include/mm/sun4u/km.h (moved) (moved from uspace/lib/c/include/net/modules.h ) (2 diffs)

kernel/arch/sparc64/include/mm/sun4u/km.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup sparc64mm
  * @{
  */
-
 /** @file
- * Generic module functions.
- *
- * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
- * FUNCTIONALITY OR VIA INTEGRATING ITS FUNCTIONALITY MORE TIGHTLY WITH THE REST
- * OF THE SYSTEM.
  */
 
-#ifndef LIBC_MODULES_H_
-#define LIBC_MODULES_H_
+#ifndef KERN_sparc64_sun4u_KM_H_
+#define KERN_sparc64_sun4u_KM_H_
 
-#include <async.h>
-#include <ipc/services.h>
-#include <sys/time.h>
+#include <typedefs.h>
 
-/** Connect to module function type definition.
+/*
+ * Be conservative and assume the 44-bit virtual address width as found
+ * on the UltraSPARC CPU, even when running on a newer CPU, such as
+ * UltraSPARC III, which has the full 64-bit virtual address width.
  *
- * @return Session to the service.
- *
+ * Do not use the 4 GiB area on either side of the VA hole to meet the
+ * limitations of the UltraSPARC CPU.
  */
-typedef async_sess_t *connect_module_t(services_t);
 
-extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
-extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t);
-extern async_sess_t *connect_to_service(services_t);
-extern int data_reply(void *, size_t);
-extern void refresh_answer(ipc_call_t *, size_t *);
+#define KM_SPARC64_US_IDENTITY_START            UINT64_C(0x0000000000000000)
+#define KM_SPARC64_US_IDENTITY_SIZE             UINT64_C(0x000007ff00000000)
+
+#define KM_SPARC64_US_NON_IDENTITY_START        UINT64_C(0xfffff80100000000)
+#define KM_SPARC64_US_NON_IDENTITY_SIZE         UINT64_C(0x000007ff00000000)
+
+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