Changeset 231b3fd in mainline for uspace/drv/nic/rtl8139/general.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/drv/nic/rtl8139/general.c (modified) (3 diffs)

uspace/drv/nic/rtl8139/general.c

@@ -85 +85 @@
  */
 errno_t rtl8139_timer_act_init(rtl8139_timer_act_t *ta, uint32_t timer_freq,
-    const struct timeval *time)
+    const struct timespec *time)
 {
         if (!ta || timer_freq == 0 || !time)
@@ -95 +95 @@
         ta->full_val = seconds_in_reg * tics_per_ms * 1000;
 
-        struct timeval remains = *time;
+        struct timespec remains = *time;
         ta->full_skips = remains.tv_sec / seconds_in_reg;
         remains.tv_sec = remains.tv_sec % seconds_in_reg;
 
-        if (remains.tv_usec > RTL8139_USEC_IN_SEC) {
-                remains.tv_sec += remains.tv_usec / RTL8139_USEC_IN_SEC;
-                remains.tv_usec = remains.tv_usec % RTL8139_USEC_IN_SEC;
+        if (NSEC2USEC(remains.tv_nsec) > RTL8139_USEC_IN_SEC) {
+                remains.tv_sec += NSEC2USEC(remains.tv_nsec) / RTL8139_USEC_IN_SEC;
+                remains.tv_nsec = NSEC2USEC(remains.tv_nsec) % RTL8139_USEC_IN_SEC;
 
                 /* it can be increased above seconds_in_reg again */
@@ -108 +108 @@
         }
 
-        ta->last_val = remains.tv_sec * 1000 + remains.tv_usec / 1000;
+        ta->last_val = SEC2MSEC(remains.tv_sec) + NSEC2MSEC(remains.tv_nsec);
         ta->last_val *= tics_per_ms;