Changeset 4687a26c in mainline for uspace/lib/c/include/ipc/net_net.h

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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/lib/c/include/ipc/net_net.h (moved) (moved from uspace/lib/net/include/net_net_messages.h ) (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>
 
-#include <net_messages.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;