xserver: Branch 'master' - 8 commits
Adam Jackson
ajax at kemper.freedesktop.org
Wed Jul 18 12:45:50 PDT 2007
hw/xfree86/common/xf86.h | 16 -----
hw/xfree86/common/xf86Configure.c | 65 +--------------------
hw/xfree86/common/xf86Cursor.c | 10 ---
hw/xfree86/common/xf86Debug.c | 117 --------------------------------------
hw/xfree86/common/xf86Events.c | 10 ---
hw/xfree86/common/xf86Helper.c | 14 ----
hw/xfree86/common/xf86Init.c | 69 ----------------------
hw/xfree86/common/xf86Priv.h | 3
hw/xfree86/common/xf86pciBus.c | 24 -------
hw/xfree86/loader/xf86sym.c | 21 ------
10 files changed, 7 insertions(+), 342 deletions(-)
New commits:
diff-tree 21bbd7d64b5f74915afd7a312e589654442f3461 (from 1f71f0c0574bafb36da20fec669f9a1138c69a47)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:42:50 2007 -0500
Delete some pre-dlloader debugging scaffolding.
If your loader is as bad as elfloader, then it makes sense for the
server to have some stubs for you to assign to / break on. However it
is no longer 1996.
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index ba68a7e..f2cf78c 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -85,14 +85,6 @@ extern Bool xf86inSuspend;
#define PIX24TOBPP(p) (((p) == Pix24Use24) ? 24 : \
(((p) == Pix24Use32) ? 32 : 0))
-/* variables for debugging */
-#ifdef BUILDDEBUG
-extern char* xf86p8bit[];
-extern CARD32 xf86DummyVar1;
-extern CARD32 xf86DummyVar2;
-extern CARD32 xf86DummyVar3;
-#endif
-
/* Function Prototypes */
#ifndef _NO_XF86_PROTOTYPES
@@ -365,9 +357,6 @@ void xf86DeleteModuleInfo(int idx);
/* xf86Debug.c */
#ifdef BUILDDEBUG
- void xf86Break1(void);
-void xf86Break2(void);
-void xf86Break3(void);
CARD8 xf86PeekFb8(CARD8 *p);
CARD16 xf86PeekFb16(CARD16 *p);
CARD32 xf86PeekFb32(CARD32 *p);
@@ -380,8 +369,6 @@ CARD32 xf86PeekMmio32(pointer Base, unsi
void xf86PokeMmio8(pointer Base, unsigned long Offset, CARD8 v);
void xf86PokeMmio16(pointer Base, unsigned long Offset, CARD16 v);
void xf86PokeMmio32(pointer Base, unsigned long Offset, CARD32 v);
-extern void xf86SPTimestamp(xf86TsPtr* timestamp, char* string);
-extern void xf86STimestamp(xf86TsPtr* timestamp);
#endif
/* xf86Init.c */
diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c
index 781c0e5..5b60965 100644
--- a/hw/xfree86/common/xf86Debug.c
+++ b/hw/xfree86/common/xf86Debug.c
@@ -39,88 +39,6 @@
#include "xf86_OSlib.h"
#include "compiler.h"
-_X_EXPORT void xf86Break1(void)
-{
-}
-
-_X_EXPORT void xf86Break2(void)
-{
-}
-
-_X_EXPORT void xf86Break3(void)
-{
-}
-
-_X_EXPORT char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011",
- "00000100", "00000101", "00000110", "00000111",
- "00001000", "00001001", "00001010", "00001011",
- "00001100", "00001101", "00001110", "00001111",
- "00010000", "00010001", "00010010", "00010011",
- "00010100", "00010101", "00010110", "00010111",
- "00011000", "00011001", "00011010", "00011011",
- "00011100", "00011101", "00011110", "00011111",
- "00100000", "00100001", "00100010", "00100011",
- "00100100", "00100101", "00100110", "00100111",
- "00101000", "00101001", "00101010", "00101011",
- "00101100", "00101101", "00101110", "00101111",
- "00110000", "00110001", "00110010", "00110011",
- "00110100", "00110101", "00110110", "00110111",
- "00111000", "00111001", "00111010", "00111011",
- "00111100", "00111101", "00111110", "00111111",
- "01000000", "01000001", "01000010", "01000011",
- "01000100", "01000101", "01000110", "01000111",
- "01001000", "01001001", "01001010", "01001011",
- "01001100", "01001101", "01001110", "01001111",
- "01010000", "01010001", "01010010", "01010011",
- "01010100", "01010101", "01010110", "01010111",
- "01011000", "01011001", "01011010", "01011011",
- "01011100", "01011101", "01011110", "01011111",
- "01100000", "01100001", "01100010", "01100011",
- "01100100", "01100101", "01100110", "01100111",
- "01101000", "01101001", "01101010", "01101011",
- "01101100", "01101101", "01101110", "01101111",
- "01110000", "01110001", "01110010", "01110011",
- "01110100", "01110101", "01110110", "01110111",
- "01111000", "01111001", "01111010", "01111011",
- "01111100", "01111101", "01111110", "01111111",
- "10000000", "10000001", "10000010", "10000011",
- "10000100", "10000101", "10000110", "10000111",
- "10001000", "10001001", "10001010", "10001011",
- "10001100", "10001101", "10001110", "10001111",
- "10010000", "10010001", "10010010", "10010011",
- "10010100", "10010101", "10010110", "10010111",
- "10011000", "10011001", "10011010", "10011011",
- "10011100", "10011101", "10011110", "10011111",
- "10100000", "10100001", "10100010", "10100011",
- "10100100", "10100101", "10100110", "10100111",
- "10101000", "10101001", "10101010", "10101011",
- "10101100", "10101101", "10101110", "10101111",
- "10110000", "10110001", "10110010", "10110011",
- "10110100", "10110101", "10110110", "10110111",
- "10111000", "10111001", "10111010", "10111011",
- "10111100", "10111101", "10111110", "10111111",
- "11000000", "11000001", "11000010", "11000011",
- "11000100", "11000101", "11000110", "11000111",
- "11001000", "11001001", "11001010", "11001011",
- "11001100", "11001101", "11001110", "11001111",
- "11010000", "11010001", "11010010", "11010011",
- "11010100", "11010101", "11010110", "11010111",
- "11011000", "11011001", "11011010", "11011011",
- "11011100", "11011101", "11011110", "11011111",
- "11100000", "11100001", "11100010", "11100011",
- "11100100", "11100101", "11100110", "11100111",
- "11101000", "11101001", "11101010", "11101011",
- "11101100", "11101101", "11101110", "11101111",
- "11110000", "11110001", "11110010", "11110011",
- "11110100", "11110101", "11110110", "11110111",
- "11111000", "11111001", "11111010", "11111011",
- "11111100", "11111101", "11111110", "11111111"
-};
-
-_X_EXPORT CARD32 xf86DummyVar1;
-_X_EXPORT CARD32 xf86DummyVar2;
-_X_EXPORT CARD32 xf86DummyVar3;
-
CARD8 xf86PeekFb8(CARD8 *p) { return *p; }
CARD16 xf86PeekFb16(CARD16 *p) { return *p; }
CARD32 xf86PeekFb32(CARD32 *p) { return *p; }
@@ -157,38 +75,3 @@ void xf86PokeMmio32(pointer Base, unsign
{
MMIO_OUT32(Base,Offset,v);
}
-
-
-#if 0
-_X_EXPORT void
-xf86STimestamp(xf86TsPtr* timestamp)
-{
- if (*timestamp) {
- gettimeofday((struct timeval*)*timestamp,NULL);
- } else {
- *timestamp = xnfalloc(sizeof(xf86TsRec));
- gettimeofday((struct timeval*)*timestamp,NULL);
- }
-}
-
-_X_EXPORT void
-xf86SPTimestamp(xf86TsPtr* timestamp, char *str)
-{
- if (*timestamp) {
- long diff;
- struct timeval ts;
- ts = **(struct timeval**)timestamp;
- gettimeofday((struct timeval*)*timestamp,NULL);
- if (ts.tv_usec > (*timestamp)->usec)
- diff = ((*timestamp)->sec - ts.tv_sec - 1) * 1000
- + (ts.tv_usec - (*timestamp)->usec) / 1000;
- else
- diff = ((*timestamp)->sec - ts.tv_sec) * 1000
- +(- ts.tv_usec + (*timestamp)->usec) / 1000;
- ErrorF("%s Elapsed: %li\n",str,diff);
- } else {
- *timestamp = xnfalloc(sizeof(xf86TsRec));
- gettimeofday((struct timeval*)*timestamp,NULL);
- }
-}
-#endif
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 8da0d20..d925bed 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -706,15 +706,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(DPMSSet)
SYMFUNC(DPMSSupported)
#endif
-/* xf86Debug.c */
-#ifdef BUILDDEBUG
- SYMFUNC(xf86Break1)
- SYMFUNC(xf86Break2)
- SYMFUNC(xf86Break3)
- SYMFUNC(xf86SPTimestamp)
- SYMFUNC(xf86STimestamp)
-#endif
-
SYMFUNC(pciFindFirst)
SYMFUNC(pciFindNext)
SYMFUNC(pciWriteByte)
@@ -1127,13 +1118,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMVAR(xf86Screens)
SYMVAR(byte_reversed)
SYMVAR(xf86inSuspend)
- /* debugging variables */
-#ifdef BUILDDEBUG
- SYMVAR(xf86p8bit)
- SYMVAR(xf86DummyVar1)
- SYMVAR(xf86DummyVar2)
- SYMVAR(xf86DummyVar3)
-#endif
/* predefined resource lists from xf86Bus.h */
SYMVAR(resVgaExclusive)
diff-tree 1f71f0c0574bafb36da20fec669f9a1138c69a47 (from 0a63d874e9c2f4fe4b38839a744461f9d41040b2)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:28:03 2007 -0500
Remove (long-)deprecated xf86EnablePciBusMaster.
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 169a957..ba68a7e 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -165,9 +165,6 @@ pciVideoPtr xf86FindPciDeviceVendor(CARD
char n, pciVideoPtr pvp_exclude);
pciVideoPtr xf86FindPciClass(CARD8 intf, CARD8 subClass, CARD16 class,
char n, pciVideoPtr pvp_exclude);
-#ifdef INCLUDE_DEPRECATED
-void xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable);
-#endif
void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg);
Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func);
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index ae33568..096b789 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -28,8 +28,6 @@
/*
* This file contains the interfaces to the bus-specific code
*/
-#define INCLUDE_DEPRECATED 1
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
@@ -3451,25 +3449,3 @@ pciConvertRange2Host(int entityIndex, re
tag = TAG(pvp);
pciTagConvertRange2Host(tag, pRange);
}
-
-
-#ifdef INCLUDE_DEPRECATED
-_X_EXPORT void
-xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable)
-{
- CARD32 temp;
- PCITAG tag;
-
- if (!pPci) return;
-
- tag = pciTag(pPci->bus, pPci->device, pPci->func);
- temp = pciReadLong(tag, PCI_CMD_STAT_REG);
- if (enable) {
- updateAccessInfoStatusControlInfo(tag, temp | PCI_CMD_MASTER_ENABLE);
- pciWriteLong(tag, PCI_CMD_STAT_REG, temp | PCI_CMD_MASTER_ENABLE);
- } else {
- updateAccessInfoStatusControlInfo(tag, temp & ~PCI_CMD_MASTER_ENABLE);
- pciWriteLong(tag, PCI_CMD_STAT_REG, temp & ~PCI_CMD_MASTER_ENABLE);
- }
-}
-#endif /* INCLUDE_DEPRECATED */
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index aae3629..8da0d20 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -46,8 +46,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-#define INCLUDE_DEPRECATED 1
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
@@ -350,9 +348,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86FindScreenForEntity)
SYMFUNC(xf86FindPciDeviceVendor)
SYMFUNC(xf86FindPciClass)
-#ifdef INCLUDE_DEPRECATED
- SYMFUNC(xf86EnablePciBusMaster)
-#endif
SYMFUNC(xf86RegisterStateChangeNotificationCallback)
SYMFUNC(xf86DeregisterStateChangeNotificationCallback)
SYMFUNC(xf86NoSharedResources)
diff-tree 0a63d874e9c2f4fe4b38839a744461f9d41040b2 (from 9a1c6afd12caf0143483f72bfbba0c4c3daaa6ff)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:22:49 2007 -0500
Always normalize the module name.
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 2717a9c..4636af4 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2429,12 +2429,8 @@ xf86LoadOneModule(char *name, pointer op
if (!name)
return NULL;
-#ifndef NORMALISE_MODULE_NAME
- Name = xstrdup(name);
-#else
/* Normalise the module name */
Name = xf86NormalizeName(name);
-#endif
/* Skip empty names */
if (Name == NULL)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0975898..666a424 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1769,12 +1769,8 @@ xf86LoadModules(char **list, pointer *op
for (i = 0; list[i] != NULL; i++) {
-#ifndef NORMALISE_MODULE_NAME
- name = xstrdup(list[i]);
-#else
/* Normalise the module name */
name = xf86NormalizeName(list[i]);
-#endif
/* Skip empty names */
if (name == NULL || *name == '\0')
diff-tree 9a1c6afd12caf0143483f72bfbba0c4c3daaa6ff (from 8ca2fe8914af1a67bf597f99025e5cbe9b08da57)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:19:50 2007 -0500
Remove dead code for screen crossing.
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 44c1a77..9e6e622 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -406,18 +406,14 @@ xf86CursorOffScreen(ScreenPtr *pScreen,
/*
* xf86CrossScreen --
* Switch to another screen
+ *
+ * Currently nothing special happens, but mi assumes the CrossScreen
+ * method exists.
*/
-/* NEED TO CHECK THIS */
-/* ARGSUSED */
static void
xf86CrossScreen (ScreenPtr pScreen, Bool entering)
{
-#if 0
- if (xf86Info.sharedMonitor)
- (XF86SCRNINFO(pScreen)->EnterLeaveMonitor)(entering);
- (XF86SCRNINFO(pScreen)->EnterLeaveCursor)(entering);
-#endif
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 4418a3c..0975898 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -881,14 +881,6 @@ InitOutput(ScreenInfo *pScreenInfo, int
xf86Msg(xf86Info.randRFrom, "RandR %s\n",
xf86Info.disableRandR ? "disabled" : "enabled");
#endif
-#ifdef NOT_USED
- /*
- * Here we have to let the driver getting access of the VT. Note that
- * this doesn't mean that the graphics board may access automatically
- * the monitor. If the monitor is shared this is done in xf86CrossScreen!
- */
- if (!xf86Info.sharedMonitor) (xf86Screens[i]->EnterLeaveMonitor)(ENTER);
-#endif
}
xf86PostScreenInit();
diff-tree 8ca2fe8914af1a67bf597f99025e5cbe9b08da57 (from e2413cc7cae4e578b8e9b408ea85bef596b03ea3)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:11:13 2007 -0500
Delete dead module test code.
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 9690bc5..4418a3c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -313,39 +313,6 @@ InitOutput(ScreenInfo *pScreenInfo, int
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
}
-#ifdef TESTING
- {
- char **list, **l;
- const char *subdirs[] = {
- "drivers",
- NULL
- };
- const char *patlist[] = {
- "(.*)_drv\\.so",
- "(.*)_drv\\.o",
- NULL
- };
- ErrorF("Getting module listing...\n");
- list = LoaderListDirs(NULL, NULL);
- if (list)
- for (l = list; *l; l++)
- ErrorF("module: %s\n", *l);
- LoaderFreeDirList(list);
- ErrorF("Getting video driver listing...\n");
- list = LoaderListDirs(subdirs, NULL);
- if (list)
- for (l = list; *l; l++)
- ErrorF("video driver: %s\n", *l);
- LoaderFreeDirList(list);
- ErrorF("Getting driver listing...\n");
- list = LoaderListDirs(NULL, patlist);
- if (list)
- for (l = list; *l; l++)
- ErrorF("video driver: %s\n", *l);
- LoaderFreeDirList(list);
- }
-#endif
-
/* Force load mandatory base modules */
if (!xf86LoadModules(baseModules, NULL))
FatalError("Unable to load required base modules, Exiting...\n");
diff-tree e2413cc7cae4e578b8e9b408ea85bef596b03ea3 (from d1d65a84150dfbc3a4dbe108f237a85ab6e09bbb)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:07:37 2007 -0500
Remove MEMDEBUG
This existed (but may not have worked) in the monolith, but is gone now.
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index bbb5855..dd9c34e 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -764,16 +764,6 @@ xf86SigHandler(int signo)
FatalError("Caught signal %d. Server aborting\n", signo);
}
-#ifdef MEMDEBUG
-void
-xf86SigMemDebug(int signo)
-{
- CheckMemory();
- (void) signal(signo, xf86SigMemDebug);
- return;
-}
-#endif
-
static void
xf86ReleaseKeys(DeviceIntPtr pDev)
{
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0afbe12..9690bc5 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -230,9 +230,6 @@ PostConfigInit(void)
#ifdef SIGXFSZ
signal(SIGXFSZ,xf86SigHandler);
#endif
-#ifdef MEMDEBUG
- signal(SIGUSR2,xf86SigMemDebug);
-#endif
}
#ifdef XF86PM
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 59ce8da..b6fbd3a 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -174,9 +174,6 @@ void xf86PostKbdEvent(unsigned key);
void xf86PostMseEvent(DeviceIntPtr device, int buttons, int dx, int dy);
void xf86Wakeup(pointer blockData, int err, pointer pReadmask);
void xf86SigHandler(int signo);
-#ifdef MEMDEBUG
-void xf86SigMemDebug(int signo);
-#endif
void xf86HandlePMEvents(int fd, pointer data);
extern int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);
extern pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);
diff-tree d1d65a84150dfbc3a4dbe108f237a85ab6e09bbb (from cbe74394a5ed21ed80c0aab6eefd2716122cce11)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 21:01:08 2007 -0500
Dead ifdefs for BITMAP_SCANLINE_UNIT == 64
This appears to be a legacy of cfb24 not being smart enough to deal with this
case. But since cfb24 unexists, die die die.
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index e0b758f..2717a9c 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -481,16 +481,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int de
scrp->bitsPerPixelFrom = X_DEFAULT;
scrp->depthFrom = X_DEFAULT;
-#if BITMAP_SCANLINE_UNIT == 64
- /*
- * For platforms with 64-bit scanlines, modify the driver's depth24flags
- * to remove preferences for packed 24bpp modes, which are not currently
- * supported on these platforms.
- */
- depth24flags &= ~(SupportConvert32to24 | SupportConvert32to24 |
- PreferConvert24to32 | PreferConvert32to24);
-#endif
-
if (xf86FbBpp > 0) {
scrp->bitsPerPixel = xf86FbBpp;
scrp->bitsPerPixelFrom = X_CMDLINE;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index c0775d1..0afbe12 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -761,27 +761,6 @@ InitOutput(ScreenInfo *pScreenInfo, int
}
}
-#if BITMAP_SCANLINE_UNIT == 64
- /*
- * cfb24 doesn't currently work on architectures with a 64 bit
- * BITMAP_SCANLINE_UNIT, so check for 24 bit pixel size for pixmaps
- * or framebuffers.
- */
- {
- Bool usesCfb24 = FALSE;
-
- if (PIX24TOBPP(pix24) == 24)
- usesCfb24 = TRUE;
- for (i = 0; i < xf86NumScreens; i++)
- if (xf86Screens[i]->bitsPerPixel == 24)
- usesCfb24 = TRUE;
- if (usesCfb24) {
- FatalError("24-bit pixel size is not supported on systems with"
- " 64-bit scanlines.\n");
- }
- }
-#endif
-
#ifdef XKB
xf86InitXkb();
#endif
diff-tree cbe74394a5ed21ed80c0aab6eefd2716122cce11 (from 5657fb065cc79ba3ca5a836f45637ba9894f9abf)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Tue Feb 6 20:44:34 2007 -0500
Nuke dead X -configure code.
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index abe986e..19f040b 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -268,17 +268,6 @@ configureInputSection (void)
/* Crude mechanism to auto-detect mouse (os dependent) */
{
int fd;
-#if 0 && defined linux
- /* Our autodetection code can do a better job */
- int len;
- char path[32];
-
- if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) {
- path[len] = '\0';
- if (strstr(path, "psaux") != NULL)
- DFLT_MOUSE_PROTO = "PS/2";
- }
-#endif
#ifdef WSCONS_SUPPORT
fd = open("/dev/wsmouse", 0);
if (fd > 0) {
@@ -320,29 +309,6 @@ configureInputSection (void)
return ptr;
}
-static XF86ConfDRIPtr
-configureDRISection (void)
-{
-#ifdef NOTYET
- parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec)
-
- return ptr;
-#else
- return NULL;
-#endif
-}
-
-static XF86ConfVendorPtr
-configureVendorSection (void)
-{
- parsePrologue (XF86ConfVendorPtr, XF86ConfVendorRec)
-
- return NULL;
-#if 0
- return ptr;
-#endif
-}
-
static XF86ConfScreenPtr
configureScreenSection (int screennum)
{
@@ -564,29 +530,6 @@ configureLayoutSection (void)
return ptr;
}
-static XF86ConfModesPtr
-configureModesSection (void)
-{
-#ifdef NOTYET
- parsePrologue (XF86ConfModesPtr, XF86ConfModesRec)
-
- return ptr;
-#else
- return NULL;
-#endif
-}
-
-static XF86ConfVideoAdaptorPtr
-configureVideoAdaptorSection (void)
-{
- parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec)
-
- return NULL;
-#if 0
- return ptr;
-#endif
-}
-
static XF86ConfFlagsPtr
configureFlagsSection (void)
{
@@ -859,10 +802,10 @@ DoConfigure()
xf86config->conf_files = configureFilesSection();
xf86config->conf_modules = configureModuleSection();
xf86config->conf_flags = configureFlagsSection();
- xf86config->conf_videoadaptor_lst = configureVideoAdaptorSection();
- xf86config->conf_modes_lst = configureModesSection();
- xf86config->conf_vendor_lst = configureVendorSection();
- xf86config->conf_dri = configureDRISection();
+ xf86config->conf_videoadaptor_lst = NULL;
+ xf86config->conf_modes_lst = NULL;
+ xf86config->conf_vendor_lst = NULL;
+ xf86config->conf_dri = NULL;
xf86config->conf_input_lst = configureInputSection();
xf86config->conf_layout_lst = configureLayoutSection();
More information about the xorg-commit
mailing list