From e4a8065910cd6b2e7e0448cc6431ca2906322389 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 9 Aug 2018 13:04:41 +0200 Subject: Update to FreeBSD head 2017-10-01 Git mirror commit b2f0376b45428f13151d229c5ae9d4d8f74acbd1. Update #3472. --- .../include/machine/rtems-bsd-kernel-namespace.h | 4 ++- rtemsbsd/include/rtems/bsd/local/mmcbus_if.h | 40 +++++++++++----------- rtemsbsd/include/rtems/bsd/local/usbdevs.h | 6 ++++ rtemsbsd/include/rtems/bsd/local/usbdevs_data.h | 24 +++++++++++++ 4 files changed, 53 insertions(+), 21 deletions(-) (limited to 'rtemsbsd') diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h index 9eaed1f1..1d628f90 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h @@ -316,6 +316,7 @@ #define blist_fill _bsd_blist_fill #define blist_free _bsd_blist_free #define blist_resize _bsd_blist_resize +#define blist_stats _bsd_blist_stats #define bpfattach _bsd_bpfattach #define bpfattach2 _bsd_bpfattach2 #define bpf_buffer_append_bytes _bsd_bpf_buffer_append_bytes @@ -1285,6 +1286,7 @@ #define hid_is_collection _bsd_hid_is_collection #define hid_is_keyboard _bsd_hid_is_keyboard #define hid_is_mouse _bsd_hid_is_mouse +#define hid_item_resolution _bsd_hid_item_resolution #define hid_locate _bsd_hid_locate #define hid_put_data_unsigned _bsd_hid_put_data_unsigned #define hid_report_size _bsd_hid_report_size @@ -3536,6 +3538,7 @@ #define r92cu_power_off _bsd_r92cu_power_off #define r92cu_power_on _bsd_r92cu_power_on #define r92cu_set_led _bsd_r92cu_set_led +#define r92c_write_txpower _bsd_r92c_write_txpower #define r92e_detach_private _bsd_r92e_detach_private #define r92e_fw_reset _bsd_r92e_fw_reset #define r92e_get_rssi_cck _bsd_r92e_get_rssi_cck @@ -4234,7 +4237,6 @@ #define sctp_serialize_hmaclist _bsd_sctp_serialize_hmaclist #define sctp_set_key _bsd_sctp_set_key #define sctp_set_primary_addr _bsd_sctp_set_primary_addr -#define sctp_set_primary_ip_address _bsd_sctp_set_primary_ip_address #define sctp_set_primary_ip_address_sa _bsd_sctp_set_primary_ip_address_sa #define sctp_set_rwnd _bsd_sctp_set_rwnd #define SctpShowAliasStats _bsd_SctpShowAliasStats diff --git a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h index 7910f1f3..e9e61557 100644 --- a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h +++ b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h @@ -17,65 +17,65 @@ /** @brief Unique descriptor for the MMCBUS_RETUNE_PAUSE() method */ extern struct kobjop_desc mmcbus_retune_pause_desc; /** @brief A function implementing the MMCBUS_RETUNE_PAUSE() method */ -typedef void mmcbus_retune_pause_t(device_t brdev, device_t reqdev, +typedef void mmcbus_retune_pause_t(device_t busdev, device_t reqdev, bool retune); -static __inline void MMCBUS_RETUNE_PAUSE(device_t brdev, device_t reqdev, +static __inline void MMCBUS_RETUNE_PAUSE(device_t busdev, device_t reqdev, bool retune) { kobjop_t _m; - KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_pause); - ((mmcbus_retune_pause_t *) _m)(brdev, reqdev, retune); + KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_retune_pause); + ((mmcbus_retune_pause_t *) _m)(busdev, reqdev, retune); } /** @brief Unique descriptor for the MMCBUS_RETUNE_UNPAUSE() method */ extern struct kobjop_desc mmcbus_retune_unpause_desc; /** @brief A function implementing the MMCBUS_RETUNE_UNPAUSE() method */ -typedef void mmcbus_retune_unpause_t(device_t brdev, device_t reqdev); +typedef void mmcbus_retune_unpause_t(device_t busdev, device_t reqdev); -static __inline void MMCBUS_RETUNE_UNPAUSE(device_t brdev, device_t reqdev) +static __inline void MMCBUS_RETUNE_UNPAUSE(device_t busdev, device_t reqdev) { kobjop_t _m; - KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_unpause); - ((mmcbus_retune_unpause_t *) _m)(brdev, reqdev); + KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_retune_unpause); + ((mmcbus_retune_unpause_t *) _m)(busdev, reqdev); } /** @brief Unique descriptor for the MMCBUS_WAIT_FOR_REQUEST() method */ extern struct kobjop_desc mmcbus_wait_for_request_desc; /** @brief A function implementing the MMCBUS_WAIT_FOR_REQUEST() method */ -typedef int mmcbus_wait_for_request_t(device_t brdev, device_t reqdev, +typedef int mmcbus_wait_for_request_t(device_t busdev, device_t reqdev, struct mmc_request *req); -static __inline int MMCBUS_WAIT_FOR_REQUEST(device_t brdev, device_t reqdev, +static __inline int MMCBUS_WAIT_FOR_REQUEST(device_t busdev, device_t reqdev, struct mmc_request *req) { kobjop_t _m; - KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_wait_for_request); - return ((mmcbus_wait_for_request_t *) _m)(brdev, reqdev, req); + KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_wait_for_request); + return ((mmcbus_wait_for_request_t *) _m)(busdev, reqdev, req); } /** @brief Unique descriptor for the MMCBUS_ACQUIRE_BUS() method */ extern struct kobjop_desc mmcbus_acquire_bus_desc; /** @brief A function implementing the MMCBUS_ACQUIRE_BUS() method */ -typedef int mmcbus_acquire_bus_t(device_t brdev, device_t reqdev); +typedef int mmcbus_acquire_bus_t(device_t busdev, device_t reqdev); -static __inline int MMCBUS_ACQUIRE_BUS(device_t brdev, device_t reqdev) +static __inline int MMCBUS_ACQUIRE_BUS(device_t busdev, device_t reqdev) { kobjop_t _m; - KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_acquire_bus); - return ((mmcbus_acquire_bus_t *) _m)(brdev, reqdev); + KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_acquire_bus); + return ((mmcbus_acquire_bus_t *) _m)(busdev, reqdev); } /** @brief Unique descriptor for the MMCBUS_RELEASE_BUS() method */ extern struct kobjop_desc mmcbus_release_bus_desc; /** @brief A function implementing the MMCBUS_RELEASE_BUS() method */ -typedef int mmcbus_release_bus_t(device_t brdev, device_t reqdev); +typedef int mmcbus_release_bus_t(device_t busdev, device_t reqdev); -static __inline int MMCBUS_RELEASE_BUS(device_t brdev, device_t reqdev) +static __inline int MMCBUS_RELEASE_BUS(device_t busdev, device_t reqdev) { kobjop_t _m; - KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_release_bus); - return ((mmcbus_release_bus_t *) _m)(brdev, reqdev); + KOBJOPLOOKUP(((kobj_t)busdev)->ops,mmcbus_release_bus); + return ((mmcbus_release_bus_t *) _m)(busdev, reqdev); } #endif /* _mmcbus_if_h_ */ diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h index 73c13394..c48a8765 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h @@ -67,6 +67,7 @@ #define USB_VENDOR_EGALAX2 0x0123 /* eGalax, Inc. */ #define USB_VENDOR_CHIPSBANK 0x0204 /* Chipsbank Microelectronics Co. */ #define USB_VENDOR_HUMAX 0x02ad /* HUMAX */ +#define USB_VENDOR_INTENSO 0x2109 /* INTENSO */ #define USB_VENDOR_LTS 0x0386 /* LTS */ #define USB_VENDOR_BWCT 0x03da /* Bernd Walter Computer Technology */ #define USB_VENDOR_AOX 0x03e8 /* AOX */ @@ -2506,6 +2507,9 @@ #define USB_PRODUCT_INSYSTEM_USBCABLE 0x081a /* USB cable */ #define USB_PRODUCT_INSYSTEM_STORAGE_V2 0x5701 /* USB Storage Adapter V2 */ +/* Intenso products */ +#define USB_PRODUCT_INTENSO_MEMORY_BOX 0x0701 /* External disk */ + /* Intel products */ #define USB_PRODUCT_INTEL_EASYPC_CAMERA 0x0110 /* Easy PC Camera */ #define USB_PRODUCT_INTEL_TESTBOARD 0x9890 /* 82930 test board */ @@ -2706,6 +2710,7 @@ /* Lenovo products */ #define USB_PRODUCT_LENOVO_GIGALAN 0x304b /* USB 3.0 Ethernet */ #define USB_PRODUCT_LENOVO_ETHERNET 0x7203 /* USB 2.0 Ethernet */ +#define USB_PRODUCT_LENOVO_RTL8153 0x7205 /* USB 3.0 Ethernet */ /* Lexar products */ #define USB_PRODUCT_LEXAR_JUMPSHOT 0x0001 /* jumpSHOT CompactFlash Reader */ @@ -3922,6 +3927,7 @@ #define USB_PRODUCT_ROLAND_SD20 0x0027 /* SD-20 MIDI Synth */ #define USB_PRODUCT_ROLAND_SD80 0x0029 /* SD-80 MIDI Synth */ #define USB_PRODUCT_ROLAND_UA700 0x002b /* UA-700 Audio I/F */ +#define USB_PRODUCT_ROLAND_PCR300 0x0033 /* EDIROL PCR-300 MIDI I/F */ /* Rockfire products */ #define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h index 91375d64..bb52312d 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h @@ -7833,6 +7833,12 @@ const struct usb_knowndev usb_knowndevs[] = { "In-System Design", "USB Storage Adapter V2", }, + { + USB_VENDOR_INTENSO, USB_PRODUCT_INTENSO_MEMORY_BOX, + 0, + "INTENSO", + "External disk", + }, { USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA, 0, @@ -8631,6 +8637,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Lenovo", "USB 2.0 Ethernet", }, + { + USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153, + 0, + "Lenovo", + "USB 3.0 Ethernet", + }, { USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT, 0, @@ -14595,6 +14607,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Roland", "UA-700 Audio I/F", }, + { + USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PCR300, + 0, + "Roland", + "EDIROL PCR-300 MIDI I/F", + }, { USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, 0, @@ -18381,6 +18399,12 @@ const struct usb_knowndev usb_knowndevs[] = { "HUMAX", NULL, }, + { + USB_VENDOR_INTENSO, 0, + USB_KNOWNDEV_NOPROD, + "INTENSO", + NULL, + }, { USB_VENDOR_LTS, 0, USB_KNOWNDEV_NOPROD, -- cgit v1.2.3