diff options
| author | Tilman Sauerbeck <tilman@code-monkey.de> | 2007-10-28 08:35:18 +0100 |
|---|---|---|
| committer | Tilman Sauerbeck <tilman@code-monkey.de> | 2007-10-28 08:35:18 +0100 |
| commit | 0031fe800f8388bbf56e76b9974b88e0643e1f85 (patch) | |
| tree | 64cf2234ee55b5a72d80de72a5e6342a2f90235c | |
| parent | bfef69e770d4af300d0396b0cb7f4427e4f565de (diff) | |
Fixed compilation when DEBUG is defined.
| -rw-r--r-- | src/mga_g450pll.c | 2 | ||||
| -rw-r--r-- | src/mga_g_crtc.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c index 1a9931f..0fc8aef 100644 --- a/src/mga_g450pll.c +++ b/src/mga_g450pll.c @@ -139,7 +139,7 @@ static CARD32 G450FindNextPLLParam(ScrnInfoPtr pScrn, CARD32 ulFout, *pulPLLMNP |= (CARD32)ucP; #ifdef DEBUG - ErrorF("FINS_S: VCO = %d, S = %02X, *pulPLLMNP = %08X\n", ulVCO, (ULONG)ucS, *pulPLLMNP); + ErrorF("FINS_S: VCO = %d, S = %02X, *pulPLLMNP = %08X\n", ulVCO, (unsigned long)ucS, *pulPLLMNP); #endif } diff --git a/src/mga_g_crtc.c b/src/mga_g_crtc.c index e199e06..1e8d25b 100644 --- a/src/mga_g_crtc.c +++ b/src/mga_g_crtc.c @@ -261,7 +261,7 @@ MGAGCalcClock(xf86CrtcPtr crtc, long f_out, *s = 3; #ifdef DEBUG - xf86DrvMsg(pScrn->scrnIndex, X_INFO, + xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO, "f_out_requ =%ld f_pll_real=%.1f f_vco=%.1f n=0x%x m=0x%x p=0x%x s=0x%x\n", f_out, (f_vco / (*p + 1)), f_vco, *best_n, *best_m, *p, *s ); #endif @@ -740,14 +740,14 @@ state_restore(xf86CrtcPtr crtc, MgaCrtcStatePtr state, for (i = 0; i < sizeof(state->DacRegs); i++) { #if 1 if(!(i%16)) ErrorF("\n%02X: ",i); - ErrorF("%02X ", mgaReg->DacRegs[i]); + ErrorF("%02X ", state->DacRegs[i]); #else if(!(i%8)) ErrorF("\n%02X: ",i); - ErrorF("0x%02X, ", mgaReg->DacRegs[i]); + ErrorF("0x%02X, ", state->DacRegs[i]); #endif } - ErrorF("\nOPTION = %08lX\n", mgaReg->Option); - ErrorF("OPTION2 = %08lX\n", mgaReg->Option2); + ErrorF("\nOPTION = %08lX\n", state->Option); + ErrorF("OPTION2 = %08lX\n", state->Option2); ErrorF("CRTCEXT:"); for (i=0; i<6; i++) ErrorF(" %02X", state->ExtVga[i]); ErrorF("\n"); |