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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16287 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
Giovanni Di Sirio 2023-06-16 13:16:29 +00:00
parent e79ef9f801
commit 4759d8b4a7
3 changed files with 140 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
os/xhal/codegen/hal_spi.xml
View File

@ -788,22 +788,66 @@ This code handles the portable part of the ISR code:
</note>
<notapi />
<implementation><![CDATA[
if (self->config->data_cb) {
if (self->cb != NULL) {
self->state = HAL_DRV_STATE_COMPLETE;
self->config->data_cb(spip);
if (self->state == HAL_DRV_STATE_COMPLETE)
self->cb(self);
if (self->state == HAL_DRV_STATE_COMPLETE) {
self->state = HAL_DRV_STATE_READY;
}
}
else {
self->state = HAL_DRV_STATE_READY;
}
#if SPI_USE_SYNCHRONIZATION == TRUE
/* Thread wakeup, if any.*/
osalSysLockFromISR();
osalThreadResumeI(&self->sync_transfer, MSG_OK);
osalSysUnlockFromISR();
#endif]]></implementation>
__spi_wakeup_isr(self);]]></implementation>
</method>
<method name="__spi_isr_half_code" ctype="void">
<brief>Half buffer filled ISR code in circular mode.</brief>
<details><verbatim><![CDATA[The callback is invoked with driver
state set to @p HAL_DRV_STATE_ACTIVE.]]></verbatim></details>
<note>This function is meant to be used in the low level
drivers implementations only.
</note>
<notapi />
<implementation><![CDATA[
if (self->cb != NULL) {
self->cb(self);
}]]></implementation>
</method>
<method name="__spi_isr_full_code" ctype="void">
<brief>Full buffer filled ISR code in circular mode.</brief>
<details><verbatim><![CDATA[The callback is invoked with driver
state set to @p HAL_DRV_STATE_COMPLETE.]]></verbatim></details>
<note>This function is meant to be used in the low level
drivers implementations only.
</note>
<notapi />
<implementation><![CDATA[
if (self->cb != NULL) {
self->state = HAL_DRV_STATE_COMPLETE;
self->cb(self);
if (self->state == HAL_DRV_STATE_COMPLETE) {
self->state = HAL_DRV_STATE_ACTIVE;
}
}]]></implementation>
</method>
<method name="__spi_isr_error_code" ctype="void">
<brief>ISR error reporting code..</brief>
<details><verbatim><![CDATA[The callback is invoked with driver
state set to @p HAL_DRV_STATE_ERROR.]]></verbatim></details>
<note>This function is meant to be used in the low level
drivers implementations only.
</note>
<param name="msg" ctype="msg_t" dir="in">The error code.</param>
<notapi />
<implementation><![CDATA[
if (self->cb) {
self->cb(self);
}
__spi_wakeup_isr(self, msg);]]></implementation>
</method>
</inline>
<override>

92
os/xhal/include/hal_spi.h
View File

@ -437,6 +437,7 @@ static inline void spiUnselectX(void *ip) {
palSetPad(self->config->ssport, self->config->sspad);
}
#endif /* SPI_SELECT_MODE == SPI_SELECT_MODE_LLD */
#if (SPI_USE_SYNCHRONIZATION == TRUE) || defined (__DOXYGEN__)
/**
* @memberof hal_spi_driver_c
@ -461,6 +462,7 @@ static inline void __spi_wakeup_isr(void *ip, msg_t msg) {
}
#else
CC_FORCE_INLINE
static inline void __spi_wakeup_isr(void *ip, msg_t msg) {
hal_spi_driver_c *self = (hal_spi_driver_c *)ip;
@ -468,6 +470,7 @@ static inline void __spi_wakeup_isr(void *ip, msg_t msg) {
(void)self;
}
#endif /* SPI_USE_SYNCHRONIZATION == TRUE */
/**
* @memberof hal_spi_driver_c
* @public
@ -488,22 +491,93 @@ static inline void __spi_wakeup_isr(void *ip, msg_t msg) {
CC_FORCE_INLINE
static inline void __spi_isr_complete_code(void *ip) {
hal_spi_driver_c *self = (hal_spi_driver_c *)ip;
if (self->config->data_cb) {
if (self->cb != NULL) {
self->state = HAL_DRV_STATE_COMPLETE;
self->config->data_cb(spip);
if (self->state == HAL_DRV_STATE_COMPLETE)
self->cb(self);
if (self->state == HAL_DRV_STATE_COMPLETE) {
self->state = HAL_DRV_STATE_READY;
}
}
else {
self->state = HAL_DRV_STATE_READY;
}
#if SPI_USE_SYNCHRONIZATION == TRUE
/* Thread wakeup, if any.*/
osalSysLockFromISR();
osalThreadResumeI(&self->sync_transfer, MSG_OK);
osalSysUnlockFromISR();
#endif
__spi_wakeup_isr(self);
}
/**
* @memberof hal_spi_driver_c
* @public
*
* @brief Half buffer filled ISR code in circular mode.
* @details The callback is invoked with driver
* state set to @p HAL_DRV_STATE_ACTIVE.
* @note This function is meant to be used in the low level drivers
* implementations only.
*
* @param[in,out] ip Pointer to a @p hal_spi_driver_c instance.
*
* @notapi
*/
CC_FORCE_INLINE
static inline void __spi_isr_half_code(void *ip) {
hal_spi_driver_c *self = (hal_spi_driver_c *)ip;
if (self->cb != NULL) {
self->cb(self);
}
}
/**
* @memberof hal_spi_driver_c
* @public
*
* @brief Full buffer filled ISR code in circular mode.
* @details The callback is invoked with driver
* state set to @p HAL_DRV_STATE_COMPLETE.
* @note This function is meant to be used in the low level drivers
* implementations only.
*
* @param[in,out] ip Pointer to a @p hal_spi_driver_c instance.
*
* @notapi
*/
CC_FORCE_INLINE
static inline void __spi_isr_full_code(void *ip) {
hal_spi_driver_c *self = (hal_spi_driver_c *)ip;
if (self->cb != NULL) {
self->state = HAL_DRV_STATE_COMPLETE;
self->cb(self);
if (self->state == HAL_DRV_STATE_COMPLETE) {
self->state = HAL_DRV_STATE_ACTIVE;
}
}
}
/**
* @memberof hal_spi_driver_c
* @public
*
* @brief ISR error reporting code..
* @details The callback is invoked with driver
* state set to @p HAL_DRV_STATE_ERROR.
* @note This function is meant to be used in the low level drivers
* implementations only.
*
* @param[in,out] ip Pointer to a @p hal_spi_driver_c instance.
* @param[in] msg The error code.
*
* @notapi
*/
CC_FORCE_INLINE
static inline void __spi_isr_error_code(void *ip, msg_t msg) {
hal_spi_driver_c *self = (hal_spi_driver_c *)ip;
if (self->cb) {
self->cb(self);
}
__spi_wakeup_isr(self, msg);
}
/** @} */

4
tools/ftl/libs/libcclasses.ftl
View File

@ -725,11 +725,15 @@ CC_FORCE_INLINE
modifiers = modifiers
nodoc = nodoc /]
#endif /* ${condcheck} */
[#if this?has_next]
[/#if]
[#elseif this?node_name == "elseif"]
[#local nodoc = true]
[#local condcheck = (this.@check[0]!"")?trim]
[#if condcheck?length == 0]
#else
[#else]
#elif ${condcheck}
[/#if]