Module Name: src
Committed By: matt
Date: Tue Jan 31 04:28:03 UTC 2012
Modified Files:
src/sys/dev/rcons: raster_op.c raster_text.c
Log Message:
ANSIfy the prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/rcons/raster_op.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/rcons/raster_text.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/dev/rcons/raster_op.c
diff -u src/sys/dev/rcons/raster_op.c:1.18 src/sys/dev/rcons/raster_op.c:1.19
--- src/sys/dev/rcons/raster_op.c:1.18 Sat Apr 18 15:04:26 2009
+++ src/sys/dev/rcons/raster_op.c Tue Jan 31 04:28:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_op.c,v 1.18 2009/04/18 15:04:26 tsutsui Exp $ */
+/* $NetBSD: raster_op.c,v 1.19 2012/01/31 04:28:02 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.18 2009/04/18 15:04:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.19 2012/01/31 04:28:02 matt Exp $");
#include <sys/types.h>
#ifdef _KERNEL
@@ -555,11 +555,8 @@ static int raster_blit(struct raster *,
/* Performs a bitblit. Returns 0 on success, -1 on failure. */
int
-raster_op( dst, dx, dy, w, h, rop, src, sx, sy )
- struct raster* dst;
- int dx, dy, w, h, rop;
- struct raster* src;
- int sx, sy;
+raster_op(struct raster* dst, int dx, int dy, int w, int h, int rop,
+ struct raster* src, int sx, int sy)
{
if ( dst == (struct raster*) 0 )
return -1; /* no destination */
@@ -640,11 +637,8 @@ raster_op( dst, dx, dy, w, h, rop, src,
** success, -1 on failure.
*/
int
-raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
- struct raster* dst;
- int dx, dy, w, h, rop;
- struct raster* src;
- int sx, sy;
+raster_op_noclip(struct raster* dst, int dx, int dy, int w, int h, int rop,
+ struct raster* src, int sx, int sy)
{
int op;
@@ -1092,9 +1086,8 @@ raster_op_noclip( dst, dx, dy, w, h, rop
** on success, -1 on failure.
*/
int
-raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
- struct raster* dst;
- int dx, dy, w, h, rop;
+raster_op_nosrc_noclip(struct raster* dst,
+ int dx, int dy, int w, int h, int rop)
{
int op;
@@ -1625,14 +1618,13 @@ raster_op_nosrc_noclip( dst, dx, dy, w,
** destination. It's used for both the 1-to-1 and 8-to-8 cases.
*/
static int
-raster_blit( src, srclin1, srcleftignore, srcrightignore, srclongs, dst, dstlin1, dstleftignore, dstrightignore, dstlongs, h, op )
- struct raster* src;
- u_int32_t* srclin1;
- int srcleftignore, srcrightignore, srclongs;
- struct raster* dst;
- u_int32_t* dstlin1;
- int dstleftignore, dstrightignore, dstlongs;
- int h, op;
+raster_blit(
+ struct raster* src, uint32_t* srclin1,
+ int srcleftignore, int srcrightignore, int srclongs,
+ struct raster* dst,
+ uint32_t* dstlin1,
+ int dstleftignore, int dstrightignore, int dstlongs,
+ int h, int op)
{
u_int32_t* srclin2;
u_int32_t* dstlin2;
Index: src/sys/dev/rcons/raster_text.c
diff -u src/sys/dev/rcons/raster_text.c:1.9 src/sys/dev/rcons/raster_text.c:1.10
--- src/sys/dev/rcons/raster_text.c:1.9 Sun Mar 4 06:02:39 2007
+++ src/sys/dev/rcons/raster_text.c Tue Jan 31 04:28:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_text.c,v 1.9 2007/03/04 06:02:39 christos Exp $ */
+/* $NetBSD: raster_text.c,v 1.10 2012/01/31 04:28:03 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.9 2007/03/04 06:02:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.10 2012/01/31 04:28:03 matt Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -61,25 +61,27 @@ __KERNEL_RCSID(0, "$NetBSD: raster_text.
/* Draws text. Returns 0 on success, -1 on failure. */
int
-raster_text( r, x, y, rop, rf, text )
- struct raster* r;
- int x, y;
- int rop;
- struct raster_font* rf;
- unsigned char* text;
+raster_text(
+ struct raster* r,
+ int x,
+ int y,
+ int rop,
+ struct raster_font* rf,
+ unsigned char* text)
{
return raster_textn( r, x, y, rop, rf, text, strlen( text ) );
}
/* Draws n characters of text. Returns 0 on success, -1 on failure. */
int
-raster_textn( r, x, y, rop, rf, text, n )
- struct raster* r;
- int x, y;
- int rop;
- struct raster_font* rf;
- unsigned char* text;
- int n;
+raster_textn(
+ struct raster* r,
+ int x,
+ int y,
+ int rop,
+ struct raster_font* rf,
+ unsigned char* text,
+ int n)
{
int clip;
int x1, y1;
@@ -223,8 +225,10 @@ raster_textn( r, x, y, rop, rf, text, n
#ifdef COLORFONT_CACHE
/* Allocates a raster. Returns (struct raster*) 0 on failure. */
struct raster*
-raster_alloc( width, height, depth )
- int width, height, depth;
+raster_alloc(
+ int width,
+ int height,
+ int depth)
{
struct raster* r;
int linelongs;
