diff options
| author | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
| commit | 53524e44efd7c7176da8dc8190a698b2fe184db1 (patch) | |
| tree | 68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/dev/rasops | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/rasops')
| -rw-r--r-- | sys/dev/rasops/rasops.h | 4 | ||||
| -rw-r--r-- | sys/dev/rasops/rasops15.c | 6 | ||||
| -rw-r--r-- | sys/dev/rasops/rasops24.c | 6 | ||||
| -rw-r--r-- | sys/dev/rasops/rasops8.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/rasops/rasops.h b/sys/dev/rasops/rasops.h index a42c3e3283b..7b35f4c715d 100644 --- a/sys/dev/rasops/rasops.h +++ b/sys/dev/rasops/rasops.h @@ -1,4 +1,4 @@ -/* $NetBSD: rasops.h,v 1.20 2007/02/02 02:10:24 ober Exp $ */ +/* $NetBSD: rasops.h,v 1.21 2007/03/04 06:02:39 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ struct rasops_info { #endif }; -#define DELTA(p, d, cast) ((p) = (cast)((caddr_t)(p) + (d))) +#define DELTA(p, d, cast) ((p) = (cast)((char *)(p) + (d))) #define CHAR_IN_FONT(c,font) \ ((c) >= (font)->firstchar && \ diff --git a/sys/dev/rasops/rasops15.c b/sys/dev/rasops/rasops15.c index 8bc26e313b3..14a8e07ac07 100644 --- a/sys/dev/rasops/rasops15.c +++ b/sys/dev/rasops/rasops15.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops15.c,v 1.14 2006/02/18 13:57:33 jmcneill Exp $ */ +/* $NetBSD: rasops15.c,v 1.15 2007/03/04 06:02:39 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.14 2006/02/18 13:57:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.15 2007/03/04 06:02:39 christos Exp $"); #include "opt_rasops.h" @@ -75,7 +75,7 @@ static int stamp_mutex; /* XXX see note in readme */ */ #define STAMP_SHIFT(fb,n) ((n*4-3) >= 0 ? (fb)>>(n*4-3):(fb)<<-(n*4-3)) #define STAMP_MASK (15 << 3) -#define STAMP_READ(o) (*(int32_t *)((caddr_t)stamp + (o))) +#define STAMP_READ(o) (*(int32_t *)((char *)stamp + (o))) #endif /* diff --git a/sys/dev/rasops/rasops24.c b/sys/dev/rasops/rasops24.c index b70dff1a829..6df61b4ff6f 100644 --- a/sys/dev/rasops/rasops24.c +++ b/sys/dev/rasops/rasops24.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops24.c,v 1.22 2006/01/29 21:42:41 dsl Exp $ */ +/* $NetBSD: rasops24.c,v 1.23 2007/03/04 06:02:39 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.22 2006/01/29 21:42:41 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.23 2007/03/04 06:02:39 christos Exp $"); #include "opt_rasops.h" @@ -80,7 +80,7 @@ static int stamp_mutex; /* XXX see note in readme */ */ #define STAMP_SHIFT(fb,n) ((n*4-4) >= 0 ? (fb)>>(n*4-4):(fb)<<-(n*4-4)) #define STAMP_MASK (0xf << 4) -#define STAMP_READ(o) (*(int32_t *)((caddr_t)stamp + (o))) +#define STAMP_READ(o) (*(int32_t *)((void *)stamp + (o))) /* * Initialize rasops_info struct for this colordepth. diff --git a/sys/dev/rasops/rasops8.c b/sys/dev/rasops/rasops8.c index e90fc8575c3..1fe5f08d4ec 100644 --- a/sys/dev/rasops/rasops8.c +++ b/sys/dev/rasops/rasops8.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops8.c,v 1.21 2006/02/18 13:57:33 jmcneill Exp $ */ +/* $NetBSD: rasops8.c,v 1.22 2007/03/04 06:02:39 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.21 2006/02/18 13:57:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.22 2007/03/04 06:02:39 christos Exp $"); #include "opt_rasops.h" @@ -73,7 +73,7 @@ static int stamp_mutex; /* XXX see note in README */ */ #define STAMP_SHIFT(fb,n) ((n*4-2) >= 0 ? (fb)>>(n*4-2):(fb)<<-(n*4-2)) #define STAMP_MASK (0xf << 2) -#define STAMP_READ(o) (*(int32_t *)((caddr_t)stamp + (o))) +#define STAMP_READ(o) (*(int32_t *)((char *)stamp + (o))) /* * Initialize a 'rasops_info' descriptor for this depth. |
