Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/luna68k/dev Add consistent prefix to a softc member...



details:   https://anonhg.NetBSD.org/src/rev/0c8c54f53878
branches:  trunk
changeset: 797612:0c8c54f53878
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jul 24 14:09:09 2014 +0000

description:
Add consistent prefix to a softc member name.

diffstat:

 sys/arch/luna68k/dev/lunafb.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r 553853aaa7f4 -r 0c8c54f53878 sys/arch/luna68k/dev/lunafb.c
--- a/sys/arch/luna68k/dev/lunafb.c     Thu Jul 24 13:42:28 2014 +0000
+++ b/sys/arch/luna68k/dev/lunafb.c     Thu Jul 24 14:09:09 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.33 2014/07/18 18:17:54 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.34 2014/07/24 14:09:09 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.33 2014/07/18 18:17:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.34 2014/07/24 14:09:09 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,7 @@
 struct omfb_softc {
        device_t sc_dev;                /* base device */
        struct om_hwdevconfig *sc_dc;   /* device configuration */
-       int nscreens;
+       int sc_nscreens;
 };
 
 static int  omgetcmap(struct omfb_softc *, struct wsdisplay_cmap *);
@@ -204,7 +204,7 @@
 
        if (omfb_console) {
                sc->sc_dc = &omfb_console_dc;
-               sc->nscreens = 1;
+               sc->sc_nscreens = 1;
        } else {
                sc->sc_dc = kmem_zalloc(sizeof(struct om_hwdevconfig),
                    KM_SLEEP);
@@ -497,14 +497,14 @@
        struct omfb_softc *sc = v;
        struct rasops_info *ri = &sc->sc_dc->dc_ri;
 
-       if (sc->nscreens > 0)
+       if (sc->sc_nscreens > 0)
                return ENOMEM;
 
        *cookiep = ri;
        *curxp = 0;
        *curyp = 0;
        (*ri->ri_ops.allocattr)(ri, 0, 0, 0, attrp);
-       sc->nscreens++;
+       sc->sc_nscreens++;
        return 0;
 }
 
@@ -516,7 +516,7 @@
        if (sc->sc_dc == &omfb_console_dc)
                panic("omfb_free_screen: console");
 
-       sc->nscreens--;
+       sc->sc_nscreens--;
 }
 
 static int



Home | Main Index | Thread Index | Old Index