From c37f9fba70085fedc8eede7559489d2321393005 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 7 Aug 2018 14:56:50 +0200 Subject: Update to FreeBSD head 2017-08-01 Git mirror commit f5002f5e5f78cae9f0269d812dc0aedb0339312c. Update #3472. --- rtemsbsd/include/rtems/bsd/local/miidevs.h | 4 +++- rtemsbsd/include/rtems/bsd/local/mmcbr_if.h | 24 ++++++++++++++++++++++++ rtemsbsd/include/rtems/bsd/local/mmcbus_if.h | 26 ++++++++++++++++++++++++++ rtemsbsd/include/rtems/bsd/local/opt_mmccam.h | 0 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 rtemsbsd/include/rtems/bsd/local/opt_mmccam.h (limited to 'rtemsbsd/include/rtems/bsd/local') diff --git a/rtemsbsd/include/rtems/bsd/local/miidevs.h b/rtemsbsd/include/rtems/bsd/local/miidevs.h index 4c6f542d..4ef09049 100644 --- a/rtemsbsd/include/rtems/bsd/local/miidevs.h +++ b/rtemsbsd/include/rtems/bsd/local/miidevs.h @@ -512,7 +512,9 @@ #define MII_MODEL_xxTSC_78Q2121 0x0015 #define MII_STR_xxTSC_78Q2121 "78Q2121 100BASE-TX media interface" -/* Vitesse Semiconductor */ +/* Vitesse Semiconductor (now Microsemi) */ +#define MII_MODEL_xxVITESSE_VSC8501 0x0013 +#define MII_STR_xxVITESSE_VSC8501 "Vitesse VSC8501 10/100/1000TX PHY" #define MII_MODEL_xxVITESSE_VSC8641 0x0003 #define MII_STR_xxVITESSE_VSC8641 "Vitesse VSC8641 10/100/1000TX PHY" diff --git a/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h b/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h index 33cb98e6..2fc1656c 100644 --- a/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h +++ b/rtemsbsd/include/rtems/bsd/local/mmcbr_if.h @@ -38,6 +38,30 @@ static __inline int MMCBR_SWITCH_VCCQ(device_t brdev, device_t reqdev) return ((mmcbr_switch_vccq_t *) _m)(brdev, reqdev); } +/** @brief Unique descriptor for the MMCBR_TUNE() method */ +extern struct kobjop_desc mmcbr_tune_desc; +/** @brief A function implementing the MMCBR_TUNE() method */ +typedef int mmcbr_tune_t(device_t brdev, device_t reqdev, bool hs400); + +static __inline int MMCBR_TUNE(device_t brdev, device_t reqdev, bool hs400) +{ + kobjop_t _m; + KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbr_tune); + return ((mmcbr_tune_t *) _m)(brdev, reqdev, hs400); +} + +/** @brief Unique descriptor for the MMCBR_RETUNE() method */ +extern struct kobjop_desc mmcbr_retune_desc; +/** @brief A function implementing the MMCBR_RETUNE() method */ +typedef int mmcbr_retune_t(device_t brdev, device_t reqdev, bool reset); + +static __inline int MMCBR_RETUNE(device_t brdev, device_t reqdev, bool reset) +{ + kobjop_t _m; + KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbr_retune); + return ((mmcbr_retune_t *) _m)(brdev, reqdev, reset); +} + /** @brief Unique descriptor for the MMCBR_REQUEST() method */ extern struct kobjop_desc mmcbr_request_desc; /** @brief A function implementing the MMCBR_REQUEST() method */ diff --git a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h index 35fc1a0f..7910f1f3 100644 --- a/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h +++ b/rtemsbsd/include/rtems/bsd/local/mmcbus_if.h @@ -14,6 +14,32 @@ #ifndef _mmcbus_if_h_ #define _mmcbus_if_h_ +/** @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, + bool retune); + +static __inline void MMCBUS_RETUNE_PAUSE(device_t brdev, device_t reqdev, + bool retune) +{ + kobjop_t _m; + KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_pause); + ((mmcbus_retune_pause_t *) _m)(brdev, 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); + +static __inline void MMCBUS_RETUNE_UNPAUSE(device_t brdev, device_t reqdev) +{ + kobjop_t _m; + KOBJOPLOOKUP(((kobj_t)brdev)->ops,mmcbus_retune_unpause); + ((mmcbus_retune_unpause_t *) _m)(brdev, 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 */ diff --git a/rtemsbsd/include/rtems/bsd/local/opt_mmccam.h b/rtemsbsd/include/rtems/bsd/local/opt_mmccam.h new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3