configure.ac | 2 -
src/via_driver.c | 3 --
src/via_exa_h2.c | 25 ---------------------
src/via_exa_h6.c | 25 ---------------------
src/via_fp.c | 58 +++++++++++++++++++++++++++++++++++++++------------
src/via_sii164.c | 5 ----
src/via_ums.h | 47 -----------------------------------------
src/via_vt1632.c | 31 +++++++++++----------------
src/via_vt1632.h | 2 -
src/via_xv.c | 58 ---------------------------------------------------
src/via_xv_overlay.c | 3 --
src/via_xvmc.c | 2 -
src/xvmc/viaXvMC.c | 4 ---
13 files changed, 61 insertions(+), 204 deletions(-)
New commits:
commit 574bce4b1018c500c6ab27a4086d7b12b437a535
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 17:59:15 2018 -0600
Version bumped to 0.6.167
Compilation warnings reduction edition. Reduced the compilation
warnings to only a few.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 938d869..258dda3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.166],
+ [0.6.167],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit afd5a492f7c9c32f5e2b8072e3b35518bf5d87b4
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 17:53:02 2018 -0600
libchromeXvMC compilation warning fix
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/xvmc/viaXvMC.c b/src/xvmc/viaXvMC.c
index edd2c6f..931591c 100644
--- a/src/xvmc/viaXvMC.c
+++ b/src/xvmc/viaXvMC.c
@@ -1086,7 +1086,6 @@ XvMCSyncSurface(Display * display, XvMCSurface * surface)
ppthread_mutex_lock(&pViaXvMC->ctxMutex);
if (pViaSurface->needsSync) {
- CARD32 timeStamp = pViaSurface->timeStamp;
int syncMode = pViaSurface->syncMode;
if (pViaXvMC->useAGP) {
@@ -1094,9 +1093,6 @@ XvMCSyncSurface(Display * display, XvMCSurface * surface)
syncMode = (pViaSurface->syncMode == LL_MODE_2D ||
pViaSurface->timeStamp < pViaXvMC->timeStamp) ?
LL_MODE_2D : LL_MODE_DECODER_IDLE;
- if (pViaSurface->syncMode != LL_MODE_2D)
- timeStamp = pViaXvMC->timeStamp;
-
} else if (syncMode != LL_MODE_2D &&
pViaXvMC->rendSurf[0] != (pViaSurface->srfNo | VIA_XVMC_VALID)) {
commit 89f389e535987a32b250839d16737de968d63756
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 04:12:22 2018 -0600
Remove an unused variable from via_pci_probe
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index db25254..a8ce9b2 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -478,7 +478,6 @@ via_pci_probe(DriverPtr driver, int entity_num,
struct pci_device *device, intptr_t match_data)
{
ScrnInfoPtr scrn = NULL;
- EntityInfoPtr entity;
scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VIAPciChipsets,
NULL, NULL, NULL, NULL, NULL);
@@ -489,8 +488,6 @@ via_pci_probe(DriverPtr driver, int entity_num,
scrn->name = "CHROME";
scrn->Probe = NULL;
- entity = xf86GetEntityInfo(entity_num);
-
scrn->PreInit = VIAPreInit;
scrn->ScreenInit = VIAScreenInit;
scrn->SwitchMode = VIASwitchMode;
commit 68e5f407eda633649bd001f4c91eb0e1bd954b5c
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 04:00:47 2018 -0600
Moved P4M900 chipset FP parameters into via_fp.c
This reduces the number of compilation warnings.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index c74faa9..564f56e 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -68,6 +68,51 @@ static ViaPanelModeRec ViaPanelNativeModes[] = {
#define MODEPREFIX(name) NULL, NULL, name, 0, M_T_DRIVER | M_T_DEFAULT
#define MODESUFFIX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
+
+static VIADPARec viaDPAP4M900ClockDefault[] = {
+ /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
+ * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
+ * FPDP Low Adjustment, FPDP High Adjustment */
+ { 0x07, 0x00, 0x00,
+ 0x03, 0x00, 0x00,
+ 0x08, 0x00}
+};
+
+static VIADPARec viaDPAP4M900Clock100M150M[] = {
+ /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
+ * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
+ * FPDP Low Adjustment, FPDP High Adjustment */
+ { 0x03, 0x00, 0x01,
+ 0x03, 0x00, 0x00,
+ 0x08, 0x00}
+};
+
+static VIADPARec viaDPAP4M900Clock150M[] = {
+ /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
+ * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
+ * FPDP Low Adjustment, FPDP High Adjustment */
+ { 0x01, 0x02, 0x01,
+ 0x03, 0x00, 0x00,
+ 0x08, 0x00}
+};
+
+static VIADPAInfoTableRec viaDPAFPP4M900[] = {
+ { VIA_DPA_CLK_RANGE_30M, viaDPAP4M900ClockDefault},
+ { VIA_DPA_CLK_RANGE_30M_50M, viaDPAP4M900ClockDefault},
+ { VIA_DPA_CLK_RANGE_50M_70M, viaDPAP4M900ClockDefault},
+ { VIA_DPA_CLK_RANGE_70M_100M, viaDPAP4M900ClockDefault},
+ {VIA_DPA_CLK_RANGE_100M_150M, viaDPAP4M900Clock100M150M},
+ { VIA_DPA_CLK_RANGE_150M, viaDPAP4M900Clock150M}
+};
+
+static VIA_DPA_INDEX_TABLE viaDPAIndexTable[] = {
+// {VIA_CX700, NULL, NULL},
+// {VIA_P4M890, NULL, viaDPAFPP4M890},
+// {VIA_K8M890, NULL, viaDPAFPK8M890},
+ {VIA_P4M900, NULL, viaDPAFPP4M900},
+// {VIA_VX800, NULL, NULL}
+};
+
static DisplayModeRec OLPCMode = {
MODEPREFIX("1200x900"),
57275, 1200, 1208, 1216, 1240, 0,
diff --git a/src/via_ums.h b/src/via_ums.h
index cf240a1..4edd556 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -334,53 +334,6 @@ typedef struct _VIADPAINDEXTABLE {
} VIA_DPA_INDEX_TABLE;
-static VIADPARec viaDPAP4M900ClockDefault[] = {
- /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
- * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
- * FPDP Low Adjustment, FPDP High Adjustment */
- { 0x07, 0x00, 0x00,
- 0x03, 0x00, 0x00,
- 0x08, 0x00}
-};
-
-static VIADPARec viaDPAP4M900Clock100M150M[] = {
- /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
- * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
- * FPDP Low Adjustment, FPDP High Adjustment */
- { 0x03, 0x00, 0x01,
- 0x03, 0x00, 0x00,
- 0x08, 0x00}
-};
-
-static VIADPARec viaDPAP4M900Clock150M[] = {
- /* DVP0 Adjustment, DVP0 Clock Drive, DVP0 Data Drive,
- * DVP1 Adjustment, DVP1 Clock Drive, DVP1 Data Drive,
- * FPDP Low Adjustment, FPDP High Adjustment */
- { 0x01, 0x02, 0x01,
- 0x03, 0x00, 0x00,
- 0x08, 0x00}
-};
-
-
-static VIADPAInfoTableRec viaDPAFPP4M900[] = {
- { VIA_DPA_CLK_RANGE_30M, viaDPAP4M900ClockDefault},
- { VIA_DPA_CLK_RANGE_30M_50M, viaDPAP4M900ClockDefault},
- { VIA_DPA_CLK_RANGE_50M_70M, viaDPAP4M900ClockDefault},
- { VIA_DPA_CLK_RANGE_70M_100M, viaDPAP4M900ClockDefault},
- {VIA_DPA_CLK_RANGE_100M_150M, viaDPAP4M900Clock100M150M},
- { VIA_DPA_CLK_RANGE_150M, viaDPAP4M900Clock150M}
-};
-
-
-static VIA_DPA_INDEX_TABLE viaDPAIndexTable[] = {
-// {VIA_CX700, NULL, NULL},
-// {VIA_P4M890, NULL, viaDPAFPP4M890},
-// {VIA_K8M890, NULL, viaDPAFPK8M890},
- {VIA_P4M900, NULL, viaDPAFPP4M900},
-// {VIA_VX800, NULL, NULL}
-};
-
-
#define NUMBER_VIA_DPA_TABLE (sizeof(viaDPAIndexTable) /
sizeof(*(viaDPAIndexTable)))
commit 0d7f5b240cdfb2f87f59191002bbbd3139b87569
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 03:48:14 2018 -0600
Remove unused option table from via_fp.c
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_fp.c b/src/via_fp.c
index 5518b4a..c74faa9 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -36,19 +36,6 @@
#include "via_driver.h"
#include <unistd.h>
-/*
- * Option handling.
- */
-enum ViaPanelOpts {
- OPTION_CENTER
-};
-
-static OptionInfoRec ViaPanelOptions[] =
-{
- {OPTION_CENTER, "Center", OPTV_BOOLEAN, {0}, FALSE},
- {-1, NULL, OPTV_NONE, {0}, FALSE}
-};
-
/* These table values were copied from lcd.c of VIA Frame
* Buffer device driver. */
/* {int Width, int Height, bool useDualEdge, bool useDithering}; */
commit b5e2c8521a353e04ea02854eb29c417d0c817373
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 03:41:54 2018 -0600
Remove warnings from via_sii164.c
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_sii164.c b/src/via_sii164.c
index 53f12a2..4565891 100644
--- a/src/via_sii164.c
+++ b/src/via_sii164.c
@@ -316,11 +316,7 @@ static xf86OutputStatus
via_sii164_detect(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- xf86MonPtr pMon;
xf86OutputStatus status = XF86OutputStatusDisconnected;
- I2CBusPtr pI2CBus;
- VIAPtr pVia = VIAPTR(pScrn);
- VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
viaSiI164RecPtr pSiI164Rec = (viaSiI164RecPtr) output->driver_private;
Bool connectorDetected;
@@ -383,7 +379,6 @@ via_sii164_get_modes(xf86OutputPtr output)
}
}
-exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting %s.\n", __func__));
return pDisplay_Mode;
commit ea17eb7b108b5241cae6c6dfd5373c319eff3a14
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 03:39:21 2018 -0600
Remove warnings from via_vt1632.c
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 46786fb..f7a533a 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -330,11 +330,7 @@ static xf86OutputStatus
via_vt1632_detect(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- xf86MonPtr pMon;
xf86OutputStatus status = XF86OutputStatusDisconnected;
- I2CBusPtr pI2CBus;
- VIAPtr pVia = VIAPTR(pScrn);
- VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
viaVT1632RecPtr pVIAVT1632 = (viaVT1632RecPtr) output->driver_private;
Bool connectorDetected;
@@ -397,7 +393,6 @@ via_vt1632_get_modes(xf86OutputPtr output)
}
}
-exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting %s.\n", __func__));
return pDisplay_Mode;
commit 39950e6b448644d5b4695c5caaa13d7d44e4d217
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 03:26:48 2018 -0600
Removed unused EXA related functions
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_exa_h2.c b/src/via_exa_h2.c
index 8ecde2b..1b91bb2 100644
--- a/src/via_exa_h2.c
+++ b/src/via_exa_h2.c
@@ -42,31 +42,6 @@
#include "via_rop.h"
/*
- * Emit clipping borders to the command buffer and update the 2D context
- * current command with clipping info.
- */
-static int
-viaAccelClippingHelper_H2(VIAPtr pVia, int refY)
-{
- ViaTwodContext *tdc = &pVia->td;
-
- RING_VARS;
-
- if (tdc->clipping) {
- refY = (refY < tdc->clipY1) ? refY : tdc->clipY1;
- tdc->cmd |= VIA_GEC_CLIP_ENABLE;
- BEGIN_RING(4);
- OUT_RING_H1(VIA_REG_CLIPTL,
- ((tdc->clipY1 - refY) << 16) | tdc->clipX1);
- OUT_RING_H1(VIA_REG_CLIPBR,
- ((tdc->clipY2 - refY) << 16) | tdc->clipX2);
- } else {
- tdc->cmd &= ~VIA_GEC_CLIP_ENABLE;
- }
- return refY;
-}
-
-/*
* Check if we can use a planeMask and update the 2D context accordingly.
*/
static Bool
diff --git a/src/via_exa_h6.c b/src/via_exa_h6.c
index 3e593a9..14d6b88 100644
--- a/src/via_exa_h6.c
+++ b/src/via_exa_h6.c
@@ -42,31 +42,6 @@
#include "via_rop.h"
/*
- * Emit clipping borders to the command buffer and update the 2D context
- * current command with clipping info.
- */
-static int
-viaAccelClippingHelper_H6(VIAPtr pVia, int refY)
-{
- ViaTwodContext *tdc = &pVia->td;
-
- RING_VARS;
-
- if (tdc->clipping) {
- refY = (refY < tdc->clipY1) ? refY : tdc->clipY1;
- tdc->cmd |= VIA_GEC_CLIP_ENABLE;
- BEGIN_RING(4);
- OUT_RING_H1(VIA_REG_CLIPTL_M1,
- ((tdc->clipY1 - refY) << 16) | tdc->clipX1);
- OUT_RING_H1(VIA_REG_CLIPBR_M1,
- ((tdc->clipY2 - refY) << 16) | tdc->clipX2);
- } else {
- tdc->cmd &= ~VIA_GEC_CLIP_ENABLE;
- }
- return refY;
-}
-
-/*
* Check if we can use a planeMask and update the 2D context accordingly.
*/
static Bool
commit 881e039814c98cb24774f365da15c97ce4d6d9f5
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 03:07:53 2018 -0600
Removed unused variables and functions from Xv and XvMC related code
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_xv.c b/src/via_xv.c
index adc9af2..a4c8140 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -107,10 +107,6 @@ static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32,
pointer);
static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short,
short, short, int, unsigned char *, short, short, Bool,
RegionPtr, pointer, DrawablePtr);
-static void UVBlit(unsigned char *dest,
- const unsigned char *uBuffer,
- const unsigned char *vBuffer,
- unsigned width, unsigned srcPitch, unsigned dstPitch, unsigned lines);
static void nv12Blit(unsigned char *nv12Chroma,
const unsigned char *uBuffer,
const unsigned char *vBuffer,
@@ -959,28 +955,6 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc,
}
}
-static void
-planar420cp(unsigned char *dst, const unsigned char *src, int dstPitch,
- int w, int h, int i420)
-{
- unsigned long srcUOffset, srcVOffset;
-
- /*
- * Blit luma component as a fake YUY2 assembler blit.
- */
- if (i420) {
- srcVOffset = w * h + (w >> 1) * (h >> 1);
- srcUOffset = w * h;
- } else {
- srcUOffset = w * h + (w >> 1) * (h >> 1);
- srcVOffset = w * h;
- }
-
- (*viaFastVidCpy) (dst, src, dstPitch, w >> 1, h, 1);
- UVBlit(dst + dstPitch * h, src + srcUOffset,
- src + srcVOffset, w >> 1, w >> 1, dstPitch, h >> 1);
-}
-
/*
* Slow and dirty. NV12 blit.
*/
@@ -1017,7 +991,6 @@ viaDmaBlitImage(VIAPtr pVia,
Bool bounceBuffer;
drm_via_dmablit_t blit;
drm_via_blitsync_t *chromaSync = &blit.sync;
- drm_via_blitsync_t lumaSync;
unsigned char *base;
unsigned char *bounceBase;
unsigned bounceStride;
@@ -1097,8 +1070,6 @@ viaDmaBlitImage(VIAPtr pVia,
if (err < 0)
return -1;
- lumaSync = blit.sync;
-
if (id == FOURCC_YV12 || id == FOURCC_I420) {
unsigned tmp = ALIGN_TO(width >> 1, 16);
@@ -1497,35 +1468,6 @@ VIAVidAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
}
/*
- * Blit the U and V Fields. Used to Flip the U V for I420.
- */
-
-static void
-UVBlit(unsigned char *dst,
- const unsigned char *uBuffer,
- const unsigned char *vBuffer,
- unsigned width, unsigned srcPitch, unsigned dstPitch, unsigned lines)
-{
- int i, j;
-
- dstPitch >>= 1;
-
- for(j = 0; j < lines; j++)
- {
- for(i = 0; i < width; i++)
- {
- dst[i] = (uBuffer[i] << 8) | (vBuffer[i] << 16);
- }
-
- dst += dstPitch;
- uBuffer += srcPitch;
- vBuffer += srcPitch;
- }
-
-}
-
-
-/*
* Blit the chroma field from one buffer to another while at the same time
converting from
* YV12 to NV12.
*/
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index 5d40074..14aa28c 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -1126,7 +1126,7 @@ ViaYUVFillBlack(VIAPtr pVia, void *buf, int num)
static long
AddHQVSurface(ScrnInfoPtr pScrn, unsigned int numbuf, CARD32 fourcc)
{
- unsigned int i, width, height, pitch, fbsize, addr;
+ unsigned int i, height, pitch, fbsize, addr;
BOOL isplanar;
void *buf;
@@ -1142,7 +1142,6 @@ AddHQVSurface(ScrnInfoPtr pScrn, unsigned int numbuf,
CARD32 fourcc)
isplanar = ((fourcc == FOURCC_YV12) || (fourcc == FOURCC_I420) ||
(fourcc == FOURCC_XVMC));
- width = pVia->swov.SWDevice.gdwSWSrcWidth;
height = pVia->swov.SWDevice.gdwSWSrcHeight;
pitch = pVia->swov.SWDevice.dwPitch;
fbsize = pitch * height * (isplanar ? 2 : 1);
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index cd886bf..0fdfe46 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -684,7 +684,6 @@ ViaXvMCDestroyContext(ScrnInfoPtr pScrn, XvMCContextPtr
pContext)
VIAPtr pVia = VIAPTR(pScrn);
ViaXvMCPtr vXvMC = &(pVia->xvmc);
int i;
- volatile ViaXvMCSAreaPriv *sAPriv;
viaPortPrivPtr pPriv;
XvPortRecPrivatePtr portPriv;
ViaXvMCXVPriv *vx;
@@ -692,7 +691,6 @@ ViaXvMCDestroyContext(ScrnInfoPtr pScrn, XvMCContextPtr
pContext)
for (i = 0; i < VIA_XVMC_MAX_CONTEXTS; i++) {
if (vXvMC->contexts[i] == pContext->context_id) {
- sAPriv = (ViaXvMCSAreaPriv *) DRIGetSAREAPrivate(pScrn->pScreen);
portPriv = (XvPortRecPrivatePtr) pContext->port_priv;
pPriv = (viaPortPrivPtr) portPriv->DevPriv.ptr;
vx = (ViaXvMCXVPriv *) pPriv->xvmc_priv;
commit e0b55b1cbca338066e69b5999ac823ebe38cf121
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Jan 6 02:36:31 2018 -0600
Changed VT1632(A) struct names
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 7d43354..46786fb 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -131,7 +131,7 @@ viaVT1632Power(ScrnInfoPtr pScrn, I2CDevPtr pDev, Bool
powerState)
static void
viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
- VIAVT1632Ptr pVIAVT1632)
+ viaVT1632RecPtr pVIAVT1632)
{
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632SaveRegisters.\n"));
@@ -149,7 +149,7 @@ viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
static void
viaVT1632RestoreRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
- VIAVT1632Ptr pVIAVT1632)
+ viaVT1632RecPtr pVIAVT1632)
{
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632RestoreRegisters.\n"));
@@ -169,7 +169,7 @@ static int
viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
int status = MODE_OK;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -199,7 +199,7 @@ static void
via_vt1632_dpms(xf86OutputPtr output, int mode)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_dpms.\n"));
@@ -227,7 +227,7 @@ static void
via_vt1632_save(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_save.\n"));
@@ -242,7 +242,7 @@ static void
via_vt1632_restore(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_restore.\n"));
@@ -271,7 +271,7 @@ static void
via_vt1632_prepare(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered %s.\n", __func__));
@@ -287,7 +287,7 @@ static void
via_vt1632_commit(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered %s.\n", __func__));
@@ -305,7 +305,7 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr
mode,
{
ScrnInfoPtr pScrn = output->scrn;
drmmode_crtc_private_ptr iga = output->crtc->driver_private;
- VIAVT1632Ptr pVIAVT1632 = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_mode_set.\n"));
@@ -335,7 +335,7 @@ via_vt1632_detect(xf86OutputPtr output)
I2CBusPtr pI2CBus;
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
- VIAVT1632Ptr pVIAVT1632 = (VIAVT1632Ptr) output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = (viaVT1632RecPtr) output->driver_private;
Bool connectorDetected;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -370,7 +370,7 @@ via_vt1632_get_modes(xf86OutputPtr output)
I2CBusPtr pI2CBus;
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
- VIAVT1632Ptr pVIAVT1632 = (VIAVT1632Ptr) output->driver_private;
+ viaVT1632RecPtr pVIAVT1632 = (viaVT1632RecPtr) output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered %s.\n", __func__));
@@ -525,7 +525,7 @@ viaVT1632Init(ScrnInfoPtr pScrn)
xf86OutputPtr output;
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
- VIAVT1632Ptr pVIAVT1632;
+ viaVT1632RecPtr pVIAVT1632;
I2CBusPtr pI2CBus;
I2CDevPtr pI2CDevice;
I2CSlaveAddr i2cAddr = 0x10;
@@ -570,7 +570,7 @@ viaVT1632Init(ScrnInfoPtr pScrn)
goto exit;
}
- pVIAVT1632 = (VIAVT1632Ptr) xnfcalloc(1, sizeof(VIAVT1632Rec));
+ pVIAVT1632 = (viaVT1632RecPtr) xnfcalloc(1, sizeof(viaVT1632Rec));
if (!pVIAVT1632) {
xf86DestroyI2CDevRec(pI2CDevice, TRUE);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index a7fdee6..3b9a02f 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -46,7 +46,7 @@ typedef struct _VIAVT1632 {
CARD8 Register09;
CARD8 Register0A;
CARD8 Register0C;
-} VIAVT1632Rec, *VIAVT1632Ptr;
+} viaVT1632Rec, *viaVT1632RecPtr;
const xf86OutputFuncsRec via_vt1632_funcs;
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
