andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Wall fixes

Browse Source
This commit is contained in:
Keith Packard 2003-10-14 05:04:22 +00:00
parent 44f2e82f1b
commit a398339b6d
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/kdrive/fbdev/fbdev.c
View File

@ -27,6 +27,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include "fbdev.h" #include "fbdev.h"
#include <sys/ioctl.h>
/* this code was used to debug MSB 24bpp code on a 16bpp frame buffer */ /* this code was used to debug MSB 24bpp code on a 16bpp frame buffer */
#undef FAKE24_ON_16 #undef FAKE24_ON_16
@ -73,8 +74,6 @@ fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
Bool Bool
fbdevCardInit (KdCardInfo *card) fbdevCardInit (KdCardInfo *card)
{ {
int k;
char *pixels;
FbdevPriv *priv; FbdevPriv *priv;
priv = (FbdevPriv *) xalloc (sizeof (FbdevPriv)); priv = (FbdevPriv *) xalloc (sizeof (FbdevPriv));
@ -114,7 +113,6 @@ fbdevScreenInitialize (KdScreenInfo *screen, FbdevScrPriv *scrpriv)
FbdevPriv *priv = screen->card->driver; FbdevPriv *priv = screen->card->driver;
Pixel allbits; Pixel allbits;
int depth; int depth;
Bool shadow;
Bool gray; Bool gray;
#ifdef FAKE24_ON_16 #ifdef FAKE24_ON_16
Bool fake24; Bool fake24;
@ -345,7 +343,6 @@ fbdevConfigureScreen (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
KdScreenInfo *screen = pScreenPriv->screen; KdScreenInfo *screen = pScreenPriv->screen;
FbdevPriv *priv = pScreenPriv->card->driver;
FbdevScrPriv *scrpriv = screen->driver; FbdevScrPriv *scrpriv = screen->driver;
KdMouseMatrix m; KdMouseMatrix m;
@ -388,14 +385,11 @@ fbdevLayerCreate (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
KdScreenInfo *screen = pScreenPriv->screen; KdScreenInfo *screen = pScreenPriv->screen;
FbdevPriv *priv = pScreenPriv->card->driver;
FbdevScrPriv *scrpriv = screen->driver; FbdevScrPriv *scrpriv = screen->driver;
LayerPtr pLayer;
ShadowUpdateProc update; ShadowUpdateProc update;
ShadowWindowProc window; ShadowWindowProc window;
PixmapPtr pPixmap; PixmapPtr pPixmap;
int kind; int kind;
KdMouseMatrix m;
if (scrpriv->shadow) if (scrpriv->shadow)
{ {
@ -437,7 +431,6 @@ Bool
fbdevRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) fbdevRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
FbdevPriv *priv = pScreenPriv->card->driver;
KdScreenInfo *screen = pScreenPriv->screen; KdScreenInfo *screen = pScreenPriv->screen;
FbdevScrPriv *scrpriv = screen->driver; FbdevScrPriv *scrpriv = screen->driver;
RRScreenSizePtr pSize; RRScreenSizePtr pSize;
@ -488,6 +481,7 @@ fbdevLayerRemove (WindowPtr pWin, pointer value)
return WT_WALKCHILDREN; return WT_WALKCHILDREN;
} }
Bool
fbdevRandRSetConfig (ScreenPtr pScreen, fbdevRandRSetConfig (ScreenPtr pScreen,
Rotation randr, Rotation randr,
int rate, int rate,
@ -495,7 +489,6 @@ fbdevRandRSetConfig (ScreenPtr pScreen,
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
KdScreenInfo *screen = pScreenPriv->screen; KdScreenInfo *screen = pScreenPriv->screen;
FbdevPriv *priv = pScreenPriv->card->driver;
FbdevScrPriv *scrpriv = screen->driver; FbdevScrPriv *scrpriv = screen->driver;
Bool wasEnabled = pScreenPriv->enabled; Bool wasEnabled = pScreenPriv->enabled;
FbdevScrPriv oldscr; FbdevScrPriv oldscr;
@ -560,12 +553,9 @@ bail4:
pScreen->height = oldheight; pScreen->height = oldheight;
pScreen->mmWidth = oldmmwidth; pScreen->mmWidth = oldmmwidth;
pScreen->mmHeight = oldmmheight; pScreen->mmHeight = oldmmheight;
bail2:
*scrpriv = oldscr; *scrpriv = oldscr;
bail1:
if (wasEnabled) if (wasEnabled)
KdEnableScreen (pScreen); KdEnableScreen (pScreen);
bail0:
return FALSE; return FALSE;
} }
@ -621,8 +611,6 @@ fbdevCreateColormap (ColormapPtr pmap)
Bool Bool
fbdevInitScreen (ScreenPtr pScreen) fbdevInitScreen (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen);
#ifdef TOUCHSCREEN #ifdef TOUCHSCREEN
KdTsPhyScreen = pScreen->myNum; KdTsPhyScreen = pScreen->myNum;
#endif #endif
@ -638,7 +626,6 @@ Bool
fbdevFinishInitScreen (ScreenPtr pScreen) fbdevFinishInitScreen (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
FbdevPriv *priv = pScreenPriv->card->driver;
FbdevScrPriv *scrpriv = pScreenPriv->screen->driver; FbdevScrPriv *scrpriv = pScreenPriv->screen->driver;
scrpriv->layerKind = LayerNewKind (pScreen); scrpriv->layerKind = LayerNewKind (pScreen);
@ -667,9 +654,7 @@ Bool
fbdevEnable (ScreenPtr pScreen) fbdevEnable (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen); KdScreenPriv(pScreen);
KdScreenInfo *screen = pScreenPriv->screen;
FbdevPriv *priv = pScreenPriv->card->driver; FbdevPriv *priv = pScreenPriv->card->driver;
FbdevScrPriv *scrpriv = pScreenPriv->screen->driver;
int k; int k;
priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL; priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
@ -746,13 +731,11 @@ fbdevRestore (KdCardInfo *card)
void void
fbdevScreenFini (KdScreenInfo *screen) fbdevScreenFini (KdScreenInfo *screen)
{ {
FbdevScrPriv *scrpriv = screen->driver;
} }
void void
fbdevCardFini (KdCardInfo *card) fbdevCardFini (KdCardInfo *card)
{ {
int k;
FbdevPriv *priv = card->driver; FbdevPriv *priv = card->driver;
munmap (priv->fb_base, priv->fix.smem_len); munmap (priv->fb_base, priv->fix.smem_len);