configure.ac | 2 -
src/via_tmds.c | 7 ----
src/via_vt1632.c | 94 ++++++++++++++++++++++++++-----------------------------
src/via_vt1632.h | 1
4 files changed, 47 insertions(+), 57 deletions(-)
New commits:
commit 47419f6edb27bae4fc6dbf56d39b4c8f4410d2d0
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Aug 6 22:46:15 2016 -0700
Version bumped to 0.5.120
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index bddca5b..460d457 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.119],
+ [0.5.120],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 377c9d73a5544f1833bbd6a7e62e0c052ca9bf84
Author: Xavier Bachelot <xav...@bachelot.org>
Date: Sat Aug 6 22:44:14 2016 -0700
Fix unused-variable warnings in via_tmds.c
Signed-off-by: Xavier Bachelot <xav...@bachelot.org>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 0cfc644..644e9ec 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -378,7 +378,6 @@ via_tmds_detect(xf86OutputPtr output)
xf86OutputStatus status = XF86OutputStatusDisconnected;
ScrnInfoPtr pScrn = output->scrn;
VIAPtr pVia = VIAPTR(pScrn);
- VIATMDSRecPtr pVIATMDSRec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_detect.\n"));
@@ -504,7 +503,6 @@ viaTMDSInit(ScrnInfoPtr pScrn)
{
xf86OutputPtr output;
vgaHWPtr hwp = VGAHWPTR(pScrn);
- VIAPtr pVia = VIAPTR(pScrn);
VIATMDSRecPtr pVIATMDSRec = NULL;
CARD8 sr13, sr5a, cr3e;
Bool status = FALSE;
@@ -589,11 +587,6 @@ void
via_dvi_init(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
- xf86OutputPtr output = NULL;
- ViaVT1632Ptr private_data = NULL;
- I2CBusPtr pBus = NULL;
- I2CDevPtr pDev = NULL;
- I2CSlaveAddr addr = 0x10;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_dvi_init.\n"));
commit 75915a308cbb6c1cce8aa8d079e188e5d3f63aa5
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Aug 6 22:25:07 2016 -0700
Moving viaVT1632Sense within the file
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index a2fd6a4..84a3c76 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -102,6 +102,33 @@ viaVT1632InitRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev)
"Exiting viaVT1632InitRegisters.\n"));
}
+/*
+ * Returns TMDS receiver detection state for VIA Technologies VT1632
+ * external TMDS transmitter.
+ */
+static Bool
+viaVT1632Sense(ScrnInfoPtr pScrn, I2CDevPtr pDev)
+{
+ CARD8 tmp;
+ Bool receiverDetected = FALSE;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered viaVT1632Sense.\n"));
+
+ xf86I2CReadByte(pDev, 0x09, &tmp);
+ if (tmp & 0x04) {
+ receiverDetected = TRUE;
+ }
+
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "VT1632 %s a TMDS receiver.\n",
+ receiverDetected ? "detected" : "did not detect");
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting viaVT1632Sense.\n"));
+ return receiverDetected;
+}
+
static void
viaVT1632Power(xf86OutputPtr output, Bool powerState)
{
@@ -207,33 +234,6 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr
mode,
"Exiting via_vt1632_mode_set.\n"));
}
-/*
- * Returns TMDS receiver detection state for VIA Technologies VT1632
- * external TMDS transmitter.
- */
-static Bool
-viaVT1632Sense(ScrnInfoPtr pScrn, I2CDevPtr pDev)
-{
- CARD8 tmp;
- Bool receiverDetected = FALSE;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaVT1632Sense.\n"));
-
- xf86I2CReadByte(pDev, 0x09, &tmp);
- if (tmp & 0x04) {
- receiverDetected = TRUE;
- }
-
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "VT1632 %s a TMDS receiver.\n",
- receiverDetected ? "detected" : "did not detect");
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaVT1632Sense.\n"));
- return receiverDetected;
-}
-
static void
via_dvi_create_resources(xf86OutputPtr output)
{
commit 1edc5bbd4b115bc1b66fd6a8e25a9a7da4399a09
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Aug 6 22:20:33 2016 -0700
Changing via_vt1632_power to viaVT1632Power
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index db220f8..a2fd6a4 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -103,20 +103,20 @@ viaVT1632InitRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev)
}
static void
-via_vt1632_power(xf86OutputPtr output, Bool powerState)
+viaVT1632Power(xf86OutputPtr output, Bool powerState)
{
ViaVT1632Ptr Private = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_vt1632_power.\n"));
+ "Entered viaVT1632Power.\n"));
xf86I2CMaskByte(Private->VT1632I2CDev, 0x08, powerState ? 0x01 : 0x00,
0x01);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VT1632A Power: %s\n",
powerState ? "On" : "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_power.\n"));
+ "Exiting viaVT1632Power.\n"));
}
void
@@ -264,12 +264,12 @@ via_vt1632_dpms(xf86OutputPtr output, int mode)
switch (mode) {
case DPMSModeOn:
- via_vt1632_power(output, TRUE);
+ viaVT1632Power(output, TRUE);
break;
case DPMSModeStandby:
case DPMSModeSuspend:
case DPMSModeOff:
- via_vt1632_power(output, FALSE);
+ viaVT1632Power(output, FALSE);
break;
default:
break;
commit 11b90bee75f474990c12fe48982d863ae9c4b6f0
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Aug 6 22:15:56 2016 -0700
Made small tweaks to via_vt1632_power
No change in functionality.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 1274fc0..db220f8 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -66,25 +66,6 @@ via_vt1632_dump_registers(ScrnInfoPtr pScrn, I2CDevPtr pDev)
"Exiting via_vt1632_dump_registers.\n"));
}
-
-void
-via_vt1632_power(xf86OutputPtr output, Bool powerState)
-{
- ViaVT1632Ptr Private = output->driver_private;
- ScrnInfoPtr pScrn = output->scrn;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_vt1632_power.\n"));
-
- xf86I2CMaskByte(Private->VT1632I2CDev, 0x08, powerState ? 0x01 : 0x00,
0x01);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "VT1632A Power: %s\n",
- powerState ? "On" : "Off");
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_power.\n"));
-}
-
static void
viaVT1632InitRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev)
{
@@ -121,6 +102,23 @@ viaVT1632InitRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev)
"Exiting viaVT1632InitRegisters.\n"));
}
+static void
+via_vt1632_power(xf86OutputPtr output, Bool powerState)
+{
+ ViaVT1632Ptr Private = output->driver_private;
+ ScrnInfoPtr pScrn = output->scrn;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_vt1632_power.\n"));
+
+ xf86I2CMaskByte(Private->VT1632I2CDev, 0x08, powerState ? 0x01 : 0x00,
0x01);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VT1632A Power: %s\n",
+ powerState ? "On" : "Off");
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_vt1632_power.\n"));
+}
+
void
via_vt1632_save(xf86OutputPtr output)
{
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 3b208a0..4089dd1 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -45,7 +45,6 @@ typedef struct _ViaVT1632 {
const xf86OutputFuncsRec via_dvi_funcs;
-void via_vt1632_power(xf86OutputPtr output, Bool powerState);
void via_vt1632_save(xf86OutputPtr output);
void via_vt1632_restore(xf86OutputPtr output);
int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
