Deleted Added
full compact
acpi_dock.c (196403) acpi_dock.c (199337)
1/*-
2 * Copyright (c) 2005-2006 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
1/*-
2 * Copyright (c) 2005-2006 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: head/sys/dev/acpica/acpi_dock.c 196403 2009-08-20 19:17:53Z jhb $
26 * $FreeBSD: head/sys/dev/acpica/acpi_dock.c 199337 2009-11-16 21:47:12Z jkim $
27 */
28
29#include "opt_acpi.h"
30#include <sys/param.h>
31#include <sys/bus.h>
32#include <sys/kernel.h>
33#include <sys/module.h>
34

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

219 * are not executed.
220 * Normal devices are initialized at booting by calling
221 * AcpiInitializeObjects(), however the devices under the dock
222 * need to be initialized here on the scheme of ACPICA.
223 */
224 ACPI_INIT_WALK_INFO Info;
225
226 AcpiNsWalkNamespace(ACPI_TYPE_ANY, handle,
27 */
28
29#include "opt_acpi.h"
30#include <sys/param.h>
31#include <sys/bus.h>
32#include <sys/kernel.h>
33#include <sys/module.h>
34

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

219 * are not executed.
220 * Normal devices are initialized at booting by calling
221 * AcpiInitializeObjects(), however the devices under the dock
222 * need to be initialized here on the scheme of ACPICA.
223 */
224 ACPI_INIT_WALK_INFO Info;
225
226 AcpiNsWalkNamespace(ACPI_TYPE_ANY, handle,
227 100, TRUE, AcpiNsInitOneDevice, &Info, NULL);
227 100, TRUE, AcpiNsInitOneDevice, NULL, &Info, NULL);
228#endif
229
230 dev = acpi_get_device(handle);
231 if (dev == NULL) {
232 device_printf(dock_dev, "error: %s has no associated device\n",
233 acpi_name(handle));
234 goto out;
235 }

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

244acpi_dock_insert_children(device_t dev)
245{
246 ACPI_STATUS status;
247 ACPI_HANDLE sb_handle;
248
249 status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle);
250 if (ACPI_SUCCESS(status)) {
251 AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle,
228#endif
229
230 dev = acpi_get_device(handle);
231 if (dev == NULL) {
232 device_printf(dock_dev, "error: %s has no associated device\n",
233 acpi_name(handle));
234 goto out;
235 }

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

244acpi_dock_insert_children(device_t dev)
245{
246 ACPI_STATUS status;
247 ACPI_HANDLE sb_handle;
248
249 status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle);
250 if (ACPI_SUCCESS(status)) {
251 AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle,
252 100, acpi_dock_insert_child, dev, NULL);
252 100, acpi_dock_insert_child, NULL, dev, NULL);
253 }
254}
255
256static void
257acpi_dock_insert(device_t dev)
258{
259 struct acpi_dock_softc *sc;
260 ACPI_HANDLE h;

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

314acpi_dock_eject_children(device_t dev)
315{
316 ACPI_HANDLE sb_handle;
317 ACPI_STATUS status;
318
319 status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle);
320 if (ACPI_SUCCESS(status)) {
321 AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle,
253 }
254}
255
256static void
257acpi_dock_insert(device_t dev)
258{
259 struct acpi_dock_softc *sc;
260 ACPI_HANDLE h;

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

314acpi_dock_eject_children(device_t dev)
315{
316 ACPI_HANDLE sb_handle;
317 ACPI_STATUS status;
318
319 status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle);
320 if (ACPI_SUCCESS(status)) {
321 AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle,
322 100, acpi_dock_eject_child, &dev, NULL);
322 100, acpi_dock_eject_child, NULL, &dev, NULL);
323 }
324}
325
326static void
327acpi_dock_removal(device_t dev)
328{
329 struct acpi_dock_softc *sc;
330

--- 210 unchanged lines hidden ---
323 }
324}
325
326static void
327acpi_dock_removal(device_t dev)
328{
329 struct acpi_dock_softc *sc;
330

--- 210 unchanged lines hidden ---