DRI XFree86-4_3_99_12-merge import

Merging XORG-CURRENT into trunk
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2026-04-14 11:14:32 +00:00 · 2004-06-16 09:24:09 +00:00 · 2004-04-23 19:52:24 +00:00 · 2004-03-14 08:33:41 +00:00 · 2004-03-03 12:12:28 +00:00 · 2004-02-26 13:35:55 +00:00
1 changed files with 4 additions and 5 deletions
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,8 +2,7 @@
 *  video4linux Xv Driver 
 *  based on Michael Schimek's permedia 2 driver.
 */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.31 2003/07/16 01:38:47 dawes Exp $ */

 #include "videodev.h"
 #include "xf86.h"
@@ -221,7 +220,7 @@ static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
 	if (first) {
 	    first = 0;
 	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-			 "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
+			 "v4l: memPhysBase=%p\n", pScrn->memPhysBase);
 	}

 	switch (pScrn->bitsPerPixel) {
@@ -719,11 +718,11 @@ static void
 V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
 {
    static struct video_channel     channel;
-    int i,entries,have_bttv,bttv_ver;
+    int i,entries,have_bttv;

 #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
    have_bttv = 0;
-    if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
+    if (-1 != ioctl(fd,BTTV_VERSION,NULL))
 	have_bttv = 1;
 	
    entries = (have_bttv ? 7 : 3) * channels;
Author	SHA1	Message	Date
Eric Anholt	b299863dd2	DRI XFree86-4_3_99_12-merge import	2004-06-16 09:24:09 +00:00
Egbert Eich	1f8ceb0991	Merging XORG-CURRENT into trunk	2004-04-23 19:52:24 +00:00
Egbert Eich	fb4a148b6e	Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004	2004-03-14 08:33:41 +00:00
Egbert Eich	abaaf69833	Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004	2004-03-03 12:12:28 +00:00
Egbert Eich	bd8c0455c2	readding XFree86's cvs IDs	2004-02-26 13:35:55 +00:00
Egbert Eich	9c34b95344	Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004	2004-02-26 09:23:28 +00:00
Egbert Eich	871d6d6aef	Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004	2004-01-29 08:08:41 +00:00
Kaleb Keithley	e8bf6a26c8	XFree86 4.3.99.902 (RC 2)	2003-12-19 20:55:19 +00:00
Kaleb Keithley	0fc7fdb71a	XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks	2003-11-25 19:28:43 +00:00
Kaleb Keithley	1c98a4f36f	XFree86 4.3.0.1	2003-11-14 16:48:55 +00:00