Update yield driver with output unification

cartesi · Oct 4, 2023 · b63daf0 · b63daf0
1 parent d40b754
commit b63daf0
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 533 deletions.
diff --git a/drivers/cartesi/Kconfig b/drivers/cartesi/Kconfig
@@ -17,7 +17,6 @@ config CARTESI_YIELD_DRIVER
 config CARTESI_ROLLUP_DRIVER
     bool "Cartesi Machine Rollup Device"
     depends on CARTESI_MACHINE
-    depends on CRYPTO_KECCAK
     default y
     help
         Cartesi Machine Rollup Device

diff --git a/drivers/cartesi/Makefile b/drivers/cartesi/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_CARTESI_YIELD_DRIVER) += yield.o libyield.o
-obj-$(CONFIG_CARTESI_ROLLUP_DRIVER) += rollup.o libyield.o libstream256.o
+obj-$(CONFIG_CARTESI_ROLLUP_DRIVER) += rollup.o libyield.o
diff --git a/drivers/cartesi/libstream256.c b/drivers/cartesi/libstream256.c
diff --git a/drivers/cartesi/libstream256.h b/drivers/cartesi/libstream256.h
diff --git a/drivers/cartesi/libyield.c b/drivers/cartesi/libyield.c
@@ -18,10 +18,8 @@ static int _yield_validate(u64 dev, u64 cmd, u64 reason)
     if (reason != HTIF_YIELD_REASON_PROGRESS &&
         reason != HTIF_YIELD_REASON_RX_ACCEPTED &&
         reason != HTIF_YIELD_REASON_RX_REJECTED &&
-        reason != HTIF_YIELD_REASON_TX_VOUCHER &&
-        reason != HTIF_YIELD_REASON_TX_NOTICE &&
-        reason != HTIF_YIELD_REASON_TX_REPORT &&
-        reason != HTIF_YIELD_REASON_TX_EXCEPTION) {
+        reason != HTIF_YIELD_REASON_TX_OUTPUT &&
+        reason != HTIF_YIELD_REASON_TX_VERIFIABLE_OUTPUT) {
         return -EINVAL;
     }