diff --git a/system/test_io/verilog/nanosoc_adp_manager.v b/system/test_io/verilog/nanosoc_adp_manager.v
index 25ba2539e9fb39d3ebbd642236bb7f54e870d244..2d7b0df615beec22eace9c16af132463dbe5494c 100755
--- a/system/test_io/verilog/nanosoc_adp_manager.v
+++ b/system/test_io/verilog/nanosoc_adp_manager.v
@@ -590,7 +590,7 @@ always @(posedge HCLK or negedge HRESETn)
              begin adp_state <= ADP_SYSCTL; end
            end
          else if (FNvalid_cmd(adp_cmd) == CMD_R)
-           begin ADP_BUSREADINC_next(); adp_state <= ADP_READ;
+           begin ADP_BUSREADINC_next; adp_state <= ADP_READ;
 `ifndef ADPBASIC
              adp_count_dec <= 1'b1; // optional loop param
 `endif
@@ -598,7 +598,7 @@ always @(posedge HCLK or negedge HRESETn)
          else if (FNvalid_cmd(adp_cmd) == CMD_S)
            begin adp_state <= ADP_SYSCHK; end
          else if (FNvalid_cmd(adp_cmd) == CMD_W)
-           begin adp_bus_data <= adp_param[31:0]; ADP_BUSWRITEINC_next(); adp_state <= ADP_WRITE; end
+           begin adp_bus_data <= adp_param[31:0]; ADP_BUSWRITEINC_next; adp_state <= ADP_WRITE; end
          else if (FNvalid_cmd(adp_cmd) == CMD_X)
            begin com_tx_byte <= 8'h0a; com_tx_req <= 1; adp_state <= ADP_EXIT; end
 `ifndef ADPBASIC
@@ -622,12 +622,12 @@ always @(posedge HCLK or negedge HRESETn)
 
        ADP_WRITE:  // perform bus write at current address pointer (and auto increment)
          if (adp_bus_done) begin adp_state <= ADP_ECHOCMD; adp_bus_err <= HRESP_i; end
-         else begin ADP_BUSWRITEINC_next(); end // extend request
+         else begin ADP_BUSWRITEINC_next; end // extend request
 
        ADP_READ:  // perform bus read at current adp address (and auto increment)  - and report in hex
          if (adp_bus_done) begin adp_bus_data <= HRDATA32_i; adp_bus_err <= HRESP_i; ADP_txchar_next("R"); adp_state <= ADP_ECHOBUS; end
          else begin
-           ADP_BUSREADINC_next();
+           ADP_BUSREADINC_next;
 `ifndef ADPBASIC
            adp_count_dec<= 1'b1;
 `endif
@@ -649,12 +649,12 @@ always @(posedge HCLK or negedge HRESETn)
          else com_rx_ack <= 1;  // extend stream request if not ready
        ADP_UREADB3: // read raw binary byte 3
          if (com_rx_done)
-           begin adp_bus_data[31:24] <= com_rx_byte; ADP_BUSWRITEINC_next(); adp_count_dec <= 1; adp_state <= ADP_UWRITE; end
+           begin adp_bus_data[31:24] <= com_rx_byte; ADP_BUSWRITEINC_next; adp_count_dec <= 1; adp_state <= ADP_UWRITE; end
          else com_rx_ack <= 1;  // extend stream request if not ready
        ADP_UWRITE:  // Write word to Addr++
          if (adp_bus_done) begin // auto address++, count--
            if (FNcount_down_zero_next(adp_count)) adp_state <= ADP_ECHOCMD; else begin adp_state <= ADP_UREADB0; adp_bus_err <= adp_bus_err | HRESP_i; end
-         end else begin  ADP_BUSWRITEINC_next(); adp_count_dec <= 1; end // extend request
+         end else begin  ADP_BUSWRITEINC_next; adp_count_dec <= 1; end // extend request
 
 // >>>>>>>>>>>>>>>> ADP BUS READ LOOP >>>>>>>>>>>>>>>>>>>>>>
        ADP_POLL:  // set poll value
@@ -669,17 +669,17 @@ always @(posedge HCLK or negedge HRESETn)
 
 // >>>>>>>>>>>>>>>> ADP (ZERO) FILL MEMORY >>>>>>>>>>>>>>>>>>>>>>
        ADP_FCTRL:  // set control value
-           begin adp_bus_data <= adp_val; ADP_BUSWRITEINC_next(); adp_count_dec <= 1; adp_state <= ADP_FWRITE; end
+           begin adp_bus_data <= adp_val; ADP_BUSWRITEINC_next; adp_count_dec <= 1; adp_state <= ADP_FWRITE; end
        ADP_FWRITE:  // Write word to Addr++
          if (adp_bus_done) begin // auto address++, count--
            if (FNcount_down_zero_next(adp_count)) adp_state <= ADP_ECHOCMD; else begin adp_state <= ADP_FCTRL;  adp_bus_err <= adp_bus_err | HRESP_i; end
-         end else begin  ADP_BUSWRITEINC_next(); adp_count_dec <= 1; end // extend request
+         end else begin  ADP_BUSWRITEINC_next; adp_count_dec <= 1; end // extend request
 `endif
 
         // >>>>>>>>>>>>>>>> ADP MISC >>>>>>>>>>>>>>>>>>>>>>
 
        ADP_UNKNOWN:  // output "?"
-         if (com_tx_done) begin ADP_LINEACK_next(); end
+         if (com_tx_done) begin ADP_LINEACK_next; end
          else com_tx_req <= 1;  // extend stream request if not ready
 
        ADP_EXIT:  // exit ADP mode
@@ -740,7 +740,7 @@ always @(posedge HCLK or negedge HRESETn)
        ADP_WRITEHEX0:  // output hex nibble 0 (if not startup banner then scan to end of line before lineack
          if (com_tx_done) begin
            adp_bus_err <= 1'b0; // clear sticky bus error flag
-           if (banner) begin ADP_LINEACK_next(); end
+           if (banner) begin ADP_LINEACK_next; end
            else begin ADP_txchar_next(8'h0A); com_tx_req <= 1; adp_state <= ADP_LINEACK; end // newline and prompt
          end else com_tx_req <= 1;  // extend
 
@@ -753,7 +753,7 @@ always @(posedge HCLK or negedge HRESETn)
            if (banner) begin banner <= 0; adp_state <= STD_IOCHK; end
 `ifndef ADPBASIC
            else if ((FNvalid_cmd(adp_cmd) == CMD_R) & |adp_count) //// non-zero count
-             begin ADP_BUSREADINC_next(); adp_count_dec <= 1'b1; adp_state <= ADP_READ; end //
+             begin ADP_BUSREADINC_next; adp_count_dec <= 1'b1; adp_state <= ADP_READ; end //
 `endif
            else begin ADP_txchar_next(PROMPT_CHAR); adp_state <= ADP_PROMPT; end
          end else com_tx_req <= 1;  // extend