eLua - Remove redundant includes

duplicate files included by platform.h/platform_conf.h

inc/common.h

@@ -6,7 +6,6 @@
 #include "elua_int.h"
 #include "lua.h"
 #include "platform.h"
-#include "devman.h"
 
 // Virtual timers data
 // VTMR_FIRST_ID must be LARGER than PLATFORM_TIMER_SYS_ID (as declared in platform.h)

inc/elua_adc.h

@@ -1,7 +1,6 @@
 #ifndef __ELUA_ADC_H__
 #define __ELUA_ADC_H__
 
-#include "type.h"
 #include "platform_conf.h"
 
 

inc/elua_net.h

@@ -3,7 +3,6 @@
 #ifndef __ELUA_NET_H__
 #define __ELUA_NET_H__
 
-#include "type.h"
 #include "lauxlib.h"
 #include "platform.h"
 

inc/elua_uip.h

@@ -4,7 +4,6 @@
 #ifndef __ELUA_UIP_H__
 #define __ELUA_UIP_H__
 
-#include "type.h"
 #include "elua_net.h"
 
 // eLua UIP application states

inc/platform.h

@@ -4,7 +4,6 @@
 #define __PLATFORM_H__
 
 #include "devman.h"
-#include "type.h"
 #include "elua_int.h"
 
 // Error / status codes

inc/platform_conf.h

@@ -8,9 +8,11 @@
 #include "legc.h"
 #include "platform.h"
 #include "auxmods.h"
-#include "elua_int.h"
 #include "lualib.h"
 
+// FIXME: ASF ill behaved - compiler.h does not check for previous definition of "UNDEFINED before defining it.  
+//  It is also defined in lua source (but there it checks to be sure not defined).
+//  Moving include of ELUA_CPU_HEADER before lua things solves that problem, but maybe there is another way?
 #include ELUA_CPU_HEADER
 #include ELUA_BOARD_HEADER
 #include "platform_generic.h"     // generic platform header (include whatever else is missing here)

src/buf.c

@@ -23,11 +23,8 @@
 
 #ifdef BUF_ENABLE
 
-#include "buf.h"
 #include "type.h"
-#include "platform.h"
 #include "utils.h"
-#include "sermux.h"
 #include <stdlib.h>
 #include <string.h>
 

src/common.c

@@ -1,11 +1,9 @@
 // Common code for all backends
 
-#include "platform.h"
+#include "platform.h"		// platform_conf.h
 #include "platform_conf.h"
-#include "type.h"
 #include "genstd.h"
 #include "common.h"
-#include "buf.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,8 +12,6 @@
 #include "elua_adc.h"
 #include "term.h"
 #include "xmodem.h"
-#include "elua_int.h"
-#include "sermux.h"
 #include "lua.h"
 #include "lapi.h"
 #include "lauxlib.h"

src/common_tmr.c

@@ -3,9 +3,7 @@
 
 #include "platform.h"
 #include "platform_conf.h"
-#include "type.h"
 #include "common.h"
-#include "elua_int.h"
 #include "utils.h"
 #include <stdio.h>
 

src/common_uart.c

@@ -1,11 +1,7 @@
 // Common implementation: UART functions
 
 #include "common.h"
-#include "platform.h"
 #include "platform_conf.h"
-#include "buf.h"
-#include "elua_int.h"
-#include "sermux.h"
 
 // ****************************************************************************
 // UART functions

src/elua_int.c

@@ -1,10 +1,8 @@
 // eLua interrupt support
 
-#include "elua_int.h"
 #include "lua.h"
 #include "platform.h"
 #include "platform_conf.h"
-#include "type.h"
 #include "ldebug.h"
 #include <stdio.h>
 #include <string.h>

src/elua_uip.c

@@ -6,7 +6,6 @@
 
 #include "elua_uip.h"
 #include "elua_net.h"
-#include "type.h"
 #include "uip.h"
 #include "uip_arp.h"
 #include "platform.h"

src/eluarpc.c

@@ -3,7 +3,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include "type.h"
 #include "eluarpc.h"
 #include "rtype.h"
 

src/main.c

@@ -2,8 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "type.h"
-#include "devman.h"
 #include "platform.h"
 #include "romfs.h"
 #include "xmodem.h"

src/mmcfs.c

@@ -1,9 +1,7 @@
 // MMC filesystem implementation using FatFs
 #include "mmcfs.h"
-#include "type.h"
 #include <string.h>
 #include <errno.h>
-#include "devman.h"
 #include <stdio.h>
 #include "ioctl.h"
 #include <sys/types.h>

src/romfs.c

@@ -1,9 +1,7 @@
 // Filesystem implementation
 #include "romfs.h"
-#include "type.h"
 #include <string.h>
 #include <errno.h>
-#include "devman.h"
 #include "romfiles.h"
 #include <stdio.h>
 #include "ioctl.h"

src/salloc.c

@@ -7,7 +7,6 @@
 #include <string.h>
 #include "platform.h"
 #include "platform_conf.h"
-#include "type.h"
 
 // Macros for the dynamic size allocator
 // Dynamic structure: pointer to next, pointer to prev

src/semifs.c

@@ -1,9 +1,7 @@
 // Filesystem implementation
 #include "swi.h"
-#include "type.h"
 #include <string.h>
 #include <errno.h>
-#include "devman.h"
 #include <stdio.h>
 #include "ioctl.h"
 #include "semifs.h"

src/term.c

@@ -1,7 +1,6 @@
 // Terminal function
 
 #include "term.h"
-#include "type.h"
 #include "platform.h"
 #include <stdio.h>
 #include <stdarg.h>