diff --git a/controller/verilog/socdebug_adp_control.v b/controller/verilog/socdebug_adp_control.v
index e6282ec638f169f84bb5de0889af27e86a3514d5..46991aa43e5831a1a9f5002b7f3123bc295d8635 100755
--- a/controller/verilog/socdebug_adp_control.v
+++ b/controller/verilog/socdebug_adp_control.v
@@ -268,7 +268,7 @@ localparam       STD_TXD2 = 6'b100001 ;
 localparam      ADP_UCTRL = 6'b100010 ;
 localparam     ADP_UREADB = 6'b100011 ;
 localparam     ADP_UWRITE = 6'b100100 ;
-localparam       ADP_POLL = 6'b100101 ;
+localparam      ADP_POLL0 = 6'b100101 ;
 localparam      ADP_POLL1 = 6'b100110 ;
 localparam      ADP_POLL2 = 6'b100111 ;
 localparam      ADP_FCTRL = 6'b101000 ;
@@ -316,7 +316,7 @@ localparam       STD_TXD2 = 45'b000000000001000000000000000000000000000000000 ;
 localparam      ADP_UCTRL = 45'b000000000010000000000000000000000000000000000 ; // = 6'b100010 ;
 localparam     ADP_UREADB = 45'b000000000100000000000000000000000000000000000 ; // = 6'b100011 ;
 localparam     ADP_UWRITE = 45'b000000001000000000000000000000000000000000000 ; // = 6'b100100 ;
-localparam       ADP_POLL = 45'b000000010000000000000000000000000000000000000 ; // = 6'b100101 ;
+localparam      ADP_POLL0 = 45'b000000010000000000000000000000000000000000000 ; // = 6'b100101 ;
 localparam      ADP_POLL1 = 45'b000000100000000000000000000000000000000000000 ; // = 6'b100110 ;
 localparam      ADP_POLL2 = 45'b000001000000000000000000000000000000000000000 ; // = 6'b100111 ;
 localparam      ADP_FCTRL = 45'b000010000000000000000000000000000000000000000 ; // = 6'b101000 ;
@@ -592,7 +592,7 @@ always @(posedge HCLK or negedge HRESETn)
            begin if (|adp_param[34:32]) adp_mask <= adp_param[31:0]; else adp_param <= {3'b111,adp_mask};
              adp_state <= ADP_ECHOCMD; end
          else if (FNvalid_cmd(adp_cmd) == CMD_P)
-           if (FNcount_down_zero_next(adp_param[31:0])) adp_state <= ADP_ECHOCMD; else adp_state <= ADP_POLL; // non-zero count
+           if (FNcount_down_zero_next(adp_param[31:0])) adp_state <= ADP_ECHOCMD; else adp_state <= ADP_POLL0; // non-zero count
          else if (FNvalid_cmd(adp_cmd) == CMD_V)
            begin if (|adp_param[34:32]) begin adp_size <= FNparam2size(adp_param[34:33]); adp_val <= adp_param[34:0]; end
                  else adp_param <= adp_val;
@@ -638,7 +638,7 @@ always @(posedge HCLK or negedge HRESETn)
          end else begin  ADP_BUSWRITEINC_next; adp_count_dec <= 1; end // extend request
 
 // >>>>>>>>>>>>>>>> ADP BUS READ LOOP >>>>>>>>>>>>>>>>>>>>>>
-       ADP_POLL:  // set poll value
+       ADP_POLL0:  // set poll value
          begin adp_bus_req <= 1; adp_bus_write <= 0; adp_state <= ADP_POLL1; end
        ADP_POLL1:  // wait for read data, no addr++
          if (adp_bus_done) begin adp_bus_data <= HRDATA32_i; adp_count_dec <=1; adp_state <= ADP_POLL2; adp_bus_err <= adp_bus_err | HRESP_i; end
@@ -646,7 +646,7 @@ always @(posedge HCLK or negedge HRESETn)
        ADP_POLL2:
          if (FNcount_down_zero_next(adp_count)) begin adp_state <= ADP_ECHOCMD; adp_bus_err <= 1'b1; end // timeout
          else if (((adp_bus_data  & adp_mask) ^ adp_val[31:0]) == 0) begin adp_state <= ADP_ECHOCMD; adp_param <= {1'b0, (adp_param[31:0] - adp_count)}; end // exact match
-         else adp_state <= ADP_POLL;
+         else adp_state <= ADP_POLL0;
 
 // >>>>>>>>>>>>>>>> ADP (ZERO) FILL MEMORY >>>>>>>>>>>>>>>>>>>>>>
        ADP_FCTRL:  // set control value