Deleted Added
full compact
acpi_machdep.c (150003) acpi_machdep.c (177157)
1/*-
2 * Copyright (c) 2001 Mitsuru IWASAKI
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Mitsuru IWASAKI
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/amd64/acpica/acpi_machdep.c 150003 2005-09-11 18:39:03Z obrien $");
28__FBSDID("$FreeBSD: head/sys/amd64/acpica/acpi_machdep.c 177157 2008-03-13 20:39:04Z jhb $");
29
30#include <sys/param.h>
31#include <sys/bus.h>
29
30#include <sys/param.h>
31#include <sys/bus.h>
32#include <sys/kernel.h>
33#include <sys/module.h>
32
33#include <contrib/dev/acpica/acpi.h>
34#include <dev/acpica/acpivar.h>
35
34
35#include <contrib/dev/acpica/acpi.h>
36#include <dev/acpica/acpivar.h>
37
38#include <machine/nexusvar.h>
39
36static int intr_model = ACPI_INTR_PIC;
37
38int
39acpi_machdep_init(device_t dev)
40{
41 struct acpi_softc *sc;
42
43 sc = devclass_get_softc(devclass_find("acpi"), 0);

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

62 return (0);
63}
64
65void
66acpi_cpu_c1()
67{
68 __asm __volatile("sti; hlt");
69}
40static int intr_model = ACPI_INTR_PIC;
41
42int
43acpi_machdep_init(device_t dev)
44{
45 struct acpi_softc *sc;
46
47 sc = devclass_get_softc(devclass_find("acpi"), 0);

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

66 return (0);
67}
68
69void
70acpi_cpu_c1()
71{
72 __asm __volatile("sti; hlt");
73}
74
75/*
76 * ACPI nexus(4) driver.
77 */
78static int
79nexus_acpi_probe(device_t dev)
80{
81 int error;
82
83 error = acpi_identify();
84 if (error)
85 return (error);
86
87 return (BUS_PROBE_DEFAULT);
88}
89
90static int
91nexus_acpi_attach(device_t dev)
92{
93
94 nexus_init_resources();
95 bus_generic_probe(dev);
96 if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL)
97 panic("failed to add acpi0 device");
98
99 return (bus_generic_attach(dev));
100}
101
102static device_method_t nexus_acpi_methods[] = {
103 /* Device interface */
104 DEVMETHOD(device_probe, nexus_acpi_probe),
105 DEVMETHOD(device_attach, nexus_acpi_attach),
106
107 { 0, 0 }
108};
109
110DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver);
111static devclass_t nexus_devclass;
112
113DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0);