diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-03-28 07:57:49 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-03-28 08:15:38 +0100 |
| commit | 481397ff24083456991f9e5a9e9f148984541d64 (patch) | |
| tree | 23946f12345f52b7318be74af9de10e153dcd72d /rtemsbsd/include | |
| parent | openssl/apps: Add missing newline (diff) | |
| download | rtems-libbsd-481397ff24083456991f9e5a9e9f148984541d64.tar.bz2 | |
Update to FreeBSD stable/12 2019-03-27
Git mirror commit 43a38f188ca2e936ec78104c30ea3e24d9c1606b.
Diffstat (limited to 'rtemsbsd/include')
| -rw-r--r-- | rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h | 9 | ||||
| -rw-r--r-- | rtemsbsd/include/rtems/bsd/local/usbdevs.h | 3 | ||||
| -rw-r--r-- | rtemsbsd/include/rtems/bsd/local/usbdevs_data.h | 18 |
3 files changed, 30 insertions, 0 deletions
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h index 1345e7ed..7caead1e 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h @@ -14,6 +14,11 @@ #define AddPptp _bsd_AddPptp #define addrsel_policy_init _bsd_addrsel_policy_init #define AddSeq _bsd_AddSeq +#define AES_CBC_MAC_Final _bsd_AES_CBC_MAC_Final +#define AES_CBC_MAC_Init _bsd_AES_CBC_MAC_Init +#define AES_CBC_MAC_Reinit _bsd_AES_CBC_MAC_Reinit +#define AES_CBC_MAC_Setkey _bsd_AES_CBC_MAC_Setkey +#define AES_CBC_MAC_Update _bsd_AES_CBC_MAC_Update #define AES_GMAC_Final _bsd_AES_GMAC_Final #define AES_GMAC_Init _bsd_AES_GMAC_Init #define AES_GMAC_Reinit _bsd_AES_GMAC_Reinit @@ -56,6 +61,9 @@ #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_ccm_cbc_mac_128 _bsd_auth_hash_ccm_cbc_mac_128 +#define auth_hash_ccm_cbc_mac_192 _bsd_auth_hash_ccm_cbc_mac_192 +#define auth_hash_ccm_cbc_mac_256 _bsd_auth_hash_ccm_cbc_mac_256 #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 @@ -1111,6 +1119,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_ccm _bsd_enc_xform_ccm #define enc_xform_chacha20 _bsd_enc_xform_chacha20 #define enc_xform_des _bsd_enc_xform_des #define enc_xform_null _bsd_enc_xform_null diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h index f0d49d92..73904347 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h @@ -2653,6 +2653,7 @@ #define USB_PRODUCT_JETI_SPC1201 0x04b2 /* FTDI compatible adapter */ /* JMicron products */ +#define USB_PRODUCT_JMICRON_JMS566 0x3569 /* USB to SATA 3.0Gb/s bridge */ #define USB_PRODUCT_JMICRON_JMS567 0x0567 /* USB to SATA 6.0Gb/s bridge */ #define USB_PRODUCT_JMICRON_JM20336 0x2336 /* USB to SATA Bridge */ #define USB_PRODUCT_JMICRON_JM20337 0x2338 /* USB to ATA/ATAPI Bridge */ @@ -4030,6 +4031,8 @@ #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 */ +#define USB_PRODUCT_ROLAND_UA25EX_AD 0x00e6 /* EDIROL UA-25EX (Advanced Driver) */ +#define USB_PRODUCT_ROLAND_UA25EX_CC 0x00e7 /* EDIROL UA-25EX (Class Compliant) */ /* 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 3c7f3345..aa199490 100644 --- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h +++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h @@ -8294,6 +8294,12 @@ const struct usb_knowndev usb_knowndevs[] = { "FTDI compatible adapter", }, { + USB_VENDOR_JMICRON, USB_PRODUCT_JMICRON_JMS566, + 0, + "JMicron", + "USB to SATA 3.0Gb/s bridge", + }, + { USB_VENDOR_JMICRON, USB_PRODUCT_JMICRON_JMS567, 0, "JMicron", @@ -14924,6 +14930,18 @@ const struct usb_knowndev usb_knowndevs[] = { "EDIROL PCR-300 MIDI I/F", }, { + USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA25EX_AD, + 0, + "Roland", + "EDIROL UA-25EX (Advanced Driver)", + }, + { + USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA25EX_CC, + 0, + "Roland", + "EDIROL UA-25EX (Class Compliant)", + }, + { USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, 0, "Rockfire", |