Module Name: src
Committed By: skrll
Date: Thu May 10 09:56:27 UTC 2012
Modified Files:
src/sys/arch/arm/iomd: iomd.c iomdvar.h qms.c vidcvideo.c
Log Message:
u_int*_t -> uint*_t
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/iomd/iomd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/iomd/iomdvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/iomd/qms.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/iomd/vidcvideo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/iomd/iomd.c
diff -u src/sys/arch/arm/iomd/iomd.c:1.17 src/sys/arch/arm/iomd/iomd.c:1.18
--- src/sys/arch/arm/iomd/iomd.c:1.17 Fri Jul 1 20:26:35 2011
+++ src/sys/arch/arm/iomd/iomd.c Thu May 10 09:56:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $ */
+/* $NetBSD: iomd.c,v 1.18 2012/05/10 09:56:27 skrll Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.18 2012/05/10 09:56:27 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,10 +92,10 @@ CFATTACH_DECL(iomd, sizeof(struct iomd_s
extern struct bus_space iomd_bs_tag;
int iomd_found;
-u_int32_t iomd_base = IOMD_BASE;
+uint32_t iomd_base = IOMD_BASE;
/* following flag is used in iomd_irq.s ... has to be cleaned up one day ! */
-u_int32_t arm7500_ioc_found = 0;
+uint32_t arm7500_ioc_found = 0;
/* Declare prototypes */
Index: src/sys/arch/arm/iomd/iomdvar.h
diff -u src/sys/arch/arm/iomd/iomdvar.h:1.3 src/sys/arch/arm/iomd/iomdvar.h:1.4
--- src/sys/arch/arm/iomd/iomdvar.h:1.3 Fri Jul 1 20:26:35 2011
+++ src/sys/arch/arm/iomd/iomdvar.h Thu May 10 09:56:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iomdvar.h,v 1.3 2011/07/01 20:26:35 dyoung Exp $ */
+/* $NetBSD: iomdvar.h,v 1.4 2012/05/10 09:56:27 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -119,6 +119,6 @@ union iomd_attach_args {
/*
* IOMD_BASE register variable
*/
-extern u_int32_t iomd_base;
+extern uint32_t iomd_base;
/* End of iomdvar.h */
Index: src/sys/arch/arm/iomd/qms.c
diff -u src/sys/arch/arm/iomd/qms.c:1.16 src/sys/arch/arm/iomd/qms.c:1.17
--- src/sys/arch/arm/iomd/qms.c:1.16 Fri Jul 1 20:26:35 2011
+++ src/sys/arch/arm/iomd/qms.c Thu May 10 09:56:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $ */
+/* $NetBSD: qms.c,v 1.17 2012/05/10 09:56:27 skrll Exp $ */
/*-
* Copyright (c) 2001 Reinoud Zandijk
@@ -41,7 +41,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.17 2012/05/10 09:56:27 skrll Exp $");
#include <sys/callout.h>
#include <sys/device.h>
@@ -74,8 +74,8 @@ struct qms_softc {
struct callout sc_callout;
- u_int16_t lastx;
- u_int16_t lasty;
+ uint16_t lastx;
+ uint16_t lasty;
int lastb;
};
@@ -184,7 +184,7 @@ qms_intr(void *arg)
{
struct qms_softc *sc = arg;
int b;
- u_int16_t x, y;
+ uint16_t x, y;
int16_t dx, dy;
x = bus_space_read_4(sc->sc_iot, sc->sc_ioh, QMS_MOUSEX);
Index: src/sys/arch/arm/iomd/vidcvideo.c
diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.41 src/sys/arch/arm/iomd/vidcvideo.c:1.42
--- src/sys/arch/arm/iomd/vidcvideo.c:1.41 Tue Feb 14 14:33:53 2012
+++ src/sys/arch/arm/iomd/vidcvideo.c Thu May 10 09:56:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.42 2012/05/10 09:56:27 skrll Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@@ -30,7 +30,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.42 2012/05/10 09:56:27 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -607,7 +607,7 @@ vidcvideo_colourmap_and_cursor_init(stru
struct rasops_info *ri = &dc->dc_console.scr_ri;
const u_char *rgbdat;
struct hwcmap256 *cm;
- const u_int8_t *p;
+ const uint8_t *p;
int index;
/* Whatever we do later... just make sure we have a
@@ -718,7 +718,7 @@ set_cursor(struct vidcvideo_softc *sc, s
if (p->size.x > CURSOR_MAX_WIDTH ||
p->size.y > CURSOR_MAX_HEIGHT)
return EINVAL;
- icount = sizeof(u_int32_t) * p->size.y;
+ icount = sizeof(uint32_t) * p->size.y;
error = copyin(p->image, &image, icount);
if (error)
return error;
