Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/tc u_intNN_t -> uintNN_t
details: https://anonhg.NetBSD.org/src/rev/77f339a26d00
branches: trunk
changeset: 746889:77f339a26d00
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Aug 22 17:38:06 2009 +0000
description:
u_intNN_t -> uintNN_t
diffstat:
sys/dev/tc/bba.c | 8 +-
sys/dev/tc/cfb.c | 52 ++++++++--------
sys/dev/tc/mfb.c | 34 +++++-----
sys/dev/tc/px.c | 26 ++++----
sys/dev/tc/pxg.c | 50 +++++++-------
sys/dev/tc/sfb.c | 72 +++++++++++-----------
sys/dev/tc/sfbplus.c | 164 +++++++++++++++++++++++++-------------------------
sys/dev/tc/stic.c | 66 ++++++++++----------
sys/dev/tc/tcds.c | 20 +++---
sys/dev/tc/tfb.c | 66 ++++++++++----------
sys/dev/tc/xcfb.c | 64 +++++++++---------
11 files changed, 311 insertions(+), 311 deletions(-)
diffs (truncated from 1890 to 300 lines):
diff -r 6b20b1574f99 -r 77f339a26d00 sys/dev/tc/bba.c
--- a/sys/dev/tc/bba.c Sat Aug 22 17:36:12 2009 +0000
+++ b/sys/dev/tc/bba.c Sat Aug 22 17:38:06 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */
+/* $NetBSD: bba.c,v 1.37 2009/08/22 17:38:06 tsutsui Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
/* maxine/alpha baseboard audio (bba) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.37 2009/08/22 17:38:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@
static int bba_intr(void *);
static void bba_reset(struct bba_softc *, int);
-static void bba_codec_dwrite(struct am7930_softc *, int, u_int8_t);
+static void bba_codec_dwrite(struct am7930_softc *, int, uint8_t);
static uint8_t bba_codec_dread(struct am7930_softc *, int);
static int
@@ -513,7 +513,7 @@
struct bba_softc *sc;
struct bba_dma_state *d;
tc_addr_t phys, nphys;
- u_int32_t ssr;
+ uint32_t ssr;
int state = 0;
DPRINTF(("bba_trigger_input: sc=%p start=%p end=%p blksize=%d intr=%p(%p)\n",
diff -r 6b20b1574f99 -r 77f339a26d00 sys/dev/tc/cfb.c
--- a/sys/dev/tc/cfb.c Sat Aug 22 17:36:12 2009 +0000
+++ b/sys/dev/tc/cfb.c Sat Aug 22 17:38:06 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.56 2008/12/17 20:51:34 cegger Exp $ */
+/* $NetBSD: cfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.56 2008/12/17 20:51:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,18 +68,18 @@
* adjacent each other in a word, i.e.,
* struct bt459triplet {
* struct {
- * u_int8_t u0;
- * u_int8_t u1;
- * u_int8_t u2;
+ * uint8_t u0;
+ * uint8_t u1;
+ * uint8_t u2;
* unsigned :8;
* } bt_lo;
* ...
* Although CX has single Bt459, 32bit R/W can be done w/o any trouble.
* struct bt459reg {
- * u_int32_t bt_lo;
- * u_int32_t bt_hi;
- * u_int32_t bt_reg;
- * u_int32_t bt_cmap;
+ * uint32_t bt_lo;
+ * uint32_t bt_hi;
+ * uint32_t bt_reg;
+ * uint32_t bt_cmap;
* };
*/
@@ -90,7 +90,7 @@
#define bt_cmap 0xc
#define REGWRITE32(p,i,v) do { \
- *(volatile u_int32_t *)((p) + (i)) = (v); tc_wmb(); \
+ *(volatile uint32_t *)((p) + (i)) = (v); tc_wmb(); \
} while (0)
#define VDACSELECT(p,r) do { \
REGWRITE32(p, bt_lo, 0xff & (r)); \
@@ -99,9 +99,9 @@
struct hwcmap256 {
#define CMAP_SIZE 256 /* 256 R/G/B entries */
- u_int8_t r[CMAP_SIZE];
- u_int8_t g[CMAP_SIZE];
- u_int8_t b[CMAP_SIZE];
+ uint8_t r[CMAP_SIZE];
+ uint8_t g[CMAP_SIZE];
+ uint8_t b[CMAP_SIZE];
};
struct hwcursor64 {
@@ -110,9 +110,9 @@
struct wsdisplay_curpos cc_size;
struct wsdisplay_curpos cc_magic;
#define CURSOR_MAX_SIZE 64
- u_int8_t cc_color[6];
- u_int64_t cc_image[CURSOR_MAX_SIZE];
- u_int64_t cc_mask[CURSOR_MAX_SIZE];
+ uint8_t cc_color[6];
+ uint64_t cc_image[CURSOR_MAX_SIZE];
+ uint64_t cc_mask[CURSOR_MAX_SIZE];
};
struct cfb_softc {
@@ -197,7 +197,7 @@
* 3 2 1 0 3 2 1 0 0 0 1 1 2 2 3 3
* 7 6 5 4 7 6 5 4 4 4 5 5 6 6 7 7
*/
-static const u_int8_t shuffle[256] = {
+static const uint8_t shuffle[256] = {
0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54,
0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55,
0x80, 0xc0, 0x90, 0xd0, 0x84, 0xc4, 0x94, 0xd4,
@@ -281,7 +281,7 @@
tc_intr_establish(parent, ta->ta_cookie, IPL_TTY, cfbintr, sc);
/* clear any pending interrupts */
- *(volatile u_int8_t *)((char *)ri->ri_hw + CX_OFFSET_IREQ) = 0;
+ *(volatile uint8_t *)((char *)ri->ri_hw + CX_OFFSET_IREQ) = 0;
waa.console = console;
waa.scrdata = &cfb_screenlist;
@@ -295,7 +295,7 @@
cfb_cmap_init(struct cfb_softc *sc)
{
struct hwcmap256 *cm;
- const u_int8_t *p;
+ const uint8_t *p;
int index;
cm = &sc->sc_cmap;
@@ -504,7 +504,7 @@
int v;
base = (void *)sc->sc_ri->ri_hw;
- *(u_int8_t *)(base + CX_OFFSET_IREQ) = 0;
+ *(uint8_t *)(base + CX_OFFSET_IREQ) = 0;
if (sc->sc_changed == 0)
return (1);
@@ -530,7 +530,7 @@
REGWRITE32(vdac, bt_reg, y >> 8);
}
if (v & WSDISPLAY_CURSOR_DOCMAP) {
- u_int8_t *cp = sc->sc_cursor.cc_color;
+ uint8_t *cp = sc->sc_cursor.cc_color;
VDACSELECT(vdac, BT459_IREG_CCOLOR_2);
REGWRITE32(vdac, bt_reg, cp[1]);
@@ -542,12 +542,12 @@
REGWRITE32(vdac, bt_reg, cp[4]);
}
if (v & WSDISPLAY_CURSOR_DOSHAPE) {
- u_int8_t *ip, *mp, img, msk;
- u_int8_t u;
+ uint8_t *ip, *mp, img, msk;
+ uint8_t u;
int bcnt;
- ip = (u_int8_t *)sc->sc_cursor.cc_image;
- mp = (u_int8_t *)sc->sc_cursor.cc_mask;
+ ip = (uint8_t *)sc->sc_cursor.cc_image;
+ mp = (uint8_t *)sc->sc_cursor.cc_mask;
bcnt = 0;
VDACSELECT(vdac, BT459_IREG_CRAM_BASE+0);
@@ -595,7 +595,7 @@
cfbhwinit(void *cfbbase)
{
char *vdac = (char *)cfbbase + CX_BT459_OFFSET;
- const u_int8_t *p;
+ const uint8_t *p;
int i;
VDACSELECT(vdac, BT459_IREG_COMMAND_0);
diff -r 6b20b1574f99 -r 77f339a26d00 sys/dev/tc/mfb.c
--- a/sys/dev/tc/mfb.c Sat Aug 22 17:36:12 2009 +0000
+++ b/sys/dev/tc/mfb.c Sat Aug 22 17:38:06 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.53 2008/12/17 20:51:35 cegger Exp $ */
+/* $NetBSD: mfb.c,v 1.54 2009/08/22 17:38:06 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.53 2008/12/17 20:51:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.54 2009/08/22 17:38:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@
#define bt_ctl 0xc
#define REGWRITE32(p,i,v) do { \
- *(volatile u_int32_t *)((p) + (i)) = (v); tc_wmb(); \
+ *(volatile uint32_t *)((p) + (i)) = (v); tc_wmb(); \
} while (0)
#define SELECT455(p,r) do { \
@@ -98,9 +98,9 @@
struct wsdisplay_curpos cc_size;
struct wsdisplay_curpos cc_magic;
#define CURSOR_MAX_SIZE 64
- u_int8_t cc_color[6];
- u_int64_t cc_image[CURSOR_MAX_SIZE];
- u_int64_t cc_mask[CURSOR_MAX_SIZE];
+ uint8_t cc_color[6];
+ uint64_t cc_image[CURSOR_MAX_SIZE];
+ uint64_t cc_mask[CURSOR_MAX_SIZE];
};
struct mfb_softc {
@@ -175,7 +175,7 @@
static void set_curpos(struct mfb_softc *, struct wsdisplay_curpos *);
/* bit order reverse */
-static const u_int8_t flip[256] = {
+static const uint8_t flip[256] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
@@ -259,9 +259,9 @@
tc_intr_establish(parent, ta->ta_cookie, IPL_TTY, mfbintr, sc);
/* clear any pending interrupts */
- *(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 0;
- junk = *(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET);
- *(u_int8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 1;
+ *(uint8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 0;
+ junk = *(uint8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET);
+ *(uint8_t *)((char *)ri->ri_hw + MX_IREQ_OFFSET) = 1;
waa.console = console;
waa.scrdata = &mfb_screenlist;
@@ -469,9 +469,9 @@
volatile register int junk;
base = (void *)sc->sc_ri->ri_hw;
- junk = *(u_int8_t *)(base + MX_IREQ_OFFSET);
+ junk = *(uint8_t *)(base + MX_IREQ_OFFSET);
#if 0
- *(u_int8_t *)(base + MX_IREQ_OFFSET) = 0;
+ *(uint8_t *)(base + MX_IREQ_OFFSET) = 0;
#endif
if (sc->sc_changed == 0)
return (1);
@@ -488,7 +488,7 @@
}
if (v & (WSDISPLAY_CURSOR_DOPOS | WSDISPLAY_CURSOR_DOHOT)) {
int x, y;
- u_int32_t twin;
+ uint32_t twin;
x = sc->sc_cursor.cc_pos.x - sc->sc_cursor.cc_hot.x;
y = sc->sc_cursor.cc_pos.y - sc->sc_cursor.cc_hot.y;
@@ -503,7 +503,7 @@
REGWRITE32(curs, bt_ctl, TWIN_HI(y));
}
if (v & WSDISPLAY_CURSOR_DOCMAP) {
- u_int8_t *cp = sc->sc_cursor.cc_color;
+ uint8_t *cp = sc->sc_cursor.cc_color;
SELECT455(vdac, 8);
REGWRITE32(vdac, bt_cmap, 0);
@@ -519,11 +519,11 @@
REGWRITE32(vdac, bt_ovly, 0);
}
if (v & WSDISPLAY_CURSOR_DOSHAPE) {
- u_int8_t *ip, *mp, img, msk;
+ uint8_t *ip, *mp, img, msk;
int bcnt;
- ip = (u_int8_t *)sc->sc_cursor.cc_image;
- mp = (u_int8_t *)sc->sc_cursor.cc_mask;
+ ip = (uint8_t *)sc->sc_cursor.cc_image;
+ mp = (uint8_t *)sc->sc_cursor.cc_mask;
bcnt = 0;
SELECT431(curs, BT431_REG_CRAM_BASE);
diff -r 6b20b1574f99 -r 77f339a26d00 sys/dev/tc/px.c
--- a/sys/dev/tc/px.c Sat Aug 22 17:36:12 2009 +0000
+++ b/sys/dev/tc/px.c Sat Aug 22 17:38:06 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */
+/* $NetBSD: px.c,v 1.37 2009/08/22 17:38:06 tsutsui Exp $ */
Home |
Main Index |
Thread Index |
Old Index