kernel: Add KOBJMETHOD_END and use it.

diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 1156ba3..228caa3 100644 (file)
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -305,7 +305,7 @@ static kobj_method_t ad1816mixer_methods[] = {
        KOBJMETHOD(mixer_init,          ad1816mix_init),
        KOBJMETHOD(mixer_set,           ad1816mix_set),
        KOBJMETHOD(mixer_setrecsrc,     ad1816mix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(ad1816mixer);
 
@@ -480,7 +480,7 @@ static kobj_method_t ad1816chan_methods[] = {
        KOBJMETHOD(channel_trigger,             ad1816chan_trigger),
        KOBJMETHOD(channel_getptr,              ad1816chan_getptr),
        KOBJMETHOD(channel_getcaps,             ad1816chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(ad1816chan);
 

diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 5867e2e..1e39338 100644 (file)
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -655,7 +655,7 @@ static kobj_method_t esschan_methods[] = {
        KOBJMETHOD(channel_trigger,             esschan_trigger),
        KOBJMETHOD(channel_getptr,              esschan_getptr),
        KOBJMETHOD(channel_getcaps,             esschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(esschan);
 
@@ -777,7 +777,7 @@ static kobj_method_t essmixer_methods[] = {
        KOBJMETHOD(mixer_init,          essmix_init),
        KOBJMETHOD(mixer_set,           essmix_set),
        KOBJMETHOD(mixer_setrecsrc,     essmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(essmixer);
 

diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index b6f427c..0c0376a 100644 (file)
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -534,7 +534,7 @@ static kobj_method_t mssmix_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          mssmix_init),
        KOBJMETHOD(mixer_set,           mssmix_set),
        KOBJMETHOD(mixer_setrecsrc,     mssmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(mssmix_mixer);
 
@@ -617,7 +617,7 @@ static kobj_method_t ymmix_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          ymmix_init),
        KOBJMETHOD(mixer_set,           ymmix_set),
        KOBJMETHOD(mixer_setrecsrc,     ymmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(ymmix_mixer);
 
@@ -1247,7 +1247,7 @@ static kobj_method_t msschan_methods[] = {
        KOBJMETHOD(channel_trigger,             msschan_trigger),
        KOBJMETHOD(channel_getptr,              msschan_getptr),
        KOBJMETHOD(channel_getcaps,             msschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(msschan);
 

diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 15ae09e..e23c51a 100644 (file)
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -422,7 +422,7 @@ static kobj_method_t sb16mix_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          sb16mix_init),
        KOBJMETHOD(mixer_set,           sb16mix_set),
        KOBJMETHOD(mixer_setrecsrc,     sb16mix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(sb16mix_mixer);
 
@@ -779,7 +779,7 @@ static kobj_method_t sb16chan_methods[] = {
        KOBJMETHOD(channel_trigger,             sb16chan_trigger),
        KOBJMETHOD(channel_getptr,              sb16chan_getptr),
        KOBJMETHOD(channel_getcaps,             sb16chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(sb16chan);
 

diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 9700776..6245987 100644 (file)
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -397,7 +397,7 @@ static kobj_method_t sbpromix_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          sbpromix_init),
        KOBJMETHOD(mixer_set,           sbpromix_set),
        KOBJMETHOD(mixer_setrecsrc,     sbpromix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(sbpromix_mixer);
 
@@ -465,7 +465,7 @@ static kobj_method_t sbmix_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          sbmix_init),
        KOBJMETHOD(mixer_set,           sbmix_set),
        KOBJMETHOD(mixer_setrecsrc,     sbmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(sbmix_mixer);
 
@@ -679,7 +679,7 @@ static kobj_method_t sbchan_methods[] = {
        KOBJMETHOD(channel_trigger,             sbchan_trigger),
        KOBJMETHOD(channel_getptr,              sbchan_getptr),
        KOBJMETHOD(channel_getcaps,             sbchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(sbchan);
 

diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 847fe4d..f59595d 100644 (file)
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -412,7 +412,7 @@ static kobj_method_t alspchan_methods[] = {
        KOBJMETHOD(channel_trigger,             alspchan_trigger),
        KOBJMETHOD(channel_getptr,              alschan_getptr),
        KOBJMETHOD(channel_getcaps,             alschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(alspchan);
 
@@ -505,7 +505,7 @@ static kobj_method_t alsrchan_methods[] = {
        KOBJMETHOD(channel_trigger,             alsrchan_trigger),
        KOBJMETHOD(channel_getptr,              alschan_getptr),
        KOBJMETHOD(channel_getcaps,             alschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(alsrchan);
 
@@ -614,7 +614,7 @@ static kobj_method_t als_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          alsmix_init),
        KOBJMETHOD(mixer_set,           alsmix_set),
        KOBJMETHOD(mixer_setrecsrc,     alsmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(als_mixer);
 

diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index b59ff86..17b950d 100644 (file)
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -401,7 +401,7 @@ atiixp_wrcd(kobj_t obj, void *devinfo, int reg, uint32_t data)
 static kobj_method_t atiixp_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           atiixp_rdcd),
        KOBJMETHOD(ac97_write,          atiixp_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(atiixp_ac97);
 
@@ -634,7 +634,7 @@ static kobj_method_t atiixp_chan_methods[] = {
        KOBJMETHOD(channel_trigger,             atiixp_chan_trigger),
        KOBJMETHOD(channel_getptr,              atiixp_chan_getptr),
        KOBJMETHOD(channel_getcaps,             atiixp_chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(atiixp_chan);
 

diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c
index cc1d5fa..7322e43 100644 (file)
--- a/sys/dev/sound/pci/au88x0.c
+++ b/sys/dev/sound/pci/au88x0.c
@@ -308,7 +308,7 @@ au88x0_codec_write(kobj_t obj, void *arg, int reg, uint32_t data)
 static kobj_method_t au88x0_ac97_methods[] = {
        KOBJMETHOD(ac97_read, au88x0_codec_read),
        KOBJMETHOD(ac97_write, au88x0_codec_write),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(au88x0_ac97);
 
@@ -425,7 +425,7 @@ static kobj_method_t au88x0_chan_methods[] = {
        KOBJMETHOD(channel_trigger,             au88x0_chan_trigger),
        KOBJMETHOD(channel_getptr,              au88x0_chan_getptr),
        KOBJMETHOD(channel_getcaps,             au88x0_chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(au88x0_chan);
 

diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 86e9e0e..2f1b4e5 100644 (file)
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -169,7 +169,7 @@ au_wrcd(kobj_t obj, void *arg, int regno, u_int32_t data)
 static kobj_method_t au_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           au_rdcd),
        KOBJMETHOD(ac97_write,          au_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(au_ac97);
 
@@ -384,7 +384,7 @@ static kobj_method_t auchan_methods[] = {
        KOBJMETHOD(channel_trigger,             auchan_trigger),
        KOBJMETHOD(channel_getptr,              auchan_getptr),
        KOBJMETHOD(channel_getcaps,             auchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(auchan);
 

diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index f8edb91..11d3594 100644 (file)
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -569,7 +569,7 @@ static kobj_method_t cmichan_methods[] = {
        KOBJMETHOD(channel_trigger,             cmichan_trigger),
        KOBJMETHOD(channel_getptr,              cmichan_getptr),
        KOBJMETHOD(channel_getcaps,             cmichan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(cmichan);
 
@@ -743,7 +743,7 @@ static kobj_method_t cmi_mixer_methods[] = {
        KOBJMETHOD(mixer_init,  cmimix_init),
        KOBJMETHOD(mixer_set,   cmimix_set),
        KOBJMETHOD(mixer_setrecsrc,     cmimix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(cmi_mixer);
 

diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index ccfdd55..1fe150c 100644 (file)
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -300,7 +300,7 @@ cs4281_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t cs4281_ac97_methods[] = {
         KOBJMETHOD(ac97_read,           cs4281_rdcd),
         KOBJMETHOD(ac97_write,          cs4281_wrcd),
-        { 0, 0 }
+        KOBJMETHOD_END
 };
 AC97_DECLARE(cs4281_ac97);
 
@@ -450,7 +450,7 @@ static kobj_method_t cs4281chan_methods[] = {
        KOBJMETHOD(channel_trigger,             cs4281chan_trigger),
        KOBJMETHOD(channel_getptr,              cs4281chan_getptr),
        KOBJMETHOD(channel_getcaps,             cs4281chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(cs4281chan);
 

diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 1c5ebf2..856ec5c 100644 (file)
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -165,7 +165,7 @@ csa_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t csa_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           csa_rdcd),
        KOBJMETHOD(ac97_write,          csa_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(csa_ac97);
 
@@ -629,7 +629,7 @@ static kobj_method_t csachan_methods[] = {
        KOBJMETHOD(channel_trigger,             csachan_trigger),
        KOBJMETHOD(channel_getptr,              csachan_getptr),
        KOBJMETHOD(channel_getcaps,             csachan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(csachan);
 

diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 91cfb76..1092ca1 100644 (file)
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -325,7 +325,7 @@ static kobj_method_t ds_ac97_methods[] = {
        KOBJMETHOD(ac97_init,           ds_initcd),
        KOBJMETHOD(ac97_read,           ds_rdcd),
        KOBJMETHOD(ac97_write,          ds_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(ds_ac97);
 
@@ -601,7 +601,7 @@ static kobj_method_t ds1pchan_methods[] = {
        KOBJMETHOD(channel_trigger,             ds1pchan_trigger),
        KOBJMETHOD(channel_getptr,              ds1pchan_getptr),
        KOBJMETHOD(channel_getcaps,             ds1pchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(ds1pchan);
 
@@ -721,7 +721,7 @@ static kobj_method_t ds1rchan_methods[] = {
        KOBJMETHOD(channel_trigger,             ds1rchan_trigger),
        KOBJMETHOD(channel_getptr,              ds1rchan_getptr),
        KOBJMETHOD(channel_getcaps,             ds1rchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(ds1rchan);
 

diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 15d33b7..52c44bd 100644 (file)
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -304,7 +304,7 @@ emu_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t emu_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           emu_rdcd),
        KOBJMETHOD(ac97_write,          emu_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(emu_ac97);
 
@@ -845,7 +845,7 @@ static kobj_method_t emupchan_methods[] = {
        KOBJMETHOD(channel_trigger,             emupchan_trigger),
        KOBJMETHOD(channel_getptr,              emupchan_getptr),
        KOBJMETHOD(channel_getcaps,             emupchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(emupchan);
 
@@ -1057,7 +1057,7 @@ static kobj_method_t emurchan_methods[] = {
        KOBJMETHOD(channel_trigger,             emurchan_trigger),
        KOBJMETHOD(channel_getptr,              emurchan_getptr),
        KOBJMETHOD(channel_getcaps,             emurchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(emurchan);
 

diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 4298364..048a804 100644 (file)
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -682,7 +682,7 @@ envy24_wrcd(kobj_t obj, void *devinfo, int regno, u_int16_t data)
 static kobj_method_t envy24_ac97_methods[] = {
        KOBJMETHOD(ac97_read,   envy24_rdcd),
        KOBJMETHOD(ac97_write,  envy24_wrcd),
-       {0, 0}
+       KOBJMETHOD_END
 };
 AC97_DECLARE(envy24_ac97);
 #endif
@@ -1870,7 +1870,7 @@ static kobj_method_t envy24chan_methods[] = {
        KOBJMETHOD(channel_trigger,             envy24chan_trigger),
        KOBJMETHOD(channel_getptr,              envy24chan_getptr),
        KOBJMETHOD(channel_getcaps,             envy24chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(envy24chan);
 
@@ -1990,7 +1990,7 @@ static kobj_method_t envy24mixer_methods[] = {
        KOBJMETHOD(mixer_uninit,        envy24mixer_uninit),
        KOBJMETHOD(mixer_set,           envy24mixer_set),
        KOBJMETHOD(mixer_setrecsrc,     envy24mixer_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(envy24mixer);
 

diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 5a300b1..4453c84 100644 (file)
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -791,7 +791,7 @@ envy24ht_wrcd(kobj_t obj, void *devinfo, int regno, u_int16_t data)
 static kobj_method_t envy24ht_ac97_methods[] = {
        KOBJMETHOD(ac97_read,   envy24ht_rdcd),
        KOBJMETHOD(ac97_write,  envy24ht_wrcd),
-       {0, 0}
+       KOBJMETHOD_END
 };
 AC97_DECLARE(envy24ht_ac97);
 #endif
@@ -1809,7 +1809,7 @@ static kobj_method_t envy24htchan_methods[] = {
        KOBJMETHOD(channel_trigger,             envy24htchan_trigger),
        KOBJMETHOD(channel_getptr,              envy24htchan_getptr),
        KOBJMETHOD(channel_getcaps,             envy24htchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(envy24htchan);
 
@@ -1934,7 +1934,7 @@ static kobj_method_t envy24htmixer_methods[] = {
        KOBJMETHOD(mixer_uninit,        envy24htmixer_uninit),
        KOBJMETHOD(mixer_set,           envy24htmixer_set),
        KOBJMETHOD(mixer_setrecsrc,     envy24htmixer_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(envy24htmixer);
 

diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 8c96434..5ff3a6b 100644 (file)
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -372,7 +372,7 @@ static kobj_method_t es1370_mixer_methods[] = {
        KOBJMETHOD(mixer_init,          es1370_mixinit),
        KOBJMETHOD(mixer_set,           es1370_mixset),
        KOBJMETHOD(mixer_setrecsrc,     es1370_mixsetrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(es1370_mixer);
 
@@ -689,7 +689,7 @@ static kobj_method_t eschan1370_methods[] = {
        KOBJMETHOD(channel_trigger,             eschan_trigger),
        KOBJMETHOD(channel_getptr,              eschan_getptr),
        KOBJMETHOD(channel_getcaps,             eschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(eschan1370);
 
@@ -701,7 +701,7 @@ static kobj_method_t eschan1371_methods[] = {
        KOBJMETHOD(channel_trigger,             eschan_trigger),
        KOBJMETHOD(channel_getptr,              eschan_getptr),
        KOBJMETHOD(channel_getcaps,             eschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(eschan1371);
 
@@ -962,7 +962,7 @@ es1371_rdcd(kobj_t obj, void *s, int addr)
 static kobj_method_t es1371_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           es1371_rdcd),
        KOBJMETHOD(ac97_write,          es1371_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(es1371_ac97);
 

diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 6d2b2a3..a5c4fb7 100644 (file)
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -274,7 +274,7 @@ fm801_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t fm801_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           fm801_rdcd),
        KOBJMETHOD(ac97_write,          fm801_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(fm801_ac97);
 
@@ -527,7 +527,7 @@ static kobj_method_t fm801ch_methods[] = {
        KOBJMETHOD(channel_trigger,             fm801ch_trigger),
        KOBJMETHOD(channel_getptr,              fm801ch_getptr),
        KOBJMETHOD(channel_getcaps,             fm801ch_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(fm801ch);
 

diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index d5c43c8..8767349 100644 (file)
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -3327,7 +3327,7 @@ static kobj_method_t hdac_channel_methods[] = {
        KOBJMETHOD(channel_trigger,             hdac_channel_trigger),
        KOBJMETHOD(channel_getptr,              hdac_channel_getptr),
        KOBJMETHOD(channel_getcaps,             hdac_channel_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(hdac_channel);
 
@@ -3690,7 +3690,7 @@ static kobj_method_t hdac_audio_ctl_ossmixer_methods[] = {
        KOBJMETHOD(mixer_init,          hdac_audio_ctl_ossmixer_init),
        KOBJMETHOD(mixer_set,           hdac_audio_ctl_ossmixer_set),
        KOBJMETHOD(mixer_setrecsrc,     hdac_audio_ctl_ossmixer_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(hdac_audio_ctl_ossmixer);
 

diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 32682c3..b49873f 100644 (file)
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -298,7 +298,7 @@ ich_wrcd(kobj_t obj, void *devinfo, int regno, uint16_t data)
 static kobj_method_t ich_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           ich_rdcd),
        KOBJMETHOD(ac97_write,          ich_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(ich_ac97);
 
@@ -616,7 +616,7 @@ static kobj_method_t ichchan_methods[] = {
        KOBJMETHOD(channel_trigger,             ichchan_trigger),
        KOBJMETHOD(channel_getptr,              ichchan_getptr),
        KOBJMETHOD(channel_getcaps,             ichchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(ichchan);
 

diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 55ab58f..ad0e8e2 100644 (file)
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -1266,7 +1266,7 @@ static kobj_method_t agg_ac97_methods[] = {
        KOBJMETHOD(ac97_init,           agg_ac97_init),
        KOBJMETHOD(ac97_read,           agg_ac97_read),
        KOBJMETHOD(ac97_write,          agg_ac97_write),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(agg_ac97);
 
@@ -1471,7 +1471,7 @@ static kobj_method_t aggpch_methods[] = {
        KOBJMETHOD(channel_trigger,             aggpch_trigger),
        KOBJMETHOD(channel_getptr,              aggpch_getptr),
        KOBJMETHOD(channel_getcaps,             aggpch_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(aggpch);
 
@@ -1607,7 +1607,7 @@ static kobj_method_t aggrch_methods[] = {
        KOBJMETHOD(channel_trigger,             aggrch_trigger),
        KOBJMETHOD(channel_getptr,              aggrch_getptr),
        KOBJMETHOD(channel_getcaps,             aggrch_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(aggrch);
 

diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 587af38..cfe3212 100644 (file)
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -206,7 +206,7 @@ static kobj_method_t m3_codec_methods[] = {
        KOBJMETHOD(ac97_init,   m3_initcd),
        KOBJMETHOD(ac97_read,   m3_rdcd),
        KOBJMETHOD(ac97_write,  m3_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(m3_codec);
 
@@ -231,7 +231,7 @@ static kobj_method_t m3_pch_methods[] = {
        KOBJMETHOD(channel_getptr,              m3_pchan_getptr),
        KOBJMETHOD(channel_getcaps,             m3_pchan_getcaps),
        KOBJMETHOD(channel_free,                m3_pchan_free),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(m3_pch);
 
@@ -253,7 +253,7 @@ static kobj_method_t m3_rch_methods[] = {
        KOBJMETHOD(channel_getptr,              m3_rchan_getptr),
        KOBJMETHOD(channel_getcaps,             m3_rchan_getcaps),
        KOBJMETHOD(channel_free,                m3_rchan_free),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(m3_rch);
 

diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index c8c3723..cba2dad 100644 (file)
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -279,7 +279,7 @@ static kobj_method_t nm_ac97_methods[] = {
        KOBJMETHOD(ac97_init,           nm_initcd),
        KOBJMETHOD(ac97_read,           nm_rdcd),
        KOBJMETHOD(ac97_write,          nm_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(nm_ac97);
 
@@ -476,7 +476,7 @@ static kobj_method_t nmchan_methods[] = {
        KOBJMETHOD(channel_trigger,             nmchan_trigger),
        KOBJMETHOD(channel_getptr,              nmchan_getptr),
        KOBJMETHOD(channel_getcaps,             nmchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(nmchan);
 

diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 907611b..6121540 100644 (file)
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -637,7 +637,7 @@ static kobj_method_t esschan_methods[] = {
        KOBJMETHOD(channel_trigger,             esschan_trigger),
        KOBJMETHOD(channel_getptr,              esschan_getptr),
        KOBJMETHOD(channel_getcaps,             esschan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(esschan);
 
@@ -755,7 +755,7 @@ static kobj_method_t solomixer_methods[] = {
        KOBJMETHOD(mixer_init,          essmix_init),
        KOBJMETHOD(mixer_set,           essmix_set),
        KOBJMETHOD(mixer_setrecsrc,     essmix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(solomixer);
 

diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index e0af9f5..87555e6 100644 (file)
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -291,7 +291,7 @@ tr_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t tr_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           tr_rdcd),
        KOBJMETHOD(ac97_write,          tr_wrcd),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(tr_ac97);
 
@@ -586,7 +586,7 @@ static kobj_method_t trpchan_methods[] = {
        KOBJMETHOD(channel_trigger,             trpchan_trigger),
        KOBJMETHOD(channel_getptr,              trpchan_getptr),
        KOBJMETHOD(channel_getcaps,             trpchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(trpchan);
 
@@ -709,7 +709,7 @@ static kobj_method_t trrchan_methods[] = {
        KOBJMETHOD(channel_trigger,             trrchan_trigger),
        KOBJMETHOD(channel_getptr,              trrchan_getptr),
        KOBJMETHOD(channel_getcaps,             trrchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(trrchan);
 

diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 2569a24..d2e6aac 100644 (file)
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -309,7 +309,7 @@ via_read_codec(kobj_t obj, void *addr, int reg)
 static kobj_method_t via_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           via_read_codec),
        KOBJMETHOD(ac97_write,          via_write_codec),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(via_ac97);
 
@@ -680,7 +680,7 @@ static kobj_method_t via8233wr_methods[] = {
        KOBJMETHOD(channel_setblocksize,        via8233chan_setblocksize),
        KOBJMETHOD(channel_trigger,             via8233chan_trigger),
        KOBJMETHOD(channel_getptr,              via8233chan_getptr),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(via8233wr);
 
@@ -692,7 +692,7 @@ static kobj_method_t via8233dxs_methods[] = {
        KOBJMETHOD(channel_setblocksize,        via8233chan_setblocksize),
        KOBJMETHOD(channel_trigger,             via8233chan_trigger),
        KOBJMETHOD(channel_getptr,              via8233chan_getptr),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(via8233dxs);
 
@@ -704,7 +704,7 @@ static kobj_method_t via8233msgd_methods[] = {
        KOBJMETHOD(channel_setblocksize,        via8233chan_setblocksize),
        KOBJMETHOD(channel_trigger,             via8233chan_trigger),
        KOBJMETHOD(channel_getptr,              via8233chan_getptr),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(via8233msgd);
 

diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 337a280..ece1256 100644 (file)
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -209,7 +209,7 @@ via_read_codec(kobj_t obj, void *addr, int reg)
 static kobj_method_t via_ac97_methods[] = {
        KOBJMETHOD(ac97_read,           via_read_codec),
        KOBJMETHOD(ac97_write,          via_write_codec),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 AC97_DECLARE(via_ac97);
 
@@ -419,7 +419,7 @@ static kobj_method_t viachan_methods[] = {
        KOBJMETHOD(channel_trigger,             viachan_trigger),
        KOBJMETHOD(channel_getptr,              viachan_getptr),
        KOBJMETHOD(channel_getcaps,             viachan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(viachan);
 

diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 1c59100..0edd64f 100644 (file)
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -369,7 +369,7 @@ static kobj_method_t svrchan_methods[] = {
         KOBJMETHOD(channel_trigger,             svrchan_trigger),
         KOBJMETHOD(channel_getptr,              svrchan_getptr),
         KOBJMETHOD(channel_getcaps,             svchan_getcaps),
-        { 0, 0 }
+        KOBJMETHOD_END
 };
 CHANNEL_DECLARE(svrchan);
 
@@ -445,7 +445,7 @@ static kobj_method_t svpchan_methods[] = {
         KOBJMETHOD(channel_trigger,             svpchan_trigger),
         KOBJMETHOD(channel_getptr,              svpchan_getptr),
         KOBJMETHOD(channel_getcaps,             svchan_getcaps),
-        { 0, 0 }
+        KOBJMETHOD_END
 };
 CHANNEL_DECLARE(svpchan);
 
@@ -557,7 +557,7 @@ static kobj_method_t sv_mixer_methods[] = {
         KOBJMETHOD(mixer_init,         sv_mix_init),
         KOBJMETHOD(mixer_set,          sv_mix_set),
         KOBJMETHOD(mixer_setrecsrc,    sv_mix_setrecsrc),
-        { 0, 0 }
+        KOBJMETHOD_END
 };
 MIXER_DECLARE(sv_mixer);
 

diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 6aa87e2..4af3bae 100644 (file)
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.53.2.6 2007/10/31 04:00:07 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/ac97.c,v 1.26 2007/11/30 07:59:56 hasso Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
@@ -1018,7 +1017,7 @@ static kobj_method_t ac97mixer_methods[] = {
        KOBJMETHOD(mixer_reinit,        ac97mix_reinit),
        KOBJMETHOD(mixer_set,           ac97mix_set),
        KOBJMETHOD(mixer_setrecsrc,     ac97mix_setrecsrc),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(ac97mixer);
 

diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index e4b1840..cde4c5b 100644 (file)
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/fake.c,v 1.14.2.1 2005/12/30 19:55:54 netchild Exp $
- * $DragonFly: src/sys/dev/sound/pcm/fake.c,v 1.5 2007/01/04 21:47:03 corecode Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
@@ -129,7 +128,7 @@ static kobj_method_t fkchan_methods[] = {
        KOBJMETHOD(channel_trigger,             fkchan_trigger),
        KOBJMETHOD(channel_getptr,              fkchan_getptr),
        KOBJMETHOD(channel_getcaps,             fkchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(fkchan);
 

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 9f31f09..0c13a25 100644 (file)
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -540,7 +540,7 @@ feed_root(struct pcm_feeder *feeder, struct pcm_channel *ch, u_int8_t *buffer, u
 
 static kobj_method_t feeder_root_methods[] = {
        KOBJMETHOD(feeder_feed,         feed_root),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 static struct feeder_class feeder_root_class = {
        .name =         "feeder_root",

diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 9579b6e..3832f3e 100644 (file)
--- a/sys/dev/sound/pcm/feeder_fmt.c
+++ b/sys/dev/sound/pcm/feeder_fmt.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.14.2.2 2006/01/29 02:27:28 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.4 2007/01/04 21:47:03 corecode Exp $
- *
  *
  * *New* and rewritten soft format converter, supporting 24/32bit pcm data,
  * simplified and optimized.
@@ -251,7 +249,7 @@ static struct pcm_feederdesc feeder_ulawtou8_desc[] = {
 };
 static kobj_method_t feeder_ulawtou8_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_u8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_ulawtou8, 0, ulaw_to_s8_tbl);
 
@@ -262,7 +260,7 @@ static struct pcm_feederdesc feeder_alawtou8_desc[] = {
 };
 static kobj_method_t feeder_alawtou8_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_u8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_alawtou8, 0, alaw_to_s8_tbl);
 
@@ -273,7 +271,7 @@ static struct pcm_feederdesc feeder_ulawtos16le_desc[] = {
 };
 static kobj_method_t feeder_ulawtos16le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_s16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_ulawtos16le, 0, ulaw_to_s8_tbl);
 
@@ -284,7 +282,7 @@ static struct pcm_feederdesc feeder_alawtos16le_desc[] = {
 };
 static kobj_method_t feeder_alawtos16le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_s16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_alawtos16le, 0, alaw_to_s8_tbl);
 
@@ -295,7 +293,7 @@ static struct pcm_feederdesc feeder_u8toulaw_desc[] = {
 };
 static kobj_method_t feeder_u8toulaw_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_xlaw),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_u8toulaw, 0, u8_to_ulaw_tbl);
 
@@ -306,7 +304,7 @@ static struct pcm_feederdesc feeder_u8toalaw_desc[] = {
 };
 static kobj_method_t feeder_u8toalaw_methods[] = {
        KOBJMETHOD(feeder_feed, feed_table_xlaw),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_u8toalaw, 0, u8_to_alaw_tbl);
 
@@ -364,7 +362,7 @@ static struct pcm_feederdesc feeder_8to16le_desc[] = {
 };
 static kobj_method_t feeder_8to16le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_8to16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_8to16le, 0, NULL);
 
@@ -403,7 +401,7 @@ static kobj_method_t feeder_16leto8_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_16leto8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_16leto8, 0, NULL);
 
@@ -441,7 +439,7 @@ static struct pcm_feederdesc feeder_16leto24le_desc[] = {
 };
 static kobj_method_t feeder_16leto24le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_16leto24le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_16leto24le, 0, NULL);
 
@@ -481,7 +479,7 @@ static kobj_method_t feeder_24leto16le_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_24leto16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_24leto16le, 1, NULL);
 
@@ -517,7 +515,7 @@ static struct pcm_feederdesc feeder_16leto32le_desc[] = {
 };
 static kobj_method_t feeder_16leto32le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_16leto32le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_16leto32le, 0, NULL);
 
@@ -558,7 +556,7 @@ static kobj_method_t feeder_32leto16le_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_32leto16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_32leto16le, 1, NULL);
 /*
@@ -589,7 +587,7 @@ static struct pcm_feederdesc feeder_monotostereo8_desc[] = {
 };
 static kobj_method_t feeder_monotostereo8_methods[] = {
        KOBJMETHOD(feeder_feed, feed_monotostereo8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_monotostereo8, 0, NULL);
 
@@ -628,7 +626,7 @@ static struct pcm_feederdesc feeder_monotostereo16_desc[] = {
 };
 static kobj_method_t feeder_monotostereo16_methods[] = {
        KOBJMETHOD(feeder_feed, feed_monotostereo16),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_monotostereo16, 0, NULL);
 
@@ -670,7 +668,7 @@ static struct pcm_feederdesc feeder_monotostereo24_desc[] = {
 };
 static kobj_method_t feeder_monotostereo24_methods[] = {
        KOBJMETHOD(feeder_feed, feed_monotostereo24),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_monotostereo24, 0, NULL);
 
@@ -715,7 +713,7 @@ static struct pcm_feederdesc feeder_monotostereo32_desc[] = {
 };
 static kobj_method_t feeder_monotostereo32_methods[] = {
        KOBJMETHOD(feeder_feed, feed_monotostereo32),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_monotostereo32, 0, NULL);
 /*
@@ -758,7 +756,7 @@ static kobj_method_t feeder_stereotomono8_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_stereotomono8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_stereotomono8, 0, NULL);
 
@@ -798,7 +796,7 @@ static kobj_method_t feeder_stereotomono16_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_stereotomono16),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_stereotomono16, 0, NULL);
 
@@ -839,7 +837,7 @@ static kobj_method_t feeder_stereotomono24_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_stereotomono24),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_stereotomono24, 0, NULL);
 
@@ -881,7 +879,7 @@ static kobj_method_t feeder_stereotomono32_methods[] = {
        KOBJMETHOD(feeder_init, feed_common_init),
        KOBJMETHOD(feeder_free, feed_common_free),
        KOBJMETHOD(feeder_feed, feed_stereotomono32),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_stereotomono32, 0, NULL);
 /*
@@ -911,7 +909,7 @@ static struct pcm_feederdesc feeder_sign8_desc[] = {
 };
 static kobj_method_t feeder_sign8_methods[] = {
        KOBJMETHOD(feeder_feed, feed_sign8),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_sign8, 0, NULL);
 
@@ -944,7 +942,7 @@ static struct pcm_feederdesc feeder_sign16le_desc[] = {
 };
 static kobj_method_t feeder_sign16le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_sign16le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_sign16le, 0, NULL);
 
@@ -977,7 +975,7 @@ static struct pcm_feederdesc feeder_sign24le_desc[] = {
 };
 static kobj_method_t feeder_sign24le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_sign24le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_sign24le, 0, NULL);
 
@@ -1010,7 +1008,7 @@ static struct pcm_feederdesc feeder_sign32le_desc[] = {
 };
 static kobj_method_t feeder_sign32le_methods[] = {
        KOBJMETHOD(feeder_feed, feed_sign32le),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_sign32le, 0, NULL);
 /*
@@ -1055,7 +1053,7 @@ static struct pcm_feederdesc feeder_endian16_desc[] = {
 };
 static kobj_method_t feeder_endian16_methods[] = {
        KOBJMETHOD(feeder_feed, feed_endian16),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_endian16, 0, NULL);
 
@@ -1094,7 +1092,7 @@ static struct pcm_feederdesc feeder_endian24_desc[] = {
 };
 static kobj_method_t feeder_endian24_methods[] = {
        KOBJMETHOD(feeder_feed, feed_endian24),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_endian24, 0, NULL);
 
@@ -1136,7 +1134,7 @@ static struct pcm_feederdesc feeder_endian32_desc[] = {
 };
 static kobj_method_t feeder_endian32_methods[] = {
        KOBJMETHOD(feeder_feed, feed_endian32),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_endian32, 0, NULL);
 /*

diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 88d5394..c230641 100644 (file)
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -823,6 +823,6 @@ static kobj_method_t feeder_rate_methods[] = {
        KOBJMETHOD(feeder_set,          feed_rate_set),
        KOBJMETHOD(feeder_get,          feed_rate_get),
        KOBJMETHOD(feeder_feed,         feed_rate),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_rate, 2, NULL);

diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index 4267083..2618b7b 100644 (file)
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -24,8 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/feeder_volume.c,v 1.2.2.1 2005/12/30 19:55:54 netchild Exp $
- * $DragonFly: src/sys/dev/sound/pcm/feeder_volume.c,v 1.1 2007/01/04 21:47:03 corecode Exp $
- *
  *
  * feeder_volume, a long 'Lost Technology' rather than a new feature.
  */
@@ -77,6 +75,6 @@ static struct pcm_feederdesc feeder_volume_s16_desc[] = {
 };
 static kobj_method_t feeder_volume_s16_methods[] = {
        KOBJMETHOD(feeder_feed, feed_volume_s16),
-       {0, 0}
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_volume_s16, 2, NULL);

diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index 8a0d307..e3b029f 100644 (file)
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/vchan.c,v 1.17.2.5 2007/02/04 06:17:14 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/vchan.c,v 1.8 2008/01/06 16:55:51 swildner Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
@@ -161,7 +160,7 @@ static struct pcm_feederdesc feeder_vchan_s16_desc[] = {
 };
 static kobj_method_t feeder_vchan_s16_methods[] = {
        KOBJMETHOD(feeder_feed,         feed_vchan_s16),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 FEEDER_DECLARE(feeder_vchan_s16, 2, NULL);
 
@@ -297,7 +296,7 @@ static kobj_method_t vchan_methods[] = {
        KOBJMETHOD(channel_setblocksize,        vchan_setblocksize),
        KOBJMETHOD(channel_trigger,             vchan_trigger),
        KOBJMETHOD(channel_getcaps,             vchan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 CHANNEL_DECLARE(vchan);
 

diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index fd94902..451d543 100644 (file)
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -223,7 +223,7 @@ static kobj_method_t ua_chan_methods[] = {
        KOBJMETHOD(channel_trigger,             ua_chan_trigger),
        KOBJMETHOD(channel_getptr,              ua_chan_getptr),
        KOBJMETHOD(channel_getcaps,             ua_chan_getcaps),
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 
 CHANNEL_DECLARE(ua_chan);
@@ -291,7 +291,7 @@ static kobj_method_t ua_mixer_methods[] = {
        KOBJMETHOD(mixer_set,           ua_mixer_set),
        KOBJMETHOD(mixer_setrecsrc,     ua_mixer_setrecsrc),
 
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 MIXER_DECLARE(ua_mixer);
 /************************************************************/

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 9f69e7e..ac0f7ef 100644 (file)
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -3046,7 +3046,7 @@ static kobj_method_t root_methods[] = {
        KOBJMETHOD(bus_setup_intr,      root_setup_intr),
        KOBJMETHOD(bus_child_present,   root_child_present),
 
-       { 0, 0 }
+       KOBJMETHOD_END
 };
 
 static driver_t root_driver = {

diff --git a/sys/libiconv/iconv_xlat.c b/sys/libiconv/iconv_xlat.c
index 9d4dd99..94a0115 100644 (file)
--- a/sys/libiconv/iconv_xlat.c
+++ b/sys/libiconv/iconv_xlat.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/libkern/iconv_xlat.c,v 1.5.30.1 2009/04/15 03:14:26 kensmith Exp $
- * $DragonFly: src/sys/libiconv/iconv_xlat.c,v 1.3 2004/03/18 18:27:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -126,7 +125,7 @@ static kobj_method_t iconv_xlat_methods[] = {
        KOBJMETHOD(iconv_converter_done,        iconv_xlat_done),
 #endif
        KOBJMETHOD(iconv_converter_name,        iconv_xlat_name),
-       {0, 0}
+       KOBJMETHOD_END
 };
 
 KICONV_CONVERTER(xlat, sizeof(struct iconv_xlat));

diff --git a/sys/libiconv/iconv_xlat16.c b/sys/libiconv/iconv_xlat16.c
index aec7fd9..0c9cd4d 100644 (file)
--- a/sys/libiconv/iconv_xlat16.c
+++ b/sys/libiconv/iconv_xlat16.c
@@ -240,7 +240,7 @@ static kobj_method_t iconv_xlat16_methods[] = {
        KOBJMETHOD(iconv_converter_done,        iconv_xlat16_done),
 #endif
        KOBJMETHOD(iconv_converter_name,        iconv_xlat16_name),
-       {0, 0}
+       KOBJMETHOD_END
 };
 
 KICONV_CONVERTER(xlat16, sizeof(struct iconv_xlat16));

diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index d85f09b..d002bae 100644 (file)
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -101,6 +101,7 @@ struct kobjop_desc {
  * Shorthand for constructing method tables.
  */
 #define KOBJMETHOD(NAME, FUNC) { &NAME##_desc, (kobjop_t) FUNC }
+#define KOBJMETHOD_END { NULL, NULL }
 
 /*
  * Declare a class (which should be defined in another file.