More cleanup of minix/com.h.

diff --git a/common/include/minix/com.h b/common/include/minix/com.h
index de555daed9f0dc01f4b9e543ae479640f03ca29e..3bfe6d87c3a35cd5a59b09a240acf596552d123f 100644 (file)
--- a/common/include/minix/com.h
+++ b/common/include/minix/com.h
@@ -245,14 +245,6 @@
  *                        Messages for networking layer                     *
  *===========================================================================*/
 
-/* Message types for network layer requests. This layer acts like a driver. */
-#define NW_OPEN                DEV_OPEN
-#define NW_CLOSE       DEV_CLOSE
-#define NW_READ                DEV_READ
-#define NW_WRITE       DEV_WRITE
-#define NW_IOCTL       DEV_IOCTL
-#define NW_CANCEL      CANCEL
-
 /* Base type for data link layer requests and responses. */
 #define DL_RQ_BASE     0x200           
 #define DL_RS_BASE     0x280           

diff --git a/servers/inet/inet.c b/servers/inet/inet.c
index 40dae5e8fce54a700b088675069e7ef35b0aac1b..bd84a54ca751cbb31f2cadfd3ed62c56c61a3a27 100644 (file)
--- a/servers/inet/inet.c
+++ b/servers/inet/inet.c
@@ -11,22 +11,22 @@ from FS:
 | m_type       |   DEVICE  | PROC_NR | COUNT | POSITION | ADDRESS |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_OPEN      | minor dev | proc nr | mode  |          |         |
+| DEV_OPEN     | minor dev | proc nr | mode  |          |         |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_CLOSE     | minor dev | proc nr |       |          |         |
+| DEV_CLOSE    | minor dev | proc nr |       |          |         |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_IOCTL     | minor dev | proc nr |       | NWIO..   | address |
+| DEV_IOCTL_S  | minor dev | proc nr |       | NWIO..   | address |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_READ      | minor dev | proc nr | count |          | address |
+| DEV_READ_S   | minor dev | proc nr | count |          | address |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_WRITE     | minor dev | proc nr | count |          | address |
+| DEV_WRITE_S  | minor dev | proc nr | count |          | address |
 |_______________|___________|_________|_______|__________|_________|
 |              |           |         |       |          |         |
-| NW_CANCEL    | minor dev | proc nr |       |          |         |
+| CANCEL       | minor dev | proc nr |       |          |         |
 |_______________|___________|_________|_______|__________|_________|
 
 from DL_ETH: