| acpi_timer.c (222222) | acpi_timer.c (231161) |
|---|---|
| 1/*- 2 * Copyright (c) 2000, 2001 Michael Smith 3 * Copyright (c) 2000 BSDi 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2000, 2001 Michael Smith 3 * Copyright (c) 2000 BSDi 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_timer.c 222222 2011-05-23 20:12:36Z jkim $"); | 29__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_timer.c 231161 2012-02-07 20:54:44Z jkim $"); |
| 30 31#include "opt_acpi.h" 32#include <sys/param.h> 33#include <sys/bus.h> 34#include <sys/kernel.h> 35#include <sys/module.h> 36#include <sys/sysctl.h> 37#include <sys/timetc.h> --- 81 unchanged lines hidden (view full) --- 119 int rid, rtype; 120 121 ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); 122 123 if (acpi_disabled("timer") || (acpi_quirks & ACPI_Q_TIMER) || 124 acpi_timer_dev) 125 return_VOID; 126 | 30 31#include "opt_acpi.h" 32#include <sys/param.h> 33#include <sys/bus.h> 34#include <sys/kernel.h> 35#include <sys/module.h> 36#include <sys/sysctl.h> 37#include <sys/timetc.h> --- 81 unchanged lines hidden (view full) --- 119 int rid, rtype; 120 121 ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); 122 123 if (acpi_disabled("timer") || (acpi_quirks & ACPI_Q_TIMER) || 124 acpi_timer_dev) 125 return_VOID; 126 |
| 127 if ((dev = BUS_ADD_CHILD(parent, 0, "acpi_timer", 0)) == NULL) { | 127 if ((dev = BUS_ADD_CHILD(parent, 2, "acpi_timer", 0)) == NULL) { |
| 128 device_printf(parent, "could not add acpi_timer0\n"); 129 return_VOID; 130 } 131 acpi_timer_dev = dev; 132 133 switch (AcpiGbl_FADT.XPmTimerBlock.SpaceId) { 134 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 135 rtype = SYS_RES_MEMORY; --- 266 unchanged lines hidden --- | 128 device_printf(parent, "could not add acpi_timer0\n"); 129 return_VOID; 130 } 131 acpi_timer_dev = dev; 132 133 switch (AcpiGbl_FADT.XPmTimerBlock.SpaceId) { 134 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 135 rtype = SYS_RES_MEMORY; --- 266 unchanged lines hidden --- |