# HG changeset patch
# User martin
# Date 2011-02-14 12:03:42
# Node ID 553a77d94eef94d70d2a6785dd31f9c9405b6595
# Parent  2efc60eabf6231bc237d75ff84584da621005e5e
# Parent  c98aba3842d3770c0d0cf68c577faf4df8e59ce3

Merge

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,60 +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
--------------------------------------------------------------------------------
---                      Author : Martin Morlot
---                     Mail : martin.morlot@lpp.polytechnique.fr
------------------------------------------------------------------------------*/
-#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
-====================================================*/
-
-/** Structure repr�sentant le registre du CNA */
-struct DAC_Driver
-{
-    int configReg;   /**< Registre de configuration: Flag Ready [1] ; Flag Enable [0] */
-    int dataReg;     /**< Registre de donn�e sur 16 bits */
-};
-
-typedef struct DAC_Driver DAC_Device;
-
-/*===================================================
-        F U N C T I O N S
-====================================================*/
-
-/** Ouvre l'acc� au CNA */
-DAC_Device* DacOpen(int count);
-
-//DAC_Device* DacClose(int count);
-
-/** Les donn�es sont lus a partir d'un tableau pour obtenir le signal de CAL (10Khz + 625hz) */
-int DacTable();
-
-/** Les donn�es sont entr�e par l'utilisateur, la conversion se fait a chaque nouvelle donn�e */
-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
@@ -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/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 @@
-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
-amba_lcd_16x2_ctrlr.vhd
-apb_lcd_ctrlr.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,4 +0,0 @@
-APB_MULTI_DIODE.vhd
-APB_SIMPLE_DIODE.vhd
-apb_devices_list.vhd
-lpp_amba.vhd
diff --git a/push_action.sh b/push_action.sh
new file mode 100644
--- /dev/null
+++ b/push_action.sh
@@ -0,0 +1,2 @@
+touch test
+touch test2
diff --git a/scripts/GPL_Patcher.sh b/scripts/GPL_Patcher.sh
--- a/scripts/GPL_Patcher.sh
+++ b/scripts/GPL_Patcher.sh
@@ -1,6 +1,6 @@
 echo  "======================================================================================="
 echo  "---------------------------------------------------------------------------------------"
-echo  "                                	LPP GPL PATCHER					"
+echo  "                                	LPP GPL PATCHER						"
 echo  "                    Copyright (C) 2010 Laboratory of Plasmas Physic.			" 
 echo  "======================================================================================="
 echo '----------------------------------------------------------------------------------------