 @@ -1,21 +1,21 @@
-/*	$NetBSD: tcx.c,v 1.32 2009/08/06 18:26:03 macallan Exp $ */
+/*	$NetBSD: tcx.c,v 1.33 2009/08/18 20:45:42 macallan Exp $ */
 /*
  *  Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
  *  All rights reserved.
+ *
  *  This code is derived from software contributed to The NetBSD Foundation
- *  by Paul Kranenburg.
+ *  by Paul Kranenburg and Michael Lorenz.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  *  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  *  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 @@ -28,27 +28,27 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * color display (TCX) driver.
+ *
  * Does not handle interrupts, even though they can occur.
+ *
  * XXX should defer colormap updates to vertical retrace interrupts
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.32 2009/08/06 18:26:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.33 2009/08/18 20:45:42 macallan Exp $");
 /*
  * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
  * it is bypassed on the 8-bit version (onboard framebuffer for SS4)
  */
 #undef TCX_CG8
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 @@ -73,27 +73,27 @@ __KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.32
 #include <dev/sbus/tcxreg.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #include "opt_wsemul.h"
 /* per-display variables */
 struct tcx_softc {
-	struct device	sc_dev;		/* base device */
+	device_t	sc_dev;		/* base device */
 	struct sbusdev	sc_sd;		/* sbus device */
 	struct fbdevice	sc_fb;		/* frame buffer device */
 	bus_space_tag_t	sc_bustag;
 	struct openprom_addr sc_physadr[TCX_NREG];/* phys addr of h/w */
 	bus_space_handle_t sc_bt;	/* Brooktree registers */
 	bus_space_handle_t sc_thc;	/* THC registers */
 	uint8_t *sc_fbaddr;		/* framebuffer */
 	uint64_t *sc_rblit;		/* blitspace */
 	uint64_t *sc_rstip;		/* stipple space */
 	short	sc_8bit;		/* true if 8-bit hardware */
 	short	sc_blanked;		/* true if blanked */
 @@ -136,27 +136,27 @@ struct wsscreen_list tcx_screenlist = {
  * 8 bits per pixel, unpadded; writes to this space do not modify the
  * other 18 bits.
  */
 #define TCX_CTL_8_MAPPED	0x00000000	/* 8 bits, uses color map */
 #define TCX_CTL_24_MAPPED	0x01000000	/* 24 bits, uses color map */
 #define TCX_CTL_24_LEVEL	0x03000000	/* 24 bits, ignores color map */
 #define TCX_CTL_PIXELMASK	0x00FFFFFF	/* mask for index/level */
 /* autoconfiguration driver */
 static void	tcxattach(device_t, device_t, void *);
 static int	tcxmatch(device_t, cfdata_t, void *);
 static void	tcx_unblank(device_t);
-CFATTACH_DECL(tcx, sizeof(struct tcx_softc),
+CFATTACH_DECL_NEW(tcx, sizeof(struct tcx_softc),
     tcxmatch, tcxattach, NULL, NULL);
 extern struct cfdriver tcx_cd;
 dev_type_open(tcxopen);
 dev_type_close(tcxclose);
 dev_type_ioctl(tcxioctl);
 dev_type_mmap(tcxmmap);
 const struct cdevsw tcx_cdevsw = {
 	tcxopen, tcxclose, noread, nowrite, tcxioctl,
 	nostop, notty, nopoll, tcxmmap, nokqfilter,
 };
 @@ -223,33 +223,34 @@ void
 tcxattach(device_t parent, device_t self, void *args)
+{
 	struct tcx_softc *sc = device_private(self);
 	struct sbus_attach_args *sa = args;
 	struct wsemuldisplaydev_attach_args aa;
 	struct rasops_info *ri;
 	unsigned long defattr;
 	int node, ramsize;
 	struct fbdevice *fb = &sc->sc_fb;
 	bus_space_handle_t bh;
 	int isconsole, i, j;
 	uint32_t confreg;
 	sc->sc_dev = self;
 	sc->sc_bustag = sa->sa_bustag;
 	node = sa->sa_node;
 	fb->fb_driver = &tcx_fbdriver;
-	fb->fb_device = &sc->sc_dev;
+	fb->fb_device = sc->sc_dev;
 	/* Mask out invalid flags from the user. */
-	fb->fb_flags = device_cfdata(&sc->sc_dev)->cf_flags & FB_USERMASK;
+	fb->fb_flags = device_cfdata(sc->sc_dev)->cf_flags & FB_USERMASK;
 	/*
 	 * The onboard framebuffer on the SS4 supports only 8-bit mode;
 	 * it can be distinguished from the S24 card for the SS5 by the
 	 * presence of the "tcx-8-bit" attribute on the SS4 version.
 	 */
 	sc->sc_8bit = node_has_property(node, "tcx-8-bit");
 	fb->fb_type.fb_depth = 8;
 	fb_setsize_obp(fb, fb->fb_type.fb_depth, 1152, 900, node);
 	if (sc->sc_8bit) {
 		printf(" {8bit only TCX)");
 		ramsize = 1024 * 1024;
 		/* XXX - fix THC and TEC offsets */
 @@ -355,31 +356,27 @@ tcxattach(device_t parent, device_t self
+	}
 	tcx_loadcmap(sc, 0, 256);
 	/* enable video */
 	confreg = bus_space_read_4(sa->sa_bustag, sc->sc_thc, THC_MISC);
 	confreg |= THC_MISC_VIDEN;
 	bus_space_write_4(sa->sa_bustag, sc->sc_thc, THC_MISC, confreg);
 	if (isconsole) {
 		printf(" (console)\n");
 	} else
 		printf("\n");
-	bus_space_write_4(sa->sa_bustag, sc->sc_bt, DAC_ADDRESS, 0);
+	sbus_establish(&sc->sc_sd, sc->sc_dev);
 	printf("DAC ID: %02x %02x\n",
 	    bus_space_read_1(sa->sa_bustag, sc->sc_bt, DAC_CONTROL_1),
 	    bus_space_read_1(sa->sa_bustag, sc->sc_bt, DAC_CONTROL_1));
 	sbus_establish(&sc->sc_sd, &sc->sc_dev);
 	fb_attach(&sc->sc_fb, isconsole);
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 	wsfont_init();
 	vcons_init(&sc->vd, sc, &tcx_defscreendesc, &tcx_accessops);
 	sc->vd.init_screen = tcx_init_screen;
 	vcons_init_screen(&sc->vd, &tcx_console_screen, 1, &defattr);
 	tcx_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
 	sc->sc_bg = (defattr >> 16) & 0xff;
 	tcx_clearscreen(sc);
 @@ -532,27 +529,27 @@ tcxioctl(dev_t dev, u_long cmd, void *da
 			return (error);
 		/* now blast them into the chip */
 		/* XXX should use retrace interrupt */
 		tcx_loadcmap(sc, p->index, p->count);
 #undef p
 		break;
 #endif
 	case FBIOGVIDEO:
 		*(int *)data = sc->sc_blanked;
 		break;
 	case FBIOSVIDEO:
 		if (*(int *)data)
-			tcx_unblank(&sc->sc_dev);
+			tcx_unblank(sc->sc_dev);
 		else if (!sc->sc_blanked) {
 			sc->sc_blanked = 1;
 			//sc->sc_thc->thc_hcmisc &= ~THC_MISC_VIDEN;
 			/* Put monitor in `power-saving mode' */
 			//sc->sc_thc->thc_hcmisc |= THC_MISC_VSYNC_DISABLE;
 			//sc->sc_thc->thc_hcmisc |= THC_MISC_HSYNC_DISABLE;
+		}
 		break;
 	default:
 #ifdef DEBUG
 		log(LOG_NOTICE, "tcxioctl(0x%lx) (%s[%d])\n", cmd,
 		    l->l_proc->p_comm, l->l_proc->p_pid);