Changeset bd41ac52 in mainline for uspace/lib/nic/src/nic_impl.c

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.

File:

• uspace/lib/nic/src/nic_impl.c (modified) (4 diffs)

uspace/lib/nic/src/nic_impl.c

@@ -121 +121 @@
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
-                    sizeof(struct timeval));
+                    sizeof(struct timespec));
                 if (rc != EOK) {
                         /*
@@ -714 +714 @@
  */
 errno_t nic_poll_get_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t *mode, struct timeval *period)
+    nic_poll_mode_t *mode, struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         fibril_rwlock_read_lock(&nic_data->main_lock);
         *mode = nic_data->poll_mode;
-        memcpy(period, &nic_data->poll_period, sizeof(struct timeval));
+        memcpy(period, &nic_data->poll_period, sizeof(struct timespec));
         fibril_rwlock_read_unlock(&nic_data->main_lock);
         return EOK;
@@ -737 +737 @@
  */
 errno_t nic_poll_set_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t mode, const struct timeval *period)
+    nic_poll_mode_t mode, const struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
@@ -753 +753 @@
                 if (period == NULL)
                         return EINVAL;
-                if (period->tv_sec == 0 && period->tv_usec == 0)
+                if (period->tv_sec == 0 && period->tv_nsec == 0)
                         return EINVAL;
-                if (period->tv_sec < 0 || period->tv_usec < 0)
+                if (period->tv_sec < 0 || period->tv_nsec < 0)
                         return EINVAL;
         }