Changeset bd41ac52 in mainline for uspace/lib/drv

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/lib/drv

Files:

• generic/remote_nic.c (modified) (10 diffs)
• include/nic_iface.h (modified) (1 diff)
• include/ops/nic.h (modified) (2 diffs)
• include/pci_dev_iface.h (modified) (1 diff)

uspace/lib/drv/generic/remote_nic.c

@@ -39 +39 @@
 #include <errno.h>
 #include <ipc/services.h>
-#include <sys/time.h>
+#include <time.h>
 #include <macros.h>
 
@@ -1262 +1262 @@
  */
 errno_t nic_poll_get_mode(async_sess_t *dev_sess, nic_poll_mode_t *mode,
-    struct timeval *period)
+    struct timespec *period)
 {
         assert(mode);
@@ -1280 +1280 @@
 
         if (period != NULL)
-                rc = async_data_read_start(exch, period, sizeof(struct timeval));
+                rc = async_data_read_start(exch, period, sizeof(struct timespec));
 
         async_exchange_end(exch);
@@ -1296 +1296 @@
  */
 errno_t nic_poll_set_mode(async_sess_t *dev_sess, nic_poll_mode_t mode,
-    const struct timeval *period)
+    const struct timespec *period)
 {
         async_exch_t *exch = async_exchange_begin(dev_sess);
@@ -1305 +1305 @@
         errno_t rc;
         if (period)
-                rc = async_data_write_start(exch, period, sizeof(struct timeval));
+                rc = async_data_write_start(exch, period, sizeof(struct timespec));
         else
                 rc = EOK;
@@ -2405 +2405 @@
         nic_poll_mode_t mode = NIC_POLL_IMMEDIATE;
         int request_data = IPC_GET_ARG2(*call);
-        struct timeval period = {
+        struct timespec period = {
                 .tv_sec = 0,
-                .tv_usec = 0
+                .tv_nsec = 0
         };
 
@@ -2421 +2421 @@
                 }
 
-                if (max_len != sizeof(struct timeval)) {
+                if (max_len != sizeof(struct timespec)) {
                         async_answer_0(&data, ELIMIT);
                         async_answer_0(call, ELIMIT);
@@ -2428 +2428 @@
 
                 async_data_read_finalize(&data, &period,
-                    sizeof(struct timeval));
+                    sizeof(struct timespec));
         }
 
@@ -2441 +2441 @@
         nic_poll_mode_t mode = IPC_GET_ARG2(*call);
         int has_period = IPC_GET_ARG3(*call);
-        struct timeval period_buf;
-        struct timeval *period = NULL;
+        struct timespec period_buf;
+        struct timespec *period = NULL;
         size_t length;
 
@@ -2453 +2453 @@
                 }
 
-                if (length != sizeof(struct timeval)) {
+                if (length != sizeof(struct timespec)) {
                         async_answer_0(&data, ELIMIT);
                         async_answer_0(call, ELIMIT);

uspace/lib/drv/include/nic_iface.h

@@ -106 +106 @@
 
 extern errno_t nic_poll_get_mode(async_sess_t *, nic_poll_mode_t *,
-    struct timeval *);
+    struct timespec *);
 extern errno_t nic_poll_set_mode(async_sess_t *, nic_poll_mode_t,
-    const struct timeval *);
+    const struct timespec *);
 extern errno_t nic_poll_now(async_sess_t *);
 

uspace/lib/drv/include/ops/nic.h

@@ -39 +39 @@
 #include <ipc/services.h>
 #include <nic/nic.h>
-#include <sys/time.h>
+#include <time.h>
 #include "../ddf/driver.h"
 
@@ -104 +104 @@
 
         errno_t (*poll_get_mode)(ddf_fun_t *, nic_poll_mode_t *,
-            struct timeval *);
+            struct timespec *);
         errno_t (*poll_set_mode)(ddf_fun_t *, nic_poll_mode_t,
-            const struct timeval *);
+            const struct timespec *);
         errno_t (*poll_now)(ddf_fun_t *);
 } nic_iface_t;

uspace/lib/drv/include/pci_dev_iface.h

@@ -37 +37 @@
 #ifndef LIBDRV_PCI_DEV_IFACE_H_
 #define LIBDRV_PCI_DEV_IFACE_H_
+
+#include <errno.h>
 
 #include "ddf/driver.h"