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

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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,
-        /** Device has changed address
-         * @see nil_addr_changed_msg()
-         */
-        NET_NIL_ADDR_CHANGED
+        NET_NIL_BROADCAST_ADDR
 } nil_messages;