Changeset 995689d1 in mainline

Timestamp:

2010-10-15T19:19:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f5a3479

Parents:

3a5d892f

Message:

Move network interface common module messages definitions to standard library.

Location:

uspace/lib

Files:

• c/include/ipc/netif.h (moved) (moved from uspace/lib/net/include/netif_messages.h ) (4 diffs)
• net/netif/netif_local.c (modified) (2 diffs)
• net/netif/netif_remote.c (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup netif
+/** @addtogroup libc
  * @{
  */
@@ -35 +35 @@
  */
 
-#ifndef __NET_NETIF_MESSAGES_H__
-#define __NET_NETIF_MESSAGES_H__
+#ifndef LIBC_NETIF_MESSAGES_H_
+#define LIBC_NETIF_MESSAGES_H_
 
 #include <ipc/ipc.h>
 #include <ipc/net.h>
 
-/** Network interface common module messages.
- */
+/** Network interface common module messages. */
 typedef enum {
         /** Probe device message.
-         *  @see netif_probe_req()
+         * @see netif_probe_req()
          */
         NET_NETIF_PROBE = NET_NETIF_FIRST,
         /** Send packet message.
-         *  @see netif_send_msg()
+         * @see netif_send_msg()
          */
         NET_NETIF_SEND,
         /** Start device message.
-         *  @see netif_start_req()
+         * @see netif_start_req()
          */
         NET_NETIF_START,
         /** Get device usage statistics message.
-         *  @see netif_stats_req()
+         * @see netif_stats_req()
          */
         NET_NETIF_STATS,
         /** Stop device message.
-         *  @see netif_stop_req()
+         * @see netif_stop_req()
          */
         NET_NETIF_STOP,
         /** Get device address message.
-         *  @see netif_get_addr_req()
+         * @see netif_get_addr_req()
          */
         NET_NETIF_GET_ADDR,
 } netif_messages;
 
-/** @name Network interface specific message parameters definitions
- */
+/** @name Network interface specific message parameters definitions */
 /*@{*/
 
@@ -78 +76 @@
  */
 #define NETIF_GET_IRQ(call) \
-        ({int irq = (int) IPC_GET_ARG2(*call); irq;})
+        ({ \
+                int irq = (int) IPC_GET_ARG2(*call); \
+                irq; \
+        })
 
 /** Return the input/output address message parameter.
@@ -84 +85 @@
  */
 #define NETIF_GET_IO(call) \
-        ({int io = (int) IPC_GET_ARG3(*call); io;})
+        ({ \
+                int io = (int) IPC_GET_ARG3(*call); \
+                io; \
+        })
 
 /*@}*/

uspace/lib/net/netif/netif_local.c

@@ -42 +42 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/netif.h>
 #include <err.h>
 
@@ -53 +54 @@
 #include <nil_interface.h>
 #include <netif_local.h>
-#include <netif_messages.h>
 #include <netif_interface.h>
 

uspace/lib/net/netif/netif_remote.c

@@ -36 +36 @@
 
 #include <ipc/services.h>
+#include <ipc/netif.h>
 
 #include <net/modules.h>
@@ -43 +44 @@
 #include <net/device.h>
 #include <netif_remote.h>
-#include <netif_messages.h>
 #include <generic.h>