 @@ -1,14 +1,14 @@
-/*	$NetBSD: sti.c,v 1.11 2010/10/31 15:47:53 skrll Exp $	*/
+/*	$NetBSD: sti.c,v 1.12 2010/11/01 06:41:50 skrll Exp $	*/
 /*	$OpenBSD: sti.c,v 1.35 2003/12/16 06:07:13 mickey Exp $	*/
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -25,27 +25,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * TODO:
  *	call sti procs asynchronously;
  *	implement console scroll-back;
  *	X11 support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.11 2010/10/31 15:47:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.12 2010/11/01 06:41:50 skrll Exp $");
 #include "wsdisplay.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -106,42 +106,42 @@ struct wsscreen_list sti_default_screenl
 	sizeof(sti_default_scrlist) / sizeof(sti_default_scrlist[0]),
 	sti_default_scrlist
 };
 enum sti_bmove_funcs {
 	bmf_clear, bmf_copy, bmf_invert, bmf_underline
 };
 int sti_init(struct sti_softc *, int);
 int sti_inqcfg(struct sti_softc *, struct sti_inqconfout *);
 void sti_bmove(struct sti_softc *, int, int, int, int, int, int,
     enum sti_bmove_funcs);
 int sti_setcment(struct sti_softc *, u_int, u_char, u_char, u_char);
-int sti_fetchfonts(struct sti_softc *, struct sti_inqconfout *, u_int32_t);
+int sti_fetchfonts(struct sti_softc *, struct sti_inqconfout *, uint32_t);
 void sti_attach_deferred(device_t);
 void
 sti_attach_common(struct sti_softc *sc)
+{
 	struct sti_inqconfout cfg;
 	struct sti_einqconfout ecfg;
 	bus_space_handle_t fbh;
 	struct sti_dd *dd;
 	struct sti_cfg *cc;
 	int error, size, i;
-	u_int8_t *p = (u_int8_t *)sc->sc_code;
+	uint8_t *p = (uint8_t *)sc->sc_code;
-	u_int32_t addr, eaddr;
+	uint32_t addr, eaddr;
 	struct sti_region r;
-	u_int32_t *q;
+	uint32_t *q;
 	uint32_t tmp;
 	dd = &sc->sc_dd;
 	if (sc->sc_devtype == STI_DEVTYPE1) {
 #define	parseshort(o) \
 	((bus_space_read_1(sc->memt, sc->romh, (o) + 3) <<  8) | \
 	 (bus_space_read_1(sc->memt, sc->romh, (o) + 7)))
 #define	parseword(o) \
 	((bus_space_read_1(sc->memt, sc->romh, (o) +  3) << 24) | \
 	 (bus_space_read_1(sc->memt, sc->romh, (o) +  7) << 16) | \
 	 (bus_space_read_1(sc->memt, sc->romh, (o) + 11) <<  8) | \
 	 (bus_space_read_1(sc->memt, sc->romh, (o) + 15)))
 @@ -177,37 +177,37 @@ sti_attach_common(struct sti_softc *sc)
 		dd->dd_pacode[0x4] = parseword(0x140) & ~3;
 		dd->dd_pacode[0x5] = parseword(0x150) & ~3;
 		dd->dd_pacode[0x6] = parseword(0x160) & ~3;
 		dd->dd_pacode[0x7] = parseword(0x170) & ~3;
 		dd->dd_pacode[0x8] = parseword(0x180) & ~3;
 		dd->dd_pacode[0x9] = parseword(0x190) & ~3;
 		dd->dd_pacode[0xa] = parseword(0x1a0) & ~3;
 		dd->dd_pacode[0xb] = parseword(0x1b0) & ~3;
 		dd->dd_pacode[0xc] = parseword(0x1c0) & ~3;
 		dd->dd_pacode[0xd] = parseword(0x1d0) & ~3;
 		dd->dd_pacode[0xe] = parseword(0x1e0) & ~3;
 		dd->dd_pacode[0xf] = parseword(0x1f0) & ~3;
 	} else	/* STI_DEVTYPE4 */
-		bus_space_read_region_4(sc->memt, sc->romh, 0, (u_int32_t *)dd,
+		bus_space_read_region_4(sc->memt, sc->romh, 0, (uint32_t *)dd,
 		    sizeof(*dd) / 4);
 #ifdef STIDEBUG
 	printf("dd:\n"
 	    "devtype=%x, rev=%x;%d, altt=%x, gid=%016llx, font=%x, mss=%x\n"
 	    "end=%x, regions=%x, msto=%x, timo=%d, mont=%x, user=%x[%x]\n"
 	    "memrq=%x, pwr=%d, bus=%x, ebus=%x, cfb=%x\n"
 	    "code=",
 	    dd->dd_type & 0xff, dd->dd_grrev, dd->dd_lrrev, dd->dd_altcodet,
-	    *(u_int64_t *)dd->dd_grid, dd->dd_fntaddr, dd->dd_maxst,
+	    *(uint64_t *)dd->dd_grid, dd->dd_fntaddr, dd->dd_maxst,
 	    dd->dd_romend, dd->dd_reglst, dd->dd_maxreent, dd->dd_maxtimo,
 	    dd->dd_montbl, dd->dd_udaddr, dd->dd_udsize, dd->dd_stimemreq,
 	    dd->dd_pwruse, dd->dd_bussup, dd->dd_ebussup, dd->dd_cfbaddr);
 	printf("%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x\n",
 	    dd->dd_pacode[0x0], dd->dd_pacode[0x1], dd->dd_pacode[0x2],
 	    dd->dd_pacode[0x3], dd->dd_pacode[0x4], dd->dd_pacode[0x5],
 	    dd->dd_pacode[0x6], dd->dd_pacode[0x7], dd->dd_pacode[0x8],
 	    dd->dd_pacode[0x9], dd->dd_pacode[0xa], dd->dd_pacode[0xb],
 	    dd->dd_pacode[0xc], dd->dd_pacode[0xd], dd->dd_pacode[0xe],
 	    dd->dd_pacode[0xf]);
 #endif
 	/* divise code size, could be less than STI_END entries */
 	for (i = STI_END; !dd->dd_pacode[i]; i--);
 @@ -215,35 +215,35 @@ sti_attach_common(struct sti_softc *sc)
 	if (sc->sc_devtype == STI_DEVTYPE1)
 		size = (size + 3) / 4;
 	if (!(sc->sc_code = uvm_km_alloc(kernel_map, round_page(size), 0,
 	    UVM_KMF_WIRED))) {
 		printf(": cannot allocate %u bytes for code\n", size);
 		return;
+	}
 #ifdef STIDEBUG
 	printf("code=0x%x[%x]\n", (uint)sc->sc_code, size);
 #endif
 	/* copy code into memory */
 	if (sc->sc_devtype == STI_DEVTYPE1) {
-		p = (u_int8_t *)sc->sc_code;
+		p = (uint8_t *)sc->sc_code;
 		for (addr = dd->dd_pacode[STI_BEGIN], eaddr = addr + size * 4;
 		    addr < eaddr; addr += 4 )
 			*p++ = bus_space_read_4(sc->memt, sc->romh, addr)
 			    & 0xff;
 	} else	/* STI_DEVTYPE4 */
 		bus_space_read_region_4(sc->memt, sc->romh,
-		    dd->dd_pacode[STI_BEGIN], (u_int32_t *)sc->sc_code,
+		    dd->dd_pacode[STI_BEGIN], (uint32_t *)sc->sc_code,
 		    size / 4);
 #define	O(i)	(dd->dd_pacode[(i)] ? (sc->sc_code +	\
 	(dd->dd_pacode[(i)] - dd->dd_pacode[0]) /	\
 	(sc->sc_devtype == STI_DEVTYPE1 ? 4 : 1)) : 0)
 	sc->init	= (sti_init_t)	O(STI_INIT_GRAPH);
 	sc->mgmt	= (sti_mgmt_t)	O(STI_STATE_MGMT);
 	sc->unpmv	= (sti_unpmv_t)	O(STI_FONT_UNPMV);
 	sc->blkmv	= (sti_blkmv_t)	O(STI_BLOCK_MOVE);
 	sc->test	= (sti_test_t)	O(STI_SELF_TEST);
 	sc->exhdl	= (sti_exhdl_t)	O(STI_EXCEP_HDLR);
 	sc->inqconf	= (sti_inqconf_t)O(STI_INQ_CONF);
 	sc->scment	= (sti_scment_t)O(STI_SCM_ENT);
 @@ -323,27 +323,27 @@ sti_attach_common(struct sti_softc *sc)
 #ifdef STIDEBUG
 	printf("conf: bpp=%d planes=%d attr=%d\n"
 	    "crt=0x%x:0x%x:0x%x hw=0x%x:0x%x:0x%x\n",
 	    cfg.bpp, cfg.planes, cfg.attributes,
 	    ecfg.crt_config[0], ecfg.crt_config[1], ecfg.crt_config[2],
 	    ecfg.crt_hw[0], ecfg.crt_hw[1], ecfg.crt_hw[2]);
 #endif
 	sc->sc_wsmode = WSDISPLAYIO_MODE_EMUL;
 	sc->sc_bpp = cfg.bppu;
 	printf(": %s rev %d.%02d;%d, ID 0x%016llX\n"
 	    "%s: %dx%d frame buffer, %dx%dx%d display, offset %dx%d\n",
 	    cfg.name, dd->dd_grrev >> 4, dd->dd_grrev & 0xf, dd->dd_lrrev,
-	    *(u_int64_t *)dd->dd_grid, device_xname(sc->sc_dev), cfg.fbwidth,
+	    *(uint64_t *)dd->dd_grid, device_xname(sc->sc_dev), cfg.fbwidth,
 	    cfg.fbheight, cfg.width, cfg.height, cfg.bppu, cfg.owidth,
 	    cfg.oheight);
 	if ((error = sti_fetchfonts(sc, &cfg, dd->dd_fntaddr))) {
 		aprint_error_dev(sc->sc_dev, "cannot fetch fonts (%d)\n",
 		    error);
 		return;
+	}
 	/*
 	 * parse screen descriptions:
 	 *	figure number of fonts supported;
 	 *	allocate wscons structures;
 @@ -374,27 +374,27 @@ sti_attach_deferred(device_t dev)
 	waa.accesscookie = sc;
 	/* attach as console if required */
 	if (waa.console) {
 		sti_alloc_attr(sc, 0, 0, 0, &defattr);
 		wsdisplay_cnattach(&sti_default_screen, sc,
 , sti_default_screen.nrows - 1, defattr);
+	}
 	config_found(sc->sc_dev, &waa, wsemuldisplaydevprint);
+}
 int
-sti_fetchfonts(struct sti_softc *sc, struct sti_inqconfout *cfg, u_int32_t addr)
+sti_fetchfonts(struct sti_softc *sc, struct sti_inqconfout *cfg, uint32_t addr)
+{
 	struct sti_font *fp = &sc->sc_curfont;
 	int size;
 #ifdef notyet
 	int uc;
 	struct {
 		struct sti_unpmvflags flags;
 		struct sti_unpmvin in;
 		struct sti_unpmvout out;
 	} a;
 #endif
 	/*
 @@ -409,42 +409,42 @@ sti_fetchfonts(struct sti_softc *sc, str
 			fp->height = bus_space_read_1(sc->memt, sc->romh,
 			    addr + 0x17);
 			fp->type   = bus_space_read_1(sc->memt, sc->romh,
 			    addr + 0x1b);
 			fp->bpc    = bus_space_read_1(sc->memt, sc->romh,
 			    addr + 0x1f);
 			fp->next   = parseword(addr + 0x23);
 			fp->uheight= bus_space_read_1(sc->memt, sc->romh,
 			    addr + 0x33);
 			fp->uoffset= bus_space_read_1(sc->memt, sc->romh,
 			    addr + 0x37);
 		} else	/* STI_DEVTYPE4 */
 			bus_space_read_region_4(sc->memt, sc->romh, addr,
-			    (u_int32_t *)fp, sizeof(struct sti_font) / 4);
+			    (uint32_t *)fp, sizeof(struct sti_font) / 4);
 		printf("%s: %dx%d font type %d, %d bpc, charset %d-%d\n",
 		    device_xname(sc->sc_dev), fp->width, fp->height, fp->type,
 		    fp->bpc, fp->first, fp->last);
 		size = sizeof(struct sti_font) +
 		    (fp->last - fp->first + 1) * fp->bpc;
 		if (sc->sc_devtype == STI_DEVTYPE1)
 			size *= 4;
 		sc->sc_romfont = malloc(size, M_DEVBUF, M_NOWAIT);
 		if (sc->sc_romfont == NULL)
 			return (ENOMEM);
 		bus_space_read_region_4(sc->memt, sc->romh, addr,
-		    (u_int32_t *)sc->sc_romfont, size / 4);
+		    (uint32_t *)sc->sc_romfont, size / 4);
 		addr = 0; /* fp->next */
 	} while (addr);
 #ifdef notyet
 	/*
 	 * If there is enough room in the off-screen framebuffer memory,
 	 * display all the characters there in order to display them
 	 * faster with blkmv operations rather than unpmv later on.
 	 */
 	if (size <= cfg->fbheight *
 	    (cfg->fbwidth - cfg->width - cfg->owidth)) {
 		memset(&a, 0, sizeof(a));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: stireg.h,v 1.3 2010/10/31 15:47:53 skrll Exp $	*/
+/*	$NetBSD: stireg.h,v 1.4 2010/11/01 06:41:50 skrll Exp $	*/
 /*	$OpenBSD: stireg.h,v 1.8 2003/08/19 02:52:38 mickey Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -100,507 +100,507 @@
 #define	STI_COLOUR_BLACK	0
 #define	STI_COLOUR_WHITE	1
 #define	STI_COLOUR_RED		2
 #define	STI_COLOUR_YELLOW	3
 #define	STI_COLOUR_GREEN	4
 #define	STI_COLOUR_CYAN		5
 #define	STI_COLOUR_BLUE		6
 #define	STI_COLOUR_MAGENTA	7
 #pragma pack(1)
 	/* LSB high */
 struct	sti_dd {
-	u_int32_t	dd_type;	/* 0x00 device type */
+	uint32_t	dd_type;	/* 0x00 device type */
 #define	STI_DEVTYPE1	1
 #define	STI_DEVTYPE4	3
-	u_int8_t	dd_unused;
+	uint8_t		dd_unused;
-	u_int8_t	dd_nmon;	/* 0x05 number monitor rates */
+	uint8_t		dd_nmon;	/* 0x05 number monitor rates */
-	u_int8_t	dd_grrev;	/* 0x06 global rom revision */
+	uint8_t		dd_grrev;	/* 0x06 global rom revision */
-	u_int8_t	dd_lrrev;	/* 0x07 local rom revision */
+	uint8_t		dd_lrrev;	/* 0x07 local rom revision */
-	u_int8_t	dd_grid[8];	/* 0x08 graphics id */
+	uint8_t		dd_grid[8];	/* 0x08 graphics id */
 #define STI_DEV4_DD_GRID	0x08	/* offset for STI_DEVTYPE4 */
 #define STI_DEV1_DD_GRID	0x10	/* offset for STI_DEVTYPE1 */
-	u_int32_t	dd_fntaddr;	/* 0x10 font start address */
+	uint32_t	dd_fntaddr;	/* 0x10 font start address */
-	u_int32_t	dd_maxst;	/* 0x14 max state storage */
+	uint32_t	dd_maxst;	/* 0x14 max state storage */
-	u_int32_t	dd_romend;	/* 0x18 rom last address */
+	uint32_t	dd_romend;	/* 0x18 rom last address */
 #define STI_DEV4_DD_ROMEND	0x18	/* offset for STI_DEVTYPE4 */
 #define STI_DEV1_DD_ROMEND	0x50	/* offset for STI_DEVTYPE1 */
-	u_int32_t	dd_reglst;	/* 0x1c device region list */
+	uint32_t	dd_reglst;	/* 0x1c device region list */
-	u_int16_t	dd_maxreent;	/* 0x20 max reent storage */
+	uint16_t	dd_maxreent;	/* 0x20 max reent storage */
-	u_int16_t	dd_maxtimo;	/* 0x22 max execution timeout .1 sec */
+	uint16_t	dd_maxtimo;	/* 0x22 max execution timeout .1 sec */
-	u_int32_t	dd_montbl;	/* 0x24 mon table address, array of
+	uint32_t	dd_montbl;	/* 0x24 mon table address, array of
 						names num of dd_nmon */
-	u_int32_t	dd_udaddr;	/* 0x28 user data address */
+	uint32_t	dd_udaddr;	/* 0x28 user data address */
-	u_int32_t	dd_stimemreq;	/* 0x2c sti memory request */
+	uint32_t	dd_stimemreq;	/* 0x2c sti memory request */
-	u_int32_t	dd_udsize;	/* 0x30 user data size */
+	uint32_t	dd_udsize;	/* 0x30 user data size */
-	u_int16_t	dd_pwruse;	/* 0x34 power usage */
+	uint16_t	dd_pwruse;	/* 0x34 power usage */
-	u_int8_t	dd_bussup;	/* 0x36 bus support */
+	uint8_t		dd_bussup;	/* 0x36 bus support */
 #define	STI_BUSSUPPORT_GSCINTL	0x01	/*	supports pulling INTL for int */
 #define	STI_BUSSUPPORT_GSC15X	0x02	/*	supports GSC 1.5X */
 #define	STI_BUSSUPPORT_GSC2X	0x04	/*	supports GSC 2.X */
 #define	STI_BUSSUPPORT_PCIIOEIM	0x08	/*	will use directed int */
 #define	STI_BUSSUPPORT_PCISTD	0x10	/*	will use std PCI int */
 #define	STI_BUSSUPPORT_ILOCK	0x20	/*	supports implicit locking */
 #define	STI_BUSSUPPORT_ROMMAP	0x40	/*	rom is only in pci erom space */
 #define	STI_BUSSUPPORT_2DECODE	0x80	/*	single address decoder */
-	u_int8_t	dd_ebussup;	/* 0x37 extended bus support */
+	uint8_t		dd_ebussup;	/* 0x37 extended bus support */
 #define	STI_EBUSSUPPORT_DMA	0x01	/*	supports dma */
 #define	STI_EBUSSUPPORT_PIOLOCK	0x02	/*	no implicit locking for dma */
-	u_int8_t	dd_altcodet;	/* 0x38 alternate code type */
+	uint8_t		dd_altcodet;	/* 0x38 alternate code type */
 #define	STI_ALTCODE_UNKNOWN	0x00
 #define	STI_ALTCODE_PA64	0x01	/*	alt code is in pa64 */
-	u_int8_t	dd_eddst[3];	/* 0x39 extended DD struct */
+	uint8_t		dd_eddst[3];	/* 0x39 extended DD struct */
-	u_int32_t	dd_cfbaddr;	/* 0x3c CFB address, location of
+	uint32_t	dd_cfbaddr;	/* 0x3c CFB address, location of
 						X11 driver to be used for
 						servers w/o accel */
-	u_int32_t	dd_pacode[16];	/* 0x40 routines for pa-risc */
+	uint32_t	dd_pacode[16];	/* 0x40 routines for pa-risc */
-	u_int32_t	dd_altcode[16];	/* 0x80 routines for m68k/i386 */
+	uint32_t	dd_altcode[16];	/* 0x80 routines for m68k/i386 */
 };
 /* after the last region there is one indirect list ptr */
 struct sti_region {
 	u_int	offset  :14;	/* page offset dev io space relative */
 	u_int	sys_only: 1;	/* whether allow user access */
 	u_int	cache   : 1;	/* map in cache */
 	u_int	btlb    : 1;	/* should use BTLB if available */
 	u_int	last    : 1;	/* last region in the list */
 	u_int	length  :14;	/* size in pages */
 };
 struct sti_font {
-	u_int16_t	first;
+	uint16_t	first;
-	u_int16_t	last;
+	uint16_t	last;
-	u_int8_t	width;
+	uint8_t		width;
-	u_int8_t	height;
+	uint8_t		height;
-	u_int8_t	type;
+	uint8_t		type;
 #define	STI_FONT_HPROMAN8	1
 #define	STI_FONT_KANA8		2
-	u_int8_t	bpc;
+	uint8_t		bpc;
-	u_int32_t	next;
+	uint32_t	next;
-	u_int8_t	uheight;
+	uint8_t		uheight;
-	u_int8_t	uoffset;
+	uint8_t		uoffset;
-	u_int8_t	unused[2];
+	uint8_t		unused[2];
 };
 struct sti_fontcfg {
-	u_int16_t	first;
+	uint16_t	first;
-	u_int16_t	last;
+	uint16_t	last;
-	u_int8_t	width;
+	uint8_t		width;
-	u_int8_t	height;
+	uint8_t		height;
-	u_int8_t	type;
+	uint8_t		type;
-	u_int8_t	bpc;
+	uint8_t		bpc;
-	u_int8_t	uheight;
+	uint8_t		uheight;
-	u_int8_t	uoffset;
+	uint8_t		uoffset;
 };
 typedef struct sti_ecfg {
-	u_int8_t	current_monitor;
+	uint8_t		current_monitor;
-	u_int8_t	uf_boot;
+	uint8_t		uf_boot;
-	u_int16_t	power;		/* power dissipation Watts */
+	uint16_t	power;		/* power dissipation Watts */
-	u_int32_t	freq_ref;
+	uint32_t	freq_ref;
-	u_int32_t	*addr;		/* memory block of size dd_stimemreq */
+	uint32_t	*addr;		/* memory block of size dd_stimemreq */
 	void		*future;
 } *sti_ecfg_t;
 typedef struct sti_cfg {
-	u_int32_t	text_planes;
+	uint32_t	text_planes;
-	u_int16_t	scr_width;
+	uint16_t	scr_width;
-	u_int16_t	scr_height;
+	uint16_t	scr_height;
-	u_int16_t	oscr_width;
+	uint16_t	oscr_width;
-	u_int16_t	oscr_height;
+	uint16_t	oscr_height;
-	u_int16_t	fb_width;
+	uint16_t	fb_width;
-	u_int16_t	fb_height;
+	uint16_t	fb_height;
-	u_int32_t	regions[STI_REGION_MAX];
+	uint32_t	regions[STI_REGION_MAX];
-	u_int32_t	reent_level;
+	uint32_t	reent_level;
-	u_int32_t	*save_addr;
+	uint32_t	*save_addr;
 	sti_ecfg_t	ext_cfg;
 } *sti_cfg_t;
 /* routine types */
 #define	STI_DEP(n) \
 	typedef int (*sti_##n##_t)( \
 	  sti_##n##flags_t, sti_##n##in_t, sti_##n##out_t, sti_cfg_t);
 typedef struct sti_initflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_INITF_WAIT	0x80000000
 #define	STI_INITF_RESET	0x40000000
 #define	STI_INITF_TEXT	0x20000000
 #define	STI_INITF_NTEXT	0x10000000
 #define	STI_INITF_CLEAR	0x08000000
 #define	STI_INITF_CMB	0x04000000	/* non-text planes cmap black */
 #define	STI_INITF_EBET	0x02000000	/* enable bus error timer */
 #define	STI_INITF_EBETI	0x01000000	/* enable bus error timer interrupt */
 #define	STI_INITF_PTS	0x00800000	/* preserve text settings */
 #define	STI_INITF_PNTS	0x00400000	/* preserve non-text settings */
 #define	STI_INITF_PBET	0x00200000	/* preserve BET settings */
 #define	STI_INITF_PBETI	0x00100000	/* preserve BETI settings */
 #define	STI_INITF_ICMT	0x00080000	/* init cmap for text planes */
 #define	STI_INITF_SCMT	0x00040000	/* change current monitor type */
 #define	STI_INITF_RIE	0x00020000	/* retain int enables */
 	void *future;
 } *sti_initflags_t;
 typedef struct sti_einitin {
-	u_int8_t	mon_type;
+	uint8_t		mon_type;
-	u_int8_t	pad;
+	uint8_t		pad;
-	u_int16_t	inflight;	/* possible on pci */
+	uint16_t	inflight;	/* possible on pci */
 	void		*future;
 } *sti_einitin_t;
 typedef struct sti_initin {
-	u_int32_t	text_planes;	/* number of planes for text */
+	uint32_t	text_planes;	/* number of planes for text */
 	sti_einitin_t	ext_in;
 } *sti_initin_t;
 typedef struct sti_initout {
 	int32_t		errno;
-	u_int32_t	text_planes;	/* number of planes used for text */
+	uint32_t	text_planes;	/* number of planes used for text */
 	void		*future;
 } *sti_initout_t;
 STI_DEP(init);
 typedef struct sti_mgmtflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_MGMTF_WAIT	0x80000000
 #define	STI_MGMTF_SAVE	0x40000000
 #define	STI_MGMTF_RALL	0x20000000	/* restore all display planes */
 	void *future;
 } *sti_mgmtflags_t;
 typedef struct sti_mgmtin {
 	void	*addr;
 	void	*future;
 } *sti_mgmtin_t;
 typedef struct sti_mgmtout {
 	int32_t		errno;
 	void		*future;
 } *sti_mgmtout_t;
 STI_DEP(mgmt);
 typedef struct sti_unpmvflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_UNPMVF_WAIT	0x80000000
 #define	STI_UNPMVF_NTXT	0x40000000	/* intp non-text planes */
 	void		*future;
 } *sti_unpmvflags_t;
 typedef struct sti_unpmvin {
-	u_int32_t	*font_addr;	/* font */
+	uint32_t	*font_addr;	/* font */
-	u_int16_t	index;		/* character index in the font */
+	uint16_t	index;		/* character index in the font */
-	u_int8_t	fg_colour;
+	uint8_t		fg_colour;
-	u_int8_t	bg_colour;
+	uint8_t		bg_colour;
-	u_int16_t	x, y;
+	uint16_t	x, y;
 	void		*future;
 } *sti_unpmvin_t;
 typedef struct sti_unpmvout {
-	u_int32_t	errno;
+	uint32_t	errno;
 	void		*future;
 } *sti_unpmvout_t;
 STI_DEP(unpmv);
 typedef struct sti_blkmvflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_BLKMVF_WAIT	0x80000000
 #define	STI_BLKMVF_COLR	0x40000000	/* change colour on move */
 #define	STI_BLKMVF_CLR	0x20000000	/* clear on move */
 #define	STI_BLKMVF_NTXT	0x10000000	/* move in non-text planes */
 	void		*future;
 } *sti_blkmvflags_t;
 typedef struct sti_blkmvin {
-	u_int8_t	fg_colour;
+	uint8_t		fg_colour;
-	u_int8_t	bg_colour;
+	uint8_t		bg_colour;
-	u_int16_t	srcx, srcy, dstx, dsty;
+	uint16_t	srcx, srcy, dstx, dsty;
-	u_int16_t	width, height;
+	uint16_t	width, height;
-	u_int16_t	pad;
+	uint16_t	pad;
 	void		*future;
 } *sti_blkmvin_t;
 typedef struct sti_blkmvout {
-	u_int32_t	errno;
+	uint32_t	errno;
 	void		*future;
 } *sti_blkmvout_t;
 STI_DEP(blkmv);
 typedef struct sti_testflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_TESTF_WAIT	0x80000000
 #define	STI_TESTF_ETST	0x40000000
 	void		*future;
 } *sti_testflags_t;
 typedef struct sti_testin {
 	void		*future;
 } *sti_testin_t;
 typedef struct sti_testout {
-	u_int32_t	errno;
+	uint32_t	errno;
-	u_int32_t	result;
+	uint32_t	result;
 	void		*future;
 } *sti_testout_t;
 STI_DEP(test);
 typedef struct sti_exhdlflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_EXHDLF_WAIT	0x80000000
 #define	STI_EXHDLF_CINT	0x40000000	/* clear int */
 #define	STI_EXHDLF_CBE	0x20000000	/* clear BE */
 #define	STI_EXHDLF_PINT	0x10000000	/* preserve int */
 #define	STI_EXHDLF_RINT	0x08000000	/* restore int */
 #define	STI_EXHDLF_WEIM	0x04000000	/* write eim w/ sti_eexhdlin */
 #define	STI_EXHDLF_REIM	0x02000000	/* read eim to sti_eexhdlout */
 #define	STI_EXHDLF_GIE	0x01000000	/* global int enable */
 #define	STI_EXHDLF_PGIE	0x00800000
 #define	STI_EXHDLF_WIEM	0x00400000
 #define	STI_EXHDLF_EIEM	0x00200000
 #define	STI_EXHDLF_BIC	0x00100000	/* begin int cycle */
 #define	STI_EXHDLF_EIC	0x00080000	/* end int cycle */
 #define	STI_EXHDLF_RIE	0x00040000	/* reset do not clear int enables */
 	void		*future;
 } *sti_exhdlflags_t;
 typedef struct sti_eexhdlin {
-	u_int32_t	eim_addr;
+	uint32_t	eim_addr;
-	u_int32_t	eim_data;
+	uint32_t	eim_data;
-	u_int32_t	iem;		/* enable mask */
+	uint32_t	iem;		/* enable mask */
-	u_int32_t	icm;		/* clear mask */
+	uint32_t	icm;		/* clear mask */
 	void		*future;
 } *sti_eexhdlin_t;
 typedef struct sti_exhdlint {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_EXHDLINT_BET	0x80000000	/* bus error timer */
 #define	STI_EXHDLINT_HW		0x40000000	/* high water */
 #define	STI_EXHDLINT_LW		0x20000000	/* low water */
 #define	STI_EXHDLINT_TM		0x10000000	/* texture map */
 #define	STI_EXHDLINT_VB		0x08000000	/* vertical blank */
 #define	STI_EXHDLINT_UDC	0x04000000	/* unbuffered dma complete */
 #define	STI_EXHDLINT_BDC	0x02000000	/* buffered dma complete */
 #define	STI_EXHDLINT_UDPC	0x01000000	/* unbuf priv dma complete */
 #define	STI_EXHDLINT_BDPC	0x00800000	/* buffered priv dma complete */
 } *sti_exhdlint_t;
 typedef struct sti_exhdlin {
 	sti_exhdlint_t	addr;
 	sti_eexhdlin_t	ext;
 } *sti_exhdlin_t;
 typedef struct sti_eexhdlout {
-	u_int32_t	eim_addr;
+	uint32_t	eim_addr;
-	u_int32_t	eim_data;
+	uint32_t	eim_data;
-	u_int32_t	iem;		/* enable mask */
+	uint32_t	iem;		/* enable mask */
-	u_int32_t	icm;		/* clear mask */
+	uint32_t	icm;		/* clear mask */
 	void		*future;
 } *sti_eexhdlout_t;
 typedef struct sti_exhdlout {
-	u_int32_t	errno;
+	uint32_t	errno;
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_EXHDLO_BE	0x80000000	/* BE was intercepted */
 #define	STI_EXHDLO_IP	0x40000000	/* there is int pending */
 #define	STI_EXHDLO_IE	0x20000000	/* global enable set */
 	sti_eexhdlout_t	ext;
 } *sti_exhdlout_t;
 STI_DEP(exhdl);
 typedef struct sti_inqconfflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_INQCONFF_WAIT	0x80000000
 	void		*future;
 } *sti_inqconfflags_t;
 typedef struct sti_inqconfin {
 	void	*future;
 } *sti_inqconfin_t;
 typedef struct sti_einqconfout {
-	u_int32_t	crt_config[3];
+	uint32_t	crt_config[3];
-	u_int32_t	crt_hw[3];
+	uint32_t	crt_hw[3];
 	void		*future;
 } *sti_einqconfout_t;
 typedef struct sti_inqconfout {
-	u_int32_t	errno;
+	uint32_t	errno;
-	u_int16_t	width, height, owidth, oheight, fbwidth, fbheight;
+	uint16_t	width, height, owidth, oheight, fbwidth, fbheight;
-	u_int32_t	bpp;	/* bits per pixel */
+	uint32_t	bpp;	/* bits per pixel */
-	u_int32_t	bppu;	/* accessible bpp */
+	uint32_t	bppu;	/* accessible bpp */
-	u_int32_t	planes;
+	uint32_t	planes;
-	u_int8_t	name[STI_DEVNAME_LEN];
+	uint8_t		name[STI_DEVNAME_LEN];
-	u_int32_t	attributes;
+	uint32_t	attributes;
 #define	STI_INQCONF_Y2X		0x0001	/* pixel is higher tan wider */
 #define	STI_INQCONF_HWBLKMV	0x0002	/* hw blkmv is present */
 #define	STI_INQCONF_AHW		0x0004	/* adv hw accel */
 #define	STI_INQCONF_INT		0x0008	/* can interrupt */
 #define	STI_INQCONF_GONOFF	0x0010	/* supports on/off */
 #define	STI_INQCONF_AONOFF	0x0020	/* supports alpha on/off */
 #define	STI_INQCONF_VARY	0x0040	/* variable fb height */
 #define	STI_INQCONF_ODDBYTES	0x0080	/* use only odd fb bytes */
 #define	STI_INQCONF_FLUSH	0x0100	/* fb cache requires flushing */
 #define	STI_INQCONF_DMA		0x0200	/* supports dma */
 #define	STI_INQCONF_VDMA	0x0400	/* supports vdma */
 #define	STI_INQCONF_YUV1	0x2000	/* supports YUV type 1 */
 #define	STI_INQCONF_YUV2	0x4000	/* supports YUV type 2 */
 #define	STI_INQCONF_BITS \
     "\020\001y2x\002hwblkmv\003ahw\004int\005gonoff\006aonoff\007vary"\
     "\010oddb\011flush\012dma\013vdma\016yuv1\017yuv2"
 	sti_einqconfout_t ext;
 } *sti_inqconfout_t;
 STI_DEP(inqconf);
 typedef struct sti_scmentflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_SCMENTF_WAIT	0x80000000
 	void		*future;
 } *sti_scmentflags_t;
 typedef struct sti_scmentin {
-	u_int32_t	entry;
+	uint32_t	entry;
-	u_int32_t	value;
+	uint32_t	value;
 	void		*future;
 } *sti_scmentin_t;
 typedef struct sti_scmentout {
-	u_int32_t	errno;
+	uint32_t	errno;
 	void		*future;
 } *sti_scmentout_t;
 STI_DEP(scment);
 typedef struct sti_dmacflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_DMACF_WAIT	0x80000000
 #define	STI_DMACF_PRIV	0x40000000	/* priv dma */
 #define	STI_DMACF_DIS	0x20000000	/* disable */
 #define	STI_DMACF_BUF	0x10000000	/* buffered */
 #define	STI_DMACF_MRK	0x08000000	/* write a marker */
 #define	STI_DMACF_ABRT	0x04000000	/* abort dma xfer */
 	void		*future;
 } *sti_dmacflags_t;
 typedef struct sti_dmacin {
-	u_int32_t	pa_upper;
+	uint32_t	pa_upper;
-	u_int32_t	pa_lower;
+	uint32_t	pa_lower;
-	u_int32_t	len;
+	uint32_t	len;
-	u_int32_t	mrk_data;
+	uint32_t	mrk_data;
-	u_int32_t	mrk_off;
+	uint32_t	mrk_off;
 	void		*future;
 } *sti_dmacin_t;
 typedef struct sti_dmacout {
-	u_int32_t	errno;
+	uint32_t	errno;
 	void		*future;
 } *sti_dmacout_t;
 STI_DEP(dmac);
 typedef struct sti_flowcflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_FLOWCF_WAIT	0x80000000
 #define	STI_FLOWCF_CHW	0x40000000	/* check high water */
 #define	STI_FLOWCF_WHW	0x20000000	/* write high water */
 #define	STI_FLOWCF_WLW	0x10000000	/* write low water */
 #define	STI_FLOWCF_PCSE	0x08000000	/* preserve cse */
 #define	STI_FLOWCF_CSE	0x04000000
 #define	STI_FLOWCF_CSWF	0x02000000	/* cs write fine */
 #define	STI_FLOWCF_CSWC	0x01000000	/* cs write coarse */
 #define	STI_FLOWCF_CSWQ	0x00800000	/* cs write fifo */
 	void		*future;
 } *sti_flowcflags_t;
 typedef struct sti_flowcin {
-	u_int32_t	retry;
+	uint32_t	retry;
-	u_int32_t	bufz;
+	uint32_t	bufz;
-	u_int32_t	hwcnt;
+	uint32_t	hwcnt;
-	u_int32_t	lwcnt;
+	uint32_t	lwcnt;
-	u_int32_t	csfv;	/* cs fine value */
+	uint32_t	csfv;	/* cs fine value */
-	u_int32_t	cscv;	/* cs coarse value */
+	uint32_t	cscv;	/* cs coarse value */
-	u_int32_t	csqc;	/* cs fifo count */
+	uint32_t	csqc;	/* cs fifo count */
 	void		*future;
 } *sti_flowcin_t;
 typedef struct sti_flowcout {
-	u_int32_t	errno;
+	uint32_t	errno;
-	u_int32_t	retry_result;
+	uint32_t	retry_result;
-	u_int32_t	fifo_size;
+	uint32_t	fifo_size;
 	void		*future;
 } *sti_flowcout_t;
 STI_DEP(flowc);
 typedef struct sti_utimingflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_UTIMF_WAIT	0x80000000
 #define	STI_UTIMF_HKS	0x40000000	/* has kbuf_size */
 	void		*future;
 } *sti_utimingflags_t;
 typedef struct sti_utimingin {
 	void		*data;
 	void		*kbuf;
 	void		*future;
 } *sti_utimingin_t;
 typedef struct sti_utimingout {
-	u_int32_t	errno;
+	uint32_t	errno;
-	u_int32_t	kbuf_size;	/* buffer required size */
+	uint32_t	kbuf_size;	/* buffer required size */
 	void		*future;
 } *sti_utimingout_t;
 STI_DEP(utiming);
 typedef struct sti_pmgrflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_UTIMF_WAIT	0x80000000
 #define	STI_UTIMOP_CLEANUP	0x00000000
 #define	STI_UTIMOP_BAC		0x10000000
 #define	STI_UTIMF_CRIT	0x04000000
 #define	STI_UTIMF_BUFF	0x02000000
 #define	STI_UTIMF_IBUFF	0x01000000
 	void		*future;
 } *sti_pmgrflags_t;
 typedef struct sti_pmgrin {
-	u_int32_t	reserved[4];
+	uint32_t	reserved[4];
 	void		*future;
 } *sti_pmgrin_t;
 typedef struct sti_pmgrout {
 	int32_t		errno;
 	void		*future;
 } *sti_pmgrout_t;
 STI_DEP(pmgr);
 typedef struct sti_utilflags {
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	STI_UTILF_ROOT	0x80000000	/* was called as root */
 	void		*future;
 } *sti_utilflags_t;
 typedef struct sti_utilin {
-	u_int32_t	in_size;
+	uint32_t	in_size;
-	u_int32_t	out_size;
+	uint32_t	out_size;
-	u_int8_t	*buf;
+	uint8_t		*buf;
 } *sti_utilin_t;
 typedef struct sti_utilout {
 	int32_t		errno;
 	void		*future;
 } *sti_utilout_t;
 STI_DEP(util);
 #pragma pack()
 #endif /* _IC_STIREG_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: stivar.h,v 1.4 2010/10/31 15:47:53 skrll Exp $	*/
+/*	$NetBSD: stivar.h,v 1.5 2010/11/01 06:41:50 skrll Exp $	*/
 /*	$OpenBSD: stivar.h,v 1.15 2003/12/16 06:07:13 mickey Exp $	*/
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -48,27 +48,27 @@ struct sti_softc {
 	bus_space_handle_t romh;
 	bus_addr_t base, fbaddr;
 	bus_size_t fblen;
 	struct sti_dd sc_dd;		/* in word format */
 	struct sti_font sc_curfont;
 	struct sti_cfg sc_cfg;
 	struct sti_ecfg sc_ecfg;
 	void	*sc_romfont;		/* ROM font copy, either in memory... */
 	u_int	sc_fontmaxcol;		/* ...or in off-screen frame buffer */
 	u_int	sc_fontbase;
-	u_int8_t sc_rcmap[STI_NCMAP], sc_gcmap[STI_NCMAP], sc_bcmap[STI_NCMAP];
+	uint8_t sc_rcmap[STI_NCMAP], sc_gcmap[STI_NCMAP], sc_bcmap[STI_NCMAP];
 	vaddr_t	sc_code;
 	sti_init_t	init;
 	sti_mgmt_t	mgmt;
 	sti_unpmv_t	unpmv;
 	sti_blkmv_t	blkmv;
 	sti_test_t	test;
 	sti_exhdl_t	exhdl;
 	sti_inqconf_t	inqconf;
 	sti_scment_t	scment;
 	sti_dmac_t	dmac;
 	sti_flowc_t	flowc;
 	sti_utiming_t	utiming;