Changeset bd41ac52 in mainline for uspace/drv/nic

Timestamp:

2018-08-25T22:21:25Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (4 diffs)
• rtl8139/driver.c (modified) (2 diffs)
• rtl8139/general.c (modified) (3 diffs)
• rtl8139/general.h (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -327 +327 @@
 }
 
-static uint16_t e1000_calculate_itr_interval_from_usecs(suseconds_t useconds)
+static uint16_t e1000_calculate_itr_interval_from_usecs(usec_t useconds)
 {
         return useconds * 4;
@@ -1299 +1299 @@
 }
 
-/** Calculates ITR register interrupt from timeval structure
+/** Calculates ITR register interrupt from timespec structure
  *
  * @param period Period
  *
  */
-static uint16_t e1000_calculate_itr_interval(const struct timeval *period)
+static uint16_t e1000_calculate_itr_interval(const struct timespec *period)
 {
         // TODO: use also tv_sec
-        return e1000_calculate_itr_interval_from_usecs(period->tv_usec);
+        return e1000_calculate_itr_interval_from_usecs(NSEC2USEC(period->tv_nsec));
 }
 
@@ -1321 +1321 @@
  */
 static errno_t e1000_poll_mode_change(nic_t *nic, nic_poll_mode_t mode,
-    const struct timeval *period)
+    const struct timespec *period)
 {
         assert(nic);
@@ -2182 +2182 @@
                 goto err_rx_structure;
 
-        struct timeval period;
+        struct timespec period;
         period.tv_sec = 0;
-        period.tv_usec = E1000_DEFAULT_INTERRUPT_INTERVAL_USEC;
+        period.tv_nsec = USEC2NSEC(E1000_DEFAULT_INTERRUPT_INTERVAL_USEC);
         rc = nic_report_poll_mode(nic, NIC_POLL_PERIODIC, &period);
         if (rc != EOK)

uspace/drv/nic/rtl8139/driver.c

@@ -313 +313 @@
 
 static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
-    const struct timeval *period);
+    const struct timespec *period);
 static void rtl8139_poll(nic_t *nic_data);
 
@@ -2068 +2068 @@
  */
 static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
-    const struct timeval *period)
+    const struct timespec *period)
 {
         assert(nic_data);

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;
 

uspace/drv/nic/rtl8139/general.h

@@ -36 +36 @@
 
 #include <stddef.h>
+#include <stdint.h>
 #include <time.h>
 
@@ -62 +63 @@
     size_t);
 extern errno_t rtl8139_timer_act_init(rtl8139_timer_act_t *, uint32_t,
-    const struct timeval *);
+    const struct timespec *);
 extern int rtl8139_timer_act_step(rtl8139_timer_act_t *, uint32_t *);