Changeset ab87db5 in mainline for uspace/drv/nic

Timestamp:

2019-02-23T17:16:01Z (7 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

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• ne2k/ne2k.c (modified) (2 diffs)
• rtl8139/driver.c (modified) (1 diff)
• rtl8169/driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -1244 +1244 @@
     ddf_dev_t *dev)
 {
-        uint32_t icr = (uint32_t) IPC_GET_ARG2(*icall);
+        uint32_t icr = (uint32_t) ipc_get_arg2(icall);
         nic_t *nic = NIC_DATA_DEV(dev);
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);

uspace/drv/nic/ne2k/ne2k.c

@@ -52 +52 @@
  *
  */
-#define IRQ_GET_ISR(call)  ((int) IPC_GET_ARG2(call))
+#define IRQ_GET_ISR(call)  ((int) ipc_get_arg2(&call))
 
 /** Return the TSR from the interrupt call.
@@ -59 +59 @@
  *
  */
-#define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
+#define IRQ_GET_TSR(call)  ((int) ipc_get_arg3(&call))
 
 #define DRIVER_DATA(dev) ((nic_t *) ddf_dev_data_get(dev))

uspace/drv/nic/rtl8139/driver.c

@@ -827 +827 @@
         assert(icall);
 
-        uint16_t isr = (uint16_t) IPC_GET_ARG2(*icall);
+        uint16_t isr = (uint16_t) ipc_get_arg2(icall);
         nic_t *nic_data = nic_get_from_ddf_dev(dev);
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);

uspace/drv/nic/rtl8169/driver.c

@@ -1038 +1038 @@
         assert(icall);
 
-        uint16_t isr = (uint16_t) IPC_GET_ARG2(*icall) & INT_KNOWN;
+        uint16_t isr = (uint16_t) ipc_get_arg2(icall) & INT_KNOWN;
         nic_t *nic_data = nic_get_from_ddf_dev(dev);
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);