diff options
| author | Brijeshcr | 2017-07-08 20:18:46 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:46 +0530 |
| commit | 26ab8620e89571314bc1a828bd9aca3d288eaede (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| parent | 39874e472e540ca1bb923b97b52900e1d60439cc (diff) | |
| download | Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.gz Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.bz2 Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.zip | |
Merge pull request #13 from FOSSEE/revert-12-master
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')
| -rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index c91fdfb2..cbbb47ae 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -5,19 +5,11 @@ 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: Jorawar Singh, Siddhesh Wani -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -<<<<<<< HEAD -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_RPIPERIPHERALTIMING_H__ #define __INT_RPIPERIPHERALTIMING_H__ @@ -28,7 +20,6 @@ extern "C" { #endif -<<<<<<< HEAD #define u320RPI_delay(time) u32RPI_delays(time); #define d0RPI_delay(time) u32RPI_delays(time); @@ -37,20 +28,9 @@ extern "C" { #define RPI_millisu320() RPI_millis(); #define RPI_microsu320() RPI_micros(); -======= -#define RPI_DelayMicro(in1) u16RPIDelayMicros((uint16) in1) -#define RPI_DelayMilli(in1) u16RPIDelayMillis((uint16) in1) -#define RPI_GetMicro() u32RPIGetMicros() -#define RPI_GetMillis() u32RPIGetMillis() - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ #endif -<<<<<<< HEAD #endif /* !__INT_RPIPERIPHERALTIMING_H__ */ -======= -#endif /* !__RPIPERIPHERALTIMING_H__ */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |