修正测试用例里的代码错误,看波形应该是正确了
This commit is contained in:
@@ -475,10 +475,19 @@ end
|
||||
reg [7:0] exChangeRego;
|
||||
reg [7:0] exChangeRegi;
|
||||
|
||||
|
||||
reg [11:0] transCnt;
|
||||
reg [11:0] byteCnt;
|
||||
reg [2:0] bitCnt;
|
||||
`ifndef OLD_SPI_SUPPORT
|
||||
reg spi_1to4 = 1;
|
||||
`endif
|
||||
|
||||
assign spi_mosi = exChangeRego[7];
|
||||
`ifndef OLD_SPI_SUPPORT
|
||||
assign qspi_mosi = (spi_1to4 & byteCnt < 4)? {3'h0, exChangeRego[7]}:exChangeRego[7:4];
|
||||
`else
|
||||
assign qspi_mosi = exChangeRego[7:4];
|
||||
`endif
|
||||
|
||||
wire [3:0] qspi_mux_miso = `QSPI_MUX_MISO_INIT;
|
||||
//( qspi_miso[4*0+3:4*0] & ~{4{spi_csn[ 0]}}) |
|
||||
@@ -524,12 +533,6 @@ end
|
||||
reg [11:0] length;
|
||||
reg [16:0] idx;
|
||||
|
||||
reg [11:0] transCnt;
|
||||
reg [11:0] byteCnt;
|
||||
reg [2:0] bitCnt;
|
||||
`ifndef OLD_SPI_SUPPORT
|
||||
reg spi_1to4 = 1;
|
||||
`endif
|
||||
|
||||
|
||||
always @(posedge clock) begin
|
||||
@@ -561,7 +564,7 @@ always @(negedge sck) begin
|
||||
`else
|
||||
//当单线转4线的协议生效时,且传输命令+地址,使用单线
|
||||
//否则使用接口的固定模式
|
||||
if (spi_1to4 & transCnt < 4) begin
|
||||
if (spi_1to4 & byteCnt < 4) begin
|
||||
exChangeRego <= exChangeRego << 1;
|
||||
end else begin
|
||||
exChangeRego <= isQspi ? exChangeRego << 4 : exChangeRego << 1;
|
||||
@@ -589,7 +592,7 @@ always @(posedge sck) begin
|
||||
bitCnt <= ~bitCnt;
|
||||
`else
|
||||
//当单线转4线的协议生效时,且传输命令+地址,使用单线;数据使用4线
|
||||
if ((transCnt < 4) & (spi_1to4)) begin
|
||||
if ((byteCnt < 4) & (spi_1to4)) begin
|
||||
bitCnt <= bitCnt + 1;
|
||||
end else begin
|
||||
bitCnt <= ~bitCnt;
|
||||
@@ -652,7 +655,7 @@ always @(posedge sck) begin
|
||||
end
|
||||
end else begin
|
||||
//字节数小于4个字节,且启动了QSPI的1线命令4线数据
|
||||
if ((transCnt < 4) & (spi_1to4)) begin
|
||||
if ((byteCnt < 4) & (spi_1to4)) begin
|
||||
exChangeRegi <= isQspi ? {exChangeRegi[6:0], qspi_mux_miso[0]} : {exChangeRegi[6:0], spi_mux_miso};
|
||||
end else begin
|
||||
exChangeRegi <= isQspi ? {exChangeRegi[3:0], qspi_mux_miso} : {exChangeRegi[6:0], spi_mux_miso};
|
||||
|
||||
Reference in New Issue
Block a user