Deleted Added
full compact
acpi.c (241856) acpi.c (241885)
1/*-
2 * Copyright (c) 2000 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2000, 2001 Michael Smith
5 * Copyright (c) 2000 BSDi
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2000, 2001 Michael Smith
5 * Copyright (c) 2000 BSDi
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi.c 241856 2012-10-22 03:41:14Z eadler $");
31__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi.c 241885 2012-10-22 13:06:09Z eadler $");
32
33#include "opt_acpi.h"
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/proc.h>
37#include <sys/fcntl.h>
38#include <sys/malloc.h>
39#include <sys/module.h>

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

372 ACPI_PHYSICAL_ADDRESS paddr;
373 struct sbuf sb;
374
375 ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
376
377 if (!cold)
378 return (ENXIO);
379
32
33#include "opt_acpi.h"
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/proc.h>
37#include <sys/fcntl.h>
38#include <sys/malloc.h>
39#include <sys/module.h>

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

372 ACPI_PHYSICAL_ADDRESS paddr;
373 struct sbuf sb;
374
375 ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
376
377 if (!cold)
378 return (ENXIO);
379
380 /* Check that we haven't been disabled with a hint. */
381 if (resource_disabled("acpi", 0))
382 return (ENXIO);
383
380 /* Check for other PM systems. */
381 if (power_pm_get_type() != POWER_PM_TYPE_NONE &&
382 power_pm_get_type() != POWER_PM_TYPE_ACPI) {
383 printf("ACPI identify failed, other PM system enabled.\n");
384 return (ENXIO);
385 }
386
387 /* Initialize root tables. */

--- 3504 unchanged lines hidden ---
384 /* Check for other PM systems. */
385 if (power_pm_get_type() != POWER_PM_TYPE_NONE &&
386 power_pm_get_type() != POWER_PM_TYPE_ACPI) {
387 printf("ACPI identify failed, other PM system enabled.\n");
388 return (ENXIO);
389 }
390
391 /* Initialize root tables. */

--- 3504 unchanged lines hidden ---