# HG changeset patch # User Alexis # Date 2010-10-27 13:25:29 # Node ID 749c5ca91ebcf8d19bf9af6939074deb40f2e1e7 # Parent d63cd96dab77d75acee625fe1092de4d863c69a2 imporved Doxygen file, and missing lcd file added but not implemented diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -34,3 +34,4 @@ Patched-dist: Patch-GRLIB doc: doxygen lib/lpp/Doxyfile make lib/lpp/doc/latex + cp lib/lpp/doc/latex/refman.pdf lib/lpp/doc/VHD_lib.pdf diff --git a/lib/lpp/Doxyfile b/lib/lpp/Doxyfile --- a/lib/lpp/Doxyfile +++ b/lib/lpp/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.0 # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = /opt/GRLIB/lib_lpp/lib/lpp/doc +OUTPUT_DIRECTORY = doc # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -590,7 +590,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = /opt/GRLIB/lib_lpp/lib/lpp +INPUT = . # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -1248,7 +1248,7 @@ RTF_EXTENSIONS_FILE = # If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages -GENERATE_MAN = NO +GENERATE_MAN = YES # The MAN_OUTPUT tag is used to specify where the man pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be @@ -1491,7 +1491,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = YES # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # allowed to run in parallel. When set to 0 (the default) doxygen will diff --git a/lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_DRIVER .vhd b/lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_DRIVER .vhd new file mode 100644 --- /dev/null +++ b/lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_DRIVER .vhd @@ -0,0 +1,64 @@ +------------------------------------------------------------------------------ +-- 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 +------------------------------------------------------------------------------- +---------------------------------------------------------------------------------- +-- Company: +-- Engineer: +-- +-- Create Date: 10:09:57 10/13/2010 +-- Design Name: +-- Module Name: LCD_2x16_DRIVER - Behavioral +-- Project Name: +-- Target Devices: +-- Tool versions: +-- Description: +-- +-- Dependencies: +-- +-- Revision: +-- Revision 0.01 - File Created +-- Additional Comments: +-- +---------------------------------------------------------------------------------- +library IEEE; +use IEEE.STD_LOGIC_1164.ALL; +use IEEE.NUMERIC_STD.all; +library lpp; +use lpp.amba_lcd_16x2_ctrlr.all; + + +entity LCD_16x2_DRIVER is + generic( + OSC_Freq_MHz : integer:=60 + ); + Port ( reset : in STD_LOGIC; + clk : in STD_LOGIC; + LCD_CTRL : out LCD_DRVR_CTRL_BUSS; + SYNCH : out LCD_DRVR_SYNCH_BUSS; + DRIVER_CMD : in LCD_DRVR_CMD_BUSS + ); +end LCD_16x2_DRIVER; + +architecture Behavioral of LCD_16x2_DRIVER is + +end Behavioral; + + + + + diff --git a/lib/lpp/amba_lcd_16x2_ctrlr/amba_lcd_16x2_ctrlr.vhd b/lib/lpp/amba_lcd_16x2_ctrlr/amba_lcd_16x2_ctrlr.vhd --- a/lib/lpp/amba_lcd_16x2_ctrlr/amba_lcd_16x2_ctrlr.vhd +++ b/lib/lpp/amba_lcd_16x2_ctrlr/amba_lcd_16x2_ctrlr.vhd @@ -51,6 +51,17 @@ type LCD_DRVR_CTRL_BUSS is +component LCD_16x2_DRIVER is + generic( + OSC_Freq_MHz : integer:=60 + ); + Port ( reset : in STD_LOGIC; + clk : in STD_LOGIC; + LCD_CTRL : out LCD_DRVR_CTRL_BUSS; + SYNCH : out LCD_DRVR_SYNCH_BUSS; + DRIVER_CMD : in LCD_DRVR_CMD_BUSS + ); +end component; diff --git a/lib/lpp/doc/latex/doxygen.sty b/lib/lpp/doc/latex/doxygen.sty --- a/lib/lpp/doc/latex/doxygen.sty +++ b/lib/lpp/doc/latex/doxygen.sty @@ -27,9 +27,9 @@ \fancyplain{}{\bfseries\thepage}% } \rfoot[\fancyplain{}{\bfseries\scriptsize% - Generated on Tue Oct 26 2010 19:42:42 for lib-\/lpp by Doxygen }]{} + Generated on Wed Oct 27 2010 15:11:34 for lib-\/lpp by Doxygen }]{} \lfoot[]{\fancyplain{}{\bfseries\scriptsize% - Generated on Tue Oct 26 2010 19:42:42 for lib-\/lpp by Doxygen }} + Generated on Wed Oct 27 2010 15:11:34 for lib-\/lpp by Doxygen }} \cfoot{} %---------- Internal commands used in this style file ----------------