summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/xfree86/common/compiler.h35
-rw-r--r--hw/xfree86/common/xf86Configure.c10
-rw-r--r--hw/xfree86/common/xf86Events.c26
-rw-r--r--hw/xfree86/common/xf86cmap.c3
-rw-r--r--hw/xfree86/os-support/assyntax.h2
-rw-r--r--hw/xfree86/os-support/xf86_OSlib.h67
-rw-r--r--hw/xfree86/os-support/xf86_OSproc.h4
-rw-r--r--hw/xfree86/utils/xorgcfg/startx.c5
-rw-r--r--include/servermd.h4
-rw-r--r--mi/miinitext.c3
-rw-r--r--os/access.c17
-rw-r--r--os/osdep.h3
-rw-r--r--os/osinit.c2
-rw-r--r--os/utils.c5
-rw-r--r--xkb/xkbAccessX.c3
15 files changed, 8 insertions, 181 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 9e9234f97..fe041c73d 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -84,30 +84,6 @@
# define inl RealInl
# endif
-# if defined(QNX4) /* Do this for now to keep Watcom happy */
-# define outb outp
-# define outw outpw
-# define outl outpd
-# define inb inp
-# define inw inpw
-# define inl inpd
-
-/* Define the ffs function for inlining */
-extern int ffs(unsigned long);
-# pragma aux ffs_ = \
- "bsf edx, eax" \
- "jnz bits_set" \
- "xor eax, eax" \
- "jmp exit1" \
- "bits_set:" \
- "mov eax, edx" \
- "inc eax" \
- "exit1:" \
- __parm [eax] \
- __modify [eax edx] \
- __value [eax] \
- ;
-# endif
# if defined(__SUNPRO_C)
# define DO_PROTOTYPES
@@ -1511,7 +1487,6 @@ inl(unsigned short port)
# endif /* ix86 */
# else /* !GNUC */
-# if !defined(QNX4)
# if defined(__STDC__) && (__STDC__ == 1)
# ifndef asm
# define asm __asm
@@ -1542,7 +1517,6 @@ inl(unsigned short port)
# pragma asm partial_optimization inw
# pragma asm partial_optimization inb
# endif
-# endif
# define ldq_u(p) (*((unsigned long *)(p)))
# define ldl_u(p) (*((unsigned int *)(p)))
# define ldw_u(p) (*((unsigned short *)(p)))
@@ -1553,15 +1527,6 @@ inl(unsigned short port)
# define write_mem_barrier() /* NOP */
# endif /* __GNUC__ */
-# if defined(QNX4)
-# include <sys/types.h>
-extern unsigned inb(unsigned port);
-extern unsigned inw(unsigned port);
-extern unsigned inl(unsigned port);
-extern void outb(unsigned port, unsigned val);
-extern void outw(unsigned port, unsigned val);
-extern void outl(unsigned port, unsigned val);
-# endif /* QNX4 */
# if defined(IODEBUG) && defined(__GNUC__)
# undef inb
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 536f89700..119a0a8e3 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -76,12 +76,6 @@ static char *DFLT_MOUSE_PROTO = "OSMouse";
#elif defined(__UNIXWARE__)
static char *DFLT_MOUSE_PROTO = "OSMouse";
static char *DFLT_MOUSE_DEV = "/dev/mouse";
-#elif defined(QNX4)
-static char *DFLT_MOUSE_PROTO = "OSMouse";
-static char *DFLT_MOUSE_DEV = "/dev/mouse";
-#elif defined(__QNXNTO__)
-static char *DFLT_MOUSE_PROTO = "OSMouse";
-static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0";
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
static char *DFLT_MOUSE_PROTO = "auto";
@@ -797,11 +791,7 @@ DoConfigure()
if (home[0] == '/' && home[1] == '\0')
home[0] = '\0';
-#ifndef QNX4
sprintf(filename, "%s/%s", home,configfile);
-#else
- sprintf(filename, "//%d%s/%s", getnid(),home,configfile);
-#endif
}
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 6385b7884..832de106c 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -285,12 +285,8 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
#if defined(__SCO__) || defined(__UNIXWARE__)
vtno--;
#endif
-#if defined(QNX4)
- xf86Info.vtRequestsPending = vtno;
-#else
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0)
ErrorF("Failed to switch consoles (%s)\n", strerror(errno));
-#endif
}
break;
case ACTION_SWITCHSCREEN_NEXT:
@@ -373,7 +369,6 @@ xf86CommonSpecialKey(int key, Bool down, int modifiers)
void
xf86Wakeup(pointer blockData, int err, pointer pReadmask)
{
-#if !defined(__QNX__)
fd_set* LastSelectMask = (fd_set*)pReadmask;
fd_set devicesWithInput;
InputInfoPtr pInfo;
@@ -400,27 +395,6 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
}
}
}
-#else /* __QNX__ */
-
- InputInfoPtr pInfo;
-
- pInfo = xf86InputDevs;
- while (pInfo) {
- if (pInfo->read_input && pInfo->fd >= 0) {
- int sigstate = xf86BlockSIGIO();
-
- pInfo->read_input(pInfo);
- xf86UnblockSIGIO(sigstate);
- /*
- * Must break here because more than one device may share
- * the same file descriptor.
- */
- break;
- }
- pInfo = pInfo->next;
- }
-
-#endif /* __QNX__ */
if (err >= 0) { /* we don't want the handlers called if select() */
IHPtr ih; /* returned with an error condition, do we? */
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 764647ee4..8ae193a52 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -29,8 +29,7 @@
#include <xorg-config.h>
#endif
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
- || (defined(sun) && defined(__SVR4))
+#if defined(_XOPEN_SOURCE) || defined(sun) && defined(__SVR4)
#include <math.h>
#else
#define _XOPEN_SOURCE /* to get prototype for pow on some systems */
diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h
index 2d7e17f83..4f8bbbfba 100644
--- a/hw/xfree86/os-support/assyntax.h
+++ b/hw/xfree86/os-support/assyntax.h
@@ -236,7 +236,7 @@
#endif /* ACK_ASSEMBLER */
-#if defined(__QNX__) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
+#if (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
#define GLNAME(a) a
#else
#define GLNAME(a) CONCAT(_,a)
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index b43c14df4..7469d558f 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -477,73 +477,6 @@
/* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
/**************************************************************************/
-/* QNX4 */
-/**************************************************************************/
-/* This is the QNX code for Watcom 10.6 and QNX 4.x */
-#if defined(QNX4)
-#include <signal.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <ioctl.h>
-#include <sys/param.h>
-
-/* Warning: by default, the fd_set size is 32 in QNX! */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-
- /* keyboard types */
-# define KB_84 1
-# define KB_101 2
-# define KB_OTHER 3
-
- /* LEDs */
-# define LED_CAP 0x04
-# define LED_NUM 0x02
-# define LED_SCR 0x01
-
-# define POSIX_TTY
-
-#define TIOCM_DTR 0x0001 /* data terminal ready */
-#define TIOCM_RTS 0x0002 /* request to send */
-#define TIOCM_CTS 0x1000 /* clear to send */
-#define TIOCM_DSR 0x2000 /* data set ready */
-#define TIOCM_RI 0x4000 /* ring */
-#define TIOCM_RNG TIOCM_RI
-#define TIOCM_CD 0x8000 /* carrier detect */
-#define TIOCM_CAR TIOCM_CD
-#define TIOCM_LE 0x0100 /* line enable */
-#define TIOCM_ST 0x0200 /* secondary transmit */
-#define TIOCM_SR 0x0400 /* secondary receive */
-
-#endif
-
-/**************************************************************************/
-/* QNX/Neutrino */
-/**************************************************************************/
-/* This is the Neutrino code for for NTO2.0 and GCC */
-#if defined(__QNXNTO__)
-#include <signal.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <ioctl.h>
-#include <sys/param.h>
-
-/* Warning: by default, the fd_set size is 32 in NTO! */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-
- /* keyboard types */
-# define KB_84 1
-# define KB_101 2
-# define KB_OTHER 3
-
-# define POSIX_TTY
-
-#endif
-
-/**************************************************************************/
/* IRIX */
/**************************************************************************/
#if defined(sgi)
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index abf5a47c2..74c2dc0f2 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -151,10 +151,6 @@ extern void xf86EnableInterrupts(void);
extern void xf86SetTVOut(int);
extern void xf86SetRGBOut(void);
extern void xf86OSRingBell(int, int, int);
-#if defined(QNX4)
-#pragma aux xf86BusToMem modify [eax ebx ecx edx esi edi];
-#pragma aux xf86MemToBus modify [eax ebx ecx edx esi edi];
-#endif
extern void xf86BusToMem(unsigned char *, unsigned char *, int);
extern void xf86MemToBus(unsigned char *, unsigned char *, int);
extern void xf86IODelay(void);
diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c
index 507afbf15..47713ffb0 100644
--- a/hw/xfree86/utils/xorgcfg/startx.c
+++ b/hw/xfree86/utils/xorgcfg/startx.c
@@ -82,12 +82,7 @@ startx(void)
if ((home = getenv("HOME")) == NULL)
home = "/";
-#ifndef QNX4
XmuSnprintf(filename, sizeof(filename), "%s/"__XCONFIGFILE__".new", home);
-#else
- XmuSnprintf(filename, sizeof(filename), "//%d%s/"__XCONFIGFILE__".new",
- getnid(), home);
-#endif
/* this memory is never released, even if the value of XF86Config_path is
* changed.
diff --git a/include/servermd.h b/include/servermd.h
index 6624cd921..13414f740 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -234,9 +234,9 @@ SOFTWARE.
/* ???? */
#endif /* AMD64 */
-#if (defined(SVR4) && (defined(__i386__) || (defined(__i386)))) || \
+#if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
defined(__alpha__) || defined(__alpha) || \
- defined(__i386__) || defined(__QNX__) || \
+ defined(__i386__) || \
defined(__s390x__) || defined(__s390__)
#ifndef IMAGE_BYTE_ORDER
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 67249dc80..cd0a843a4 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -83,9 +83,6 @@ SOFTWARE.
#include "micmap.h"
#include "globals.h"
-#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
-#undef GLXEXT
-#endif
extern Bool noTestExtensions;
diff --git a/os/access.c b/os/access.c
index 93e33b52f..c973cb114 100644
--- a/os/access.c
+++ b/os/access.c
@@ -95,7 +95,7 @@ SOFTWARE.
# endif
#endif
-#if defined(hpux) || defined(QNX4)
+#if defined(hpux)
# include <sys/utsname.h>
# ifdef HAS_IFREQ
# include <net/if.h>
@@ -350,7 +350,7 @@ ifioctl (int fd, int cmd, char *arg)
* for this fd and add them to the selfhosts list.
*/
-#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4)
+#if !defined(SIOCGIFCONF) || defined (hpux) && ! defined (HAS_IFREQ)
void
DefineSelf (int fd)
{
@@ -393,19 +393,11 @@ DefineSelf (int fd)
* uname() lets me access to the whole string (it smashes release, you
* see), whereas gethostname() kindly truncates it for me.
*/
-#ifndef QNX4
#ifndef WIN32
uname(&name);
#else
gethostname(name.nodename, sizeof(name.nodename));
#endif
-#else
- /* QNX4's uname returns node number in name.nodename, not the hostname
- have to overwrite it */
- char hname[1024];
- gethostname(hname, 1024);
- name.nodename = hname;
-#endif
hp = _XGethostbyname(name.nodename, hparams);
if (hp != NULL)
@@ -514,14 +506,9 @@ DefineLocalHost:
p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
#define ifraddr_size(a) (a.sa_len)
#else
-#ifdef QNX4
-#define ifr_size(p) (p->ifr_addr.sa_len + IFNAMSIZ)
-#define ifraddr_size(a) (a.sa_len)
-#else
#define ifr_size(p) (sizeof (ifr_type))
#define ifraddr_size(a) (sizeof (a))
#endif
-#endif
#if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6))
#include <arpa/inet.h>
diff --git a/os/osdep.h b/os/osdep.h
index 2f7bd7585..1b8dcf7ad 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -68,9 +68,6 @@ SOFTWARE.
#endif
#endif
-#ifdef __QNX__
-#define NOFILES_MAX 256
-#endif
#ifndef OPEN_MAX
#ifdef SVR4
#define OPEN_MAX 256
diff --git a/os/osinit.c b/os/osinit.c
index 7a16c0b1d..93e1d039f 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -71,7 +71,7 @@ SOFTWARE.
#include <sys/wait.h>
#endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
#include <sys/resource.h>
#endif
diff --git a/os/utils.c b/os/utils.c
index 67ab6d93d..35f1e849d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -94,7 +94,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#ifndef WIN32
#include <sys/wait.h>
#endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
#include <sys/resource.h>
#endif
#include <sys/stat.h>
@@ -1823,9 +1823,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
enum BadCode bad = NotBad;
int i = 0, j;
char *a, *e = NULL;
-#if defined(__QNX__) && !defined(__QNXNTO__)
- char cmd_name[64];
-#endif
#if CHECK_EUID
if (geteuid() == 0 && getuid() != geteuid())
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 3f45e23c1..658e41f01 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -30,9 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#ifdef __QNX__
-#include <limits.h>
-#endif
#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 19:07:47 +0000