Module Name: xsrc
Committed By: mrg
Date: Wed Jun 10 00:53:19 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6_driver.c cg6_regs.h
Log Message:
merge xf86-video-suncg6 1.1.1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.3 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.4
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.3 Thu Oct 30 18:36:32 2008
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c Wed Jun 10 00:53:19 2009
@@ -20,7 +20,6 @@
* 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/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,7 +32,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
#include "micmap.h"
@@ -68,9 +66,9 @@
#define CG6_VERSION 4000
#define CG6_NAME "SUNCG6"
#define CG6_DRIVER_NAME "suncg6"
-#define CG6_MAJOR_VERSION 1
-#define CG6_MINOR_VERSION 1
-#define CG6_PATCHLEVEL 0
+#define CG6_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CG6_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CG6_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the driver
@@ -345,7 +343,7 @@
deal with depth
*********************/
- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
+ if (!xf86SetDepthBpp(pScrn, 8, 0, 0, NoDepth24Support)) {
return FALSE;
} else {
/* Check that the returned depth is one we support */
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h:1.2 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h:1.3
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h:1.2 Wed Oct 29 23:43:43 2008
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h Wed Jun 10 00:53:19 2009
@@ -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$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
#ifndef CG6_REGS_H
#define CG6_REGS_H
