head	1.24;
access;
symbols
	netbsd-7-2-RELEASE:1.23
	netbsd-7-1-2-RELEASE:1.23
	netbsd-7-1-1-RELEASE:1.23
	netbsd-7-1:1.23.0.22
	netbsd-7-1-RELEASE:1.23
	netbsd-7-1-RC2:1.23
	netbsd-7-1-RC1:1.23
	netbsd-7-0-2-RELEASE:1.23
	netbsd-7-0-1-RELEASE:1.23
	netbsd-7-0:1.23.0.20
	netbsd-7-0-RELEASE:1.23
	netbsd-7-0-RC3:1.23
	netbsd-7-0-RC2:1.23
	netbsd-7-0-RC1:1.23
	netbsd-5-2-3-RELEASE:1.23
	netbsd-5-1-5-RELEASE:1.23
	netbsd-6-0-6-RELEASE:1.23
	netbsd-6-1-5-RELEASE:1.23
	netbsd-7:1.23.0.18
	netbsd-7-base:1.23
	netbsd-6-1-4-RELEASE:1.23
	netbsd-6-0-5-RELEASE:1.23
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.23
	riastradh-drm2:1.23.0.16
	riastradh-drm2-base:1.23
	netbsd-6-1-3-RELEASE:1.23
	netbsd-6-0-4-RELEASE:1.23
	netbsd-5-2-2-RELEASE:1.23
	netbsd-5-1-4-RELEASE:1.23
	netbsd-6-1-2-RELEASE:1.23
	netbsd-6-0-3-RELEASE:1.23
	netbsd-5-2-1-RELEASE:1.23
	netbsd-5-1-3-RELEASE:1.23
	netbsd-6-1-1-RELEASE:1.23
	netbsd-6-1:1.23.0.14
	netbsd-6-0-2-RELEASE:1.23
	netbsd-6-1-RELEASE:1.23
	netbsd-6-1-RC4:1.23
	netbsd-6-1-RC3:1.23
	netbsd-6-1-RC2:1.23
	netbsd-6-1-RC1:1.23
	netbsd-5-2:1.23.0.12
	netbsd-6-0-1-RELEASE:1.23
	netbsd-5-2-RELEASE:1.23
	netbsd-5-2-RC1:1.23
	netbsd-6-0:1.23.0.10
	netbsd-6-0-RELEASE:1.23
	netbsd-6-0-RC2:1.23
	netbsd-6-0-RC1:1.23
	netbsd-6:1.23.0.8
	netbsd-6-base:1.23
	netbsd-5-1-2-RELEASE:1.23
	netbsd-5-1-1-RELEASE:1.23
	netbsd-5-1:1.23.0.6
	netbsd-5-1-RELEASE:1.23
	netbsd-5-1-RC4:1.23
	netbsd-5-1-RC3:1.23
	netbsd-5-1-RC2:1.23
	netbsd-5-1-RC1:1.23
	netbsd-5-0-2-RELEASE:1.23
	netbsd-5-0-1-RELEASE:1.23
	netbsd-5-0:1.23.0.4
	netbsd-5-0-RELEASE:1.23
	netbsd-5-0-RC4:1.23
	netbsd-5-0-RC3:1.23
	netbsd-5-0-RC2:1.23
	netbsd-5-0-RC1:1.23
	netbsd-5:1.23.0.2
	netbsd-5-base:1.23
	netbsd-4-0-1-RELEASE:1.22
	netbsd-4-0:1.22.0.6
	netbsd-4-0-RELEASE:1.22
	netbsd-4-0-RC5:1.22
	netbsd-4-0-RC4:1.22
	netbsd-4-0-RC3:1.22
	netbsd-4-0-RC2:1.22
	netbsd-4-0-RC1:1.22
	netbsd-3-1-1-RELEASE:1.18.2.1
	netbsd-3-0-3-RELEASE:1.18.2.1
	abandoned-netbsd-4-base:1.22
	abandoned-netbsd-4:1.22.0.2
	netbsd-3-1:1.18.2.1.0.4
	netbsd-3-1-RELEASE:1.18.2.1
	netbsd-3-0-2-RELEASE:1.18.2.1
	netbsd-3-1-RC4:1.18.2.1
	netbsd-3-1-RC3:1.18.2.1
	netbsd-3-1-RC2:1.18.2.1
	netbsd-3-1-RC1:1.18.2.1
	netbsd-4:1.22.0.4
	netbsd-4-base:1.22
	netbsd-3-0-1-RELEASE:1.18.2.1
	netbsd-3-0:1.18.2.1.0.2
	netbsd-3-0-RELEASE:1.18.2.1
	netbsd-3-0-RC6:1.18.2.1
	netbsd-3-0-RC5:1.18.2.1
	netbsd-3-0-RC4:1.18.2.1
	netbsd-3-0-RC3:1.18.2.1
	netbsd-3-0-RC2:1.18.2.1
	netbsd-3-0-RC1:1.18.2.1
	netbsd-2-0-3-RELEASE:1.17
	netbsd-2-1:1.17.0.6
	netbsd-2-1-RELEASE:1.17
	netbsd-2-1-RC6:1.17
	netbsd-2-1-RC5:1.17
	netbsd-2-1-RC4:1.17
	netbsd-2-1-RC3:1.17
	netbsd-2-1-RC2:1.17
	netbsd-2-1-RC1:1.17
	netbsd-2-0-2-RELEASE:1.17
	v4-5-0:1.1.1.7
	v4-5-0_beforeimport:1.18
	netbsd-3:1.18.0.2
	netbsd-3-base:1.18
	netbsd-2-0-1-RELEASE:1.17
	netbsd-2:1.17.0.4
	netbsd-2-base:1.17
	netbsd-2-0-RELEASE:1.17
	netbsd-2-0-RC5:1.17
	netbsd-2-0-RC4:1.17
	netbsd-2-0-RC3:1.17
	netbsd-2-0-RC2:1.17
	netbsd-2-0-RC1:1.17
	netbsd-2-0:1.17.0.2
	netbsd-2-0-base:1.17
	v4-4-0:1.1.1.6
	v4-4-0_beforeimport:1.15
	netbsd-1-6-PATCH002-RELEASE:1.13
	netbsd-1-6-PATCH002:1.13
	netbsd-1-6-PATCH002-RC4:1.13
	v4-3-0-2003-12-19:1.1.1.5
	netbsd-1-6-PATCH002-RC3:1.13
	netbsd-1-6-PATCH002-RC2:1.13
	netbsd-1-6-PATCH002-RC1:1.13
	netbsd-1-6:1.13.0.2
	netbsd-1-6-base:1.13
	v4-3-0:1.1.1.5
	v4-3-0_beforeimport:1.10
	netbsd-1-6-PATCH001:1.10
	netbsd-1-6-RELEASE:1.10
	v4-2-1:1.1.1.4
	v4-2-1_beforeimport:1.9
	netbsd-1-5-PATCH003:1.8
	v4-2-0:1.1.1.4
	netbsd-1-5-PATCH002:1.4
	netbsd-1-5-PATCH001:1.3
	v4-1-0:1.1.1.3
	v4-0-3:1.1.1.2
	v4-0-2:1.1.1.1
	XF86:1.1.1;
locks; strict;
comment	@# @;


1.24
date	2015.07.23.08.13.51;	author mrg;	state dead;
branches;
next	1.23;
commitid	3Fk7MoycOv7VSnuy;

1.23
date	2008.04.19.20.33.54;	author macallan;	state Exp;
branches;
next	1.22;

1.22
date	2005.09.22.18.50.35;	author macallan;	state Exp;
branches;
next	1.21;

1.21
date	2005.04.15.21.42.30;	author nakayama;	state Exp;
branches;
next	1.20;

1.20
date	2005.04.08.20.56.22;	author tron;	state Exp;
branches;
next	1.19;

1.19
date	2005.03.18.14.55.15;	author tron;	state Exp;
branches;
next	1.18;

1.18
date	2005.01.19.12.29.39;	author tsutsui;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2004.03.05.17.25.10;	author fvdl;	state Exp;
branches;
next	1.16;

1.16
date	2004.03.05.16.33.06;	author tron;	state Exp;
branches;
next	1.15;

1.15
date	2004.01.25.02.59.01;	author sekiya;	state Exp;
branches;
next	1.14;

1.14
date	2004.01.10.16.09.46;	author chris;	state Exp;
branches;
next	1.13;

1.13
date	2003.06.10.17.36.46;	author perry;	state Exp;
branches;
next	1.12;

1.12
date	2003.03.15.13.27.22;	author fvdl;	state Exp;
branches;
next	1.11;

1.11
date	2003.02.28.21.49.42;	author tron;	state Exp;
branches;
next	1.10;

1.10
date	2002.09.05.01.28.33;	author mycroft;	state Exp;
branches;
next	1.9;

1.9
date	2002.08.03.21.59.13;	author chris;	state Exp;
branches;
next	1.8;

1.8
date	2002.03.28.14.38.11;	author tron;	state Exp;
branches;
next	1.7;

1.7
date	2002.01.19.23.19.35;	author tron;	state Exp;
branches;
next	1.6;

1.6
date	2001.09.16.11.59.22;	author fvdl;	state Exp;
branches;
next	1.5;

1.5
date	2001.09.14.16.08.19;	author drochner;	state Exp;
branches;
next	1.4;

1.4
date	2001.06.09.17.56.50;	author tron;	state Exp;
branches;
next	1.3;

1.3
date	2001.03.18.19.35.57;	author veego;	state Exp;
branches;
next	1.2;

1.2
date	2001.01.13.15.44.54;	author simonb;	state Exp;
branches;
next	1.1;

1.1
date	2001.01.01.12.46.30;	author veego;	state Exp;
branches
	1.1.1.1;
next	;

1.18.2.1
date	2005.04.06.20.00.52;	author tron;	state Exp;
branches;
next	;

1.1.1.1
date	2001.01.01.12.46.30;	author veego;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2001.03.18.17.33.04;	author veego;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2001.06.09.15.08.13;	author tron;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2002.01.19.15.11.59;	author tron;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2003.02.28.13.20.20;	author tron;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2004.03.05.14.29.16;	author tron;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2005.03.18.13.12.33;	author tron;	state Exp;
branches;
next	;


desc
@@


1.24
log
@remove obsolete XFree86 sources.
@
text
@XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.68 2005/03/01 03:48:53 dawes Exp $
/*
 * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
 * All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject
 * to the following conditions:
 *
 *   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, and in the same place and form as other copyright,
 *       license and disclaimer information.
 *
 *   3.  The end-user documentation included with the redistribution,
 *       if any, must include the following acknowledgment: "This product
 *       includes software developed by The XFree86 Project, Inc
 *       (http://www.xfree86.org/) and its contributors", in the same
 *       place and form as other third-party acknowledgments.  Alternately,
 *       this acknowledgment may appear in the software itself, in the
 *       same form and location as other such third-party acknowledgments.
 *
 *   4.  Except as contained in this notice, the name of The XFree86
 *       Project, Inc shall not be used in advertising or otherwise to
 *       promote the sale, use or other dealings in this Software without
 *       prior written authorization from The XFree86 Project, Inc.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 XFREE86 PROJECT, INC OR ITS 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.
 */

#include <Server.tmpl>

#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
#if BuildXInputExt
# if JoystickSupport
 JOYSTICK_SRC = bsd_jstk.c
# endif
# if DoLoadableServer
SHARED_CFLAGS = PositionIndependentCFlags
# else
#  if JoystickSupport
 JOYSTICK_OBJ = bsd_jstk.o
#  endif
# endif
#endif
#endif

#if defined(NetBSDArchitecture) \
    && ((OSMajorVersion == 1 && OSMinorVersion >= 1) || OSMajorVersion >= 2)
# if defined(i386Architecture)
  IOPERMDEFINES = -DUSE_I386_IOPL
#elif defined(PpcArchitecture) || defined(sharkArchitecture)
  IOPERMDEFINES = -DUSE_PPC_MMAP
# elif !defined(ArmArchitecture) && \
       !defined(PpcArchitecture) && \
       !defined(MipsArchitecture) && \
       !defined(AlphaArchitecture)
  IOPERM_SRC = ioperm_noop.c
  IOPERM_OBJ = ioperm_noop.o
# endif
#elif defined(OpenBSDArchitecture) 
# if defined(i386Architecture) 
  IOPERMDEFINES = -DUSE_I386_IOPL
# elif defined(AMD64Architecture)
  IOPERMDEFINES = -DUSE_AMD64_IOPL
# elif defined(PpcArchitecture)
  IOPERMDEFINES = -DUSE_PPC_MMAP
# else
  IOPERM_SRC = ioperm_noop.c
  IOPERM_OBJ = ioperm_noop.o
# endif
#elif defined(FreeBSDArchitecture)
# if defined(i386Architecture) || defined(AMD64Architecture)
  IOPERMDEFINES = -DUSE_DEV_IO
# elif defined(AlphaBsdArchitecture)
  IOPERMDEFINES = -DUSE_ALPHA_PORTS
# else
  IOPERM_SRC = ioperm_noop.c
  IOPERM_OBJ = ioperm_noop.o
# endif
#endif

#if BuildXF86DRI
DRI_SRC = sigio.c
DRI_OBJ = sigio.o
#endif

MOUSESRC = bsd_mouse.c
MOUSEOBJ = bsd_mouse.o

KBDSRC = bsd_kbd.c bsd_KbdMap.c at_scancode.c
KBDOBJ = bsd_kbd.o bsd_KbdMap.o at_scancode.o

#if HasMTRRSupport
MTRRDEFINES = -DHAS_MTRR_SUPPORT
#endif

#if defined(NetBSDArchitecture) && defined(HasMTRRBuiltin)
MTRRDEFINES = -DHAS_MTRR_BUILTIN
#endif

#if UsbMouseSupport
USBMOUSEDEFINES1 = -DUSBMOUSE_SUPPORT
#if !HasLibUsb
LIBUSBINCLUDES = -Ilibusb
#define IHaveSubdirs
SUBDIRS = libusb
#else
#if HasLibUsbHid
USBMOUSEDEFINES2 = -DHAS_LIB_USB_HID
#endif
#endif
#endif
USBMOUSEDEFINES = $(USBMOUSEDEFINES1) $(USBMOUSEDEFINES2)

#if (defined(OpenBSDArchitecture) || defined(NetBSDArchitecture)) && defined(i386Architecture)
# if !defined(HasApmKqueue) || !HasApmKqueue
APMSRC = bsd_apm.c
APMOBJ = bsd_apm.o
# else
APMSRC = bsd_kqueue_apm.c
APMOBJ = bsd_kqueue_apm.o
# endif
#else
APMSRC = pm_noop.c
APMOBJ = pm_noop.o
#endif

#if defined(FreeBSDArchitecture) && (OSMajorVersion > 2)
KMODSRC = bsd_kmod.c
KMODOBJ = bsd_kmod.o
#else
KMODSRC = kmod_noop.c
KMODOBJ = kmod_noop.o
#endif

#if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture)
RES_SRC=stdResource.c
RES_OBJ=stdResource.o
#else
RES_SRC=bsdResource.c
RES_OBJ=bsdResource.o
#endif

#if defined(AlphaArchitecture) && defined(FreeBSDArchitecture)
AXP_SRC=bsd_ev56.c xf86Axp.c bsd_axp.c
AXP_OBJ=bsd_ev56.o xf86Axp.o bsd_axp.o
#endif
#if defined(AlphaArchitecture) && defined(NetBSDArchitecture)
AXP_SRC=bsd_ev56.c
AXP_OBJ=bsd_ev56.o
#endif

#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \
	defined(OpenBSDArchitecture)) && HasAgpGart
AGP_SRC=lnx_agp.c
AGP_OBJ=lnx_agp.o
#else
AGP_SRC=agp_noop.c
AGP_OBJ=agp_noop.o
#endif

#if defined(i386Architecture) || defined(AMD64Architecture)
VIDEO_SRC = i386_video.c
VIDEO_OBJ = i386_video.o
#elif defined(AlphaArchitecture)
VIDEO_SRC = alpha_video.c
VIDEO_OBJ = alpha_video.o
#elif defined(PpcArchitecture) || defined(sharkArchitecture)
VIDEO_SRC = ppc_video.c
VIDEO_OBJ = ppc_video.o
#elif defined(ArmArchitecture) || defined(CatsArchitecture)
VIDEO_SRC = arm_video.c
VIDEO_OBJ = arm_video.o
#elif defined(SparcArchitecture) || defined(Sparc64Architecture)
VIDEO_SRC = sparc64_video.c
VIDEO_OBJ = sparc64_video.o
#elif defined(MipsArchitecture)
VIDEO_SRC = mips_video.c
VIDEO_OBJ = mips_video.o
#else
#error Unknown architecture !
#endif

SRCS = bsd_init.c $(VIDEO_SRC) bsd_io.c bsd_VTsw.c \
       libc_wrapper.c $(IOPERM_SRC) std_kbdEv.c posix_tty.c $(MOUSESRC) \
       $(RES_SRC) stdPci.c vidmem.c $(JOYSTICK_SRC) sigio.c $(APMSRC) \
       $(AXP_SRC) $(KMODSRC) $(AGP_SRC) $(KBDSRC)

OBJS = bsd_init.o $(VIDEO_OBJ) bsd_io.o bsd_VTsw.o \
       libc_wrapper.o $(IOPERM_OBJ) std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
       $(RES_OBJ) stdPci.o vidmem.o $(JOYSTICK_OBJ) sigio.o $(APMOBJ) \
       $(AXP_OBJ) $(KMODOBJ) $(AGP_OBJ) $(KBDOBJ)

INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
           -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi $(APINCLUDES) \
	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared -I$(DRMINCLUDESDIR)

CONSDEFINES = XFree86ConsoleDefines
RESDEFINES = -DUSESTDRES

#if defined(HasNetBSDApertureDriver) && HasNetBSDApertureDriver
APDEFINES = -DHAS_APERTURE_DRV
#endif

DEFINES = $(CONSDEFINES) $(APDEFINES) $(IOPERMDEFINES) $(RESDEFINES) \
	  $(MTRRDEFINES) $(USBMOUSEDEFINES)

#if defined(AlphaArchitecture)
SpecialObjectRule(bsd_ev56.o, bsd_ev56.c, -mcpu=ev56)
#endif

SubdirLibraryRule($(OBJS))
NormalLibraryObjectRule()

#if BuildXF86DRI
#define IHaveSubdirs
SUBDIRS = drm

MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif

#if BuildXInputExt
# if DoLoadableServer
#  if JoystickSupport
AllTarget(bsd_jstk.o)
#if 0
InstallDynamicModule(bsd_jstk.o,$(MODULEDIR),input)
#endif
#  endif
# endif
#endif

#if !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) || \
	!defined(i386Architecture)
LinkSourceFile(pm_noop.c,../shared)
#endif
LinkSourceFile(ioperm_noop.c,../shared)
LinkSourceFile(std_kbdEv.c,../shared)
LinkSourceFile(at_scancode.c,../shared)
LinkSourceFile(posix_tty.c,../shared)
LinkSourceFile(libc_wrapper.c,../shared)
LinkSourceFile(stdResource.c,../shared)
LinkSourceFile(stdPci.c,../shared)
LinkSourceFile(vidmem.c,../shared)
LinkSourceFile(sigio.c,../shared)
LinkSourceFile(kmod_noop.c,../shared)
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \
	defined(OpenBSDArchitecture)) && HasAgpGart
LinkSourceFile(lnx_agp.c,../linux)
#else
LinkSourceFile(agp_noop.c,../shared)
#endif
#if defined(AlphaArchitecture)
LinkSourceFile(xf86Axp.c,../shared)
#endif

DependTarget()

#if UsbMouseSupport && !HasLibUsb
MakeSubdirs($(SUBDIRS))

DependSubdirs($(SUBDIRS))
#endif

#if 0
InstallDriverSDKDynamicModule(bsd_jstk.o,$(DRIVERSDKMODULEDIR))
#endif
@


1.23
log
@use ppc_video.c on NetBSD/shark as well.
There really isn't anything PowerPC-specific in this file and we can use the
same method to mmap() PCI IO space on other architectures as well. For
instance sparc64.
With this we can access VGA registers on shark. Just one more to go...
@
text
@@


1.22
log
@

Try to access the PCI IO area by mmap()ing offset 0xf2000000
Needs ofb.c 1.42 2005/09/22
This allows drivers that need IO access to work, for example tdfx.
@
text
@d70 1
a70 1
#elif defined(PpcArchitecture)
d187 1
a187 1
#elif defined(PpcArchitecture)
@


1.21
log
@Fix the previous commit; change the first condition from #elif to #if.
@
text
@d70 2
d73 1
d84 2
@


1.20
log
@Rearrange NetBSD-alpha PIO support so that it can be used from a XFree86
loadable module.
@
text
@d68 1
a68 1
# elif defined(i386Architecture)
@


1.19
log
@Resolve conflicts from import of XFree86 4.5.0.
@
text
@a67 2
# if defined(AlphaArchitecture)
  IOPERMDEFINES = -DUSE_ALPHA_PIO
d71 2
a72 1
       !defined(MipsArchitecture)
@


1.18
log
@- Get rid of nonexistent USE_ARC_MMAP and USE_ARM32_MMAP.
- Don't assume i386Architecture is default, use ioperm_noop.c instead.
@
text
@d1 47
a47 7
XCOMM $XConsortium: Imakefile /main/12 1996/10/27 11:06:35 kaleb $





XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.62 2003/11/07 23:57:47 dawes Exp $
d80 2
a115 2
SYSVIPCDEFINES = -DHAVE_SYSV_IPC

d211 1
a211 1
	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared
d221 1
a221 1
	  $(MTRRDEFINES) $(USBMOUSEDEFINES) $(SYSVIPCDEFINES)
@


1.18.2.1
log
@Apply patch (requested by jmc in ticket #114):
Update XFree86 to version 4.5.0.
@
text
@d1 7
a7 47
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.68 2005/03/01 03:48:53 dawes Exp $
/*
 * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
 * All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject
 * to the following conditions:
 *
 *   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, and in the same place and form as other copyright,
 *       license and disclaimer information.
 *
 *   3.  The end-user documentation included with the redistribution,
 *       if any, must include the following acknowledgment: "This product
 *       includes software developed by The XFree86 Project, Inc
 *       (http://www.xfree86.org/) and its contributors", in the same
 *       place and form as other third-party acknowledgments.  Alternately,
 *       this acknowledgment may appear in the software itself, in the
 *       same form and location as other such third-party acknowledgments.
 *
 *   4.  Except as contained in this notice, the name of The XFree86
 *       Project, Inc shall not be used in advertising or otherwise to
 *       promote the sale, use or other dealings in this Software without
 *       prior written authorization from The XFree86 Project, Inc.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 XFREE86 PROJECT, INC OR ITS 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.
 */
a39 2
# elif defined(AMD64Architecture)
  IOPERMDEFINES = -DUSE_AMD64_IOPL
d74 2
d171 1
a171 1
	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared -I$(DRMINCLUDESDIR)
d181 1
a181 1
	  $(MTRRDEFINES) $(USBMOUSEDEFINES)
@


1.17
log
@Remove usage of x86_64Archirecture, which has been changed to
AMD64Architecture.
@
text
@d30 4
a33 6
# elif defined(ArcArchitecture)
  IOPERMDEFINES = -DUSE_ARC_MMAP
# elif defined(ArmArchitecture) || defined(CatsArchitecture)
  IOPERMDEFINES = -DUSE_ARM32_MMAP
# elif defined(PpcArchitecture) || \
	defined(Sparc64Architecture)
a35 2
# else
  IOPERMDEFINES = -DUSE_I386_IOPL
@


1.16
log
@Resolve conflicts from import of XFree86 4.4.0.
@
text
@d115 1
a115 1
#if defined(i386Architecture) || defined(ia64Architecture) || defined(x86_64Architecture)
@


1.15
log
@Add support for MIPS-based platforms (mips_video.c is cloned from ppc_video.c,
other changes are preprocessor-related).
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.57 2003/02/17 16:37:19 dawes Exp $
d44 1
a44 1
# elif defined(PpcArchitecture) || defined(Sparc64Architecture) 
d48 2
a49 1
#elif defined(FreeBSDArchitecture) && !defined(AlphaBsdArchitecture)
d51 1
a51 2
#else
# if defined(AlphaBsdArchitecture)
a77 1
#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
a78 1
#endif
d132 2
a133 1
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)) && HasAgpGart
d141 1
a141 1
#if defined(i386Architecture) || defined(x86_64Architecture)
d153 1
a153 1
#elif defined(Sparc64Architecture)
d227 2
a228 1
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)) && HasAgpGart
@


1.14
log
@Make cats support compile, however it still doesn't work.
@
text
@d157 3
@


1.13
log
@We HAVE_SYSV_IPC
Noted by Quentin Garnier
XXX Someone should submit this back to the XFree86 folks, and I have no
XXX idea how. Could someone help? :(
@
text
@d32 1
a32 1
# elif defined(Arm32Architecture)
d151 1
a151 1
#elif defined(Arm32Architecture)
@


1.12
log
@Add support for NetBSD/x86_64.
@
text
@d78 1
a78 1
#if defined(FreeBSDArchitecture)
@


1.11
log
@Resolve conflicts from import of XFree86 4.3.0.
@
text
@d117 1
a117 1
#if defined(i386Architecture) || defined(ia64Architecture)
d142 1
a142 1
#if defined(i386Architecture)
@


1.10
log
@Update Alpha mapping support.  Tested on a PWS600 with a TGA2, but should
work on others as well.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.50 2001/12/31 18:18:49 herrb Exp $
d26 1
a26 1
#if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) \
d29 1
a29 1
 IOPERMDEFINES = -DUSE_ALPHA_PIO
d31 1
a31 1
 IOPERMDEFINES = -DUSE_ARC_MMAP
d33 3
a35 4
 IOPERMDEFINES = -DUSE_ARM32_MMAP
# elif defined(CatsArchitecture)
 IOPERMDEFINES = -DUSE_CATS_MMAP
# elif defined(PpcArchitecture)
d39 8
a46 1
 IOPERMDEFINES = -DUSE_I386_IOPL
d49 1
a49 1
 IOPERMDEFINES = -DUSE_DEV_IO
d52 1
a52 1
 IOPERMDEFINES = -DUSE_ALPHA_PORTS
d54 2
a55 2
IOPERM_SRC = ioperm_noop.c
IOPERM_OBJ = ioperm_noop.o
d67 3
d78 4
d142 20
a161 1
SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c \
d164 1
a164 1
       $(AXP_SRC) $(KMODSRC) $(AGP_SRC)
d166 1
a166 1
OBJS = bsd_init.o bsd_video.o bsd_io.o bsd_VTsw.o \
d169 1
a169 1
       $(AXP_OBJ) $(KMODOBJ) $(AGP_OBJ)
d178 1
a178 1
#if HasNetBSDApertureDriver
d183 1
a183 1
	  $(MTRRDEFINES) $(USBMOUSEDEFINES)
d217 1
@


1.9
log
@Add support for cats to X 4.2.0.

Note that some changes are generic arm changes, some aren't but are enclosed with #if defined(__arm__).  Currently the only arm port supported by X 4.2.0 is cats, so this is not a problem.  However shark support should be relatively easy based upon on the cats changes.

Ideally a few more things should be abstracted out, so that we can run the same X server on shark and cats, but currently my aim is to get X working just in time for NetBSD 1.6 release.

This has been tested on a s3virge card on my cats, I've also checked that i386 isn't broken by any of these changes.
@
text
@d112 1
a112 1
#if defined(AlphaArchitecture)
d115 4
@


1.8
log
@Avoid build problems if aperture support is enabled on system with NetBSD
before release 1.5Y. This fixes PR xsrc/14545 and PR xsrc/16105.
@
text
@d34 2
@


1.7
log
@Resolve conflicts from last import.
@
text
@a140 1
APDIR = NetBSDApertureDir
a141 1
APINCLUDES = -I$(APDIR)/include
@


1.6
log
@Use builtin MTRR support for NetBSD 1.5Y and up.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.47 2001/02/15 19:34:20 eich Exp $
d68 1
a68 1
USBMOUSEDEFINES = -DUSBMOUSE_SUPPORT
d73 4
d79 1
d81 2
a82 3

#if (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)) \
	&& defined(i386Architecture)
d85 4
@


1.5
log
@build the linux agpgart support if HasAgpGart is defined
@
text
@d63 4
@


1.4
log
@Resolve conflicts from import of XFree86 4.1.0.
@
text
@d103 1
a103 1
#if defined(FreeBSDArchitecture) && HasAgpGart
d176 1
a176 1
#if defined(FreeBSDArchitecture) && HasAgpGart
@


1.3
log
@Resolve conflicts of the import of XFree86 4.0.3.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.45 2000/08/16 01:45:29 dawes Exp $
@


1.2
log
@Initial support for XFree86 on Alpha.

This should be considered alpha quality code - it's only been tested on
one model Alpha (a PC164) with one model graphics card (Matrox G200).
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.46 2000/11/06 19:24:08 dawes Exp $
d99 2
a100 2
AXP_SRC=bsd_ev56.c
AXP_OBJ=bsd_ev56.o
d123 1
a123 1
	    $(LIBUSBINCLUDES)
d180 3
@


1.1
log
@Initial revision
@
text
@d28 3
a30 1
# if defined(ArcArchitecture)
@


1.1.1.1
log
@Initial import of XFree86 4.x
@
text
@@


1.1.1.2
log
@Import of XFree86 4.0.3
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.45 2000/08/16 01:45:29 dawes Exp $
d97 2
a98 2
AXP_SRC=bsd_ev56.c xf86Axp.c bsd_axp.c
AXP_OBJ=bsd_ev56.o xf86Axp.o bsd_axp.o
d121 1
a121 1
	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared
a177 3
#endif
#if defined(AlphaArchitecture)
LinkSourceFile(xf86Axp.c,../shared)
@


1.1.1.3
log
@Import of XFree86 4.1.0.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.47 2001/02/15 19:34:20 eich Exp $
@


1.1.1.4
log
@Import of XFree86 4.2.0.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.50 2001/12/31 18:18:49 herrb Exp $
a60 4
#if defined(NetBSDArchitecture) && defined(HasMTRRBuiltin)
MTRRDEFINES = -DHAS_MTRR_BUILTIN
#endif

d62 1
a62 1
USBMOUSEDEFINES1 = -DUSBMOUSE_SUPPORT
a66 3
#else
#if HasLibUsbHid
USBMOUSEDEFINES2 = -DHAS_LIB_USB_HID
a68 2
#endif
USBMOUSEDEFINES = $(USBMOUSEDEFINES1) $(USBMOUSEDEFINES2)
d70 3
a72 2
#if (defined(OpenBSDArchitecture) || defined(NetBSDArchitecture)) && defined(i386Architecture)
# if !defined(HasApmKqueue) || !HasApmKqueue
a74 4
# else
APMSRC = bsd_kqueue_apm.c
APMOBJ = bsd_kqueue_apm.o
# endif
d101 1
a101 1
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)) && HasAgpGart
d174 1
a174 1
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)) && HasAgpGart
@


1.1.1.5
log
@Import of XFree86 4.3.0.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.57 2003/02/17 16:37:19 dawes Exp $
d26 1
a26 1
#if defined(NetBSDArchitecture) \
d28 2
a29 4
# if defined(AlphaArchitecture)
  IOPERMDEFINES = -DUSE_ALPHA_PIO
# elif defined(ArcArchitecture)
  IOPERMDEFINES = -DUSE_ARC_MMAP
d31 2
a32 3
  IOPERMDEFINES = -DUSE_ARM32_MMAP
# elif defined(PpcArchitecture) || \
	defined(Sparc64Architecture)
d36 1
a36 8
  IOPERMDEFINES = -DUSE_I386_IOPL
# endif
#elif defined(OpenBSDArchitecture) 
# if defined(i386Architecture) 
  IOPERMDEFINES = -DUSE_I386_IOPL
# elif defined(PpcArchitecture) || defined(Sparc64Architecture) 
  IOPERM_SRC = ioperm_noop.c
  IOPERM_OBJ = ioperm_noop.o
d39 1
a39 1
  IOPERMDEFINES = -DUSE_DEV_IO
d42 1
a42 1
  IOPERMDEFINES = -DUSE_ALPHA_PORTS
d44 2
a45 2
  IOPERM_SRC = ioperm_noop.c
  IOPERM_OBJ = ioperm_noop.o
a56 3
KBDSRC = bsd_kbd.c bsd_KbdMap.c at_scancode.c
KBDOBJ = bsd_kbd.o bsd_KbdMap.o at_scancode.o

a64 4
#if defined(FreeBSDArchitecture)
SYSVIPCDEFINES = -DHAVE_SYSV_IPC
#endif

d121 1
a121 20
#if defined(i386Architecture)
VIDEO_SRC = i386_video.c
VIDEO_OBJ = i386_video.o
#elif defined(AlphaArchitecture)
VIDEO_SRC = alpha_video.c
VIDEO_OBJ = alpha_video.o
#elif defined(PpcArchitecture)
VIDEO_SRC = ppc_video.c
VIDEO_OBJ = ppc_video.o
#elif defined(Arm32Architecture)
VIDEO_SRC = arm_video.c
VIDEO_OBJ = arm_video.o
#elif defined(Sparc64Architecture)
VIDEO_SRC = sparc64_video.c
VIDEO_OBJ = sparc64_video.o
#else
#error Unknown architecture !
#endif

SRCS = bsd_init.c $(VIDEO_SRC) bsd_io.c bsd_VTsw.c \
d124 1
a124 1
       $(AXP_SRC) $(KMODSRC) $(AGP_SRC) $(KBDSRC)
d126 1
a126 1
OBJS = bsd_init.o $(VIDEO_OBJ) bsd_io.o bsd_VTsw.o \
d129 1
a129 1
       $(AXP_OBJ) $(KMODOBJ) $(AGP_OBJ) $(KBDOBJ)
d138 2
a139 1
#if defined(HasNetBSDApertureDriver) && HasNetBSDApertureDriver
d141 1
d145 1
a145 1
	  $(MTRRDEFINES) $(USBMOUSEDEFINES) $(SYSVIPCDEFINES)
a178 1
LinkSourceFile(at_scancode.c,../shared)
@


1.1.1.6
log
@Import of XFree86 4.4.0.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.62 2003/11/07 23:57:47 dawes Exp $
d44 1
a44 1
# else
d48 1
a48 2
#elif defined(FreeBSDArchitecture)
# if defined(i386Architecture) || defined(AMD64Architecture)
d50 2
a51 1
# elif defined(AlphaBsdArchitecture)
d78 1
d80 1
d130 1
a130 2
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \
	defined(OpenBSDArchitecture)) && HasAgpGart
d138 1
a138 1
#if defined(i386Architecture) || defined(AMD64Architecture)
d150 1
a150 1
#elif defined(SparcArchitecture) || defined(Sparc64Architecture)
d221 1
a221 2
#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \
	defined(OpenBSDArchitecture)) && HasAgpGart
@


1.1.1.7
log
@Import of XFree86 4.5.0.
@
text
@d1 7
a7 47
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.68 2005/03/01 03:48:53 dawes Exp $
/*
 * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
 * All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject
 * to the following conditions:
 *
 *   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, and in the same place and form as other copyright,
 *       license and disclaimer information.
 *
 *   3.  The end-user documentation included with the redistribution,
 *       if any, must include the following acknowledgment: "This product
 *       includes software developed by The XFree86 Project, Inc
 *       (http://www.xfree86.org/) and its contributors", in the same
 *       place and form as other third-party acknowledgments.  Alternately,
 *       this acknowledgment may appear in the software itself, in the
 *       same form and location as other such third-party acknowledgments.
 *
 *   4.  Except as contained in this notice, the name of The XFree86
 *       Project, Inc shall not be used in advertising or otherwise to
 *       promote the sale, use or other dealings in this Software without
 *       prior written authorization from The XFree86 Project, Inc.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 XFREE86 PROJECT, INC OR ITS 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.
 */
a43 2
# elif defined(AMD64Architecture)
  IOPERMDEFINES = -DUSE_AMD64_IOPL
d78 2
d168 1
a168 1
	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared -I$(DRMINCLUDESDIR)
d178 1
a178 1
	  $(MTRRDEFINES) $(USBMOUSEDEFINES)
@