Changeset ab87db5 in mainline for uspace/lib/drv/generic/remote_nic.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/lib/drv/generic/remote_nic.c (modified) (25 diffs)

uspace/lib/drv/generic/remote_nic.c

@@ -1010 +1010 @@
         async_wait_for(message_id, &res);
 
-        *id = IPC_GET_ARG1(result);
+        *id = ipc_get_arg1(&result);
         return res;
 }
@@ -1385 +1385 @@
         assert(nic_iface->set_state);
 
-        nic_device_state_t state = (nic_device_state_t) IPC_GET_ARG2(*call);
+        nic_device_state_t state = (nic_device_state_t) ipc_get_arg2(call);
 
         errno_t rc = nic_iface->set_state(dev, state);
@@ -1569 +1569 @@
         }
 
-        int speed = (int) IPC_GET_ARG2(*call);
-        nic_channel_mode_t duplex = (nic_channel_mode_t) IPC_GET_ARG3(*call);
-        nic_role_t role = (nic_role_t) IPC_GET_ARG4(*call);
+        int speed = (int) ipc_get_arg2(call);
+        nic_channel_mode_t duplex = (nic_channel_mode_t) ipc_get_arg3(call);
+        nic_role_t role = (nic_role_t) ipc_get_arg4(call);
 
         errno_t rc = nic_iface->set_operation_mode(dev, speed, duplex, role);
@@ -1586 +1586 @@
         }
 
-        uint32_t advertisement = (uint32_t) IPC_GET_ARG2(*call);
+        uint32_t advertisement = (uint32_t) ipc_get_arg2(call);
 
         errno_t rc = nic_iface->autoneg_enable(dev, advertisement);
@@ -1664 +1664 @@
         }
 
-        int allow_send = (int) IPC_GET_ARG2(*call);
-        int allow_receive = (int) IPC_GET_ARG3(*call);
-        uint16_t pause = (uint16_t) IPC_GET_ARG4(*call);
+        int allow_send = (int) ipc_get_arg2(call);
+        int allow_receive = (int) ipc_get_arg3(call);
+        uint16_t pause = (uint16_t) ipc_get_arg4(call);
 
         errno_t rc = nic_iface->set_pause(dev, allow_send, allow_receive,
@@ -1682 +1682 @@
         }
 
-        size_t max_count = IPC_GET_ARG2(*call);
+        size_t max_count = ipc_get_arg2(call);
         nic_address_t *address_list = NULL;
 
@@ -1733 +1733 @@
 
         size_t length;
-        nic_unicast_mode_t mode = IPC_GET_ARG2(*call);
-        size_t address_count = IPC_GET_ARG3(*call);
+        nic_unicast_mode_t mode = ipc_get_arg2(call);
+        size_t address_count = ipc_get_arg3(call);
         nic_address_t *address_list = NULL;
 
@@ -1785 +1785 @@
         }
 
-        size_t max_count = IPC_GET_ARG2(*call);
+        size_t max_count = ipc_get_arg2(call);
         nic_address_t *address_list = NULL;
 
@@ -1835 +1835 @@
         nic_iface_t *nic_iface = (nic_iface_t *) iface;
 
-        nic_multicast_mode_t mode = IPC_GET_ARG2(*call);
-        size_t address_count = IPC_GET_ARG3(*call);
+        nic_multicast_mode_t mode = ipc_get_arg2(call);
+        size_t address_count = ipc_get_arg3(call);
         nic_address_t *address_list = NULL;
 
@@ -1903 +1903 @@
         }
 
-        nic_broadcast_mode_t mode = IPC_GET_ARG2(*call);
+        nic_broadcast_mode_t mode = ipc_get_arg2(call);
 
         errno_t rc = nic_iface->broadcast_set_mode(dev, mode);
@@ -1933 +1933 @@
         }
 
-        uint32_t mode = IPC_GET_ARG2(*call);
+        uint32_t mode = ipc_get_arg2(call);
 
         errno_t rc = nic_iface->defective_set_mode(dev, mode);
@@ -1948 +1948 @@
         }
 
-        size_t max_count = IPC_GET_ARG2(*call);
+        size_t max_count = ipc_get_arg2(call);
         nic_address_t *address_list = NULL;
 
@@ -1998 +1998 @@
 
         size_t length;
-        size_t address_count = IPC_GET_ARG2(*call);
+        size_t address_count = ipc_get_arg2(call);
         nic_address_t *address_list = NULL;
 
@@ -2081 +2081 @@
         nic_vlan_mask_t vlan_mask;
         nic_vlan_mask_t *vlan_mask_pointer = NULL;
-        bool vlan_mask_set = (bool) IPC_GET_ARG2(*call);
+        bool vlan_mask_set = (bool) ipc_get_arg2(call);
 
         if (vlan_mask_set) {
@@ -2124 +2124 @@
         }
 
-        uint16_t tag = (uint16_t) IPC_GET_ARG2(*call);
-        bool add = (int) IPC_GET_ARG3(*call);
-        bool strip = (int) IPC_GET_ARG4(*call);
+        uint16_t tag = (uint16_t) ipc_get_arg2(call);
+        bool add = (int) ipc_get_arg3(call);
+        bool strip = (int) ipc_get_arg4(call);
 
         errno_t rc = nic_iface->vlan_set_tag(dev, tag, add, strip);
@@ -2137 +2137 @@
         nic_iface_t *nic_iface = (nic_iface_t *) iface;
 
-        int send_data = (int) IPC_GET_ARG3(*call);
+        int send_data = (int) ipc_get_arg3(call);
         ipc_call_t data;
 
@@ -2175 +2175 @@
 
         nic_wv_id_t id = 0;
-        nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call);
+        nic_wv_type_t type = (nic_wv_type_t) ipc_get_arg2(call);
 
         errno_t rc = nic_iface->wol_virtue_add(dev, type, virtue, length, &id);
@@ -2192 +2192 @@
         }
 
-        nic_wv_id_t id = (nic_wv_id_t) IPC_GET_ARG2(*call);
+        nic_wv_id_t id = (nic_wv_id_t) ipc_get_arg2(call);
 
         errno_t rc = nic_iface->wol_virtue_remove(dev, id);
@@ -2208 +2208 @@
         }
 
-        nic_wv_id_t id = (nic_wv_id_t) IPC_GET_ARG2(*call);
-        size_t max_length = IPC_GET_ARG3(*call);
+        nic_wv_id_t id = (nic_wv_id_t) ipc_get_arg2(call);
+        size_t max_length = ipc_get_arg3(call);
         nic_wv_type_t type = NIC_WV_NONE;
         size_t length = 0;
@@ -2259 +2259 @@
         }
 
-        nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call);
-        size_t max_count = IPC_GET_ARG3(*call);
+        nic_wv_type_t type = (nic_wv_type_t) ipc_get_arg2(call);
+        size_t max_count = ipc_get_arg3(call);
         size_t count = 0;
         nic_wv_id_t *id_list = NULL;
@@ -2310 +2310 @@
 
         int count = -1;
-        nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call);
+        nic_wv_type_t type = (nic_wv_type_t) ipc_get_arg2(call);
 
         errno_t rc = nic_iface->wol_virtue_get_caps(dev, type, &count);
@@ -2325 +2325 @@
         }
 
-        size_t max_length = (size_t) IPC_GET_ARG2(*call);
+        size_t max_length = (size_t) ipc_get_arg2(call);
         size_t frame_length = 0;
         nic_wv_type_t type = NIC_WV_NONE;
@@ -2386 +2386 @@
         }
 
-        uint32_t mask = (uint32_t) IPC_GET_ARG2(*call);
-        uint32_t active = (uint32_t) IPC_GET_ARG3(*call);
+        uint32_t mask = (uint32_t) ipc_get_arg2(call);
+        uint32_t active = (uint32_t) ipc_get_arg3(call);
 
         errno_t rc = nic_iface->offload_set(dev, mask, active);
@@ -2403 +2403 @@
 
         nic_poll_mode_t mode = NIC_POLL_IMMEDIATE;
-        int request_data = IPC_GET_ARG2(*call);
+        int request_data = ipc_get_arg2(call);
         struct timespec period = {
                 .tv_sec = 0,
@@ -2438 +2438 @@
         nic_iface_t *nic_iface = (nic_iface_t *) iface;
 
-        nic_poll_mode_t mode = IPC_GET_ARG2(*call);
-        int has_period = IPC_GET_ARG3(*call);
+        nic_poll_mode_t mode = ipc_get_arg2(call);
+        int has_period = ipc_get_arg3(call);
         struct timespec period_buf;
         struct timespec *period = NULL;