commit ad85e19ef353da3ae1f02d304a73f35d43f63b90
author Stefan Lippuner <lstefan@iis.ee.ethz.ch> Wed Jan 08 17:05:30 2020 +0100
committer Pirmin Vogel <vogelpi@lowrisc.org> Tue Jan 14 17:53:53 2020 +0100
tree 112dc1562b0ce469ad743decf895b228996badb5
parent b7c706c07b81c85560757b75edd2fb8667c3e30e

[usbdev] Re-align the usbdev simulation to current master

Re-align UART, remove SimCtrl call

Signed-off-by: Stefan Lippuner <lstefan@iis.ee.ethz.ch>

hw/dv/dpi/usbdpi/usbdpi.c

diff --git a/hw/dv/dpi/usbdpi/usbdpi.c b/hw/dv/dpi/usbdpi/usbdpi.c
index 5ce8265..9b4fc75 100644
--- a/hw/dv/dpi/usbdpi/usbdpi.c
+++ b/hw/dv/dpi/usbdpi/usbdpi.c
@@ -544,9 +544,7 @@
   }
   switch (ctx->state) {
     case ST_IDLE:
-      if ((VerilatorSimCtrl::GetInstance().TracingEnabled() &&
-           (ctx->frame == 20)) ||
-          (ctx->frame > 50)) {
+      if (ctx->frame == 20) {
         printf("USB: usbdpi done, frame: %d, success: %d, state: %d\n",
                ctx->frame, ctx->baudrate_set_successfully, ctx->state);
 

hw/top_earlgrey/rtl/top_earlgrey_usb.sv

diff --git a/hw/top_earlgrey/rtl/top_earlgrey_usb.sv b/hw/top_earlgrey/rtl/top_earlgrey_usb.sv
index ff46183..41fd6ec 100644
--- a/hw/top_earlgrey/rtl/top_earlgrey_usb.sv
+++ b/hw/top_earlgrey/rtl/top_earlgrey_usb.sv
@@ -162,7 +162,7 @@
   // Interrupt source list
   logic intr_uart_tx_watermark;
   logic intr_uart_rx_watermark;
-  logic intr_uart_tx_overflow;
+  logic intr_uart_tx_empty;
   logic intr_uart_rx_overflow;
   logic intr_uart_rx_frame_err;
   logic intr_uart_rx_break_err;
@@ -456,7 +456,7 @@
         // Interrupt
         .intr_tx_watermark_o  (intr_uart_tx_watermark),
         .intr_rx_watermark_o  (intr_uart_rx_watermark),
-        .intr_tx_overflow_o   (intr_uart_tx_overflow),
+        .intr_tx_empty_o      (intr_uart_tx_empty),
         .intr_rx_overflow_o   (intr_uart_rx_overflow),
         .intr_rx_frame_err_o  (intr_uart_rx_frame_err),
         .intr_rx_break_err_o  (intr_uart_rx_break_err),
@@ -489,7 +489,7 @@
 
       .intr_tx_watermark_o  (intr_uart_tx_watermark),
       .intr_rx_watermark_o  (intr_uart_rx_watermark),
-      .intr_tx_overflow_o   (intr_uart_tx_overflow),
+      .intr_tx_overflow_o   (intr_uart_tx_empty),
       .intr_rx_overflow_o   (intr_uart_rx_overflow),
       .intr_rx_frame_err_o  (intr_uart_rx_frame_err),
       .intr_rx_break_err_o  (intr_uart_rx_break_err),
@@ -751,7 +751,7 @@
       intr_uart_rx_break_err,
       intr_uart_rx_frame_err,
       intr_uart_rx_overflow,
-      intr_uart_tx_overflow,
+      intr_uart_tx_empty,
       intr_uart_rx_watermark,
       intr_uart_tx_watermark,
       intr_gpio_gpio