Tue Apr 16 18:59:49 2024 UTC (23d)

Pull up following revision(s) (requested by thorpej in ticket #651):

	sys/dev/usb/ugen.c: revision 1.177

ugen and ugenif share the same /dev/ugenN.xx namespace in such a way
that the device unit number does not necessarily match the /dev/ugenN.xx
unit number (N).  If you ONLY have ugen devices, it happens to work out
and devpubd scripts can be extremely naive.  If you ONLY have ugenif
devices, it also happens to work out, but your devpubd scripts have to
slightly more informed.  If you have a mix of ugen AND ugenif devices,
though, you're pretty much out of luck.

So, this change adds a "ugen-unit" device property which devpubd scripts
can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif
device is using.


(martin)

diff -r1.171.2.1 -r1.171.2.2 src/sys/dev/usb/ugen.c

--- src/sys/dev/usb/ugen.c 2024/04/16 18:45:39	1.171.2.1
+++ src/sys/dev/usb/ugen.c 2024/04/16 18:59:49	1.171.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 martin Exp $	*/
+/*	$NetBSD: ugen.c,v 1.171.2.2 2024/04/16 18:59:49 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and the Department of the Interior National Business
  * Center under agreement number NBCHC050166.
 @@ -27,27 +27,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.171.2.2 2024/04/16 18:59:49 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 @@ -219,32 +219,38 @@ ugenif_get_unit(struct ugen_softc *sc)
 	unsigned i;
 	mutex_enter(&ugenif.lock);
 	for (i = 0, sc0 = RB_TREE_MIN(&ugenif.tree);
 	     sc0 != NULL && i == sc0->sc_unit;
 	     i++, sc0 = RB_TREE_NEXT(&ugenif.tree, sc0))
 		KASSERT(i < UINT_MAX);
 	KASSERT(rb_tree_find_node(&ugenif.tree, &i) == NULL);
 	sc->sc_unit = i;
 	sc0 = rb_tree_insert_node(&ugenif.tree, sc);
 	KASSERT(sc0 == sc);
 	KASSERT(rb_tree_find_node(&ugenif.tree, &i) == sc);
 	mutex_exit(&ugenif.lock);
 	prop_dictionary_set_uint(device_properties(sc->sc_dev),
 	    "ugen-unit", sc->sc_unit);
+}
 static void
 ugenif_put_unit(struct ugen_softc *sc)
+{
 	prop_dictionary_remove(device_properties(sc->sc_dev),
 	    "ugen-unit");
 	mutex_enter(&ugenif.lock);
 	KASSERT(rb_tree_find_node(&ugenif.tree, &sc->sc_unit) == sc);
 	rb_tree_remove_node(&ugenif.tree, sc);
 	sc->sc_unit = -1;
 	mutex_exit(&ugenif.lock);
+}
 static struct ugen_softc *
 ugenif_acquire(unsigned unit)
+{
 	struct ugen_softc *sc;
 	mutex_enter(&ugenif.lock);