From 2df56dbd60bb5d925d2ce0ddbdefdbe6107ea783 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 21 Aug 2018 09:39:55 +0200 Subject: Update to FreeBSD head 2018-04-01 Git mirror commit 8dfb1ccc26d1cea7e2529303003ff61f9f1784c4. Update #3472. --- .../include/machine/rtems-bsd-kernel-namespace.h | 38 ++++-- rtemsbsd/include/rtems/bsd/local/pci_if.h | 152 +++++++++++++++++---- rtemsbsd/include/rtems/bsd/local/usbdevs.h | 3 + rtemsbsd/include/rtems/bsd/local/usbdevs_data.h | 18 +++ rtemsbsd/include/sys/kerneldump.h | 0 rtemsbsd/local/pci_if.c | 12 ++ 6 files changed, 189 insertions(+), 34 deletions(-) create mode 100644 rtemsbsd/include/sys/kerneldump.h (limited to 'rtemsbsd') diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h index 3bdb6916..fa2e946c 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h @@ -63,6 +63,8 @@ #define arpstat _bsd_arpstat #define async_crypto _bsd_async_crypto #define auth_algorithm_lookup _bsd_auth_algorithm_lookup +#define auth_hash_blake2b _bsd_auth_hash_blake2b +#define auth_hash_blake2s _bsd_auth_hash_blake2s #define auth_hash_hmac_md5 _bsd_auth_hash_hmac_md5 #define auth_hash_hmac_ripemd_160 _bsd_auth_hash_hmac_ripemd_160 #define auth_hash_hmac_sha1 _bsd_auth_hash_hmac_sha1 @@ -310,6 +312,18 @@ #define BF_encrypt _bsd_BF_encrypt #define BF_set_key _bsd_BF_set_key #define bin2bcd_data _bsd_bin2bcd_data +#define blake2b_final_ref _bsd_blake2b_final_ref +#define blake2b_init_key_ref _bsd_blake2b_init_key_ref +#define blake2b_init_param_ref _bsd_blake2b_init_param_ref +#define blake2b_init_ref _bsd_blake2b_init_ref +#define blake2b_ref _bsd_blake2b_ref +#define blake2b_update_ref _bsd_blake2b_update_ref +#define blake2s_final_ref _bsd_blake2s_final_ref +#define blake2s_init_key_ref _bsd_blake2s_init_key_ref +#define blake2s_init_param_ref _bsd_blake2s_init_param_ref +#define blake2s_init_ref _bsd_blake2s_init_ref +#define blake2s_ref _bsd_blake2s_ref +#define blake2s_update_ref _bsd_blake2s_update_ref #define blist_alloc _bsd_blist_alloc #define blist_avail _bsd_blist_avail #define blist_create _bsd_blist_create @@ -516,11 +530,13 @@ #define cast_decrypt _bsd_cast_decrypt #define cast_encrypt _bsd_cast_encrypt #define cast_setkey _bsd_cast_setkey +#define cc_abe_frlossreduce _bsd_cc_abe_frlossreduce #define cc_ack_received _bsd_cc_ack_received #define cc_cong_signal _bsd_cc_cong_signal #define cc_conn_init _bsd_cc_conn_init #define cc_cpu _bsd_cc_cpu #define cc_deregister_algo _bsd_cc_deregister_algo +#define cc_do_abe _bsd_cc_do_abe #define cc_list _bsd_cc_list #define cc_list_lock _bsd_cc_list_lock #define cc_modevent _bsd_cc_modevent @@ -528,6 +544,9 @@ #define cc_register_algo _bsd_cc_register_algo #define cdevpriv_mtx _bsd_cdevpriv_mtx #define cgem_set_ref_clk _bsd_cgem_set_ref_clk +#define chacha_encrypt_bytes _bsd_chacha_encrypt_bytes +#define chacha_ivsetup _bsd_chacha_ivsetup +#define chacha_keysetup _bsd_chacha_keysetup #define clean_unrhdr _bsd_clean_unrhdr #define clean_unrhdrl _bsd_clean_unrhdrl #define ClearCheckNewLink _bsd_ClearCheckNewLink @@ -1062,6 +1081,7 @@ #define enc_xform_blf _bsd_enc_xform_blf #define enc_xform_camellia _bsd_enc_xform_camellia #define enc_xform_cast5 _bsd_enc_xform_cast5 +#define enc_xform_chacha20 _bsd_enc_xform_chacha20 #define enc_xform_des _bsd_enc_xform_des #define enc_xform_null _bsd_enc_xform_null #define enc_xform_rijndael128 _bsd_enc_xform_rijndael128 @@ -1070,6 +1090,7 @@ #define esp_enable _bsd_esp_enable #define esp_hdrsiz _bsd_esp_hdrsiz #define espstat _bsd_espstat +#define ether_8021q_frame _bsd_ether_8021q_frame #define ether_crc32_be _bsd_ether_crc32_be #define ether_crc32_le _bsd_ether_crc32_le #define ether_demux _bsd_ether_demux @@ -1368,6 +1389,7 @@ #define ieee80211_alloc_cts _bsd_ieee80211_alloc_cts #define ieee80211_alloc_node _bsd_ieee80211_alloc_node #define ieee80211_alloc_proberesp _bsd_ieee80211_alloc_proberesp +#define ieee80211_alloc_prot _bsd_ieee80211_alloc_prot #define ieee80211_alloc_rts _bsd_ieee80211_alloc_rts #define ieee80211_ampdu_reorder _bsd_ieee80211_ampdu_reorder #define ieee80211_ampdu_request _bsd_ieee80211_ampdu_request @@ -1851,6 +1873,7 @@ #define ifq_delete _bsd_ifq_delete #define if_qflush _bsd_if_qflush #define ifq_init _bsd_ifq_init +#define ifr_data_get_ptr _bsd_ifr_data_get_ptr #define if_ref _bsd_if_ref #define if_register_com_alloc _bsd_if_register_com_alloc #define if_rele _bsd_if_rele @@ -2127,10 +2150,8 @@ #define intr_event_create _bsd_intr_event_create #define intr_event_execute_handlers _bsd_intr_event_execute_handlers #define ip4_ah_net_deflev _bsd_ip4_ah_net_deflev -#define ip4_ah_offsetmask _bsd_ip4_ah_offsetmask #define ip4_ah_trans_deflev _bsd_ip4_ah_trans_deflev #define ip4_esp_net_deflev _bsd_ip4_esp_net_deflev -#define ip4_esp_randpad _bsd_ip4_esp_randpad #define ip4_esp_trans_deflev _bsd_ip4_esp_trans_deflev #define ip4_ipsec_dfbit _bsd_ip4_ipsec_dfbit #define ip4_ipsec_ecn _bsd_ip4_ipsec_ecn @@ -2336,11 +2357,6 @@ #define ip_tryforward _bsd_ip_tryforward #define ipv4_ipsec_support _bsd_ipv4_ipsec_support #define ipv6_ipsec_support _bsd_ipv6_ipsec_support -#define iso88025_ifattach _bsd_iso88025_ifattach -#define iso88025_ifdetach _bsd_iso88025_ifdetach -#define iso88025_input _bsd_iso88025_input -#define iso88025_ioctl _bsd_iso88025_ioctl -#define iso88025_output _bsd_iso88025_output #define itimerfix _bsd_itimerfix #define jailed _bsd_jailed #define jailed_without_vnet _bsd_jailed_without_vnet @@ -2415,7 +2431,6 @@ #define key_randomfill _bsd_key_randomfill #define key_register_ifnet _bsd_key_register_ifnet #define key_sa_recordxfer _bsd_key_sa_recordxfer -#define key_sendup _bsd_key_sendup #define key_sendup_mbuf _bsd_key_sendup_mbuf #define key_sockaddrcmp _bsd_key_sockaddrcmp #define key_sockaddrcmp_withmask _bsd_key_sockaddrcmp_withmask @@ -3011,6 +3026,9 @@ #define pci_find_dbsf _bsd_pci_find_dbsf #define pci_find_extcap_method _bsd_pci_find_extcap_method #define pci_find_htcap_method _bsd_pci_find_htcap_method +#define pci_find_next_cap_method _bsd_pci_find_next_cap_method +#define pci_find_next_extcap_method _bsd_pci_find_next_extcap_method +#define pci_find_next_htcap_method _bsd_pci_find_next_htcap_method #define pci_find_pcie_root_port _bsd_pci_find_pcie_root_port #define pci_freecfg _bsd_pci_freecfg #define pci_generation _bsd_pci_generation @@ -3151,12 +3169,14 @@ #define pfi_kif_ref _bsd_pfi_kif_ref #define pfi_kif_unref _bsd_pfi_kif_unref #define pfil_add_hook _bsd_pfil_add_hook +#define pfil_add_hook_flags _bsd_pfil_add_hook_flags #define pfil_head_get _bsd_pfil_head_get #define pfil_head_list _bsd_pfil_head_list #define pfil_head_register _bsd_pfil_head_register #define pfil_head_unregister _bsd_pfil_head_unregister #define pfil_lock _bsd_pfil_lock #define pfil_remove_hook _bsd_pfil_remove_hook +#define pfil_remove_hook_flags _bsd_pfil_remove_hook_flags #define pfil_rlock _bsd_pfil_rlock #define pfil_run_hooks _bsd_pfil_run_hooks #define pfil_runlock _bsd_pfil_runlock @@ -4619,6 +4639,7 @@ #define sysctl___net_inet_raw _bsd_sysctl___net_inet_raw #define sysctl___net_inet_tcp _bsd_sysctl___net_inet_tcp #define sysctl___net_inet_tcp_cc _bsd_sysctl___net_inet_tcp_cc +#define sysctl___net_inet_tcp_cc_newreno _bsd_sysctl___net_inet_tcp_cc_newreno #define sysctl___net_inet_tcp_lro _bsd_sysctl___net_inet_tcp_lro #define sysctl___net_inet_tcp_sack _bsd_sysctl___net_inet_tcp_sack #define sysctl___net_inet_udp _bsd_sysctl___net_inet_udp @@ -5286,6 +5307,7 @@ #define vlan_devat_p _bsd_vlan_devat_p #define vlan_input_p _bsd_vlan_input_p #define vlan_link_state_p _bsd_vlan_link_state_p +#define vlan_mtag_pcp _bsd_vlan_mtag_pcp #define vlan_setcookie_p _bsd_vlan_setcookie_p #define vlan_tag_p _bsd_vlan_tag_p #define vlan_trunk_cap_p _bsd_vlan_trunk_cap_p diff --git a/rtemsbsd/include/rtems/bsd/local/pci_if.h b/rtemsbsd/include/rtems/bsd/local/pci_if.h index 6350dc7e..1e076546 100644 --- a/rtemsbsd/include/rtems/bsd/local/pci_if.h +++ b/rtemsbsd/include/rtems/bsd/local/pci_if.h @@ -37,8 +37,10 @@ static __inline u_int32_t PCI_READ_CONFIG(device_t dev, device_t child, int reg, int width) { kobjop_t _m; + u_int32_t rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_read_config); - return ((pci_read_config_t *) _m)(dev, child, reg, width); + rc = ((pci_read_config_t *) _m)(dev, child, reg, width); + return (rc); } /** @brief Unique descriptor for the PCI_WRITE_CONFIG() method */ @@ -63,8 +65,10 @@ typedef int pci_get_powerstate_t(device_t dev, device_t child); static __inline int PCI_GET_POWERSTATE(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_get_powerstate); - return ((pci_get_powerstate_t *) _m)(dev, child); + rc = ((pci_get_powerstate_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_SET_POWERSTATE() method */ @@ -75,8 +79,10 @@ typedef int pci_set_powerstate_t(device_t dev, device_t child, int state); static __inline int PCI_SET_POWERSTATE(device_t dev, device_t child, int state) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_set_powerstate); - return ((pci_set_powerstate_t *) _m)(dev, child, state); + rc = ((pci_set_powerstate_t *) _m)(dev, child, state); + return (rc); } /** @brief Unique descriptor for the PCI_GET_VPD_IDENT() method */ @@ -89,8 +95,10 @@ static __inline int PCI_GET_VPD_IDENT(device_t dev, device_t child, const char **identptr) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_get_vpd_ident); - return ((pci_get_vpd_ident_t *) _m)(dev, child, identptr); + rc = ((pci_get_vpd_ident_t *) _m)(dev, child, identptr); + return (rc); } /** @brief Unique descriptor for the PCI_GET_VPD_READONLY() method */ @@ -103,8 +111,10 @@ static __inline int PCI_GET_VPD_READONLY(device_t dev, device_t child, const char *kw, const char **vptr) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_get_vpd_readonly); - return ((pci_get_vpd_readonly_t *) _m)(dev, child, kw, vptr); + rc = ((pci_get_vpd_readonly_t *) _m)(dev, child, kw, vptr); + return (rc); } /** @brief Unique descriptor for the PCI_ENABLE_BUSMASTER() method */ @@ -115,8 +125,10 @@ typedef int pci_enable_busmaster_t(device_t dev, device_t child); static __inline int PCI_ENABLE_BUSMASTER(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_enable_busmaster); - return ((pci_enable_busmaster_t *) _m)(dev, child); + rc = ((pci_enable_busmaster_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_DISABLE_BUSMASTER() method */ @@ -127,8 +139,10 @@ typedef int pci_disable_busmaster_t(device_t dev, device_t child); static __inline int PCI_DISABLE_BUSMASTER(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_disable_busmaster); - return ((pci_disable_busmaster_t *) _m)(dev, child); + rc = ((pci_disable_busmaster_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_ENABLE_IO() method */ @@ -139,8 +153,10 @@ typedef int pci_enable_io_t(device_t dev, device_t child, int space); static __inline int PCI_ENABLE_IO(device_t dev, device_t child, int space) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_enable_io); - return ((pci_enable_io_t *) _m)(dev, child, space); + rc = ((pci_enable_io_t *) _m)(dev, child, space); + return (rc); } /** @brief Unique descriptor for the PCI_DISABLE_IO() method */ @@ -151,8 +167,10 @@ typedef int pci_disable_io_t(device_t dev, device_t child, int space); static __inline int PCI_DISABLE_IO(device_t dev, device_t child, int space) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_disable_io); - return ((pci_disable_io_t *) _m)(dev, child, space); + rc = ((pci_disable_io_t *) _m)(dev, child, space); + return (rc); } /** @brief Unique descriptor for the PCI_ASSIGN_INTERRUPT() method */ @@ -163,8 +181,10 @@ typedef int pci_assign_interrupt_t(device_t dev, device_t child); static __inline int PCI_ASSIGN_INTERRUPT(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_assign_interrupt); - return ((pci_assign_interrupt_t *) _m)(dev, child); + rc = ((pci_assign_interrupt_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_FIND_CAP() method */ @@ -177,8 +197,26 @@ static __inline int PCI_FIND_CAP(device_t dev, device_t child, int capability, int *capreg) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_cap); - return ((pci_find_cap_t *) _m)(dev, child, capability, capreg); + rc = ((pci_find_cap_t *) _m)(dev, child, capability, capreg); + return (rc); +} + +/** @brief Unique descriptor for the PCI_FIND_NEXT_CAP() method */ +extern struct kobjop_desc pci_find_next_cap_desc; +/** @brief A function implementing the PCI_FIND_NEXT_CAP() method */ +typedef int pci_find_next_cap_t(device_t dev, device_t child, int capability, + int start, int *capreg); + +static __inline int PCI_FIND_NEXT_CAP(device_t dev, device_t child, + int capability, int start, int *capreg) +{ + kobjop_t _m; + int rc; + KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_next_cap); + rc = ((pci_find_next_cap_t *) _m)(dev, child, capability, start, capreg); + return (rc); } /** @brief Unique descriptor for the PCI_FIND_EXTCAP() method */ @@ -191,8 +229,26 @@ static __inline int PCI_FIND_EXTCAP(device_t dev, device_t child, int capability, int *capreg) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_extcap); - return ((pci_find_extcap_t *) _m)(dev, child, capability, capreg); + rc = ((pci_find_extcap_t *) _m)(dev, child, capability, capreg); + return (rc); +} + +/** @brief Unique descriptor for the PCI_FIND_NEXT_EXTCAP() method */ +extern struct kobjop_desc pci_find_next_extcap_desc; +/** @brief A function implementing the PCI_FIND_NEXT_EXTCAP() method */ +typedef int pci_find_next_extcap_t(device_t dev, device_t child, int capability, + int start, int *capreg); + +static __inline int PCI_FIND_NEXT_EXTCAP(device_t dev, device_t child, + int capability, int start, int *capreg) +{ + kobjop_t _m; + int rc; + KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_next_extcap); + rc = ((pci_find_next_extcap_t *) _m)(dev, child, capability, start, capreg); + return (rc); } /** @brief Unique descriptor for the PCI_FIND_HTCAP() method */ @@ -205,8 +261,26 @@ static __inline int PCI_FIND_HTCAP(device_t dev, device_t child, int capability, int *capreg) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_htcap); - return ((pci_find_htcap_t *) _m)(dev, child, capability, capreg); + rc = ((pci_find_htcap_t *) _m)(dev, child, capability, capreg); + return (rc); +} + +/** @brief Unique descriptor for the PCI_FIND_NEXT_HTCAP() method */ +extern struct kobjop_desc pci_find_next_htcap_desc; +/** @brief A function implementing the PCI_FIND_NEXT_HTCAP() method */ +typedef int pci_find_next_htcap_t(device_t dev, device_t child, int capability, + int start, int *capreg); + +static __inline int PCI_FIND_NEXT_HTCAP(device_t dev, device_t child, + int capability, int start, int *capreg) +{ + kobjop_t _m; + int rc; + KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_find_next_htcap); + rc = ((pci_find_next_htcap_t *) _m)(dev, child, capability, start, capreg); + return (rc); } /** @brief Unique descriptor for the PCI_ALLOC_MSI() method */ @@ -217,8 +291,10 @@ typedef int pci_alloc_msi_t(device_t dev, device_t child, int *count); static __inline int PCI_ALLOC_MSI(device_t dev, device_t child, int *count) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_alloc_msi); - return ((pci_alloc_msi_t *) _m)(dev, child, count); + rc = ((pci_alloc_msi_t *) _m)(dev, child, count); + return (rc); } /** @brief Unique descriptor for the PCI_ALLOC_MSIX() method */ @@ -229,8 +305,10 @@ typedef int pci_alloc_msix_t(device_t dev, device_t child, int *count); static __inline int PCI_ALLOC_MSIX(device_t dev, device_t child, int *count) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_alloc_msix); - return ((pci_alloc_msix_t *) _m)(dev, child, count); + rc = ((pci_alloc_msix_t *) _m)(dev, child, count); + return (rc); } /** @brief Unique descriptor for the PCI_ENABLE_MSI() method */ @@ -283,8 +361,10 @@ static __inline int PCI_REMAP_MSIX(device_t dev, device_t child, int count, const u_int *vectors) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_remap_msix); - return ((pci_remap_msix_t *) _m)(dev, child, count, vectors); + rc = ((pci_remap_msix_t *) _m)(dev, child, count, vectors); + return (rc); } /** @brief Unique descriptor for the PCI_RELEASE_MSI() method */ @@ -295,8 +375,10 @@ typedef int pci_release_msi_t(device_t dev, device_t child); static __inline int PCI_RELEASE_MSI(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_release_msi); - return ((pci_release_msi_t *) _m)(dev, child); + rc = ((pci_release_msi_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_MSI_COUNT() method */ @@ -307,8 +389,10 @@ typedef int pci_msi_count_t(device_t dev, device_t child); static __inline int PCI_MSI_COUNT(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msi_count); - return ((pci_msi_count_t *) _m)(dev, child); + rc = ((pci_msi_count_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_MSIX_COUNT() method */ @@ -319,8 +403,10 @@ typedef int pci_msix_count_t(device_t dev, device_t child); static __inline int PCI_MSIX_COUNT(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msix_count); - return ((pci_msix_count_t *) _m)(dev, child); + rc = ((pci_msix_count_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_MSIX_PBA_BAR() method */ @@ -331,8 +417,10 @@ typedef int pci_msix_pba_bar_t(device_t dev, device_t child); static __inline int PCI_MSIX_PBA_BAR(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msix_pba_bar); - return ((pci_msix_pba_bar_t *) _m)(dev, child); + rc = ((pci_msix_pba_bar_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_MSIX_TABLE_BAR() method */ @@ -343,8 +431,10 @@ typedef int pci_msix_table_bar_t(device_t dev, device_t child); static __inline int PCI_MSIX_TABLE_BAR(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_msix_table_bar); - return ((pci_msix_table_bar_t *) _m)(dev, child); + rc = ((pci_msix_table_bar_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_GET_ID() method */ @@ -357,8 +447,10 @@ static __inline int PCI_GET_ID(device_t dev, device_t child, enum pci_id_type type, uintptr_t *id) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_get_id); - return ((pci_get_id_t *) _m)(dev, child, type, id); + rc = ((pci_get_id_t *) _m)(dev, child, type, id); + return (rc); } /** @brief Unique descriptor for the PCI_ALLOC_DEVINFO() method */ @@ -369,8 +461,10 @@ typedef struct pci_devinfo * pci_alloc_devinfo_t(device_t dev); static __inline struct pci_devinfo * PCI_ALLOC_DEVINFO(device_t dev) { kobjop_t _m; + struct pci_devinfo * rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_alloc_devinfo); - return ((pci_alloc_devinfo_t *) _m)(dev); + rc = ((pci_alloc_devinfo_t *) _m)(dev); + return (rc); } /** @brief Unique descriptor for the PCI_CHILD_ADDED() method */ @@ -397,8 +491,10 @@ static __inline int PCI_IOV_ATTACH(device_t dev, device_t child, struct nvlist *vf_schema, const char *name) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_iov_attach); - return ((pci_iov_attach_t *) _m)(dev, child, pf_schema, vf_schema, name); + rc = ((pci_iov_attach_t *) _m)(dev, child, pf_schema, vf_schema, name); + return (rc); } /** @brief Unique descriptor for the PCI_IOV_DETACH() method */ @@ -409,8 +505,10 @@ typedef int pci_iov_detach_t(device_t dev, device_t child); static __inline int PCI_IOV_DETACH(device_t dev, device_t child) { kobjop_t _m; + int rc; KOBJOPLOOKUP(((kobj_t)dev)->ops,pci_iov_detach); - return ((pci_iov_detach_t *) _m)(dev, child); + rc = ((pci_iov_detach_t *) _m)(dev, child); + return (rc); } /** @brief Unique descriptor for the PCI_CREATE_IOV_CHILD() method */ @@ -424,8 +522,10 @@ static __inline device_t PCI_CREATE_IOV_CHILD(device_t bus, device_t pf, uint16_t did) { kobjop_t _m; + device_t rc; KOBJOPLOOKUP(((kobj_t)bus)->ops,pci_create_iov_child); - return ((pci_create_iov_child_t *) _m)(bus, pf, rid, vid, did); + rc = ((pci_create_iov_child_t *) _m)(bus, pf, rid, vid, did); + return (rc); } #endif /* _pci_if_h_ */ diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h index 4848ccd7..5eee5c10 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h @@ -1537,6 +1537,7 @@ /* Corsair products */ #define USB_PRODUCT_CORSAIR_K60 0x0a60 /* Corsair Vengeance K60 keyboard */ #define USB_PRODUCT_CORSAIR_K70 0x1b09 /* Corsair Vengeance K70 keyboard */ +#define USB_PRODUCT_CORSAIR_K70_RGB 0x1b13 /* Corsair K70 RGB Keyboard */ #define USB_PRODUCT_CORSAIR_STRAFE 0x1b15 /* Cossair STRAFE Gaming keyboard */ /* Creative products */ @@ -2162,6 +2163,7 @@ #define USB_PRODUCT_FTDI_TERATRONIK_D2XX 0xec89 /* FTDI compatible adapter */ #define USB_PRODUCT_FTDI_TERATRONIK_VCP 0xec88 /* FTDI compatible adapter */ #define USB_PRODUCT_FTDI_THORLABS 0xfaf0 /* FTDI compatible adapter */ +#define USB_PRODUCT_FTDI_TIAO 0x8a98 /* FTDI compatible adapter */ #define USB_PRODUCT_FTDI_TNC_X 0xebe0 /* FTDI compatible adapter */ #define USB_PRODUCT_FTDI_TTUSB 0xff20 /* FTDI compatible adapter */ #define USB_PRODUCT_FTDI_USBX_707 0xf857 /* FTDI compatible adapter */ @@ -4243,6 +4245,7 @@ #define USB_PRODUCT_SILABS_AC_SERV_OBD 0x8665 /* AC-Services OBD Interface */ #define USB_PRODUCT_SILABS_MMB_ZIGBEE 0x88a4 /* MMB Networks ZigBee */ #define USB_PRODUCT_SILABS_INGENI_ZIGBEE 0x88a5 /* Planet Innovation Ingeni ZigBee */ +#define USB_PRODUCT_SILABS_HUBZ 0x8a2a /* HubZ dual ZigBee and Z-Wave */ #define USB_PRODUCT_SILABS_CP2102 0xea60 /* SILABS USB UART */ #define USB_PRODUCT_SILABS_CP210X_2 0xea61 /* CP210x Serial */ #define USB_PRODUCT_SILABS_CP210X_3 0xea70 /* CP210x Serial */ diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h index d8fe4aea..49ac75d7 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h @@ -3181,6 +3181,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Corsair", "Corsair Vengeance K70 keyboard", }, + { + USB_VENDOR_CORSAIR, USB_PRODUCT_CORSAIR_K70_RGB, + 0, + "Corsair", + "Corsair K70 RGB Keyboard", + }, { USB_VENDOR_CORSAIR, USB_PRODUCT_CORSAIR_STRAFE, 0, @@ -6229,6 +6235,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Future Technology Devices", "FTDI compatible adapter", }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TIAO, + 0, + "Future Technology Devices", + "FTDI compatible adapter", + }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TNC_X, 0, @@ -16189,6 +16201,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Silicon Labs", "Planet Innovation Ingeni ZigBee", }, + { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HUBZ, + 0, + "Silicon Labs", + "HubZ dual ZigBee and Z-Wave", + }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP2102, 0, diff --git a/rtemsbsd/include/sys/kerneldump.h b/rtemsbsd/include/sys/kerneldump.h new file mode 100644 index 00000000..e69de29b diff --git a/rtemsbsd/local/pci_if.c b/rtemsbsd/local/pci_if.c index f8ea8d96..54702f1b 100644 --- a/rtemsbsd/local/pci_if.c +++ b/rtemsbsd/local/pci_if.c @@ -89,14 +89,26 @@ struct kobjop_desc pci_find_cap_desc = { 0, { &pci_find_cap_desc, (kobjop_t)kobj_error_method } }; +struct kobjop_desc pci_find_next_cap_desc = { + 0, { &pci_find_next_cap_desc, (kobjop_t)kobj_error_method } +}; + struct kobjop_desc pci_find_extcap_desc = { 0, { &pci_find_extcap_desc, (kobjop_t)kobj_error_method } }; +struct kobjop_desc pci_find_next_extcap_desc = { + 0, { &pci_find_next_extcap_desc, (kobjop_t)kobj_error_method } +}; + struct kobjop_desc pci_find_htcap_desc = { 0, { &pci_find_htcap_desc, (kobjop_t)kobj_error_method } }; +struct kobjop_desc pci_find_next_htcap_desc = { + 0, { &pci_find_next_htcap_desc, (kobjop_t)kobj_error_method } +}; + struct kobjop_desc pci_alloc_msi_desc = { 0, { &pci_alloc_msi_desc, (kobjop_t)kobj_error_method } }; -- cgit v1.2.3