|
@@ -456,14 +456,16 @@ always @(posedge clk100) begin
|
|
|
if (currState == IDLE && valToRxFifo) begin
|
|
if (currState == IDLE && valToRxFifo) begin
|
|
|
configReg1 <=dataToRxFifo;
|
|
configReg1 <=dataToRxFifo;
|
|
|
end
|
|
end
|
|
|
- else if (modeSel) begin
|
|
|
|
|
- if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8 + numOfConfigCmds && trCnt != 0) begin
|
|
|
|
|
- configReg1 <= 24'h0;
|
|
|
|
|
|
|
+ else begin
|
|
|
|
|
+ if (modeSel) begin
|
|
|
|
|
+ if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8 + numOfConfigCmds && trCnt != 0 ) begin
|
|
|
|
|
+ configReg1 <= 24'h0;
|
|
|
|
|
+ end
|
|
|
end
|
|
end
|
|
|
- end
|
|
|
|
|
- if (!modeSel) begin
|
|
|
|
|
- if (trCnt1Spi == wordNum && trCnt1Spi != 0) begin
|
|
|
|
|
- configReg1 <= 24'h0;
|
|
|
|
|
|
|
+ if (!modeSel) begin
|
|
|
|
|
+ if (trCnt1Spi == wordNum && wordNum != 0) begin
|
|
|
|
|
+ configReg1 <= 24'h0;
|
|
|
|
|
+ end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
@@ -1097,7 +1099,7 @@ always @(*) begin
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
else begin
|
|
else begin
|
|
|
- if (trCnt == 15'h1) begin
|
|
|
|
|
|
|
+ if (trCnt == 16'h1) begin
|
|
|
nextState = deviceID + 1;
|
|
nextState = deviceID + 1;
|
|
|
end
|
|
end
|
|
|
else begin
|
|
else begin
|
|
@@ -1175,13 +1177,15 @@ always @(*) begin
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
else begin
|
|
else begin
|
|
|
- if (trCnt1Spi == wordNum && trCnt != 0 ) begin
|
|
|
|
|
- nextState = IDLE;
|
|
|
|
|
|
|
+ if (wordNum != 0) begin
|
|
|
|
|
+ if (trCnt1Spi == wordNum) begin
|
|
|
|
|
+ nextState = IDLE;
|
|
|
|
|
+ end
|
|
|
|
|
+ else if (trCnt1Spi < wordNum) begin
|
|
|
|
|
+ nextState = DDS;
|
|
|
|
|
+ end
|
|
|
end
|
|
end
|
|
|
- if (trCnt1Spi < wordNum) begin
|
|
|
|
|
- nextState = DDS;
|
|
|
|
|
- end
|
|
|
|
|
- if (wordNum == 0) begin
|
|
|
|
|
|
|
+ else begin
|
|
|
nextState = IDLE;
|
|
nextState = IDLE;
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|