diff options
author | Eric Anholt <anholt@freebsd.org> | 2005-06-09 23:22:55 +0000 |
---|---|---|
committer | Eric Anholt <anholt@freebsd.org> | 2005-06-09 23:22:55 +0000 |
commit | 75065f3a54ec760bbe81160fa233810f14d8aaa2 (patch) | |
tree | 3275ad92f368e6c8ecf30567575acd878fa0002e /hw/kdrive/pm2 | |
parent | e11e60b361d63ae02918dd6b43038a5c92b73a49 (diff) |
Perform a warnings sweep on hw/kdrive. A number of these were my fault, but
some come from others.
Diffstat (limited to 'hw/kdrive/pm2')
-rw-r--r-- | hw/kdrive/pm2/pm2.c | 28 | ||||
-rw-r--r-- | hw/kdrive/pm2/pm2stub.c | 3 |
2 files changed, 10 insertions, 21 deletions
diff --git a/hw/kdrive/pm2/pm2.c b/hw/kdrive/pm2/pm2.c index a6b4142da..df2cf7ce4 100644 --- a/hw/kdrive/pm2/pm2.c +++ b/hw/kdrive/pm2/pm2.c @@ -49,7 +49,7 @@ int partprodPermedia[] = { -1, -1, -1, -1, 0}; -Bool +static Bool pmMapReg(KdCardInfo *card, PM2CardInfo *pm2c) { pm2c->reg_base = (CARD8 *)KdMapDevice(PM2_REG_BASE(card), @@ -64,7 +64,7 @@ pmMapReg(KdCardInfo *card, PM2CardInfo *pm2c) return TRUE; } -void +static void pmUnmapReg(KdCardInfo *card, PM2CardInfo *pm2c) { if (pm2c->reg_base) { @@ -78,8 +78,6 @@ pmUnmapReg(KdCardInfo *card, PM2CardInfo *pm2c) Bool pmCardInit (KdCardInfo *card) { - int i; - PM2CardInfo *pm2c; pm2c = (PM2CardInfo *) xalloc (sizeof (PM2CardInfo)); @@ -102,7 +100,7 @@ pmCardInit (KdCardInfo *card) return TRUE; } -void +static void pmCardFini (KdCardInfo *card) { PM2CardInfo *pm2c = (PM2CardInfo *) card->driver; @@ -176,7 +174,7 @@ pmScreenInit (KdScreenInfo *screen) return TRUE; } -void +static void pmScreenFini (KdScreenInfo *screen) { PM2ScreenInfo *pm2s = (PM2ScreenInfo *) screen->driver; @@ -186,7 +184,7 @@ pmScreenFini (KdScreenInfo *screen) screen->driver = 0; } -Bool +static Bool pmInitScreen (ScreenPtr pScreen) { return vesaInitScreen (pScreen); @@ -216,7 +214,7 @@ pmRandRInit (ScreenPtr pScreen) } #endif -Bool +static Bool pmFinishInitScreen (ScreenPtr pScreen) { Bool ret; @@ -227,7 +225,7 @@ pmFinishInitScreen (ScreenPtr pScreen) return ret; } -void +static void pmPreserve(KdCardInfo *card) { vesaPreserve(card); @@ -236,17 +234,12 @@ pmPreserve(KdCardInfo *card) static void pmRestore(KdCardInfo *card) { - PM2CardInfo *pm2c = card->driver; - vesaRestore (card); } -Bool +static Bool pmEnable (ScreenPtr pScreen) { - KdScreenPriv(pScreen); - PM2CardInfo *pm2c = pScreenPriv->card->driver; - if (!vesaEnable (pScreen)) return FALSE; @@ -257,12 +250,9 @@ pmEnable (ScreenPtr pScreen) return TRUE; } -void +static void pmDisable(ScreenPtr pScreen) { - KdScreenPriv(pScreen); - PM2CardInfo *pm2c = pScreenPriv->card->driver; - #ifdef XV KdXVDisable (pScreen); #endif diff --git a/hw/kdrive/pm2/pm2stub.c b/hw/kdrive/pm2/pm2stub.c index f125466b4..07a176005 100644 --- a/hw/kdrive/pm2/pm2stub.c +++ b/hw/kdrive/pm2/pm2stub.c @@ -2,6 +2,7 @@ #include <config.h> #endif #include "kdrive.h" +#include "klinux.h" #include "pm2.h" @@ -16,8 +17,6 @@ InitCard (char *name) KdCardAttr attr; int i; - Bool LinuxFindPci(CARD16, CARD16, CARD32, KdCardAttr *); - for (i = 0; i < numPM2Cards; i++) if (LinuxFindPci (0x3d3d, PM2Cards[i], 0, &attr)) KdCardInfoAdd (&PM2Funcs, &attr, (void *) PM2Cards[i]); |