Deleted Added
full compact
acpivar.h (128046) acpivar.h (128225)
1/*-
2 * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
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

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
1/*-
2 * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
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

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: head/sys/dev/acpica/acpivar.h 128046 2004-04-09 06:53:50Z njl $
28 * $FreeBSD: head/sys/dev/acpica/acpivar.h 128225 2004-04-14 03:39:08Z njl $
29 */
30
31#include "bus_if.h"
32#include <sys/eventhandler.h>
33#include <sys/sysctl.h>
34#if __FreeBSD_version >= 500000
35#include <sys/lock.h>
36#include <sys/mutex.h>

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

65 int acpi_lid_switch_sx;
66
67 int acpi_standby_sx;
68 int acpi_suspend_sx;
69
70 int acpi_sleep_delay;
71 int acpi_s4bios;
72 int acpi_disable_on_poweroff;
29 */
30
31#include "bus_if.h"
32#include <sys/eventhandler.h>
33#include <sys/sysctl.h>
34#if __FreeBSD_version >= 500000
35#include <sys/lock.h>
36#include <sys/mutex.h>

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

65 int acpi_lid_switch_sx;
66
67 int acpi_standby_sx;
68 int acpi_suspend_sx;
69
70 int acpi_sleep_delay;
71 int acpi_s4bios;
72 int acpi_disable_on_poweroff;
73
74 int acpi_verbose;
75
76 bus_dma_tag_t acpi_waketag;
77 bus_dmamap_t acpi_wakemap;
78 vm_offset_t acpi_wakeaddr;
79 vm_paddr_t acpi_wakephys;
80
81 struct sysctl_ctx_list acpi_battery_sysctl_ctx;
82 struct sysctl_oid *acpi_battery_sysctl_tree;
83};
84
85struct acpi_device {
86 /* ACPI ivars */
87 ACPI_HANDLE ad_handle;
88 int ad_magic;
89 void *ad_private;
90
73 int acpi_verbose;
74
75 bus_dma_tag_t acpi_waketag;
76 bus_dmamap_t acpi_wakemap;
77 vm_offset_t acpi_wakeaddr;
78 vm_paddr_t acpi_wakephys;
79
80 struct sysctl_ctx_list acpi_battery_sysctl_ctx;
81 struct sysctl_oid *acpi_battery_sysctl_tree;
82};
83
84struct acpi_device {
85 /* ACPI ivars */
86 ACPI_HANDLE ad_handle;
87 int ad_magic;
88 void *ad_private;
89
91 /* resources */
90 /* Resources */
92 struct resource_list ad_rl;
93
94};
95
96#if __FreeBSD_version < 500000
97/*
98 * In 4.x, ACPI is protected by splhigh().
99 */

--- 278 unchanged lines hidden ---
91 struct resource_list ad_rl;
92
93};
94
95#if __FreeBSD_version < 500000
96/*
97 * In 4.x, ACPI is protected by splhigh().
98 */

--- 278 unchanged lines hidden ---