| acpi_hpet.c (224919) | acpi_hpet.c (231161) |
|---|---|
| 1/*- 2 * Copyright (c) 2005 Poul-Henning Kamp 3 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org> 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) 2005 Poul-Henning Kamp 3 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org> 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_hpet.c 224919 2011-08-16 21:51:29Z mav $"); | 29__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_hpet.c 231161 2012-02-07 20:54:44Z jkim $"); |
| 30 31#include "opt_acpi.h" 32#if defined(__amd64__) || defined(__ia64__) 33#define DEV_APIC 34#else 35#include "opt_apic.h" 36#endif 37#include <sys/param.h> --- 299 unchanged lines hidden (view full) --- 337 /* Search for HPET device with same ID. */ 338 found = 0; 339 AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 340 100, hpet_find, NULL, (void *)(uintptr_t)hpet->Sequence, (void *)&found); 341 /* If found - let it be probed in normal way. */ 342 if (found) 343 continue; 344 /* If not - create it from table info. */ | 30 31#include "opt_acpi.h" 32#if defined(__amd64__) || defined(__ia64__) 33#define DEV_APIC 34#else 35#include "opt_apic.h" 36#endif 37#include <sys/param.h> --- 299 unchanged lines hidden (view full) --- 337 /* Search for HPET device with same ID. */ 338 found = 0; 339 AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 340 100, hpet_find, NULL, (void *)(uintptr_t)hpet->Sequence, (void *)&found); 341 /* If found - let it be probed in normal way. */ 342 if (found) 343 continue; 344 /* If not - create it from table info. */ |
| 345 child = BUS_ADD_CHILD(parent, ACPI_DEV_BASE_ORDER, "hpet", 0); | 345 child = BUS_ADD_CHILD(parent, 2, "hpet", 0); |
| 346 if (child == NULL) { 347 printf("%s: can't add child\n", __func__); 348 continue; 349 } 350 bus_set_resource(child, SYS_RES_MEMORY, 0, hpet->Address.Address, 351 HPET_MEM_WIDTH); 352 } 353} --- 500 unchanged lines hidden --- | 346 if (child == NULL) { 347 printf("%s: can't add child\n", __func__); 348 continue; 349 } 350 bus_set_resource(child, SYS_RES_MEMORY, 0, hpet->Address.Address, 351 HPET_MEM_WIDTH); 352 } 353} --- 500 unchanged lines hidden --- |