configure.ac | 2 +- src/via_vt1632.c | 40 +++++++++++++++++++++++----------------- src/via_vt1632.h | 1 - 3 files changed, 24 insertions(+), 19 deletions(-)
New commits: commit 3b6163684f08007d4ed52b2c22ffc90bc14b3ec8 Author: Kevin Brace <kevinbr...@gmx.com> Date: Mon Aug 15 17:13:33 2016 -0700 Version bumped to 0.5.130 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/configure.ac b/configure.ac index 6cad2a2..9fa1e9d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], - [0.5.129], + [0.5.130], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome], [xf86-video-openchrome]) commit 01eea49cc2e6e54dc8473a6d216bcfcc9b15058c Author: Kevin Brace <kevinbr...@gmx.com> Date: Mon Aug 15 17:11:55 2016 -0700 Added debug messages to via_vt1632_save Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index b170681..aed3ed9 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -293,7 +293,13 @@ via_vt1632_save(xf86OutputPtr output) ScrnInfoPtr pScrn = output->scrn; ViaVT1632Ptr pVIAVT1632Rec = output->driver_private; + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered via_vt1632_save.\n")); + viaVT1632SaveRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev, pVIAVT1632Rec); + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting via_vt1632_save.\n")); } static void commit c0e9120c9dc04362b3fd12b9c28b8009ae187b50 Author: Kevin Brace <kevinbr...@gmx.com> Date: Mon Aug 15 16:41:29 2016 -0700 Rewrite of viaVT1632SaveRegisters Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index a4a9b20..b170681 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -143,22 +143,19 @@ viaVT1632Power(ScrnInfoPtr pScrn, I2CDevPtr pDev, Bool powerState) "Exiting viaVT1632Power.\n")); } -void -viaVT1632SaveRegisters(xf86OutputPtr output) +static void +viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev, + ViaVT1632Ptr pVIAVT1632Rec) { - ViaVT1632Ptr Private = output->driver_private; - ScrnInfoPtr pScrn = output->scrn; - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Entered viaVT1632SaveRegisters.\n")); - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "VT1632A: Saving the content of registers " - "0x08, 0x09, 0x0A, and 0x0C.\n")); - xf86I2CReadByte(Private->VT1632I2CDev, 0x08, &Private->Register08); - xf86I2CReadByte(Private->VT1632I2CDev, 0x09, &Private->Register09); - xf86I2CReadByte(Private->VT1632I2CDev, 0x0A, &Private->Register0A); - xf86I2CReadByte(Private->VT1632I2CDev, 0x0C, &Private->Register0C); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Saving VT1632 registers.\n"); + xf86I2CReadByte(pDev, 0x08, &pVIAVT1632Rec->Register08); + xf86I2CReadByte(pDev, 0x09, &pVIAVT1632Rec->Register09); + xf86I2CReadByte(pDev, 0x0A, &pVIAVT1632Rec->Register0A); + xf86I2CReadByte(pDev, 0x0C, &pVIAVT1632Rec->Register0C); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Exiting viaVT1632SaveRegisters.\n")); @@ -293,7 +290,10 @@ via_vt1632_dpms(xf86OutputPtr output, int mode) static void via_vt1632_save(xf86OutputPtr output) { - viaVT1632SaveRegisters(output); + ScrnInfoPtr pScrn = output->scrn; + ViaVT1632Ptr pVIAVT1632Rec = output->driver_private; + + viaVT1632SaveRegisters(pScrn, pVIAVT1632Rec->VT1632I2CDev, pVIAVT1632Rec); } static void diff --git a/src/via_vt1632.h b/src/via_vt1632.h index e81306e..8b272c5 100644 --- a/src/via_vt1632.h +++ b/src/via_vt1632.h @@ -45,7 +45,6 @@ typedef struct _ViaVT1632 { const xf86OutputFuncsRec via_dvi_funcs; -void viaVT1632SaveRegisters(xf86OutputPtr output); void via_vt1632_restore(xf86OutputPtr output); int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode); Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); commit b150e2ecdd28f5b78d1b912d69ddaab94c8bce74 Author: Kevin Brace <kevinbr...@gmx.com> Date: Mon Aug 15 15:00:31 2016 -0700 Changing via_dvi_save to via_vt1632_save Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index 7cdd4ba..a4a9b20 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -291,7 +291,7 @@ via_vt1632_dpms(xf86OutputPtr output, int mode) } static void -via_dvi_save(xf86OutputPtr output) +via_vt1632_save(xf86OutputPtr output) { viaVT1632SaveRegisters(output); } @@ -371,7 +371,7 @@ const xf86OutputFuncsRec via_dvi_funcs = { .get_property = via_dvi_get_property, #endif .dpms = via_vt1632_dpms, - .save = via_dvi_save, + .save = via_vt1632_save, .restore = via_dvi_restore, .mode_valid = via_dvi_mode_valid, .mode_fixup = via_dvi_mode_fixup, commit c6250088df61d98fd5c7223b0b2d63d575fa9fb2 Author: Kevin Brace <kevinbr...@gmx.com> Date: Mon Aug 15 14:54:00 2016 -0700 Changing via_vt1632_save to viaVT1632SaveRegisters This function is located inside via_vt1632.c. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_vt1632.c b/src/via_vt1632.c index 35a9d35..7cdd4ba 100644 --- a/src/via_vt1632.c +++ b/src/via_vt1632.c @@ -144,13 +144,13 @@ viaVT1632Power(ScrnInfoPtr pScrn, I2CDevPtr pDev, Bool powerState) } void -via_vt1632_save(xf86OutputPtr output) +viaVT1632SaveRegisters(xf86OutputPtr output) { ViaVT1632Ptr Private = output->driver_private; ScrnInfoPtr pScrn = output->scrn; DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Entered via_vt1632_save.\n")); + "Entered viaVT1632SaveRegisters.\n")); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VT1632A: Saving the content of registers " @@ -161,7 +161,7 @@ via_vt1632_save(xf86OutputPtr output) xf86I2CReadByte(Private->VT1632I2CDev, 0x0C, &Private->Register0C); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Exiting via_vt1632_save.\n")); + "Exiting viaVT1632SaveRegisters.\n")); } void @@ -293,7 +293,7 @@ via_vt1632_dpms(xf86OutputPtr output, int mode) static void via_dvi_save(xf86OutputPtr output) { - via_vt1632_save(output); + viaVT1632SaveRegisters(output); } static void diff --git a/src/via_vt1632.h b/src/via_vt1632.h index 4089dd1..e81306e 100644 --- a/src/via_vt1632.h +++ b/src/via_vt1632.h @@ -45,7 +45,7 @@ typedef struct _ViaVT1632 { const xf86OutputFuncsRec via_dvi_funcs; -void via_vt1632_save(xf86OutputPtr output); +void viaVT1632SaveRegisters(xf86OutputPtr output); void via_vt1632_restore(xf86OutputPtr output); int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode); Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel