Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbarm/rpi make global variables static



details:   https://anonhg.NetBSD.org/src/rev/16eace98c037
branches:  trunk
changeset: 332571:16eace98c037
user:      macallan <macallan%NetBSD.org@localhost>
date:      Sun Sep 28 15:39:36 2014 +0000

description:
make global variables static
also, make cursor test pattern red/green to highlight RGB vs. BGR

diffstat:

 sys/arch/evbarm/rpi/rpi_machdep.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 62907e15488e -r 16eace98c037 sys/arch/evbarm/rpi/rpi_machdep.c
--- a/sys/arch/evbarm/rpi/rpi_machdep.c Sun Sep 28 14:38:29 2014 +0000
+++ b/sys/arch/evbarm/rpi/rpi_machdep.c Sun Sep 28 15:39:36 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpi_machdep.c,v 1.48 2014/09/28 14:38:29 macallan Exp $        */
+/*     $NetBSD: rpi_machdep.c,v 1.49 2014/09/28 15:39:36 macallan Exp $        */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.48 2014/09/28 14:38:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.49 2014/09/28 15:39:36 macallan Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
@@ -382,13 +382,13 @@
 extern void bcmgenfb_ddb_trap_callback(int where);
 static int     rpi_ioctl(void *, void *, u_long, void *, int, lwp_t *);
 
-int rpi_video_on = WSDISPLAYIO_VIDEO_ON;
-uint32_t hcursor = 0;
-bus_addr_t pcursor = 0;
-uint32_t *cmem = NULL;
-int cursor_x = 0, cursor_y = 0, hot_x = 0, hot_y = 0, cursor_on = 0;
-uint32_t cursor_cmap[4];
-uint8_t cursor_mask[8 * 64], cursor_bitmap[8 * 64];
+static int rpi_video_on = WSDISPLAYIO_VIDEO_ON;
+static uint32_t hcursor = 0;
+static bus_addr_t pcursor = 0;
+static uint32_t *cmem = NULL;
+static int cursor_x = 0, cursor_y = 0, hot_x = 0, hot_y = 0, cursor_on = 0;
+static uint32_t cursor_cmap[4];
+static uint8_t cursor_mask[8 * 64], cursor_bitmap[8 * 64];
 #endif
 
 
@@ -845,7 +845,7 @@
                for (j = 0; j < 64; j++) {
                        for (i = 0; i < 64; i++) {
                                cmem[i + k] = 
-                                ((i & 8) ^ (j & 8)) ? 0xa0ff0000 : 0xa00000ff;
+                                ((i & 8) ^ (j & 8)) ? 0xa0ff0000 : 0xa000ff00;
                        }
                        k += 64;
                }



Home | Main Index | Thread Index | Old Index