Skip to content

Commit

Permalink
Merge pull request #44 from Digilent/tommywork
Browse files Browse the repository at this point in the history
Changed ADC fifo_generator name
  • Loading branch information
tom21091 authored Apr 29, 2020
2 parents b094660 + 7464c74 commit 202e194
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions ip/Zmods/ZmodADC1410Controller/component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@
<spirit:fileSet>
<spirit:name>xilinx_anylanguagesynthesis_view_fileset</spirit:name>
<spirit:file>
<spirit:name>src/fifo_generator_0/fifo_generator_0.xci</spirit:name>
<spirit:name>src/fifo_generator_adc/fifo_generator_adc.xci</spirit:name>
<spirit:userFileType>xci</spirit:userFileType>
</spirit:file>
<spirit:file>
Expand All @@ -1374,7 +1374,7 @@
<spirit:fileSet>
<spirit:name>xilinx_anylanguagebehavioralsimulation_view_fileset</spirit:name>
<spirit:file>
<spirit:name>src/fifo_generator_0/fifo_generator_0.xci</spirit:name>
<spirit:name>src/fifo_generator_adc/fifo_generator_adc.xci</spirit:name>
<spirit:userFileType>xci</spirit:userFileType>
</spirit:file>
<spirit:file>
Expand Down
6 changes: 3 additions & 3 deletions ip/Zmods/ZmodADC1410Controller/src/ZmodADC1410_Controller.vhd
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Port (
sDone : out STD_LOGIC);
end component;

COMPONENT fifo_generator_0
COMPONENT fifo_generator_adc
PORT (
rst : IN STD_LOGIC;
wr_clk : IN STD_LOGIC;
Expand Down Expand Up @@ -1086,7 +1086,7 @@ end process;

-- Data Path FIFOs

InstChAFIFO : fifo_generator_0 --CHA FIFO
InstChAFIFO : fifo_generator_adc --CHA FIFO
PORT MAP (
rst => sInitDoneR_n,
wr_clk => DcoBufgClk,
Expand All @@ -1101,7 +1101,7 @@ InstChAFIFO : fifo_generator_0 --CHA FIFO
almost_empty => sFIFO_AlmostEmptyChA
);

InstChBFIFO : fifo_generator_0 --CHB FIFO
InstChBFIFO : fifo_generator_adc --CHB FIFO
PORT MAP (
rst => sInitDoneR_n,
wr_clk => DcoBufgClk,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<spirit:version>1.0</spirit:version>
<spirit:componentInstances>
<spirit:componentInstance>
<spirit:instanceName>fifo_generator_0</spirit:instanceName>
<spirit:instanceName>fifo_generator_adc</spirit:instanceName>
<spirit:componentRef spirit:vendor="xilinx.com" spirit:library="ip" spirit:name="fifo_generator" spirit:version="13.2"/>
<spirit:configurableElementValues>
<spirit:configurableElementValue spirit:referenceId="BUSIFPARAM_VALUE.CORE_CLK.ASSOCIATED_BUSIF"/>
Expand Down Expand Up @@ -327,7 +327,7 @@
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.C_SELECT_XPM">0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Clock_Enable_Type">Slave_Interface_Clock_Enable</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Clock_Type_AXI">Common_Clock</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Component_Name">fifo_generator_0</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Component_Name">fifo_generator_adc</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.DATA_WIDTH">64</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Data_Count">false</spirit:configurableElementValue>
<spirit:configurableElementValue spirit:referenceId="PARAM_VALUE.Data_Count_Width">5</spirit:configurableElementValue>
Expand Down

0 comments on commit 202e194

Please sign in to comment.