ports/cheriot-rtos: Addressed pr comments.

Signed-off-by: Jacob Trevor <[email protected]>

Author: JakeTrevor

ports/cheriot-rtos/hal/i2c.cpp

@@ -11,10 +11,6 @@ extern "C" bool i2c_blocking_read(volatile OpenTitanI2c *i2c, uint8_t addr, uint
     return i2c->blocking_read(addr, buf, len);
 }
 
-extern "C" void i2c_blocking_write(volatile OpenTitanI2c *i2c, uint8_t addr, uint8_t *buf, uint32_t len, bool skipStop) {
-    i2c->blocking_write(addr, buf, len, skipStop);
-}
-
 extern "C" bool i2c_check_success(volatile OpenTitanI2c *i2c) {
     while (!i2c->format_is_empty()) {
     }
@@ -25,6 +21,13 @@ extern "C" bool i2c_check_success(volatile OpenTitanI2c *i2c) {
     return true;
 }
 
-extern "C" void i2c_send_address(volatile OpenTitanI2c *i2c, uint8_t addr) {
+extern "C" bool i2c_blocking_write(volatile OpenTitanI2c *i2c, uint8_t addr, uint8_t *buf, uint32_t len, bool skipStop) {
+    i2c->blocking_write(addr, buf, len, skipStop);
+    return i2c_check_success(i2c);
+}
+
+
+extern "C" bool i2c_send_address(volatile OpenTitanI2c *i2c, uint8_t addr) {
     i2c->blocking_write_byte(OpenTitanI2c::FormatDataStart | OpenTitanI2c::FormatDataStop | (addr << 1) | 1u);
+    return i2c_check_success(i2c);
 }

ports/cheriot-rtos/hal/uart.cpp

@@ -3,11 +3,11 @@
 #include "timer.h"
 
 extern "C" uint8_t uart_get_rx_level(volatile OpenTitanUart<115'200> *block) {
-    return (block->fifoStatus >> 16) & 0xff;
+    return block->receive_fifo_level();
 }
 
 extern "C" uint8_t uart_get_tx_level(volatile OpenTitanUart<115'200> *block) {
-    return block->fifoStatus & 0xff;
+    return block->transmit_fifo_level();
 }
 
 extern "C" bool uart_is_readable(volatile OpenTitanUart<115'200> *block) {
@@ -18,7 +18,7 @@ extern "C" bool uart_is_writable(volatile OpenTitanUart<115'200> *block) {
     return block->can_write();
 }
 
-extern "C" bool uart_read(volatile OpenTitanUart<115'200> *block, uint8_t *out, uint32_t timeout_ms) {
+extern "C" bool uart_timeout_read(volatile OpenTitanUart<115'200> *block, uint8_t *out, uint32_t timeout_ms) {
     uint32_t t_end = get_time() + MS_TO_CLOCK_CYCLES(timeout_ms);
 
     while (!block->can_read()) {
@@ -31,10 +31,8 @@ extern "C" bool uart_read(volatile OpenTitanUart<115'200> *block, uint8_t *out,
     return true;
 }
 
-extern "C" void uart_write(volatile OpenTitanUart<115'200> *block, uint8_t data) {
-    while (!block->can_write()) {
-    }
-    block->wData = data;
+extern "C" void uart_blocking_write(volatile OpenTitanUart<115'200> *block, uint8_t data) {
+    block->blocking_write(data);
 }
 
 extern "C" void uart_init(volatile OpenTitanUart<115'200> *block, uint32_t baudrate) {

ports/cheriot-rtos/machine_i2c.c

@@ -7,12 +7,9 @@
 typedef struct OpenTitanI2c open_titan_i2c_t;
 
 extern void i2c_setup(volatile open_titan_i2c_t *i2c, uint32_t freq_kHz);
-extern void i2c_send_address(volatile open_titan_i2c_t *i2c, uint8_t addr);
+extern bool i2c_send_address(volatile open_titan_i2c_t *i2c, uint8_t addr);
 extern bool i2c_blocking_read(volatile open_titan_i2c_t *i2c, uint8_t addr, uint8_t *buf, uint32_t len);
-extern void i2c_blocking_write(volatile open_titan_i2c_t *i2c, uint8_t addr, uint8_t *buf, uint32_t len, bool skipStop);
-
-extern bool  i2c_check_success(volatile open_titan_i2c_t *i2c);
-
+extern bool i2c_blocking_write(volatile open_titan_i2c_t *i2c, uint8_t addr, uint8_t *buf, uint32_t len, bool skipStop);
 
 typedef struct _machine_i2c_obj_t {
     mp_obj_base_t base;
@@ -22,15 +19,18 @@ typedef struct _machine_i2c_obj_t {
 
 #define I2C_DEFAULT_FREQ (400000)
 
+#define SPI_BLOCK_0 (0x80200000)
+#define SPI_BLOCK_1 (0x80201000)
+
 static void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_i2c_obj_t *self = (machine_i2c_obj_t *)MP_OBJ_TO_PTR(self_in);
     const char *name;
 
-    switch ((uint32_t)self->i2c_block) {
-        case 2149580800:
+    switch ((ptraddr_t)self->i2c_block) {
+        case SPI_BLOCK_0:
             name = "0";
             break;
-        case 2149584896:
+        case SPI_BLOCK_1:
             name = "1";
             break;
         default:
@@ -100,15 +100,13 @@ static int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     bool success;
 
     if (len == 0) {
-        i2c_send_address(self->i2c_block, addr);
-        success = i2c_check_success(self->i2c_block);
+        success = i2c_send_address(self->i2c_block, addr);
 
     } else if (flags & MP_MACHINE_I2C_FLAG_READ) {
         success = i2c_blocking_read(self->i2c_block, addr, buf, len);
 
     } else {
-        i2c_blocking_write(self->i2c_block, addr, buf, len, !stop);
-        success = i2c_check_success(self->i2c_block);
+        success = i2c_blocking_write(self->i2c_block, addr, buf, len, !stop);
     }
     return success ? len : -5;
 }

ports/cheriot-rtos/machine_uart.c

@@ -126,7 +126,6 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 
-// TODO this one too
 static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
 
 }
@@ -200,6 +199,3 @@ static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
     }
     return ret;
 }
-
-
-#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS