Update to FreeBSD head 2017-10-01

Git mirror commit b2f0376b45428f13151d229c5ae9d4d8f74acbd1.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-09 13:04:41 +02:00
parent c37f9fba70
commit e4a8065910
164 changed files with 2619 additions and 1406 deletions

View File

@@ -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_ */

View File

@@ -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 */

View File

@@ -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,