From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 03:48:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1A6A13F; Sat, 18 Jan 2014 03:48:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 923E61791; Sat, 18 Jan 2014 03:48:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0I3mY9t046301; Sat, 18 Jan 2014 03:48:34 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0I3mYxp046300; Sat, 18 Jan 2014 03:48:34 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401180348.s0I3mYxp046300@svn.freebsd.org> From: Justin Hibbits Date: Sat, 18 Jan 2014 03:48:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260841 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 03:48:34 -0000 Author: jhibbits Date: Sat Jan 18 03:48:34 2014 New Revision: 260841 URL: http://svnweb.freebsd.org/changeset/base/260841 Log: Be consistent in softc member names, use the sc_ prefix. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sat Jan 18 03:45:07 2014 (r260840) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sat Jan 18 03:48:34 2014 (r260841) @@ -727,16 +727,16 @@ pmu_intr(void *arg) } if (resp[1] & PMU_INT_ENVIRONMENT) { /* if the lid was just closed, notify devd. */ - if ((resp[2] & PMU_ENV_LID_CLOSED) && (!sc->lid_closed)) { - sc->lid_closed = 1; + if ((resp[2] & PMU_ENV_LID_CLOSED) && (!sc->sc_lid_closed)) { + sc->sc_lid_closed = 1; if (devctl_process_running()) devctl_notify("PMU", "lid", "close", NULL); } - else if (!(resp[2] & PMU_ENV_LID_CLOSED) && (sc->lid_closed)) { + else if (!(resp[2] & PMU_ENV_LID_CLOSED) && (sc->sc_lid_closed)) { /* if the lid was just opened, notify devd. */ if (devctl_process_running()) devctl_notify("PMU", "lid", "open", NULL); - sc->lid_closed = 0; + sc->sc_lid_closed = 0; } } } @@ -1045,29 +1045,29 @@ pmu_settime(device_t dev, struct timespe static void pmu_save_state(struct pmu_softc *sc) { - sc->saved_regs[0] = pmu_read_reg(sc, vBufA); - sc->saved_regs[1] = pmu_read_reg(sc, vDirA); - sc->saved_regs[2] = pmu_read_reg(sc, vBufB); - sc->saved_regs[3] = pmu_read_reg(sc, vDirB); - sc->saved_regs[4] = pmu_read_reg(sc, vPCR); - sc->saved_regs[5] = pmu_read_reg(sc, vACR); - sc->saved_regs[6] = pmu_read_reg(sc, vIER); - sc->saved_regs[7] = pmu_read_reg(sc, vT1C); - sc->saved_regs[8] = pmu_read_reg(sc, vT1CH); + sc->sc_saved_regs[0] = pmu_read_reg(sc, vBufA); + sc->sc_saved_regs[1] = pmu_read_reg(sc, vDirA); + sc->sc_saved_regs[2] = pmu_read_reg(sc, vBufB); + sc->sc_saved_regs[3] = pmu_read_reg(sc, vDirB); + sc->sc_saved_regs[4] = pmu_read_reg(sc, vPCR); + sc->sc_saved_regs[5] = pmu_read_reg(sc, vACR); + sc->sc_saved_regs[6] = pmu_read_reg(sc, vIER); + sc->sc_saved_regs[7] = pmu_read_reg(sc, vT1C); + sc->sc_saved_regs[8] = pmu_read_reg(sc, vT1CH); } static void pmu_restore_state(struct pmu_softc *sc) { - pmu_write_reg(sc, vBufA, sc->saved_regs[0]); - pmu_write_reg(sc, vDirA, sc->saved_regs[1]); - pmu_write_reg(sc, vBufB, sc->saved_regs[2]); - pmu_write_reg(sc, vDirB, sc->saved_regs[3]); - pmu_write_reg(sc, vPCR, sc->saved_regs[4]); - pmu_write_reg(sc, vACR, sc->saved_regs[5]); - pmu_write_reg(sc, vIER, sc->saved_regs[6]); - pmu_write_reg(sc, vT1C, sc->saved_regs[7]); - pmu_write_reg(sc, vT1CH, sc->saved_regs[8]); + pmu_write_reg(sc, vBufA, sc->sc_saved_regs[0]); + pmu_write_reg(sc, vDirA, sc->sc_saved_regs[1]); + pmu_write_reg(sc, vBufB, sc->sc_saved_regs[2]); + pmu_write_reg(sc, vDirB, sc->sc_saved_regs[3]); + pmu_write_reg(sc, vPCR, sc->sc_saved_regs[4]); + pmu_write_reg(sc, vACR, sc->sc_saved_regs[5]); + pmu_write_reg(sc, vIER, sc->sc_saved_regs[6]); + pmu_write_reg(sc, vT1C, sc->sc_saved_regs[7]); + pmu_write_reg(sc, vT1CH, sc->sc_saved_regs[8]); } static int