diff options
author | Adam Jackson <ajax@redhat.com> | 2014-05-21 13:56:03 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2014-05-21 13:56:03 -0400 |
commit | 2650c0bf05c30183d7fd31902e96260e6b8bf028 (patch) | |
tree | c133332edb2df839ee2a67ee271ef94fa39b74bb | |
parent | 48c15909691e28ad2c188a2978b1c8ef3d9d8760 (diff) |
Use own thunk functions instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | src/trident_driver.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/trident_driver.c b/src/trident_driver.c index 408c870..11f31eb 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -981,6 +981,18 @@ TRIDENTProbeDDC(ScrnInfoPtr pScrn, int index) } } +static void +TRIDENTProtect(ScrnInfoPtr pScrn, Bool on) +{ + vgaHWProtect(pScrn, on); +} + +static void +TRIDENTBlankScreen(ScrnInfoPtr pScrn, Bool on) +{ + vgaHWBlankScreen(pScrn, on); +} + /* Mandatory */ static Bool TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) @@ -1987,8 +1999,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) if (!pScrn->progClock) { pScrn->numClocks = NoClocks; xf86GetClocks(pScrn, NoClocks, TRIDENTClockSelect, - vgaHWProtectWeak(), - vgaHWBlankScreenWeak(), + TRIDENTProtect, TRIDENTBlankScreen, vgaIOBase + 0x0A, 0x08, 1, 28322); from = X_PROBED; xf86ShowClocks(pScrn, from); |