Changeset bd41ac52 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2018-08-25T22:21:25Z (6 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.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (4 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)