Attachment #204738 for bug #238138

Lines 351-356 Resume notification. Link Here

(-)b/sbin/devd/devd.conf.5 (+2 lines)
351	Suspend notification.	351	Suspend notification.
352	.It Li Thermal	352	.It Li Thermal
353	Thermal zone events.	353	Thermal zone events.
		354	.It Li Dock
		355	Dock state ($notify=0x00 is undocked, 0x01 is docked).
354	.El	356	.El
355	.Pp	357	.Pp
356	.It Li CARP	358	.It Li CARP




static void
acpi_dock_insert(device_t dev)
{
	struct acpi_dock_softc	*sc;
	ACPI_HANDLE		h;

	ACPI_SERIAL_ASSERT(dock);

	sc = device_get_softc(dev);
	h = acpi_get_handle(dev);

	if (sc->status == ACPI_DOCK_STATUS_UNDOCKED ||
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {

			return;
		}

		if (!cold) {
			acpi_dock_insert_children(dev);

			/* Notify devd(8) that we're docked */
			acpi_UserNotify("Dock", h, 1);
		}

		sc->status = ACPI_DOCK_STATUS_DOCKED;
	}
}

acpi_dock_removal(device_t dev)
{
	struct acpi_dock_softc *sc;
	ACPI_HANDLE		h;

	ACPI_SERIAL_ASSERT(dock);

	sc = device_get_softc(dev);
	h = acpi_get_handle(dev);

	if (sc->status == ACPI_DOCK_STATUS_DOCKED ||
	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
		acpi_dock_eject_children(dev);

			return;
		}

		/* Notify devd(8) that we're undocked */
		acpi_UserNotify("Dock", h, 0);

		sc->status = ACPI_DOCK_STATUS_UNDOCKED;
	}



DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);

- 

Return to bug 238138

Lines 256-266 acpi_dock_insert_children(device_t dev) Link Here

(-)b/sys/dev/acpica/acpi_dock.c (-4 / +15 lines)
256	static void	256	static void
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	acpi_UserNotify("Dock", h, 1);
		280	}
		281
275	sc->status = ACPI_DOCK_STATUS_DOCKED;	282	sc->status = ACPI_DOCK_STATUS_DOCKED;
276	}	283	}
277	}	284	}
Lines 325-334 static void Link Here
325	acpi_dock_removal(device_t dev)	332	acpi_dock_removal(device_t dev)
326	{	333	{
327	struct acpi_dock_softc *sc;	334	struct acpi_dock_softc *sc;
		335	ACPI_HANDLE h;
328		336
329	ACPI_SERIAL_ASSERT(dock);	337	ACPI_SERIAL_ASSERT(dock);
330		338
331	sc = device_get_softc(dev);	339	sc = device_get_softc(dev);
		340	h = acpi_get_handle(dev);
		341
332	if (sc->status == ACPI_DOCK_STATUS_DOCKED \|\|	342	if (sc->status == ACPI_DOCK_STATUS_DOCKED \|\|
333	sc->status == ACPI_DOCK_STATUS_UNKNOWN) {	343	sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
334	acpi_dock_eject_children(dev);	344	acpi_dock_eject_children(dev);
Lines 342-347 acpi_dock_removal(device_t dev) Link Here
342	return;	352	return;
343	}	353	}
344		354
		355	/* Notify devd(8) that we're undocked */
		356	acpi_UserNotify("Dock", h, 0);
		357
345	sc->status = ACPI_DOCK_STATUS_UNDOCKED;	358	sc->status = ACPI_DOCK_STATUS_UNDOCKED;
346	}	359	}
347		360
Lines 534-537 static devclass_t acpi_dock_devclass; Link Here
534		547
535	DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);	548	DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
536	MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);	549	MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);
537
538	-