View | Details | Raw Unified | Return to bug 238138 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/acpica/acpi_dock.c (-3 / +16 lines)
Lines 257-266 static void Link Here
257
acpi_dock_insert(device_t dev)
257
acpi_dock_insert(device_t dev)
258
{
258
{
259
	struct acpi_dock_softc *sc;
259
	struct acpi_dock_softc *sc;
260
        ACPI_HANDLE            h;
260
261
261
	ACPI_SERIAL_ASSERT(dock);
262
	ACPI_SERIAL_ASSERT(dock);
262
263
263
	sc = device_get_softc(dev);
264
	sc = device_get_softc(dev);
265
        h = acpi_get_handle(dev);
264
266
265
	if (sc->status == ACPI_DOCK_STATUS_UNDOCKED ||
267
	if (sc->status == ACPI_DOCK_STATUS_UNDOCKED ||
266
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
268
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
Lines 270-277 acpi_dock_insert(device_t dev) Link Here
270
			return;
272
			return;
271
		}
273
		}
272
274
273
		if (!cold)
275
		if (!cold) {
274
			acpi_dock_insert_children(dev);
276
			acpi_dock_insert_children(dev);
277
278
                        /* Notify devd(8) that we're docked */
279
                        if (devctl_process_running())
280
                          acpi_UserNotify("Dock", h, 1);
281
                }
282
275
		sc->status = ACPI_DOCK_STATUS_DOCKED;
283
		sc->status = ACPI_DOCK_STATUS_DOCKED;
276
	}
284
	}
277
}
285
}
Lines 325-334 static void Link Here
325
acpi_dock_removal(device_t dev)
333
acpi_dock_removal(device_t dev)
326
{
334
{
327
	struct acpi_dock_softc *sc;
335
	struct acpi_dock_softc *sc;
336
        ACPI_HANDLE            h;
328
337
329
	ACPI_SERIAL_ASSERT(dock);
338
	ACPI_SERIAL_ASSERT(dock);
330
339
331
	sc = device_get_softc(dev);
340
	sc = device_get_softc(dev);
341
        h = acpi_get_handle(dev);
342
332
	if (sc->status == ACPI_DOCK_STATUS_DOCKED ||
343
	if (sc->status == ACPI_DOCK_STATUS_DOCKED ||
333
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
344
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
334
		acpi_dock_eject_children(dev);
345
		acpi_dock_eject_children(dev);
Lines 342-347 acpi_dock_removal(device_t dev) Link Here
342
			return;
353
			return;
343
		}
354
		}
344
355
356
                /* Notify devd(8) that we're undocked */
357
                if (devctl_process_running())
358
                  acpi_UserNotify("Dock", h, 0);
359
345
		sc->status = ACPI_DOCK_STATUS_UNDOCKED;
360
		sc->status = ACPI_DOCK_STATUS_UNDOCKED;
346
	}
361
	}
347
362
Lines 534-537 static devclass_t acpi_dock_devclass; Link Here
534
549
535
DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
550
DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
536
MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);
551
MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);
537
538
- 

Return to bug 238138