Changeset 231b3fd in mainline for uspace/lib/nic/src/nic_driver.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/nic/src/nic_driver.c (modified) (7 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -384 +384 @@
  *  @return Current polling mode of the controller
  */
-nic_poll_mode_t nic_query_poll_mode(nic_t *nic_data, struct timeval *period)
+nic_poll_mode_t nic_query_poll_mode(nic_t *nic_data, struct timespec *period)
 {
         if (period)
@@ -400 +400 @@
  */
 errno_t nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode,
-    struct timeval *period)
+    struct timespec *period)
 {
         errno_t rc = EOK;
@@ -408 +408 @@
         if (mode == NIC_POLL_PERIODIC) {
                 if (period) {
-                        memcpy(&nic_data->default_poll_period, period, sizeof(struct timeval));
-                        memcpy(&nic_data->poll_period, period, sizeof(struct timeval));
+                        memcpy(&nic_data->default_poll_period, period, sizeof(struct timespec));
+                        memcpy(&nic_data->poll_period, period, sizeof(struct timespec));
                 } else {
                         rc = EINVAL;
@@ -1030 +1030 @@
  *  @returns Nonzero if t is zero interval
  */
-static int timeval_nonpositive(struct timeval t)
-{
-        return (t.tv_sec <= 0) && (t.tv_usec <= 0);
+static int timespec_nonpositive(struct timespec t)
+{
+        return (t.tv_sec <= 0) && (t.tv_nsec <= 0);
 }
 
@@ -1051 +1051 @@
                 int run = info->run;
                 int running = info->running;
-                struct timeval remaining = nic->poll_period;
+                struct timespec remaining = nic->poll_period;
                 fibril_rwlock_read_unlock(&nic->main_lock);
 
                 if (!running) {
                         remaining.tv_sec = 5;
-                        remaining.tv_usec = 0;
+                        remaining.tv_nsec = 0;
                 }
 
                 /* Wait the period (keep attention to overflows) */
-                while (!timeval_nonpositive(remaining)) {
-                        suseconds_t wait = 0;
+                while (!timespec_nonpositive(remaining)) {
+                        usec_t wait = 0;
                         if (remaining.tv_sec > 0) {
                                 time_t wait_sec = remaining.tv_sec;
@@ -1071 +1071 @@
                                         wait_sec = 5;
 
-                                wait = (suseconds_t) wait_sec * 1000000;
+                                wait = SEC2USEC(wait_sec);
 
                                 remaining.tv_sec -= wait_sec;
                         } else {
-                                wait = remaining.tv_usec;
+                                wait = NSEC2USEC(remaining.tv_nsec);
 
                                 if (wait > 5 * 1000000) {
@@ -1081 +1081 @@
                                 }
 
-                                remaining.tv_usec -= wait;
+                                remaining.tv_nsec -= USEC2NSEC(wait);
                         }
                         fibril_usleep(wait);