Move USE_US_TIMER to esp8266.h and remove redundant inclusions of osapi.h

esp-link/cgiflash.c

@@ -13,10 +13,7 @@ Some flash handling cgi routines. Used for reading the existing flash and updati
  * ----------------------------------------------------------------------------
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
-#include <osapi.h>
 #include "cgi.h"
 #include "cgiflash.h"
 

esp-link/cgioptiboot.c

@@ -1,9 +1,6 @@
 // Copyright (c) 2015 by Thorsten von Eicken, see LICENSE.txt in the esp-link repo
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
-#include <osapi.h>
 #include "cgi.h"
 #include "cgioptiboot.h"
 #include "config.h"

esp-link/cgiservices.c

@@ -1,4 +1,3 @@
-#define USE_US_TIMER
 
 #include <esp8266.h>
 #include "cgiwifi.h"

esp-link/cgiwifi.c

@@ -13,8 +13,6 @@ Cgi/template routines for the /wifi url.
  * ----------------------------------------------------------------------------
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "cgiwifi.h"
 #include "cgi.h"

esp-link/config.c

@@ -2,7 +2,6 @@
 /* Configuration stored in flash */
 
 #include <esp8266.h>
-#include <osapi.h>
 #include "config.h"
 #include "espfs.h"
 #include "crc16.h"

esp-link/main.c

@@ -9,8 +9,6 @@
 * ----------------------------------------------------------------------------
 */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "httpd.h"
 #include "httpdespfs.h"

esp-link/status.c

@@ -1,7 +1,5 @@
 // Copyright 2015 by Thorsten von Eicken, see LICENSE.txt
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "config.h"
 #include "serled.h"

include/esp8266.h

@@ -14,6 +14,8 @@
 #include <ets_sys.h>
 #include <gpio.h>
 #include <mem.h>
+
+#define USE_US_TIMER
 #include <osapi.h>
 #include <upgrade.h>
 
@@ -24,4 +26,4 @@
 #include <_mingw.h>
 #endif
 
-#endif // _ESP8266_H_
+#endif // _ESP8266_H_

mqtt/mqtt.c

@@ -37,8 +37,6 @@
 // Allow messages that don't require ACK to be sent even when pending_buffer is != NULL
 // Set dup flag in retransmissions
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "pktbuf.h"
 #include "mqtt.h"

serial/serled.c

@@ -1,7 +1,5 @@
 // Copyright 2015 by Thorsten von Eicken, see LICENSE.txt
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include <config.h>
 #include <serled.h>

serial/uart.c

@@ -17,11 +17,9 @@
  * ----------------------------------------------------------------------------
  * Heavily modified and enhanced by Thorsten von Eicken in 2015
  */
-#define USE_US_TIMER
 #include "esp8266.h"
 #include "task.h"
 #include "uart.h"
-#include <osapi.h>
 
 #ifdef UART_DBG
 #define DBG_UART(format, ...) os_printf(format, ## __VA_ARGS__)

syslog/syslog.c

@@ -8,8 +8,6 @@
  *
  */
 
-#define USE_US_TIMER
-
 #include <esp8266.h>
 #include "config.h"
 #include "syslog.h"