diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-23 19:51:52 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-23 19:51:52 +0000 |
| commit | f2f55036f84942dc438fa29bb6ac9d609febf0e2 (patch) | |
| tree | 2c7c86865318073388cb970a0a56160b0fff65dc | |
| parent | 868a7cad8d9fc638066380ab52b9606cddd5ed69 (diff) | |
| download | mpv-f2f55036f84942dc438fa29bb6ac9d609febf0e2.tar.bz2 mpv-f2f55036f84942dc438fa29bb6ac9d609febf0e2.tar.xz | |
gcc warnings fixed - patch by Aelius aelius@wish.net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@855 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | drivers/mga_vid.c | 8 | ||||
| -rw-r--r-- | drivers/mga_vid.h | 2 | ||||
| -rw-r--r-- | drivers/mga_vid_test.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c index 2dd75ca266..8c8b07ae00 100644 --- a/drivers/mga_vid.c +++ b/drivers/mga_vid.c @@ -554,7 +554,7 @@ static void disable_irq(){ 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 @@ static int mga_vid_ioctl(struct inode *inode, struct file *file, unsigned int cm //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_ioctl(struct inode *inode, struct file *file, unsigned int cm 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 @@ static int mga_vid_find_card(void) 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, diff --git a/drivers/mga_vid.h b/drivers/mga_vid.h index 55b807e7a1..7a791e606f 100644 --- a/drivers/mga_vid.h +++ b/drivers/mga_vid.h @@ -15,7 +15,7 @@ #ifndef __LINUX_MGAVID_H #define __LINUX_MGAVID_H -#include <inttypes.h> +//#include <inttypes.h> typedef struct mga_vid_config_s { diff --git a/drivers/mga_vid_test.c b/drivers/mga_vid_test.c index e51bcd4d49..563bd50f0d 100644 --- a/drivers/mga_vid_test.c +++ b/drivers/mga_vid_test.c @@ -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; |