From f195bc0f17e395e2e177f5e101ee4fa004c9175f Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Thu, 19 Feb 2009 20:13:10 +0100 Subject: Lots of code cleanup: Remove unused functions, fix naming, fix indent. --- src/glamo-cmdq.c | 8 +- src/glamo-display.c | 13 +- src/glamo-driver.c | 346 ++++++++++++++++++++++++++-------------------------- src/glamo-output.c | 46 +++++-- src/glamo.h | 64 ++-------- 5 files changed, 233 insertions(+), 244 deletions(-) diff --git a/src/glamo-cmdq.c b/src/glamo-cmdq.c index 8053867..5b3abbd 100644 --- a/src/glamo-cmdq.c +++ b/src/glamo-cmdq.c @@ -1,5 +1,6 @@ /* * Copyright 2007 OpenMoko, Inc. + * Copyright © 2009 Lars-Peter Clausen * * This driver is based on Xati, * Copyright 2004 Eric Anholt @@ -32,8 +33,11 @@ #include "glamo-cmdq.h" #include "glamo-draw.h" -static void GLAMOCMDQResetCP(GlamoPtr pGlamo); -static void GLAMODumpRegs(GlamoPtr pGlamo, CARD16 from, CARD16 to); +static void +GLAMOCMDQResetCP(GlamoPtr pGlamo); + +static void +GLAMODumpRegs(GlamoPtr pGlamo, CARD16 from, CARD16 to); #define CQ_LEN 255 #define CQ_MASK ((CQ_LEN + 1) * 1024 - 1) diff --git a/src/glamo-display.c b/src/glamo-display.c index dd98a26..a63064f 100644 --- a/src/glamo-display.c +++ b/src/glamo-display.c @@ -43,10 +43,15 @@ #include "glamo.h" #include "glamo-regs.h" -static void GlamoCrtcDPMS(xf86CrtcPtr crtc, int mode); -static void GlamoCrtcGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, - CARD16 *blue, int size); -static void GlamoCrtcDestroy(xf86CrtcPtr crtc); +static void +GlamoCrtcDPMS(xf86CrtcPtr crtc, int mode); + +static void +GlamoCrtcGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, + int size); + +static void +GlamoCrtcDestroy(xf86CrtcPtr crtc); static Bool GlamoSetModeMajor(xf86CrtcPtr crtc, DisplayModePtr mode, diff --git a/src/glamo-driver.c b/src/glamo-driver.c index c1db064..d1bfa3d 100644 --- a/src/glamo-driver.c +++ b/src/glamo-driver.c @@ -52,16 +52,27 @@ static Bool debug = 0; /* -------------------------------------------------------------------- */ /* prototypes */ +static const OptionInfoRec * +GlamoAvailableOptions(int chipid, int busid); + +static void +GlamoIdentify(int flags); + +static Bool +GlamoProbe(DriverPtr drv, int flags); + +static Bool +GlamoPreInit(ScrnInfoPtr pScrn, int flags); + +static Bool +GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); + +static Bool +GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen); -static const OptionInfoRec * GlamoAvailableOptions(int chipid, int busid); -static void GlamoIdentify(int flags); -static Bool GlamoProbe(DriverPtr drv, int flags); -static Bool GlamoPreInit(ScrnInfoPtr pScrn, int flags); -static Bool GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, - char **argv); -static Bool GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen); static Bool GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height); + static Bool GlamoInitFramebufferDevice(GlamoPtr pGlamo, const char *fb_device); /* -------------------------------------------------------------------- */ @@ -258,7 +269,7 @@ GlamoProbe(DriverPtr drv, int flags) { int i; ScrnInfoPtr pScrn; - GDevPtr *devSections; + GDevPtr *devSections; int numDevSections; char *dev; Bool foundScreen = FALSE; @@ -278,7 +289,7 @@ GlamoProbe(DriverPtr drv, int flags) xf86LoaderReqSymLists(fbdevHWSymbols, NULL); for (i = 0; i < numDevSections; i++) { - dev = xf86FindOptionValue(devSections[i]->options,"Glamo"); + dev = xf86FindOptionValue(devSections[i]->options, "Glamo"); if (fbdevHWProbe(NULL, dev, NULL)) { int entity; pScrn = NULL; @@ -315,62 +326,65 @@ GlamoProbe(DriverPtr drv, int flags) static Bool GlamoPreInit(ScrnInfoPtr pScrn, int flags) { - GlamoPtr fPtr; - int default_depth, fbbpp; - /*const char *s;*/ - rgb weight_defaults = { 0, 0, 0 }; + GlamoPtr pGlamo; + int default_depth, fbbpp; + rgb weight_defaults = {0, 0, 0}; Gamma gamma_defaults = {0.0, 0.0, 0.0}; + char *fb_device; + + if (flags & PROBE_DETECT) + return FALSE; - if (flags & PROBE_DETECT) return FALSE; + TRACE_ENTER("PreInit"); - TRACE_ENTER("PreInit"); + /* Check the number of entities, and fail if it isn't one. */ + if (pScrn->numEntities != 1) + return FALSE; - /* Check the number of entities, and fail if it isn't one. */ - if (pScrn->numEntities != 1) - return FALSE; + pScrn->monitor = pScrn->confScreen->monitor; - pScrn->monitor = pScrn->confScreen->monitor; + GlamoGetRec(pScrn); + pGlamo = GlamoPTR(pScrn); - GlamoGetRec(pScrn); - fPtr = GlamoPTR(pScrn); + pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); + pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; + /* XXX Is this right? Can probably remove RAC_FB */ + pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - /* XXX Is this right? Can probably remove RAC_FB */ - pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; + fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Glamo"); - /* open device */ - if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"Glamo"))) - return FALSE; + /* open device */ + if (!fbdevHWInit(pScrn, NULL, fb_device)) + return FALSE; /* FIXME: Replace all fbdev functionality with our own code, so we only have * to open the fb devic only once. */ - if (!GlamoInitFramebufferDevice(fPtr, xf86FindOptionValue(fPtr->pEnt->device->options,"Glamo"))) - return FALSE; + if (!GlamoInitFramebufferDevice(pGlamo, fb_device)) + return FALSE; - default_depth = fbdevHWGetDepth(pScrn,&fbbpp); + default_depth = fbdevHWGetDepth(pScrn, &fbbpp); - if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp, 0)) - return FALSE; + if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp, 0)) + return FALSE; - xf86PrintDepthBpp(pScrn); + xf86PrintDepthBpp(pScrn); /* color weight */ if (!xf86SetWeight(pScrn, weight_defaults, weight_defaults)) return FALSE; - /* visual init */ - if (!xf86SetDefaultVisual(pScrn, -1)) - return FALSE; + /* visual init */ + if (!xf86SetDefaultVisual(pScrn, -1)) + return FALSE; - /* We don't currently support DirectColor at > 8bpp */ - if (pScrn->defaultVisual != TrueColor) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "requested default visual" + /* We don't currently support DirectColor at > 8bpp */ + if (pScrn->defaultVisual != TrueColor) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "requested default visual" " (%s) is not supported at depth %d\n", xf86GetVisualName(pScrn->defaultVisual), pScrn->depth); - return FALSE; - } + return FALSE; + } if (!xf86SetGamma(pScrn, gamma_defaults)) { return FALSE; @@ -386,50 +400,50 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - pScrn->progClock = TRUE; - pScrn->chipset = "Glamo"; - pScrn->videoRam = fbdevHWGetVidmem(pScrn); + pScrn->progClock = TRUE; + pScrn->chipset = "Glamo"; + pScrn->videoRam = fbdevHWGetVidmem(pScrn); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "hardware: %s (video memory:" + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "hardware: %s (video memory:" " %dkB)\n", fbdevHWGetName(pScrn), pScrn->videoRam/1024); - /* handle options */ - xf86CollectOptions(pScrn, NULL); - if (!(fPtr->Options = xalloc(sizeof(GlamoOptions)))) - return FALSE; - memcpy(fPtr->Options, GlamoOptions, sizeof(GlamoOptions)); - xf86ProcessOptions(pScrn->scrnIndex, fPtr->pEnt->device->options, fPtr->Options); + /* handle options */ + xf86CollectOptions(pScrn, NULL); + if (!(pGlamo->Options = xalloc(sizeof(GlamoOptions)))) + return FALSE; + memcpy(pGlamo->Options, GlamoOptions, sizeof(GlamoOptions)); + xf86ProcessOptions(pScrn->scrnIndex, pGlamo->pEnt->device->options, pGlamo->Options); - /* use shadow framebuffer by default */ - fPtr->shadowFB = xf86ReturnOptValBool(fPtr->Options, OPTION_SHADOW_FB, TRUE); + /* use shadow framebuffer by default */ + pGlamo->shadowFB = xf86ReturnOptValBool(pGlamo->Options, OPTION_SHADOW_FB, TRUE); - debug = xf86ReturnOptValBool(fPtr->Options, OPTION_DEBUG, FALSE); + debug = xf86ReturnOptValBool(pGlamo->Options, OPTION_DEBUG, FALSE); - /* First approximation, may be refined in ScreenInit */ - pScrn->displayWidth = pScrn->virtualX; + /* First approximation, may be refined in ScreenInit */ + pScrn->displayWidth = pScrn->virtualX; - xf86PrintModes(pScrn); + xf86PrintModes(pScrn); - /* Set display resolution */ - xf86SetDpi(pScrn, 0, 0); + /* Set display resolution */ + xf86SetDpi(pScrn, 0, 0); - if (xf86LoadSubModule(pScrn, "fb") == NULL) { - GlamoFreeRec(pScrn); - return FALSE; - } - xf86LoaderReqSymLists(fbSymbols, NULL); + if (xf86LoadSubModule(pScrn, "fb") == NULL) { + GlamoFreeRec(pScrn); + return FALSE; + } + xf86LoaderReqSymLists(fbSymbols, NULL); - TRACE_EXIT("PreInit"); - return TRUE; + TRACE_EXIT("PreInit"); + return TRUE; } static Bool GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - GlamoPtr fPtr = GlamoPTR(pScrn); - VisualPtr visual; + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + GlamoPtr pGlamo = GlamoPTR(pScrn); + VisualPtr visual; int ret, flags; TRACE_ENTER("GlamoScreenInit"); @@ -444,41 +458,39 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pScrn->offset.red,pScrn->offset.green,pScrn->offset.blue); #endif - if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) { - xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory" - " failed\n"); - return FALSE; - } - fPtr->fboff = fbdevHWLinearOffset(pScrn); + if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) { + xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n"); + return FALSE; + } + pGlamo->fboff = fbdevHWLinearOffset(pScrn); - fbdevHWSave(pScrn); - fbdevHWSaveScreen(pScreen, SCREEN_SAVER_ON); - fbdevHWAdjustFrame(scrnIndex,0,0,0); + fbdevHWSave(pScrn); + fbdevHWSaveScreen(pScreen, SCREEN_SAVER_ON); + fbdevHWAdjustFrame(scrnIndex,0,0,0); - /* mi layer */ - miClearVisualTypes(); + /* mi layer */ + miClearVisualTypes(); if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { - xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed" - " for %d bits per pixel [1]\n", - pScrn->bitsPerPixel); + xf86DrvMsg(scrnIndex, X_ERROR, + "visual type setup failed for %d bits per pixel [1]\n", + pScrn->bitsPerPixel); return FALSE; } - if (!miSetPixmapDepths()) { - xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); - return FALSE; - } + if (!miSetPixmapDepths()) { + xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n"); + return FALSE; + } pScrn->displayWidth = fbdevHWGetLineLength(pScrn) / (pScrn->bitsPerPixel / 8); - fPtr->fbstart = fPtr->fbmem + fPtr->fboff; + pGlamo->fbstart = pGlamo->fbmem + pGlamo->fboff; - ret = fbScreenInit(pScreen, fPtr->fbstart, pScrn->virtualX, - pScrn->virtualY, pScrn->xDpi, - pScrn->yDpi, pScrn->displayWidth, - pScrn->bitsPerPixel); - if (!ret) - return FALSE; + ret = fbScreenInit(pScreen, pGlamo->fbstart, pScrn->virtualX, + pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, + pScrn->displayWidth, pScrn->bitsPerPixel); + if (!ret) + return FALSE; /* Fixup RGB ordering */ visual = pScreen->visuals + pScreen->numVisuals; @@ -493,87 +505,79 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } - /* must be after RGB ordering fixed */ - if (!fbPictureInit(pScreen, NULL, 0)) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Render extension initialisation failed\n"); + /* must be after RGB ordering fixed */ + if (!fbPictureInit(pScreen, NULL, 0)) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Render extension initialisation failed\n"); - /* map in the registers */ - fPtr->reg_base = xf86MapVidMem(pScreen->myNum, VIDMEM_MMIO, 0x8000000, 0x2400); + /* map in the registers */ + pGlamo->reg_base = xf86MapVidMem(pScreen->myNum, VIDMEM_MMIO, 0x8000000, 0x2400); - fPtr->pScreen = pScreen; + pGlamo->pScreen = pScreen; - /*fPtr->cmd_queue_cache = GLAMOCreateCMDQCache(fPtr);*/ + xf86LoadSubModule(pScrn, "exa"); + xf86LoaderReqSymLists(exaSymbols, NULL); - /*GLAMOCMDQCacheSetup(fPtr);*/ - - xf86LoadSubModule(pScrn, "exa"); - xf86LoaderReqSymLists(exaSymbols, NULL); - - if(!GLAMODrawExaInit(pScreen, pScrn)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "EXA hardware acceleration initialization failed\n"); - return FALSE; - } + if (!GLAMODrawExaInit(pScreen, pScrn)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "EXA hardware acceleration initialization failed\n"); + return FALSE; + } - GLAMODrawEnable(fPtr); + GLAMODrawEnable(pGlamo); - xf86SetBlackWhitePixels(pScreen); - miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); + xf86SetBlackWhitePixels(pScreen); + miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); - /* software cursor */ - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); + /* software cursor */ + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); - /* colormap */ - if (!miCreateDefColormap(pScreen)) { - xf86DrvMsg(scrnIndex, X_ERROR, - "internal error: miCreateDefColormap failed " - "in GlamoScreenInit()\n"); - return FALSE; - } + /* colormap */ + if (!miCreateDefColormap(pScreen)) { + xf86DrvMsg(scrnIndex, X_ERROR, + "internal error: miCreateDefColormap failed " + "in GlamoScreenInit()\n"); + return FALSE; + } - flags = CMAP_PALETTED_TRUECOLOR; - if(!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(), - NULL, flags)) - return FALSE; + flags = CMAP_PALETTED_TRUECOLOR; + if (!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(), + NULL, flags)) + return FALSE; xf86CrtcScreenInit(pScreen); xf86RandR12SetRotations(pScreen, RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270); - xf86DPMSInit(pScreen, xf86DPMSSet, 0); + xf86DPMSInit(pScreen, xf86DPMSSet, 0); - pScreen->SaveScreen = xf86SaveScreen; + pScreen->SaveScreen = xf86SaveScreen; xf86SetDesiredModes(pScrn); /* Wrap the current CloseScreen function */ - fPtr->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = GlamoCloseScreen; + pGlamo->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = GlamoCloseScreen; - TRACE_EXIT("GlamoScreenInit"); + TRACE_EXIT("GlamoScreenInit"); - return TRUE; + return TRUE; } static Bool GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - GlamoPtr fPtr = GlamoPTR(pScrn); - - fbdevHWRestore(pScrn); - fbdevHWUnmapVidmem(pScrn); - if (fPtr->shadow) { - xfree(fPtr->shadow); - fPtr->shadow = NULL; - } - pScrn->vtSema = FALSE; + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + GlamoPtr pGlamo = GlamoPTR(pScrn); + + fbdevHWRestore(pScrn); + fbdevHWUnmapVidmem(pScrn); + pScrn->vtSema = FALSE; - pScreen->CreateScreenResources = fPtr->CreateScreenResources; - pScreen->CloseScreen = fPtr->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + pScreen->CreateScreenResources = pGlamo->CreateScreenResources; + pScreen->CloseScreen = pGlamo->CloseScreen; + return (*pScreen->CloseScreen)(scrnIndex, pScreen); } static Bool @@ -589,28 +593,28 @@ GlamoCrtcResize(ScrnInfoPtr pScrn, int width, int height) { static Bool GlamoInitFramebufferDevice(GlamoPtr pGlamo, const char *fb_device) { - if(fb_device) { - pGlamo->fb_fd = open(fb_device, O_RDWR, 0); - if (pGlamo->fb_fd == -1) { - ErrorF("Failed to open framebuffer device\n"); - goto fail2; - } - } else { - fb_device = getenv("FRAMEBUFFER"); - if (fb_device != NULL) { - pGlamo->fb_fd = open(fb_device, O_RDWR, 0); - if (pGlamo->fb_fd != -1) - fb_device = NULL; - } - if (fb_device == NULL) { - fb_device = "/dev/fb0"; - pGlamo->fb_fd = open(fb_device, O_RDWR, 0); - if (pGlamo->fb_fd == -1) { - ErrorF("Failed to open framebuffer device\n"); - goto fail2; - } - } - } + if (fb_device) { + pGlamo->fb_fd = open(fb_device, O_RDWR, 0); + if (pGlamo->fb_fd == -1) { + ErrorF("Failed to open framebuffer device\n"); + goto fail2; + } + } else { + fb_device = getenv("FRAMEBUFFER"); + if (fb_device != NULL) { + pGlamo->fb_fd = open(fb_device, O_RDWR, 0); + if (pGlamo->fb_fd != -1) + fb_device = NULL; + } + if (fb_device == NULL) { + fb_device = "/dev/fb0"; + pGlamo->fb_fd = open(fb_device, O_RDWR, 0); + if (pGlamo->fb_fd == -1) { + ErrorF("Failed to open framebuffer device\n"); + goto fail2; + } + } + } /* retrive current setting */ if (ioctl(pGlamo->fb_fd, FBIOGET_FSCREENINFO, (void*)(&pGlamo->fb_fix)) == -1) { diff --git a/src/glamo-output.c b/src/glamo-output.c index 5a09ee0..afee4fd 100644 --- a/src/glamo-output.c +++ b/src/glamo-output.c @@ -42,22 +42,44 @@ static const char *display_state_switch_path = "/sys/bus/spi/devices/spi2.0/stat static const char *display_state_vga = "normal"; static const char *display_state_qvga = "qvga-normal"; -static void GlamoOutputDPMS(xf86OutputPtr output, int mode) {} -static xf86OutputStatus GlamoOutputDetect(xf86OutputPtr output); -static Bool GlamoOutputModeFixup(xf86OutputPtr output, DisplayModePtr mode, +static void +GlamoOutputDPMS(xf86OutputPtr output, int mode) {} + +static xf86OutputStatus +GlamoOutputDetect(xf86OutputPtr output); + +static Bool +GlamoOutputModeFixup(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr mode_adjusted); -static void GlamoOutputPrepare(xf86OutputPtr output); -static void GlamoOutputModeSet(xf86OutputPtr output, DisplayModePtr mode, + +static void +GlamoOutputPrepare(xf86OutputPtr output); + +static void +GlamoOutputModeSet(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode); -static int GlamoOutputModeValid(xf86OutputPtr output, DisplayModePtr mode); -static Bool GlamoOutputModeFixup(xf86OutputPtr output, DisplayModePtr mode, - DisplayModePtr mode_adjusted); -static void GlamoOutputPrepare(xf86OutputPtr output); + +static int +GlamoOutputModeValid(xf86OutputPtr output, DisplayModePtr mode); + +static Bool +GlamoOutputModeFixup(xf86OutputPtr output, DisplayModePtr mode, + DisplayModePtr mode_adjusted); + +static void +GlamoOutputPrepare(xf86OutputPtr output); + static void GlamoOutputModeSet(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode); -static void GlamoOutputCommit(xf86OutputPtr output); -static void GlamoOutputDestroy(xf86OutputPtr output); -static DisplayModePtr GlamoOutputGetModes(xf86OutputPtr output); + +static void +GlamoOutputCommit(xf86OutputPtr output); + +static void +GlamoOutputDestroy(xf86OutputPtr output); + +static DisplayModePtr +GlamoOutputGetModes(xf86OutputPtr output); static const xf86OutputFuncsRec glamo_output_funcs = { .create_resources = NULL, diff --git a/src/glamo.h b/src/glamo.h index a8807d5..f14224a 100644 --- a/src/glamo.h +++ b/src/glamo.h @@ -1,5 +1,6 @@ /* * Copyright 2007 OpenMoko, Inc. + * Copyright © 2009 Lars-Peter Clausen * * This driver is based on Xati, * Copyright 2003 Eric Anholt @@ -40,33 +41,7 @@ #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) #define GLAMO_REG_SIZE(c) (0x2400) -#ifdef __powerpc__ - -static __inline__ void -MMIO_OUT16(__volatile__ void *base, const unsigned long offset, - const unsigned int val) -{ - __asm__ __volatile__( - "stwbrx %1,%2,%3\n\t" - "eieio" - : "=m" (*((volatile unsigned char *)base+offset)) - : "r" (val), "b" (base), "r" (offset)); -} - -static __inline__ CARD32 -MMIO_IN16(__volatile__ void *base, const unsigned long offset) -{ - register unsigned int val; - __asm__ __volatile__( - "lwbrx %0,%1,%2\n\t" - "eieio" - : "=r" (val) - : "b" (base), "r" (offset), - "m" (*((volatile unsigned char *)base+offset))); - return val; -} - -#elif defined(__arm__) /* && !defined(__ARM_EABI__) */ +#if defined(__arm__) /* && !defined(__ARM_EABI__) */ static __inline__ void MMIO_OUT16(__volatile__ void *base, const unsigned long offset, @@ -93,14 +68,12 @@ MMIO_IN16(__volatile__ void *base, const unsigned long offset) #else -#define MMIO_OUT16(mmio, a, v) (*(VOL16 *)((mmio) + (a)) = (v)) -#define MMIO_IN16(mmio, a) (*(VOL16 *)((mmio) + (a))) +#define MMIO_OUT16(mmio, a, v) (*(VOL16 *)((mmio) + (a)) = (v)) +#define MMIO_IN16(mmio, a) (*(VOL16 *)((mmio) + (a))) #endif -typedef volatile CARD8 VOL8; -typedef volatile CARD16 VOL16; -typedef volatile CARD32 VOL32; +typedef volatile CARD16 VOL16; typedef struct _MemBuf { int size; @@ -112,44 +85,29 @@ typedef struct { Bool shadowFB; void *shadow; CloseScreenProcPtr CloseScreen; - CreateScreenResourcesProcPtr CreateScreenResources; + CreateScreenResourcesProcPtr CreateScreenResources; void (*PointerMoved)(int index, int x, int y); EntityInfoPtr pEnt; - /* DGA info */ - DGAModePtr pDGAMode; - int nDGAMode; OptionInfoPtr Options; ScreenPtr pScreen; - PixmapPtr srcPixmap; - PixmapPtr dstPixmap; - CARD32 src_offset; - CARD32 dst_offset; - CARD32 src_pitch; - CARD32 dst_pitch; - CARD32 settings; - CARD32 foreground; - ExaDriverPtr exa; ExaOffscreenArea *exa_cmd_queue; - CARD16 *ring_addr; /* Beginning of ring buffer. */ - int ring_len; + CARD16 *ring_addr; /* Beginning of ring buffer. */ + int ring_len; /* * cmd queue cache in system memory * It is to be flushed to cmd_queue_space * "at once", when we are happy with it. */ - MemBuf *cmd_queue_cache; - int cmd_queue_cache_start; + MemBuf *cmd_queue_cache; /* What was GLAMOCardInfo */ volatile char *reg_base; Bool is_3362; - CARD32 crtc_pitch; - CARD32 crtc2_pitch; /* linux framebuffer */ int fb_fd; @@ -158,7 +116,6 @@ typedef struct { unsigned char *fbstart; unsigned char *fbmem; int fboff; - int lineLength; } GlamoRec, *GlamoPtr; #define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate)) @@ -193,9 +150,6 @@ GLAMODrawDisable(ScreenPtr pScreen); void GLAMODrawFini(ScreenPtr pScreen); -void -GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef); - Bool GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn); -- cgit v1.2.3