Changes in uspace/lib/c/include/ddi.h [aad43a8:7ee7e6a] in mainline

File:

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

uspace/lib/c/include/ddi.h

@@ -52 +52 @@
 typedef volatile uint16_t ioport16_t;
 typedef volatile uint32_t ioport32_t;
-typedef volatile uint64_t ioport64_t;
+
+extern int device_assign_devno(void);
 
 extern int physmem_map(uintptr_t, size_t, unsigned int, void **);
@@ -68 +69 @@
 extern int pio_disable(void *, size_t);
 
-typedef void (*trace_fnc)(const volatile void *place, uint64_t val,
+typedef void (*trace_fnc)(const volatile void *place, uint32_t val,
     volatile void* base, size_t size, void *data, bool write);
 
 extern int pio_trace_enable(void *, size_t, trace_fnc, void *);
-extern void pio_trace_log(const volatile void *, uint64_t val, bool write);
+extern void pio_trace_log(const volatile void *, uint32_t val, bool write);
 extern void pio_trace_disable(void *);
 
@@ -78 +79 @@
 extern void pio_write_16(ioport16_t *, uint16_t);
 extern void pio_write_32(ioport32_t *, uint32_t);
-extern void pio_write_64(ioport64_t *, uint64_t);
 
 extern uint8_t pio_read_8(const ioport8_t *);
 extern uint16_t pio_read_16(const ioport16_t *);
 extern uint32_t pio_read_32(const ioport32_t *);
-extern uint64_t pio_read_64(const ioport64_t *);
 
 static inline uint8_t pio_change_8(ioport8_t *reg, uint8_t val, uint8_t mask,
@@ -112 +111 @@
 }
 
-static inline uint64_t pio_change_64(ioport64_t *reg, uint64_t val,
-    uint64_t mask, useconds_t delay)
-{
-        uint64_t v = pio_read_64(reg);
-        udelay(delay);
-        pio_write_64(reg, (v & ~mask) | val);
-        return v;
-}
-
 static inline uint8_t pio_set_8(ioport8_t *r, uint8_t v, useconds_t d)
 {
@@ -132 +122 @@
 {
         return pio_change_32(r, v, 0, d);
-}
-static inline uint64_t pio_set_64(ioport64_t *r, uint64_t v, useconds_t d)
-{
-        return pio_change_64(r, v, 0, d);
 }
 
@@ -150 +136 @@
         return pio_change_32(r, 0, v, d);
 }
-static inline uint64_t pio_clear_64(ioport64_t *r, uint64_t v, useconds_t d)
-{
-        return pio_change_64(r, 0, v, d);
-}
 
 #endif