D20382.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D20382.id.diff
View Options

	Index: head/sys/dev/iicbus/iicbus.h
	===================================================================
	--- head/sys/dev/iicbus/iicbus.h
	+++ head/sys/dev/iicbus/iicbus.h
	@@ -72,6 +72,12 @@
	#define IICBUS_UNLOCK(sc) mtx_unlock(&(sc)->lock)
	#define IICBUS_ASSERT_LOCKED(sc) mtx_assert(&(sc)->lock, MA_OWNED)

	+#ifdef FDT
	+#define IICBUS_FDT_PNPINFO(t) FDTCOMPAT_PNP_INFO(t, iicbus)
	+#else
	+#define IICBUS_FDT_PNPINFO(t)
	+#endif
	+
	int iicbus_generic_intr(device_t dev, int event, char *buf);
	void iicbus_init_frequency(device_t dev, u_int bus_freq);

	Index: head/sys/dev/ofw/ofw_bus_subr.h
	===================================================================
	--- head/sys/dev/ofw/ofw_bus_subr.h
	+++ head/sys/dev/ofw/ofw_bus_subr.h
	@@ -65,9 +65,11 @@
	};
	#endif

	-#define SIMPLEBUS_PNP_DESCR "Z:compat;P:#;"
	-#define SIMPLEBUS_PNP_INFO(t) \
	- MODULE_PNP_INFO(SIMPLEBUS_PNP_DESCR, simplebus, t, t, sizeof(t) / sizeof(t[0]));
	+#define FDTCOMPAT_PNP_DESCR "Z:compat;P:#;"
	+#define FDTCOMPAT_PNP_INFO(t, busname) \
	+ MODULE_PNP_INFO(FDTCOMPAT_PNP_DESCR, busname, t, t, sizeof(t) / sizeof(t[0]));
	+
	+#define SIMPLEBUS_PNP_INFO(t) FDTCOMPAT_PNP_INFO(t, simplebus)

	/* Generic implementation of ofw_bus_if.m methods and helper routines */
	int ofw_bus_gen_setup_devinfo(struct ofw_bus_devinfo *, phandle_t);