[src/trunk]: src/sys/dev/ic Fix

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79fcc8b87f81
branches:  trunk
changeset: 767198:79fcc8b87f81
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jul 11 02:30:49 2011 +0000

description:
Fix
    error: new qualifiers in middle of multi-level non-const cast are unsafe
by defining the type correctly thereby avoid the cast.

diffstat:

 sys/dev/ic/sti.c    |  7 +++----
 sys/dev/ic/stivar.h |  4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 0b975d19afb9 -r 79fcc8b87f81 sys/dev/ic/sti.c
--- a/sys/dev/ic/sti.c  Mon Jul 11 01:24:34 2011 +0000
+++ b/sys/dev/ic/sti.c  Mon Jul 11 02:30:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $ */
+/*     $NetBSD: sti.c,v 1.16 2011/07/11 02:30:49 matt Exp $    */
 
 /*     $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $   */
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.16 2011/07/11 02:30:49 matt Exp $");
 
 #include "wsdisplay.h"
 
@@ -640,8 +640,7 @@
 
        scr->scr_scrlist[0] = &scr->scr_wsd;
        scr->scr_screenlist.nscreens = 1;
-       scr->scr_screenlist.screens =
-           (const struct wsscreen_descr **)scr->scr_scrlist;
+       scr->scr_screenlist.screens = scr->scr_scrlist;
 
        return 0;
 
diff -r 0b975d19afb9 -r 79fcc8b87f81 sys/dev/ic/stivar.h
--- a/sys/dev/ic/stivar.h       Mon Jul 11 01:24:34 2011 +0000
+++ b/sys/dev/ic/stivar.h       Mon Jul 11 02:30:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stivar.h,v 1.6 2010/11/09 12:24:48 skrll Exp $ */
+/*     $NetBSD: stivar.h,v 1.7 2011/07/11 02:30:49 matt Exp $  */
 
 /*     $OpenBSD: stivar.h,v 1.24 2009/02/06 22:51:04 miod Exp $        */
 
@@ -96,7 +96,7 @@
        int                      scr_nscreens;
        u_int                    scr_wsmode;
        struct  wsscreen_descr   scr_wsd;
-       struct  wsscreen_descr  *scr_scrlist[1];
+       const struct wsscreen_descr     *scr_scrlist[1];
        struct  wsscreen_list    scr_screenlist;
 };