diff options
| author | Arkadiusz Miskiewicz <arekm@maven.pl> | 2007-12-21 18:10:17 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-12-21 18:10:17 -0500 |
| commit | 2b6e8e2b8f74e94560de89693ecbc7260536591e (patch) | |
| tree | 06537ec722a51d0ee92cf386d2416ab1e2be0c6f /src/radeon_output.c | |
| parent | 4c6f60e3b19ac55ab1255c79df03b1df5950864e (diff) | |
RADEON: various cleanups
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 84b1dd9d..10369d9e 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -198,7 +198,7 @@ void RADEONPrintPortMap(ScrnInfoPtr pScrn) ConnectorTypeName[radeon_output->ConnectorType], DACTypeName[radeon_output->DACType+1], TMDSTypeName[radeon_output->TMDSType+1], - radeon_output->ddc_line); + (unsigned int)radeon_output->ddc_line); } } @@ -232,7 +232,7 @@ avivo_display_ddc_connected(ScrnInfoPtr pScrn, xf86OutputPtr output) } else MonType = MT_NONE; xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "DDC Type: 0x%x, Detected Monitor Type: %d\n", radeon_output->ddc_line, MonType); + "DDC Type: 0x%x, Detected Monitor Type: %d\n", (unsigned int)radeon_output->ddc_line, MonType); return MonType; } @@ -332,7 +332,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output) } else MonType = MT_NONE; xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "DDC Type: 0x%x, Detected Monitor Type: %d\n", radeon_output->ddc_line, MonType); + "DDC Type: 0x%x, Detected Monitor Type: %d\n", (unsigned int)radeon_output->ddc_line, MonType); return MonType; } @@ -1196,6 +1196,7 @@ void RADEONSetOutputType(ScrnInfoPtr pScrn, RADEONOutputPrivatePtr radeon_output radeon_output->type = output; } +#if 0 static Bool AVIVOI2CReset(ScrnInfoPtr pScrn) { @@ -1207,6 +1208,7 @@ Bool AVIVOI2CReset(ScrnInfoPtr pScrn) OUTREG(AVIVO_I2C_STOP, 0x0); return TRUE; } +#endif static Bool AVIVOI2CDoLock(ScrnInfoPtr pScrn, int lock_state, int gpio_reg) @@ -1669,7 +1671,7 @@ void RADEONInitConnector(xf86OutputPtr output) RADEONOutputPrivatePtr radeon_output = output->driver_private; char stmp[16]; char *name; - sprintf(stmp, "DDC_0x%x", radeon_output->ddc_line); + sprintf(stmp, "DDC_0x%x", (unsigned int)radeon_output->ddc_line); name = xnfalloc(strlen(stmp) + 1); strcpy(name, stmp); @@ -2224,11 +2226,11 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) info->BiosConnector[0].valid = TRUE; info->BiosConnector[1].valid = TRUE; if (sscanf(optstr, "%u,%d,%d,%u,%u,%d,%d,%u", - &info->BiosConnector[0].ddc_line, + (unsigned int *)&info->BiosConnector[0].ddc_line, &info->BiosConnector[0].DACType, &info->BiosConnector[0].TMDSType, &info->BiosConnector[0].ConnectorType, - &info->BiosConnector[1].ddc_line, + (unsigned int *)&info->BiosConnector[1].ddc_line, &info->BiosConnector[1].DACType, &info->BiosConnector[1].TMDSType, &info->BiosConnector[1].ConnectorType) != 8) { |