RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-02 05:01:56 +00:00
Code Issues Releases Wiki Activity

gcc warnings fixed - patch by Aelius aelius@wish.net

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@855 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-05-23 19:51:52 +00:00
parent 868a7cad8d
commit f2f55036f8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mga_vid.c
View File

@ -554,7 +554,7 @@ static void disable_irq(){
void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) { void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
// static int frame=0; // static int frame=0;
static int counter=0; // static int counter=0;
long int cc; long int cc;
// if ( ! mga_enabled_flag ) return; // 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 //FIXME remove
// printk(KERN_DEBUG "vcount = %d\n",readl(mga_mmio_base + VCOUNT)); // 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_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 //FIXME remove
printk(KERN_DEBUG "mga_vid: Received configuration\n"); 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) static int mga_vid_find_card(void)
{ {
struct pci_dev *dev = NULL; 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))) 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_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; mga_mem_base = dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK;
#endif #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); pci_read_config_dword(dev, 0x40, &card_option);
printk(KERN_INFO "mga_vid: OPTION word: 0x%08X mem: 0x%02X %s\n", card_option, printk(KERN_INFO "mga_vid: OPTION word: 0x%08X mem: 0x%02X %s\n", card_option,

2
drivers/mga_vid.h
View File

@ -15,7 +15,7 @@
#ifndef __LINUX_MGAVID_H #ifndef __LINUX_MGAVID_H
#define __LINUX_MGAVID_H #define __LINUX_MGAVID_H
#include <inttypes.h> //#include <inttypes.h>
typedef struct mga_vid_config_s typedef struct mga_vid_config_s
{ {

1
drivers/mga_vid_test.c
View File

@ -16,6 +16,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <inttypes.h>
#include "mga_vid.h" #include "mga_vid.h"
mga_vid_config_t config; mga_vid_config_t config;