Changeset 00aece0 in mainline for uspace/lib/c/include/ipc/nil.h

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/nil.h (modified) (2 diffs)

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

@@ -46 +46 @@
          */
         NET_NIL_DEVICE = NET_NIL_FIRST,
-        /** New device state message.
-         * @see nil_device_state_msg()
-         */
-        NET_NIL_DEVICE_STATE,
-        /** Received packet queue message.
-         * @see nil_received_msg()
-         */
-        NET_NIL_RECEIVED,
         /** Send packet queue message.
          * @see nil_send_msg()
@@ -69 +61 @@
          * @see nil_get_broadcast_addr()
          */
-        NET_NIL_BROADCAST_ADDR,
+        NET_NIL_BROADCAST_ADDR
 } nil_messages;