Revision 0128be0f periphery-lld/periphAL.h
periphery-lld/periphAL.h | ||
---|---|---|
56 | 56 |
static inline void usleep(apalTime_t us) |
57 | 57 |
{ |
58 | 58 |
// check if the specified time can be represented by the system |
59 |
aosDbgCheck(us <= LL_ST2US(TIME_INFINITE));
|
|
59 |
aosDbgCheck(us <= TIME_I2US(TIME_INFINITE));
|
|
60 | 60 |
|
61 |
const systime_t st = LL_US2ST(us);
|
|
61 |
const systime_t st = TIME_US2I(us);
|
|
62 | 62 |
// TIME_IMMEDIATE makes no sense and would even cause system halt |
63 | 63 |
if (st != TIME_IMMEDIATE) { |
64 | 64 |
chThdSleep(st); |
... | ... | |
185 | 185 |
|
186 | 186 |
#endif |
187 | 187 |
|
188 |
#if HAL_USE_EXT || defined(__DOXYGEN__)
|
|
188 |
#if HAL_USE_PAL || defined(__DOXYGEN__)
|
|
189 | 189 |
|
190 | 190 |
/** |
191 | 191 |
* @brief Converts an apalGpioEdge_t to an ChibiOS EXT edge. |
192 | 192 |
*/ |
193 | 193 |
#define APAL2CH_EDGE(edge) \ |
194 |
((edge == APAL_GPIO_EDGE_RISING) ? EXT_CH_MODE_RISING_EDGE : \
|
|
195 |
(edge == APAL_GPIO_EDGE_FALLING) ? EXT_CH_MODE_FALLING_EDGE : \
|
|
196 |
(edge == APAL_GPIO_EDGE_BOTH) ? EXT_CH_MODE_BOTH_EDGES : 0)
|
|
194 |
((edge == APAL_GPIO_EDGE_RISING) ? PAL_EVENT_MODE_RISING_EDGE : \
|
|
195 |
(edge == APAL_GPIO_EDGE_FALLING) ? PAL_EVENT_MODE_FALLING_EDGE : \
|
|
196 |
(edge == APAL_GPIO_EDGE_BOTH) ? PAL_EVENT_MODE_BOTH_EDGES : 0)
|
|
197 | 197 |
|
198 | 198 |
#endif |
199 | 199 |
|
... | ... | |
365 | 365 |
msg_t status = MSG_OK; |
366 | 366 |
if (rxbytes == 1) { |
367 | 367 |
uint8_t buffer[2]; |
368 |
status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, buffer, 2, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
368 |
status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, buffer, 2, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
369 | 369 |
rxbuf[0] = buffer[0]; |
370 | 370 |
} else { |
371 |
status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
371 |
status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
372 | 372 |
} |
373 | 373 |
#else |
374 |
const msg_t status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
374 |
const msg_t status = i2cMasterTransmitTimeout(i2cd, addr, txbuf, txbytes, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
375 | 375 |
#endif |
376 | 376 |
|
377 | 377 |
#if (I2C_USE_MUTUAL_EXCLUSION == TRUE) |
... | ... | |
418 | 418 |
msg_t status = MSG_OK; |
419 | 419 |
if (rxbytes == 1) { |
420 | 420 |
uint8_t buffer[2]; |
421 |
status = i2cMasterReceiveTimeout(i2cd, addr, buffer, 2, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
421 |
status = i2cMasterReceiveTimeout(i2cd, addr, buffer, 2, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
422 | 422 |
rxbuf[0] = buffer[0]; |
423 | 423 |
} else { |
424 |
status = i2cMasterReceiveTimeout(i2cd, addr, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
424 |
status = i2cMasterReceiveTimeout(i2cd, addr, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
425 | 425 |
} |
426 | 426 |
#else |
427 |
const msg_t status = i2cMasterReceiveTimeout(i2cd, addr, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : LL_US2ST(timeout)) );
|
|
427 |
const msg_t status = i2cMasterReceiveTimeout(i2cd, addr, rxbuf, rxbytes, ((timeout >= TIME_INFINITE) ? TIME_INFINITE : TIME_US2I(timeout)) );
|
|
428 | 428 |
#endif |
429 | 429 |
|
430 | 430 |
#if (I2C_USE_MUTUAL_EXCLUSION == TRUE) |
Also available in: Unified diff