 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.49 2021/01/25 12:15:33 jmcneill Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.50 2021/01/25 19:59:49 mrg 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.49 2021/01/25 12:15:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.50 2021/01/25 19:59:49 mrg Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/i2c/i2cvar.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
 @@ -385,43 +385,43 @@ of_getnode_byname(int start, const char
 				break;
 			node = OF_parent(node);
+		}
+	}
 	/* XXX is this correct? */
 	return node;
+}
 /*
  * Create a uint32_t integer property from an OFW node property.
  */
-boolean_t
+bool
 of_to_uint32_prop(prop_dictionary_t dict, int node, const char *ofname,
     const char *propname)
+{
 	uint32_t prop;
 	if (OF_getprop(node, ofname, &prop, sizeof(prop)) != sizeof(prop))
 		return FALSE;
 	return(prop_dictionary_set_uint32(dict, propname, prop));
+}
 /*
  * Create a data property from an OFW node property.  Max size of 256bytes.
  */
-boolean_t
+bool
 of_to_dataprop(prop_dictionary_t dict, int node, const char *ofname,
     const char *propname)
+{
 	int len;
 	uint8_t prop[256];
 	len = OF_getprop(node, ofname, prop, 256);
 	if (len < 1)
 		return FALSE;
 	return prop_dictionary_set_data(dict, propname, prop, len);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: openfirm.h,v 1.41 2021/01/18 02:35:49 thorpej Exp $	*/
+/*	$NetBSD: openfirm.h,v 1.42 2021/01/25 19:59:49 mrg 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
 @@ -105,30 +105,28 @@ int	openfirmware(void *);
  */
 struct device_compatible_entry;
 int	of_compatible(int, const char * const *);
 int	of_match_compatible(int, const char * const *);
 int	of_match_compat_data(int, const struct device_compatible_entry *);
 const struct device_compatible_entry *
 	of_search_compatible(int, const struct device_compatible_entry *);
 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 *,
+bool	of_to_uint32_prop(prop_dictionary_t, int, const char *, const char *);
-    const char *);
+bool	of_to_dataprop(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 *);
 #define of_getprop_bool	of_hasprop
 int	of_getprop_uint32(int, const char *, uint32_t *);
 int	of_getprop_uint32_array(int, const char *, uint32_t *, int);
 int	of_getprop_uint64(int, const char *, uint64_t *);

 @@ -109,27 +109,27 @@ static inline void
 ixgbe_send_vf_nack(struct adapter *adapter, struct ixgbe_vf *vf, u32 msg)
+{
 	msg &= IXGBE_VT_MSG_MASK;
 	ixgbe_send_vf_msg(adapter, vf, msg | IXGBE_VT_MSGTYPE_NACK);
+}
 static inline void
 ixgbe_process_vf_ack(struct adapter *adapter, struct ixgbe_vf *vf)
+{
 	if (!(vf->flags & IXGBE_VF_CTS))
 		ixgbe_send_vf_nack(adapter, vf, 0);
+}
-static inline boolean_t
+static inline bool
 ixgbe_vf_mac_changed(struct ixgbe_vf *vf, const uint8_t *mac)
+{
 	return (bcmp(mac, vf->ether_addr, ETHER_ADDR_LEN) != 0);
+}
 static inline int
 ixgbe_vf_queues(int mode)
+{
 	switch (mode) {
 	case IXGBE_64_VM:
 		return (2);
 	case IXGBE_32_VM:
 		return (4);
 @@ -254,27 +254,27 @@ static void
 ixgbe_clear_vfmbmem(struct ixgbe_hw *hw, struct ixgbe_vf *vf)
+{
 	uint32_t vf_index = IXGBE_VF_INDEX(vf->pool);
 	uint16_t mbx_size = hw->mbx.size;
 	uint16_t i;
 	IXGBE_CORE_LOCK_ASSERT(adapter);
 	for (i = 0; i < mbx_size; ++i)
 		IXGBE_WRITE_REG_ARRAY(hw, IXGBE_PFMBMEM(vf_index), i, 0x0);
 } /* ixgbe_clear_vfmbmem */
-static boolean_t
+static bool
 ixgbe_vf_frame_size_compatible(struct adapter *adapter, struct ixgbe_vf *vf)
+{
 	/*
 	 * Frame size compatibility between PF and VF is only a problem on
 	 * 82599-based cards.  X540 and later support any combination of jumbo
 	 * frames on PFs and VFs.
 	 */
 	if (adapter->hw.mac.type != ixgbe_mac_82599EB)
 		return (TRUE);
 	switch (vf->api_ver) {
 	case IXGBE_API_VER_1_0: