Minix Support

Stichting-MINIX-Research-Foundation · Nov 7, 2014 · a95b153 · a95b153
1 parent 055d5fa
commit a95b153
Show file tree

Hide file tree

Showing 55 changed files with 1,267 additions and 22 deletions.
diff --git a/external/mit/fontconfig/include/config.h b/external/mit/fontconfig/include/config.h
@@ -117,11 +117,13 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
+#if !defined(__minix)
 /* Define to 1 if you have the 'posix_fadvise' function. */
 #define HAVE_POSIX_FADVISE 1
 
 /* Have POSIX threads */
 #define HAVE_PTHREAD 1
+#endif /* !defined(__minix) */
 
 /* Have PTHREAD_PRIO_INHERIT. */
 /* #undef HAVE_PTHREAD_PRIO_INHERIT */

diff --git a/external/mit/libFS/include/config.h b/external/mit/libFS/include/config.h
@@ -40,8 +40,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+#if !defined(__minix)
 /* Support IPv6 for TCP connections */
 #define IPv6 1
+#endif /* !defined(__minix) */
 
 /* Support os-specific local connections */
 /* #undef LOCALCONN */

diff --git a/external/mit/libX11/dist/src/UIThrStubs.c b/external/mit/libX11/dist/src/UIThrStubs.c
@@ -97,7 +97,12 @@ typedef pthread_t xthread_t;
 #pragma weak tis_cond_signal = _Xthr_zero_stub_
 #pragma weak tis_cond_broadcast = _Xthr_zero_stub_
 #else
+#  if defined(__minix)
+#define _MTHREADIFY_PTHREADS 1
+#include <minix/mthread.h>
+#  else
 #include <pthread.h>
+#  endif /* defined(__minix) */
 typedef pthread_t xthread_t;
 #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 xthread_t pthread_self()    __attribute__ ((weak, alias ("_Xthr_self_stub_")));

diff --git a/external/mit/libXfont/include/config.h b/external/mit/libXfont/include/config.h
@@ -52,8 +52,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+#if !defined(__minix)
 /* Support IPv6 for TCP connections */
 #define IPv6 1
+#endif /* !defined(__minix) */
 
 /* Support os-specific local connections */
 /* #undef LOCALCONN */

diff --git a/external/mit/libXxf86dga/dist/src/XF86DGA.c b/external/mit/libXxf86dga/dist/src/XF86DGA.c
@@ -551,6 +551,7 @@ MapPhysAddress(unsigned long address, unsigned long size)
     vaddr = (void *)smem_create("XF86DGA", (char *)offset,
 				size + delta, SM_READ|SM_WRITE);
 #else
+#if !defined(__minix)
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
@@ -562,6 +563,7 @@ MapPhysAddress(unsigned long address, unsigned long size)
                         MAP_FILE | MAP_SHARED, mapFd, (off_t)offset);
     if (vaddr == (void *)-1)
 	return NULL;
+#endif /* !defined(__minix) */
 #endif
 
     if (!vaddr) {
@@ -624,14 +626,14 @@ XF86DGADirectVideo(
     if (enable & XF86DGADirectGraphics) {
 #if !defined(ISC) && !defined(HAS_SVR3_MMAP) \
 	&& !(defined(Lynx) && defined(NO_MMAP)) \
-	&& !defined(__UNIXOS2__)
+	&& !defined(__UNIXOS2__) && !defined(__minix)
 	if (mp && mp->vaddr)
 	    mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ | PROT_WRITE);
 #endif
     } else {
 #if !defined(ISC) && !defined(HAS_SVR3_MMAP) \
 	&& !(defined(Lynx) && defined(NO_MMAP)) \
-	&& !defined(__UNIXOS2__)
+	&& !defined(__UNIXOS2__) && !defined(__minix)
 	if (mp && mp->vaddr)
 	    mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ);
 #elif defined(Lynx) && defined(NO_MMAP)

diff --git a/external/mit/libXxf86dga/dist/src/XF86DGA2.c b/external/mit/libXxf86dga/dist/src/XF86DGA2.c
@@ -967,6 +967,7 @@ DGAMapPhysical(
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
+#if !defined(__minix)
     if (!name)
 	    name = DEV_MEM;
     if ((pMap->fd = open(name, O_RDWR)) < 0)
@@ -976,6 +977,7 @@ DGAMapPhysical(
     if (pMap->virtual == (void *)-1)
 	return False;
     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
+#endif /* !defined(__minix) */
 #endif
 
     return True;
@@ -996,7 +998,9 @@ DGAUnmapPhysical(DGAMapPtr pMap)
     smem_remove("XF86DGA");
 #else
     if (pMap->virtual && pMap->virtual != (void *)-1) {
+#if !defined(__minix)
 	mprotect(pMap->virtual,pMap->size, PROT_READ);
+#endif /* ! defined(__minix) */
 	munmap(pMap->virtual, pMap->size);
 	pMap->virtual = 0;
     }

diff --git a/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c b/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c
@@ -43,7 +43,12 @@
 #include <assert.h>
 #include <errno.h>
 #include <xf86drm.h>
+#if !defined(__minix)
 #include <pthread.h>
+#else
+#define _MTHREADIFY_PTHREADS 1
+#include <minix/mthread.h>
+#endif /* !defined(__minix) */
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "drm.h"

diff --git a/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c b/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
@@ -46,7 +46,12 @@
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#if !defined(__minix)
 #include <pthread.h>
+#else
+#define _MTHREADIFY_PTHREADS 1
+#include <minix/mthread.h>
+#endif /* !defined(__minix) */
 #include <stddef.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -1062,9 +1067,13 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
 		}
 
 		/* and mmap it */
+#if !defined(__minix)
 		bo_gem->gtt_virtual = mmap(0, bo->size, PROT_READ | PROT_WRITE,
 					   MAP_SHARED, bufmgr_gem->fd,
 					   mmap_arg.offset);
+#else
+		bo_gem->gtt_virtual = MAP_FAILED;
+#endif /* !defined(__minix) */
 		if (bo_gem->gtt_virtual == MAP_FAILED) {
 			bo_gem->gtt_virtual = NULL;
 			ret = -errno;

diff --git a/external/mit/libdrm/dist/radeon/radeon_bo_gem.c b/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
@@ -178,7 +178,11 @@ static int bo_map(struct radeon_bo_int *boi, int write)
                 boi, boi->handle, r);
         return r;
     }
+#if !defined(__minix)
     ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi->bom->fd, args.addr_ptr);
+#else
+    ptr = MAP_FAILED;
+#endif /* !defined(__minix) */
     if (ptr == MAP_FAILED)
         return -errno;
     bo_gem->priv_ptr = ptr;

diff --git a/external/mit/libdrm/dist/radeon/radeon_cs_gem.c b/external/mit/libdrm/dist/radeon/radeon_cs_gem.c
@@ -33,7 +33,12 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#if !defined(__minix)
 #include <pthread.h>
+#else
+#define _MTHREADIFY_PTHREADS 1
+#include <minix/mthread.h>
+#endif /* !defined(__minix) */
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "radeon_cs.h"

diff --git a/external/mit/libdrm/dist/xf86atomic.h b/external/mit/libdrm/dist/xf86atomic.h
@@ -92,7 +92,7 @@ typedef struct { uint_t atomic; } atomic_t;
 
 #endif
 
-#if defined(__NetBSD__) && !defined(HAS_ATOMIC_OPS)  /* NetBSD */
+#if (defined(__NetBSD__) || defined(__minix)) && !defined(HAS_ATOMIC_OPS)  /* NetBSD */
 
 #include <sys/atomic.h>
 #define HAS_ATOMIC_OPS 1

diff --git a/external/mit/libdrm/dist/xf86drm.c b/external/mit/libdrm/dist/xf86drm.c
@@ -1128,7 +1128,11 @@ int drmMap(int fd, drm_handle_t handle, drmSize size, drmAddressPtr address)
 
     size = (size + pagesize_mask) & ~pagesize_mask;
 
+#if !defined(__minix)
     *address = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle);
+#else
+    *address = MAP_FAILED;
+#endif /* !defined(__minix) */
     if (*address == MAP_FAILED)
 	return -errno;
     return 0;

diff --git a/external/mit/libpciaccess/dist/src/common_init.c b/external/mit/libpciaccess/dist/src/common_init.c
@@ -56,6 +56,8 @@ pci_system_init( void )
     err = pci_system_linux_sysfs_create();
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     err = pci_system_freebsd_create();
+#elif defined(__minix)
+    err = pci_system_minix_create();
 #elif defined(__NetBSD__)
     err = pci_system_netbsd_create();
 #elif defined(__OpenBSD__)

diff --git a/external/mit/libpciaccess/dist/src/common_interface.c b/external/mit/libpciaccess/dist/src/common_interface.c
@@ -74,7 +74,7 @@
 #define HTOLE_16(x)	htole16(x)
 #define HTOLE_32(x)	htole32(x)
 
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__minix)
 #define LETOH_16(x)	le16toh(x)
 #define LETOH_32(x)	le32toh(x)
 #else