CVS commit: src/sys/dev/sbus

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Sat Sep 19 11:55:10 UTC 2009

Modified Files:
        src/sys/dev/sbus: zx.c zxvar.h

Log Message:
u_intNN_t -> uintNN_t


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sbus/zx.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sbus/zxvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.32 src/sys/dev/sbus/zx.c:1.33
--- src/sys/dev/sbus/zx.c:1.32	Thu Sep 17 16:39:48 2009
+++ src/sys/dev/sbus/zx.c	Sat Sep 19 11:55:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zx.c,v 1.32 2009/09/17 16:39:48 tsutsui Exp $	*/
+/*	$NetBSD: zx.c,v 1.33 2009/09/19 11:55:09 tsutsui Exp $	*/
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.32 2009/09/17 16:39:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.33 2009/09/19 11:55:09 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -235,7 +235,7 @@
 		return;
 	}
 	fb->fb_pixels = (void *)bus_space_vaddr(bt, bh);
-	sc->sc_pixels = (u_int32_t *)fb->fb_pixels;
+	sc->sc_pixels = (uint32_t *)fb->fb_pixels;
 
 	if (sbus_bus_map(bt, sa->sa_slot, sa->sa_offset + ZX_OFF_LC_SS0_USR,
 	    PAGE_SIZE, BUS_SPACE_MAP_LINEAR, &bh) != 0) {
@@ -766,7 +766,7 @@
 static void
 zx_cursor_color(struct zx_softc *sc)
 {
-	u_int8_t tmp;
+	uint8_t tmp;
 
 	bus_space_write_4(sc->sc_bt, sc->sc_bhzcu, zcu_type, 0x50);
 
@@ -991,8 +991,8 @@
 	struct vcons_screen *scr = ri->ri_hw;
 	struct zx_softc *sc = scr->scr_cookie;
 	struct wsdisplay_font *font;
-	volatile u_int32_t *dp;
-	u_int8_t *fb;
+	volatile uint32_t *dp;
+	uint8_t *fb;
 	int fs, i, ul;
 	uint32_t fg, bg;
 	
@@ -1011,10 +1011,10 @@
 
 	font = ri->ri_font;
 
-	dp = (volatile u_int32_t *)sc->sc_pixels +
+	dp = (volatile uint32_t *)sc->sc_pixels +
 	    ((row * font->fontheight + ri->ri_yorigin) << 11) +
 	    (col * font->fontwidth + ri->ri_xorigin);
-	fb = (u_int8_t *)font->data + (uc - font->firstchar) *
+	fb = (uint8_t *)font->data + (uc - font->firstchar) *
 	    ri->ri_fontscale;
 	fs = font->stride;
 
@@ -1035,7 +1035,7 @@
 		}
 	} else {
 		for (i = font->fontheight; i != 0; i--, dp += 2048) {
-			*dp = *((u_int16_t *)fb) << 16;
+			*dp = *((uint16_t *)fb) << 16;
 			fb += fs;
 		}
 	}

Index: src/sys/dev/sbus/zxvar.h
diff -u src/sys/dev/sbus/zxvar.h:1.5 src/sys/dev/sbus/zxvar.h:1.6
--- src/sys/dev/sbus/zxvar.h:1.5	Thu Sep 17 16:28:13 2009
+++ src/sys/dev/sbus/zxvar.h	Sat Sep 19 11:55:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zxvar.h,v 1.5 2009/09/17 16:28:13 tsutsui Exp $	*/
+/*	$NetBSD: zxvar.h,v 1.6 2009/09/19 11:55:09 tsutsui Exp $	*/
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -90,8 +90,8 @@
 	bus_space_handle_t sc_bhzcu;
 
 	int		sc_flags;
-	u_int8_t	*sc_cmap;
-	u_int32_t	*sc_pixels;
+	uint8_t		*sc_cmap;
+	uint32_t	*sc_pixels;
 	bus_addr_t	sc_paddr;
 	int		sc_shiftx;
 	int		sc_shifty;
@@ -99,8 +99,8 @@
 	struct fbcurpos	sc_curpos;
 	struct fbcurpos	sc_curhot;
 	struct fbcurpos sc_cursize;
-	u_int8_t	sc_curcmap[8];
-	u_int32_t	sc_curbits[2][32];
+	uint8_t		sc_curcmap[8];
+	uint32_t	sc_curbits[2][32];
 
 #if NWSDISPLAY > 0	
 	uint32_t sc_width;