Make room for a cookie argument passed to audio_attach_mi(). Currently

unused but intended to be used to correlate audio and wskbd devices.

ok ratchov@

20 files changed, 40 insertions, 40 deletions

diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index c42f78e0abb..c042bedc8b9 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auacer.c,v 1.22 2019/12/14 12:35:19 fcambus Exp $	*/
+/*	$OpenBSD: auacer.c,v 1.23 2022/02/16 06:21:18 anton Exp $	*/
 /*	$NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $	*/
 
 /*-
@@ -274,7 +274,7 @@ auacer_attach(struct device *parent, struct device *self, void *aux)
 	if (ac97_attach(&sc->host_if) != 0)
 		return;
 
-	audio_attach_mi(&auacer_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&auacer_hw_if, sc, NULL, &sc->sc_dev);
 
 	auacer_reset(sc);
 }
diff --git a/sys/dev/pci/auglx.c b/sys/dev/pci/auglx.c
index 84bbf238a5b..dd293021742 100644
--- a/sys/dev/pci/auglx.c
+++ b/sys/dev/pci/auglx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: auglx.c,v 1.17 2019/12/14 12:37:05 fcambus Exp $	*/
+/*      $OpenBSD: auglx.c,v 1.18 2022/02/16 06:21:18 anton Exp $	*/
 
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -334,7 +334,7 @@ auglx_attach(struct device *parent, struct device *self, void *aux)
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, bar_size);
 		return;
 	}
-	audio_attach_mi(&auglx_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&auglx_hw_if, sc, NULL, &sc->sc_dev);
 }
 
 /* Functions to communicate with the AC97 Codec via the ACC */
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index ab1403a6c73..925c960103e 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.113 2022/01/09 05:42:45 jsg Exp $	*/
+/*	$OpenBSD: auich.c,v 1.114 2022/02/16 06:21:18 anton Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -512,7 +512,7 @@ auich_attach(struct device *parent, struct device *self, void *aux)
 		goto fail_disestablish_intr;
 	sc->codec_if->vtbl->unlock(sc->codec_if);
 
-	audio_attach_mi(&auich_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&auich_hw_if, sc, NULL, &sc->sc_dev);
 
 	/* Watch for power changes */
 	sc->suspend = DVACT_RESUME;
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 578572e1a91..a69a66f1a64 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.44 2022/01/09 05:42:45 jsg Exp $ */
+/* $OpenBSD: auixp.c,v 1.45 2022/02/16 06:21:18 anton Exp $ */
 /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
 
 /*
@@ -1035,7 +1035,7 @@ auixp_post_config(struct device *self)
 		return;
 	}
 
-	audio_attach_mi(&auixp_hw_if, &sc->sc_codec, &sc->sc_dev);
+	audio_attach_mi(&auixp_hw_if, &sc->sc_codec, NULL, &sc->sc_dev);
 
 	if (sc->has_spdif)
 		sc->has_spdif = 0;
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 7f85a254b81..228e3f2d0e5 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autri.c,v 1.44 2020/01/11 09:08:39 cheloha Exp $	*/
+/*	$OpenBSD: autri.c,v 1.45 2022/02/16 06:21:18 anton Exp $	*/
 
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -574,7 +574,7 @@ autri_attach(struct device *parent, struct device *self, void *aux)
 	ctl.dev = autri_get_portnum_by_name(sc,AudioCoutputs,AudioNmaster,NULL);
 	autri_mixer_set_port(sc, &ctl);
 
-	audio_attach_mi(&autri_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&autri_hw_if, sc, NULL, &sc->sc_dev);
 
 #if NMIDI > 0
 	midi_attach_mi(&autri_midi_hw_if, sc, &sc->sc_dev);
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 8ca4e924543..39145b52e39 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auvia.c,v 1.60 2019/12/01 21:14:13 fcambus Exp $ */
+/*	$OpenBSD: auvia.c,v 1.61 2022/02/16 06:21:18 anton Exp $ */
 /*	$NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $	*/
 
 /*-
@@ -346,7 +346,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 	    AudioCoutputs, AudioNmaster, NULL);
 	auvia_set_port(sc, &ctl);
 
-	audio_attach_mi(&auvia_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&auvia_hw_if, sc, NULL, &sc->sc_dev);
 	sc->codec_if->vtbl->unlock(sc->codec_if);
 }
 
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 83fa8d1d7f0..ee3da2b6451 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.268 2022/01/11 00:37:23 jsg Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.269 2022/02/16 06:21:18 anton Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -588,7 +588,7 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux)
 	if (azalia_init_streams(sc))
 		goto err_exit;
 
-	audio_attach_mi(&azalia_hw_if, sc, &sc->dev);
+	audio_attach_mi(&azalia_hw_if, sc, NULL, &sc->dev);
 
 	return;
 
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 40ebb9bad7d..03c0c39b9e2 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmpci.c,v 1.46 2022/01/09 05:42:45 jsg Exp $	*/
+/*	$OpenBSD: cmpci.c,v 1.47 2022/02/16 06:21:18 anton Exp $	*/
 /*	$NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $	*/
 
 /*
@@ -392,7 +392,7 @@ cmpci_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_dmat = pa->pa_dmat;
 
-	audio_attach_mi(&cmpci_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&cmpci_hw_if, sc, NULL, &sc->sc_dev);
 
 	/* attach OPL device */
 	aa.type = AUDIODEV_TYPE_OPL;
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index f24d6d75dda..e75aa0c034e 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4280.c,v 1.54 2022/01/09 05:42:45 jsg Exp $	*/
+/*	$OpenBSD: cs4280.c,v 1.55 2022/02/16 06:21:19 anton Exp $	*/
 /*	$NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $	*/
 
 /*
@@ -548,7 +548,7 @@ cs4280_attachhook(struct device *self)
 					     AudioNcd, AudioNmute);
 	cs4280_mixer_set_port(sc, &ctl);
 
-	audio_attach_mi(&cs4280_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&cs4280_hw_if, sc, NULL, &sc->sc_dev);
 
 #if NMIDI > 0
 	midi_attach_mi(&cs4280_midi_hw_if, sc, &sc->sc_dev);
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index ac2ae6bccf4..b21149786b1 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4281.c,v 1.39 2022/01/09 05:42:45 jsg Exp $ */
+/*	$OpenBSD: cs4281.c,v 1.40 2022/02/16 06:21:19 anton Exp $ */
 /*	$Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $	*/
 
 /*
@@ -327,7 +327,7 @@ cs4281_attach(struct device *parent, struct device *self, void *aux)
 		printf("%s: ac97_attach failed\n", sc->sc_dev.dv_xname);
 		return;
 	}
-	audio_attach_mi(&cs4281_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&cs4281_hw_if, sc, NULL, &sc->sc_dev);
 
 #if NMIDI > 0
 	midi_attach_mi(&cs4281_midi_hw_if, sc, &sc->sc_dev);
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 18662619337..e20114c4789 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: eap.c,v 1.58 2020/01/11 09:09:09 cheloha Exp $ */
+/*      $OpenBSD: eap.c,v 1.59 2022/02/16 06:21:19 anton Exp $ */
 /*	$NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
 
 /*
@@ -588,7 +588,7 @@ eap_attach(struct device *parent, struct device *self, void *aux)
 		eap_hw_if = &eap1371_hw_if;
 	}
 
-	audio_attach_mi(eap_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(eap_hw_if, sc, NULL, &sc->sc_dev);
 #if NMIDI > 0
 	sc->sc_mididev = midi_attach_mi(&eap_midi_hw_if, sc, &sc->sc_dev);
 #endif
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 35ae40dda02..792a9b449cc 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxki.c,v 1.55 2022/01/09 05:42:45 jsg Exp $	*/
+/*	$OpenBSD: emuxki.c,v 1.56 2022/02/16 06:21:19 anton Exp $	*/
 /*	$NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -474,7 +474,7 @@ emuxki_attach(struct device *parent, struct device *self, void *aux)
 	if (emuxki_scinit(sc, 0) ||
 	    /* APS has no ac97 XXX */
 	    (sc->sc_flags & EMUXKI_APS || emuxki_ac97_init(sc)) ||
-	    (sc->sc_audev = audio_attach_mi(&emuxki_hw_if, sc, self)) == NULL) {
+	    (sc->sc_audev = audio_attach_mi(&emuxki_hw_if, sc, NULL, self)) == NULL) {
 		emuxki_pci_shutdown(sc);
 		return;
 	}
diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c
index c43bbf43ece..22ae8ea3cf1 100644
--- a/sys/dev/pci/envy.c
+++ b/sys/dev/pci/envy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: envy.c,v 1.81 2020/01/05 01:07:58 jsg Exp $	*/
+/*	$OpenBSD: envy.c,v 1.82 2022/02/16 06:21:19 anton Exp $	*/
 /*
  * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
  *
@@ -1761,7 +1761,7 @@ envyattach(struct device *parent, struct device *self, void *aux)
 	printf("%s: %s, %u inputs, %u outputs\n", DEVNAME(sc),
 	    sc->card->name, sc->card->nich, sc->card->noch);
 	envy_reset(sc);
-	sc->audio = audio_attach_mi(&envy_hw_if, sc, &sc->dev);
+	sc->audio = audio_attach_mi(&envy_hw_if, sc, NULL, &sc->dev);
 #if NMIDI > 0
 	if (sc->card->nmidi > 0 && (!sc->isht ||
 		sc->eeprom[ENVY_EEPROM_CONF] & ENVY_CONF_MIDI)) {
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 286db17038b..7d3627d8862 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esa.c,v 1.35 2018/09/14 08:37:34 miko Exp $	*/
+/*	$OpenBSD: esa.c,v 1.36 2022/02/16 06:21:19 anton Exp $	*/
 /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
 
 /*
@@ -1048,7 +1048,7 @@ esa_attach(struct device *parent, struct device *self, void *aux)
 		sc->voice[i].parent = (struct device *)sc;
 		sc->voice[i].index = i;
 		sc->sc_audiodev[i] =
-		    audio_attach_mi(&esa_hw_if, &sc->voice[i], &sc->sc_dev);
+		    audio_attach_mi(&esa_hw_if, &sc->voice[i], NULL, &sc->sc_dev);
 	}
 }
 
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 3df0f89b01b..21e84e24b8b 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eso.c,v 1.47 2020/01/19 00:18:34 cheloha Exp $	*/
+/*	$OpenBSD: eso.c,v 1.48 2022/02/16 06:21:19 anton Exp $	*/
 /*	$NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $	*/
 
 /*
@@ -289,7 +289,7 @@ eso_attach(struct device *parent, struct device *self, void *aux)
 		config_defer((struct device *)sc, eso_defer);
 	}
 	
-	audio_attach_mi(&eso_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&eso_hw_if, sc, NULL, &sc->sc_dev);
 
 	aa.type = AUDIODEV_TYPE_OPL;
 	aa.hwif = NULL;
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index b07694ff71a..1c5aa781a8d 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fms.c,v 1.30 2016/12/20 15:31:00 ratchov Exp $ */
+/*	$OpenBSD: fms.c,v 1.31 2022/02/16 06:21:19 anton Exp $ */
 /*	$NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $	*/
 
 /*-
@@ -256,7 +256,7 @@ fms_attach(struct device *parent, struct device *self, void *aux)
 		fms_set_port(sc, &ctl);
 	}
 
-	audio_attach_mi(&fms_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&fms_hw_if, sc, NULL, &sc->sc_dev);
 
 	aa.type = AUDIODEV_TYPE_OPL;
 	aa.hwif = NULL;
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index f3523120203..c5e6692bd9b 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maestro.c,v 1.43 2018/04/11 04:48:31 ratchov Exp $	*/
+/*	$OpenBSD: maestro.c,v 1.44 2022/02/16 06:21:19 anton Exp $	*/
 /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
 /*
  * FreeBSD's ESS Agogo/Maestro driver 
@@ -727,7 +727,7 @@ maestro_attach(struct device *parent, struct device *self, void *aux)
 	sc->record.mode = 0;
 
 	/* Attach audio */
-	audio_attach_mi(&maestro_hw_if, sc, &sc->dev);
+	audio_attach_mi(&maestro_hw_if, sc, NULL, &sc->dev);
 	return;
 
  bad:
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index 3548c09f2da..b01986863c6 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: neo.c,v 1.34 2022/01/09 05:42:58 jsg Exp $       */
+/*      $OpenBSD: neo.c,v 1.35 2022/02/16 06:21:19 anton Exp $       */
 
 /*
  * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -597,7 +597,7 @@ neo_attach(struct device *parent, struct device *self, void *aux)
 	if ((error = ac97_attach(&sc->host_if)) != 0)
 		return;
 
-	audio_attach_mi(&neo_hw_if, sc, &sc->dev);
+	audio_attach_mi(&neo_hw_if, sc, NULL, &sc->dev);
 
 	return;
 }
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 40e38941a0a..d402785fc2e 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sv.c,v 1.37 2022/02/02 03:55:29 jsg Exp $ */
+/*      $OpenBSD: sv.c,v 1.38 2022/02/16 06:21:19 anton Exp $ */
 
 /*
  * Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -357,7 +357,7 @@ sv_attach(struct device *parent, struct device *self, void *aux)
 
   sv_init_mixer(sc);
 
-  audio_attach_mi(&sv_hw_if, sc, &sc->sc_dev);
+  audio_attach_mi(&sv_hw_if, sc, NULL, &sc->sc_dev);
 }
 
 #ifdef AUDIO_DEBUG
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 010665375d7..84fd5d8805b 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yds.c,v 1.56 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: yds.c,v 1.57 2022/02/16 06:21:19 anton Exp $	*/
 /*	$NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $	*/
 
 /*
@@ -785,7 +785,7 @@ yds_attachhook(struct device *self)
 		sc->sc_codec[0].codec_if, AudioCoutputs, AudioNmaster, NULL);
 	yds_mixer_set_port(sc, &ctl);
 
-	audio_attach_mi(&yds_hw_if, sc, &sc->sc_dev);
+	audio_attach_mi(&yds_hw_if, sc, NULL, &sc->sc_dev);
 
 	/* Watch for power changes */
 	sc->suspend = DVACT_RESUME;