diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-03-27 14:49:30 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-03-27 14:49:30 -0700 |
| commit | ad4abba20b8a6db7b52898bc7159809539cbed43 (patch) | |
| tree | 11638de295d99f7282b5247f0aae91ea77b1f67c | |
| parent | 7e0e5c1fb38922add99db33f282baf2ee1531685 (diff) | |
Fix warnings.
| -rw-r--r-- | src/g80_display.c | 1 | ||||
| -rw-r--r-- | src/g80_driver.c | 6 | ||||
| -rw-r--r-- | src/g80_output.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/g80_display.c b/src/g80_display.c index b9882da..2442e96 100644 --- a/src/g80_display.c +++ b/src/g80_display.c @@ -322,7 +322,6 @@ G80CrtcModeSet(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjusted_mode, int x, int y) { ScrnInfoPtr pScrn = crtc->scrn; - G80Ptr pNv = G80PTR(pScrn); G80CrtcPrivPtr pPriv = crtc->driver_private; const int HDisplay = mode->HDisplay, VDisplay = mode->VDisplay; const int headOff = 0x400 * G80CrtcGetHead(crtc); diff --git a/src/g80_driver.c b/src/g80_driver.c index 6d19cce..8dff209 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -30,6 +30,7 @@ #include <xf86_OSproc.h> #include <xf86Resources.h> +#include <xf86RandR12.h> #include <mipointer.h> #include <mibstore.h> #include <micmap.h> @@ -44,6 +45,7 @@ #include "g80_display.h" #include "g80_ddc.h" #include "g80_dma.h" +#include "g80_output.h" #include "g80_xaa.h" #define G80_REG_SIZE (1024 * 1024 * 16) @@ -119,6 +121,7 @@ G80FreeRec(ScrnInfoPtr pScrn) pScrn->driverPrivate = NULL; } +static Bool G80ResizeScreen(ScrnInfoPtr pScrn, int width, int height) { G80Ptr pNv = G80PTR(pScrn); @@ -161,7 +164,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) PCITAG pcitag; MessageType from; Bool primary; - char *s; const rgb zeros = {0, 0, 0}; const Gamma gzeros = {0.0, 0.0, 0.0}; CARD32 tmp; @@ -395,7 +397,7 @@ fail: static Bool AcquireDisplay(ScrnInfoPtr pScrn) { - G80Ptr pNv = G80PTR(pScrn); +// G80Ptr pNv = G80PTR(pScrn); if(!G80DispInit(pScrn)) return FALSE; diff --git a/src/g80_output.c b/src/g80_output.c index 481dd85..b56bf00 100644 --- a/src/g80_output.c +++ b/src/g80_output.c @@ -236,7 +236,7 @@ G80CreateOutputs(ScrnInfoPtr pScrn) { G80Ptr pNv = G80PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - int i, count = 0; + int i; if(!G80ReadPortMapping(pScrn->scrnIndex, pNv)) return FALSE; @@ -252,7 +252,6 @@ G80CreateOutputs(ScrnInfoPtr pScrn) /* For each output, set the crtc and clone masks */ for(i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; - G80OutputPrivPtr pPriv = output->driver_private; /* Any output can connect to any head */ output->possible_crtcs = 0x3; |