diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502 index 4653d60c1..0322fefe5 100644 --- a/cpu/6502/Makefile.6502 +++ b/cpu/6502/Makefile.6502 @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.6502,v 1.32 2010/09/28 23:02:16 oliverschmidt Exp $ +# $Id: Makefile.6502,v 1.33 2010/10/23 08:17:45 oliverschmidt Exp $ # ifndef CC65_HOME @@ -42,12 +42,12 @@ all: cs8900a.eth lan91c96.eth CONTIKI_TARGET_DIRS = . lib sys CONTIKI_CPU_DIRS = . lib sys ctk net -CONTIKI_TARGET_SOURCEFILES = contiki-main.c -CONTIKI_CPU_SOURCEFILES = log.c error.c unload.c config.c ctk-mouse.c \ - clock.c mtarch.c mtarch-asm.S lc-asm.S \ - uip_arch.c ethernet-drv.c ethernet.c +CONTIKI_TARGET_SOURCEFILES += contiki-main.c +CONTIKI_CPU_SOURCEFILES += log.c error.c unload.c config.c ctk-mouse.c \ + clock.c mtarch.c mtarch-asm.S lc-asm.S \ + uip_arch.c ethernet-drv.c ethernet.c -CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \ +CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c \ $(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES) TARGET_LIBFILES = $(TARGET).lib diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh index e4fa4d1df..6e318b904 100644 --- a/platform/apple2enh/Makefile.apple2enh +++ b/platform/apple2enh/Makefile.apple2enh @@ -30,10 +30,11 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.apple2enh,v 1.18 2010/09/28 20:40:52 oliverschmidt Exp $ +# $Id: Makefile.apple2enh,v 1.19 2010/10/23 08:17:45 oliverschmidt Exp $ # -CONTIKI_SOURCEFILES += pfs.S +CONTIKI_SOURCEFILES += cfs-posix-dir.c +CONTIKI_TARGET_SOURCEFILES += pfs.S CONTIKI_CPU = $(CONTIKI)/cpu/6502 include $(CONTIKI_CPU)/Makefile.6502 diff --git a/platform/apple2enh/contiki-main.c b/platform/apple2enh/contiki-main.c index e26ea4198..53880ee7c 100644 --- a/platform/apple2enh/contiki-main.c +++ b/platform/apple2enh/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-main.c,v 1.21 2010/09/08 22:50:56 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.22 2010/10/23 08:17:45 oliverschmidt Exp $ */ #include "contiki-net.h" @@ -58,12 +58,6 @@ PROCINIT(&etimer_process, void clock_update(void); -/*-----------------------------------------------------------------------------------*/ -off_t __fastcall__ -lseek(int, off_t, int) -{ - return -1; -} /*-----------------------------------------------------------------------------------*/ void main(void) diff --git a/platform/atari/contiki-conf.h b/platform/atari/contiki-conf.h index fe8a8b6d2..8c17f20c6 100644 --- a/platform/atari/contiki-conf.h +++ b/platform/atari/contiki-conf.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-conf.h,v 1.3 2010/10/16 11:42:40 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.4 2010/10/23 08:17:45 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -43,6 +43,10 @@ #define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */ #define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */ +#define cfs_opendir(dir, name) 0 +#define cfs_readdir(dir, entry) -1 +#define cfs_closedir(dir) + #define textcolor(color) COLOR_WHITE #define BORDERCOLOR COLOR_BLACK diff --git a/platform/atari/contiki-main.c b/platform/atari/contiki-main.c index 1cae202dc..2f838b273 100644 --- a/platform/atari/contiki-main.c +++ b/platform/atari/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-main.c,v 1.3 2010/10/16 11:42:40 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.4 2010/10/23 08:17:45 oliverschmidt Exp $ */ #include "contiki-net.h" @@ -56,23 +56,6 @@ PROCINIT(&etimer_process, RESOLV_PROCESS &tcpip_process); -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -opendir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -readdir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void __fastcall__ -closedir(void *) -{ -} /*-----------------------------------------------------------------------------------*/ void main(void) diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128 index 9794625b1..57a3f5a59 100644 --- a/platform/c128/Makefile.c128 +++ b/platform/c128/Makefile.c128 @@ -30,10 +30,10 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.c128,v 1.13 2010/09/28 20:40:53 oliverschmidt Exp $ +# $Id: Makefile.c128,v 1.14 2010/10/23 08:17:45 oliverschmidt Exp $ # -CONTIKI_SOURCEFILES += pfs.S pfs_write.S +CONTIKI_TARGET_SOURCEFILES += pfs.S pfs_write.S CONTIKI_CPU = $(CONTIKI)/cpu/6502 include $(CONTIKI_CPU)/Makefile.6502 diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h index 130339219..a409f0da4 100644 --- a/platform/c128/contiki-conf.h +++ b/platform/c128/contiki-conf.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-conf.h,v 1.15 2010/10/19 22:41:24 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.16 2010/10/23 08:17:45 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -46,6 +46,10 @@ #define MOUSE_CONF_XTOC(x) ((x) / 4) #define MOUSE_CONF_YTOC(y) ((y) / 8) +#define cfs_opendir(dir, name) 0 +#define cfs_readdir(dir, entry) -1 +#define cfs_closedir(dir) + #define BORDERCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK #define BACKGROUNDCOLOR COLOR_BLACK diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c index 0a1cb47c9..47478917d 100644 --- a/platform/c128/contiki-main.c +++ b/platform/c128/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-main.c,v 1.8 2010/02/10 07:43:25 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.9 2010/10/23 08:17:45 oliverschmidt Exp $ */ #include @@ -58,29 +58,6 @@ PROCINIT(&etimer_process, RESOLV_PROCESS &tcpip_process); -/*-----------------------------------------------------------------------------------*/ -off_t __fastcall__ -lseek(int, off_t, int) -{ - return -1; -} -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -opendir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -readdir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void __fastcall__ -closedir(void *) -{ -} /*-----------------------------------------------------------------------------------*/ void main(void) diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64 index d85dc294d..cb462b345 100644 --- a/platform/c64/Makefile.c64 +++ b/platform/c64/Makefile.c64 @@ -30,10 +30,10 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.c64,v 1.15 2010/09/28 20:40:53 oliverschmidt Exp $ +# $Id: Makefile.c64,v 1.16 2010/10/23 08:17:45 oliverschmidt Exp $ # -CONTIKI_SOURCEFILES += pfs.S pfs_write.S +CONTIKI_TARGET_SOURCEFILES += pfs.S pfs_write.S CONTIKI_CPU = $(CONTIKI)/cpu/6502 include $(CONTIKI_CPU)/Makefile.6502 diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index d70d8b097..fe8237c72 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-conf.h,v 1.25 2010/10/19 22:31:59 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.26 2010/10/23 08:17:45 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -46,6 +46,10 @@ #define MOUSE_CONF_XTOC(x) ((x) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8) +#define cfs_opendir(dir, name) 0 +#define cfs_readdir(dir, entry) -1 +#define cfs_closedir(dir) + #define BORDERCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK #define BACKGROUNDCOLOR COLOR_BLACK diff --git a/platform/c64/contiki-main.c b/platform/c64/contiki-main.c index 3e8bacd3a..a901b07c2 100644 --- a/platform/c64/contiki-main.c +++ b/platform/c64/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: contiki-main.c,v 1.23 2010/02/10 07:43:25 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.24 2010/10/23 08:17:45 oliverschmidt Exp $ */ #include @@ -58,29 +58,6 @@ PROCINIT(&etimer_process, RESOLV_PROCESS &tcpip_process); -/*-----------------------------------------------------------------------------------*/ -off_t __fastcall__ -lseek(int, off_t, int) -{ - return -1; -} -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -opendir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void * __fastcall__ -readdir(void *) -{ - return NULL; -} -/*-----------------------------------------------------------------------------------*/ -void __fastcall__ -closedir(void *) -{ -} /*-----------------------------------------------------------------------------------*/ void main(void)