From b299863dd21226e2ea47f7983f31e1920ac70cd9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 16 Jun 2004 09:24:09 +0000 Subject: [PATCH] DRI XFree86-4_3_99_12-merge import --- README | 2 +- man/v4l.man | 10 +++++----- src/v4l.c | 24 ++++++++++++------------ src/videodev.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README b/README index e40f639..a21e915 100644 --- a/README +++ b/README @@ -34,4 +34,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $ diff --git a/man/v4l.man b/man/v4l.man index ab2f844..5337112 100644 --- a/man/v4l.man +++ b/man/v4l.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH V4L __drivermansuffix__ __vendorversion__ @@ -13,9 +13,9 @@ v4l \- video4linux driver .fi .SH DESCRIPTION .B v4l -is an __xservername__ driver for video4linux cards. It provides a Xvideo +is an XFree86 driver for video4linux cards. It provides a Xvideo extention port for video overlay. Just add the driver to the module -list within the module section of your __xconfigfile__ file if you want +list within the module section of your XF86Config file if you want to use it. There are no config options. .P Note that the the extmod module is also required for the Xvideo @@ -30,10 +30,10 @@ overlay. bt848/bt878-based TV cards are the most popular hardware these days. .SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration +Please refer to XF86Config(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: Gerd Knorr diff --git a/src/v4l.c b/src/v4l.c index 9899743..241f528 100644 --- a/src/v4l.c +++ b/src/v4l.c @@ -2,7 +2,7 @@ * video4linux Xv Driver * based on Michael Schimek's permedia 2 driver. */ -/* $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" @@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, 0, 0, 1, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -220,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) { @@ -718,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; @@ -747,17 +747,17 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) continue; } - v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50); + v4l_add_enc(p->enc, p->nenc,"pal", channel.name, 768,576, 1,50); p->norm[p->nenc] = VIDEO_MODE_PAL; p->input[p->nenc] = i; p->nenc++; - v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000); + v4l_add_enc(p->enc,p->nenc,"ntsc", channel.name, 640,480, 1001,60000); p->norm[p->nenc] = VIDEO_MODE_NTSC; p->input[p->nenc] = i; p->nenc++; - v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50); + v4l_add_enc(p->enc,p->nenc,"secam",channel.name, 768,576, 1,50); p->norm[p->nenc] = VIDEO_MODE_SECAM; p->input[p->nenc] = i; p->nenc++; @@ -767,28 +767,28 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) ntsc and secam. But there are a few more norms (pal versions with a different timings used in south america for example). The bttv driver can handle these too. */ - if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"palnc",channel.name, 640, 576, 1,50)) goto fail; p->norm[p->nenc] = 3; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"palm",channel.name, 640, 576, 1,50)) goto fail; p->norm[p->nenc] = 4; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name, + if (0 != v4l_add_enc(p->enc, p->nenc,"paln", channel.name, 768,576, 1,50)) goto fail; p->norm[p->nenc] = 5; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"ntscjp", channel.name, 640,480, 1001,60000)) goto fail; p->norm[p->nenc] = 6; diff --git a/src/videodev.h b/src/videodev.h index 1d6991e..77b592e 100644 --- a/src/videodev.h +++ b/src/videodev.h @@ -7,7 +7,7 @@ * Used here with the explicit permission of the original author, Alan Cox. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */ #include "Xmd.h"