Merge "Nits from change 11042"

GitOrigin-RevId: d01d882d7b46ef080e509c153e5f690a9bd68a8b
This commit is contained in:
Matt Harvey 2021-10-05 21:02:26 +00:00 committed by Sam Leffler
parent 97fccf9c95
commit 201f5cf609
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@
* Apache License 2.0
*/
import "../../interfaces/RustIO.idl4";
import <RustIO.idl4>;
component OpenTitanUARTDriver {
dataport Buf mmio_region;

View File

@ -47,8 +47,8 @@
((value & UART_##regname##_##subfield##_MASK) \
<< UART_##regname##_##subfield##_OFFSET)
#define LOCK(lockname) seL4_Assert(lockname##_lock() == 0);
#define UNLOCK(lockname) seL4_Assert(lockname##_unlock() == 0);
#define LOCK(lockname) seL4_Assert(lockname##_lock() == 0)
#define UNLOCK(lockname) seL4_Assert(lockname##_unlock() == 0)
#define ASSERT_OR_RETURN(x) \
if (!(bool)(x)) { \
return UARTDriver_AssertionFailed; \