From bb80d9df8bac71eedee1a6787ca63aef972a7e48 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 9 Aug 2018 14:02:09 +0200 Subject: Update to FreeBSD head 2017-12-01 Git mirror commit e724f51f811a4b2bd29447f8b85ab5c2f9b88266. Update #3472. --- rtemsbsd/include/casper/cap_dns.h | 1 + rtemsbsd/include/casper/cap_syslog.h | 1 + rtemsbsd/include/libcasper.h | 1 + rtemsbsd/include/machine/_kernel_lock.h | 6 ++++ .../include/machine/rtems-bsd-kernel-namespace.h | 24 +++++++++++---- rtemsbsd/include/rtems/bsd/local/usbdevs.h | 6 ++++ rtemsbsd/include/rtems/bsd/local/usbdevs_data.h | 36 ++++++++++++++++++++++ rtemsbsd/rtems/rtems-kernel-rwlock.c | 13 ++------ rtemsbsd/rtems/rtems-kernel-sx.c | 18 ++++++----- 9 files changed, 83 insertions(+), 23 deletions(-) create mode 100644 rtemsbsd/include/casper/cap_dns.h create mode 100644 rtemsbsd/include/casper/cap_syslog.h create mode 100644 rtemsbsd/include/libcasper.h (limited to 'rtemsbsd') diff --git a/rtemsbsd/include/casper/cap_dns.h b/rtemsbsd/include/casper/cap_dns.h new file mode 100644 index 00000000..5bd73ec5 --- /dev/null +++ b/rtemsbsd/include/casper/cap_dns.h @@ -0,0 +1 @@ +#include diff --git a/rtemsbsd/include/casper/cap_syslog.h b/rtemsbsd/include/casper/cap_syslog.h new file mode 100644 index 00000000..783ec98e --- /dev/null +++ b/rtemsbsd/include/casper/cap_syslog.h @@ -0,0 +1 @@ +#include diff --git a/rtemsbsd/include/libcasper.h b/rtemsbsd/include/libcasper.h new file mode 100644 index 00000000..c65a4711 --- /dev/null +++ b/rtemsbsd/include/libcasper.h @@ -0,0 +1 @@ +#include diff --git a/rtemsbsd/include/machine/_kernel_lock.h b/rtemsbsd/include/machine/_kernel_lock.h index 5481813a..dc4f8255 100644 --- a/rtemsbsd/include/machine/_kernel_lock.h +++ b/rtemsbsd/include/machine/_kernel_lock.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -137,9 +139,13 @@ struct lock_class { * operations. Otherwise, use default values to avoid the unneeded bloat. */ #if LOCK_DEBUG > 0 +#define LOCK_FILE_LINE_ARG_DEF , const char *file, int line +#define LOCK_FILE_LINE_ARG , file, line #define LOCK_FILE __FILE__ #define LOCK_LINE __LINE__ #else +#define LOCK_FILE_LINE_ARG_DEF +#define LOCK_FILE_LINE_ARG #define LOCK_FILE NULL #define LOCK_LINE 0 #endif diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h index 1d628f90..dd0b2ed2 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h @@ -61,6 +61,7 @@ #define arpresolve _bsd_arpresolve #define arpresolve_addr _bsd_arpresolve_addr #define arpstat _bsd_arpstat +#define async_crypto _bsd_async_crypto #define auth_algorithm_lookup _bsd_auth_algorithm_lookup #define auth_hash_hmac_md5 _bsd_auth_hash_hmac_md5 #define auth_hash_hmac_ripemd_160 _bsd_auth_hash_hmac_ripemd_160 @@ -530,6 +531,7 @@ #define clean_unrhdr _bsd_clean_unrhdr #define clean_unrhdrl _bsd_clean_unrhdrl #define ClearCheckNewLink _bsd_ClearCheckNewLink +#define clear_unrhdr _bsd_clear_unrhdr #define clk_intr_event _bsd_clk_intr_event #define comp_algo_deflate _bsd_comp_algo_deflate #define comp_algorithm_lookup _bsd_comp_algorithm_lookup @@ -1140,7 +1142,9 @@ #define evdev_support_sw _bsd_evdev_support_sw #define evdev_sysmouse_t_axis _bsd_evdev_sysmouse_t_axis #define evdev_unregister _bsd_evdev_unregister +#define eventhandler_create_list _bsd_eventhandler_create_list #define eventhandler_deregister _bsd_eventhandler_deregister +#define eventhandler_deregister_nowait _bsd_eventhandler_deregister_nowait #define eventhandler_find_list _bsd_eventhandler_find_list #define eventhandler_prune_list _bsd_eventhandler_prune_list #define eventhandler_register _bsd_eventhandler_register @@ -3802,7 +3806,6 @@ #define _rw_rlock _bsd__rw_rlock #define _rw_runlock _bsd__rw_runlock #define rw_sysinit _bsd_rw_sysinit -#define rw_sysinit_flags _bsd_rw_sysinit_flags #define _rw_try_rlock _bsd__rw_try_rlock #define _rw_try_upgrade _bsd__rw_try_upgrade #define _rw_try_wlock _bsd__rw_try_wlock @@ -4523,14 +4526,14 @@ #define swi_add _bsd_swi_add #define swi_sched _bsd_swi_sched #define sx_destroy _bsd_sx_destroy -#define sx_downgrade_ _bsd_sx_downgrade_ +#define sx_downgrade_int _bsd_sx_downgrade_int #define sx_init_flags _bsd_sx_init_flags +#define _sx_slock_int _bsd__sx_slock_int +#define _sx_sunlock_int _bsd__sx_sunlock_int #define sx_sysinit _bsd_sx_sysinit -#define sx_try_upgrade_ _bsd_sx_try_upgrade_ -#define sx_try_xlock_ _bsd_sx_try_xlock_ -#define _sx_xlock _bsd__sx_xlock +#define sx_try_slock_int _bsd_sx_try_slock_int +#define sx_try_upgrade_int _bsd_sx_try_upgrade_int #define sx_xlocked _bsd_sx_xlocked -#define _sx_xunlock _bsd__sx_xunlock #define syncache_add _bsd_syncache_add #define syncache_badack _bsd_syncache_badack #define syncache_chkrst _bsd_syncache_chkrst @@ -4556,6 +4559,7 @@ #define sysctl_ctx_init _bsd_sysctl_ctx_init #define sysctl___debug _bsd_sysctl___debug #define sysctl___dev _bsd_sysctl___dev +#define sysctl_enable_oid _bsd_sysctl_enable_oid #define sysctl_find_oid _bsd_sysctl_find_oid #define sysctl_handle_16 _bsd_sysctl_handle_16 #define sysctl_handle_32 _bsd_sysctl_handle_32 @@ -4625,6 +4629,7 @@ #define sysctl___net_pf _bsd_sysctl___net_pf #define sysctl___net_pfsync _bsd_sysctl___net_pfsync #define sysctl___net_wlan _bsd_sysctl___net_wlan +#define sysctl_register_disabled_oid _bsd_sysctl_register_disabled_oid #define sysctl_register_oid _bsd_sysctl_register_oid #define sysctl_remove_name _bsd_sysctl_remove_name #define sysctl_remove_oid _bsd_sysctl_remove_oid @@ -4741,6 +4746,8 @@ #define tcp_output _bsd_tcp_output #define tcp_persmax _bsd_tcp_persmax #define tcp_persmin _bsd_tcp_persmin +#define tcp_pmtud_blackhole_detect _bsd_tcp_pmtud_blackhole_detect +#define tcp_pmtud_blackhole_mss _bsd_tcp_pmtud_blackhole_mss #define tcp_pulloutofband _bsd_tcp_pulloutofband #define tcp_reass _bsd_tcp_reass #define tcp_reass_flush _bsd_tcp_reass_flush @@ -4787,6 +4794,7 @@ #define tcp_use_hostcache _bsd_tcp_use_hostcache #define tcp_usrreqs _bsd_tcp_usrreqs #define tcp_v6mssdflt _bsd_tcp_v6mssdflt +#define tcp_v6pmtud_blackhole_mss _bsd_tcp_v6pmtud_blackhole_mss #define tcp_xmit_timer _bsd_tcp_xmit_timer #define tc_tick_bt _bsd_tc_tick_bt #define tc_tick_sbt _bsd_tc_tick_sbt @@ -4955,12 +4963,15 @@ #define ulitecb _bsd_ulitecb #define ulitecbinfo _bsd_ulitecbinfo #define uma_align_cache _bsd_uma_align_cache +#define uma_limit _bsd_uma_limit #define uma_print_stats _bsd_uma_print_stats #define uma_print_zone _bsd_uma_print_zone #define uma_reclaim _bsd_uma_reclaim #define uma_reclaim_wakeup _bsd_uma_reclaim_wakeup #define uma_reclaim_worker _bsd_uma_reclaim_worker #define uma_set_align _bsd_uma_set_align +#define uma_set_limit _bsd_uma_set_limit +#define uma_size _bsd_uma_size #define uma_startup _bsd_uma_startup #define uma_zalloc_arg _bsd_uma_zalloc_arg #define uma_zcache_create _bsd_uma_zcache_create @@ -4982,6 +4993,7 @@ #define uma_zone_set_zfini _bsd_uma_zone_set_zfini #define uma_zone_set_zinit _bsd_uma_zone_set_zinit #define uma_zsecond_create _bsd_uma_zsecond_create +#define uma_zwait _bsd_uma_zwait #define untimeout _bsd_untimeout #define usb_alloc_device _bsd_usb_alloc_device #define usb_alloc_mbufs _bsd_usb_alloc_mbufs diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h index c48a8765..dbb8b0f2 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h @@ -1680,8 +1680,10 @@ #define USB_PRODUCT_DLINK_DUB1312 0x4a00 /* 10/100/1000 Ethernet */ #define USB_PRODUCT_DLINK_DWM157 0x7d02 /* DWM-157 */ #define USB_PRODUCT_DLINK_DWR510 0x7e12 /* DWR-510 */ +#define USB_PRODUCT_DLINK_DWM222 0x7e35 /* DWM-222 */ #define USB_PRODUCT_DLINK_DWM157_CD 0xa707 /* DWM-157 CD-ROM Mode */ #define USB_PRODUCT_DLINK_DWR510_CD 0xa805 /* DWR-510 CD-ROM Mode */ +#define USB_PRODUCT_DLINK_DWM222_CD 0xab00 /* DWM-222 CD-ROM Mode */ #define USB_PRODUCT_DLINK_DSB650 0xabc1 /* 10/100 Ethernet */ #define USB_PRODUCT_DLINK_DUBH7 0xf103 /* DUB-H7 USB 2.0 7-Port Hub */ #define USB_PRODUCT_DLINK2_RTL8192SU_1 0x3300 /* RTL8192SU */ @@ -3684,6 +3686,7 @@ #define USB_PRODUCT_PROLIFIC_ATAPI4 0x2307 /* ATAPI-4 Controller */ #define USB_PRODUCT_PROLIFIC_PL2501 0x2501 /* PL2501 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_PL2506 0x2506 /* PL2506 USB to IDE Bridge */ +#define USB_PRODUCT_PROLIFIC_PL27A1 0x27A1 /* PL27A1 USB 3.0 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_HCR331 0x331a /* HCR331 Hybrid Card Reader */ #define USB_PRODUCT_PROLIFIC_PHAROS 0xaaa0 /* Prolific Pharos */ #define USB_PRODUCT_PROLIFIC_RSAQ3 0xaaa2 /* PL2303 Serial Adapter (IODATA USB-RSAQ3) */ @@ -4541,6 +4544,9 @@ #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 */ +#define USB_PRODUCT_TPLINK_T4UV2 0x010d /* Archer T4U ver 2 */ +#define USB_PRODUCT_TPLINK_T4UHV2 0x010e /* Archer T4UH ver 2 */ +#define USB_PRODUCT_TPLINK_RTL8153 0x0601 /* RTL8153 USB 10/100/1000 LAN */ /* Trek Technology products */ #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h index bb52312d..ef168bbf 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h @@ -3819,6 +3819,12 @@ const struct usb_knowndev usb_knowndevs[] = { "D-Link", "DWR-510", }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM222, + 0, + "D-Link", + "DWM-222", + }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157_CD, 0, @@ -3831,6 +3837,12 @@ const struct usb_knowndev usb_knowndevs[] = { "D-Link", "DWR-510 CD-ROM Mode", }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM222_CD, + 0, + "D-Link", + "DWM-222 CD-ROM Mode", + }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650, 0, @@ -13371,6 +13383,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Prolific Technology", "PL2506 USB to IDE Bridge", }, + { + USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL27A1, + 0, + "Prolific Technology", + "PL27A1 USB 3.0 Host-Host interface", + }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_HCR331, 0, @@ -17403,6 +17421,24 @@ const struct usb_knowndev usb_knowndevs[] = { "TP-Link", "TL-WN823N v2", }, + { + USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4UV2, + 0, + "TP-Link", + "Archer T4U ver 2", + }, + { + USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4UHV2, + 0, + "TP-Link", + "Archer T4UH ver 2", + }, + { + USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8153, + 0, + "TP-Link", + "RTL8153 USB 10/100/1000 LAN", + }, { USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, 0, diff --git a/rtemsbsd/rtems/rtems-kernel-rwlock.c b/rtemsbsd/rtems/rtems-kernel-rwlock.c index 80918f70..c204c04f 100644 --- a/rtemsbsd/rtems/rtems-kernel-rwlock.c +++ b/rtemsbsd/rtems/rtems-kernel-rwlock.c @@ -119,17 +119,10 @@ rw_destroy(struct rwlock *rw) void rw_sysinit(void *arg) { - struct rw_args *args = arg; + struct rw_args *args; - rw_init(args->ra_rw, args->ra_desc); -} - -void -rw_sysinit_flags(void *arg) -{ - struct rw_args_flags *args = arg; - - rw_init_flags(args->ra_rw, args->ra_desc, args->ra_flags); + args = arg; + rw_init(args->ra_rw, args->ra_desc); } int diff --git a/rtemsbsd/rtems/rtems-kernel-sx.c b/rtemsbsd/rtems/rtems-kernel-sx.c index 7f47bd71..4f8bea4d 100644 --- a/rtemsbsd/rtems/rtems-kernel-sx.c +++ b/rtemsbsd/rtems/rtems-kernel-sx.c @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2009-2015 embedded brains GmbH. All rights reserved. + * Copyright (c) 2009, 2018 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -114,34 +114,38 @@ sx_destroy(struct sx *sx) } int -_sx_xlock(struct sx *sx, int opts, const char *file, int line) +_sx_slock_int(struct sx *sx, int opts LOCK_FILE_LINE_ARG_DEF) { - rtems_bsd_mutex_lock(&sx->lock_object, &sx->mutex); + rtems_bsd_mutex_lock(&sx->lock_object, &sx->mutex); return (0); } int -sx_try_xlock_(struct sx *sx, const char *file, int line) +sx_try_slock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) { + return (rtems_bsd_mutex_trylock(&sx->lock_object, &sx->mutex)); } void -_sx_xunlock(struct sx *sx, const char *file, int line) +_sx_sunlock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) { + rtems_bsd_mutex_unlock(&sx->mutex); } int -sx_try_upgrade_(struct sx *sx, const char *file, int line) +sx_try_upgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) { + return (1); } void -sx_downgrade_(struct sx *sx, const char *file, int line) +sx_downgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) { + /* Do nothing */ } -- cgit v1.2.3