Changeset 3a5d892f in mainline

Timestamp:

2010-10-15T19:13:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

995689d1

Parents:

779a47d

Message:

Move networking subsystem central module messages definitions to standard library.

Location:

uspace

Files:

• lib/c/include/ipc/net_net.h (moved) (moved from uspace/lib/net/include/net_net_messages.h ) (1 diff)
• lib/net/generic/net_remote.c (modified) (2 diffs)
• srv/net/net/net.c (modified) (2 diffs)
• srv/net/netstart/netstart.c (modified) (1 diff)

uspace/lib/c/include/ipc/net_net.h

@@ -27 +27 @@
  */
 
-/** @addtogroup net
- *  @{
+/** @addtogroup libc
+ * @{
  */
 
 /** @file
- *  Networking subsystem central module messages.
- *  @see net_interface.h
+ * Networking subsystem central module messages.
+ * @see net_interface.h
  */
 
-#ifndef __NET_NET_MESSAGES_H__
-#define __NET_NET_MESSAGES_H__
+#ifndef LIBC_NET_NET_MESSAGES_H_
+#define LIBC_NET_NET_MESSAGES_H_
 
 #include <ipc/ipc.h>
 #include <ipc/net.h>
 
-/** Networking subsystem central module messages.
- */
-typedef enum{
+/** Networking subsystem central module messages. */
+typedef enum {
         /** Returns the general configuration
-         *  @see net_get_conf_req()
+         * @see net_get_conf_req()
          */
         NET_NET_GET_CONF = NET_FIRST,
         /** Returns the device specific configuration
-         *  @see net_get_device_conf_req()
+         * @see net_get_device_conf_req()
          */
         NET_NET_GET_DEVICE_CONF,
-        /** Starts the networking stack.
-         */
+        /** Starts the networking stack. */
         NET_NET_STARTUP,
 } net_messages;

uspace/lib/net/generic/net_remote.c

@@ -37 +37 @@
 
 #include <ipc/services.h>
+#include <ipc/net_net.h>
 
 #include <malloc.h>
@@ -45 +46 @@
 #include <net_interface.h>
 #include <adt/measured_strings.h>
-#include <net_net_messages.h>
 
 int net_connect_module(services_t service)

uspace/srv/net/net/net.c

@@ -48 +48 @@
 #include <ipc/services.h>
 #include <ipc/net.h>
+#include <ipc/net_net.h>
 #include <ipc/il.h>
 
@@ -61 +62 @@
 #include <net_interface.h>
 #include <ip_interface.h>
-#include <net_net_messages.h>
 
 #include "net.h"

uspace/srv/net/netstart/netstart.c

@@ -48 +48 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net_net.h>
 
 #include <net/modules.h>
-#include <net_net_messages.h>
 
 #include "self_test.h"