diff options
Diffstat (limited to 'os/hal/templates')
| -rw-r--r-- | os/hal/templates/hal_i2c_lld.c | 4 | ||||
| -rw-r--r-- | os/hal/templates/hal_i2c_lld.h | 4 | ||||
| -rw-r--r-- | os/hal/templates/hal_spi_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/templates/osal/osal.c | 8 | ||||
| -rw-r--r-- | os/hal/templates/osal/osal.h | 8 |
5 files changed, 14 insertions, 12 deletions
diff --git a/os/hal/templates/hal_i2c_lld.c b/os/hal/templates/hal_i2c_lld.c index 819ff7a9f..b7f2e9944 100644 --- a/os/hal/templates/hal_i2c_lld.c +++ b/os/hal/templates/hal_i2c_lld.c @@ -132,7 +132,7 @@ void i2c_lld_stop(I2CDriver *i2cp) { */
msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout) {
+ sysinterval_t timeout) {
(void)i2cp;
(void)addr;
@@ -169,7 +169,7 @@ msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr, msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, i2caddr_t addr,
const uint8_t *txbuf, size_t txbytes,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout) {
+ sysinterval_t timeout) {
(void)i2cp;
(void)addr;
diff --git a/os/hal/templates/hal_i2c_lld.h b/os/hal/templates/hal_i2c_lld.h index 5015bf502..a1148062c 100644 --- a/os/hal/templates/hal_i2c_lld.h +++ b/os/hal/templates/hal_i2c_lld.h @@ -137,10 +137,10 @@ extern "C" { msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, i2caddr_t addr,
const uint8_t *txbuf, size_t txbytes,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout);
+ sysinterval_t timeout);
msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout);
+ sysinterval_t timeout);
#ifdef __cplusplus
}
#endif
diff --git a/os/hal/templates/hal_spi_lld.h b/os/hal/templates/hal_spi_lld.h index 0355cb914..e939c3955 100644 --- a/os/hal/templates/hal_spi_lld.h +++ b/os/hal/templates/hal_spi_lld.h @@ -174,6 +174,8 @@ extern "C" { void spi_lld_select(SPIDriver *spip);
void spi_lld_unselect(SPIDriver *spip);
#endif
+ void spi_lld_select(SPIDriver *spip);
+ void spi_lld_unselect(SPIDriver *spip);
void spi_lld_ignore(SPIDriver *spip, size_t n);
void spi_lld_exchange(SPIDriver *spip, size_t n,
const void *txbuf, void *rxbuf);
diff --git a/os/hal/templates/osal/osal.c b/os/hal/templates/osal/osal.c index e83ebcabd..5ec0bae59 100644 --- a/os/hal/templates/osal/osal.c +++ b/os/hal/templates/osal/osal.c @@ -150,7 +150,7 @@ systime_t osalOsGetSystemTimeX(void) { *
* @sclass
*/
-void osalThreadSleepS(systime_t time) {
+void osalThreadSleepS(sysinterval_t time) {
(void)time;
}
@@ -167,7 +167,7 @@ void osalThreadSleepS(systime_t time) { *
* @api
*/
-void osalThreadSleep(systime_t time) {
+void osalThreadSleep(sysinterval_t time) {
(void)time;
}
@@ -208,7 +208,7 @@ msg_t osalThreadSuspendS(thread_reference_t *trp) { *
* @sclass
*/
-msg_t osalThreadSuspendTimeoutS(thread_reference_t *trp, systime_t timeout) {
+msg_t osalThreadSuspendTimeoutS(thread_reference_t *trp, sysinterval_t timeout) {
osalDbgCheck(trp != NULL);
@@ -274,7 +274,7 @@ void osalThreadResumeS(thread_reference_t *trp, msg_t msg) { *
* @sclass
*/
-msg_t osalThreadEnqueueTimeoutS(threads_queue_t *tqp, systime_t timeout) {
+msg_t osalThreadEnqueueTimeoutS(threads_queue_t *tqp, sysinterval_t timeout) {
osalDbgCheck(tqp != NULL);
diff --git a/os/hal/templates/osal/osal.h b/os/hal/templates/osal/osal.h index bbaaf69df..620d5fb27 100644 --- a/os/hal/templates/osal/osal.h +++ b/os/hal/templates/osal/osal.h @@ -165,7 +165,7 @@ typedef int32_t msg_t; typedef uint32_t systime_t;
/**
- * @brief Type of system time counter.
+ * @brief Type of system time interval.
*/
typedef uint32_t sysinterval_t;
@@ -344,7 +344,7 @@ typedef struct { * @api
*/
#define OSAL_S2I(secs) \
- ((systime_t)((uint32_t)(secs) * (uint32_t)OSAL_ST_FREQUENCY))
+ ((sysinterval_t)((uint32_t)(secs) * (uint32_t)OSAL_ST_FREQUENCY))
/**
* @brief Milliseconds to system ticks.
@@ -357,7 +357,7 @@ typedef struct { * @api
*/
#define OSAL_MS2I(msecs) \
- ((systime_t)((((((uint32_t)(msecs)) * \
+ ((sysinterval_t)((((((uint32_t)(msecs)) * \
((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000UL) + 1UL))
/**
@@ -371,7 +371,7 @@ typedef struct { * @api
*/
#define OSAL_US2I(usecs) \
- ((systime_t)((((((uint32_t)(usecs)) * \
+ ((sysinterval_t)((((((uint32_t)(usecs)) * \
((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000000UL) + 1UL))
/** @} */
|