Merged features/inband-usb -r6431:8293 into trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8295 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 6 insertions, 6 deletions

diff --git a/usrp/fpga/megacells/fifo_1kx16.bsf b/usrp/fpga/megacells/fifo_1kx16.bsf
index 329be2d44..2de80816f 100755
--- a/usrp/fpga/megacells/fifo_1kx16.bsf
+++ b/usrp/fpga/megacells/fifo_1kx16.bsf
@@ -95,7 +95,7 @@ applicable agreement for further details.
 	)

 	(drawing

 		(text "16 bits x 1024 words" (rect 58 132 144 144)(font "Arial" ))

-		(text "almost_empty < 126" (rect 58 122 144 134)(font "Arial" ))

+		(text "almost_empty < 504" (rect 58 122 144 134)(font "Arial" ))

 		(line (pt 16 16)(pt 144 16)(line_width 1))

 		(line (pt 144 16)(pt 144 144)(line_width 1))

 		(line (pt 144 144)(pt 16 144)(line_width 1))

diff --git a/usrp/fpga/megacells/fifo_1kx16.v b/usrp/fpga/megacells/fifo_1kx16.v
index e22b416e5..4f7e94ef5 100755
--- a/usrp/fpga/megacells/fifo_1kx16.v
+++ b/usrp/fpga/megacells/fifo_1kx16.v
@@ -86,7 +86,7 @@ module fifo_1kx16 (
 				);

 	defparam

 		scfifo_component.add_ram_output_register = "OFF",

-		scfifo_component.almost_empty_value = 126,

+		scfifo_component.almost_empty_value = 504,

 		scfifo_component.intended_device_family = "Cyclone",

 		scfifo_component.lpm_hint = "RAM_BLOCK_TYPE=M4K",

 		scfifo_component.lpm_numwords = 1024,

@@ -105,7 +105,7 @@ endmodule
 // CNX file retrieval info

 // ============================================================

 // Retrieval info: PRIVATE: AlmostEmpty NUMERIC "1"

-// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "126"

+// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "504"

 // Retrieval info: PRIVATE: AlmostFull NUMERIC "0"

 // Retrieval info: PRIVATE: AlmostFullThr NUMERIC "-1"

 // Retrieval info: PRIVATE: CLOCKS_ARE_SYNCHRONIZED NUMERIC "0"

@@ -133,7 +133,7 @@ endmodule
 // Retrieval info: PRIVATE: wsFull NUMERIC "1"

 // Retrieval info: PRIVATE: wsUsedW NUMERIC "0"

 // Retrieval info: CONSTANT: ADD_RAM_OUTPUT_REGISTER STRING "OFF"

-// Retrieval info: CONSTANT: ALMOST_EMPTY_VALUE NUMERIC "126"

+// Retrieval info: CONSTANT: ALMOST_EMPTY_VALUE NUMERIC "504"

 // Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone"

 // Retrieval info: CONSTANT: LPM_HINT STRING "RAM_BLOCK_TYPE=M4K"

 // Retrieval info: CONSTANT: LPM_NUMWORDS NUMERIC "1024"

diff --git a/usrp/fpga/megacells/fifo_1kx16_bb.v b/usrp/fpga/megacells/fifo_1kx16_bb.v
index 283aada81..9d9912bc2 100755
--- a/usrp/fpga/megacells/fifo_1kx16_bb.v
+++ b/usrp/fpga/megacells/fifo_1kx16_bb.v
@@ -57,7 +57,7 @@ endmodule
 // CNX file retrieval info

 // ============================================================

 // Retrieval info: PRIVATE: AlmostEmpty NUMERIC "1"

-// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "126"

+// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "504"

 // Retrieval info: PRIVATE: AlmostFull NUMERIC "0"

 // Retrieval info: PRIVATE: AlmostFullThr NUMERIC "-1"

 // Retrieval info: PRIVATE: CLOCKS_ARE_SYNCHRONIZED NUMERIC "0"

@@ -85,7 +85,7 @@ endmodule
 // Retrieval info: PRIVATE: wsFull NUMERIC "1"

 // Retrieval info: PRIVATE: wsUsedW NUMERIC "0"

 // Retrieval info: CONSTANT: ADD_RAM_OUTPUT_REGISTER STRING "OFF"

-// Retrieval info: CONSTANT: ALMOST_EMPTY_VALUE NUMERIC "126"

+// Retrieval info: CONSTANT: ALMOST_EMPTY_VALUE NUMERIC "504"

 // Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone"

 // Retrieval info: CONSTANT: LPM_HINT STRING "RAM_BLOCK_TYPE=M4K"

 // Retrieval info: CONSTANT: LPM_NUMWORDS NUMERIC "1024"