From 6d534cd3cb5ca12d41f53345e92b9ab594971406 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 31 Jan 2011 03:44:50 +0200 Subject: vidix: drop VIDIX support By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention. --- vidix/sysdep/pci_sparc.c | 60 ------------------------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 vidix/sysdep/pci_sparc.c (limited to 'vidix/sysdep/pci_sparc.c') diff --git a/vidix/sysdep/pci_sparc.c b/vidix/sysdep/pci_sparc.c deleted file mode 100644 index 9ef2012727..0000000000 --- a/vidix/sysdep/pci_sparc.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - This file is based on: - $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.34.2.17 1998/11/10 11:55:40 dawes Exp $ - Modified for readability by Nick Kurshev -*/ - -static int pci_config_type( void ) -{ - unsigned long tmplong1, tmplong2; - unsigned char tmp1, tmp2; - int retval; - retval = 0; - - outb(PCI_MODE2_ENABLE_REG, 0x00); - outb(PCI_MODE2_FORWARD_REG, 0x00); - tmp1 = inb(PCI_MODE2_ENABLE_REG); - tmp2 = inb(PCI_MODE2_FORWARD_REG); - if ((tmp1 == 0x00) && (tmp2 == 0x00)) { - retval = 2; - /*printf("PCI says configuration type 2\n");*/ - } else { - tmplong1 = inl(PCI_MODE1_ADDRESS_REG); - outl(PCI_MODE1_ADDRESS_REG, PCI_EN); - tmplong2 = inl(PCI_MODE1_ADDRESS_REG); - outl(PCI_MODE1_ADDRESS_REG, tmplong1); - if (tmplong2 == PCI_EN) { - retval = 1; - /*printf("PCI says configuration type 1\n");*/ - } else { - /*printf("No PCI !\n");*/ - disable_os_io(); - /*exit(1);*/ - retval = 0xFFFF; - } - } - return retval; -} - -static int pci_get_vendor( - unsigned char bus, - unsigned char dev, - int func) -{ - unsigned long config_cmd; - config_cmd = PCI_EN | (bus<<16) | (dev<<11) | (func<<8); - outl(PCI_MODE1_ADDRESS_REG, config_cmd); - return inl(PCI_MODE1_DATA_REG); -} - -static long pci_config_read_long( - unsigned char bus, - unsigned char dev, - int func, - unsigned cmd) -{ - unsigned long config_cmd; - config_cmd = PCI_EN | (bus<<16) | (dev<<11) | (func<<8); - outl(PCI_MODE1_ADDRESS_REG, config_cmd | cmd); - return inl(PCI_MODE1_DATA_REG); -} -- cgit v1.2.3