Changeset 231b3fd in mainline for uspace/lib/c/include/ddi.h

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

• uspace/lib/c/include/ddi.h (modified) (6 diffs)

uspace/lib/c/include/ddi.h

@@ -39 +39 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <sys/time.h>
+#include <time.h>
 #include <byteorder.h>
 #include <abi/ddi/irq.h>
@@ -138 +138 @@
 
 static inline uint8_t pio_change_8(ioport8_t *reg, uint8_t val, uint8_t mask,
-    useconds_t delay)
+    usec_t delay)
 {
         uint8_t v = pio_read_8(reg);
@@ -147 +147 @@
 
 static inline uint16_t pio_change_16(ioport16_t *reg, uint16_t val,
-    uint16_t mask, useconds_t delay)
+    uint16_t mask, usec_t delay)
 {
         uint16_t v = pio_read_16(reg);
@@ -156 +156 @@
 
 static inline uint32_t pio_change_32(ioport32_t *reg, uint32_t val,
-    uint32_t mask, useconds_t delay)
+    uint32_t mask, usec_t delay)
 {
         uint32_t v = pio_read_32(reg);
@@ -165 +165 @@
 
 static inline uint64_t pio_change_64(ioport64_t *reg, uint64_t val,
-    uint64_t mask, useconds_t delay)
+    uint64_t mask, usec_t delay)
 {
         uint64_t v = pio_read_64(reg);
@@ -173 +173 @@
 }
 
-static inline uint8_t pio_set_8(ioport8_t *r, uint8_t v, useconds_t d)
+static inline uint8_t pio_set_8(ioport8_t *r, uint8_t v, usec_t d)
 {
         return pio_change_8(r, v, 0, d);
 }
-static inline uint16_t pio_set_16(ioport16_t *r, uint16_t v, useconds_t d)
+static inline uint16_t pio_set_16(ioport16_t *r, uint16_t v, usec_t d)
 {
         return pio_change_16(r, v, 0, d);
 }
-static inline uint32_t pio_set_32(ioport32_t *r, uint32_t v, useconds_t d)
+static inline uint32_t pio_set_32(ioport32_t *r, uint32_t v, usec_t d)
 {
         return pio_change_32(r, v, 0, d);
 }
-static inline uint64_t pio_set_64(ioport64_t *r, uint64_t v, useconds_t d)
+static inline uint64_t pio_set_64(ioport64_t *r, uint64_t v, usec_t d)
 {
         return pio_change_64(r, v, 0, d);
 }
 
-static inline uint8_t pio_clear_8(ioport8_t *r, uint8_t v, useconds_t d)
+static inline uint8_t pio_clear_8(ioport8_t *r, uint8_t v, usec_t d)
 {
         return pio_change_8(r, 0, v, d);
 }
-static inline uint16_t pio_clear_16(ioport16_t *r, uint16_t v, useconds_t d)
+static inline uint16_t pio_clear_16(ioport16_t *r, uint16_t v, usec_t d)
 {
         return pio_change_16(r, 0, v, d);
 }
-static inline uint32_t pio_clear_32(ioport32_t *r, uint32_t v, useconds_t d)
+static inline uint32_t pio_clear_32(ioport32_t *r, uint32_t v, usec_t d)
 {
         return pio_change_32(r, 0, v, d);
 }
-static inline uint64_t pio_clear_64(ioport64_t *r, uint64_t v, useconds_t d)
+static inline uint64_t pio_clear_64(ioport64_t *r, uint64_t v, usec_t d)
 {
         return pio_change_64(r, 0, v, d);