Update to FreeBSD stable/12 2019-06-05

Git mirror commit 78576620f2689e23144a1cf1bf55106cc6abe2b7.
This commit is contained in:
Sebastian Huber
2019-06-05 11:35:39 +02:00
parent 8f12ed3824
commit 705e362ea5
368 changed files with 34728 additions and 7606 deletions

View File

@@ -1155,4 +1155,75 @@ static __inline int BUS_GET_CPUS(device_t _dev, device_t _child,
return (rc);
}
/** @brief Unique descriptor for the BUS_RESET_PREPARE() method */
extern struct kobjop_desc bus_reset_prepare_desc;
/** @brief A function implementing the BUS_RESET_PREPARE() method */
typedef int bus_reset_prepare_t(device_t _dev, device_t _child);
/**
* @brief Prepares the given child of the bus for reset
*
* Typically bus detaches or suspends children' drivers, and then
* calls this method to save bus-specific information, for instance,
* PCI config space, which is damaged by reset.
*
* The bus_helper_reset_prepare() helper is provided to ease
* implementing bus reset methods.
*
* @param _dev the bus device
* @param _child the child device
*/
static __inline int BUS_RESET_PREPARE(device_t _dev, device_t _child)
{
kobjop_t _m;
int rc;
KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_reset_prepare);
rc = ((bus_reset_prepare_t *) _m)(_dev, _child);
return (rc);
}
/** @brief Unique descriptor for the BUS_RESET_POST() method */
extern struct kobjop_desc bus_reset_post_desc;
/** @brief A function implementing the BUS_RESET_POST() method */
typedef int bus_reset_post_t(device_t _dev, device_t _child);
/**
* @brief Restores the child operations after the reset
*
* The bus_helper_reset_post() helper is provided to ease
* implementing bus reset methods.
*
* @param _dev the bus device
* @param _child the child device
*/
static __inline int BUS_RESET_POST(device_t _dev, device_t _child)
{
kobjop_t _m;
int rc;
KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_reset_post);
rc = ((bus_reset_post_t *) _m)(_dev, _child);
return (rc);
}
/** @brief Unique descriptor for the BUS_RESET_CHILD() method */
extern struct kobjop_desc bus_reset_child_desc;
/** @brief A function implementing the BUS_RESET_CHILD() method */
typedef int bus_reset_child_t(device_t _dev, device_t _child, int _flags);
/**
* @brief Performs reset of the child
*
* @param _dev the bus device
* @param _child the child device
* @param _flags DEVF_RESET_ flags
*/
static __inline int BUS_RESET_CHILD(device_t _dev, device_t _child, int _flags)
{
kobjop_t _m;
int rc;
KOBJOPLOOKUP(((kobj_t)_dev)->ops,bus_reset_child);
rc = ((bus_reset_child_t *) _m)(_dev, _child, _flags);
return (rc);
}
#endif /* _bus_if_h_ */

View File

@@ -356,6 +356,7 @@
#define USB_VENDOR_AGFA 0x06bd /* AGFA-Gevaert */
#define USB_VENDOR_ASIAMD 0x06be /* Asia Microelectronic Development */
#define USB_VENDOR_BIZLINK 0x06c4 /* Bizlink International */
#define USB_VENDOR_SYNAPTICS 0x06cb /* Synaptics, Inc. */
#define USB_VENDOR_KEYSPAN 0x06cd /* Keyspan / InnoSys Inc. */
#define USB_VENDOR_CONTEC 0x06ce /* Contec products */
#define USB_VENDOR_AASHIMA 0x06d6 /* Aashima Technology */
@@ -2587,6 +2588,7 @@
#define USB_PRODUCT_INTEL2_IRMH2 0x0024 /* Integrated Rate Matching Hub */
#define USB_PRODUCT_INTEL2_IRMH3 0x8000 /* Integrated Rate Matching Hub */
#define USB_PRODUCT_INTEL2_IRMH4 0x8008 /* Integrated Rate Matching Hub */
#define USB_PRODUCT_INTEL2_SNP 0x0a2b /* Stone Peak (7265) Bluetooth Module */
#define USB_PRODUCT_INTEL2_SFP 0x0aa7 /* Sandy Peak (3168) Bluetooth Module */
#define USB_PRODUCT_INTEL2_JFP 0x0aaa /* Jefferson Peak (9460/9560) Bluetooth Module */
#define USB_PRODUCT_INTEL2_THP 0x0025 /* Thunder Peak (9160/9260) Bluetooth Module */
@@ -2679,6 +2681,9 @@
#define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit USB/PS2 trackball */
#define USB_PRODUCT_KENSINGTON_TURBOBALL 0x1005 /* TurboBall */
/* Synaptics products */
#define USB_PRODUCT_SYNAPTICS_FPR9A 0x009a /* Fingerprint Reader */
/* Keyspan products */
#define USB_PRODUCT_KEYSPAN_USA28_NF 0x0101 /* USA-28 serial Adapter (no firmware) */
#define USB_PRODUCT_KEYSPAN_USA28X_NF 0x0102 /* USA-28X serial Adapter (no firmware) */

View File

@@ -8053,6 +8053,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Intel",
"Integrated Rate Matching Hub",
},
{
USB_VENDOR_INTEL2, USB_PRODUCT_INTEL2_SNP,
0,
"Intel",
"Stone Peak (7265) Bluetooth Module",
},
{
USB_VENDOR_INTEL2, USB_PRODUCT_INTEL2_SFP,
0,
@@ -8371,6 +8377,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Kensington",
"TurboBall",
},
{
USB_VENDOR_SYNAPTICS, USB_PRODUCT_SYNAPTICS_FPR9A,
0,
"Synaptics, Inc.",
"Fingerprint Reader",
},
{
USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28_NF,
0,
@@ -20791,6 +20803,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Bizlink International",
NULL,
},
{
USB_VENDOR_SYNAPTICS, 0,
USB_KNOWNDEV_NOPROD,
"Synaptics, Inc.",
NULL,
},
{
USB_VENDOR_KEYSPAN, 0,
USB_KNOWNDEV_NOPROD,