Merge branch 'jacmet-sdk-2x-support'

Author: Spritetm

include/espmissingincludes.h

@@ -9,13 +9,14 @@ int strcasecmp(const char *a, const char *b);
 #ifndef FREERTOS
 #include <eagle_soc.h>
 #include <ets_sys.h>
+
 //Missing function prototypes in include folders. Gcc will warn on these if we don't define 'em anywhere.
 //MOST OF THESE ARE GUESSED! but they seem to swork and shut up the compiler.
 typedef struct espconn espconn;
 
 int atoi(const char *nptr);
-void ets_install_putc1(void *routine);
-void ets_isr_attach(int intr, void *handler, void *arg);
+void ets_install_putc1(void (*routine)(char c));
+void ets_isr_attach(int intr, void (*handler)(void *), void *arg);
 void ets_isr_mask(unsigned intr);
 void ets_isr_unmask(unsigned intr);
 int ets_memcmp(const void *s1, const void *s2, size_t n);
@@ -25,24 +26,24 @@ int ets_sprintf(char *str, const char *format, ...)  __attribute__ ((format (pri
 int ets_str2macaddr(void *, void *);
 int ets_strcmp(const char *s1, const char *s2);
 char *ets_strcpy(char *dest, const char *src);
-size_t ets_strlen(const char *s);
-int ets_strncmp(const char *s1, const char *s2, int len);
+int ets_strlen(const char *s);
+int ets_strncmp(const char *s1, const char *s2, unsigned int len);
 char *ets_strncpy(char *dest, const char *src, size_t n);
 char *ets_strstr(const char *haystack, const char *needle);
-void ets_timer_arm_new(os_timer_t *a, int b, int c, int isMstimer);
+void ets_timer_arm_new(os_timer_t *a, uint32_t b, bool repeat, bool isMstimer);
 void ets_timer_disarm(os_timer_t *a);
 void ets_timer_setfn(os_timer_t *t, ETSTimerFunc *fn, void *parg);
 void ets_update_cpu_frequency(int freqmhz);
 void *os_memmove(void *dest, const void *src, size_t n);
 int os_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
 int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
 int os_printf_plus(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
-void uart_div_modify(int no, unsigned int freq);
+void uart_div_modify(uint8 no, uint32 freq);
 uint8 wifi_get_opmode(void);
 uint32 system_get_time();
 int rand(void);
 void ets_bzero(void *s, size_t n);
-void ets_delay_us(int ms);
+void ets_delay_us(uint16_t ms);
 
 //Hack: this is defined in SDK 1.4.0 and undefined in 1.3.0. It's only used for this, the symbol itself
 //has no meaning here.
@@ -54,11 +55,11 @@ void vPortFree(void *ptr);
 void *vPortMalloc(size_t xWantedSize);
 void pvPortFree(void *ptr);
 #else
-void *pvPortMalloc(size_t xWantedSize, const char *file, int line);
-void *pvPortZalloc(size_t, const char *file, int line);
-void vPortFree(void *ptr, const char *file, int line);
-void *vPortMalloc(size_t xWantedSize, const char *file, int line);
-void pvPortFree(void *ptr, const char *file, int line);
+void *pvPortMalloc(size_t xWantedSize, const char *file, unsigned line);
+void *pvPortZalloc(size_t, const char *file, unsigned line);
+void vPortFree(void *ptr, const char *file, unsigned line);
+void *vPortMalloc(size_t xWantedSize, const char *file, unsigned line);
+void pvPortFree(void *ptr, const char *file, unsigned line);
 #endif
 
 //Standard PIN_FUNC_SELECT gives a warning. Replace by a non-warning one.