Page MenuHomeFreeBSD
Files F149353050

D26824.id78339.diff
No OneTemporary
Actions

D26824.id78339.diff
View Options

Index: sys/dev/acpi_support/acpi_wmi.c
===================================================================
--- sys/dev/acpi_support/acpi_wmi.c
+++ sys/dev/acpi_support/acpi_wmi.c
@@ -201,6 +201,7 @@
MODULE_VERSION(acpi_wmi, 1);
MODULE_DEPEND(acpi_wmi, acpi, 1, 1, 1);
static char *wmi_ids[] = {"PNP0C14", NULL};
+ACPI_PNP_INFO(wmi_ids);
/*
* Probe for the PNP0C14 ACPI node
Index: sys/dev/acpica/acpi_dock.c
===================================================================
--- sys/dev/acpica/acpi_dock.c
+++ sys/dev/acpica/acpi_dock.c
@@ -64,6 +64,8 @@
ACPI_SERIAL_DECL(dock, "ACPI Docking Station");
+static char *acpi_dock_pnp_ids[] = {"PNP0C15", NULL};
+
/*
* Utility functions
*/
@@ -545,3 +547,4 @@
DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);
+ACPI_PNP_INFO(acpi_dock_pnp_ids);
Index: sys/dev/acpica/acpivar.h
===================================================================
--- sys/dev/acpica/acpivar.h
+++ sys/dev/acpica/acpivar.h
@@ -231,6 +231,15 @@
#define ACPI_Q_TIMER (1 << 1)
#define ACPI_Q_MADT_IRQ0 (1 << 2)
+/*
+ * Plug and play information for device matching. Matching table format
+ * is compatible with ids parameter of ACPI_ID_PROBE bus method.
+ */
+#define ACPICOMPAT_PNP_INFO(t, busname) \
+ MODULE_PNP_INFO("Z:_HID", busname, t##hid, t, nitems(t)-1); \
+ MODULE_PNP_INFO("Z:_CID", busname, t##cid, t, nitems(t)-1);
+#define ACPI_PNP_INFO(t) ACPICOMPAT_PNP_INFO(t, acpi)
+
/*
* Note that the low ivar values are reserved to provide
* interface compatibility with ISA drivers which can also
Index: sys/dev/iicbus/iicbus.h
===================================================================
--- sys/dev/iicbus/iicbus.h
+++ sys/dev/iicbus/iicbus.h
@@ -77,6 +77,12 @@
#define IICBUS_FDT_PNP_INFO(t)
#endif
+#ifdef DEV_ACPI
+#define IICBUS_ACPI_PNP_INFO(t) ACPICOMPAT_PNP_INFO(t, iicbus)
+#else
+#define IICBUS_ACPI_PNP_INFO(t)
+#endif
+
int iicbus_generic_intr(device_t dev, int event, char *buf);
void iicbus_init_frequency(device_t dev, u_int bus_freq);

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 24, 10:45 PM (3 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30277765
Default Alt Text
D26824.id78339.diff (2 KB)

Event Timeline