Update to FreeBSD head 2017-04-04

Git mirror commit 642b174daddbd0efd9bb5f242c43f4ab4db6869f.

8 files changed, 870 insertions, 50 deletions

diff --git a/rtemsbsd/include/rtems/bsd/local/bus_if.h b/rtemsbsd/include/rtems/bsd/local/bus_if.h
index 2376b896..fb71413f 100644
--- a/rtemsbsd/include/rtems/bsd/local/bus_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/bus_if.h
@@ -212,7 +212,7 @@ typedef device_t bus_add_child_t(device_t _dev, u_int _order, const char *_name,
 /**
  * @brief Create a new child device
  *
- * For busses which use use drivers supporting DEVICE_IDENTIFY() to
+ * For buses which use use drivers supporting DEVICE_IDENTIFY() to
  * enumerate their devices, this method is used to create new
  * device instances. The new device will be added after the last
  * existing child with the same order. Implementations of bus_add_child
@@ -564,7 +564,7 @@ typedef int bus_set_resource_t(device_t _dev, device_t _child, int _type,
  * @brief Define a resource which can be allocated with
  * BUS_ALLOC_RESOURCE().
  *
- * This method is used by some busses (typically ISA) to allow a
+ * This method is used by some buses (typically ISA) to allow a
  * driver to describe a resource range that it would like to
  * allocate. The resource defined by @p _type and @p _rid is defined
  * to start at @p _start and to include @p _count indices in its
@@ -679,7 +679,7 @@ typedef int bus_child_present_t(device_t _dev, device_t _child);
  * should return -1 if it is present.  Any errors in determining
  * should be returned as a normal errno value.  Client drivers are to
  * assume that the device is present, even if there is an error
- * determining if it is there.  Busses are to try to avoid returning
+ * determining if it is there.  Buses are to try to avoid returning
  * errors, but newcard will return an error if the device fails to
  * implement this method.
  * 
diff --git a/rtemsbsd/include/rtems/bsd/local/ifdi_if.h b/rtemsbsd/include/rtems/bsd/local/ifdi_if.h
new file mode 100644
index 00000000..b1a5da05
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/ifdi_if.h
@@ -0,0 +1,520 @@
+/*
+ * This file is produced automatically.
+ * Do not modify anything in here by hand.
+ *
+ * Created from source file
+ *   freebsd-org/sys/net/ifdi_if.m
+ * with
+ *   makeobjops.awk
+ *
+ * See the source file for legal information
+ */
+
+
+#ifndef _ifdi_if_h_
+#define _ifdi_if_h_
+
+/** @brief Unique descriptor for the IFDI_ATTACH_PRE() method */
+extern struct kobjop_desc ifdi_attach_pre_desc;
+/** @brief A function implementing the IFDI_ATTACH_PRE() method */
+typedef int ifdi_attach_pre_t(if_ctx_t _ctx);
+
+static __inline int IFDI_ATTACH_PRE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_attach_pre);
+	return ((ifdi_attach_pre_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_ATTACH_POST() method */
+extern struct kobjop_desc ifdi_attach_post_desc;
+/** @brief A function implementing the IFDI_ATTACH_POST() method */
+typedef int ifdi_attach_post_t(if_ctx_t _ctx);
+
+static __inline int IFDI_ATTACH_POST(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_attach_post);
+	return ((ifdi_attach_post_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_DETACH() method */
+extern struct kobjop_desc ifdi_detach_desc;
+/** @brief A function implementing the IFDI_DETACH() method */
+typedef int ifdi_detach_t(if_ctx_t _ctx);
+
+static __inline int IFDI_DETACH(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_detach);
+	return ((ifdi_detach_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_SUSPEND() method */
+extern struct kobjop_desc ifdi_suspend_desc;
+/** @brief A function implementing the IFDI_SUSPEND() method */
+typedef int ifdi_suspend_t(if_ctx_t _ctx);
+
+static __inline int IFDI_SUSPEND(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_suspend);
+	return ((ifdi_suspend_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_SHUTDOWN() method */
+extern struct kobjop_desc ifdi_shutdown_desc;
+/** @brief A function implementing the IFDI_SHUTDOWN() method */
+typedef int ifdi_shutdown_t(if_ctx_t _ctx);
+
+static __inline int IFDI_SHUTDOWN(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_shutdown);
+	return ((ifdi_shutdown_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_RESUME() method */
+extern struct kobjop_desc ifdi_resume_desc;
+/** @brief A function implementing the IFDI_RESUME() method */
+typedef int ifdi_resume_t(if_ctx_t _ctx);
+
+static __inline int IFDI_RESUME(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_resume);
+	return ((ifdi_resume_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_TX_QUEUES_ALLOC() method */
+extern struct kobjop_desc ifdi_tx_queues_alloc_desc;
+/** @brief A function implementing the IFDI_TX_QUEUES_ALLOC() method */
+typedef int ifdi_tx_queues_alloc_t(if_ctx_t _ctx, caddr_t *_vaddrs,
+                                   uint64_t *_paddrs, int ntxqs, int ntxqsets);
+
+static __inline int IFDI_TX_QUEUES_ALLOC(if_ctx_t _ctx, caddr_t *_vaddrs,
+                                         uint64_t *_paddrs, int ntxqs,
+                                         int ntxqsets)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_tx_queues_alloc);
+	return ((ifdi_tx_queues_alloc_t *) _m)(_ctx, _vaddrs, _paddrs, ntxqs, ntxqsets);
+}
+
+/** @brief Unique descriptor for the IFDI_RX_QUEUES_ALLOC() method */
+extern struct kobjop_desc ifdi_rx_queues_alloc_desc;
+/** @brief A function implementing the IFDI_RX_QUEUES_ALLOC() method */
+typedef int ifdi_rx_queues_alloc_t(if_ctx_t _ctx, caddr_t *_vaddrs,
+                                   uint64_t *_paddrs, int nrxqs, int nrxqsets);
+
+static __inline int IFDI_RX_QUEUES_ALLOC(if_ctx_t _ctx, caddr_t *_vaddrs,
+                                         uint64_t *_paddrs, int nrxqs,
+                                         int nrxqsets)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_rx_queues_alloc);
+	return ((ifdi_rx_queues_alloc_t *) _m)(_ctx, _vaddrs, _paddrs, nrxqs, nrxqsets);
+}
+
+/** @brief Unique descriptor for the IFDI_QUEUES_FREE() method */
+extern struct kobjop_desc ifdi_queues_free_desc;
+/** @brief A function implementing the IFDI_QUEUES_FREE() method */
+typedef void ifdi_queues_free_t(if_ctx_t _ctx);
+
+static __inline void IFDI_QUEUES_FREE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_queues_free);
+	((ifdi_queues_free_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_INIT() method */
+extern struct kobjop_desc ifdi_init_desc;
+/** @brief A function implementing the IFDI_INIT() method */
+typedef void ifdi_init_t(if_ctx_t _ctx);
+
+static __inline void IFDI_INIT(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_init);
+	((ifdi_init_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_STOP() method */
+extern struct kobjop_desc ifdi_stop_desc;
+/** @brief A function implementing the IFDI_STOP() method */
+typedef void ifdi_stop_t(if_ctx_t _ctx);
+
+static __inline void IFDI_STOP(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_stop);
+	((ifdi_stop_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_MSIX_INTR_ASSIGN() method */
+extern struct kobjop_desc ifdi_msix_intr_assign_desc;
+/** @brief A function implementing the IFDI_MSIX_INTR_ASSIGN() method */
+typedef int ifdi_msix_intr_assign_t(if_ctx_t _sctx, int msix);
+
+static __inline int IFDI_MSIX_INTR_ASSIGN(if_ctx_t _sctx, int msix)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_sctx)->ops,ifdi_msix_intr_assign);
+	return ((ifdi_msix_intr_assign_t *) _m)(_sctx, msix);
+}
+
+/** @brief Unique descriptor for the IFDI_INTR_ENABLE() method */
+extern struct kobjop_desc ifdi_intr_enable_desc;
+/** @brief A function implementing the IFDI_INTR_ENABLE() method */
+typedef void ifdi_intr_enable_t(if_ctx_t _ctx);
+
+static __inline void IFDI_INTR_ENABLE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_intr_enable);
+	((ifdi_intr_enable_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_INTR_DISABLE() method */
+extern struct kobjop_desc ifdi_intr_disable_desc;
+/** @brief A function implementing the IFDI_INTR_DISABLE() method */
+typedef void ifdi_intr_disable_t(if_ctx_t _ctx);
+
+static __inline void IFDI_INTR_DISABLE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_intr_disable);
+	((ifdi_intr_disable_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_RX_QUEUE_INTR_ENABLE() method */
+extern struct kobjop_desc ifdi_rx_queue_intr_enable_desc;
+/** @brief A function implementing the IFDI_RX_QUEUE_INTR_ENABLE() method */
+typedef int ifdi_rx_queue_intr_enable_t(if_ctx_t _ctx, uint16_t _qid);
+
+static __inline int IFDI_RX_QUEUE_INTR_ENABLE(if_ctx_t _ctx, uint16_t _qid)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_rx_queue_intr_enable);
+	return ((ifdi_rx_queue_intr_enable_t *) _m)(_ctx, _qid);
+}
+
+/** @brief Unique descriptor for the IFDI_TX_QUEUE_INTR_ENABLE() method */
+extern struct kobjop_desc ifdi_tx_queue_intr_enable_desc;
+/** @brief A function implementing the IFDI_TX_QUEUE_INTR_ENABLE() method */
+typedef int ifdi_tx_queue_intr_enable_t(if_ctx_t _ctx, uint16_t _qid);
+
+static __inline int IFDI_TX_QUEUE_INTR_ENABLE(if_ctx_t _ctx, uint16_t _qid)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_tx_queue_intr_enable);
+	return ((ifdi_tx_queue_intr_enable_t *) _m)(_ctx, _qid);
+}
+
+/** @brief Unique descriptor for the IFDI_LINK_INTR_ENABLE() method */
+extern struct kobjop_desc ifdi_link_intr_enable_desc;
+/** @brief A function implementing the IFDI_LINK_INTR_ENABLE() method */
+typedef void ifdi_link_intr_enable_t(if_ctx_t _ctx);
+
+static __inline void IFDI_LINK_INTR_ENABLE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_link_intr_enable);
+	((ifdi_link_intr_enable_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_MULTI_SET() method */
+extern struct kobjop_desc ifdi_multi_set_desc;
+/** @brief A function implementing the IFDI_MULTI_SET() method */
+typedef void ifdi_multi_set_t(if_ctx_t _ctx);
+
+static __inline void IFDI_MULTI_SET(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_multi_set);
+	((ifdi_multi_set_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_MTU_SET() method */
+extern struct kobjop_desc ifdi_mtu_set_desc;
+/** @brief A function implementing the IFDI_MTU_SET() method */
+typedef int ifdi_mtu_set_t(if_ctx_t _ctx, uint32_t _mtu);
+
+static __inline int IFDI_MTU_SET(if_ctx_t _ctx, uint32_t _mtu)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_mtu_set);
+	return ((ifdi_mtu_set_t *) _m)(_ctx, _mtu);
+}
+
+/** @brief Unique descriptor for the IFDI_MEDIA_SET() method */
+extern struct kobjop_desc ifdi_media_set_desc;
+/** @brief A function implementing the IFDI_MEDIA_SET() method */
+typedef void ifdi_media_set_t(if_ctx_t _ctx);
+
+static __inline void IFDI_MEDIA_SET(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_media_set);
+	((ifdi_media_set_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_PROMISC_SET() method */
+extern struct kobjop_desc ifdi_promisc_set_desc;
+/** @brief A function implementing the IFDI_PROMISC_SET() method */
+typedef int ifdi_promisc_set_t(if_ctx_t _ctx, int _flags);
+
+static __inline int IFDI_PROMISC_SET(if_ctx_t _ctx, int _flags)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_promisc_set);
+	return ((ifdi_promisc_set_t *) _m)(_ctx, _flags);
+}
+
+/** @brief Unique descriptor for the IFDI_CRCSTRIP_SET() method */
+extern struct kobjop_desc ifdi_crcstrip_set_desc;
+/** @brief A function implementing the IFDI_CRCSTRIP_SET() method */
+typedef void ifdi_crcstrip_set_t(if_ctx_t _ctx, int _onoff, int _strip);
+
+static __inline void IFDI_CRCSTRIP_SET(if_ctx_t _ctx, int _onoff, int _strip)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_crcstrip_set);
+	((ifdi_crcstrip_set_t *) _m)(_ctx, _onoff, _strip);
+}
+
+/** @brief Unique descriptor for the IFDI_VFLR_HANDLE() method */
+extern struct kobjop_desc ifdi_vflr_handle_desc;
+/** @brief A function implementing the IFDI_VFLR_HANDLE() method */
+typedef void ifdi_vflr_handle_t(if_ctx_t _ctx);
+
+static __inline void IFDI_VFLR_HANDLE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_vflr_handle);
+	((ifdi_vflr_handle_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_IOV_INIT() method */
+extern struct kobjop_desc ifdi_iov_init_desc;
+/** @brief A function implementing the IFDI_IOV_INIT() method */
+typedef int ifdi_iov_init_t(if_ctx_t _ctx, uint16_t num_vfs,
+                            const nvlist_t * params);
+
+static __inline int IFDI_IOV_INIT(if_ctx_t _ctx, uint16_t num_vfs,
+                                  const nvlist_t * params)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_iov_init);
+	return ((ifdi_iov_init_t *) _m)(_ctx, num_vfs, params);
+}
+
+/** @brief Unique descriptor for the IFDI_IOV_UNINIT() method */
+extern struct kobjop_desc ifdi_iov_uninit_desc;
+/** @brief A function implementing the IFDI_IOV_UNINIT() method */
+typedef void ifdi_iov_uninit_t(if_ctx_t _ctx);
+
+static __inline void IFDI_IOV_UNINIT(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_iov_uninit);
+	((ifdi_iov_uninit_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_IOV_VF_ADD() method */
+extern struct kobjop_desc ifdi_iov_vf_add_desc;
+/** @brief A function implementing the IFDI_IOV_VF_ADD() method */
+typedef int ifdi_iov_vf_add_t(if_ctx_t _ctx, uint16_t num_vfs,
+                              const nvlist_t * params);
+
+static __inline int IFDI_IOV_VF_ADD(if_ctx_t _ctx, uint16_t num_vfs,
+                                    const nvlist_t * params)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_iov_vf_add);
+	return ((ifdi_iov_vf_add_t *) _m)(_ctx, num_vfs, params);
+}
+
+/** @brief Unique descriptor for the IFDI_UPDATE_ADMIN_STATUS() method */
+extern struct kobjop_desc ifdi_update_admin_status_desc;
+/** @brief A function implementing the IFDI_UPDATE_ADMIN_STATUS() method */
+typedef void ifdi_update_admin_status_t(if_ctx_t _ctx);
+
+static __inline void IFDI_UPDATE_ADMIN_STATUS(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_update_admin_status);
+	((ifdi_update_admin_status_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_MEDIA_STATUS() method */
+extern struct kobjop_desc ifdi_media_status_desc;
+/** @brief A function implementing the IFDI_MEDIA_STATUS() method */
+typedef void ifdi_media_status_t(if_ctx_t _ctx, struct ifmediareq *_ifm);
+
+static __inline void IFDI_MEDIA_STATUS(if_ctx_t _ctx, struct ifmediareq *_ifm)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_media_status);
+	((ifdi_media_status_t *) _m)(_ctx, _ifm);
+}
+
+/** @brief Unique descriptor for the IFDI_MEDIA_CHANGE() method */
+extern struct kobjop_desc ifdi_media_change_desc;
+/** @brief A function implementing the IFDI_MEDIA_CHANGE() method */
+typedef int ifdi_media_change_t(if_ctx_t _ctx);
+
+static __inline int IFDI_MEDIA_CHANGE(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_media_change);
+	return ((ifdi_media_change_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_GET_COUNTER() method */
+extern struct kobjop_desc ifdi_get_counter_desc;
+/** @brief A function implementing the IFDI_GET_COUNTER() method */
+typedef uint64_t ifdi_get_counter_t(if_ctx_t _ctx, ift_counter cnt);
+
+static __inline uint64_t IFDI_GET_COUNTER(if_ctx_t _ctx, ift_counter cnt)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_get_counter);
+	return ((ifdi_get_counter_t *) _m)(_ctx, cnt);
+}
+
+/** @brief Unique descriptor for the IFDI_PRIV_IOCTL() method */
+extern struct kobjop_desc ifdi_priv_ioctl_desc;
+/** @brief A function implementing the IFDI_PRIV_IOCTL() method */
+typedef int ifdi_priv_ioctl_t(if_ctx_t _ctx, u_long _cmd, caddr_t _data);
+
+static __inline int IFDI_PRIV_IOCTL(if_ctx_t _ctx, u_long _cmd, caddr_t _data)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_priv_ioctl);
+	return ((ifdi_priv_ioctl_t *) _m)(_ctx, _cmd, _data);
+}
+
+/** @brief Unique descriptor for the IFDI_I2C_REQ() method */
+extern struct kobjop_desc ifdi_i2c_req_desc;
+/** @brief A function implementing the IFDI_I2C_REQ() method */
+typedef int ifdi_i2c_req_t(if_ctx_t _ctx, struct ifi2creq *_req);
+
+static __inline int IFDI_I2C_REQ(if_ctx_t _ctx, struct ifi2creq *_req)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_i2c_req);
+	return ((ifdi_i2c_req_t *) _m)(_ctx, _req);
+}
+
+/** @brief Unique descriptor for the IFDI_TXQ_SETUP() method */
+extern struct kobjop_desc ifdi_txq_setup_desc;
+/** @brief A function implementing the IFDI_TXQ_SETUP() method */
+typedef int ifdi_txq_setup_t(if_ctx_t _ctx, uint32_t _txqid);
+
+static __inline int IFDI_TXQ_SETUP(if_ctx_t _ctx, uint32_t _txqid)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_txq_setup);
+	return ((ifdi_txq_setup_t *) _m)(_ctx, _txqid);
+}
+
+/** @brief Unique descriptor for the IFDI_RXQ_SETUP() method */
+extern struct kobjop_desc ifdi_rxq_setup_desc;
+/** @brief A function implementing the IFDI_RXQ_SETUP() method */
+typedef int ifdi_rxq_setup_t(if_ctx_t _ctx, uint32_t _txqid);
+
+static __inline int IFDI_RXQ_SETUP(if_ctx_t _ctx, uint32_t _txqid)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_rxq_setup);
+	return ((ifdi_rxq_setup_t *) _m)(_ctx, _txqid);
+}
+
+/** @brief Unique descriptor for the IFDI_TIMER() method */
+extern struct kobjop_desc ifdi_timer_desc;
+/** @brief A function implementing the IFDI_TIMER() method */
+typedef void ifdi_timer_t(if_ctx_t _ctx, uint16_t _txqid);
+
+static __inline void IFDI_TIMER(if_ctx_t _ctx, uint16_t _txqid)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_timer);
+	((ifdi_timer_t *) _m)(_ctx, _txqid);
+}
+
+/** @brief Unique descriptor for the IFDI_WATCHDOG_RESET() method */
+extern struct kobjop_desc ifdi_watchdog_reset_desc;
+/** @brief A function implementing the IFDI_WATCHDOG_RESET() method */
+typedef void ifdi_watchdog_reset_t(if_ctx_t _ctx);
+
+static __inline void IFDI_WATCHDOG_RESET(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_watchdog_reset);
+	((ifdi_watchdog_reset_t *) _m)(_ctx);
+}
+
+/** @brief Unique descriptor for the IFDI_LED_FUNC() method */
+extern struct kobjop_desc ifdi_led_func_desc;
+/** @brief A function implementing the IFDI_LED_FUNC() method */
+typedef void ifdi_led_func_t(if_ctx_t _ctx, int _onoff);
+
+static __inline void IFDI_LED_FUNC(if_ctx_t _ctx, int _onoff)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_led_func);
+	((ifdi_led_func_t *) _m)(_ctx, _onoff);
+}
+
+/** @brief Unique descriptor for the IFDI_VLAN_REGISTER() method */
+extern struct kobjop_desc ifdi_vlan_register_desc;
+/** @brief A function implementing the IFDI_VLAN_REGISTER() method */
+typedef void ifdi_vlan_register_t(if_ctx_t _ctx, uint16_t _vtag);
+
+static __inline void IFDI_VLAN_REGISTER(if_ctx_t _ctx, uint16_t _vtag)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_vlan_register);
+	((ifdi_vlan_register_t *) _m)(_ctx, _vtag);
+}
+
+/** @brief Unique descriptor for the IFDI_VLAN_UNREGISTER() method */
+extern struct kobjop_desc ifdi_vlan_unregister_desc;
+/** @brief A function implementing the IFDI_VLAN_UNREGISTER() method */
+typedef void ifdi_vlan_unregister_t(if_ctx_t _ctx, uint16_t _vtag);
+
+static __inline void IFDI_VLAN_UNREGISTER(if_ctx_t _ctx, uint16_t _vtag)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_vlan_unregister);
+	((ifdi_vlan_unregister_t *) _m)(_ctx, _vtag);
+}
+
+/** @brief Unique descriptor for the IFDI_SYSCTL_INT_DELAY() method */
+extern struct kobjop_desc ifdi_sysctl_int_delay_desc;
+/** @brief A function implementing the IFDI_SYSCTL_INT_DELAY() method */
+typedef int ifdi_sysctl_int_delay_t(if_ctx_t _sctx, if_int_delay_info_t _iidi);
+
+static __inline int IFDI_SYSCTL_INT_DELAY(if_ctx_t _sctx,
+                                          if_int_delay_info_t _iidi)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_sctx)->ops,ifdi_sysctl_int_delay);
+	return ((ifdi_sysctl_int_delay_t *) _m)(_sctx, _iidi);
+}
+
+/** @brief Unique descriptor for the IFDI_DEBUG() method */
+extern struct kobjop_desc ifdi_debug_desc;
+/** @brief A function implementing the IFDI_DEBUG() method */
+typedef void ifdi_debug_t(if_ctx_t _ctx);
+
+static __inline void IFDI_DEBUG(if_ctx_t _ctx)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)_ctx)->ops,ifdi_debug);
+	((ifdi_debug_t *) _m)(_ctx);
+}
+
+#endif /* _ifdi_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h b/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h
index f11e201d..33cb98e6 100644
--- a/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h
@@ -3,7 +3,7 @@
  * Do not modify anything in here by hand.
  *
  * Created from source file
- *   dev/mmc/mmcbr_if.m
+ *   freebsd-org/sys/dev/mmc/mmcbr_if.m
  * with
  *   makeobjops.awk
  *
@@ -26,6 +26,18 @@ static __inline int MMCBR_UPDATE_IOS(device_t brdev, device_t reqdev)
 	return ((mmcbr_update_ios_t *) _m)(brdev, reqdev);
 }
 
+/** @brief Unique descriptor for the MMCBR_SWITCH_VCCQ() method */
+extern struct kobjop_desc mmcbr_switch_vccq_desc;
+/** @brief A function implementing the MMCBR_SWITCH_VCCQ() method */
+typedef int mmcbr_switch_vccq_t(device_t brdev, device_t reqdev);
+
+static __inline int MMCBR_SWITCH_VCCQ(device_t brdev, device_t reqdev)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbr_switch_vccq);
+	return ((mmcbr_switch_vccq_t *) _m)(brdev, reqdev);
+}
+
 /** @brief Unique descriptor for the MMCBR_REQUEST() method */
 extern struct kobjop_desc mmcbr_request_desc;
 /** @brief A function implementing the MMCBR_REQUEST() method */
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_ratelimit.h b/rtemsbsd/include/rtems/bsd/local/opt_ratelimit.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_ratelimit.h
diff --git a/rtemsbsd/include/rtems/bsd/local/pci_if.h b/rtemsbsd/include/rtems/bsd/local/pci_if.h
index 2f11c95a..6350dc7e 100644
--- a/rtemsbsd/include/rtems/bsd/local/pci_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/pci_if.h
@@ -22,6 +22,11 @@ enum pci_id_type {
     PCI_ID_MSI,
 };
 
+enum pci_feature {
+    PCI_FEATURE_HP,		/* Hot Plug feature */
+    PCI_FEATURE_AER,		/* Advanced Error Reporting */
+};
+
 /** @brief Unique descriptor for the PCI_READ_CONFIG() method */
 extern struct kobjop_desc pci_read_config_desc;
 /** @brief A function implementing the PCI_READ_CONFIG() method */
diff --git a/rtemsbsd/include/rtems/bsd/local/pcib_if.h b/rtemsbsd/include/rtems/bsd/local/pcib_if.h
index a7c06c31..a362d74f 100644
--- a/rtemsbsd/include/rtems/bsd/local/pcib_if.h
+++ b/rtemsbsd/include/rtems/bsd/local/pcib_if.h
@@ -214,4 +214,18 @@ static __inline void PCIB_DECODE_RID(device_t pcib, uint16_t rid, int *bus,
 	((pcib_decode_rid_t *) _m)(pcib, rid, bus, slot, func);
 }
 
+/** @brief Unique descriptor for the PCIB_REQUEST_FEATURE() method */
+extern struct kobjop_desc pcib_request_feature_desc;
+/** @brief A function implementing the PCIB_REQUEST_FEATURE() method */
+typedef int pcib_request_feature_t(device_t pcib, device_t dev,
+                                   enum pci_feature feature);
+
+static __inline int PCIB_REQUEST_FEATURE(device_t pcib, device_t dev,
+                                         enum pci_feature feature)
+{
+	kobjop_t _m;
+	KOBJOPLOOKUP(((kobj_t)pcib)->ops,pcib_request_feature);
+	return ((pcib_request_feature_t *) _m)(pcib, dev, feature);
+}
+
 #endif /* _pcib_if_h_ */
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
index 941a7ac7..73c13394 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
@@ -594,6 +594,7 @@
 #define	USB_VENDOR_CURITEL	0x106c		/* Curitel Communications Inc */
 #define	USB_VENDOR_SILABS2	0x10a6		/* SILABS2 */
 #define	USB_VENDOR_USI	0x10ab		/* USI */
+#define	USB_VENDOR_HONEYWELL	0x10ac		/* Honeywell */
 #define	USB_VENDOR_LIEBERT2	0x10af		/* Liebert */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
@@ -601,6 +602,7 @@
 #define	USB_VENDOR_SILABS3	0x10c5		/* Silicon Labs */
 #define	USB_VENDOR_SILABS4	0x10ce		/* Silicon Labs */
 #define	USB_VENDOR_ACTIONS	0x10d6		/* Actions */
+#define	USB_VENDOR_MOXA	0x110a		/* Moxa */
 #define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices */
 #define	USB_VENDOR_TENX	0x1130		/* Ten X Technology, Inc. */
 #define	USB_VENDOR_ISSC	0x1131		/* Integrated System Solution Corp. */
@@ -705,6 +707,7 @@
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_QUALCOMMINC	0x19d2		/* Qualcomm, Incorporated */
 #define	USB_VENDOR_QUALCOMM3	0x19f5		/* Qualcomm, Inc. */
+#define	USB_VENDOR_ABBOTT	0x1a61		/* Abbott Diabetics */
 #define	USB_VENDOR_BAYER	0x1a79		/* Bayer */
 #define	USB_VENDOR_WCH2	0x1a86		/* QinHeng Electronics */
 #define	USB_VENDOR_STELERA	0x1a8d		/* Stelera Wireless */
@@ -751,6 +754,7 @@
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_HIROSE	0x2631		/* Hirose Electric */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
+#define	USB_VENDOR_THINGM	0x27b8		/* ThingM */
 #define	USB_VENDOR_PLANEX	0x2c02		/* Planex Communications */
 #define	USB_VENDOR_VIDZMEDIA	0x3275		/* VidzMedia Pte Ltd */
 #define	USB_VENDOR_LINKINSTRUMENTS	0x3195		/* Link Instruments Inc. */
@@ -813,6 +817,10 @@
 #define	USB_PRODUCT_3COMUSR_HOMECONN	0x009d		/* 3Com HomeConnect Camera */
 #define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S. Robotics 56000 Voice FaxModem Pro */
 
+/* Abbott Diabetics */
+#define	USB_PRODUCT_ABBOTT_STEREO_PLUG	0x3410		/* Abbott Diabetics Stereo Plug */
+#define	USB_PRODUCT_ABBOTT_STRIP_PORT	0x3420		/* Abbott Diabetics Strip Port */
+
 /* AboCom products */
 #define	USB_PRODUCT_ABOCOM_XX1	0x110c		/* XX1 */
 #define	USB_PRODUCT_ABOCOM_XX2	0x200c		/* XX2 */
@@ -1325,6 +1333,7 @@
 #define	USB_PRODUCT_BELKIN_F9L1103	0x1103		/* F9L1103 Wireless Adapter */
 #define	USB_PRODUCT_BELKIN_RTL8192CU	0x2102		/* RTL8192CU Wireless Adapter */
 #define	USB_PRODUCT_BELKIN_F7D2102	0x2103		/* F7D2102 Wireless Adapter */
+#define	USB_PRODUCT_BELKIN_F5U258	0x258A		/* F5U258 Host to Host cable */
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
 #define	USB_PRODUCT_BELKIN_F5D5055	0x5055		/* F5D5055 */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 Wireless Adapter */
@@ -1449,6 +1458,9 @@
 #define	USB_PRODUCT_CLIPSAL_C5000CT2	0x0305		/* C5000CT2 C-Bus Touch Screen */
 #define	USB_PRODUCT_CLIPSAL_L51xx	0x0401		/* L51xx C-Bus Dimmer */
 
+/* C-Media products */
+#define	USB_PRODUCT_CMEDIA_CM6206	0x0102		/* CM106 compatible sound device */
+
 /* CMOTECH products */
 #define	USB_PRODUCT_CMOTECH_CNU510	0x5141		/* CDMA Technologies USB modem */
 #define	USB_PRODUCT_CMOTECH_CNU550	0x5543		/* CDMA 2000 1xRTT/1xEVDO USB modem */
@@ -2293,6 +2305,9 @@
 /* Holtek products */
 #define	USB_PRODUCT_HOLTEK_F85	0xa030		/* Holtek USB gaming keyboard */
 
+/* Honeywell */
+#define	USB_PRODUCT_HONEYWELL_HGI80	0x0102		/* Honeywell HGI80 Wireless USB Gateway */
+
 /* HP products */
 #define	USB_PRODUCT_HP_895C	0x0004		/* DeskJet 895C */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
@@ -2427,7 +2442,9 @@
 #define	USB_PRODUCT_HUAWEI_K4505	0x1464		/* 3G modem */
 #define	USB_PRODUCT_HUAWEI_K3765	0x1465		/* 3G modem */
 #define	USB_PRODUCT_HUAWEI_E1820	0x14ac		/* E1820 HSPA+ USB Slider */
+#define	USB_PRODUCT_HUAWEI_K3771_INIT	0x14c4		/* K3771 Initial */
 #define	USB_PRODUCT_HUAWEI_K3770	0x14c9		/* 3G modem */
+#define	USB_PRODUCT_HUAWEI_K3771	0x14ca		/* K3771 */
 #define	USB_PRODUCT_HUAWEI_K3772	0x14cf		/* K3772 */
 #define	USB_PRODUCT_HUAWEI_K3770_INIT	0x14d1		/* K3770 Initial */
 #define	USB_PRODUCT_HUAWEI_E3131_INIT	0x14fe		/* 3G modem initial */
@@ -2451,6 +2468,9 @@
 
 /* IBM Corporation */
 #define	USB_PRODUCT_IBM_USBCDROMDRIVE	0x4427		/* USB CD-ROM Drive */
+#define	USB_PRODUCT_IBM_USB4543	0x4543		/* TI IBM USB 4543 Modem */
+#define	USB_PRODUCT_IBM_USB454B	0x454b		/* TI IBM USB 454B Modem */
+#define	USB_PRODUCT_IBM_USB454C	0x454c		/* TI IBM USB 454C Modem */
 
 /* Icom products */
 #define	USB_PRODUCT_ICOM_SP1	0x0004		/* FTDI compatible adapter */
@@ -3225,12 +3245,27 @@
 #define	USB_PRODUCT_MOTOROLA4_RT2770	0x9031		/* RT2770 */
 #define	USB_PRODUCT_MOTOROLA4_RT3070	0x9032		/* RT3070 */
 
+/* Moxa */
+#define	USB_PRODUCT_MOXA_MXU1_1110	0x1110		/* Moxa Uport 1110 */
+#define	USB_PRODUCT_MOXA_MXU1_1130	0x1130		/* Moxa Uport 1130 */
+#define	USB_PRODUCT_MOXA_MXU1_1131	0x1131		/* Moxa Uport 1131 */
+#define	USB_PRODUCT_MOXA_MXU1_1150	0x1150		/* Moxa Uport 1150 */
+#define	USB_PRODUCT_MOXA_MXU1_1151	0x1151		/* Moxa Uport 1151 */
+
 /* MpMan products */
 #define	USB_PRODUCT_MPMAN_MPF400_2	0x25a8		/* MPF400 Music Player 2Go */
 #define	USB_PRODUCT_MPMAN_MPF400_1	0x36d0		/* MPF400 Music Player 1Go */
 
 /* MultiTech products */
+#define	USB_PRODUCT_MULTITECH_MT9234ZBA_2	0x0319		/* MT9234ZBA USB modem (alt) */
 #define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA-USB modem */
+#define	USB_PRODUCT_MULTITECH_GSM	0xf108		/* GSM USB Modem */
+#define	USB_PRODUCT_MULTITECH_CDMA	0xf109		/* CDMA USB Modem */
+#define	USB_PRODUCT_MULTITECH_CDMA_FW	0xf110		/* CDMA USB Modem firmware running */
+#define	USB_PRODUCT_MULTITECH_GSM_FW	0xf111		/* GSM USB Modem firmware running */
+#define	USB_PRODUCT_MULTITECH_EDGE	0xf112		/* Edge USB Modem */
+#define	USB_PRODUCT_MULTITECH_MT9234MU	0xf114		/* MT9234 MU */
+#define	USB_PRODUCT_MULTITECH_MT9234ZBA	0xf115		/* MT9234 ZBA */
 
 /* Mustek products */
 #define	USB_PRODUCT_MUSTEK_1200CU	0x0001		/* 1200 CU scanner */
@@ -3818,6 +3853,7 @@
 #define	USB_PRODUCT_REALTEK_USB20CRW	0x0158		/* USB20CRW Card Reader */
 #define	USB_PRODUCT_REALTEK_RTL8188ETV	0x0179		/* RTL8188ETV */
 #define	USB_PRODUCT_REALTEK_RTL8188CTV	0x018a		/* RTL8188CTV */
+#define	USB_PRODUCT_REALTEK_RTL8188RU_2	0x317f		/* RTL8188RU */
 #define	USB_PRODUCT_REALTEK_USBKR100	0x8150		/* USBKR100 USB Ethernet */
 #define	USB_PRODUCT_REALTEK_RTL8152	0x8152		/* RTL8152 USB Ethernet */
 #define	USB_PRODUCT_REALTEK_RTL8153	0x8153		/* RTL8153 USB Ethernet */
@@ -3827,27 +3863,27 @@
 #define	USB_PRODUCT_REALTEK_RTL8173	0x8173		/* RTL8173 */
 #define	USB_PRODUCT_REALTEK_RTL8174	0x8174		/* RTL8174 */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_0	0x8176		/* RTL8188CU */
-#define	USB_PRODUCT_REALTEK_RTL8192CU_1	0x8178		/* RTL8192CU */
+#define	USB_PRODUCT_REALTEK_RTL8191CU	0x8177		/* RTL8191CU */
+#define	USB_PRODUCT_REALTEK_RTL8192CU	0x8178		/* RTL8192CU */
 #define	USB_PRODUCT_REALTEK_RTL8188EU	0x8179		/* RTL8188EU */
-#define	USB_PRODUCT_REALTEK_RTL8188CE_1	0x817e		/* RTL8188CE */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_1	0x817a		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_2	0x817b		/* RTL8188CU */
+#define	USB_PRODUCT_REALTEK_RTL8192CE	0x817c		/* RTL8192CE */
+#define	USB_PRODUCT_REALTEK_RTL8188RU_1	0x817d		/* RTL8188RU */
+#define	USB_PRODUCT_REALTEK_RTL8188CE_1	0x817e		/* RTL8188CE */
+#define	USB_PRODUCT_REALTEK_RTL8188RU_3	0x817f		/* RTL8188RU */
 #define	USB_PRODUCT_REALTEK_RTL8187	0x8187		/* RTL8187 Wireless Adapter */
 #define	USB_PRODUCT_REALTEK_RTL8187B_0	0x8189		/* RTL8187B Wireless Adapter */
+#define	USB_PRODUCT_REALTEK_RTL8188CUS	0x818a		/* RTL8188CUS */
+#define	USB_PRODUCT_REALTEK_RTL8192EU	0x818b		/* RTL8192EU */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_3	0x8191		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8196EU	0x8196		/* RTL8196EU */
 #define	USB_PRODUCT_REALTEK_RTL8187B_1	0x8197		/* RTL8187B Wireless Adapter */
 #define	USB_PRODUCT_REALTEK_RTL8187B_2	0x8198		/* RTL8187B Wireless Adapter */
-#define	USB_PRODUCT_REALTEK_RTL8188CUS	0x818a		/* RTL8188CUS */
-#define	USB_PRODUCT_REALTEK_RTL8188CU_COMBO	0x8754		/* RTL8188CU */
-#define	USB_PRODUCT_REALTEK_RTL8191CU	0x8177		/* RTL8191CU */
-#define	USB_PRODUCT_REALTEK_RTL8192CU	0x8178		/* RTL8192CU */
-#define	USB_PRODUCT_REALTEK_RTL8192CE	0x817c		/* RTL8192CE */
-#define	USB_PRODUCT_REALTEK_RTL8188RU_1	0x817d		/* RTL8188RU */
-#define	USB_PRODUCT_REALTEK_RTL8188RU_3	0x817f		/* RTL8188RU */
 #define	USB_PRODUCT_REALTEK_RTL8712	0x8712		/* RTL8712 */
-#define	USB_PRODUCT_REALTEK_RTL8713	0x8712		/* RTL8713 */
-#define	USB_PRODUCT_REALTEK_RTL8188RU_2	0x317f		/* RTL8188RU */
+#define	USB_PRODUCT_REALTEK_RTL8713	0x8713		/* RTL8713 */
+#define	USB_PRODUCT_REALTEK_RTL8188CU_COMBO	0x8754		/* RTL8188CU */
+#define	USB_PRODUCT_REALTEK_RTL8723BU	0xb720		/* RTL8723BU */
 #define	USB_PRODUCT_REALTEK_RTL8192SU	0xc512		/* RTL8192SU */
 
 /* RedOctane products */
@@ -4465,9 +4501,19 @@
 /* Ten X Technology, Inc. */
 #define	USB_PRODUCT_TENX_UAUDIO0	0xf211		/* USB audio headset */
 
+/* ThingM products */
+#define	USB_PRODUCT_THINGM_BLINK1	0x01ed		/* USB notification light */
+
 /* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 #define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
+#define	USB_PRODUCT_TI_USB3410	0x3410		/* TI USB 3410 Modem */
+#define	USB_PRODUCT_TI_USB5052	0x5052		/* TI USB 5250 Modem */
+#define	USB_PRODUCT_TI_FRI2	0x5053		/* TI Fish River Island II */
+#define	USB_PRODUCT_TI_USB5052_EEPROM	0x505a		/* TI USB 5250 Modem w/Eeprom */
+#define	USB_PRODUCT_TI_USB5052_FW	0x505f		/* TI USB 5250 Modme w/Firmware running */
+#define	USB_PRODUCT_TI_USB5152	0x5152		/* TI USB 5152 Modem */
+#define	USB_PRODUCT_TI_EZ430	0xf430		/* TI ex430 development tool */
 
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
@@ -4487,6 +4533,7 @@
 
 /* TP-Link products */
 #define	USB_PRODUCT_TPLINK_T4U	0x0101		/* Archer T4U */
+#define	USB_PRODUCT_TPLINK_WN822NV4	0x0108		/* TL-WN822N v4 */
 #define	USB_PRODUCT_TPLINK_WN823NV2	0x0109		/* TL-WN823N v2 */
 
 /* Trek Technology products */
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
index 5936c8ca..91375d64 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
@@ -130,6 +130,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "U.S. Robotics 56000 Voice FaxModem Pro",
 	},
 	{
+	    USB_VENDOR_ABBOTT, USB_PRODUCT_ABBOTT_STEREO_PLUG,
+	    0,
+	    "Abbott Diabetics",
+	    "Abbott Diabetics Stereo Plug",
+	},
+	{
+	    USB_VENDOR_ABBOTT, USB_PRODUCT_ABBOTT_STRIP_PORT,
+	    0,
+	    "Abbott Diabetics",
+	    "Abbott Diabetics Strip Port",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1,
 	    0,
 	    "AboCom Systems",
@@ -2284,6 +2296,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "F7D2102 Wireless Adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U258,
+	    0,
+	    "Belkin Components",
+	    "F5U258 Host to Host cable",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B,
 	    0,
 	    "Belkin Components",
@@ -2824,6 +2842,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "L51xx C-Bus Dimmer",
 	},
 	{
+	    USB_VENDOR_CMEDIA, USB_PRODUCT_CMEDIA_CM6206,
+	    0,
+	    "CMEDIA",
+	    "CM106 compatible sound device",
+	},
+	{
 	    USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510,
 	    0,
 	    "C-motech",
@@ -6748,6 +6772,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Holtek USB gaming keyboard",
 	},
 	{
+	    USB_VENDOR_HONEYWELL, USB_PRODUCT_HONEYWELL_HGI80,
+	    0,
+	    "Honeywell",
+	    "Honeywell HGI80 Wireless USB Gateway",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
 	    0,
 	    "Hewlett Packard",
@@ -7522,12 +7552,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "E1820 HSPA+ USB Slider",
 	},
 	{
+	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3771_INIT,
+	    0,
+	    "Huawei Technologies",
+	    "K3771 Initial",
+	},
+	{
 	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3770,
 	    0,
 	    "Huawei Technologies",
 	    "3G modem",
 	},
 	{
+	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3771,
+	    0,
+	    "Huawei Technologies",
+	    "K3771",
+	},
+	{
 	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3772,
 	    0,
 	    "Huawei Technologies",
@@ -7642,6 +7684,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB CD-ROM Drive",
 	},
 	{
+	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USB4543,
+	    0,
+	    "IBM",
+	    "TI IBM USB 4543 Modem",
+	},
+	{
+	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USB454B,
+	    0,
+	    "IBM",
+	    "TI IBM USB 454B Modem",
+	},
+	{
+	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USB454C,
+	    0,
+	    "IBM",
+	    "TI IBM USB 454C Modem",
+	},
+	{
 	    USB_VENDOR_ICOM, USB_PRODUCT_ICOM_SP1,
 	    0,
 	    "Icom Inc.",
@@ -11314,6 +11374,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_MOXA, USB_PRODUCT_MOXA_MXU1_1110,
+	    0,
+	    "Moxa",
+	    "Moxa Uport 1110",
+	},
+	{
+	    USB_VENDOR_MOXA, USB_PRODUCT_MOXA_MXU1_1130,
+	    0,
+	    "Moxa",
+	    "Moxa Uport 1130",
+	},
+	{
+	    USB_VENDOR_MOXA, USB_PRODUCT_MOXA_MXU1_1131,
+	    0,
+	    "Moxa",
+	    "Moxa Uport 1131",
+	},
+	{
+	    USB_VENDOR_MOXA, USB_PRODUCT_MOXA_MXU1_1150,
+	    0,
+	    "Moxa",
+	    "Moxa Uport 1150",
+	},
+	{
+	    USB_VENDOR_MOXA, USB_PRODUCT_MOXA_MXU1_1151,
+	    0,
+	    "Moxa",
+	    "Moxa Uport 1151",
+	},
+	{
 	    USB_VENDOR_MPMAN, USB_PRODUCT_MPMAN_MPF400_2,
 	    0,
 	    "MpMan",
@@ -11326,12 +11416,60 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "MPF400 Music Player 1Go",
 	},
 	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_MT9234ZBA_2,
+	    0,
+	    "MultiTech",
+	    "MT9234ZBA USB modem (alt)",
+	},
+	{
 	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
 	    0,
 	    "MultiTech",
 	    "MT5634ZBA-USB modem",
 	},
 	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_GSM,
+	    0,
+	    "MultiTech",
+	    "GSM USB Modem",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_CDMA,
+	    0,
+	    "MultiTech",
+	    "CDMA USB Modem",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_CDMA_FW,
+	    0,
+	    "MultiTech",
+	    "CDMA USB Modem firmware running",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_GSM_FW,
+	    0,
+	    "MultiTech",
+	    "GSM USB Modem firmware running",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_EDGE,
+	    0,
+	    "MultiTech",
+	    "Edge USB Modem",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_MT9234MU,
+	    0,
+	    "MultiTech",
+	    "MT9234 MU",
+	},
+	{
+	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_MT9234ZBA,
+	    0,
+	    "MultiTech",
+	    "MT9234 ZBA",
+	},
+	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
 	    0,
 	    "Mustek Systems",
@@ -14104,6 +14242,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CTV",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_2,
+	    0,
+	    "Realtek",
+	    "RTL8188RU",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_USBKR100,
 	    0,
 	    "Realtek",
@@ -14158,22 +14302,22 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CU_1,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8191CU,
 	    0,
 	    "Realtek",
-	    "RTL8192CU",
+	    "RTL8191CU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188EU,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CU,
 	    0,
 	    "Realtek",
-	    "RTL8188EU",
+	    "RTL8192CU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CE_1,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188EU,
 	    0,
 	    "Realtek",
-	    "RTL8188CE",
+	    "RTL8188EU",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_1,
@@ -14188,37 +14332,37 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CE,
 	    0,
 	    "Realtek",
-	    "RTL8187 Wireless Adapter",
+	    "RTL8192CE",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_0,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_1,
 	    0,
 	    "Realtek",
-	    "RTL8187B Wireless Adapter",
+	    "RTL8188RU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_3,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CE_1,
 	    0,
 	    "Realtek",
-	    "RTL8188CU",
+	    "RTL8188CE",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8196EU,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_3,
 	    0,
 	    "Realtek",
-	    "RTL8196EU",
+	    "RTL8188RU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
 	    0,
 	    "Realtek",
-	    "RTL8187B Wireless Adapter",
+	    "RTL8187 Wireless Adapter",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_2,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_0,
 	    0,
 	    "Realtek",
 	    "RTL8187B Wireless Adapter",
@@ -14230,40 +14374,34 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CUS",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_COMBO,
-	    0,
-	    "Realtek",
-	    "RTL8188CU",
-	},
-	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8191CU,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192EU,
 	    0,
 	    "Realtek",
-	    "RTL8191CU",
+	    "RTL8192EU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CU,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_3,
 	    0,
 	    "Realtek",
-	    "RTL8192CU",
+	    "RTL8188CU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CE,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8196EU,
 	    0,
 	    "Realtek",
-	    "RTL8192CE",
+	    "RTL8196EU",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_1,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1,
 	    0,
 	    "Realtek",
-	    "RTL8188RU",
+	    "RTL8187B Wireless Adapter",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_3,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_2,
 	    0,
 	    "Realtek",
-	    "RTL8188RU",
+	    "RTL8187B Wireless Adapter",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8712,
@@ -14278,10 +14416,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8713",
 	},
 	{
-	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_2,
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_COMBO,
 	    0,
 	    "Realtek",
-	    "RTL8188RU",
+	    "RTL8188CU",
+	},
+	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8723BU,
+	    0,
+	    "Realtek",
+	    "RTL8723BU",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192SU,
@@ -17116,6 +17260,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB audio headset",
 	},
 	{
+	    USB_VENDOR_THINGM, USB_PRODUCT_THINGM_BLINK1,
+	    0,
+	    "ThingM",
+	    "USB notification light",
+	},
+	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
 	    0,
 	    "Texas Instruments",
@@ -17128,6 +17278,48 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "TUSB2046 hub",
 	},
 	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_USB3410,
+	    0,
+	    "Texas Instruments",
+	    "TI USB 3410 Modem",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_USB5052,
+	    0,
+	    "Texas Instruments",
+	    "TI USB 5250 Modem",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_FRI2,
+	    0,
+	    "Texas Instruments",
+	    "TI Fish River Island II",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_USB5052_EEPROM,
+	    0,
+	    "Texas Instruments",
+	    "TI USB 5250 Modem w/Eeprom",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_USB5052_FW,
+	    0,
+	    "Texas Instruments",
+	    "TI USB 5250 Modme w/Firmware running",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_USB5152,
+	    0,
+	    "Texas Instruments",
+	    "TI USB 5152 Modem",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_EZ430,
+	    0,
+	    "Texas Instruments",
+	    "TI ex430 development tool",
+	},
+	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
 	    0,
 	    "Thrustmaster",
@@ -17182,6 +17374,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Archer T4U",
 	},
 	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN822NV4,
+	    0,
+	    "TP-Link",
+	    "TL-WN822N v4",
+	},
+	{
 	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN823NV2,
 	    0,
 	    "TP-Link",
@@ -21346,6 +21544,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HONEYWELL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Honeywell",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LIEBERT2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Liebert",
@@ -21388,6 +21592,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MOXA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Moxa",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ANALOG, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Analog Devices",
@@ -22012,6 +22222,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ABBOTT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Abbott Diabetics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BAYER, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Bayer",
@@ -22288,6 +22504,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_THINGM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ThingM",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PLANEX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Planex Communications",