diff options
Diffstat (limited to 'hw/xfree86/common')
26 files changed, 188 insertions, 74 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 2b66ddbdc..c101c41cd 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -116,6 +116,10 @@ extern int ffs(unsigned long); ; # endif +# if defined(__SUNPRO_C) +# define DO_PROTOTYPES +# endif + # if defined(NO_INLINE) || defined(DO_PROTOTYPES) # if !defined(__sparc__) && !defined(__arm32__) \ @@ -493,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11) # define outw(a,b) _outw(b,a) # define outl(a,b) _outl(b,a) -# elif defined(linux) && defined(__AMD64__) +# elif defined(linux) && defined(__amd64__) # include <inttypes.h> @@ -1728,7 +1732,7 @@ static __inline__ void ppc_flush_icache(char *addr) : : "r"(addr) : "memory"); } -# elif defined(__sparc__) +# elif defined(__sparc__) || defined(sparc) /* * Like powerpc, we provide byteswapping and no byteswapping functions * here with byteswapping as default, drivers that don't need byteswapping diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes index f7dc01216..1d72861e4 100644 --- a/hw/xfree86/common/extramodes +++ b/hw/xfree86/common/extramodes @@ -1,7 +1,7 @@ // // Extra modes to include as default modes in the X server. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ // # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl index e31fe28e1..abe995550 100644 --- a/hw/xfree86/common/modeline2c.pl +++ b/hw/xfree86/common/modeline2c.pl @@ -34,7 +34,7 @@ # the sale, use or other dealings in this Software without prior written # authorization from the copyright holder(s) and author(s). # -# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $ #my %flagshash; $flagshash{""} = "0"; diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes index d2df5931a..851643fa6 100644 --- a/hw/xfree86/common/vesamodes +++ b/hw/xfree86/common/vesamodes @@ -3,7 +3,7 @@ // "VESA and Industry Standards and Guide for Computer Display Monitor // Timing", version 1.0, revision 0.8, adopted September 17, 1998. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $ # 640x350 @ 85Hz (VESA) hsync: 37.9kHz diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 7c773fee6..5f4886724 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -265,7 +265,7 @@ xf86AutoConfig(void) " -v 0x%04x -d 0x%04x -r 0x%02x -s 0x%04x" " -b 0x%04x -c 0x%04x", path, - (unsigned int)xf86GetVersion(), + (unsigned int)xorgGetVersion(), searchPath, info->vendor, info->chipType, info->chipRev, info->subsysVendor, info->subsysCard, diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 8f6dd2803..fd5de965a 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */ +/* $XdotOrg$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* @@ -1101,7 +1102,7 @@ configInputKbd(IDevPtr inputp) #endif #ifdef XKB if (!xf86IsPc98()) { - xf86Info.xkbrules = "xfree86"; + xf86Info.xkbrules = __XKBDEFRULES__; xf86Info.xkbmodel = "pc105"; xf86Info.xkblayout = "us"; xf86Info.xkbvariant = NULL; diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 3dde4ba7d..3061aab33 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * @@ -499,7 +499,7 @@ configureLayoutSection (void) int scrnum = 0; parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec) - ptr->lay_identifier = "XFree86 Configured"; + ptr->lay_identifier = "X.org Configured"; { XF86ConfInputrefPtr iptr; @@ -632,8 +632,8 @@ configureModuleSection (void) /* Add only those font backends which are referenced by fontpath */ /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */ if (defaultFontPath && ( - (strcmp(*el, "xtt") == 0 && - strstr(defaultFontPath, "/TrueType")) || + (strcmp(*el, "freetype") == 0 && + strstr(defaultFontPath, "/TTF")) || (strcmp(*el, "type1") == 0 && strstr(defaultFontPath, "/Type1")) || (strcmp(*el, "speedo") == 0 && @@ -741,6 +741,16 @@ configureDDCMonitorSection (int screennum) case DS_ASCII_STR: case DS_SERIAL: case DS_RANGES: + ptr->mon_hsync[ptr->mon_n_hsync].lo = + ConfiguredMonitor->det_mon[i].section.ranges.min_h; + ptr->mon_hsync[ptr->mon_n_hsync].hi = + ConfiguredMonitor->det_mon[i].section.ranges.max_h; + ptr->mon_n_vrefresh = 1; + ptr->mon_vrefresh[ptr->mon_n_hsync].lo = + ConfiguredMonitor->det_mon[i].section.ranges.min_v; + ptr->mon_vrefresh[ptr->mon_n_hsync].hi = + ptr->mon_n_hsync++; + ConfiguredMonitor->det_mon[i].section.ranges.max_v; default: break; } @@ -967,29 +977,33 @@ DoConfigure() ErrorF("\n"); #ifdef SCO - ErrorF("\nXFree86 is using the kernel event driver to access the mouse.\n" - "If you wish to use the internal XFree86 mouse drivers, please\n" + ErrorF("\n"__XSERVERNAME__ + " is using the kernel event driver to access the mouse.\n" + "If you wish to use the internal "__XSERVERNAME__ + "mouse drivers, please\n" "edit the file and correct the Device.\n"); #else /* !SCO */ if (!foundMouse) { - ErrorF("\nXFree86 is not able to detect your mouse.\n" + ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" "Edit the file and correct the Device.\n"); } else { #ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */ - ErrorF("\nXFree86 detected your mouse at device %s.\n" + ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n" "Please check your config if the mouse is still not\n" - "operational, as by default XFree86 tries to autodetect\n" + "operational, as by default "__XSERVERNAME__ + " tries to autodetect\n" "the protocol.\n",DFLT_MOUSE_DEV); #endif } #endif /* !SCO */ if (xf86NumScreens > 1) { - ErrorF("\nXFree86 has configured a multihead system, please check your config.\n"); + ErrorF("\n"__XSERVERNAME__ + " has configured a multihead system, please check your config.\n"); } - ErrorF("\nYour XF86Config file is %s\n\n", filename); - ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename); + ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename); + ErrorF("To test the server, run 'X -xf86config %s'\n\n", filename); bail: OsCleanup(TRUE); diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 5e4bc29b6..bb63cca0e 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */ +/* $XdotOrg$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index a9f9a2021..b3e645723 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.1.4.2 2003/12/06 13:24:23 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 7257b204b..1d6d332ec 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */ +/* $XFree86$ */ /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at * modeline2c.pl */ diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 07dd88741..3a721a33f 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -49,6 +49,7 @@ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.1.4.3 2003/12/06 13:24:24 kaleb Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -402,7 +403,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) /* */ /* otherwise fallback to sending a key event message to */ /* the current screen's driver: */ - if (*pScr->HandleMessage) { + if (*pScr->HandleMessage != NULL) { (void) (*pScr->HandleMessage)(pScr->scrnIndex, "KeyEventMessage", message, &retstr); } diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 979b655ee..d3e36e02c 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -69,7 +69,7 @@ #include "xf86Priv.h" #include "xf86Config.h" #include "xf86_OSlib.h" -#include "xf86Version.h" +#include "xorgVersion.h" #include "xf86Date.h" #include "xf86Build.h" #include "mipointer.h" @@ -1262,12 +1262,17 @@ AbortDDX() void OsVendorFatalError() { - ErrorF("\nWhen reporting a problem related to a server crash, please send\n" - "the full server output, not just the last messages.\n"); - if (xf86LogFile && xf86LogFileWasOpened) - ErrorF("This can be found in the log file \"%s\".\n", xf86LogFile); - ErrorF("Please report problems to %s.\n", BUILDERADDR); - ErrorF("\n"); +#ifdef VENDORSUPPORT + ErrorF("\nPlease refer to your Operating System Vendor support pages\n" + "at %s for support on this crash.\n",VENDORSUPPORT); +#else + ErrorF("\nPlease consult the "XVENDORNAME" support \n" + "\t at "__VENDORDWEBSUPPORT__"\n for help. \n"); +#endif + if (xf86LogFile && xf86LogFileWasOpened) + ErrorF("Please also check the log file at \"%s\" for additional " + "information.\n", xf86LogFile); + ErrorF("\n"); } int @@ -1339,15 +1344,15 @@ ddxProcessArgument(int argc, char **argv, int i) return 2; } } - if (!strcmp(argv[i], "-xf86config")) + if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) { if (!argv[i + 1]) return 0; if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) { - FatalError("\nInvalid argument for -xf86config\n" - "\tFor non-root users, the file specified with -xf86config must be\n" + FatalError("\nInvalid argument for -config\n" + "\tFor non-root users, the file specified with -config must be\n" "\ta relative path and must not contain any \"..\" elements.\n" - "\tUsing default XF86Config search path.\n\n"); + "\tUsing default "__XCONFIGFILE__" search path.\n\n"); } xf86ConfigFile = argv[i + 1]; return 2; @@ -1636,6 +1641,11 @@ ddxProcessArgument(int argc, char **argv, int i) return xf86ProcessArgument(argc, argv, i); } +/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ +void ddxInitGlobals(void) +{ +} + /* * ddxUseMsg -- * Print out correct use of device dependent commandline options. @@ -1650,15 +1660,14 @@ ddxUseMsg() ErrorF("Device Dependent Usage\n"); if (getuid() == 0) { - ErrorF("-xf86config file specify a configuration file\n"); ErrorF("-modulepath paths specify the module search path\n"); ErrorF("-logfile file specify a log file name\n"); - ErrorF("-configure probe for devices and write an XF86Config\n"); + ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n"); } else { - ErrorF("-xf86config file specify a configuration file, relative to the\n"); - ErrorF(" XF86Config search path, only root can use absolute\n"); + ErrorF("-config file specify a configuration file, relative to the\n"); + ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n"); } ErrorF("-probeonly probe for devices, then exit\n"); ErrorF("-scanpci execute the scanpci module and exit\n"); @@ -1706,7 +1715,7 @@ ddxUseMsg() #define OSVENDOR "" #endif #ifndef PRE_RELEASE -#define PRE_RELEASE XF86_VERSION_SNAP +#define PRE_RELEASE XORG_VERSION_SNAP #endif static void @@ -1714,24 +1723,25 @@ xf86PrintBanner() { #if PRE_RELEASE ErrorF("\n" - "This is a pre-release version of XFree86, and is not supported in any\n" - "way. Bugs may be reported to XFree86@XFree86.Org and patches submitted\n" - "to fixes@XFree86.Org. Before reporting bugs in pre-release versions,\n" - "please check the latest version in the XFree86 CVS repository\n" - "(http://www.XFree86.Org/cvs).\n"); -#endif - ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR, - XF86_VERSION_PATCH); -#if XF86_VERSION_SNAP > 0 + "This is a pre-release version of the " XVENDORNAME " X11.\n" + "Portions of this release are based on XFree86 4.4RC2 and selected\n" + "files from XFree86 4.4RC3. It is not supported in any way.\n" + "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n" + "Select the \"xorg\" product for bugs you find in this release.\n" + "Before reporting bugs in pre-release versions please check the\n" + "latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n" + "repository hosted at http://www.freedesktop.org/Software/xorg/"); +#endif +#if XORG_VERSION_SNAP > 0 ErrorF(".%d", XF86_VERSION_SNAP); #endif -#if XF86_VERSION_SNAP >= 900 - ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1, - XF86_VERSION_SNAP - 900); +#if XORG_VERSION_SNAP >= 900 + ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1, + XORG_VERSION_SNAP - 900); #endif -#ifdef XF86_CUSTOM_VERSION +#ifdef XORG_CUSTOM_VERSION ErrorF(" (%s)", XF86_CUSTOM_VERSION); #endif ErrorF("\nRelease Date: %s\n", XF86_DATE); @@ -1779,7 +1789,7 @@ xf86PrintBanner() #if defined(BUILDERSTRING) ErrorF("%s \n",BUILDERSTRING); #endif - ErrorF("\tBefore reporting problems, check http://www.XFree86.Org/\n" + ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n" "\tto make sure that you have the latest version.\n"); #ifdef XFree86LOADER ErrorF("Module Loader present\n"); diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index fbbafd8af..3b7551fc5 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index fd2ff4a22..470fb7c95 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index bd18e895f..f0ac3bd59 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -63,11 +63,11 @@ typedef enum { /* Built-in ABI classes. These definitions must not be changed. */ #define ABI_CLASS_NONE NULL -#define ABI_CLASS_ANSIC "XFree86 ANSI C Emulation" -#define ABI_CLASS_VIDEODRV "XFree86 Video Driver" -#define ABI_CLASS_XINPUT "XFree86 XInput driver" -#define ABI_CLASS_EXTENSION "XFree86 Server Extension" -#define ABI_CLASS_FONT "XFree86 Font Renderer" +#define ABI_CLASS_ANSIC "X.Org ANSI C Emulation" +#define ABI_CLASS_VIDEODRV "X.Org Video Driver" +#define ABI_CLASS_XINPUT "X.Org XInput driver" +#define ABI_CLASS_EXTENSION "X.Org Server Extension" +#define ABI_CLASS_FONT "X.Org Font Renderer" #define ABI_MINOR_MASK 0x0000FFFF #define ABI_MAJOR_MASK 0xFFFF0000 @@ -95,9 +95,9 @@ typedef enum { #ifndef MODULEVENDORSTRING #ifndef __OS2ELF__ -#define MODULEVENDORSTRING "The XFree86 Project" +#define MODULEVENDORSTRING "X.Org Foundation" #else -#define MODULEVENDORSTRING "The XFree86 Project - XFree86/OS2" +#define MODULEVENDORSTRING "X.Org Foundation - OS2" #endif #endif @@ -129,10 +129,10 @@ typedef enum { * the video driver ABI are themselves video drivers. */ #define MOD_CLASS_NONE NULL -#define MOD_CLASS_VIDEODRV "XFree86 Video Driver" -#define MOD_CLASS_XINPUT "XFree86 XInput Driver" -#define MOD_CLASS_FONT "XFree86 Font Renderer" -#define MOD_CLASS_EXTENSION "XFree86 Server Extension" +#define MOD_CLASS_VIDEODRV "X.Org Video Driver" +#define MOD_CLASS_XINPUT "X.Org XInput Driver" +#define MOD_CLASS_FONT "X.Org Font Renderer" +#define MOD_CLASS_EXTENSION "X.Org Server Extension" /* This structure is expected to be returned by the initfunc */ typedef struct { diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 546c909ff..44574d5fb 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,5 +1,6 @@ +/* $XdotOrg$ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index 2eed84783..d40fcdaed 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */ /* @@ -58,3 +59,4 @@ #endif /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index f7cb065a4..52ab57f4a 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. @@ -26,7 +27,8 @@ * authorization from the copyright holder(s) and author(s). */ -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) +#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ + || (defined(sun) && defined(__SVR4)) #include <math.h> #else #define _XOPEN_SOURCE /* to get prototype for pow on some systems */ diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 641d1c919..790bf7409 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -310,7 +310,7 @@ FindPCIVideoInfo(void) (memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32; #else if (pcrp->pci_base1) - info->memBase[0] = 0; + info->memBase[0] = 0; #endif } } @@ -910,10 +910,15 @@ removeOverlapsWithBridges(int busIndex, resPtr target) { PciBusPtr pbp; resPtr tmp,bridgeRes = NULL; - resRange range = target->val; + resRange range; + if (!target) + return; + if (!ResCanOverlap(&target->val)) return; + + range = target->val; for (pbp=xf86PciBus; pbp; pbp = pbp->next) { if (pbp->primary == busIndex) { diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 87042cb14..801f2bafe 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ #include <ctype.h> #include <stdio.h> diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 0816c63a1..81c1b84ac 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index eedf47b8b..db19e1442 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -28,7 +28,7 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.38 2004/02/19 22:38:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index facc27842..33fedeb0f 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */ /* X Input Serial Buffer routines for use in any XInput driver that accesses diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 7b5e26a23..39ae2ee11 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */ +/* $XFree86$ */ #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c new file mode 100644 index 000000000..c6364f19e --- /dev/null +++ b/hw/xfree86/common/xorgHelper.c @@ -0,0 +1,20 @@ +/* $XdotOrg$ */ + +#include "X.h" +#include "os.h" +#include "servermd.h" +#include "pixmapstr.h" +#include "windowstr.h" +#include "propertyst.h" +#include "gcstruct.h" +#include "loaderProcs.h" +#include "xf86.h" +#include "xf86Priv.h" +#include "xorgVersion.h" + + +CARD32 +xorgGetVersion() +{ + return XORG_VERSION_CURRENT; +} diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h new file mode 100644 index 000000000..f40a452e6 --- /dev/null +++ b/hw/xfree86/common/xorgVersion.h @@ -0,0 +1,51 @@ +/* $XdotOrg$ */ + +/* + * Copyright (c) 2004, X.Org Foundation + * + * 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: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) 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 copyright holder(s) and author(s). + */ + +#ifndef XORG_VERSION_H +# define XORG_VERSION_H + +# ifndef XORG_VERSION_CURRENT +# error +# endif + +# define XORG_VERSION_NUMERIC(major,minor,patch,snap,dummy) \ + (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) + +# define XORG_GET_MAJOR_VERSION(vers) ((vers) / 10000000) +# define XORG_GET_MINOR_VERSION(vers) (((vers) % 10000000) / 100000) +# define XORG_GET_PATCH_VERSION(vers) (((vers) % 100000) / 1000) +# define XORG_GET_SNAP_VERSION(vers) ((vers) % 1000) + +# define XORG_VERSION_MAJOR XORG_GET_MAJOR_VERSION(XORG_VERSION_CURRENT) +# define XORG_VERSION_MINOR XORG_GET_MINOR_VERSION(XORG_VERSION_CURRENT) +# define XORG_VERSION_PATCH XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT) +# define XORG_VERSION_SNAP XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT) + +#endif +/* $XdotOrg$ */ |