diff options
| -rw-r--r-- | sys/dev/pci/files.pci | 6 | ||||
| -rw-r--r-- | sys/dev/pci/vgafb_pci.c | 380 | ||||
| -rw-r--r-- | sys/dev/pci/vgafb_pcivar.h | 38 |
3 files changed, 1 insertions, 423 deletions
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index 1e1cb2dfff1..6b3132f2369 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.82 2000/08/29 23:45:39 jason Exp $ +# $OpenBSD: files.pci,v 1.83 2000/09/06 01:46:45 rahnds Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -16,10 +16,6 @@ file dev/pci/pci_subr.c pci attach vga at pci with vga_pci file dev/pci/vga_pci.c vga_pci needs-flag -# Generic VGA Framebuffer version -attach vgafb at pci with vgafb_pci -file dev/pci/vgafb_pci.c vgafb_pci needs-flag - device tga: wsemuldisplaydev, wsrasteremulops attach tga at pci file dev/pci/tga.c tga needs-flag diff --git a/sys/dev/pci/vgafb_pci.c b/sys/dev/pci/vgafb_pci.c deleted file mode 100644 index 5120c9924d8..00000000000 --- a/sys/dev/pci/vgafb_pci.c +++ /dev/null @@ -1,380 +0,0 @@ -/* $OpenBSD: vgafb_pci.c,v 1.3 1998/10/09 02:00:52 rahnds Exp $ */ -/* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ - -/* - * Copyright (c) 1995, 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/device.h> -#include <sys/malloc.h> - -#ifndef i386 -#include <machine/autoconf.h> -#endif -#include <machine/pte.h> - -#include <dev/pci/pcireg.h> -#include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> - -#include <dev/ic/vgafbvar.h> -#include <dev/pci/vgafb_pcivar.h> - -#define PCI_VENDORID(x) ((x) & 0xFFFF) -#define PCI_CHIPID(x) (((x) >> 16) & 0xFFFF) - -struct vgafb_pci_softc { - struct device sc_dev; - - pcitag_t sc_pcitag; /* PCI tag, in case we need it. */ - struct vgafb_config *sc_vc; /* VGA configuration */ -}; - -#ifdef __BROKEN_INDIRECT_CONFIG -int vgafb_pci_match __P((struct device *, void *, void *)); -#else -int vgafb_pci_match __P((struct device *, struct cfdata *, void *)); -#endif -void vgafb_pci_attach __P((struct device *, struct device *, void *)); - -int vgafbpcimmap __P((void *, off_t, int)); -int vgafbpciioctl __P((void *, u_long, caddr_t, int, struct proc *)); - -struct cfattach vgafb_pci_ca = { - sizeof(struct vgafb_pci_softc), (cfmatch_t)vgafb_pci_match, vgafb_pci_attach, -}; - -pcitag_t vgafb_pci_console_tag; -struct vgafb_config vgafb_pci_console_vc; - -#if 0 -#define DEBUG_VGAFB -#endif - -int -vgafb_pci_probe(pa, id, ioaddr, iosize, memaddr, memsize, cacheable, mmioaddr, mmiosize) - struct pci_attach_args *pa; - int id; - u_int32_t *ioaddr, *iosize; - u_int32_t *memaddr, *memsize, *cacheable; - u_int32_t *mmioaddr, *mmiosize; -{ - u_int32_t addr, size, tcacheable; - pci_chipset_tag_t pc = pa->pa_pc; - int retval; - int i; - - *iosize = 0x0; - *memsize = 0x0; - *mmiosize = 0x0; - for (i = 0x10; i < 0x18; i += 4) { -#ifdef DEBUG_VGAFB - printf("vgafb confread %x %x\n", - i, pci_conf_read(pc, pa->pa_tag, i)); -#endif - /* need to check more than just two base addresses? */ - if (0x1 & pci_conf_read(pc, pa->pa_tag, i) ) { - retval = pci_io_find(pc, pa->pa_tag, i, - &addr, &size); - if (retval) { - printf("vgafb_pci_probe: io %x addr %x size %x\n", i, addr, size); - return 0; - } - if (*iosize == 0) { - *ioaddr = addr; - *iosize = size; - } - - } else { - retval = pci_mem_find(pc, pa->pa_tag, i, - &addr, &size, &tcacheable); -#ifdef DEBUG_VGAFB - printf("vgafb_pci_probe: mem %x addr %x size %x\n", i, addr, size); -#endif - - if (retval) { - printf("vgafb_pci_probe: mem %x addr %x size %x\n", i, addr, size); - return 0; - } - if (size == 0) { - /* ignore this entry */ - }else if (size <= (64 * 1024)) { -#ifdef DEBUG_VGAFB - printf("vgafb_pci_probe: mem %x addr %x size %x iosize %x\n", - i, addr, size, *iosize); -#endif - if (*mmiosize == 0) { - /* this is mmio, not memory */ - *mmioaddr = addr; - *mmiosize = size; - /* need skew in here for io memspace */ - } - } else { - if (*memsize == 0) { - *memaddr = addr; - *memsize = size; - *cacheable = tcacheable; - } - } - } - } -#ifdef DEBUG_VGAFB - printf("vgafb_pci_probe: id %x ioaddr %x, iosize %x, memaddr %x,\n memsize %x, mmioaddr %x, mmiosize %x\n", - id, *ioaddr, *iosize, *memaddr, *memsize, *mmioaddr, *mmiosize); -#endif - if (*iosize == 0) { - if (id == 0) { -#ifdef powerpc - /* this is only used if on openfirmware system and - * the device does not have a iobase config register, - * eg CirrusLogic 5434 VGA. (they hardcode iobase to 0 - * thus giving standard PC addresses for the registers) - */ - int s; - u_int32_t sizedata; - - /* - * Open Firmware (yuck) shuts down devices before - * entering a program so we need to bring them back - * 'online' to respond to bus accesses... so far - * this is true on the power.4e. - */ - s = splhigh(); - sizedata = pci_conf_read(pc, pa->pa_tag, - PCI_COMMAND_STATUS_REG); - sizedata |= (PCI_COMMAND_MASTER_ENABLE | - PCI_COMMAND_IO_ENABLE | - PCI_COMMAND_PARITY_ENABLE | - PCI_COMMAND_SERR_ENABLE); - pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, - sizedata); - splx(s); - -#endif - /* if this is the first card, allow it - * to be accessed in vga iospace - */ - *ioaddr = 0; - *iosize = 0x10000; /* 64k, good as any */ - } else { - /* iospace not available, assume 640x480, pray */ - *ioaddr = 0; - *iosize=0; - } - } -#ifdef DEBUG_VGAFB - printf("vgafb_pci_probe: id %x ioaddr %x, iosize %x, memaddr %x,\n memsize %x, mmioaddr %x, mmiosize %x\n", - id, *ioaddr, *iosize, *memaddr, *memsize, *mmioaddr, *mmiosize); -#endif - return 1; -} -int -vgafb_pci_match(parent, match, aux) - struct device *parent; -#ifdef __BROKEN_INDIRECT_CONFIG - void *match; -#else - struct cfdata *match; -#endif - void *aux; -{ - struct pci_attach_args *pa = aux; - u_int32_t memaddr, memsize, cacheable; - u_int32_t ioaddr, iosize; - u_int32_t mmioaddr, mmiosize; - int potential; - int retval; - static int id = 0; - int myid; - - myid = id; - - potential = 0; - - /* - * If it's prehistoric/vga or display/vga, we might match. - * For the console device, this is jut a sanity check. - */ - if (PCI_CLASS(pa->pa_class) == PCI_CLASS_PREHISTORIC && - PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_PREHISTORIC_VGA) - potential = 1; - if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY && - PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_DISPLAY_VGA) - potential = 1; - - if (!potential) - return (0); - - /* If it's the console, we have a winner! */ - if (!bcmp(&pa->pa_tag, &vgafb_pci_console_tag, sizeof(pa->pa_tag))) { - id++; - return (1); - } - -#ifdef DEBUG_VGAFB - { - int i; - pci_chipset_tag_t pc = pa->pa_pc; - for (i = 0x10; i < 0x24; i+=4) { - printf("vgafb confread %x %x\n", - i, pci_conf_read(pc, pa->pa_tag, i)); - } - } -#endif - - memaddr=0xb8000; /* default to isa addresses? */ - ioaddr = 0; /* default to isa addresses? */ - - retval = vgafb_pci_probe(pa, myid, &ioaddr, &iosize, - &memaddr, &memsize, &cacheable, &mmioaddr, &mmiosize); - if (retval == 0) { - return 0; - } -#if 0 - printf("ioaddr %x, iosize %x, memaddr %x, memsize %x mmioaddr %x mmiosize %x\n", - ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize); -#endif - - if (!vgafb_common_probe(pa->pa_iot, pa->pa_memt, ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize)) - { - printf("vgafb_pci_match: common_probe failed\n"); - return (0); - } - id++; - - return (1); -} - -void -vgafb_pci_attach(parent, self, aux) - struct device *parent, *self; - void *aux; -{ - struct pci_attach_args *pa = aux; - struct vgafb_pci_softc *sc = (struct vgafb_pci_softc *)self; - struct vgafb_config *vc; - u_int32_t memaddr, memsize, cacheable; - u_int32_t ioaddr, iosize; - u_int32_t mmioaddr, mmiosize; - int console; - static int id = 0; - int myid; - - myid = id; - - vgafb_pci_probe(pa, myid, &ioaddr, &iosize, - &memaddr, &memsize, &cacheable, &mmioaddr, &mmiosize); - - console = (!bcmp(&pa->pa_tag, &vgafb_pci_console_tag, sizeof(pa->pa_tag))); - if (console) - vc = sc->sc_vc = &vgafb_pci_console_vc; - else { - vc = sc->sc_vc = (struct vgafb_config *) - malloc(sizeof(struct vgafb_config), M_DEVBUF, M_WAITOK); - - /* set up bus-independent VGA configuration */ - vgafb_common_setup(pa->pa_iot, pa->pa_memt, vc, - ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize); - } - vc->vc_mmap = vgafbpcimmap; - vc->vc_ioctl = vgafbpciioctl; - - sc->sc_pcitag = pa->pa_tag; - - if (iosize == 0) { - printf (", no io"); - } - if (mmiosize != 0) { - printf (", mmio"); - } - printf("\n"); - - vgafb_wscons_attach(self, vc, console); - id++; -} - -void -vgafb_pci_console(iot, memt, pc, bus, device, function) - bus_space_tag_t iot, memt; - pci_chipset_tag_t pc; - int bus, device, function; -{ - struct vgafb_config *vc = &vgafb_pci_console_vc; - u_int32_t memaddr, memsize, mmioaddr; - u_int32_t ioaddr, iosize, mmiosize; - int retval; - u_int32_t cacheable; - static struct pci_attach_args spa; - struct pci_attach_args *pa = &spa; - - /* for later recognition */ - vgafb_pci_console_tag = pci_make_tag(pc, bus, device, function); - - pa->pa_iot = iot; - pa->pa_memt = memt; - pa->pa_tag = vgafb_pci_console_tag; - /* - pa->pa_pc = XXX; - */ - -/* XXX probe pci before pci bus config? */ - - vgafb_pci_probe(pa, 0, &ioaddr, &iosize, - &memaddr, &memsize, &cacheable, mmioaddr, mmiosize); - - - /* set up bus-independent VGA configuration */ - vgafb_common_setup(iot, memt, vc, ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize); - - vgafb_wscons_console(vc); -} - -int -vgafbpciioctl(v, cmd, data, flag, p) - void *v; - u_long cmd; - caddr_t data; - int flag; - struct proc *p; -{ - struct vgafb_pci_softc *sc = v; - - return (vgafbioctl(sc->sc_vc, cmd, data, flag, p)); -} - -int -vgafbpcimmap(v, offset, prot) - void *v; - off_t offset; - int prot; -{ - struct vgafb_pci_softc *sc = v; - - return (vgafbmmap(sc->sc_vc, offset, prot)); -} diff --git a/sys/dev/pci/vgafb_pcivar.h b/sys/dev/pci/vgafb_pcivar.h deleted file mode 100644 index 836dca2897d..00000000000 --- a/sys/dev/pci/vgafb_pcivar.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $OpenBSD: vgafb_pcivar.h,v 1.1 1998/09/27 03:55:59 rahnds Exp $ */ -/* $NetBSD: vga_pcivar.h,v 1.1 1996/11/19 04:38:36 cgd Exp $ */ - -/* - * Copyright (c) 1995, 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#define DEVICE_IS_VGA_PCI(class, id) \ - (((PCI_CLASS(class) == PCI_CLASS_DISPLAY && \ - PCI_SUBCLASS(class) == PCI_SUBCLASS_DISPLAY_VGA) || \ - (PCI_CLASS(class) == PCI_CLASS_PREHISTORIC && \ - PCI_SUBCLASS(class) == PCI_SUBCLASS_PREHISTORIC_VGA)) ? 1 : 0) - -void vgafb_pci_console __P((bus_space_tag_t, bus_space_tag_t, - pci_chipset_tag_t, int, int, int)); |