Module Name: xsrc
Committed By: riz
Date: Wed Feb 13 20:52:41 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src [netbsd-6]: wsfb.h
wsfb_driver.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #818):
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.14
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.15
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:
revision 1.32
external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile: revision
1.15
sys/dev/wsfb/genfb.c: revision 1.49
distrib/sets/lists/xserver/md.evbarm: revision 1.1
sys/dev/wscons/wsdisplay_vconsvar.h: revision 1.22
external/mit/xorg/server/xorg-server/Makefile.common: revision 1.24
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h: revision 1.4
external/mit/xorg/server/drivers/Makefile: revision 1.61
sys/dev/wsfb/genfb.c: revision 1.50
enable X11 build for evbarm.
aprint_verbose -> aprint_debug
WSDISPLAY_TYPE_VC4 framebuffer is BGR
for WSDISPLAYIO_SMODE, if the bus ioctl handler returns EPASSTHROUGH, dont
treat it as an error
default to swkbd mode on evbarm as well, now X without config should work
properly on BeagleBoard, RPi and the like
fix a typo in a comment
use WSDISPLAYIO_GET_FBINFO if available
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
cvs rdiff -u -r1.13 -r1.13.2.1 \
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.3 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.3.2.1
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.3 Sat Dec 12 07:52:36 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h Wed Feb 13 20:52:41 2013
@@ -52,8 +52,7 @@
/* private data */
typedef struct {
int fd; /* file descriptor of open device */
- struct wsdisplay_fbinfo info; /* frame buffer characteristics */
- int linebytes; /* number of bytes per row */
+ struct wsdisplayio_fbinfo fbi;
int rotate;
unsigned char* fbstart;
unsigned char* fbmem;
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.13 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.1
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13 Fri Jul 22 15:12:01 2011
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Wed Feb 13 20:52:41 2013
@@ -516,7 +516,8 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
wstype == WSDISPLAY_TYPE_SUNCG14 ||
wstype == WSDISPLAY_TYPE_SUNTCX ||
wstype == WSDISPLAY_TYPE_SUNFFB ||
- wstype == WSDISPLAY_TYPE_XVR1000) {
+ wstype == WSDISPLAY_TYPE_XVR1000 ||
+ wstype == WSDISPLAY_TYPE_VC4) {
masks.red = 0x0000ff;
masks.green = 0x00ff00;
masks.blue = 0xff0000;
