Removing useless minix/types.h header

Change-Id: If5f922279b87f075f301b64c7786caa18b434c2a

diff --git a/commands/btrace/btrace.c b/commands/btrace/btrace.c
index dbdf508e933dd7371d149a3e6ea6f2247c253eff..6e9451adbe36a31eeb082fda9bdf0aa4d8c89dfb 100644 (file)
--- a/commands/btrace/btrace.c
+++ b/commands/btrace/btrace.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/btrace.h>
 #include <minix/u64.h>
 #include <sys/ioc_block.h>

diff --git a/common/include/sys/svrctl.h b/common/include/sys/svrctl.h
index 1bdad0e331fc9bb171ca1763e75e69f5998b7d33..88746d4b1f8af646a9e8962ba1d4a5003e214a59 100644 (file)
--- a/common/include/sys/svrctl.h
+++ b/common/include/sys/svrctl.h
@@ -7,9 +7,7 @@ Created:        Feb 15, 1994 by Philip Homburg <philip@cs.vu.nl>
 #ifndef _SYS__SVRCTL_H
 #define _SYS__SVRCTL_H
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 /* Server control commands have the same encoding as the commands for ioctls. */
 #include <minix/ioctl.h>

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 855e84f12f6335d5254944afa1d39092780720bc..60a5dbc514142af1b39c5efbc6465c90c2bef3ba 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -663,7 +663,7 @@
 ./usr/include/minix/timers.h                                   minix-sys
 ./usr/include/minix/tty.h                                      minix-sys
 ./usr/include/minix/type.h                                     minix-sys
-./usr/include/minix/types.h                                    minix-sys
+./usr/include/minix/types.h                                    minix-sys       obsolete
 ./usr/include/minix/u64.h                                      minix-sys
 ./usr/include/minix/usb_ch9.h                                  minix-sys
 ./usr/include/minix/usb.h                                      minix-sys

diff --git a/external/gpl3/gcc/patches/0001-minix.patch b/external/gpl3/gcc/patches/0001-minix.patch
index 30f29fce462cce08670dd861aaa2c97ac166d9e5..3c4a5efc4eff9f5e837e0e261d24b6920784980b 100644 (file)
--- a/external/gpl3/gcc/patches/0001-minix.patch
+++ b/external/gpl3/gcc/patches/0001-minix.patch
@@ -56,7 +56,7 @@ diff -r -x CVS -N -U 3 dist.orig/gcc/ginclude/stddef.h dist/gcc/ginclude/stddef.
  #include <sys/_types.h>
  #endif
 +#if defined (__minix)
-+#include <minix/types.h>
++#include <sys/types.h>
 +#endif
  
  /* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are

diff --git a/include/arch/arm/include/multiboot.h b/include/arch/arm/include/multiboot.h
index 751c5cdba3ae3900873833924d7c53731b31aec4..4b8ac1a3acf1ae017c58fbb3e266a6b2d1de5826 100644 (file)
--- a/include/arch/arm/include/multiboot.h
+++ b/include/arch/arm/include/multiboot.h
@@ -52,7 +52,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <minix/types.h>
+#include <sys/types.h>
 /* The symbol table for a.out. */
 struct multiboot_aout_symbol_table
 {

diff --git a/include/arch/i386/include/multiboot.h b/include/arch/i386/include/multiboot.h
index 751c5cdba3ae3900873833924d7c53731b31aec4..4b8ac1a3acf1ae017c58fbb3e266a6b2d1de5826 100644 (file)
--- a/include/arch/i386/include/multiboot.h
+++ b/include/arch/i386/include/multiboot.h
@@ -52,7 +52,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <minix/types.h>
+#include <sys/types.h>
 /* The symbol table for a.out. */
 struct multiboot_aout_symbol_table
 {

diff --git a/include/lib.h b/include/lib.h
index 9932a4f015b15d5b931514cbb69a3b0f2c3ad256..cb60ef0bd7f9a41ac242d1ad0d53d66bf70cb30b 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -16,7 +16,7 @@
 
 /* The following are so basic, all the lib files get them automatically. */
 #include <minix/config.h>      /* must be first */
-#include <minix/types.h>
+#include <sys/types.h>
 #include <limits.h>
 #include <errno.h>
 

diff --git a/include/minix/Makefile b/include/minix/Makefile
index 7df7814ab4680ca8f65f779ae4fe850c1e4b0b86..d0627e35002e65cbc0ea1d91d4ab84effc77cd69 100644 (file)
--- a/include/minix/Makefile
+++ b/include/minix/Makefile
@@ -4,7 +4,7 @@ NOOBJ=          # defined
 
 INCSDIR=       /usr/include/minix
 
-INCS+= dirent.h paths.h types.h param.h
+INCS+= dirent.h paths.h param.h
 INCS+= acpi.h audio_fw.h bitmap.h \
        bdev.h blockdriver.h blockdriver_mt.h \
        btrace.h \

diff --git a/include/minix/acpi.h b/include/minix/acpi.h
index 129f4c45fc18ec05c9a06c91e28ac8bb7ad3a79b..618339d1fb39f6c5cee56535fcb70151cac4f762 100644 (file)
--- a/include/minix/acpi.h
+++ b/include/minix/acpi.h
@@ -1,4 +1,4 @@
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/ipc.h>
 
 #define ACPI_REQ_GET_IRQ       1

diff --git a/include/minix/devio.h b/include/minix/devio.h
index 8a2b3c8fe5e42a87c6e0c76c16e026ecf2a8eb59..435f0f58f487859f52d2f95f8bdc247f3e4743cb 100644 (file)
--- a/include/minix/devio.h
+++ b/include/minix/devio.h
@@ -10,7 +10,7 @@
 #define _DEVIO_H
 
 #include <minix/sys_config.h>     /* needed to include <minix/type.h> */
-#include <minix/types.h>        /* u8_t, u16_t, u32_t needed */
+#include <sys/types.h>        /* u8_t, u16_t, u32_t needed */
 
 typedef u16_t port_t;
 

diff --git a/include/minix/ds.h b/include/minix/ds.h
index 803f58d613d5e652d57bb717215bef059530aefb..b9d449ee2f61e523c5d56618bfb11a1aff49cb37 100644 (file)
--- a/include/minix/ds.h
+++ b/include/minix/ds.h
@@ -3,7 +3,7 @@
 #ifndef _MINIX_DS_H
 #define _MINIX_DS_H
 
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/endpoint.h>
 
 /* Flags. */

diff --git a/include/minix/ioctl.h b/include/minix/ioctl.h
index 1ea5c9221027b408a13ed5a7045d7df2d3ad00cc..fe18d9d47687c8970aca2987e1f9ab01fb10ae77 100644 (file)
--- a/include/minix/ioctl.h
+++ b/include/minix/ioctl.h
@@ -8,10 +8,7 @@
 #define _M_IOCTL_H
 
 #include <sys/cdefs.h>
-
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 /* Ioctls have the command encoded in the low-order word, and the size
  * of the parameter in the high-order word. The 3 high bits of the high-

diff --git a/include/minix/partition.h b/include/minix/partition.h
index 07f64b4366dbb44925550ad787df3ae5bedf987e..21f743d70bfcea6b5bc9db36b47ce9ffc81d16dd 100644 (file)
--- a/include/minix/partition.h
+++ b/include/minix/partition.h
@@ -6,9 +6,7 @@
 #ifndef _MINIX__PARTITION_H
 #define _MINIX__PARTITION_H
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 #include <minix/u64.h>
 

diff --git a/include/minix/portio.h b/include/minix/portio.h
index 4682a7b51b652b311c9f138bb28c3e8244d53c0e..0075fb36cdf41c2c2f8a2ac38bb809b504632213 100644 (file)
--- a/include/minix/portio.h
+++ b/include/minix/portio.h
@@ -7,9 +7,7 @@ Created:        Jan 15, 1992 by Philip Homburg
 #ifndef _PORTIO_H_
 #define _PORTIO_H_
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 unsigned inb(u16_t _port);
 unsigned inw(u16_t _port);

diff --git a/include/minix/profile.h b/include/minix/profile.h
index c3f5eed4692bfba1bade8689f055e5931663b6c7..3569bb4deb240e028ddd528a5b1523fe2a2b4b1a 100644 (file)
--- a/include/minix/profile.h
+++ b/include/minix/profile.h
@@ -2,6 +2,7 @@
 #define _PROFILE_H
 
 #include <minix/type.h>
+#include <sys/types.h>
 
 /*
  * Types relating to system profiling.  Types are supplied for both
@@ -34,8 +35,6 @@ struct sprof_proc {
        char            name[PROC_NAME_LEN];
 };
 
-#include <minix/types.h>
-
 #  define PROF_GET         2    /* get call profiling tables */
 #  define PROF_RESET       3    /* reset call profiling tables */
 

diff --git a/include/minix/safecopies.h b/include/minix/safecopies.h
index 5b94cc04d91d49c11e3a841f5e43458cc39b1cf9..aa35fc502b51d6f214818a9d4480605fb8d88675 100644 (file)
--- a/include/minix/safecopies.h
+++ b/include/minix/safecopies.h
@@ -3,7 +3,7 @@
 #define _MINIX_SAFECOPIES_H 1
 
 #include <minix/sys_config.h>
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/vm.h>
 #include <stdint.h>
 

diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 38cea2e4944700435ea4d45da0d551f3a5881aae..f1bc43186cf76afeeec6764f432628bb18cc403b 100644 (file)
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -3,19 +3,12 @@
 #ifndef _SYSLIB_H
 #define _SYSLIB_H
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
+#include <sys/sigtypes.h>
 
-#ifndef _IPC_H
 #include <minix/ipc.h>
-#endif
-
 #include <minix/u64.h>
-
-#ifndef _DEVIO_H
 #include <minix/devio.h>
-#endif
 
 #include <minix/safecopies.h>
 #include <minix/sef.h>

diff --git a/include/minix/tty.h b/include/minix/tty.h
index 65712d540eb99deea3f981f5e7b233152fbfc817..fcf8d2f97f41583bc1aa7166bd39c4ab46b83c12 100644 (file)
--- a/include/minix/tty.h
+++ b/include/minix/tty.h
@@ -2,7 +2,7 @@
 #ifndef _MINIX_TTY_H
 #define _MINIX_TTY_H
 
-#include <minix/types.h>
+#include <sys/types.h>
 
 #define TTYMAGIC       0xb105
 

diff --git a/include/minix/type.h b/include/minix/type.h
index dbcb23e1f58d31d8e54cc51124344e397b210d03..7dc11f1610e5466aca09da635f3e89204c7aff8b 100644 (file)
--- a/include/minix/type.h
+++ b/include/minix/type.h
@@ -6,9 +6,7 @@
 #include <minix/sys_config.h>
 #endif
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 #include <stdint.h>
 

diff --git a/include/minix/types.h b/include/minix/types.h
deleted file mode 100644 (file)
index b7e2c43..0000000
--- a/include/minix/types.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _MINIX_TYPES_H_
-#define _MINIX_TYPES_H_
-
-/* Dummy file used in legacy (and shared) minix includes. */
-#include <sys/types.h>
-#include <sys/sigtypes.h>
-
-#endif

diff --git a/include/minix/u64.h b/include/minix/u64.h
index 466b73e3f95c4c29a28fc215f4cd00eed2f2c28d..aa0059c1591377f15a424ab2d967eb6f258a47a5 100644 (file)
--- a/include/minix/u64.h
+++ b/include/minix/u64.h
@@ -5,9 +5,7 @@
 #ifndef _MINIX__U64_H
 #define _MINIX__U64_H
 
-#ifndef _TYPES_H
-#include <minix/types.h>
-#endif
+#include <sys/types.h>
 
 #include <limits.h>
 

diff --git a/include/minix/usb.h b/include/minix/usb.h
index cd5b6690c390d40911d9d150285d8f759839e8b9..07845527dfffd06faac5385a5c93a881354efc2f 100644 (file)
--- a/include/minix/usb.h
+++ b/include/minix/usb.h
@@ -1,9 +1,9 @@
 #ifndef _MINIX_USB_H
 #define _MINIX_USB_H
 
+#include <sys/types.h>
 #include <minix/com.h>
 #include <minix/ipc.h>
-#include <minix/types.h>
 #include <stdio.h>
 
 #define USB_URBSIZE(data_size, iso_count) \

diff --git a/include/minix/usb_ch9.h b/include/minix/usb_ch9.h
index b9ebab8a3f33347d57ba79cc36e617e48dcc4d3e..6d994a94093551fa6dc81955588ba9d9c71fe38a 100644 (file)
--- a/include/minix/usb_ch9.h
+++ b/include/minix/usb_ch9.h
@@ -44,7 +44,7 @@
  * values.
  */
 
-#include <minix/types.h>
+#include <sys/types.h>
 
 typedef u8_t uByte;
 typedef u8_t uWord[2];

diff --git a/include/minix/vm.h b/include/minix/vm.h
index 4ab02a88cdc3adc31f5c1252b2e65df924548241..acb0a901af4582057676e85ea975674c75732730 100644 (file)
--- a/include/minix/vm.h
+++ b/include/minix/vm.h
@@ -3,7 +3,7 @@
 #ifndef _MINIX_VM_H
 #define _MINIX_VM_H
 
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/endpoint.h>
 
 int vm_exit(endpoint_t ep);

diff --git a/include/net/gen/in.h b/include/net/gen/in.h
index 1f88486a543f69d4f66e58c39be15dbb14927e54..fb4398f8d861f98575dafb13cf1486d31b3770a2 100644 (file)
--- a/include/net/gen/in.h
+++ b/include/net/gen/in.h
@@ -6,7 +6,7 @@ server/ip/gen/in.h
 #define __SERVER__IP__GEN__IN_H__
 
 #include <net/gen/in.h>
-#include <minix/types.h>
+#include <sys/types.h>
 
 #define IP_MIN_HDR_SIZE                20
 #define IP_MAX_HDR_SIZE                60              /* 15 * 4 */

diff --git a/include/timers.h b/include/timers.h
index 3773f530725c8714548ef27958dc6ffe857585f2..dcb5ba4907356dcdde255c96bd0994b5e99e11eb 100644 (file)
--- a/include/timers.h
+++ b/include/timers.h
@@ -17,7 +17,7 @@
 
 #include <limits.h>
 
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/u64.h>
 #include <minix/minlib.h>
 #include <minix/endpoint.h>

diff --git a/kernel/arch/arm/direct_tty_utils.c b/kernel/arch/arm/direct_tty_utils.c
index 9862cf27319f27a1700d179df08585cee010fc10..7b7207859cebddb1815d2ce8fd85fae07d79f183 100644 (file)
--- a/kernel/arch/arm/direct_tty_utils.c
+++ b/kernel/arch/arm/direct_tty_utils.c
@@ -3,9 +3,9 @@
 #include <minix/minlib.h>
 #include <minix/const.h>
 #include <minix/cpufeature.h>
-#include <minix/types.h>
 #include <minix/type.h>
 #include <minix/com.h>
+#include <sys/types.h>
 #include <sys/param.h>
 #include <libexec.h>
 #include "string.h"

diff --git a/kernel/arch/arm/pre_init.c b/kernel/arch/arm/pre_init.c
index 970e44d4a2d21a3e9e682c162d72ea796552926e..ea7e5aa45885fb6558f09a2fc93187f5bdd4439a 100644 (file)
--- a/kernel/arch/arm/pre_init.c
+++ b/kernel/arch/arm/pre_init.c
@@ -6,9 +6,9 @@
 #include <stdlib.h>
 #include <minix/minlib.h>
 #include <minix/const.h>
-#include <minix/types.h>
 #include <minix/type.h>
 #include <minix/com.h>
+#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include "string.h"

diff --git a/kernel/arch/i386/direct_tty_utils.c b/kernel/arch/i386/direct_tty_utils.c
index 72a31174c3b67946ba9ae7abd2c9a151381710af..b51c7e247274f074da14d5eef453c627caa6202f 100644 (file)
--- a/kernel/arch/i386/direct_tty_utils.c
+++ b/kernel/arch/i386/direct_tty_utils.c
@@ -3,9 +3,9 @@
 #include <minix/minlib.h>
 #include <minix/const.h>
 #include <minix/cpufeature.h>
-#include <minix/types.h>
 #include <minix/type.h>
 #include <minix/com.h>
+#include <sys/types.h>
 #include <sys/param.h>
 #include <machine/partition.h>
 #include <libexec.h>

diff --git a/kernel/arch/i386/pre_init.c b/kernel/arch/i386/pre_init.c
index 388972354879ef9a22aea0f6a087ca81f558c439..2e8530eb30bbe98811c32eca95ba5dc57cb056c9 100644 (file)
--- a/kernel/arch/i386/pre_init.c
+++ b/kernel/arch/i386/pre_init.c
@@ -6,9 +6,9 @@
 #include <stdlib.h>
 #include <minix/minlib.h>
 #include <minix/const.h>
-#include <minix/types.h>
 #include <minix/type.h>
 #include <minix/com.h>
+#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <machine/partition.h>

diff --git a/lib/liblwip/include/arch/cc.h b/lib/liblwip/include/arch/cc.h
index f21655c1e6b31772368855f0595982eaf05ed097..afad1469b1d1a2a08ef55ff555913c84fb465122 100644 (file)
--- a/lib/liblwip/include/arch/cc.h
+++ b/lib/liblwip/include/arch/cc.h
@@ -3,7 +3,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/time.h>
-#include <minix/types.h>
+#include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
 

diff --git a/lib/liblwip/sys_arch.c b/lib/liblwip/sys_arch.c
index eeedb4baad34faa390bcea62d3fe33c75b8e3721..2a1e7e53d0804f21033e733d1971d004d6be141d 100644 (file)
--- a/lib/liblwip/sys_arch.c
+++ b/lib/liblwip/sys_arch.c
@@ -1,4 +1,4 @@
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/sysutil.h>
 #include <errno.h>
 

diff --git a/servers/mfs/mfsdir.h b/servers/mfs/mfsdir.h
index d997c053cc954ccbccfb0af945f7619238ad2753..3a3f3229583c1824985cabd3517a691a3b15e0e2 100644 (file)
--- a/servers/mfs/mfsdir.h
+++ b/servers/mfs/mfsdir.h
@@ -4,7 +4,7 @@
 #ifdef __NBSD_LIBC
 #include <sys/cdefs.h>
 #endif
-#include <minix/types.h>
+#include <sys/types.h>
 
 /* Maximum Minix MFS on-disk directory filename.
  * MFS uses 'struct direct' to write and parse 

diff --git a/sys/sys/specificdata.h b/sys/sys/specificdata.h
new file mode 100644 (file)
index 0000000..3db08c6
--- /dev/null
+++ b/sys/sys/specificdata.h
@@ -0,0 +1,69 @@
+/*     $NetBSD: specificdata.h,v 1.4 2008/04/28 20:24:11 martin Exp $  */
+
+/*-
+ * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_SPECIFICDATA_H_
+#define        _SYS_SPECIFICDATA_H_
+
+#include <sys/mutex.h>
+
+typedef unsigned int specificdata_key_t;
+typedef void (*specificdata_dtor_t)(void *);
+typedef struct specificdata_domain *specificdata_domain_t;
+typedef struct specificdata_container *specificdata_container_t;
+
+typedef struct {
+       specificdata_container_t specdataref_container;
+       kmutex_t specdataref_lock;
+} specificdata_reference;
+
+specificdata_domain_t  specificdata_domain_create(void);
+void                   specificdata_domain_delete(specificdata_domain_t);
+
+int    specificdata_key_create(specificdata_domain_t,
+                               specificdata_key_t *, specificdata_dtor_t);
+void   specificdata_key_delete(specificdata_domain_t, specificdata_key_t);
+
+int    specificdata_init(specificdata_domain_t, specificdata_reference *);
+void   specificdata_fini(specificdata_domain_t, specificdata_reference *);
+
+void * specificdata_getspecific(specificdata_domain_t,
+                                specificdata_reference *, specificdata_key_t);
+void * specificdata_getspecific_unlocked(specificdata_domain_t,
+                                         specificdata_reference *,
+                                         specificdata_key_t);
+void   specificdata_setspecific(specificdata_domain_t,
+                                specificdata_reference *, specificdata_key_t,
+                                void *);
+int    specificdata_setspecific_nowait(specificdata_domain_t,
+                                       specificdata_reference *,
+                                       specificdata_key_t, void *);
+
+#endif /* _SYS_SPECIFICDATA_H_ */