[Openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_vt1632.c src/via_vt1632.h

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_vt1632.c |   27 ---------------------------
 src/via_vt1632.h |    4 +---
 3 files changed, 2 insertions(+), 31 deletions(-)

New commits:
commit 29f52a9149b2835fd6b65f52f4703b4aa31629f5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Aug 3 13:20:53 2016 -0700

    Version bumped to 0.5.112
    
    I need to thank Xavier Bachelot for catching a bug in the code that
    can possibly cause a crash.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 284fb74..e8d4000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.5.111],
+        [0.5.112],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 46f5f3e181735b23b1eeb4ad84bb0818510cb0f0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Aug 3 13:18:11 2016 -0700

    Removing redundant code from via_vt1632.c and via_vt1632.h
    
    via_vt1632_detect function was deleted due to the code inside that
    function being transferred to viaVT1632Init function. Also, several
    discontinued function prototypes were removed.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 2a3c995..7e669cf 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -200,33 +200,6 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
                 "Exiting via_vt1632_mode_set.\n"));
 }
 
-xf86OutputStatus
-via_vt1632_detect(xf86OutputPtr output)
-{
-    ViaVT1632Ptr Private = output->driver_private;
-    xf86OutputStatus status;
-    ScrnInfoPtr pScrn = output->scrn;
-    CARD8 tmp;
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
-                        "Entered via_vt1632_detect.\n"));
-
-    xf86I2CReadByte(Private->VT1632I2CDev, 0x09, &tmp);
-    if (tmp & 0x04) {
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
-                    "VT1632A: DVI device is detected.\n");
-        status = XF86OutputStatusConnected;
-    } else {
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                    "VT1632A: DVI device was not detected.\n");
-        status = XF86OutputStatusDisconnected;
-    }
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting via_vt1632_detect.\n"));
-    return status;
-}
-
 Bool
 viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
 {
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index b08345a..06df175 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -47,9 +47,6 @@ void via_vt1632_save(xf86OutputPtr output);
 void via_vt1632_restore(xf86OutputPtr output);
 int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
 void via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode);
-xf86OutputStatus via_vt1632_detect(xf86OutputPtr output);
-BOOL via_vt1632_probe(ScrnInfoPtr pScrn, I2CDevPtr pDev);
-ViaVT1632Ptr via_vt1632_init(ScrnInfoPtr pScrn, I2CDevPtr pDev);
 Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
 
 #endif /* _VIA_VT1632_H_ */
commit 980f417665489f5bdfbcd5bf95d8ddfa37a56774
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Aug 3 12:56:04 2016 -0700

    Fix for viaVT1632Init implicit function declaration build warning
    
    The function prototype declaration was moved to via_vt1632.h where it
    is a more appropriate place to be located.
    
    Signed-off-by: Xavier Bachelot <xavier at bachelot.org>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 13f2c05..b08345a 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -50,5 +50,6 @@ void via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode, DisplayModeP
 xf86OutputStatus via_vt1632_detect(xf86OutputPtr output);
 BOOL via_vt1632_probe(ScrnInfoPtr pScrn, I2CDevPtr pDev);
 ViaVT1632Ptr via_vt1632_init(ScrnInfoPtr pScrn, I2CDevPtr pDev);
+Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
 
 #endif /* _VIA_VT1632_H_ */