Merge branch 'ShinTop' into eb_dev
This commit is contained in:
@@ -151,7 +151,7 @@ class QSpiInterface extends SpiInterfaceBase{
|
|||||||
sck := qspi.sck
|
sck := qspi.sck
|
||||||
csn := qspi.csn
|
csn := qspi.csn
|
||||||
qspi.miso := exRego(7, 4)
|
qspi.miso := exRego(7, 4)
|
||||||
qspi.isDirIn := isSpiWrite
|
qspi.isDirIn := ~isSpiRead
|
||||||
|
|
||||||
when( shiftCSn(2) & ~shiftCSn(1) ){
|
when( shiftCSn(2) & ~shiftCSn(1) ){
|
||||||
bitSel := 0.U
|
bitSel := 0.U
|
||||||
|
|||||||
@@ -327,17 +327,11 @@ wire [11:0] nextByteCnt = byteCnt + 1;
|
|||||||
always @(negedge sck) begin
|
always @(negedge sck) begin
|
||||||
if( isBusy ) begin
|
if( isBusy ) begin
|
||||||
if( &bitCnt ) begin
|
if( &bitCnt ) begin
|
||||||
if( txBuf[2] === 1 & nextByteCnt >= 3) begin
|
|
||||||
exChangeRego <= isQspi ? exChangeRego << 4 : exChangeRego << 1;
|
|
||||||
end else begin
|
|
||||||
exChangeRego <= txBuf[nextByteCnt];
|
exChangeRego <= txBuf[nextByteCnt];
|
||||||
end
|
|
||||||
end else begin
|
end else begin
|
||||||
if( isQspi ) begin
|
|
||||||
exChangeRego <= isQspi ? exChangeRego << 4 : exChangeRego << 1;
|
exChangeRego <= isQspi ? exChangeRego << 4 : exChangeRego << 1;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
//输入
|
//输入
|
||||||
|
|||||||
Reference in New Issue
Block a user