Changes in uspace/drv/nic/rtl8139/general.c [205f1add:7c3fb9b] in mainline

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 timespec *time)
+    const struct timeval *time)
 {
         if (!ta || timer_freq == 0 || !time)
@@ -95 +95 @@
         ta->full_val = seconds_in_reg * tics_per_ms * 1000;
 
-        struct timespec remains = *time;
+        struct timeval remains = *time;
         ta->full_skips = remains.tv_sec / seconds_in_reg;
         remains.tv_sec = remains.tv_sec % seconds_in_reg;
 
-        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;
+        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;
 
                 /* it can be increased above seconds_in_reg again */
@@ -108 +108 @@
         }
 
-        ta->last_val = SEC2MSEC(remains.tv_sec) + NSEC2MSEC(remains.tv_nsec);
+        ta->last_val = remains.tv_sec * 1000 + remains.tv_usec / 1000;
         ta->last_val *= tics_per_ms;