1 files changed, 21 insertions, 0 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
index 14df95b4..19ddcb21 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
@@ -5,20 +5,40 @@
  you should have received as part of this distribution.  The terms
  are also available at
  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+<<<<<<< HEAD
+ Author: Siddhesh Wani, Jorawar Singh
+=======
  Author: Siddhesh Wani
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
  */
 #ifndef __RPIPERIPHERALSERIAL_H__
 #define __RPIPERIPHERALSERIAL_H__
 
+<<<<<<< HEAD
+=======
 #include "types.h"
 #include "wiringSerial.h"
 
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+<<<<<<< HEAD
+#include "types.h"
+#include "wiringSerial.h"
+
+int8 gRPI_serialOpena(char* device,int size,uint32 baud);
+void u8RPI_serialCloses(uint8 fd);
+uint8 u8RPI_serialDataAvails(uint8 fd);
+void u8RPI_serialFlushs(uint8 fd);
+void u8RPI_serialGetchars(uint8 fd,char* out);
+void u8RPI_serialPrintfs(uint8 fd,char* msg,int size);
+void u8RPI_serialPutchars(uint8 fd,uint8 character);
+void u8RPI_serialPutss(uint8 fd,char* character,int size);
+=======
 int u8RPISerialSetups(char* port, int baudrate);
 void u8RPISerialCloses(int fd);
 
@@ -41,6 +61,7 @@ int16 i16RPISerialDataAvails(int fd);
 int16 i16RPISerialGetChars(int fd);
 
 void u8RPISerialFlushs(int fd);
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus 
 } /* extern "C" */