Merge branch 'main' of http://114.214.202.87:9030/yangshenbo/UDP_data_process
This commit is contained in:
commit
86836807be
|
|
@ -9,6 +9,11 @@ begin
|
||||||
if (!rst_n)
|
if (!rst_n)
|
||||||
count <= 0;
|
count <= 0;
|
||||||
else if (enable == 1'b1)
|
else if (enable == 1'b1)
|
||||||
|
<<<<<<< HEAD
|
||||||
count <= count + 1;
|
count <= count + 1;
|
||||||
end//
|
end//
|
||||||
|
=======
|
||||||
|
count <= count + 1;//00sss
|
||||||
|
end
|
||||||
|
>>>>>>> 3dc244fbc9669daee2436d70f0933dbd577fece0
|
||||||
endmodule
|
endmodule
|
||||||
Loading…
Reference in New Issue