HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r3:63fe0f21a403

APB_SIMPLE_DIODE Vendor ID Added

martin -

r3:63fe0f21a403 default

parent child

Context file:

r3:63fe0f21a403

Collapse all files

Makefile +1 -1

             all: help
             help:
             	@echo
             	@echo " batch targets:"
             	@echo
             	@echo " make Patch-GRLIB     : install library into $(GRLIB)"
             	@echo " make dist            : create a tar file for using into an other computer"
             	@echo " make Patched-dist    : create a tar file for with a patched grlib for using into an other computer"
             	@echo " make allGPL          : add a GPL HEADER in all vhdl Files"
             	@echo " make init            : add a GPL HEADER in all vhdl Files, init all files"
             	@echo " make doc             : make documentation for VHDL IPs"
             	@echo
             allGPL:
             	sh lib/GPL_Patcher.sh -R
             init: allGPL
             	sh lib/lpp/vhdlsynPatcher.sh
             	sh lib/lpp/makeDirs.sh lib/lpp
-            Patch-GRLIB: init doc
+            Patch-GRLIB: init
             	sh patch.sh $(GRLIB)
             dist: init
             	tar -cvzf ./../lpp-lib.tgz ./../lib_lpp/*
             Patched-dist: Patch-GRLIB
             	tar -cvzf ./../lpp-patched-GRLIB.tgz $(GRLIB)/*
             doc:
             	doxygen lib/lpp/Doxyfile
             	make lib/lpp/doc/latex
             	cp lib/lpp/doc/latex/refman.pdf lib/lpp/doc/VHD_lib.pdf

lib/lpp/amba_lcd_16x2_ctrlr/vhdlsyn.txt +3 -1

-            amba_lcd_16x2_ctrlr.vhd
             FRAME_CLK.vhd
             LCD_16x2_CFG.vhd
+            LCD_16x2_DRIVER
+            .vhd
             LCD_16x2_ENGINE.vhd
             LCD_2x16_DRIVER.vhd
             LCD_CLK_GENERATOR.vhd
             Top_LCD.vhd
+            amba_lcd_16x2_ctrlr.vhd

lib/lpp/dirs.txt +2 -2

@@ -1,4 +1,4
		1	./amba_lcd_16x2_ctrlr
		2	./dsp/iir_filter
1	./general_purpose	3	./general_purpose
2	./lpp_amba	4	./lpp_amba
3	./dsp/iir_filter
4	./amba_lcd_16x2_ctrlr

lib/lpp/dsp/iir_filter/vhdlsyn.txt +4 -4

             APB_IIR_CEL.vhd
+            FILTER.vhd
+            FILTER_RAM_CTRLR.vhd
             FILTERcfg.vhd
             FilterCTRLR.vhd
-            FILTER_RAM_CTRLR.vhd
-            FILTER.vhd
             IIR_CEL_CTRLR.vhd
             IIR_CEL_FILTER.vhd
-            iir_filter.vhd
+            RAM.vhd
             RAM_CEL.vhd
             RAM_CTRLR2.vhd
-            RAM.vhd
             Top_Filtre_IIR.vhd
+            iir_filter.vhd

lib/lpp/general_purpose/vhdlsyn.txt +5 -5

-            Adder.vhd
             ADDRcntr.vhd
             ALU.vhd
-            general_purpose.vhd
+            Adder.vhd
+            MAC.vhd
             MAC_CONTROLER.vhd
-            MAC_MUX2.vhd
             MAC_MUX.vhd
+            MAC_MUX2.vhd
             MAC_REG.vhd
-            MAC.vhd
+            MUX2.vhd
             Multiplier.vhd
-            MUX2.vhd
             REG.vhd
             Shifter.vhd
+            general_purpose.vhd

lib/lpp/lpp_amba/APB_SIMPLE_DIODE.vhd +5 -5

             ------------------------------------------------------------------------------
             --  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 2 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
             -------------------------------------------------------------------------------
             -- APB_SIMPLE_DIODE.vhd
             library ieee;
             use ieee.std_logic_1164.all;
             --use ieee.numeric_std.all;
             library grlib;
             use grlib.amba.all;
             use grlib.stdlib.all;
             use grlib.devices.all;
             library lpp;
             use lpp.lpp_amba.all;
             entity APB_SIMPLE_DIODE is
               generic (
                 pindex   : integer := 0;
                 paddr    : integer := 0;
                 pmask    : integer := 16#fff#;
                 pirq     : integer := 0;
                 abits    : integer := 8);
               port (
                 rst    : in  std_ulogic;
                 clk    : in  std_ulogic;
                 apbi   : in  apb_slv_in_type;
                 apbo   : out apb_slv_out_type;
                 LED    : out std_ulogic
                 );
             end;
             architecture AR_APB_SIMPLE_DIODE of APB_SIMPLE_DIODE is
             constant REVISION : integer := 1;
             constant pconfig : apb_config_type := (
-=> ahb_device_reg (VENDOR_LPP, ROCKET_TM, 0, REVISION, 0),
+=> ahb_device_reg (VENDOR_LPP, LPP_SIMPLE_DIODE, 0, REVISION, 0),
 => apb_iobar(paddr, pmask));
             type LEDregs is record
               DATAin    :   std_logic_vector(31 downto 0);
               DATAout   :   std_logic_vector(31 downto 0);
             end record;
             signal r : LEDregs;
             begin
             r.DATAout   <=  r.DATAin xor X"FFFFFFFF";
             process(rst,clk)
             begin
                 if rst = '0' then
                     LED <=  '0';
                     r.DATAin <= (others => '0');
                     apbo.prdata <= (others => '0');
                 elsif clk'event and clk = '1' then
                         LED <= r.DATAin(0);
             --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" =>
                                 r.DATAin <= apbi.pwdata;
                             when others =>
                                 null;
                         end case;
                     end if;
             --APB READ OP
                     if (apbi.psel(pindex) and apbi.penable and (not apbi.pwrite)) = '1' then
                         case apbi.paddr(abits-1 downto 2) is
                             when "000000" =>
                                 apbo.prdata <= r.DATAin;
                             when others =>
                                 apbo.prdata <= r.DATAout;
                         end case;
                     end if;
                 end if;
                 apbo.pconfig <= pconfig;
             end process;
             -- pragma translate_off
-                bootmsg : report_version
+            --    bootmsg : report_version
-                generic map ("apbuart" & tost(pindex) &
+            --    generic map ("apbuart" & tost(pindex) &
-            	": Generic UART rev " & tost(REVISION) & ", fifo " & tost(fifosize) &
+            --	": Generic UART rev " & tost(REVISION) & ", fifo " & tost(fifosize) &
-            	", irq " & tost(pirq));
+            --	", irq " & tost(pirq));
             -- pragma translate_on
             end ar_APB_SIMPLE_DIODE;

lib/lpp/lpp_amba/lpp_amba.vhd +1 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 2 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
             -------------------------------------------------------------------------------
             library ieee;
             use ieee.std_logic_1164.all;
             library grlib;
             use grlib.amba.all;
             -- pragma translate_off
             use std.textio.all;
             -- pragma translate_on
             package lpp_amba is
             constant VENDOR_LPP        : amba_vendor_type := 16#19#;
             -- LPP device ids
             constant ROCKET_TM	                : amba_device_type := 16#001#;
             constant otherCore         	        : amba_device_type := 16#002#;
+            constant LPP_SIMPLE_DIODE	        : amba_device_type := 16#003#;
             component APB_SIMPLE_DIODE is
               generic (
                 pindex   : integer := 0;
                 paddr    : integer := 0;
                 pmask    : integer := 16#fff#;
                 pirq     : integer := 0;
                 abits    : integer := 8);
               port (
                 rst    : in  std_ulogic;
                 clk    : in  std_ulogic;
                 apbi   : in  apb_slv_in_type;
                 apbo   : out apb_slv_out_type;
                 LED    : out std_ulogic
                 );
             end component;
             end;

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