summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-01 12:57:47 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-01 12:57:47 +0000
commitd9583acf377cc291b8897917be4c88bbe2d5591d (patch)
treea35b611d96e1b2a82e275851d2b069b1a933659a /vidix
parent7d397d5961413f5da3ff259688c13bd7517c0ef9 (diff)
downloadmpv-d9583acf377cc291b8897917be4c88bbe2d5591d.tar.bz2
mpv-d9583acf377cc291b8897917be4c88bbe2d5591d.tar.xz
killed warnings in savage driver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22886 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/savage_vid.c29
1 files changed, 4 insertions, 25 deletions
diff --git a/vidix/savage_vid.c b/vidix/savage_vid.c
index 7625de1472..b0a897055a 100644
--- a/vidix/savage_vid.c
+++ b/vidix/savage_vid.c
@@ -130,12 +130,6 @@ void SavageStreamsOn(void);
*/
pciinfo_t pci_info;
-/**
- * @brief Unichrome driver colorkey settings.
- */
-static vidix_grkey_t savage_grkey;
-
-static int frames[VID_PLAY_MAXFRAMES];
uint8_t *vio;
uint8_t mclk_save[3];
@@ -670,7 +664,6 @@ SavageStreamsOn(void)
static void savage_getscreenproperties(struct savage_info *info){
unsigned char bpp=0;
- uint32_t width=0;
uint32_t vgaIOBase, vgaCRIndex, vgaCRReg;
@@ -842,14 +835,14 @@ static int
savage_init (void)
{
int mtrr;
- unsigned char config1, m, n, n1, n2, sr8, cr3f, cr66 = 0, tmp;
+ unsigned char config1, tmp;
static unsigned char RamSavage3D[] = { 8, 4, 4, 2 };
static unsigned char RamSavage4[] = { 2, 4, 8, 12, 16, 32, 64, 32 };
static unsigned char RamSavageMX[] = { 2, 8, 4, 16, 8, 16, 4, 16 };
static unsigned char RamSavageNB[] = { 0, 2, 4, 8, 16, 32, 16, 2 };
- int videoRam, videoRambytes;
+ int videoRam;
uint32_t vgaIOBase, vgaCRIndex, vgaCRReg ;
@@ -973,7 +966,7 @@ savage_init (void)
udelay (10000);
VGAOUT8 (0x3d4, 0x66);
- VGAOUT8 (0x3d5, cr66 & ~0x02); /* clear reset flag */
+ VGAOUT8 (0x3d5, cr66 & ~0x02); */ // clear reset flag
/* udelay (10000); */
/* This maps framebuffer @6MB, thus 2MB are left for video. */
@@ -986,7 +979,7 @@ savage_init (void)
info->picture_offset = info->chip.fbsize - FRAMEBUFFER_SIZE;
// info->picture_offset = 1024*1024* 4 * 2;
}
- if ( info->video_base < 0 ){
+ if ( info->video_base == NULL){
printf("errno = %s\n", strerror(errno));
return -1;
}
@@ -1179,11 +1172,6 @@ savage_set_eq (const vidix_video_eq_t * eq)
}
/**
- * @brief Y, U, V offsets.
- */
-static int YOffs, UOffs, VOffs;
-
-/**
* @brief Configure driver for playback. Driver should prepare BES.
*
* @param info configuration description for playback.
@@ -1196,15 +1184,6 @@ savage_config_playback (vidix_playback_t * vinfo)
{
int uv_size, swap_uv;
unsigned int i;
- int extfifo_on;
- int srcPitch,srcPitch2;
-
- /* Overlay register settings */
- uint32_t win_start, win_end;
- uint32_t zoom, mini;
- uint32_t dcount, falign, qwfetch;
- uint32_t y_start, u_start, v_start;
- uint32_t v_ctrl, fifo_ctrl;
if (!is_supported_fourcc (vinfo->fourcc))
return -1;