Mercurial > mplayer.hg

changeset 854:76ca00724e12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc warnings fixed - patch by Aelius aelius@wish.net
author arpi_esp
date Wed, 23 May 2001 19:51:52 +0000
parents 4f5a6c252703
children 044cfdebe60c
files drivers/mga_vid.c drivers/mga_vid.h drivers/mga_vid_test.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/mga_vid.c	Wed May 23 09:19:58 2001 +0000
+++ b/drivers/mga_vid.c	Wed May 23 19:51:52 2001 +0000
@@ -554,7 +554,7 @@
 
 void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
 //	static int frame=0;
-	static int counter=0;
+//	static int counter=0;
 	long int cc;
 //	if ( ! mga_enabled_flag ) return;
 
@@ -629,7 +629,7 @@
 			//FIXME remove
 //			printk(KERN_DEBUG "vcount = %d\n",readl(mga_mmio_base + VCOUNT));
 			printk(KERN_DEBUG "mga_mmio_base = %p\n",mga_mmio_base);
-			printk(KERN_DEBUG "mga_mem_base = %08lx\n",mga_mem_base);
+			printk(KERN_DEBUG "mga_mem_base = %08x\n",mga_mem_base);
 			//FIXME remove
 
 			printk(KERN_DEBUG "mga_vid: Received configuration\n");
@@ -724,7 +724,7 @@
 static int mga_vid_find_card(void)
 {
 	struct pci_dev *dev = NULL;
-	unsigned int card_option, temp;
+	unsigned int card_option;
 
 	if((dev = pci_find_device(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400, NULL)))
 	{
@@ -758,7 +758,7 @@
 	mga_mmio_base = ioremap_nocache(dev->base_address[1] & PCI_BASE_ADDRESS_MEM_MASK,0x4000);
 	mga_mem_base =  dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK;
 #endif
-	printk(KERN_INFO "mga_vid: MMIO at 0x%p IRQ: %d  framebuffer: 0x%08lX\n", mga_mmio_base, mga_irq, mga_mem_base);
+	printk(KERN_INFO "mga_vid: MMIO at 0x%p IRQ: %d  framebuffer: 0x%08X\n", mga_mmio_base, mga_irq, mga_mem_base);
 
 	pci_read_config_dword(dev,  0x40, &card_option);
 	printk(KERN_INFO "mga_vid: OPTION word: 0x%08X  mem: 0x%02X  %s\n", card_option,
--- a/drivers/mga_vid.h	Wed May 23 09:19:58 2001 +0000
+++ b/drivers/mga_vid.h	Wed May 23 19:51:52 2001 +0000
@@ -15,7 +15,7 @@
 #ifndef __LINUX_MGAVID_H
 #define __LINUX_MGAVID_H
 
-#include <inttypes.h>
+//#include <inttypes.h>
 
 typedef struct mga_vid_config_s
 {
--- a/drivers/mga_vid_test.c	Wed May 23 09:19:58 2001 +0000
+++ b/drivers/mga_vid_test.c	Wed May 23 19:51:52 2001 +0000
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <inttypes.h>
 #include "mga_vid.h"
 
 mga_vid_config_t config;