D55355.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55355.diff
View Options

	diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
	--- a/sys/dev/acpica/acpivar.h
	+++ b/sys/dev/acpica/acpivar.h
	@@ -289,31 +289,10 @@
	*/
	#define ACPI_DEV_DOMAIN_UNKNOWN (-1)

	-/*
	- * Accessor functions for our ivars. Default value for BUS_READ_IVAR is
	- * (type) 0. The <sys/bus.h> accessor functions don't check return values.
	- */
	-#define __ACPI_BUS_ACCESSOR(varp, var, ivarp, ivar, type) \
	- \
	-static __inline type varp ## _get_ ## var(device_t dev) \
	-{ \
	- uintptr_t v = 0; \
	- BUS_READ_IVAR(device_get_parent(dev), dev, \
	- ivarp ## _IVAR_ ## ivar, &v); \
	- return ((type) v); \
	-} \
	- \
	-static __inline void varp ## _set_ ## var(device_t dev, type t) \
	-{ \
	- uintptr_t v = (uintptr_t) t; \
	- BUS_WRITE_IVAR(device_get_parent(dev), dev, \
	- ivarp ## _IVAR_ ## ivar, v); \
	-}
	-
	-__ACPI_BUS_ACCESSOR(acpi, handle, ACPI, HANDLE, ACPI_HANDLE)
	-__ACPI_BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *)
	-__ACPI_BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int)
	-__ACPI_BUS_ACCESSOR(acpi, domain, ACPI, DOMAIN, int)
	+__BUS_ACCESSOR_DEFAULT(acpi, handle, ACPI, HANDLE, ACPI_HANDLE, NULL)
	+__BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *)
	+__BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int)
	+__BUS_ACCESSOR(acpi, domain, ACPI, DOMAIN, int)

	void acpi_fake_objhandler(ACPI_HANDLE h, void *data);
	static __inline device_t