Changeset 6843a9c in mainline for kernel/arch/mips32/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/mips32/include/mm/km.h (moved) (moved from uspace/srv/net/tl/udp/udp_header.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup udp
+/** @addtogroup mips32mm
  * @{
  */
-
 /** @file
- * UDP header definition.
- * Based on the RFC 768.
  */
 
-#ifndef NET_UDP_HEADER_H_
-#define NET_UDP_HEADER_H_
+#ifndef KERN_mips32_KM_H_
+#define KERN_mips32_KM_H_
 
-#include <sys/types.h>
+#include <typedefs.h>
 
-/** UDP header size in bytes. */
-#define UDP_HEADER_SIZE         sizeof(udp_header_t)
+#define KM_MIPS32_KSEG0_START   UINT32_C(0x80000000)
+#define KM_MIPS32_KSEG0_SIZE    UINT32_C(0x20000000)
 
-/** Type definition of the user datagram header.
- * @see udp_header
- */
-typedef struct udp_header udp_header_t;
+#define KM_MIPS32_KSSEG_START   UINT32_C(0xc0000000)
+#define KM_MIPS32_KSSEG_SIZE    UINT32_C(0x20000000)
 
-/** User datagram header. */
-struct udp_header {
-        uint16_t source_port;
-        uint16_t destination_port;
-        uint16_t total_length;
-        uint16_t checksum;
-} __attribute__ ((packed));
+#define KM_MIPS32_KSEG3_START   UINT32_C(0xe0000000)
+#define KM_MIPS32_KSEG3_SIZE    UINT32_C(0x20000000)
+
+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