diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-11-24 13:52:25 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-11-24 13:52:25 +0000 |
| commit | 5ac195a3224a0b9277ab86a2581362cb55b05242 (patch) | |
| tree | c5b65094c1985f87d55302aeac478824f0b609be | |
| parent | 4e1a4007ede5ccd3d1681509ed9326304e9f363e (diff) | |
glamo.c : more rename damage
| -rw-r--r-- | src/glamo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glamo.c b/src/glamo.c index 9ef0eb9..bc678e3 100644 --- a/src/glamo.c +++ b/src/glamo.c @@ -166,7 +166,7 @@ static const char *GlamoHWSymbols[] = { "fbdevHWUseBuildinMode", "fbdevHWGetDepth", - "GlamoHWGetLineLength", + "fbdevHWGetLineLength", "fbdevHWGetName", "GlamoHWGetType", "fbdevHWGetVidmem", @@ -742,7 +742,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } else if (!fPtr->shadowFB) { /* FIXME: this doesn't work for all cases, e.g. when each scanline has a padding which is independent from the depth (controlfb) */ - pScrn->displayWidth = GlamoHWGetLineLength(pScrn) / + pScrn->displayWidth = fbdevHWGetLineLength(pScrn) / (pScrn->bitsPerPixel / 8); if (pScrn->displayWidth != pScrn->virtualX) { @@ -903,7 +903,7 @@ GlamoWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, if (fPtr->lineLength) *size = fPtr->lineLength; else - *size = fPtr->lineLength = GlamoHWGetLineLength(pScrn); + *size = fPtr->lineLength = fbdevHWGetLineLength(pScrn); return ((CARD8 *)fPtr->fbstart + row * fPtr->lineLength + offset); } @@ -1058,7 +1058,7 @@ GlamoDGAAddModes(ScrnInfoPtr pScrn) if (fPtr->lineLength) pDGAMode->bytesPerScanline = fPtr->lineLength; else - pDGAMode->bytesPerScanline = fPtr->lineLength = GlamoHWGetLineLength(pScrn); + pDGAMode->bytesPerScanline = fPtr->lineLength = fbdevHWGetLineLength(pScrn); pDGAMode->imageWidth = pMode->HDisplay; pDGAMode->imageHeight = pMode->VDisplay; |