 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.39 2020/06/26 10:14:32 martin Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.40 2020/07/16 21:32:44 jmcneill Exp $	*/
 /*
  * Copyright 1998
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -24,27 +24,27 @@
  * 3) This software is provided "AS-IS" and any express or implied
  *    warranties, including but not limited to, any implied warranties
  *    of merchantability, fitness for a particular purpose, or
  *    non-infringement are disclaimed. In no event shall DIGITAL be
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.39 2020/06/26 10:14:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.40 2020/07/16 21:32:44 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <dev/ofw/openfirm.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
+ *
  * This routine converts OFW encoded-int datums
 @@ -327,26 +327,46 @@ of_find_firstchild_byname(int node, cons
 	int nn;
 	for (nn = OF_child(node); nn; nn = OF_peer(nn)) {
 		memset(namex, 0, sizeof(namex));
 		if (OF_getprop(nn, "name", namex, sizeof(namex)) == -1)
 			continue;
 		if (strcmp(name, namex) == 0)
 			return nn;
+	}
 	return -1;
+}
 /*
  * Find a child node that is compatible with str. Recurses, starting at node.
  */
 int
 of_find_bycompat(int node, const char *str)
+{
 	const char * compatible[] = { str, NULL };
 	int child, ret;
 	for (child = OF_child(node); child; child = OF_peer(child)) {
 		if (of_match_compatible(child, compatible) != 0)
 			return child;
 		ret = of_find_bycompat(child, str);
 		if (ret != -1)
 			return ret;
+	}
 	return -1;
+}
 /*
  * Find a give node by name.  Recurses, and seems to walk upwards too.
  */
 int
 of_getnode_byname(int start, const char *target)
+{
 	int node, next;
 	char name[64];
 	if (start == 0)
 		start = OF_peer(0);
 	for (node = start; node; node = next) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: openfirm.h,v 1.38 2019/08/06 18:17:52 tnn Exp $	*/
+/*	$NetBSD: openfirm.h,v 1.39 2020/07/16 21:32:44 jmcneill Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -106,26 +106,27 @@ int	OF_write(int, const void *, int);
 int	openfirmware(void *);
 /*
  * Functions and variables provided by machine-independent code.
  */
 int	of_compatible(int, const char * const *);
 int	of_match_compatible(int, const char * const *);
 int	of_match_compat_data(int, const struct of_compat_data *);
 const struct of_compat_data *
 	of_search_compatible(int, const struct of_compat_data *);
 int	of_decode_int(const unsigned char *);
 int	of_packagename(int, char *, int);
 int	of_find_firstchild_byname(int, const char *);
 int	of_find_bycompat(int, const char *);
 int	of_getnode_byname(int, const char *);
 boolean_t	of_to_uint32_prop(prop_dictionary_t, int, const char *,
     const char *);
 boolean_t	of_to_dataprop(prop_dictionary_t, int, const char *,
     const char *);
 int	*of_network_decode_media(int, int *, int *);
 char	*of_get_mode_string(char *, int);
 void	of_enter_i2c_devs(prop_dictionary_t, int, size_t, int);
 void	of_enter_spi_devs(prop_dictionary_t, int, size_t);
 bool	of_hasprop(int, const char *);