summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha/pci')
-rw-r--r--sys/arch/alpha/pci/bt485reg.h65
-rw-r--r--sys/arch/alpha/pci/pci_machdep.c10
-rw-r--r--sys/arch/alpha/pci/tga.c589
-rw-r--r--sys/arch/alpha/pci/tga_bt463.c52
-rw-r--r--sys/arch/alpha/pci/tga_bt485.c588
-rw-r--r--sys/arch/alpha/pci/tga_conf.c184
-rw-r--r--sys/arch/alpha/pci/tgavar.h141
7 files changed, 5 insertions, 1624 deletions
diff --git a/sys/arch/alpha/pci/bt485reg.h b/sys/arch/alpha/pci/bt485reg.h
index fcd1b16fc21..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/bt485reg.h
+++ b/sys/arch/alpha/pci/bt485reg.h
@@ -1,65 +0,0 @@
-/* $OpenBSD: bt485reg.h,v 1.4 1996/10/30 22:39:52 niklas Exp $ */
-/* $NetBSD: bt485reg.h,v 1.4 1996/04/12 06:08:17 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.
- */
-
-/*
- * Register definitions for the Brooktree Bt485A 170MHz Monolithic
- * CMOS True-Color RAMDAC.
- */
-
-
-/*
- * Directly-addressed registers.
- */
-#define BT485_REG_PCRAM_WRADDR 0x00
-#define BT485_REG_PALETTE 0x01
-#define BT485_REG_PIXMASK 0x02
-#define BT485_REG_PCRAM_RDADDR 0x03
-#define BT485_REG_COC_WRADDR 0x04
-#define BT485_REG_COCDATA 0x05
-#define BT485_REG_COMMAND_0 0x06
-#define BT485_REG_COC_RDADDR 0x07
-#define BT485_REG_COMMAND_1 0x08
-#define BT485_REG_COMMAND_2 0x09
-#define BT485_REG_STATUS 0x0a
-#define BT485_REG_EXTENDED BT485_REG_STATUS
-#define BT485_REG_CURSOR_RAM 0x0b
-#define BT485_REG_CURSOR_X_LOW 0x0c
-#define BT485_REG_CURSOR_X_HIGH 0x0d
-#define BT485_REG_CURSOR_Y_LOW 0x0e
-#define BT485_REG_CURSOR_Y_HIGH 0x0f
-
-#define BT485_REG_MAX 0x0f
-
-#define BT485_IREG_STATUS 0x00
-#define BT485_IREG_COMMAND_3 0x01
-#define BT485_IREG_COMMAND_4 0x02
-#define BT485_IREG_RSA 0x20
-#define BT485_IREG_GSA 0x21
-#define BT485_IREG_BSA 0x22
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index 64e71bfb838..cffb296b604 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.9 1997/11/06 12:27:03 niklas Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.10 2000/07/03 19:30:21 mickey Exp $ */
/* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */
/*
@@ -52,7 +52,7 @@
#include "tga.h"
#if NTGA
-#include <alpha/pci/tgavar.h>
+#include <dev/pci/tgavar.h>
#endif
void
@@ -67,7 +67,7 @@ pci_display_console(iot, memt, pc, bus, device, function)
#if NVGA_PCI || NTGA
int nmatch;
#endif
- void (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
+ int (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
int, int, int));
tag = pci_make_tag(pc, bus, device, function);
@@ -84,14 +84,14 @@ pci_display_console(iot, memt, pc, bus, device, function)
nmatch = DEVICE_IS_VGA_PCI(class, id);
if (nmatch > match) {
match = nmatch;
- fn = vga_pci_console;
+ fn = vga_pci_cnattach;
}
#endif
#if NTGA
nmatch = DEVICE_IS_TGA(class, id);
if (nmatch > match) {
match = nmatch;
- fn = tga_console;
+ fn = tga_cnattach;
}
#endif
diff --git a/sys/arch/alpha/pci/tga.c b/sys/arch/alpha/pci/tga.c
index 7f64fed2b0a..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/tga.c
+++ b/sys/arch/alpha/pci/tga.c
@@ -1,589 +0,0 @@
-/* $OpenBSD: tga.c,v 1.12 1998/11/21 18:25:48 millert Exp $ */
-/* $NetBSD: tga.c,v 1.13 1996/12/05 01:39:37 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>
-#include <sys/buf.h>
-#include <sys/conf.h>
-#include <sys/ioctl.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-#include <machine/tgareg.h>
-#include <alpha/pci/tgavar.h>
-#include <alpha/pci/bt485reg.h>
-
-#include <dev/rcons/raster.h>
-#include <dev/wscons/wscons_raster.h>
-#include <dev/wscons/wsconsvar.h>
-#include <machine/fbio.h>
-
-#include <machine/autoconf.h>
-#include <machine/pte.h>
-
-#ifdef __BROKEN_INDIRECT_CONFIG
-int tgamatch __P((struct device *, void *, void *));
-#else
-int tgamatch __P((struct device *, struct cfdata *, void *));
-#endif
-void tgaattach __P((struct device *, struct device *, void *));
-int tgaprint __P((void *, const char *));
-
-struct cfattach tga_ca = {
- sizeof(struct tga_softc), tgamatch, tgaattach,
-};
-
-struct cfdriver tga_cd = {
- NULL, "tga", DV_DULL,
-};
-
-int tga_identify __P((tga_reg_t *));
-const struct tga_conf *tga_getconf __P((int));
-void tga_getdevconfig __P((bus_space_tag_t memt, pci_chipset_tag_t pc,
- pcitag_t tag, struct tga_devconfig *dc));
-
-struct tga_devconfig tga_console_dc;
-
-struct wscons_emulfuncs tga_emulfuncs = {
- rcons_cursor, /* could use hardware cursor; punt */
- rcons_putstr,
- rcons_copycols,
- rcons_erasecols,
- rcons_copyrows,
- rcons_eraserows,
- rcons_setattr,
-};
-
-int tgaioctl __P((void *, u_long, caddr_t, int, struct proc *));
-int tgammap __P((void *, off_t, int));
-
-void tga_blank __P((struct tga_devconfig *));
-void tga_unblank __P((struct tga_devconfig *));
-
-int
-tgamatch(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;
-
- if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_DEC ||
- PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_DEC_21030)
- return (0);
-
- return (10);
-}
-
-void
-tga_getdevconfig(memt, pc, tag, dc)
- bus_space_tag_t memt;
- pci_chipset_tag_t pc;
- pcitag_t tag;
- struct tga_devconfig *dc;
-{
- const struct tga_conf *tgac;
- const struct tga_ramdac_conf *tgar;
- struct raster *rap;
- struct rcons *rcp;
- bus_size_t pcisize;
- int i, cacheable;
-
- dc->dc_memt = memt;
- dc->dc_pc = pc;
-
- dc->dc_pcitag = tag;
-
- /* XXX MAGIC NUMBER */
- pci_mem_find(pc, tag, 0x10, &dc->dc_pcipaddr, &pcisize,
- &cacheable);
- if (!cacheable) /* sanity */
- panic("tga_getdevconfig: memory not cacheable?");
-
- /* XXX XXX XXX */
- if (bus_space_map(memt, dc->dc_pcipaddr, pcisize, 1, &dc->dc_vaddr))
- return;
- dc->dc_paddr = ALPHA_K0SEG_TO_PHYS(dc->dc_vaddr); /* XXX */
-
- dc->dc_regs = (tga_reg_t *)(dc->dc_vaddr + TGA_MEM_CREGS);
- dc->dc_tga_type = tga_identify(dc->dc_regs);
- tgac = dc->dc_tgaconf = tga_getconf(dc->dc_tga_type);
- if (tgac == NULL)
- return;
-
-#if 0
- /* XXX on the Alpha, pcisize = 4 * cspace_size. */
- if (tgac->tgac_cspace_size != pcisize) /* sanity */
- panic("tga_getdevconfig: memory size mismatch?");
-#endif
-
- tgar = tgac->tgac_ramdac;
-
- switch (dc->dc_regs[TGA_REG_VHCR] & 0x1ff) { /* XXX */
- case 0:
- dc->dc_wid = 8192;
- break;
-
- case 1:
- dc->dc_wid = 8196;
- break;
-
- default:
- dc->dc_wid = (dc->dc_regs[TGA_REG_VHCR] & 0x1ff) * 4; /* XXX */
- break;
- }
-
- dc->dc_rowbytes = dc->dc_wid * (dc->dc_tgaconf->tgac_phys_depth / 8);
-
- if ((dc->dc_regs[TGA_REG_VHCR] & 0x00000001) != 0 && /* XXX */
- (dc->dc_regs[TGA_REG_VHCR] & 0x80000000) != 0) { /* XXX */
- dc->dc_wid -= 4;
- /*
- * XXX XXX turning off 'odd' shouldn't be necesssary,
- * XXX XXX but i can't make X work with the weird size.
- */
- dc->dc_regs[TGA_REG_VHCR] &= ~0x80000001;
- dc->dc_rowbytes =
- dc->dc_wid * (dc->dc_tgaconf->tgac_phys_depth / 8);
- }
-
- dc->dc_ht = (dc->dc_regs[TGA_REG_VVCR] & 0x7ff); /* XXX */
-
- /* XXX this seems to be what DEC does */
- dc->dc_regs[TGA_REG_CCBR] = 0;
- dc->dc_regs[TGA_REG_VVBR] = 1;
- dc->dc_videobase = dc->dc_vaddr + tgac->tgac_dbuf[0] +
- 1 * tgac->tgac_vvbr_units;
- dc->dc_blanked = 1;
- tga_unblank(dc);
-
- /*
- * Set all bits in the pixel mask, to enable writes to all pixels.
- * It seems that the console firmware clears some of them
- * under some circumstances, which causes cute vertical stripes.
- */
- dc->dc_regs[TGA_REG_GPXR_P] = 0xffffffff;
-
- /* clear the screen */
- for (i = 0; i < dc->dc_ht * dc->dc_rowbytes; i += sizeof(u_int32_t))
- *(u_int32_t *)(dc->dc_videobase + i) = 0;
-
- /* initialize the raster */
- rap = &dc->dc_raster;
- rap->width = dc->dc_wid;
- rap->height = dc->dc_ht;
- rap->depth = tgac->tgac_phys_depth;
- rap->linelongs = dc->dc_rowbytes / sizeof(u_int32_t);
- rap->pixels = (u_int32_t *)dc->dc_videobase;
-
- /* initialize the raster console blitter */
- rcp = &dc->dc_rcons;
- rcp->rc_sp = rap;
- rcp->rc_crow = rcp->rc_ccol = -1;
- rcp->rc_crowp = &rcp->rc_crow;
- rcp->rc_ccolp = &rcp->rc_ccol;
- rcons_init(rcp, 34, 80);
-}
-
-void
-tgaattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- struct pci_attach_args *pa = aux;
- struct tga_softc *sc = (struct tga_softc *)self;
- struct wscons_attach_args waa;
- struct wscons_odev_spec *wo;
- pci_intr_handle_t intrh;
- const char *intrstr;
- u_int8_t rev;
- int console;
-
- console = (pa->pa_tag == tga_console_dc.dc_pcitag);
- if (console)
- sc->sc_dc = &tga_console_dc;
- else {
- sc->sc_dc = (struct tga_devconfig *)
- malloc(sizeof(struct tga_devconfig), M_DEVBUF, M_WAITOK);
- tga_getdevconfig(pa->pa_memt, pa->pa_pc, pa->pa_tag, sc->sc_dc);
- }
- if (sc->sc_dc->dc_vaddr == NULL) {
- printf(": couldn't map memory space; punt!\n");
- return;
- }
-
- /* XXX say what's going on. */
- intrstr = NULL;
- if (sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr != NULL) {
- if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
- pa->pa_intrline, &intrh)) {
- printf(": couldn't map interrupt");
- return;
- }
- intrstr = pci_intr_string(pa->pa_pc, intrh);
- sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY,
- sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr, sc->sc_dc,
- sc->sc_dev.dv_xname);
- if (sc->sc_intr == NULL) {
- printf(": couldn't establish interrupt");
- if (intrstr != NULL)
- printf("at %s", intrstr);
- printf("\n");
- return;
- }
- }
-
- /*
- * Initialize the RAMDAC and allocate any private storage it needs.
- * Initialization includes disabling cursor, setting a sane
- * colormap, etc.
- */
- (*sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_init)(sc->sc_dc, 1);
-
- printf(": DC21030 ");
- rev = PCI_REVISION(pa->pa_class);
- switch (rev) {
- case 1: case 2: case 3:
- printf("step %c", 'A' + rev - 1);
- break;
-
- default:
- printf("unknown stepping (0x%x)", rev);
- break;
- }
- printf(", ");
-
- if (sc->sc_dc->dc_tgaconf == NULL) {
- printf("unknown board configuration\n");
- return;
- }
- printf("board type %s\n", sc->sc_dc->dc_tgaconf->tgac_name);
- printf("%s: %d x %d, %dbpp, %s RAMDAC\n", sc->sc_dev.dv_xname,
- sc->sc_dc->dc_wid, sc->sc_dc->dc_ht,
- sc->sc_dc->dc_tgaconf->tgac_phys_depth,
- sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_name);
-
- if (intrstr != NULL)
- printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname,
- intrstr);
-
- waa.waa_isconsole = console;
-
- wo = &waa.waa_odev_spec;
-
- wo->wo_emulfuncs = &tga_emulfuncs;
- wo->wo_emulfuncs_cookie = &sc->sc_dc->dc_rcons;
-
- wo->wo_ioctl = tgaioctl;
- wo->wo_mmap = tgammap;
- wo->wo_miscfuncs_cookie = sc;
-
- wo->wo_nrows = sc->sc_dc->dc_rcons.rc_maxrow;
- wo->wo_ncols = sc->sc_dc->dc_rcons.rc_maxcol;
- wo->wo_crow = 0;
- wo->wo_ccol = 0;
-
- config_found(self, &waa, tgaprint);
-}
-
-int
-tgaprint(aux, pnp)
- void *aux;
- const char *pnp;
-{
-
- if (pnp)
- printf("wscons at %s", pnp);
- return (UNCONF);
-}
-
-int
-tgaioctl(v, cmd, data, flag, p)
- void *v;
- u_long cmd;
- caddr_t data;
- int flag;
- struct proc *p;
-{
- struct tga_softc *sc = v;
- struct tga_devconfig *dc = sc->sc_dc;
- const struct tga_ramdac_conf *tgar = dc->dc_tgaconf->tgac_ramdac;
-
- switch (cmd) {
- case FBIOGTYPE:
-#define fbt ((struct fbtype *)data)
- fbt->fb_type = FBTYPE_TGA;
- fbt->fb_height = sc->sc_dc->dc_ht;
- fbt->fb_width = sc->sc_dc->dc_wid;
- fbt->fb_depth = sc->sc_dc->dc_tgaconf->tgac_phys_depth;
- fbt->fb_cmsize = 256; /* XXX ??? */
- fbt->fb_size = sc->sc_dc->dc_tgaconf->tgac_cspace_size;
-#undef fbt
- return (0);
-
- case FBIOPUTCMAP:
- return (*tgar->tgar_set_cmap)(dc, (struct fbcmap *)data);
-
- case FBIOGETCMAP:
- return (*tgar->tgar_get_cmap)(dc, (struct fbcmap *)data);
-
- case FBIOGATTR:
- return (ENOTTY); /* XXX ? */
-
- case FBIOSVIDEO:
- if (*(int *)data == FBVIDEO_OFF)
- tga_blank(sc->sc_dc);
- else
- tga_unblank(sc->sc_dc);
- return (0);
-
- case FBIOGVIDEO:
- *(int *)data = dc->dc_blanked ? FBVIDEO_OFF : FBVIDEO_ON;
- return (0);
-
- case FBIOSCURSOR:
- return (*tgar->tgar_set_cursor)(dc, (struct fbcursor *)data);
-
- case FBIOGCURSOR:
- return (*tgar->tgar_get_cursor)(dc, (struct fbcursor *)data);
-
- case FBIOSCURPOS:
- return (*tgar->tgar_set_curpos)(dc, (struct fbcurpos *)data);
-
- case FBIOGCURPOS:
- return (*tgar->tgar_get_curpos)(dc, (struct fbcurpos *)data);
-
- case FBIOGCURMAX:
- return (*tgar->tgar_get_curmax)(dc, (struct fbcurpos *)data);
- }
- return (-1);
-}
-
-int
-tgammap(v, offset, prot)
- void *v;
- off_t offset;
- int prot;
-{
- struct tga_softc *sc = v;
-
- if (offset >= sc->sc_dc->dc_tgaconf->tgac_cspace_size || offset < 0)
- return -1;
- return alpha_btop(sc->sc_dc->dc_paddr + offset);
-}
-
-void
-tga_console(iot, memt, pc, bus, device, function)
- bus_space_tag_t iot, memt;
- pci_chipset_tag_t pc;
- int bus, device, function;
-{
- struct tga_devconfig *dcp = &tga_console_dc;
- struct wscons_odev_spec wo;
-
- tga_getdevconfig(memt, pc, pci_make_tag(pc, bus, device, function), dcp);
-
- /* sanity checks */
- if (dcp->dc_vaddr == NULL)
- panic("tga_console(%d, %d): couldn't map memory space",
- device, function);
- if (dcp->dc_tgaconf == NULL)
- panic("tga_console(%d, %d): unknown board configuration",
- device, function);
-
- /*
- * Initialize the RAMDAC but DO NOT allocate any private storage.
- * Initialization includes disabling cursor, setting a sane
- * colormap, etc. It will be reinitialized in tgaattach().
- */
- (*dcp->dc_tgaconf->tgac_ramdac->tgar_init)(dcp, 0);
-
- wo.wo_emulfuncs = &tga_emulfuncs;
- wo.wo_emulfuncs_cookie = &dcp->dc_rcons;
-
- /* ioctl and mmap are unused until real attachment. */
-
- wo.wo_nrows = dcp->dc_rcons.rc_maxrow;
- wo.wo_ncols = dcp->dc_rcons.rc_maxcol;
- wo.wo_crow = 0;
- wo.wo_ccol = 0;
-
- wscons_attach_console(&wo);
-}
-
-/*
- * Functions to blank and unblank the display.
- */
-void
-tga_blank(dc)
- struct tga_devconfig *dc;
-{
-
- if (!dc->dc_blanked) {
- dc->dc_blanked = 1;
- dc->dc_regs[TGA_REG_VVVR] |= 0x02; /* XXX */
- }
-}
-
-void
-tga_unblank(dc)
- struct tga_devconfig *dc;
-{
-
- if (dc->dc_blanked) {
- dc->dc_blanked = 0;
- dc->dc_regs[TGA_REG_VVVR] &= ~0x02; /* XXX */
- }
-}
-
-/*
- * Functions to manipulate the built-in cursor handing hardware.
- */
-int
-tga_builtin_set_cursor(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcursor *fbc;
-{
- int v;
-#if 0
- int count;
-#endif
-
- v = fbc->set;
-#if 0
- if (v & FB_CUR_SETCMAP) /* XXX should be supported */
- return EINVAL;
- if (v & FB_CUR_SETSHAPE) {
- if ((u_int)fbc->size.x != 64 || (u_int)fbc->size.y > 64)
- return (EINVAL);
- /* The cursor is 2 bits deep, and there is no mask */
- count = (fbc->size.y * 64 * 2) / NBBY;
- if (!useracc(fbc->image, count, B_READ))
- return (EFAULT);
- }
- if (v & FB_CUR_SETHOT) /* not supported */
- return EINVAL;
-#endif
-
- /* parameters are OK; do it */
- if (v & FB_CUR_SETCUR) {
- if (fbc->enable)
- dc->dc_regs[TGA_REG_VVVR] |= 0x04; /* XXX */
- else
- dc->dc_regs[TGA_REG_VVVR] &= ~0x04; /* XXX */
- }
-#if 0
- if (v & FB_CUR_SETPOS) {
- dc->dc_regs[TGA_REG_CXYR] =
- ((fbc->pos.y & 0xfff) << 12) | (fbc->pos.x & 0xfff);
- }
- if (v & FB_CUR_SETCMAP) {
- /* XXX */
- }
- if (v & FB_CUR_SETSHAPE) {
- dc->dc_regs[TGA_REG_CCBR] =
- (dc->dc_regs[TGA_REG_CCBR] & ~0xfc00) | (fbc->size.y << 10);
- copyin(fbc->image, (char *)(dc->dc_vaddr +
- (dc->dc_regs[TGA_REG_CCBR] & 0x3ff)),
- count); /* can't fail. */
- }
-#endif
- return (0);
-}
-
-int
-tga_builtin_get_cursor(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcursor *fbc;
-{
- int count, error;
-
- fbc->set = FB_CUR_SETALL & ~(FB_CUR_SETHOT | FB_CUR_SETCMAP);
- fbc->enable = (dc->dc_regs[TGA_REG_VVVR] & 0x04) != 0;
- fbc->pos.x = dc->dc_regs[TGA_REG_CXYR] & 0xfff;
- fbc->pos.y = (dc->dc_regs[TGA_REG_CXYR] >> 12) & 0xfff;
- fbc->size.x = 64;
- fbc->size.y = (dc->dc_regs[TGA_REG_CCBR] >> 10) & 0x3f;
-
- if (fbc->image != NULL) {
- count = (fbc->size.y * 64 * 2) / NBBY;
- error = copyout((char *)(dc->dc_vaddr +
- (dc->dc_regs[TGA_REG_CCBR] & 0x3ff)),
- fbc->image, count);
- if (error)
- return (error);
- /* No mask */
- }
- /* XXX No color map */
- return (0);
-}
-
-int
-tga_builtin_set_curpos(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
-
- dc->dc_regs[TGA_REG_CXYR] =
- ((fbp->y & 0xfff) << 12) | (fbp->x & 0xfff);
- return (0);
-}
-
-int
-tga_builtin_get_curpos(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
-
- fbp->x = dc->dc_regs[TGA_REG_CXYR] & 0xfff;
- fbp->y = (dc->dc_regs[TGA_REG_CXYR] >> 12) & 0xfff;
- return (0);
-}
-
-int
-tga_builtin_get_curmax(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
-
- fbp->x = fbp->y = 64;
- return (0);
-}
diff --git a/sys/arch/alpha/pci/tga_bt463.c b/sys/arch/alpha/pci/tga_bt463.c
index b628a0ead93..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/tga_bt463.c
+++ b/sys/arch/alpha/pci/tga_bt463.c
@@ -1,52 +0,0 @@
-/* $OpenBSD: tga_bt463.c,v 1.3 1996/10/30 22:40:19 niklas Exp $ */
-/* $NetBSD: tga_bt463.c,v 1.2 1996/04/12 06:09:13 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/device.h>
-
-#include <dev/pci/pcivar.h>
-#include <machine/tgareg.h>
-#include <alpha/pci/tgavar.h>
-#include <alpha/pci/bt485reg.h>
-
-#include <machine/fbio.h>
-
-const struct tga_ramdac_conf tga_ramdac_bt463 = {
- "Bt463",
-#if 0
- NULL, /* XXX SET CMAP */
- NULL, /* XXX GET CMAP */
- tga_builtin_set_cursor,
- tga_builtin_get_cursor,
- tga_builtin_set_curpos,
- tga_builtin_get_curpos,
- tga_builtin_get_curmax,
-#endif
-};
diff --git a/sys/arch/alpha/pci/tga_bt485.c b/sys/arch/alpha/pci/tga_bt485.c
index 95ee3543859..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/tga_bt485.c
+++ b/sys/arch/alpha/pci/tga_bt485.c
@@ -1,588 +0,0 @@
-/* $OpenBSD: tga_bt485.c,v 1.5 1999/01/11 05:11:03 millert Exp $ */
-/* $NetBSD: tga_bt485.c,v 1.4 1996/11/13 21:13:35 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/device.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-
-#include <dev/pci/pcivar.h>
-#include <machine/tgareg.h>
-#include <alpha/pci/tgavar.h>
-#include <alpha/pci/bt485reg.h>
-
-#include <machine/fbio.h>
-
-/*
- * Functions exported via the RAMDAC configuration table.
- */
-void tga_bt485_init __P((struct tga_devconfig *, int));
-int tga_bt485_intr __P((void *));
-int tga_bt485_set_cmap __P((struct tga_devconfig *, struct fbcmap *));
-int tga_bt485_get_cmap __P((struct tga_devconfig *, struct fbcmap *));
-int tga_bt485_set_cursor __P((struct tga_devconfig *, struct fbcursor *));
-int tga_bt485_get_cursor __P((struct tga_devconfig *, struct fbcursor *));
-int tga_bt485_set_curpos __P((struct tga_devconfig *, struct fbcurpos *));
-int tga_bt485_get_curpos __P((struct tga_devconfig *, struct fbcurpos *));
-int tga_bt485_get_curmax __P((struct tga_devconfig *, struct fbcurpos *));
-
-const struct tga_ramdac_conf tga_ramdac_bt485 = {
- "Bt485",
- tga_bt485_init,
- tga_bt485_intr,
- tga_bt485_set_cmap,
- tga_bt485_get_cmap,
- tga_bt485_set_cursor,
- tga_bt485_get_cursor,
- tga_bt485_set_curpos,
- tga_bt485_get_curpos,
- tga_bt485_get_curmax,
-};
-
-/*
- * Private data.
- */
-struct bt485data {
- int changed; /* what changed; see below */
- int curenb; /* cursor enabled */
- struct fbcurpos curpos; /* current cursor position */
- struct fbcurpos curhot; /* cursor hotspot */
- char curcmap_r[2]; /* cursor colormap */
- char curcmap_g[2];
- char curcmap_b[2];
- struct fbcurpos cursize; /* current cursor size */
- char curimage[512]; /* cursor image data */
- char curmask[512]; /* cursor mask data */
- char cmap_r[256]; /* colormap */
- char cmap_g[256];
- char cmap_b[256];
-};
-
-#define DATA_ENB_CHANGED 0x01 /* cursor enable changed */
-#define DATA_CURCMAP_CHANGED 0x02 /* cursor colormap changed */
-#define DATA_CURSHAPE_CHANGED 0x04 /* cursor size, image, mask changed */
-#define DATA_CMAP_CHANGED 0x08 /* colormap changed */
-#define DATA_ALL_CHANGED 0x0f
-
-#define CURSOR_MAX_SIZE 64
-
-/*
- * Internal functions.
- */
-inline void tga_bt485_wr_d __P((volatile tga_reg_t *, u_int, u_int8_t));
-inline u_int8_t tga_bt485_rd_d __P((volatile tga_reg_t *, u_int));
-inline void tga_bt485_wr_i __P((volatile tga_reg_t *, u_int8_t, u_int8_t));
-inline u_int8_t tga_bt485_rd_i __P((volatile tga_reg_t *, u_int8_t));
-void tga_bt485_update __P((struct tga_devconfig *, struct bt485data *));
-void tga_bt485_update_curpos __P((struct tga_devconfig *, struct bt485data *));
-
-#define tga_bt485_sched_update(dc) \
- ((dc)->dc_regs[TGA_REG_SISR] = 0x00010000) /* XXX */
-
-/*****************************************************************************/
-
-/*
- * Functions exported via the RAMDAC configuration table.
- */
-
-void
-tga_bt485_init(dc, alloc)
- struct tga_devconfig *dc;
- int alloc;
-{
- u_int8_t regval;
- struct bt485data tmp, *data;
- int i;
-
- /*
- * Init the BT485 for normal operation.
- */
-
- /*
- * Allow indirect register access. (Actually, this is
- * already enabled. In fact, if it is _disabled_, for
- * some reason the monitor appears to lose sync!!! (?!?!)
- */
- regval = tga_bt485_rd_d(dc->dc_regs, BT485_REG_COMMAND_0);
- regval |= 0x80;
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COMMAND_0, regval);
-
- /* Set the RAMDAC to 8BPP (no interestion options). */
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COMMAND_1, 0x40);
-
- /* Disable the cursor (for now) */
- regval = tga_bt485_rd_d(dc->dc_regs, BT485_REG_COMMAND_2);
- regval &= ~0x03;
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COMMAND_2, regval);
-
- /* Use a 64x64x2 cursor */
- regval = tga_bt485_rd_d(dc->dc_regs, BT485_IREG_COMMAND_3);
- regval |= 0x04;
- tga_bt485_wr_d(dc->dc_regs, BT485_IREG_COMMAND_3, regval);
-
- /*
- * If we should allocate a new private info struct, do so.
- * Otherwise, use the one we have (if it's there), or
- * use the temporary one on the stack.
- */
- if (alloc) {
- if (dc->dc_ramdac_private != NULL)
- panic("tga_bt485_init: already have private struct");
- dc->dc_ramdac_private = malloc(sizeof *data, M_DEVBUF,
- M_WAITOK);
- }
- if (dc->dc_ramdac_private != NULL)
- data = dc->dc_ramdac_private;
- else
- data = &tmp;
-
- /*
- * Initalize the RAMDAC info struct to hold all of our
- * data, and fill it in.
- */
- data->changed = DATA_ALL_CHANGED;
-
- data->curenb = 0; /* cursor disabled */
- data->curpos.x = data->curpos.y = 0; /* right now at 0,0 */
- data->curhot.x = data->curhot.y = 0; /* hot spot at 0,0 */
-
- /* initial cursor colormap: 0 is black, 1 is white */
- data->curcmap_r[0] = data->curcmap_g[0] = data->curcmap_b[0] = 0;
- data->curcmap_r[1] = data->curcmap_g[1] = data->curcmap_b[1] = 0xff;
-
- /* initial cursor data: 64x64 block of white. */
- data->cursize.x = data->cursize.y = 64;
- for (i = 0; i < 512; i++)
- data->curimage[i] = data->curmask[i] = 0xff;
-
- /* Initial colormap: 0 is black, everything else is white */
- data->cmap_r[0] = data->cmap_g[0] = data->cmap_b[0] = 0;
- for (i = 1; i < 256; i++)
- data->cmap_r[i] = data->cmap_g[i] = data->cmap_b[i] = 255;
-
- tga_bt485_update(dc, data);
-
- dc->dc_regs[TGA_REG_SISR] = 0x00000001; /* XXX */
-}
-
-int
-tga_bt485_set_cmap(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcmap *fbc;
-{
- struct bt485data *data = dc->dc_ramdac_private;
- int count, index, s;
-
- if ((u_int)fbc->index >= 256 ||
- ((u_int)fbc->index + (u_int)fbc->count) > 256)
- return (EINVAL);
- if (!useracc(fbc->red, fbc->count, B_READ) ||
- !useracc(fbc->green, fbc->count, B_READ) ||
- !useracc(fbc->blue, fbc->count, B_READ))
- return (EFAULT);
-
- s = spltty();
-
- index = fbc->index;
- count = fbc->count;
- copyin(fbc->red, &data->cmap_r[index], count);
- copyin(fbc->green, &data->cmap_g[index], count);
- copyin(fbc->blue, &data->cmap_b[index], count);
-
- data->changed |= DATA_CMAP_CHANGED;
-
- tga_bt485_sched_update(dc);
- splx(s);
-
- return (0);
-}
-
-int
-tga_bt485_get_cmap(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcmap *fbc;
-{
- struct bt485data *data = dc->dc_ramdac_private;
- int error, count, index;
-
- if ((u_int)fbc->index >= 256 ||
- ((u_int)fbc->index + (u_int)fbc->count) > 256)
- return (EINVAL);
-
- count = fbc->count;
- index = fbc->index;
-
- error = copyout(&data->cmap_r[index], fbc->red, count);
- if (error)
- return (error);
- error = copyout(&data->cmap_g[index], fbc->green, count);
- if (error)
- return (error);
- error = copyout(&data->cmap_b[index], fbc->blue, count);
- return (error);
-}
-
-int
-tga_bt485_set_cursor(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcursor *fbc;
-{
- struct bt485data *data = dc->dc_ramdac_private;
- int count, index, v, s;
-
- v = fbc->set;
-
- /*
- * For SETCMAP and SETSHAPE, verify that parameters are OK
- * before we do anything that we can't recover from.
- */
- if (v & FB_CUR_SETCMAP) {
- if ((u_int)fbc->cmap.index > 2 ||
- ((u_int)fbc->cmap.index + (u_int)fbc->cmap.count) > 2)
- return (EINVAL);
- count = fbc->cmap.count;
- if (!useracc(fbc->cmap.red, count, B_READ) ||
- !useracc(fbc->cmap.green, count, B_READ) ||
- !useracc(fbc->cmap.blue, count, B_READ))
- return (EFAULT);
- }
- if (v & FB_CUR_SETSHAPE) {
- if ((u_int)fbc->size.x > CURSOR_MAX_SIZE ||
- (u_int)fbc->size.y > CURSOR_MAX_SIZE)
- return (EINVAL);
- count = (CURSOR_MAX_SIZE / NBBY) * data->cursize.y;
- if (!useracc(fbc->image, count, B_READ) ||
- !useracc(fbc->mask, count, B_READ))
- return (EFAULT);
- }
-
- if (v & (FB_CUR_SETPOS | FB_CUR_SETCUR)) {
- if (v & FB_CUR_SETPOS)
- data->curpos = fbc->pos;
- if (v & FB_CUR_SETCUR)
- data->curhot = fbc->hot;
- tga_bt485_update_curpos(dc, data);
- }
-
- s = spltty();
-
- /* Parameters are OK; perform the requested operations. */
- if (v & FB_CUR_SETCUR) {
- data->curenb = fbc->enable;
- data->changed |= DATA_ENB_CHANGED;
- }
- if (v & FB_CUR_SETCMAP) {
- count = fbc->cmap.count;
- index = fbc->cmap.index;
- copyin(fbc->cmap.red, &data->cmap_r[index], count);
- copyin(fbc->cmap.green, &data->cmap_g[index], count);
- copyin(fbc->cmap.blue, &data->cmap_b[index], count);
- data->changed |= DATA_CURCMAP_CHANGED;
- }
- if (v & FB_CUR_SETSHAPE) {
- data->cursize = fbc->size;
- count = (CURSOR_MAX_SIZE / NBBY) * data->cursize.y;
- bzero(data->curimage, sizeof data->curimage);
- bzero(data->curmask, sizeof data->curmask);
- copyin(fbc->image, data->curimage, count); /* can't fail */
- copyin(fbc->mask, data->curmask, count); /* can't fail */
- data->changed |= DATA_CURSHAPE_CHANGED;
- }
-
- if (data->changed)
- tga_bt485_sched_update(dc);
- splx(s);
-
- return (0);
-}
-
-int
-tga_bt485_get_cursor(dc, fbc)
- struct tga_devconfig *dc;
- struct fbcursor *fbc;
-{
- struct bt485data *data = dc->dc_ramdac_private;
- int error, count;
-
- fbc->set = FB_CUR_SETALL; /* we return everything they want */
- fbc->enable = data->curenb; /* SETCUR */
- fbc->pos = data->curpos; /* SETPOS */
- fbc->hot = data->curhot; /* SETHOT */
-
- fbc->cmap.index = 0; /* SETCMAP */
- fbc->cmap.count = 2;
- if (fbc->cmap.red != NULL) {
- error = copyout(data->curcmap_r, fbc->cmap.red, 2);
- if (error)
- return (error);
- }
- if (fbc->cmap.green != NULL) {
- error = copyout(data->curcmap_g, fbc->cmap.green, 2);
- if (error)
- return (error);
- }
- if (fbc->cmap.blue != NULL) {
- error = copyout(data->curcmap_b, fbc->cmap.blue, 2);
- if (error)
- return (error);
- }
-
- fbc->size = data->cursize; /* SETSHAPE */
- if (fbc->image != NULL) {
- count = (CURSOR_MAX_SIZE / NBBY) * data->cursize.y;
- error = copyout(data->curimage, fbc->image, count);
- if (error)
- return (error);
- error = copyout(data->curmask, fbc->mask, count);
- if (error)
- return (error);
- }
-
- return (0);
-}
-
-int
-tga_bt485_set_curpos(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
- struct bt485data *data = dc->dc_ramdac_private;
-
- data->curpos = *fbp;
- tga_bt485_update_curpos(dc, data);
-
- return (0);
-}
-
-int
-tga_bt485_get_curpos(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
- struct bt485data *data = dc->dc_ramdac_private;
-
- *fbp = data->curpos;
- return (0);
-}
-
-int
-tga_bt485_get_curmax(dc, fbp)
- struct tga_devconfig *dc;
- struct fbcurpos *fbp;
-{
- fbp->x = fbp->y = CURSOR_MAX_SIZE;
- return (0);
-}
-
-int
-tga_bt485_intr(v)
- void *v;
-{
- struct tga_devconfig *dc = v;
-
- if ((dc->dc_regs[TGA_REG_SISR] & 0x00010001) != 0x00010001)
- return 0;
- tga_bt485_update(dc, dc->dc_ramdac_private);
- dc->dc_regs[TGA_REG_SISR] = 0x00000001;
- return (1);
-}
-
-/*****************************************************************************/
-
-/*
- * Internal functions.
- */
-
-inline void
-tga_bt485_wr_d(tgaregs, btreg, val)
- volatile tga_reg_t *tgaregs;
- u_int btreg;
- u_int8_t val;
-{
-
- if (btreg > BT485_REG_MAX)
- panic("tga_bt485_wr_d: reg %d out of range", btreg);
-
- tgaregs[TGA_REG_EPDR] = (btreg << 9) | (0 << 8 ) | val; /* XXX */
- alpha_mb();
-}
-
-inline u_int8_t
-tga_bt485_rd_d(tgaregs, btreg)
- volatile tga_reg_t *tgaregs;
- u_int btreg;
-{
- tga_reg_t rdval;
-
- if (btreg > BT485_REG_MAX)
- panic("tga_bt485_rd_d: reg %d out of range", btreg);
-
- tgaregs[TGA_REG_EPSR] = (btreg << 1) | 0x1; /* XXX */
- alpha_mb();
-
- rdval = tgaregs[TGA_REG_EPDR];
- return (rdval >> 16) & 0xff; /* XXX */
-}
-
-inline void
-tga_bt485_wr_i(tgaregs, ireg, val)
- volatile tga_reg_t *tgaregs;
- u_int8_t ireg;
- u_int8_t val;
-{
- tga_bt485_wr_d(tgaregs, BT485_REG_PCRAM_WRADDR, ireg);
- tga_bt485_wr_d(tgaregs, BT485_REG_EXTENDED, val);
-}
-
-inline u_int8_t
-tga_bt485_rd_i(tgaregs, ireg)
- volatile tga_reg_t *tgaregs;
- u_int8_t ireg;
-{
- tga_bt485_wr_d(tgaregs, BT485_REG_PCRAM_WRADDR, ireg);
- return (tga_bt485_rd_d(tgaregs, BT485_REG_EXTENDED));
-}
-
-void
-tga_bt485_update(dc, data)
- struct tga_devconfig *dc;
- struct bt485data *data;
-{
- u_int8_t regval;
- int count, i, v;
-
- v = data->changed;
- data->changed = 0;
-
- if (v & DATA_ENB_CHANGED) {
- regval = tga_bt485_rd_d(dc->dc_regs, BT485_REG_COMMAND_2);
- if (data->curenb)
- regval |= 0x01;
- else
- regval &= ~0x03;
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COMMAND_2, regval);
- }
-
- if (v & DATA_CURCMAP_CHANGED) {
- /* addr[9:0] assumed to be 0 */
- /* set addr[7:0] to 1 */
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COC_WRADDR, 0x01);
-
- /* spit out the cursor data */
- for (i = 0; i < 2; i++) {
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COCDATA,
- data->curcmap_r[i]);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COCDATA,
- data->curcmap_g[i]);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_COCDATA,
- data->curcmap_b[i]);
- }
- }
-
- if (v & DATA_CURSHAPE_CHANGED) {
- count = (CURSOR_MAX_SIZE / NBBY) * data->cursize.y;
-
- /*
- * Write the cursor image data:
- * set addr[9:8] to 0,
- * set addr[7:0] to 0,
- * spit it all out.
- */
- regval = tga_bt485_rd_i(dc->dc_regs,
- BT485_IREG_COMMAND_3);
- regval &= ~0x03;
- tga_bt485_wr_i(dc->dc_regs, BT485_IREG_COMMAND_3,
- regval);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PCRAM_WRADDR, 0);
- for (i = 0; i < count; i++)
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_RAM,
- data->curimage[i]);
-
- /*
- * Write the cursor mask data:
- * set addr[9:8] to 2,
- * set addr[7:0] to 0,
- * spit it all out.
- */
- regval = tga_bt485_rd_i(dc->dc_regs,
- BT485_IREG_COMMAND_3);
- regval &= ~0x03; regval |= 0x02;
- tga_bt485_wr_i(dc->dc_regs, BT485_IREG_COMMAND_3,
- regval);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PCRAM_WRADDR, 0);
- for (i = 0; i < count; i++)
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_RAM,
- data->curmask[i]);
-
- /* set addr[9:0] back to 0 */
- regval = tga_bt485_rd_i(dc->dc_regs, BT485_IREG_COMMAND_3);
- regval &= ~0x03;
- tga_bt485_wr_i(dc->dc_regs, BT485_IREG_COMMAND_3, regval);
- }
-
- if (v & DATA_CMAP_CHANGED) {
- /* addr[9:0] assumed to be 0 */
- /* set addr[7:0] to 0 */
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PCRAM_WRADDR, 0x00);
-
- /* spit out the cursor data */
- for (i = 0; i < 256; i++) {
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PALETTE,
- data->cmap_r[i]);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PALETTE,
- data->cmap_g[i]);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_PALETTE,
- data->cmap_b[i]);
- }
- }
-}
-
-void
-tga_bt485_update_curpos(dc, data)
- struct tga_devconfig *dc;
- struct bt485data *data;
-{
- int s, x, y;
-
- s = spltty();
-
- x = data->curpos.x + CURSOR_MAX_SIZE - data->curhot.x;
- y = data->curpos.y + CURSOR_MAX_SIZE - data->curhot.y;
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_X_LOW, x & 0xff);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_X_HIGH, (x >> 8) & 0x0f);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_Y_LOW, y & 0xff);
- tga_bt485_wr_d(dc->dc_regs, BT485_REG_CURSOR_Y_HIGH, (y >> 8) & 0x0f);
-
- splx(s);
-}
diff --git a/sys/arch/alpha/pci/tga_conf.c b/sys/arch/alpha/pci/tga_conf.c
index 73a65a85a23..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/tga_conf.c
+++ b/sys/arch/alpha/pci/tga_conf.c
@@ -1,184 +0,0 @@
-/* $OpenBSD: tga_conf.c,v 1.3 1996/10/30 22:40:22 niklas Exp $ */
-/* $NetBSD: tga_conf.c,v 1.2 1996/04/12 06:09:18 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/device.h>
-
-#include <dev/pci/pcivar.h>
-#include <machine/tgareg.h>
-#include <alpha/pci/tgavar.h>
-
-#undef KB
-#define KB * 1024
-#undef MB
-#define MB * 1024 * 1024
-
-static const struct tga_conf tga_configs[TGA_TYPE_UNKNOWN] = {
- /* TGA_TYPE_T8_01 */
- {
- "T8-01",
- &tga_ramdac_bt485,
- 8,
- 4 MB,
- 2 KB,
- 1, { 2 MB, 0 }, { 1 MB, 0 },
- 0, { 0, 0 }, { 0, 0 },
- },
- /* TGA_TYPE_T8_02 */
- {
- "T8-02",
- &tga_ramdac_bt485,
- 8,
- 4 MB,
- 4 KB,
- 1, { 2 MB, 0 }, { 2 MB, 0 },
- 0, { 0, 0 }, { 0, 0 },
- },
- /* TGA_TYPE_T8_22 */
- {
- "T8-22",
- &tga_ramdac_bt485,
- 8,
- 8 MB,
- 4 KB,
- 1, { 4 MB, 0 }, { 2 MB, 0 },
- 1, { 6 MB, 0 }, { 2 MB, 0 },
- },
- /* TGA_TYPE_T8_44 */
- {
- "T8-44",
- &tga_ramdac_bt485,
- 8,
- 16 MB,
- 4 KB,
- 2, { 8 MB, 12 MB }, { 2 MB, 2 MB },
- 2, { 10 MB, 14 MB }, { 2 MB, 2 MB },
- },
- /* TGA_TYPE_T32_04 */
- {
- "T32-04",
- &tga_ramdac_bt463,
- 32,
- 16 MB,
- 8 KB,
- 1, { 8 MB, 0 }, { 4 MB, 0 },
- 0, { 0, 0 }, { 0, 0 },
- },
- /* TGA_TYPE_T32_08 */
- {
- "T32-08",
- &tga_ramdac_bt463,
- 32,
- 16 MB,
- 16 KB,
- 1, { 8 MB, 0 }, { 8 MB, 0 },
- 0, { 0, 0 }, { 0, 0 },
- },
- /* TGA_TYPE_T32_88 */
- {
- "T32-88",
- &tga_ramdac_bt463,
- 32,
- 32 MB,
- 16 KB,
- 1, { 16 MB, 0 }, { 8 MB, 0 },
- 1, { 24 MB, 0 }, { 8 MB, 0 },
- },
-};
-
-#undef KB
-#undef MB
-
-int
-tga_identify(regs)
- tga_reg_t *regs;
-{
- int type;
- int deep, addrmask, wide;
-
- deep = (regs[TGA_REG_GDER] & 0x1) != 0; /* XXX */
- addrmask = ((regs[TGA_REG_GDER] >> 2) & 0x7); /* XXX */
- wide = (regs[TGA_REG_GDER] & 0x200) == 0; /* XXX */
-
- type = TGA_TYPE_UNKNOWN;
-
- if (!deep) {
- /* 8bpp frame buffer */
-
- if (addrmask == 0x0) {
- /* 4MB core map; T8-01 or T8-02 */
-
- if (!wide)
- type = TGA_TYPE_T8_01;
- else
- type = TGA_TYPE_T8_02;
- } else if (addrmask == 0x1) {
- /* 8MB core map; T8-22 */
-
- if (wide) /* sanity */
- type = TGA_TYPE_T8_22;
- } else if (addrmask == 0x3) {
- /* 16MB core map; T8-44 */
-
- if (wide) /* sanity */
- type = TGA_TYPE_T8_44;
- }
- } else {
- /* 32bpp frame buffer */
-
- if (addrmask == 0x3) {
- /* 16MB core map; T32-04 or T32-08 */
-
- if (!wide)
- type = TGA_TYPE_T32_04;
- else
- type = TGA_TYPE_T32_08;
- } else if (addrmask == 0x7) {
- /* 32MB core map; T32-88 */
-
- if (wide) /* sanity */
- type = TGA_TYPE_T32_88;
- }
- }
-
- return (type);
-}
-
-const struct tga_conf *
-tga_getconf(type)
- int type;
-{
-
- if (type >= 0 && type < TGA_TYPE_UNKNOWN)
- return &tga_configs[type];
-
- return (NULL);
-}
-
diff --git a/sys/arch/alpha/pci/tgavar.h b/sys/arch/alpha/pci/tgavar.h
index 71529d34750..e69de29bb2d 100644
--- a/sys/arch/alpha/pci/tgavar.h
+++ b/sys/arch/alpha/pci/tgavar.h
@@ -1,141 +0,0 @@
-/* $OpenBSD: tgavar.h,v 1.7 1997/11/06 12:27:04 niklas Exp $ */
-/* $NetBSD: tgavar.h,v 1.6 1996/10/23 04:12: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.
- */
-
-#include <machine/tgareg.h>
-#include <dev/rcons/raster.h>
-#include <dev/wscons/wsconsvar.h>
-#include <dev/wscons/wscons_raster.h>
-
-struct tga_devconfig;
-struct fbcmap;
-struct fbcursor;
-struct fbcurpos;
-
-struct tga_ramdac_conf {
- char *tgar_name;
- void (*tgar_init) __P((struct tga_devconfig *, int));
- int (*tgar_intr) __P((void *));
- int (*tgar_set_cmap) __P((struct tga_devconfig *,
- struct fbcmap *));
- int (*tgar_get_cmap) __P((struct tga_devconfig *,
- struct fbcmap *));
- int (*tgar_set_cursor) __P((struct tga_devconfig *,
- struct fbcursor *));
- int (*tgar_get_cursor) __P((struct tga_devconfig *,
- struct fbcursor *));
- int (*tgar_set_curpos) __P((struct tga_devconfig *,
- struct fbcurpos *));
- int (*tgar_get_curpos) __P((struct tga_devconfig *,
- struct fbcurpos *));
- int (*tgar_get_curmax) __P((struct tga_devconfig *,
- struct fbcurpos *));
-};
-
-struct tga_conf {
- char *tgac_name; /* name for this board type */
-
- const struct tga_ramdac_conf
- *tgac_ramdac; /* the RAMDAC type; see above */
- int tgac_phys_depth; /* physical frame buffer depth */
- vm_size_t tgac_cspace_size; /* core space size */
- vm_size_t tgac_vvbr_units; /* what '1' in the VVBR means */
-
- int tgac_ndbuf; /* number of display buffers */
- vm_offset_t tgac_dbuf[2]; /* display buffer offsets/addresses */
- vm_size_t tgac_dbufsz[2]; /* display buffer sizes */
-
- int tgac_nbbuf; /* number of display buffers */
- vm_offset_t tgac_bbuf[2]; /* back buffer offsets/addresses */
- vm_size_t tgac_bbufsz[2]; /* back buffer sizes */
-};
-
-struct tga_devconfig {
- bus_space_tag_t dc_memt;
- pci_chipset_tag_t dc_pc;
-
- pcitag_t dc_pcitag; /* PCI tag */
- bus_addr_t dc_pcipaddr; /* PCI phys addr. */
-
- tga_reg_t *dc_regs; /* registers; XXX: need aliases */
-
- int dc_tga_type; /* the device type; see below */
- const struct tga_conf *dc_tgaconf; /* device buffer configuration */
-
- vm_offset_t dc_vaddr; /* memory space virtual base address */
- vm_offset_t dc_paddr; /* memory space physical base address */
-
- int dc_wid; /* width of frame buffer */
- int dc_ht; /* height of frame buffer */
- int dc_rowbytes; /* bytes in a FB scan line */
-
- vm_offset_t dc_videobase; /* base of flat frame buffer */
-
- struct raster dc_raster; /* raster description */
- struct rcons dc_rcons; /* raster blitter control info */
-
- int dc_blanked; /* currently had video disabled */
- void *dc_ramdac_private; /* RAMDAC private storage */
-};
-
-struct tga_softc {
- struct device sc_dev;
-
- struct tga_devconfig *sc_dc; /* device configuration */
- void *sc_intr; /* interrupt handler info */
- /* XXX should record intr fns/arg */
-};
-
-#define TGA_TYPE_T8_01 0 /* 8bpp, 1MB */
-#define TGA_TYPE_T8_02 1 /* 8bpp, 2MB */
-#define TGA_TYPE_T8_22 2 /* 8bpp, 4MB */
-#define TGA_TYPE_T8_44 3 /* 8bpp, 8MB */
-#define TGA_TYPE_T32_04 4 /* 32bpp, 4MB */
-#define TGA_TYPE_T32_08 5 /* 32bpp, 8MB */
-#define TGA_TYPE_T32_88 6 /* 32bpp, 16MB */
-#define TGA_TYPE_UNKNOWN 7 /* unknown */
-
-#define DEVICE_IS_TGA(class, id) \
- ((PCI_VENDOR(id) == PCI_VENDOR_DEC && \
- PCI_PRODUCT(id) == PCI_PRODUCT_DEC_21030) ? 10 : 0)
-
-void tga_console __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
- int, int, int));
-
-int tga_identify __P((tga_reg_t *));
-const struct tga_conf *tga_getconf __P((int));
-
-extern const struct tga_ramdac_conf tga_ramdac_bt463;
-extern const struct tga_ramdac_conf tga_ramdac_bt485;
-
-int tga_builtin_set_cursor __P((struct tga_devconfig *, struct fbcursor *));
-int tga_builtin_get_cursor __P((struct tga_devconfig *, struct fbcursor *));
-int tga_builtin_set_curpos __P((struct tga_devconfig *, struct fbcurpos *));
-int tga_builtin_get_curpos __P((struct tga_devconfig *, struct fbcurpos *));
-int tga_builtin_get_curmax __P((struct tga_devconfig *, struct fbcurpos *));