[Openchrome-devel] xf86-video-openchrome: 2 commits - src/via_display.c src/via_ums.h

[Kevin Brace]

 src/via_display.c |   12 ++++++------
 src/via_ums.h     |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 2415e245995c538f1dde3507f404d74d4343b7ff
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 15 20:11:20 2016 -0700

    Changing ViaModeSecondCRTC to viaIGA2SetMode
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 1ac44a0..12f16d6 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -725,14 +725,14 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
 }
 
 void
-ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     VIAPtr pVia = VIAPTR(pScrn);
     VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     DisplayModePtr realMode = mode;
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA2SetMode\n"));
 
     viaIGA2SetDisplayRegister(pScrn, realMode);
     ViaSetSecondaryFIFO(pScrn, realMode);
@@ -1423,7 +1423,7 @@ iga2_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
     }
 
     ViaCRTCInit(pScrn);
-    ViaModeSecondCRTC(pScrn, adjusted_mode);
+    viaIGA2SetMode(pScrn, adjusted_mode);
     ViaSecondDisplayChannelEnable(pScrn);
 
     if (pVia->pBIOSInfo->SimultaneousEnabled)
diff --git a/src/via_ums.h b/src/via_ums.h
index 4d088d9..e09962a 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -212,7 +212,7 @@ void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
 void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
 void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaGammaDisable(ScrnInfoPtr pScrn);
 
commit 24e9828c04832723853302ffa44dd7b75e7a2ca2
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 15 19:47:17 2016 -0700

    Changing ViaModeFirstCRTC to viaIGA1SetMode
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 9a68518..1ac44a0 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -495,9 +495,9 @@ ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
 }
 
 void
-ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeFirstCRTC\n");
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA1SetMode\n");
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     VIAPtr pVia = VIAPTR(pScrn);
     VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
@@ -1027,7 +1027,7 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
     }
 
     ViaCRTCInit(pScrn);
-    ViaModeFirstCRTC(pScrn, adjusted_mode);
+    viaIGA1SetMode(pScrn, adjusted_mode);
 
     if (pVia->pBIOSInfo->SimultaneousEnabled)
         ViaDisplayEnableSimultaneous(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index 906f47e..4d088d9 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -207,7 +207,7 @@ Bool UMSCrtcInit(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
 void ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
 void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);