From 9acc8ad69edafd33a721b6f745a2f9442836f466 Mon Sep 17 00:00:00 2001 From: njl Date: Fri, 9 Apr 2004 18:14:32 +0000 Subject: [PATCH] Add MODULE_DEPEND entries so some of these drivers can eventually be loaded separately from ACPI (i.e., embedded use). --- sys/dev/acpica/acpi_acad.c | 1 + sys/dev/acpica/acpi_button.c | 1 + sys/dev/acpica/acpi_cmbat.c | 1 + sys/dev/acpica/acpi_cpu.c | 1 + sys/dev/acpica/acpi_ec.c | 1 + sys/dev/acpica/acpi_isab.c | 1 + sys/dev/acpica/acpi_lid.c | 1 + sys/dev/acpica/acpi_pci.c | 3 ++- sys/dev/acpica/acpi_pcib_acpi.c | 1 + sys/dev/acpica/acpi_pcib_pci.c | 1 + sys/dev/acpica/acpi_resource.c | 1 + sys/dev/acpica/acpi_thermal.c | 1 + sys/dev/acpica/acpi_timer.c | 1 + 13 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c index 57c9b2ff0167..4dcb20367cc4 100644 --- a/sys/dev/acpica/acpi_acad.c +++ b/sys/dev/acpica/acpi_acad.c @@ -83,6 +83,7 @@ static driver_t acpi_acad_driver = { static devclass_t acpi_acad_devclass; DRIVER_MODULE(acpi_acad, acpi, acpi_acad_driver, acpi_acad_devclass, 0, 0); +MODULE_DEPEND(acpi_acad, acpi, 1, 1, 1); static void acpi_acad_get_status(void *context) diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c index 9d95ba1ad273..8071102947e4 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -83,6 +83,7 @@ static driver_t acpi_button_driver = { static devclass_t acpi_button_devclass; DRIVER_MODULE(acpi_button, acpi, acpi_button_driver, acpi_button_devclass, 0, 0); +MODULE_DEPEND(acpi_button, acpi, 1, 1, 1); static int acpi_button_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 8bcf2869ce05..5a3d94871af7 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -110,6 +110,7 @@ static driver_t acpi_cmbat_driver = { static devclass_t acpi_cmbat_devclass; DRIVER_MODULE(acpi_cmbat, acpi, acpi_cmbat_driver, acpi_cmbat_devclass, 0, 0); +MODULE_DEPEND(acpi_cmbat, acpi, 1, 1, 1); static int acpi_cmbat_info_expired(struct timespec *lastupdated) diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index ef4f01e3cac4..76b7ad491cb0 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -184,6 +184,7 @@ static driver_t acpi_cpu_driver = { static devclass_t acpi_cpu_devclass; DRIVER_MODULE(acpi_cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0); +MODULE_DEPEND(acpi_cpu, acpi, 1, 1, 1); static int acpi_cpu_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 4b2ac8abdded..aac8d2479893 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -352,6 +352,7 @@ static driver_t acpi_ec_driver = { static devclass_t acpi_ec_devclass; DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0); +MODULE_DEPEND(acpi_ec, acpi, 1, 1, 1); /* * Look for an ECDT and if we find one, set up default GPE and diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index 184793ec775d..c8688daa5471 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -88,6 +88,7 @@ static driver_t acpi_isab_driver = { }; DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0); +MODULE_DEPEND(acpi_isab, acpi, 1, 1, 1); static int acpi_isab_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index 892fe4ce9717..1758e173f322 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -75,6 +75,7 @@ static driver_t acpi_lid_driver = { static devclass_t acpi_lid_devclass; DRIVER_MODULE(acpi_lid, acpi, acpi_lid_driver, acpi_lid_devclass, 0, 0); +MODULE_DEPEND(acpi_lid, acpi, 1, 1, 1); static int acpi_lid_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index f6affecc1df0..aa95d228d7f2 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -123,8 +123,9 @@ static driver_t acpi_pci_driver = { }; DRIVER_MODULE(acpi_pci, pcib, acpi_pci_driver, pci_devclass, 0, 0); -MODULE_VERSION(acpi_pci, 1); +MODULE_DEPEND(acpi_pci, acpi, 1, 1, 1); MODULE_DEPEND(acpi_pci, pci, 1, 1, 1); +MODULE_VERSION(acpi_pci, 1); static int acpi_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 65cc4a7cc92a..5d0a5dccff50 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -110,6 +110,7 @@ static driver_t acpi_pcib_acpi_driver = { }; DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0); +MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); static int acpi_pcib_acpi_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c index b0d9fff62f27..7ea0b5dc3614 100644 --- a/sys/dev/acpica/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -106,6 +106,7 @@ static driver_t acpi_pcib_pci_driver = { }; DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0); +MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); static int acpi_pcib_pci_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 6c73c40186f9..c441d8726a8a 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -568,6 +568,7 @@ static driver_t acpi_sysresource_driver = { static devclass_t acpi_sysresource_devclass; DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysresource_driver, acpi_sysresource_devclass, 0, 0); +MODULE_DEPEND(acpi_sysresource, acpi, 1, 1, 1); static int acpi_sysresource_probe(device_t dev) diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c index 2dfc43513432..9b7ad0cd33ff 100644 --- a/sys/dev/acpica/acpi_thermal.c +++ b/sys/dev/acpica/acpi_thermal.c @@ -137,6 +137,7 @@ static driver_t acpi_tz_driver = { static devclass_t acpi_tz_devclass; DRIVER_MODULE(acpi_tz, acpi, acpi_tz_driver, acpi_tz_devclass, 0, 0); +MODULE_DEPEND(acpi_tz, acpi, 1, 1, 1); static struct sysctl_ctx_list acpi_tz_sysctl_ctx; static struct sysctl_oid *acpi_tz_sysctl_tree; diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 41e16b6384a8..feebfda98abf 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -87,6 +87,7 @@ static driver_t acpi_timer_driver = { static devclass_t acpi_timer_devclass; DRIVER_MODULE(acpi_timer, acpi, acpi_timer_driver, acpi_timer_devclass, 0, 0); +MODULE_DEPEND(acpi_timer, acpi, 1, 1, 1); static struct timecounter acpi_timer_timecounter = { acpi_timer_get_timecount_safe,