add module metadata. this is a hack, sound drivers will eventually present a

bus to which pcm, mixer, etc will attach.

9 files changed, 49 insertions, 17 deletions

diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index bcf0715..a041ba9 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -619,4 +619,8 @@ static driver_t ad1816_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_ad1816, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_ad1816, 1);
+
+
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index f1c32b5..c4e98ea 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -170,4 +170,8 @@ static driver_t es1888_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(es1888, isa, es1888_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_es1888, isa, es1888_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_es1888, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_es1888, 1);
+
+
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 733dd65..709549b 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -867,7 +867,10 @@ static driver_t ess_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(ess, sbc, ess_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ess, sbc, ess_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_ess, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_ess, 1);
+
 
 static devclass_t esscontrol_devclass;
 
@@ -924,6 +927,3 @@ static driver_t esscontrol_driver = {
 
 DRIVER_MODULE(esscontrol, isa, esscontrol_driver, esscontrol_devclass, 0, 0);
 
-
-
-
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index bbda980..7235e16 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -663,4 +663,8 @@ static driver_t gusc_driver = {
 /*
  * gusc can be attached to an isa bus.
  */
-DRIVER_MODULE(gusc, isa, gusc_driver, gusc_devclass, 0, 0);
+DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0);
+MODULE_DEPEND(snd_gusc, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_gusc, 1);
+
+
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 938854e..374dc31 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -966,7 +966,10 @@ static driver_t mss_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(mss, isa, mss_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_mss, isa, mss_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_mss, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_mss, 1);
+
 
 /*
  * main irq handler for the CS423x. The OPTi931 code is
@@ -1458,7 +1461,10 @@ static driver_t pnpmss_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_pnpmss, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_pnpmss, 1);
+
 
 /*
  * the opti931 seems to miss interrupts when working in full
@@ -1597,7 +1603,10 @@ static driver_t guspcm_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_guspcm, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_guspcm, 1);
+
 
 static int
 mssmix_init(snd_mixer *m)
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c
index 1dd971d..f984d5c 100644
--- a/sys/dev/sound/isa/sb.c
+++ b/sys/dev/sound/isa/sb.c
@@ -892,7 +892,10 @@ static driver_t sbsbc_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(sbsbc, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_sb, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_sb, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_sb, 1);
+
 
 
 
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 1dd971d..f984d5c 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -892,7 +892,10 @@ static driver_t sbsbc_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(sbsbc, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_sb, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_sb, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_sb, 1);
+
 
 
 
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 1dd971d..f984d5c 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -892,7 +892,10 @@ static driver_t sbsbc_driver = {
 	sizeof(snddev_info),
 };
 
-DRIVER_MODULE(sbsbc, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_sb, sbc, sbsbc_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_sb, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_sb, 1);
+
 
 
 
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 2077d11..efec890 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -26,11 +26,9 @@
  * $FreeBSD$
  */
 
-#include "isa.h"
-
 #include <dev/sound/chip.h>
 #include <dev/sound/pcm/sound.h>
-#include  <dev/sound/isa/sb.h>
+#include <dev/sound/isa/sb.h>
 
 #define IO_MAX	3
 #define IRQ_MAX	1
@@ -719,4 +717,8 @@ static driver_t sbc_driver = {
 };
 
 /* sbc can be attached to an isa bus. */
-DRIVER_MODULE(sbc, isa, sbc_driver, sbc_devclass, 0, 0);
+DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0);
+MODULE_DEPEND(snd_sbc, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_sbc, 1);
+
+