Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/rasops fix compile failure.



details:   https://anonhg.NetBSD.org/src/rev/d0a48cae6727
branches:  trunk
changeset: 754571:d0a48cae6727
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue May 04 12:36:37 2010 +0000

description:
fix compile failure.

diffstat:

 sys/dev/rasops/rasops2.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 64824ca8769b -r d0a48cae6727 sys/dev/rasops/rasops2.c
--- a/sys/dev/rasops/rasops2.c  Tue May 04 12:20:50 2010 +0000
+++ b/sys/dev/rasops/rasops2.c  Tue May 04 12:36:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rasops2.c,v 1.15 2010/05/04 04:57:34 macallan Exp $    */
+/*     $NetBSD: rasops2.c,v 1.16 2010/05/04 12:36:37 nonaka Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.15 2010/05/04 04:57:34 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.16 2010/05/04 12:36:37 nonaka Exp $");
 
 #include "opt_rasops.h"
 
@@ -102,7 +102,7 @@
 rasops2_putchar(void *cookie, int row, int col, u_int uc, long attr)
 {
        int height, width, fs, rs, fb, bg, fg, lmask, rmask;
-       struct rasops_info *ri;
+       struct rasops_info *ri = (struct rasops_info *)cookie;
        struct wsdisplay_font *font = PICK_FONT(ri, uc);
        int32_t *rp;
        u_char *fr;
@@ -244,7 +244,7 @@
 static void
 rasops2_putchar8(void *cookie, int row, int col, u_int uc, long attr)
 {
-       struct rasops_info *ri;
+       struct rasops_info *ri = (struct rasops_info *)cookie;
        struct wsdisplay_font *font = PICK_FONT(ri, uc);
        int height, fs, rs;
        u_char *fr, *rp;
@@ -311,7 +311,7 @@
 static void
 rasops2_putchar12(void *cookie, int row, int col, u_int uc, long attr)
 {
-       struct rasops_info *ri;
+       struct rasops_info *ri = (struct rasops_info *)cookie;
        struct wsdisplay_font *font = PICK_FONT(ri, uc);
        int height, fs, rs;
        u_char *fr, *rp;
@@ -381,7 +381,7 @@
 static void
 rasops2_putchar16(void *cookie, int row, int col, u_int uc, long attr)
 {
-       struct rasops_info *ri;
+       struct rasops_info *ri = (struct rasops_info *)cookie;
        struct wsdisplay_font *font = PICK_FONT(ri, uc);
        int height, fs, rs;
        u_char *fr, *rp;



Home | Main Index | Thread Index | Old Index