Changeset 46c20c8 in mainline for uspace/srv/net/il/ip/ip_module.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• uspace/srv/net/il/ip/ip_module.h (moved) (moved from kernel/arch/ppc32/include/cpuid.h ) (2 diffs)

uspace/srv/net/il/ip/ip_module.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup ip
  * @{
  */
+
 /** @file
+ * IP module functions.
+ * The functions are used as IP module entry points.
  */
 
-#ifndef KERN_ppc32_CPUID_H_
-#define KERN_ppc32_CPUID_H_
+#ifndef NET_IP_MODULE_H_
+#define NET_IP_MODULE_H_
 
-#include <arch/types.h>
+#include <ipc/ipc.h>
 
-typedef struct {
-        uint16_t version;
-        uint16_t revision;
-} __attribute__ ((packed)) cpu_info_t;
-
-static inline void cpu_version(cpu_info_t *info)
-{
-        asm volatile (
-                "mfpvr %0\n"
-                : "=r" (*info)
-        );
-}
+extern int ip_initialize(async_client_conn_t);
+extern int ip_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
+    int *);
 
 #endif