diff options
Diffstat (limited to 'src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')
| -rw-r--r-- | src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index 1a704655..073cc1ec 100644 --- a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -5,12 +5,19 @@ 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__ @@ -21,14 +28,27 @@ extern "C" { #endif +<<<<<<< HEAD +#define u320RPI_delay(time) u32RPI_delays(time); +#define d0RPI_delay(time) u32RPI_delays(time); + +#define u320RPI_delayMicro(time) u32RPI_delayMicros(time); +#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 |