Changeset 7ee7e6a in mainline for uspace/lib/c

Timestamp:

2017-05-15T21:24:35Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

adc68de

Parents:

0e7c3d9

Message:

Further reduce the number of inclusions of sys/types.h

Location:

uspace/lib/c

Files:

• arch/abs32le/include/libarch/ddi.h (modified) (1 diff)
• arch/arm32/include/libarch/ddi.h (modified) (1 diff)
• arch/ia32/include/libarch/ddi.h (modified) (1 diff)
• arch/ia64/include/libarch/ddi.h (modified) (1 diff)
• arch/mips32/include/libarch/ddi.h (modified) (1 diff)
• arch/ppc32/include/libarch/ddi.h (modified) (1 diff)
• arch/riscv64/include/libarch/ddi.h (modified) (1 diff)
• arch/sparc64/include/libarch/ddi.h (modified) (1 diff)
• generic/ddi.c (modified) (1 diff)
• include/ddi.h (modified) (2 diffs)
• include/sys/types.h (modified) (1 diff)

uspace/lib/c/arch/abs32le/include/libarch/ddi.h

@@ -33 +33 @@
 #define LIBC_abs32le_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)

uspace/lib/c/arch/arm32/include/libarch/ddi.h

@@ -34 +34 @@
 #define LIBC_arm32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)

uspace/lib/c/arch/ia32/include/libarch/ddi.h

@@ -34 +34 @@
 #define LIBC_ia32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 #define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))

uspace/lib/c/arch/ia64/include/libarch/ddi.h

@@ -36 +36 @@
 #define LIBC_ia64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 #define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))

uspace/lib/c/arch/mips32/include/libarch/ddi.h

@@ -34 +34 @@
 #define LIBC_mips32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)

uspace/lib/c/arch/ppc32/include/libarch/ddi.h

@@ -34 +34 @@
 #define LIBC_ppc32_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)

uspace/lib/c/arch/riscv64/include/libarch/ddi.h

@@ -33 +33 @@
 #define LIBC_riscv64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)

uspace/lib/c/arch/sparc64/include/libarch/ddi.h

@@ -34 +34 @@
 #define LIBC_sparc64_DDI_H_
 
-#include <sys/types.h>
-#include <libarch/types.h>
+#include <ddi.h>
 
 static inline void memory_barrier(void)

uspace/lib/c/generic/ddi.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <abi/ddi/arg.h>
 #include <ddi.h>

uspace/lib/c/include/ddi.h

@@ -37 +37 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <abi/ddi/irq.h>
@@ -47 +48 @@
 #define DMAMEM_16MiB  ((uintptr_t) UINT64_C(0xffffffffff000000))
 #define DMAMEM_4GiB   ((uintptr_t) UINT64_C(0xffffffff00000000))
+
+typedef volatile uint8_t ioport8_t;
+typedef volatile uint16_t ioport16_t;
+typedef volatile uint32_t ioport32_t;
 
 extern int device_assign_devno(void);

uspace/lib/c/include/sys/types.h

@@ -46 +46 @@
 typedef uint32_t fourcc_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef int16_t unaligned_int16_t __attribute__ ((aligned(1)));
 typedef int32_t unaligned_int32_t __attribute__ ((aligned(1)));