Deleted Added
full compact
acpi_ec.c (173480) acpi_ec.c (189903)
1/*-
2 * Copyright (c) 2003-2007 Nate Lawson
3 * Copyright (c) 2000 Michael Smith
4 * Copyright (c) 2000 BSDi
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003-2007 Nate Lawson
3 * Copyright (c) 2000 Michael Smith
4 * Copyright (c) 2000 BSDi
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_ec.c 173480 2007-11-08 21:20:34Z njl $");
30__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_ec.c 189903 2009-03-17 00:48:11Z jkim $");
31
32#include "opt_acpi.h"
33#include <sys/param.h>
34#include <sys/kernel.h>
35#include <sys/bus.h>
36#include <sys/lock.h>
37#include <sys/malloc.h>
38#include <sys/module.h>

--- 703 unchanged lines hidden (view full) ---

742 *Value = 0;
743 EcAddr = Address;
744 Status = AE_ERROR;
745
746 /*
747 * If booting, check if we need to run the query handler. If so, we
748 * we call it directly here since our thread taskq is not active yet.
749 */
31
32#include "opt_acpi.h"
33#include <sys/param.h>
34#include <sys/kernel.h>
35#include <sys/bus.h>
36#include <sys/lock.h>
37#include <sys/malloc.h>
38#include <sys/module.h>

--- 703 unchanged lines hidden (view full) ---

742 *Value = 0;
743 EcAddr = Address;
744 Status = AE_ERROR;
745
746 /*
747 * If booting, check if we need to run the query handler. If so, we
748 * we call it directly here since our thread taskq is not active yet.
749 */
750 if (cold || rebooting) {
750 if (cold || rebooting || sc->ec_suspending) {
751 if ((EC_GET_CSR(sc) & EC_EVENT_SCI)) {
752 CTR0(KTR_ACPI, "ec running gpe handler directly");
753 EcGpeQueryHandler(sc);
754 }
755 }
756
757 /* Serialize with EcGpeQueryHandler() at transaction granularity. */
758 Status = EcLock(sc);

--- 285 unchanged lines hidden ---
751 if ((EC_GET_CSR(sc) & EC_EVENT_SCI)) {
752 CTR0(KTR_ACPI, "ec running gpe handler directly");
753 EcGpeQueryHandler(sc);
754 }
755 }
756
757 /* Serialize with EcGpeQueryHandler() at transaction granularity. */
758 Status = EcLock(sc);

--- 285 unchanged lines hidden ---