diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-28 16:36:09 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-28 16:37:46 -0800 |
| commit | 9e4e7d4fa25a64a2494e7531967599142e60e716 (patch) | |
| tree | e1e023c59b9b28e26a2c1f30c7bb86edb79314ee /src/i830_modes.c | |
| parent | 8d9ba2405d1f1e58a0cfb570e83e9206af8525b5 (diff) | |
Conditionally compile old-server compatibility code in.
This also replaces calls to compat code with the real names of the functions,
and slips #defines to an i830-namespaced version in when doing compat.
The current server version (7.1.99.2) is still left as requiring compat code,
since the version hasn't been bumped yet.
This also fixes some failures to call the compat code, and some failures to
actually compile the compat code. Oops.
Diffstat (limited to 'src/i830_modes.c')
| -rw-r--r-- | src/i830_modes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_modes.c b/src/i830_modes.c index 9e952c8e..60bedad5 100644 --- a/src/i830_modes.c +++ b/src/i830_modes.c @@ -158,11 +158,11 @@ i830_reprobe_output_modes(ScrnInfoPtr pScrn) /* The code to choose the best mode per pipe later on will require * VRefresh to be set. */ - mode->VRefresh = i830xf86ModeVRefresh(mode); - I830xf86SetModeCrtc(mode, INTERLACE_HALVE_V); + mode->VRefresh = xf86ModeVRefresh(mode); + xf86SetModeCrtc(mode, INTERLACE_HALVE_V); #ifdef DEBUG_REPROBE - PrintModeline(pScrn->scrnIndex, mode); + xf86PrintModeline(pScrn->scrnIndex, mode); #endif } } @@ -203,7 +203,7 @@ i830_set_xf86_modes_from_outputs(ScrnInfoPtr pScrn) for (i = 0; i < pI830->num_outputs; i++) { if (pI830->output[i].probed_modes != NULL) { pScrn->modes = - i830xf86DuplicateModes(pScrn, pI830->output[i].probed_modes); + xf86DuplicateModes(pScrn, pI830->output[i].probed_modes); break; } } |