spi读取胡乱修复,
This commit is contained in:
@@ -48,7 +48,7 @@ abstract class SpiInterfaceBase extends Module{
|
||||
|
||||
|
||||
|
||||
val addrSel = Reg(UInt(16.W)); io.addrSel := addrSel
|
||||
val addrSel = Reg(UInt(16.W))
|
||||
val spiCmd = Reg(UInt(8.W))
|
||||
|
||||
val isSpiWrite = spiCmd === 0.U
|
||||
@@ -58,9 +58,14 @@ abstract class SpiInterfaceBase extends Module{
|
||||
val byteSel = Reg(UInt(12.W))
|
||||
|
||||
|
||||
io.isEnR := isSckPosedgeNext(0) & ~shiftCSn(1) & bitSel === 0.U & isSpiRead & byteSel >= 4.U
|
||||
io.isEnR :=
|
||||
(isSckPosedgeNext(0) & ~shiftCSn(1) & bitSel === 0.U & exReg === 1.U & byteSel === 3.U ) |
|
||||
(isSckPosedgeNext(0) & ~shiftCSn(1) & bitSel === 0.U & isSpiRead & byteSel >= 4.U)
|
||||
io.isEnW := isSckPosedgeNext(0) & ~shiftCSn(1) & bitSel === 0.U & isSpiWrite & byteSel >= 4.U
|
||||
io.dataw := exReg
|
||||
io.addrSel :=
|
||||
Mux( isSpiRead, addrSel + 1.U, addrSel )//覆盖三种情况
|
||||
|
||||
|
||||
when( shiftCSn(2) & ~shiftCSn(1) ){
|
||||
byteSel := 0.U
|
||||
@@ -114,18 +119,12 @@ class SSpiInterface extends SpiInterfaceBase{
|
||||
|
||||
when( shiftCSn(2) & ~shiftCSn(1) ){ //CS下跳 //第一个byte
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSckPosedgeNext(1) & ~shiftCSn(2) & bitSel === 0.U ){ //CS为低,且SCK上跳补一拍 的第0bit
|
||||
when( byteSel === 1.U || byteSel === 2.U ){ //第1、2byte
|
||||
exReg := 0.U
|
||||
} .otherwise{
|
||||
when( isSpiWrite ){
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSpiRead ){
|
||||
exReg := io.datar
|
||||
} .otherwise{
|
||||
assert(false.B, "Assert Failed, empty CMD!\n")
|
||||
}
|
||||
}
|
||||
} .elsewhen( isSckPosedgeNext(1) & ~shiftCSn(2) & bitSel === 0.U & (byteSel === 1.U || byteSel === 2.U) ){ //CS为低,且SCK上跳补一拍 的第0bit
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSpiWrite ){
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSpiRead ){
|
||||
exReg := io.datar
|
||||
} .elsewhen( isSckPosedge & ~shiftCSn(1) ){
|
||||
exReg := Cat( exReg(6 ,0), shiftMOSI(1) )
|
||||
}
|
||||
@@ -150,18 +149,12 @@ class QSpiInterface extends SpiInterfaceBase{
|
||||
|
||||
when( shiftCSn(2) & ~shiftCSn(1) ){ //CS下跳 //第一个byte
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSckPosedgeNext(1) & ~shiftCSn(2) & bitSel === 0.U ){ //CS为低,且SCK上跳补一拍 的第0bit
|
||||
when( byteSel === 1.U || byteSel === 2.U ){ //第1、2byte
|
||||
exReg := 0.U
|
||||
} .otherwise{
|
||||
when( isSpiWrite ){
|
||||
exReg := 0.U
|
||||
} .elsewhen( isSpiRead ){
|
||||
exReg := io.datar
|
||||
} .otherwise{
|
||||
assert(false.B, "Assert Failed, empty CMD!\n")
|
||||
}
|
||||
}
|
||||
} .elsewhen( isSckPosedgeNext(1) & ~shiftCSn(2) & bitSel === 0.U & ( byteSel === 1.U || byteSel === 2.U) ){ //CS为低,且SCK上跳补一拍 的第0bit
|
||||
exReg := 0.U
|
||||
} .elsewhen( io.isEnW ){
|
||||
exReg := 0.U
|
||||
} .elsewhen( io.isEnR ){
|
||||
exReg := io.datar
|
||||
} .elsewhen( isSckPosedge & ~shiftCSn(1) ){
|
||||
exReg := Cat( exReg(3,0), shiftMOSI(1) )
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user