[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/nsc
nsc.man, 1.1.4.2, 1.1.4.3 nsc_driver.c, 1.1.4.3,
1.1.4.4 nsc_gx1_video.c, 1.1.4.4, 1.1.4.5 nsc_gx2_video.c,
1.1.4.4, 1.1.4.5
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:16:39 PDT 2004
- Previous message: [xorg-commit-diffs]
xc/programs/Xserver/hw/xfree86/drivers/rendition rendition.c,
1.1.4.3, 1.1.4.4 rendition.man, 1.1.4.2, 1.1.4.3
- Next message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/nv
nv.man, 1.1.4.3, 1.1.4.4 nv_driver.c, 1.1.4.4,
1.1.4.5 riva_driver.c, 1.1.4.2, 1.1.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: eich
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/nsc
Modified Files:
Tag: XORG-CURRENT
nsc.man nsc_driver.c nsc_gx1_video.c nsc_gx2_video.c
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: nsc.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/nsc.man 5 Mar 2004 13:40:26 -0000 1.1.4.2
+++ b/nsc.man 15 Apr 2004 10:16:31 -0000 1.1.4.3
@@ -14,7 +14,7 @@
.fi
.SH DESCRIPTION
.B nsc
-is an XFree86 driver for National Semiconductors GEODE processor family.
+is an __xservername__ driver for National Semiconductors GEODE processor family.
It uses the DURANGO kit provided by National Semiconductor.
The driver is accelerated, and provides support for the following
framebuffer depths: 8, 16 and 24.
@@ -24,7 +24,7 @@
driver supports GXLV (5530 companion chip), SC1200, SC1400 and
GX2 (5535 companion chip).
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -129,6 +129,6 @@
hh: Viewable height.
Default: no TV.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHOR
Author: Sarma V. Kolluru
Index: nsc_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/nsc_driver.c 5 Mar 2004 13:40:26 -0000 1.1.4.3
+++ b/nsc_driver.c 15 Apr 2004 10:16:31 -0000 1.1.4.4
@@ -398,7 +398,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
NSC_VERSION_MAJOR, NSC_VERSION_MINOR, NSC_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
Index: nsc_gx1_video.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/nsc_gx1_video.c 30 Mar 2004 14:23:13 -0000 1.1.4.4
+++ b/nsc_gx1_video.c 15 Apr 2004 10:16:31 -0000 1.1.4.5
@@ -1,8 +1,8 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.7tsi Exp $ */
/*
* $Workfile: nsc_gx1_video.c $
- * $Revision: 1.1.4.3 $
- * $Author: eich $
+ * $Revision: 1.8 $
+ * $Author: tsi $
*
* File Contents: This file consists of main Xfree video supported routines.
*
@@ -243,6 +243,7 @@
pGeode = GEODEPTR(pScreenInfo);
+ if (!pGeode->NoAccel) {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
@@ -277,6 +278,7 @@
if (newAdaptors)
xfree(newAdaptors);
+ }
}
/* client libraries expect an encoding */
@@ -411,15 +413,17 @@
void
GX1ResetVideo(ScrnInfoPtr pScrn)
{
- GeodePtr pGeode = GEODEPTR(pScrn);
+ GeodePtr pGeode = GEODEPTR(pScrn);
- GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
-
- DEBUGMSG(0, (0, X_NONE, "ResetVideo\n"));
- GX1AccelSync(pScrn);
- GFX(set_video_palette(NULL));
- GX1SetColorkey(pScrn, pPriv);
- GFX(set_video_filter(pPriv->filter, pPriv->filter));
+ if (!pGeode->NoAccel) {
+ GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
+
+ DEBUGMSG(0, (0, X_NONE, "ResetVideo\n"));
+ GX1AccelSync(pScrn);
+ GFX(set_video_palette(NULL));
+ GX1SetColorkey(pScrn, pPriv);
+ GFX(set_video_filter(pPriv->filter, pPriv->filter));
+ }
}
/*----------------------------------------------------------------------------
@@ -533,7 +537,7 @@
DEBUGMSG(0, (0, X_NONE, "StopVideo\n"));
REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
- if (!pGeode->NoAccel) GX1AccelSync(pScrn);
+ GX1AccelSync(pScrn);
if (exit) {
if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
GFX(set_video_enable(0));
@@ -576,9 +580,8 @@
Atom attribute, INT32 value, pointer data)
{
GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
- GeodePtr pGeode = GEODEPTR(pScrn);
- if (!pGeode->NoAccel) GX1AccelSync(pScrn);
+ GX1AccelSync(pScrn);
if (attribute == xvColorKey) {
pPriv->colorKey = value;
GX1SetColorkey(pScrn, pPriv);
@@ -999,7 +1002,7 @@
GeodePtr pGeode = GEODEPTR(pScrn);
/* DisplayModePtr mode = pScrn->currentMode; */
- if (!pGeode->NoAccel) GX1AccelSync(pScrn);
+ GX1AccelSync(pScrn);
GFX(set_video_enable(1));
@@ -1350,7 +1353,7 @@
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
pScreen->BlockHandler = GX1BlockHandler;
- if (!pGeode->NoAccel) GX1AccelSync(pScrn);
+ GX1AccelSync(pScrn);
if (pPriv->videoStatus & TIMER_MASK) {
UpdateCurrentTime();
if (pPriv->videoStatus & OFF_TIMER) {
Index: nsc_gx2_video.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/nsc_gx2_video.c 30 Mar 2004 14:23:13 -0000 1.1.4.4
+++ b/nsc_gx2_video.c 15 Apr 2004 10:16:31 -0000 1.1.4.5
@@ -1,8 +1,8 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.6tsi Exp $ */
/*
* $Workfile: nsc_gx2_video.c $
- * $Revision: 1.1.4.3 $
- * $Author: eich $
+ * $Revision: 1.7 $
+ * $Author: tsi $
*
* File Contents: This file consists of main Xfree video supported routines.
*
@@ -233,44 +233,46 @@
void
GX2InitVideo(ScreenPtr pScreen)
{
- GeodePtr pGeode;
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ GeodePtr pGeode;
+ ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
- pGeode = GEODEPTR(pScreenInfo);
+ pGeode = GEODEPTR(pScreenInfo);
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
- XF86VideoAdaptorPtr newAdaptor = NULL;
+ if (!pGeode->NoAccel) {
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
+ XF86VideoAdaptorPtr newAdaptor = NULL;
- int num_adaptors;
+ int num_adaptors;
- newAdaptor = GX2SetupImageVideo(pScreen);
- GX2InitOffscreenImages(pScreen);
+ newAdaptor = GX2SetupImageVideo(pScreen);
+ GX2InitOffscreenImages(pScreen);
- num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
+ num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
- if (newAdaptor) {
- if (!num_adaptors) {
+ if (newAdaptor) {
+ if (!num_adaptors) {
num_adaptors = 1;
adaptors = &newAdaptor;
- } else {
+ } else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
+ xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
if (newAdaptors) {
- memcpy(newAdaptors, adaptors, num_adaptors *
- sizeof(XF86VideoAdaptorPtr));
- newAdaptors[num_adaptors] = newAdaptor;
- adaptors = newAdaptors;
- num_adaptors++;
+ memcpy(newAdaptors, adaptors, num_adaptors *
+ sizeof(XF86VideoAdaptorPtr));
+ newAdaptors[num_adaptors] = newAdaptor;
+ adaptors = newAdaptors;
+ num_adaptors++;
}
- }
- }
+ }
+ }
- if (num_adaptors)
- xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ if (num_adaptors)
+ xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- if (newAdaptors)
- xfree(newAdaptors);
+ if (newAdaptors)
+ xfree(newAdaptors);
+ }
}
/* client libraries expect an encoding */
@@ -414,14 +416,16 @@
void
GX2ResetVideo(ScrnInfoPtr pScrn)
{
- GeodePtr pGeode = GEODEPTR(pScrn);
+ GeodePtr pGeode = GEODEPTR(pScrn);
- GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
+ if (!pGeode->NoAccel) {
+ GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
- if (!pGeode->NoAccel) GX2AccelSync(pScrn);
- GFX(set_video_palette(NULL));
- GX2SetColorkey(pScrn, pPriv);
- GFX(set_video_filter(pPriv->filter, pPriv->filter));
+ GX2AccelSync(pScrn);
+ GFX(set_video_palette(NULL));
+ GX2SetColorkey(pScrn, pPriv);
+ GFX(set_video_filter(pPriv->filter, pPriv->filter));
+ }
}
/*----------------------------------------------------------------------------
@@ -533,7 +537,7 @@
REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
- if (!pGeode->NoAccel) GX2AccelSync(pScrn);
+ GX2AccelSync(pScrn);
if (exit) {
if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
GFX(set_video_enable(0));
@@ -576,9 +580,8 @@
Atom attribute, INT32 value, pointer data)
{
GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
- GeodePtr pGeode = GEODEPTR(pScrn);
- if (!pGeode->NoAccel) GX2AccelSync(pScrn);
+ GX2AccelSync(pScrn);
if (attribute == xvColorKey) {
pPriv->colorKey = value;
GX2SetColorkey(pScrn, pPriv);
@@ -938,7 +941,7 @@
{
GeodePtr pGeode = GEODEPTR(pScrn);
- if (!pGeode->NoAccel) GX2AccelSync(pScrn);
+ GX2AccelSync(pScrn);
GFX(set_video_enable(1));
@@ -1295,7 +1298,7 @@
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
pScreen->BlockHandler = GX2BlockHandler;
- if (!pGeode->NoAccel) GX2AccelSync(pScrn);
+ GX2AccelSync(pScrn);
if (pPriv->videoStatus & TIMER_MASK) {
UpdateCurrentTime();
if (pPriv->videoStatus & OFF_TIMER) {
- Previous message: [xorg-commit-diffs]
xc/programs/Xserver/hw/xfree86/drivers/rendition rendition.c,
1.1.4.3, 1.1.4.4 rendition.man, 1.1.4.2, 1.1.4.3
- Next message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/nv
nv.man, 1.1.4.3, 1.1.4.4 nv_driver.c, 1.1.4.4,
1.1.4.5 riva_driver.c, 1.1.4.2, 1.1.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list