| acpi_hpet.c (212533) | acpi_hpet.c (212541) |
|---|---|
| 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 212533 2010-09-13 06:32:56Z mav $"); | 29__FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_hpet.c 212541 2010-09-13 07:25:35Z mav $"); |
| 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> --- 640 unchanged lines hidden (view full) --- 678 679 /* XXX Without a tc_remove() function, we can't detach. */ 680 return (EBUSY); 681} 682 683static int 684hpet_suspend(device_t dev) 685{ | 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> --- 640 unchanged lines hidden (view full) --- 678 679 /* XXX Without a tc_remove() function, we can't detach. */ 680 return (EBUSY); 681} 682 683static int 684hpet_suspend(device_t dev) 685{ |
| 686 struct hpet_softc *sc; | 686// struct hpet_softc *sc; |
| 687 688 /* 689 * Disable the timer during suspend. The timer will not lose 690 * its state in S1 or S2, but we are required to disable 691 * it. 692 */ | 687 688 /* 689 * Disable the timer during suspend. The timer will not lose 690 * its state in S1 or S2, but we are required to disable 691 * it. 692 */ |
| 693 sc = device_get_softc(dev); 694 hpet_disable(sc); | 693// sc = device_get_softc(dev); 694// hpet_disable(sc); |
| 695 696 return (0); 697} 698 699static int 700hpet_resume(device_t dev) 701{ 702 struct hpet_softc *sc; --- 130 unchanged lines hidden --- | 695 696 return (0); 697} 698 699static int 700hpet_resume(device_t dev) 701{ 702 struct hpet_softc *sc; --- 130 unchanged lines hidden --- |