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

bus to which pcm, mixer, etc will attach.

8 files changed, 28 insertions, 10 deletions

diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index c1e040d..e97b689 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -686,4 +686,6 @@ static driver_t au_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(au, pci, au_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_aureal, pci, au_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_aureal, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_aureal, 1);
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index f031f83..b474574 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -41,6 +41,7 @@
 #include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/soundcard.h>
+#include <dev/sound/pcm/sound.h>
 #include <dev/sound/chip.h>
 #include <dev/sound/pci/csareg.h>
 #include <dev/sound/pci/csavar.h>
@@ -796,9 +797,9 @@ csa_readcodec(csa_res *resp, u_long offset, u_int32_t *data)
 
 	/*
 	 * Read the data returned from the AC97 register.
-	 * ACSDA = Status Data Register = 474h 
+	 * ACSDA = Status Data Register = 474h
 	 */
-	*data = csa_readio(resp, BA0_ACSDA); 
+	*data = csa_readio(resp, BA0_ACSDA);
 
 	return (0);
 }
@@ -921,4 +922,6 @@ static driver_t csa_driver = {
 /*
  * csa can be attached to a pci bus.
  */
-DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0);
+DRIVER_MODULE(snd_csa, pci, csa_driver, csa_devclass, 0, 0);
+MODULE_DEPEND(snd_csa, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_csa, 1);
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 8e63ee7..6eb67c4 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -874,4 +874,7 @@ static driver_t pcmcsa_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(pcmcsa, csa, pcmcsa_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_csapcm, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_DEPEND(snd_csapcm, snd_csa, 1, 1, 1);
+MODULE_VERSION(snd_csapcm, 1);
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 5fb0f07..61559c8 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -986,4 +986,6 @@ static driver_t ds1_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(ds1, pci, ds1_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ds1, pci, ds1_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_ds1, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_ds1, 1);
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index c814ada..e598185 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1450,7 +1450,9 @@ static driver_t emu_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(emu, pci, emu_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_emu10k1, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_emu10k1, 1);
 
 static int
 emujoy_pci_probe(device_t dev)
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 3a29023..0664dbc 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -867,4 +867,6 @@ static driver_t es_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(es, pci, es_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_es137x, pci, es_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_es137x, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_es137x, 1);
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 638ac96..f8c5ef0 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -695,4 +695,6 @@ static driver_t nm_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(nm, pci, nm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_neomagic, pci, nm_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_neomagic, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_neomagic, 1);
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 29cf9b7..01c6220 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -698,4 +698,6 @@ static driver_t tr_driver = {
 
 static devclass_t pcm_devclass;
 
-DRIVER_MODULE(tr, pci, tr_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0);
+MODULE_DEPEND(snd_t4dwave, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_VERSION(snd_t4dwave, 1);