Removing useless minix/types.h header

Change-Id: If5f922279b87f075f301b64c7786caa18b434c2a

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>

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>

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

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

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
 {

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
 {

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>
 

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 \

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

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;
 

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. */

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-

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>
 

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);

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 */
 

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>
 

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>

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
 

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>
 

include/minix/types.h

@@ -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

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>
 

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) \

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];

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);

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 */

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>

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"

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"

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>

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>

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>
 

lib/liblwip/sys_arch.c

@@ -1,4 +1,4 @@
-#include <minix/types.h>
+#include <sys/types.h>
 #include <minix/sysutil.h>
 #include <errno.h>
 

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 

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_ */