From 9e1f76baa0a84accbc10d28532bdeee7e4a93a5a Mon Sep 17 00:00:00 2001 From: Ross Thompson Date: Wed, 29 Dec 2021 20:18:00 -0600 Subject: [PATCH] Fixed lint issues with SDC. --- wally-pipelined/src/sdc/SDC.sv | 26 +++++++++++++++++--------- wally-pipelined/src/sdc/sd_cmd_fsm.sv | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/wally-pipelined/src/sdc/SDC.sv b/wally-pipelined/src/sdc/SDC.sv index 424d45771..ac199cb2c 100644 --- a/wally-pipelined/src/sdc/SDC.sv +++ b/wally-pipelined/src/sdc/SDC.sv @@ -208,15 +208,23 @@ module SDC end assign SDCReadDataPreNibbleSwap = ReadData512ByteWords[WordCount]; - assign SDCReadData = {SDCReadDataPreNibbleSwap[59:56], SDCReadDataPreNibbleSwap[63:60], - SDCReadDataPreNibbleSwap[51:48], SDCReadDataPreNibbleSwap[55:52], - SDCReadDataPreNibbleSwap[43:40], SDCReadDataPreNibbleSwap[47:44], - SDCReadDataPreNibbleSwap[35:32], SDCReadDataPreNibbleSwap[39:36], - SDCReadDataPreNibbleSwap[27:24], SDCReadDataPreNibbleSwap[31:28], - SDCReadDataPreNibbleSwap[19:16], SDCReadDataPreNibbleSwap[23:20], - SDCReadDataPreNibbleSwap[11:8], SDCReadDataPreNibbleSwap[15:12], - SDCReadDataPreNibbleSwap[3:0], SDCReadDataPreNibbleSwap[7:4]}; - + generate + if(`XLEN == 64) begin + assign SDCReadData = {SDCReadDataPreNibbleSwap[59:56], SDCReadDataPreNibbleSwap[63:60], + SDCReadDataPreNibbleSwap[51:48], SDCReadDataPreNibbleSwap[55:52], + SDCReadDataPreNibbleSwap[43:40], SDCReadDataPreNibbleSwap[47:44], + SDCReadDataPreNibbleSwap[35:32], SDCReadDataPreNibbleSwap[39:36], + SDCReadDataPreNibbleSwap[27:24], SDCReadDataPreNibbleSwap[31:28], + SDCReadDataPreNibbleSwap[19:16], SDCReadDataPreNibbleSwap[23:20], + SDCReadDataPreNibbleSwap[11:8], SDCReadDataPreNibbleSwap[15:12], + SDCReadDataPreNibbleSwap[3:0], SDCReadDataPreNibbleSwap[7:4]}; + end else begin + assign SDCReadData = {SDCReadDataPreNibbleSwap[27:24], SDCReadDataPreNibbleSwap[31:28], + SDCReadDataPreNibbleSwap[19:16], SDCReadDataPreNibbleSwap[23:20], + SDCReadDataPreNibbleSwap[11:8], SDCReadDataPreNibbleSwap[15:12], + SDCReadDataPreNibbleSwap[3:0], SDCReadDataPreNibbleSwap[7:4]}; + end + endgenerate flopenr #($clog2(4096/`XLEN)) WordCountReg (.clk(HCLK), diff --git a/wally-pipelined/src/sdc/sd_cmd_fsm.sv b/wally-pipelined/src/sdc/sd_cmd_fsm.sv index ef9467e92..7614bfd2e 100644 --- a/wally-pipelined/src/sdc/sd_cmd_fsm.sv +++ b/wally-pipelined/src/sdc/sd_cmd_fsm.sv @@ -271,7 +271,7 @@ module sd_cmd_fsm assign o_ERROR_CODE_Q = r_ERROR_CODE_Q; assign COUNTER_OUT_GT_ZERO = i_COUNTER_OUT > 0; - assign COUNTER_OUT_GE_ZERO = i_COUNTER_OUT >= 0; + assign COUNTER_OUT_GE_ZERO = $signed(i_COUNTER_OUT) >= $signed(8'b0); assign COUNTER_OUT_GT_8 = i_COUNTER_OUT > 8; assign COUNTER_OUT_EQ_8 = i_COUNTER_OUT == 8; assign COUNTER_OUT_EQ_ZERO = i_COUNTER_OUT == 0;