[Mplayer-cvslog] CVS: main/drivers mga_vid_test.c,1.2,1.3 mga_vid.h,1.6,1.7 mga_vid.c,1.21,1.22

[GEREOFFY]

Update of /cvsroot/mplayer/main/drivers
In directory usw-pr-cvs1:/tmp/cvs-serv20712

Modified Files:
	mga_vid_test.c mga_vid.h mga_vid.c 
Log Message:
gcc warnings fixed - patch by Aelius aelius at wish.net

Index: mga_vid_test.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mga_vid_test.c	2001/03/11 00:01:03	1.2
--- mga_vid_test.c	2001/05/23 19:51:52	1.3
***************
*** 17,20 ****
--- 17,21 ----
  #include <fcntl.h>
  #include <sys/mman.h>
+ #include <inttypes.h>
  #include "mga_vid.h"
  

Index: mga_vid.h
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mga_vid.h	2001/04/16 03:32:26	1.6
--- mga_vid.h	2001/05/23 19:51:52	1.7
***************
*** 16,20 ****
  #define __LINUX_MGAVID_H
  
! #include <inttypes.h>
  
  typedef struct mga_vid_config_s
--- 16,20 ----
  #define __LINUX_MGAVID_H
  
! //#include <inttypes.h>
  
  typedef struct mga_vid_config_s

Index: mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** mga_vid.c	2001/04/29 20:24:38	1.21
--- mga_vid.c	2001/05/23 19:51:52	1.22
***************
*** 555,559 ****
  void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
  //	static int frame=0;
! 	static int counter=0;
  	long int cc;
  //	if ( ! mga_enabled_flag ) return;
--- 555,559 ----
  void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
  //	static int frame=0;
! //	static int counter=0;
  	long int cc;
  //	if ( ! mga_enabled_flag ) return;
***************
*** 630,634 ****
  //			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);
  			//FIXME remove
  
--- 630,634 ----
  //			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 = %08x\n",mga_mem_base);
  			//FIXME remove
  
***************
*** 725,729 ****
  {
  	struct pci_dev *dev = NULL;
! 	unsigned int card_option, temp;
  
  	if((dev = pci_find_device(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400, NULL)))
--- 725,729 ----
  {
  	struct pci_dev *dev = NULL;
! 	unsigned int card_option;
  
  	if((dev = pci_find_device(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400, NULL)))
***************
*** 759,763 ****
  	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);
  
  	pci_read_config_dword(dev,  0x40, &card_option);
--- 759,763 ----
  	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%08X\n", mga_mmio_base, mga_irq, mga_mem_base);
  
  	pci_read_config_dword(dev,  0x40, &card_option);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog