[xserver-commit] xserver/hw/xizzle/common Makefile.am,3.4,3.5 xf86.h,3.179,3.180 xf86Config.c,3.284,3.285 xf86DPMS.c,1.13,1.14 xf86Events.c,3.164,3.165 xf86Helper.c,1.140,1.141 xf86Init.c,3.219,3.220 xf86Privstr.h,1.42,1.43 xf86XKB.c,3.14,3.15 xf86Xinput.c,3.73,3.74

Daniel Stone xserver-commit@pdx.freedesktop.org
Previous message: [xserver-commit] xserver/hw/xizzle Makefile.am,1.10,1.11
Next message: [xserver-commit] xserver/hw/xizzle/dummylib Makefile.am,1.2,1.3
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/common
In directory pdx:/tmp/cvs-serv1952/common

Modified Files:
	Makefile.am xf86.h xf86Config.c xf86DPMS.c xf86Events.c 
	xf86Helper.c xf86Init.c xf86Privstr.h xf86XKB.c xf86Xinput.c 
Log Message:
Link errors: and then there was one.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/Makefile.am,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/Makefile.am	10 Mar 2004 11:50:31 -0000	3.4
+++ b/Makefile.am	10 Mar 2004 12:39:40 -0000	3.5
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libxizzlecommon.a libxizzlehelper.a
+lib_LIBRARIES = libxizzlecommon.a libxizzlehelper.a libxizzlemode.a
 
 if XIZZLE_BUS_SBUS
 SBUS_SOURCES = xf86sbusBus.c
@@ -44,12 +44,13 @@
                             xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
                             xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
                             xf86Globals.c xf86Init.c xf86Io.c \
-                            xf86MiscExt.c xf86Mode.c xf86Option.c \
-                            xf86VidMode.c xf86fbman.c xf86cmap.c xf86PM.c \
+                            xf86MiscExt.c xf86Option.c xf86PM.c \
+                            xf86VidMode.c xf86fbman.c xf86cmap.c \
                             xf86Versions.c $(XVSOURCES) $(BUSSOURCES) \
                             $(XKBSOURCES) $(DEBUGSOURCES) $(XISOURCES) \
                             $(RANDRSOURCES) $(KBDSOURCES)
 libxizzlehelper_a_SOURCES = xf86Helper.c
+libxizzlemode_a_SOURCES = xf86Mode.c
 
 AM_CFLAGS = $(XIZZLE_CFLAGS)
 

Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86.h,v
retrieving revision 3.179
retrieving revision 3.180
diff -u -d -r3.179 -r3.180
--- a/xf86.h	7 Mar 2004 11:58:13 -0000	3.179
+++ b/xf86.h	10 Mar 2004 12:39:40 -0000	3.180
@@ -445,8 +445,6 @@
 
 #endif /* _NO_XF86_PROTOTYPES */
 
-/* this is an absolutely terrible hack to fix an absolutely terrible hack; the
- * wrong solution to the wrong problem. -daniel */
 extern Bool noXkbExtension;
 
 /* FIXME FIXME FIXME XXX FIXME FIXME */

Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Config.c,v
retrieving revision 3.284
retrieving revision 3.285
diff -u -d -r3.284 -r3.285
--- a/xf86Config.c	10 Mar 2004 11:50:31 -0000	3.284
+++ b/xf86Config.c	10 Mar 2004 12:39:40 -0000	3.285
@@ -1004,7 +1004,6 @@
     if (i >= 0)
 	ScreenSaverTime = defaultScreenSaverTime = i * MILLI_PER_MIN;
 
-#ifdef DPMSExtension
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i);
     if (i >= 0)
@@ -1017,7 +1016,6 @@
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
     if (i >= 0)
 	DPMSOffTime = defaultDPMSOffTime = i * MILLI_PER_MIN;
-#endif
 
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_PIXMAP, &i);

Index: xf86DPMS.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86DPMS.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/xf86DPMS.c	28 Feb 2004 01:27:38 -0000	1.13
+++ b/xf86DPMS.c	10 Mar 2004 12:39:40 -0000	1.14
@@ -39,25 +39,29 @@
 #include "globals.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#ifdef DPMSExtension
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
-#endif
 
-
-#ifdef DPMSExtension
+CARD16 DPMSPowerLevel;
+Bool DPMSDisabledSwitch = FALSE;
+Bool DPMSEnabledSwitch = TRUE;
+Bool DPMSEnabled;
+CARD32 defaultDPMSSuspendTime;
+CARD32 defaultDPMSStandbyTime;
+CARD32 defaultDPMSOffTime;
+CARD32 DPMSSuspendTime;
+CARD32 DPMSStandbyTime;
+CARD32 DPMSOffTime;
 static int DPMSGeneration = 0;
 static int DPMSIndex = -1;
 static Bool DPMSClose(int i, ScreenPtr pScreen);
 static int DPMSCount = 0;
-#endif
 
 
 Bool
 xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 {
-#ifdef DPMSExtension
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     DPMSPtr pDPMS;
     pointer DPMSOpt;
@@ -96,14 +100,9 @@
     pScreen->CloseScreen = DPMSClose;
     DPMSCount++;
     return TRUE;
-#else
-    return FALSE;
-#endif
 }
 
 
-#ifdef DPMSExtension
-
 static Bool
 DPMSClose(int i, ScreenPtr pScreen)
 {
@@ -206,5 +205,3 @@
 {
     return DPMSPowerLevel;
 }
-
-#endif /* DPMSExtension */

Index: xf86Events.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Events.c,v
retrieving revision 3.164
retrieving revision 3.165
diff -u -d -r3.164 -r3.165
--- a/xf86Events.c	10 Mar 2004 11:50:31 -0000	3.164
+++ b/xf86Events.c	10 Mar 2004 12:39:40 -0000	3.165
@@ -623,7 +623,7 @@
 #ifdef __linux__
 customkeycodes:
 #endif
-#if defined(i386) || defined(__i386__)
+#if 0 && (defined(i386) || defined(__i386__))
   if (xf86IsPc98()) {
     switch (scanCode) {
       case 0x0e: specialkey = 0x0e; break; /* KEY_BackSpace */
@@ -746,7 +746,7 @@
 	break;
 #endif
 
-#if defined(linux) || (defined(CSRG_BASED) && (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT))) || defined(SCO)
+#if defined(linux) || (defined(CSRG_BASED) && (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)))
 	/*
 	 * Under Linux, the raw keycodes are consumed before the kernel
 	 * does any processing on them, so we must emulate the vt switching

Index: xf86Helper.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Helper.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- a/xf86Helper.c	10 Mar 2004 11:50:31 -0000	1.140
+++ b/xf86Helper.c	10 Mar 2004 12:39:40 -0000	1.141
@@ -1311,10 +1311,10 @@
 		     xf86Screens[scrnIndex]->name, scrnIndex);
 
 	strcat(tmpFormat, format);
-	LogVMessageVerb(type, verb, tmpFormat, args);
+	/* XXX LogVMessageVerb(type, verb, tmpFormat, args); */
 	xfree(tmpFormat);
-    } else
-	LogVMessageVerb(type, verb, format, args);
+    } /* else */
+	/* XXX LogVMessageVerb(type, verb, format, args); */
 }
 #undef PREFIX_SIZE
 
@@ -1407,7 +1407,7 @@
 	xf86LogFile = lf;
     }
 
-    /* LogInit(xf86LogFile, NULL); */
+    /* XXX LogInit(xf86LogFile, NULL); */
     xf86LogFileWasOpened = TRUE;
 
     xf86SetVerbosity(xf86Verbose);
@@ -1420,7 +1420,7 @@
 void
 xf86CloseLog()
 {
-    LogClose();
+    /* XXX LogClose(); */
 }
 
 
@@ -2320,7 +2320,7 @@
     return xf86Info.allowMouseOpenFail;
 }
 
-
+#if 0
 Bool
 xf86IsPc98()
 {
@@ -2330,6 +2330,7 @@
     return FALSE;
 #endif
 }
+#endif
 
 void
 xf86DisableRandR()

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Init.c,v
retrieving revision 3.219
retrieving revision 3.220
diff -u -d -r3.219 -r3.220
--- a/xf86Init.c	10 Mar 2004 11:50:31 -0000	3.219
+++ b/xf86Init.c	10 Mar 2004 12:39:40 -0000	3.220
@@ -119,6 +119,7 @@
 #endif
 static Bool formatsDone = FALSE;
 
+
 InputDriverRec xf86KEYBOARD = {
 	1,
 	"keyboard",
@@ -1668,7 +1669,7 @@
 static void
 xf86PrintMarkers()
 {
-  LogPrintMarkers();
+  /* XXX LogPrintMarkers(); */
 }
 
 static void

Index: xf86Privstr.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Privstr.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- a/xf86Privstr.h	19 Feb 2004 03:51:36 -0000	1.42
+++ b/xf86Privstr.h	10 Mar 2004 12:39:40 -0000	1.43
@@ -177,14 +177,12 @@
     } grabInfo;
 } xf86InfoRec, *xf86InfoPtr;
 
-#ifdef DPMSExtension
 /* Private info for DPMS */
 typedef struct {
     CloseScreenProcPtr	CloseScreen;
     Bool		Enabled;
     int			Flags;
 } DPMSRec, *DPMSPtr;
-#endif
 
 #ifdef XF86VIDMODE
 /* Private info for Video Mode Extentsion */

Index: xf86XKB.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86XKB.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- a/xf86XKB.c	28 Feb 2004 01:27:38 -0000	3.14
+++ b/xf86XKB.c	10 Mar 2004 12:39:40 -0000	3.15
@@ -75,6 +75,8 @@
 
 #include <X11/extensions/XKBsrv.h>
 
+Bool noXkbExtension = FALSE;
+
 void
 xf86InitXkb(void)
 {

Index: xf86Xinput.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Xinput.c,v
retrieving revision 3.73
retrieving revision 3.74
diff -u -d -r3.73 -r3.74
--- a/xf86Xinput.c	7 Mar 2004 13:43:02 -0000	3.73
+++ b/xf86Xinput.c	10 Mar 2004 12:39:40 -0000	3.74
@@ -63,11 +63,9 @@
 #include "mipointer.h"
 #include "xf86InPriv.h"
 
-#ifdef DPMSExtension
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
-#endif
 
 #include "dgaproc.h"
Previous message: [xserver-commit] xserver/hw/xizzle Makefile.am,1.10,1.11
Next message: [xserver-commit] xserver/hw/xizzle/dummylib Makefile.am,1.2,1.3
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]