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

Timestamp:

2018-08-25T21:35:26Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

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

uspace/lib/drv/generic/remote_nic.c

@@ -39 +39 @@
 #include <errno.h>
 #include <ipc/services.h>
-#include <sys/time.h>
+#include <time.h>
 #include <macros.h>
 
@@ -1262 +1262 @@
  */
 errno_t nic_poll_get_mode(async_sess_t *dev_sess, nic_poll_mode_t *mode,
-    struct timeval *period)
+    struct timespec *period)
 {
         assert(mode);
@@ -1280 +1280 @@
 
         if (period != NULL)
-                rc = async_data_read_start(exch, period, sizeof(struct timeval));
+                rc = async_data_read_start(exch, period, sizeof(struct timespec));
 
         async_exchange_end(exch);
@@ -1296 +1296 @@
  */
 errno_t nic_poll_set_mode(async_sess_t *dev_sess, nic_poll_mode_t mode,
-    const struct timeval *period)
+    const struct timespec *period)
 {
         async_exch_t *exch = async_exchange_begin(dev_sess);
@@ -1305 +1305 @@
         errno_t rc;
         if (period)
-                rc = async_data_write_start(exch, period, sizeof(struct timeval));
+                rc = async_data_write_start(exch, period, sizeof(struct timespec));
         else
                 rc = EOK;
@@ -2405 +2405 @@
         nic_poll_mode_t mode = NIC_POLL_IMMEDIATE;
         int request_data = IPC_GET_ARG2(*call);
-        struct timeval period = {
+        struct timespec period = {
                 .tv_sec = 0,
-                .tv_usec = 0
+                .tv_nsec = 0
         };
 
@@ -2421 +2421 @@
                 }
 
-                if (max_len != sizeof(struct timeval)) {
+                if (max_len != sizeof(struct timespec)) {
                         async_answer_0(&data, ELIMIT);
                         async_answer_0(call, ELIMIT);
@@ -2428 +2428 @@
 
                 async_data_read_finalize(&data, &period,
-                    sizeof(struct timeval));
+                    sizeof(struct timespec));
         }
 
@@ -2441 +2441 @@
         nic_poll_mode_t mode = IPC_GET_ARG2(*call);
         int has_period = IPC_GET_ARG3(*call);
-        struct timeval period_buf;
-        struct timeval *period = NULL;
+        struct timespec period_buf;
+        struct timespec *period = NULL;
         size_t length;
 
@@ -2453 +2453 @@
                 }
 
-                if (length != sizeof(struct timeval)) {
+                if (length != sizeof(struct timespec)) {
                         async_answer_0(&data, ELIMIT);
                         async_answer_0(call, ELIMIT);