diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -26,4 +26,5 @@ syntax: glob *.a *.bin *~ - +LPP_drivers/libsrc/AMBA/apb_devices_list.h +lib/lpp/lpp_amba/apb_devices_list.vhd diff --git a/LPP_drivers/includes/apb_dac_Driver.h b/LPP_drivers/includes/apb_dac_Driver.h deleted file mode 100644 --- a/LPP_drivers/includes/apb_dac_Driver.h +++ /dev/null @@ -1,53 +0,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 --------------------------------------------------------------------------------*/ -#ifndef APB_CNA_DRIVER_H -#define APB_CNA_DRIVER_H - -#define DAC_ready 3 -#define DAC_enable 1 -#define DAC_disable 0 - - -/*=================================================== - T Y P E S D E F -====================================================*/ - -struct DAC_Driver -{ - int configReg; - int dataReg; -}; - -typedef struct DAC_Driver DAC_Device; - -/*=================================================== - F U N C T I O N S -====================================================*/ - -DAC_Device* DacOpen(int count); - -//DAC_Device* DacClose(int count); - -int DacTable(); - -int DacConst(); - - - -#endif diff --git a/LPP_drivers/includes/apb_lcd_driver.h b/LPP_drivers/includes/apb_lcd_driver.h --- a/LPP_drivers/includes/apb_lcd_driver.h +++ b/LPP_drivers/includes/apb_lcd_driver.h @@ -16,6 +16,9 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -------------------------------------------------------------------------------*/ +/*-- Author : Alexis Jeandet +-- Mail : alexis.jeandet@lpp.polytechnique.fr +----------------------------------------------------------------------------*/ #ifndef APB_LCD_DRIVER_H #define APB_LCD_DRIVER_H @@ -64,7 +67,8 @@ typedef int lcd_err; /** structure representing the lcd registers */ struct lcd_driver { - int cfg_reg; /**< Configuration register composed of Ready flag [10], CMD time Value [9:8], CMD to send [7:0]*/ + int cfg_reg; /**< Configuration register composed of Ready flag [10], CMD time Value [9:8], + CMD to send [7:0]*/ int Frame_buff[lcdCharCnt]; /**< Frame Buffer space each address corresponds to a char on the lcd screen */ }; diff --git a/LPP_drivers/includes/lpp_apb_functions.h b/LPP_drivers/includes/lpp_apb_functions.h --- a/LPP_drivers/includes/lpp_apb_functions.h +++ b/LPP_drivers/includes/lpp_apb_functions.h @@ -16,6 +16,9 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -------------------------------------------------------------------------------*/ +/*-- Author : Alexis Jeandet +-- Mail : alexis.jeandet@lpp.polytechnique.fr +----------------------------------------------------------------------------*/ #ifndef LPP_APB_FUNCTIONS_H #define LPP_APB_FUNCTIONS_H diff --git a/LPP_drivers/libsrc/LCD/apb_lcd_driver.h b/LPP_drivers/libsrc/LCD/apb_lcd_driver.h --- a/LPP_drivers/libsrc/LCD/apb_lcd_driver.h +++ b/LPP_drivers/libsrc/LCD/apb_lcd_driver.h @@ -67,7 +67,8 @@ typedef int lcd_err; /** structure representing the lcd registers */ struct lcd_driver { - int cfg_reg; /**< Configuration register composed of Ready flag [10], CMD time Value [9:8], CMD to send [7:0]*/ + int cfg_reg; /**< Configuration register composed of Ready flag [10], CMD time Value [9:8], + CMD to send [7:0]*/ int Frame_buff[lcdCharCnt]; /**< Frame Buffer space each address corresponds to a char on the lcd screen */ }; diff --git a/lib/lpp/amba_lcd_16x2_ctrlr/vhdlsyn.txt b/lib/lpp/amba_lcd_16x2_ctrlr/vhdlsyn.txt deleted file mode 100644 --- a/lib/lpp/amba_lcd_16x2_ctrlr/vhdlsyn.txt +++ /dev/null @@ -1,9 +0,0 @@ -amba_lcd_16x2_ctrlr.vhd -apb_lcd_ctrlr.vhd -FRAME_CLK.vhd -LCD_16x2_CFG.vhd -LCD_16x2_DRVR.vhd -LCD_16x2_ENGINE.vhd -LCD_2x16_DRIVER.vhd -LCD_CLK_GENERATOR.vhd -Top_LCD.vhd diff --git a/lib/lpp/lpp_amba/vhdlsyn.txt b/lib/lpp/lpp_amba/vhdlsyn.txt deleted file mode 100644 --- a/lib/lpp/lpp_amba/vhdlsyn.txt +++ /dev/null @@ -1,6 +0,0 @@ -apb_devices_list.vhd -APB_MULTI_DIODE.vhd -APB_MULTI_DIODE.vhd.orig -APB_SIMPLE_DIODE.vhd -APB_SIMPLE_DIODE.vhd.orig -lpp_amba.vhd