Module Name: xsrc
Committed By: mrg
Date: Fri Jun 12 01:53:00 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h wsfb_cursor.c
wsfb_driver.c
Log Message:
xf86_ansic.h is no more.
use <errno.h> and <sys/mman.h> always.
remove no longer working 1 and 4 bpp. :-(
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
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-wsfb/dist/src/wsfb.h
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.1 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.2
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.1 Tue Nov 4 22:20:39 2008
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h Fri Jun 12 01:53:00 2009
@@ -43,7 +43,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86RamDac.h"
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c:1.1 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c:1.2
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c:1.1 Tue Nov 4 22:20:39 2008
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_cursor.c Fri Jun 12 01:53:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfb_cursor.c,v 1.1 2008/11/04 22:20:39 macallan Exp $ */
+/* $NetBSD: wsfb_cursor.c,v 1.2 2009/06/12 01:53:00 mrg Exp $ */
/*
* Copyright (c) 2005 Michael Lorenz
* All rights reserved.
@@ -46,7 +46,6 @@
/* all driver need this */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "wsfb.h"
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.2 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.3
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.2 Tue Nov 4 22:20:39 2008
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Fri Jun 12 01:53:00 2009
@@ -43,12 +43,12 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/time.h>
+#include <errno.h>
#include <dev/wscons/wsconsio.h>
/* all driver need this */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -59,8 +59,6 @@
#include "dgaproc.h"
/* for visuals */
-#include "xf1bpp.h"
-#include "xf4bpp.h"
#include "fb.h"
#include "xf86Resources.h"
@@ -74,9 +72,7 @@
/* #include "wsconsio.h" */
-#ifndef XFree86LOADER
#include <sys/mman.h>
-#endif
#ifdef USE_PRIVSEP
extern int priv_open_device(const char *);
@@ -639,14 +635,6 @@
/* Load bpp-specific modules */
switch(pScrn->bitsPerPixel) {
- case 1:
- mod = "xf1bpp";
- reqSym = "xf1bppScreenInit";
- break;
- case 4:
- mod = "xf4bpp";
- reqSym = "xf4bppScreenInit";
- break;
default:
mod = "fb";
break;
@@ -825,18 +813,6 @@
fPtr->fbstart = fPtr->fbmem;
switch (pScrn->bitsPerPixel) {
- case 1:
- ret = xf1bppScreenInit(pScreen, fPtr->fbstart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth);
- break;
- case 4:
- ret = xf4bppScreenInit(pScreen, fPtr->fbstart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth);
- break;
case 8:
case 16:
case 24:
