zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hdl_2015_r2' into dev 

Conflicts:
	projects/daq1/common/daq1_spi.v
main
Adrian Costina 2016-03-02 13:52:15 +02:00
parent f7e490c2b3 40fb68dfd5
commit 977d9d0624
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/ad9265_fmc/common/ad9265_spi.v
View File

@ -78,7 +78,7 @@ module ad9265_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/ad9434_fmc/common/ad9434_spi.v
View File

@ -79,7 +79,7 @@ module ad9434_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/ad9467_fmc/common/ad9467_spi.v
View File

@ -78,7 +78,7 @@ module ad9467_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/daq1/common/daq1_spi.v
View File

@ -85,7 +85,7 @@ module daq1_spi (
spi_rd_wr_n <= 1'b0;
spi_device_addr <= 8'b00000000;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count <= 6'd7) begin
spi_device_addr <= {spi_device_addr[6:0], spi_mosi};
end

2
projects/daq2/common/daq2_spi.v
View File

@ -81,7 +81,7 @@ module daq2_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/daq3/common/daq3_spi.v
View File

@ -81,7 +81,7 @@ module daq3_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/fmcadc2/common/fmcadc2_spi.v
View File

@ -102,7 +102,7 @@ module fmcadc2_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/fmcadc4/common/fmcadc4_spi.v
View File

@ -78,7 +78,7 @@ module fmcadc4_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/fmcadc5/common/fmcadc5_spi.v
View File

@ -83,7 +83,7 @@ module fmcadc5_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/fmcomms6/common/fmcomms6_spi.v
View File

@ -78,7 +78,7 @@ module fmcomms6_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/fmcomms7/common/fmcomms7_spi.v
View File

@ -81,7 +81,7 @@ module fmcomms7_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end

2
projects/usdrx1/common/usdrx1_spi.v
View File

@ -87,7 +87,7 @@ module usdrx1_spi (
spi_count <= 6'd0;
spi_rd_wr_n <= 1'd0;
end else begin
spi_count <= spi_count + 1'b1;
spi_count <= (spi_count < 6'h3f) ? spi_count + 1'b1 : spi_count;
if (spi_count == 6'd0) begin
spi_rd_wr_n <= spi_mosi;
end