Fix prototypes to strictly match Arduino API

See arduino/Arduino#4525

Author: cmaglie

cores/arduino/wiring.c

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-uint32_t millis( void )
+unsigned long millis( void )
 {
 // todo: ensure no interrupts
     return GetTickCount() ;
@@ -32,7 +32,7 @@ uint32_t millis( void )
 // Theory: repeatedly take readings of SysTick counter, millis counter and SysTick interrupt pending flag.
 // When it appears that millis counter and pending is stable and SysTick hasn't rolled over, use these 
 // values to calculate micros. If there is a pending SysTick, add one to the millis counter in the calculation.
-uint32_t micros( void )
+unsigned long micros( void )
 {
     uint32_t ticks, ticks2;
     uint32_t pend, pend2;
@@ -72,7 +72,7 @@ uint32_t micros( void )
 // }
 
 
-void delay( uint32_t ms )
+void delay( unsigned long ms )
 {
     if (ms == 0)
         return;

cores/arduino/wiring.h

@@ -37,7 +37,7 @@ extern void init( void ) ;
  *
  * \return Number of milliseconds since the program started (uint32_t)
  */
-extern uint32_t millis( void ) ;
+extern unsigned long millis( void ) ;
 
 /**
  * \brief Returns the number of microseconds since the Arduino board began running the current program.
@@ -49,23 +49,23 @@ extern uint32_t millis( void ) ;
  *
  * \note There are 1,000 microseconds in a millisecond and 1,000,000 microseconds in a second.
  */
-extern uint32_t micros( void ) ;
+extern unsigned long micros( void ) ;
 
 /**
  * \brief Pauses the program for the amount of time (in miliseconds) specified as parameter.
  * (There are 1000 milliseconds in a second.)
  *
- * \param dwMs the number of milliseconds to pause (uint32_t)
+ * \param ms the number of milliseconds to pause (unsigned long)
  */
-extern void delay( uint32_t dwMs ) ;
+extern void delay( unsigned long ms ) ;
 
 /**
  * \brief Pauses the program for the amount of time (in microseconds) specified as parameter.
  *
- * \param dwUs the number of microseconds to pause (uint32_t)
+ * \param dwUs the number of microseconds to pause (unsigned long)
  */
-static inline void delayMicroseconds(uint32_t) __attribute__((always_inline, unused));
-static inline void delayMicroseconds(uint32_t usec){
+static inline void delayMicroseconds(unsigned int) __attribute__((always_inline, unused));
+static inline void delayMicroseconds(unsigned int usec){
     /*
      * Based on Paul Stoffregen's implementation
      * for Teensy 3.0 (http://www.pjrc.com/)