HG_REPOSITORIES/LPP/INSTRUMENTATION/VHD_Lib Commit - r270:4545cae6efef

merge

Jeandet Alexis -

r270:4545cae6efef alexis

parent child

Context file:

r270:4545cae6efef

Collapse all files

lib/lpp/lpp_cna/ReadFifo_GEN.vhd created 644 +67 0

@@ -0,0 +1,67
	1	------------------------------------------------------------------------------
	2	-- This file is a part of the LPP VHDL IP LIBRARY
	3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 3 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	------------------------------------------------------------------------------
	19	-- Author : Martin Morlot
	20	-- Mail : martin.morlot@lpp.polytechnique.fr
	21	------------------------------------------------------------------------------
	22	library IEEE;
	23	use IEEE.numeric_std.all;
	24	use IEEE.std_logic_1164.all;
	25
	26	entity ReadFifo_GEN is
	27	port(
	28	clk,raz : in std_logic; --! Horloge et Reset du composant
	29	SYNC : in std_logic;
	30	Readn : out std_logic
	31	);
	32	end entity;
	33
	34
	35	architecture ar_ReadFifo_GEN of ReadFifo_GEN is
	36
	37	type etat is (eX,e0);
	38	signal ect : etat;
	39
	40	signal SYNC_reg : std_logic;
	41
	42	begin
	43	process(clk,raz)
	44	begin
	45	if(raz='0')then
	46	ect <= eX;
	47	Readn <= '1';
	48
	49	elsif(clk'event and clk='1')then
	50	SYNC_reg <= SYNC;
	51
	52	case ect is
	53	when eX =>
	54	if (SYNC_reg='0' and SYNC='1') then
	55	Readn <= '0';
	56	ect <= e0;
	57	end if;
	58
	59	when e0 =>
	60	Readn <= '1';
	61	ect <= eX;
	62
	63	end case;
	64	end if;
	65	end process;
	66
	67	end architecture; No newline at end of file

lib/lpp/lpp_memory/Bridge.vhd created 644 +53 0

@@ -0,0 +1,53
	1	-- Bridge.vhd
	2	library IEEE;
	3	use IEEE.std_logic_1164.all;
	4	use IEEE.numeric_std.all;
	5
	6	entity Bridge is
	7	port(
	8	clk : in std_logic;
	9	raz : in std_logic;
	10	EmptyUp : in std_logic;
	11	FullDwn : in std_logic;
	12	WriteDwn : out std_logic;
	13	ReadUp : out std_logic
	14	);
	15	end entity;
	16
	17
	18	architecture ar_Bridge of Bridge is
	19
	20	type etat is (e0,e1);
	21	signal ect : etat;
	22
	23	begin
	24
	25	process(clk,raz)
	26	begin
	27	if(raz='0')then
	28	WriteDwn <= '1';
	29	ReadUp <= '1';
	30	ect <= e0;
	31
	32	elsif(clk'event and clk='1')then
	33
	34	case ect is
	35
	36	when e0 =>
	37	WriteDwn <= '1';
	38	if(EmptyUp='0' and FullDwn='0')then
	39	ReadUp <= '0';
	40	ect <= e1;
	41	end if;
	42
	43	when e1 =>
	44	ReadUp <= '1';
	45	WriteDwn <= '0';
	46	ect <= e0;
	47
	48	end case;
	49
	50	end if;
	51	end process;
	52
	53	end architecture; No newline at end of file

LPP_drivers/libsrc/FIFO/apb_fifo_Driver.c +33 -33

@@ -1,53 +1,53
1	/*------------------------------------------------------------------------------	1	/*------------------------------------------------------------------------------
2	-- This file is a part of the LPP VHDL IP LIBRARY	2	-- This file is a part of the LPP VHDL IP LIBRARY
3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS	3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
4	--	4	--
5	-- This program is free software; you can redistribute it and/or modify	5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by	6	-- it under the terms of the GNU General Public License as published by
7	-- the Free Software Foundation; either version 3 of the License, or	7	-- the Free Software Foundation; either version 3 of the License, or
8	-- (at your option) any later version.	8	-- (at your option) any later version.
9	--	9	--
10	-- This program is distributed in the hope that it will be useful,	10	-- This program is distributed in the hope that it will be useful,
11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	-- GNU General Public License for more details.	13	-- GNU General Public License for more details.
14	--	14	--
15	-- You should have received a copy of the GNU General Public License	15	-- You should have received a copy of the GNU General Public License
16	-- along with this program; if not, write to the Free Software	16	-- along with this program; if not, write to the Free Software
17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	-------------------------------------------------------------------------------	18	-------------------------------------------------------------------------------
19	-- Author : Martin Morlot	19	-- Author : Martin Morlot
20	-- Mail : martin.morlot@lpp.polytechnique.fr	20	-- Mail : martin.morlot@lpp.polytechnique.fr
21	-----------------------------------------------------------------------------*/	21	-----------------------------------------------------------------------------*/
22	#include "lpp_apb_functions.h"	22	#include "lpp_apb_functions.h"
23	#include "apb_fifo_Driver.h"	23	#include "apb_fifo_Driver.h"
24	#include <stdio.h>	24	#include <stdio.h>
25		25
26		26
27	FIFO_Device* openFIFO(int count)	27	FIFO_Device* openFIFO(int count)
28	{	28	{
29	FIFO_Device* fifo0;	29	FIFO_Device* fifo0;
30	fifo0 = (FIFO_Device*) apbgetdevice(LPP_FIFO_PID,VENDOR_LPP,count);	30	fifo0 = (FIFO_Device*) apbgetdevice(LPP_FIFO_PID,VENDOR_LPP,count);
31	return fifo0;	31	return fifo0;
32	}	32	}
33		33
34		34
35	int FillFifo(FIFO_Device* dev,int ID,int Tbl[],int count)	35	int FillFifo(FIFO_Device* dev,int ID,int Tbl[],int count)
36	{	36	{
37	int i=0;	37	int i=0;
38	//int poub;	38	//int poub;
39	//printf("%x\n",dev->FIFOreg[(2*0)+FIFO_Ctrl]);	39	//printf("%x\n",dev->FIFOreg[(2*0)+FIFO_Ctrl]);
40	while(i<count)	40	while(i<=count)
41	//while((dev->FIFOreg[(2*ID)+FIFO_Ctrl] & FIFO_Full) != FIFO_Full)// TANT QUE full a 0 ALORS	41	//while((dev->FIFOreg[(2*ID)+FIFO_Ctrl] & FIFO_Full) != FIFO_Full)// TANT QUE full a 0 ALORS
42	{	42	{
43	//printf("%x\n",dev->FIFOreg[(2*ID)+FIFO_Ctrl]);	43	//printf("%x\n",dev->FIFOreg[(2*ID)+FIFO_Ctrl]);
44	//printf("%d\n",i);	44	//printf("%d\n",i);
45	dev->FIFOreg[(2*ID)+FIFO_RWdata] = Tbl[i];	45	dev->FIFOreg[(2*ID)+FIFO_RWdata] = Tbl[i];
46	i++;	46	i++;
47	}	47	}
48	//poub = dev->FIFOreg[(2*ID)+FIFO_RWdata];	48	//poub = dev->FIFOreg[(2*ID)+FIFO_RWdata];
49	//dev->FIFOreg[(2*ID)+FIFO_RWdata] = Tbl[0];	49	//dev->FIFOreg[(2*ID)+FIFO_RWdata] = Tbl[0];
50	//printf("END:%x\n",dev->FIFOreg[(2*ID)+FIFO_Ctrl]);	50	//printf("END:%x\n",dev->FIFOreg[(2*ID)+FIFO_Ctrl]);
51	//while((dev->FIFOreg[(2*ID)+FIFO_Ctrl] & FIFO_Full) != FIFO_Full); // TANT QUE full a 0 RIEN	51	//while((dev->FIFOreg[(2*ID)+FIFO_Ctrl] & FIFO_Full) != FIFO_Full); // TANT QUE full a 0 RIEN
52	return 0;	52	return 0;
53	}	53	}

lib/lpp/lpp_cna/APB_DAC.vhd +17 -12

             ------------------------------------------------------------------------------
             --  This file is a part of the LPP VHDL IP LIBRARY
             --  Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             ------------------------------------------------------------------------------
             --                        Author : Martin Morlot
             --                     Mail : martin.morlot@lpp.polytechnique.fr
             ------------------------------------------------------------------------------
             library ieee;
             use ieee.std_logic_1164.all;
             library grlib;
             use grlib.amba.all;
             use grlib.stdlib.all;
             use grlib.devices.all;
             library lpp;
             use lpp.lpp_amba.all;
             use lpp.apb_devices_list.all;
             use lpp.lpp_cna.all;
             --! Driver APB, va faire le lien entre l'IP VHDL du convertisseur et le bus Amba
             entity APB_DAC is
               generic (
                 pindex   : integer := 0;
                 paddr    : integer := 0;
                 pmask    : integer := 16#fff#;
                 pirq     : integer := 0;
-                abits    : integer := 8);
+                abits    : integer := 8;
+                cpt_serial : integer := 6);
               port (
                 clk     : in  std_logic;           --! Horloge du composant
                 rst     : in  std_logic;           --! Reset general du composant
                 apbi    : in  apb_slv_in_type;     --! Registre de gestion des entr�es du bus
                 apbo    : out apb_slv_out_type;    --! Registre de gestion des sorties du bus
+                DataIN : in std_logic_vector(15 downto 0);
                 Cal_EN  : out std_logic;           --! Signal Enable du multiplex pour la CAL
+                Readn   : out std_logic;
                 SYNC    : out std_logic;           --! Signal de synchronisation du convertisseur
                 SCLK    : out std_logic;           --! Horloge systeme du convertisseur
                 DATA    : out std_logic            --! Donn�e num�rique s�rialis�
                 );
             end entity;
             --! @details Les deux registres (apbi,apbo) permettent de g�rer la communication sur le bus
             --! et les sorties seront cabl�es vers le convertisseur.
             architecture ar_APB_DAC of APB_DAC is
             constant REVISION : integer := 1;
             constant pconfig : apb_config_type := (
 => ahb_device_reg (VENDOR_LPP, LPP_CNA, 0, REVISION, 0),
 => apb_iobar(paddr, pmask));
             signal enable   : std_logic;
-            signal flag_sd : std_logic;
+            signal Ready : std_logic;
             type DAC_ctrlr_Reg is record
                  DAC_Cfg  : std_logic_vector(1 downto 0);
-                 DAC_Data : std_logic_vector(15 downto 0);
+            --     DAC_Data : std_logic_vector(15 downto 0);
             end record;
             signal Rec : DAC_ctrlr_Reg;
             signal Rdata     : std_logic_vector(31 downto 0);
             begin
             enable <= Rec.DAC_Cfg(0);
-            Rec.DAC_Cfg(1) <= flag_sd;
+            Rec.DAC_Cfg(1) <= Ready;
                 CONV0 : DacDriver
-                    port map(clk,rst,enable,Rec.CNA_Data,SYNC,SCLK,flag_sd,Data);
+                    generic map (cpt_serial)
+                    port map(clk,rst,enable,DataIN,SYNC,SCLK,Readn,Ready,Data);
+            --        port map(clk,rst,enable,Rec.DAC_Data,SYNC,SCLK,Ready,Data);
                 process(rst,clk)
                 begin
                     if(rst='0')then
-                        Rec.DAC_Data <=  (others => '0');
+            --            Rec.DAC_Data <=  (others => '0');
                     elsif(clk'event and clk='1')then
                 --APB Write OP
                         if (apbi.psel(pindex) and apbi.penable and apbi.pwrite) = '1' then
                             case apbi.paddr(abits-1 downto 2) is
                                 when "000000" =>
                                     Rec.DAC_Cfg(0) <= apbi.pwdata(0);
-                                when "000001" =>
+            --                    when "000001" =>
-                                    Rec.DAC_Data <= apbi.pwdata(15 downto 0);
+            --                        Rec.DAC_Data <= apbi.pwdata(15 downto 0);
                                 when others =>
                                     null;
                             end case;
                         end if;
                 --APB Read OP
                         if (apbi.psel(pindex) and (not apbi.pwrite)) = '1' then
                             case apbi.paddr(abits-1 downto 2) is
                                 when "000000" =>
                                     Rdata(31 downto 2) <= X"ABCDEF5" & "00";
                                     Rdata(1 downto 0) <= Rec.DAC_Cfg;
-                                when "000001" =>
+            --                    when "000001" =>
-                                    Rdata(31 downto 16) <= X"FD18";
+            --                        Rdata(31 downto 16) <= X"FD18";
-                                    Rdata(15 downto 0) <= Rec.DAC_Data;
+            --                        Rdata(15 downto 0) <= Rec.DAC_Data;
                                 when others =>
                                     Rdata <= (others => '0');
                             end case;
                         end if;
                     end if;
                     apbo.pconfig <= pconfig;
                 end process;
             apbo.prdata     <=   Rdata when apbi.penable = '1';
             Cal_EN <= enable;
-            end architecture;
+            end architecture;
  No newline at end of file

lib/lpp/lpp_cna/DacDriver.vhd +10 -7

             ------------------------------------------------------------------------------
             --  This file is a part of the LPP VHDL IP LIBRARY
             --  Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             ------------------------------------------------------------------------------
             --                    Author : Martin Morlot
             --                     Mail : martin.morlot@lpp.polytechnique.fr
             ------------------------------------------------------------------------------
             library IEEE;
             use IEEE.std_logic_1164.all;
             use IEEE.numeric_std.all;
-            use work.Convertisseur_config.all;
             use lpp.lpp_cna.all;
             --! Programme du Convertisseur Num�rique/Analogique
             entity DacDriver is
+            generic(cpt_serial : integer := 6);  --! G�n�rique contenant le r�sultat de la division clk/sclk  !!! clk=25Mhz
               port(
                 clk         : in std_logic;                        --! Horloge du composant
                 rst         : in std_logic;                        --! Reset general du composant
                 enable      : in std_logic;                        --! Autorise ou non l'utilisation du composant
-                Data_C      : in std_logic_vector(15 downto 0);    --! Donn�e Num�rique d'entr�e sur 16 bits
+                Data_IN      : in std_logic_vector(15 downto 0);    --! Donn�e Num�rique d'entr�e sur 16 bits
                 SYNC        : out std_logic;                       --! Signal de synchronisation du convertisseur
                 SCLK        : out std_logic;                       --! Horloge systeme du convertisseur
-                flag_sd     : out std_logic;                       --! Flag, signale la fin de la s�rialisation d'une donn�e
+                Readn       : out std_logic;
+                Ready     : out std_logic;                       --! Flag, signale la fin de la s�rialisation d'une donn�e
                 Data        : out std_logic                        --! Donn�e num�rique s�rialis�
                 );
             end entity;
             --! @details Un driver C va permettre de g�nerer un tableau de donn�es sur 16 bits,
             --! qui seront s�rialis� pour �tre ensuite dirig�es vers le convertisseur.
             architecture ar_DacDriver of DacDriver is
             signal s_SCLK      : std_logic;
-            signal OKAI_send    : std_logic;
+            signal Send    : std_logic;
             begin
             SystemCLK : Systeme_Clock
-                generic map (nb_serial)
+                generic map (cpt_serial)
                 port map (clk,rst,s_SCLK);
             Signal_sync : Gene_SYNC
-                port map (s_SCLK,rst,enable,OKAI_send,SYNC);
+                port map (s_SCLK,rst,enable,Send,SYNC);
             Serial : serialize
-                port map (clk,rst,s_SCLK,Data_C,OKAI_send,flag_sd,Data);
+                port map (clk,rst,s_SCLK,Data_IN,Send,Ready,Data);
+            RenGEN : ReadFifo_GEN
+                port map (clk,rst,Send,Readn);
             SCLK        <= s_SCLK;
             end architecture;

lib/lpp/lpp_cna/Gene_SYNC.vhd +4 -4

             ------------------------------------------------------------------------------
             --  This file is a part of the LPP VHDL IP LIBRARY
             --  Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             ------------------------------------------------------------------------------
             --                    Author : Martin Morlot
             --                     Mail : martin.morlot@lpp.polytechnique.fr
             ------------------------------------------------------------------------------
             library IEEE;
             use IEEE.std_logic_1164.all;
             use IEEE.numeric_std.all;
             --! Programme qui va permettre de g�n�rer le signal SYNC
             entity Gene_SYNC is
               port(
                 SCLK,raz : in std_logic;     --! Horloge systeme et Reset du composant
                 enable : in std_logic;       --! Autorise ou non l'utilisation du composant
-                OKAI_send : out std_logic;   --! Flag, Autorise l'envoi (s�rialisation) d'une nouvelle donn�e
+                Send : out std_logic;   --! Flag, Autorise l'envoi (s�rialisation) d'une nouvelle donn�e
                 SYNC : out std_logic         --! Signal de synchronisation du convertisseur g�n�r�
                 );
             end Gene_SYNC;
             --! @details NB: Ce programme est uniquement synchronis� sur l'horloge Systeme (sclk)
             architecture ar_Gene_SYNC of Gene_SYNC is
             signal count : integer;
             begin
                 process (SCLK,raz)
                 begin
                     if(raz='0')then
                         SYNC <= '0';
                         count <= 14;
-                        OKAI_send <= '0';
+                        Send <= '0';
                     elsif(SCLK' event and SCLK='1')then
                         if(enable='1')then
                             if(count=15)then
                                 SYNC <= '1';
                                 count <= count+1;
                             elsif(count=16)then
                                 count <= 0;
                                 SYNC <= '0';
-                                OKAI_send <= '1';
+                                Send <= '1';
                             else
                                 count <= count+1;
-                                OKAI_send <= '0';
+                                Send <= '0';
                             end if;
                         end if;
                   	end if;
                 end process;
             end ar_Gene_SYNC;

lib/lpp/lpp_cna/lpp_cna.vhd +108 -96

@@ -1,96 +1,108
1	------------------------------------------------------------------------------	1	------------------------------------------------------------------------------
2	-- This file is a part of the LPP VHDL IP LIBRARY	2	-- This file is a part of the LPP VHDL IP LIBRARY
3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS	3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
4	--	4	--
5	-- This program is free software; you can redistribute it and/or modify	5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by	6	-- it under the terms of the GNU General Public License as published by
7	-- the Free Software Foundation; either version 3 of the License, or	7	-- the Free Software Foundation; either version 3 of the License, or
8	-- (at your option) any later version.	8	-- (at your option) any later version.
9	--	9	--
10	-- This program is distributed in the hope that it will be useful,	10	-- This program is distributed in the hope that it will be useful,
11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	-- GNU General Public License for more details.	13	-- GNU General Public License for more details.
14	--	14	--
15	-- You should have received a copy of the GNU General Public License	15	-- You should have received a copy of the GNU General Public License
16	-- along with this program; if not, write to the Free Software	16	-- along with this program; if not, write to the Free Software
17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	------------------------------------------------------------------------------	18	------------------------------------------------------------------------------
19	-- Author : Martin Morlot	19	-- Author : Martin Morlot
20	-- Mail : martin.morlot@lpp.polytechnique.fr	20	-- Mail : martin.morlot@lpp.polytechnique.fr
21	------------------------------------------------------------------------------	21	------------------------------------------------------------------------------
22	library ieee;	22	library ieee;
23	use ieee.std_logic_1164.all;	23	use ieee.std_logic_1164.all;
24	library grlib;	24	library grlib;
25	use grlib.amba.all;	25	use grlib.amba.all;
26	use std.textio.all;	26	use std.textio.all;
27	library lpp;	27	library lpp;
28	use lpp.lpp_amba.all;	28	use lpp.lpp_amba.all;
29		29
30	--! Package contenant tous les programmes qui forment le composant int�gr� dans le l�on	30	--! Package contenant tous les programmes qui forment le composant int�gr� dans le l�on
31		31
32	package lpp_cna is	32	package lpp_cna is
33		33
34	component APB_DAC is	34	component APB_DAC is
35	generic (	35	generic (
36	pindex : integer := 0;	36	pindex : integer := 0;
37	paddr : integer := 0;	37	paddr : integer := 0;
38	pmask : integer := 16#fff#;	38	pmask : integer := 16#fff#;
39	pirq : integer := 0;	39	pirq : integer := 0;
40	abits : integer := 8);	40	abits : integer := 8;
41	port (	41	cpt_serial : integer := 6);
42	clk : in std_logic;	42	port (
43	~~rst~~ : in std_logic;	43	clk : in std_logic;
44	apbi : in apb_slv_in_type;	44	rst : in std_logic;
45	apbo : ~~out~~ ~~apb_slv_out~~_type;	45	apbi : in apb_slv_in_type;
46	Cal_EN : out std_logic;	46	apbo : out apb_slv_out_type;
47	SYNC : out std_logic;	47	DataIN : in std_logic_vector(15 downto 0);
48	SCLK : out std_logic;	48	Cal_EN : out std_logic; --! Signal Enable du multiplex pour la CAL
49	~~DATA~~ : out std_logic	49	Readn : out std_logic;
50	);	50	SYNC : out std_logic; --! Signal de synchronisation du convertisseur
51	end component;	51	SCLK : out std_logic; --! Horloge systeme du convertisseur
52		52	DATA : out std_logic
53		53	);
54	component DacDriver is	54	end component;
55	port(	55
56	clk : in std_logic;	56
57	rst : in std_logic;	57	component DacDriver is
58	enable : in std_logic;	58	generic(cpt_serial : integer := 6); --! G�n�rique contenant le r�sultat de la division clk/sclk !!! clk=25Mhz
59	Data_C : in std_logic_vector(15 downto 0);	59	port(
60	~~SYNC~~ : ~~out~~ std_logic;	60	clk : in std_logic;
61	~~SCLK~~ : ~~out~~ std_logic;	61	rst : in std_logic;
62	~~flag_sd~~ : ~~out~~ std_logic;	62	enable : in std_logic;
63	Data : out std_logic	63	Data_IN : in std_logic_vector(15 downto 0); --! Donn�e Num�rique d'entr�e sur 16 bits
64	);	64	SYNC : out std_logic; --! Signal de synchronisation du convertisseur
65	end component;	65	SCLK : out std_logic; --! Horloge systeme du convertisseur
66		66	Readn : out std_logic;
67		67	Ready : out std_logic;
68	component Systeme_Clock is	68	Data : out std_logic
69	generic(N :integer := 695);	69	);
70	port(	70	end component;
71	clk, raz : in std_logic ;	71
72	clock : out std_logic);	72
73	end component;	73	component Systeme_Clock is
74		74	generic(N :integer := 695);
75		75	port(
76	component Gene_SYNC is	76	clk, raz : in std_logic ;
77	port(	77	sclk : out std_logic);
78	clk,raz : in std_logic;	78	end component;
79	send : in std_logic;	79
80	Sysclk : in std_logic;	80
81	OKAI_send : out std_logic;	81	component Gene_SYNC is
82	SYNC : out std_logic);	82	port(
83	end component;	83	SCLK,raz : in std_logic; --! Horloge systeme et Reset du composant
84		84	enable : in std_logic; --! Autorise ou non l'utilisation du composant
85		85	Send : out std_logic; --! Flag, Autorise l'envoi (s�rialisation) d'une nouvelle donn�e
86	component Serialize is	86	SYNC : out std_logic); --! Signal de synchronisation du convertisseur g�n�r�
87	port(	87	end component;
88	clk,raz : in std_logic;	88
89	sclk : in std_logic;	89
90	vectin : in std_logic_vector(15 downto 0);	90	component Serialize is
91	send : in std_logic;	91	port(
92	~~sended~~ : ~~out~~ std_logic;	92	clk,raz : in std_logic;
93	~~Data~~ : ~~out~~ std_logic);	93	sclk : in std_logic;
94	end component;	94	vectin : in std_logic_vector(15 downto 0);
95		95	send : in std_logic;
96	end;	96	sended : out std_logic;
		97	Data : out std_logic);
		98	end component;
		99
		100	component ReadFifo_GEN is
		101	port(
		102	clk,raz : in std_logic; --! Horloge et Reset du composant
		103	SYNC : in std_logic;
		104	Readn : out std_logic
		105	);
		106	end component;
		107
		108	end; No newline at end of file

lib/lpp/lpp_memory/lpp_memory.vhd +11 0

             ------------------------------------------------------------------------------
             --  This file is a part of the LPP VHDL IP LIBRARY
             --  Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             ------------------------------------------------------------------------------
             --                    Author : Martin Morlot
             --                     Mail : martin.morlot@lpp.polytechnique.fr
             ------------------------------------------------------------------------------
             library ieee;
             use ieee.std_logic_1164.all;
             library grlib;
             use grlib.amba.all;
             use std.textio.all;
             library lpp;
             use lpp.lpp_amba.all;
             use lpp.iir_filter.all;
             library gaisler;
             use gaisler.misc.all;
             use gaisler.memctrl.all;
             library techmap;
             use techmap.gencomp.all;
             --! Package contenant tous les programmes qui forment le composant int�gr� dans le l�on
             package lpp_memory is
             component APB_FIFO is
             generic (
                 tech         : integer := apa3;
                 pindex       : integer := 0;
                 paddr        : integer := 0;
                 pmask        : integer := 16#fff#;
                 pirq         : integer := 0;
                 abits        : integer := 8;
                 FifoCnt      : integer := 2;
                 Data_sz      : integer := 16;
                 Addr_sz        : integer := 9;
                 Enable_ReUse   : std_logic := '0';
                 Mem_use        : integer := use_RAM;
                 R            : integer := 1;
                 W            : integer := 1
                 );
               port (
                 clk          : in  std_logic;                              --! Horloge du composant
                 rst          : in  std_logic;                              --! Reset general du composant
                 rclk         : in  std_logic;
                 wclk         : in  std_logic;
                 ReUse        : in  std_logic_vector(FifoCnt-1 downto 0);
                 REN          : in std_logic_vector(FifoCnt-1 downto 0);   --! Instruction de lecture en m�moire
                 WEN          : in std_logic_vector(FifoCnt-1 downto 0);   --! Instruction d'�criture en m�moire
                 Empty        : out std_logic_vector(FifoCnt-1 downto 0);    --! Flag, M�moire vide
                 Full         : out std_logic_vector(FifoCnt-1 downto 0);    --! Flag, M�moire pleine
                 RDATA        : out std_logic_vector((FifoCnt*Data_sz)-1 downto 0);   --! Registre de donn�es en entr�e
                 WDATA        : in std_logic_vector((FifoCnt*Data_sz)-1 downto 0);    --! Registre de donn�es en sortie
                 WADDR        : out std_logic_vector((FifoCnt*Addr_sz)-1 downto 0);    --! Registre d'addresse (�criture)
                 RADDR        : out std_logic_vector((FifoCnt*Addr_sz)-1 downto 0);    --! Registre d'addresse (lecture)
                 apbi         : in  apb_slv_in_type;                        --! Registre de gestion des entr�es du bus
                 apbo         : out apb_slv_out_type                        --! Registre de gestion des sorties du bus
                 );
             end component;
             component FIFO_pipeline is
             generic(
                 tech          :   integer := 0;
                 Mem_use       :   integer := use_RAM;
                 fifoCount     :   integer range 2 to 32 := 8;
                 DataSz        :   integer range 1 to 32 := 8;
                 abits         :   integer range 2 to 12 := 8
                 );
             port(
                 rstn    :   in std_logic;
                 ReUse   :   in std_logic;
                 rclk    :   in std_logic;
                 ren     :   in std_logic;
                 rdata   :   out std_logic_vector(DataSz-1 downto 0);
                 empty   :   out std_logic;
                 raddr   :   out std_logic_vector(abits-1 downto 0);
                 wclk    :   in std_logic;
                 wen     :   in std_logic;
                 wdata   :   in std_logic_vector(DataSz-1 downto 0);
                 full    :   out std_logic;
                 waddr   :   out std_logic_vector(abits-1 downto 0)
             );
             end component;
             component lpp_fifo is
             generic(
                 tech          :   integer := 0;
                 Mem_use       :   integer := use_RAM;
                 Enable_ReUse  :   std_logic := '0';
                 DataSz        :   integer range 1 to 32 := 8;
                 AddrSz        :   integer range 2 to 12 := 8
                 );
             port(
                 rstn    :   in std_logic;
                 ReUse   :   in std_logic;   --27/01/12
                 rclk    :   in std_logic;
                 ren     :   in std_logic;
                 rdata   :   out std_logic_vector(DataSz-1 downto 0);
                 empty   :   out std_logic;
                 raddr   :   out std_logic_vector(AddrSz-1 downto 0);
                 wclk    :   in std_logic;
                 wen     :   in std_logic;
                 wdata   :   in std_logic_vector(DataSz-1 downto 0);
                 full    :   out std_logic;
                 waddr   :   out std_logic_vector(AddrSz-1 downto 0)
             );
             end component;
             component lppFIFOxN is
             generic(
                 tech          :   integer := 0;
                 Mem_use       :   integer := use_RAM;
                 Data_sz       :   integer range 1 to 32 := 8;
                 Addr_sz       :   integer range 1 to 32 := 8;
                 FifoCnt : integer := 1;
                 Enable_ReUse  :   std_logic := '0'
                 );
             port(
                 rstn     :   in std_logic;
                 wclk    :   in std_logic;
                 rclk    :   in std_logic;
                 ReUse   :   in std_logic_vector(FifoCnt-1 downto 0);
                 wen     :   in std_logic_vector(FifoCnt-1 downto 0);
                 ren     :   in std_logic_vector(FifoCnt-1 downto 0);
                 wdata   :   in std_logic_vector((FifoCnt*Data_sz)-1 downto 0);
                 rdata   :   out std_logic_vector((FifoCnt*Data_sz)-1 downto 0);
                 full    :   out std_logic_vector(FifoCnt-1 downto 0);
                 empty   :   out std_logic_vector(FifoCnt-1 downto 0)
             );
             end component;
             component FillFifo is
             generic(
                 Data_sz  : integer range 1 to 32 := 16;
                 Fifo_cnt : integer range 1 to 8 := 5
                 );
             port(
                 clk         : in std_logic;
                 raz        : in std_logic;
                 write : out std_logic_vector(Fifo_cnt-1 downto 0);
                 reuse : out std_logic_vector(Fifo_cnt-1 downto 0);
                 data : out std_logic_vector(Fifo_cnt*Data_sz-1 downto 0)
             );
             end component;
+            component Bridge is
+                port(
+                    clk         : in std_logic;
+                    raz        : in std_logic;
+                    EmptyUp : in std_logic;
+                    FullDwn : in std_logic;
+                    WriteDwn : out std_logic;
+                    ReadUp : out std_logic
+                    );
+            end component;
             component ssram_plugin is
             generic (tech : integer := 0);
             port
             (
                 clk             : in  std_logic;
                 mem_ctrlr_o     : in  memory_out_type;
                 SSRAM_CLK       : out std_logic;
                 nBWa            : out std_logic;
                 nBWb            : out std_logic;
                 nBWc            : out std_logic;
                 nBWd            : out std_logic;
                 nBWE            : out std_logic;
                 nADSC           : out std_logic;
                 nADSP           : out std_logic;
                 nADV            : out std_logic;
                 nGW             : out std_logic;
                 nCE1            : out std_logic;
                 CE2             : out std_logic;
                 nCE3            : out std_logic;
                 nOE             : out std_logic;
                 MODE            : out std_logic;
                 ZZ              : out std_logic
             );
             end component;
             end;

lib/lpp/lpp_cna/Convertisseur_config.vhd removed 0 -34

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages