andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

API sduControl() added. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10506 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-08-29 14:02:30 +00:00
parent dd5d6d0aff
commit ab5f8476e1
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/hal/include/hal_serial_usb.h
View File

@ -185,6 +185,7 @@ extern "C" {
void sduDataTransmitted(USBDriver *usbp, usbep_t ep);
void sduDataReceived(USBDriver *usbp, usbep_t ep);
void sduInterruptTransmitted(USBDriver *usbp, usbep_t ep);
msg_t sduControl(USBDriver *usbp, unsigned int operation, void *arg);
#ifdef __cplusplus
}
#endif

3
os/hal/src/hal_serial.c
View File

@ -101,11 +101,10 @@ static msg_t _ctl(void *ip, unsigned int operation, void *arg) {
default:
#if defined(SD_LLD_IMPLEMENTS_CTL)
return sd_lld_control(sdp, operation, arg);
#else
#endif
case CHN_CTL_INVALID:
osalDbgAssert(false, "invalid CTL operation");
break;
#endif
}
return MSG_OK;
}

47
os/hal/src/hal_serial_usb.c
View File

@ -124,9 +124,35 @@ static size_t _readt(void *ip, uint8_t *bp, size_t n, systime_t timeout) {
return ibqReadTimeout(&((SerialUSBDriver *)ip)->ibqueue, bp, n, timeout);
}
static msg_t _ctl(void *ip, unsigned int operation, void *arg) {
SerialUSBDriver *sdup = (SerialUSBDriver *)ip;
osalDbgCheck(sdup != NULL);
switch (operation) {
case CHN_CTL_NOP:
osalDbgCheck(arg == NULL);
break;
default:
#if defined(SDU_LLD_IMPLEMENTS_CTL)
/* The SDU driver does not have a LLD but the application can use this
hook to implement extra controls by supplying this function.*/
extern msg_t sdu_lld_control(SerialUSBDriver *sdup,
unsigned int operation,
void *arg);
return sdu_lld_control(sdup, operation, arg);
#endif
case CHN_CTL_INVALID:
osalDbgAssert(false, "invalid CTL operation");
break;
}
return MSG_OK;
}
static const struct SerialUSBDriverVMT vmt = {
_write, _read, _put, _get,
_putt, _gett, _writet, _readt
_putt, _gett, _writet, _readt,
_ctl
};
/**
@ -490,6 +516,25 @@ void sduInterruptTransmitted(USBDriver *usbp, usbep_t ep) {
(void)ep;
}
/**
* @brief Control operation on a serial USB port.
*
* @param[in] usbp pointer to a @p USBDriver object
* @param[in] operation control operation code
* @param[in,out] arg operation argument
*
* @return The control operation status.
* @retval MSG_OK in case of success.
* @retval MSG_TIMEOUT in case of operation timeout.
* @retval MSG_RESET in case of operation reset.
*
* @api
*/
msg_t sduControl(USBDriver *usbp, unsigned int operation, void *arg) {
return _ctl((void *)usbp, operation, arg);
}
#endif /* HAL_USE_SERIAL_USB == TRUE */
/** @} */