There's no point in pulling in cfs-posix-dir.c if the POSIX functions it depends on are dummies anyway.

This commit is contained in:
oliverschmidt 2010-10-23 08:17:45 +00:00
parent ce9af386c6
commit 9e9eb4b55c
11 changed files with 32 additions and 88 deletions

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $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 ifndef CC65_HOME
@ -42,12 +42,12 @@ all: cs8900a.eth lan91c96.eth
CONTIKI_TARGET_DIRS = . lib sys CONTIKI_TARGET_DIRS = . lib sys
CONTIKI_CPU_DIRS = . lib sys ctk net CONTIKI_CPU_DIRS = . lib sys ctk net
CONTIKI_TARGET_SOURCEFILES = contiki-main.c CONTIKI_TARGET_SOURCEFILES += contiki-main.c
CONTIKI_CPU_SOURCEFILES = log.c error.c unload.c config.c ctk-mouse.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 \ clock.c mtarch.c mtarch-asm.S lc-asm.S \
uip_arch.c ethernet-drv.c ethernet.c 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) $(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES)
TARGET_LIBFILES = $(TARGET).lib TARGET_LIBFILES = $(TARGET).lib

View file

@ -30,10 +30,11 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $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 CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502 include $(CONTIKI_CPU)/Makefile.6502

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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" #include "contiki-net.h"
@ -58,12 +58,6 @@ PROCINIT(&etimer_process,
void clock_update(void); void clock_update(void);
/*-----------------------------------------------------------------------------------*/
off_t __fastcall__
lseek(int, off_t, int)
{
return -1;
}
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void
main(void) main(void)

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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__ #ifndef __CONTIKI_CONF_H__
@ -43,6 +43,10 @@
#define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */ #define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */
#define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */ #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 textcolor(color) COLOR_WHITE
#define BORDERCOLOR COLOR_BLACK #define BORDERCOLOR COLOR_BLACK

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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" #include "contiki-net.h"
@ -56,23 +56,6 @@ PROCINIT(&etimer_process,
RESOLV_PROCESS RESOLV_PROCESS
&tcpip_process); &tcpip_process);
/*-----------------------------------------------------------------------------------*/
void * __fastcall__
opendir(void *)
{
return NULL;
}
/*-----------------------------------------------------------------------------------*/
void * __fastcall__
readdir(void *)
{
return NULL;
}
/*-----------------------------------------------------------------------------------*/
void __fastcall__
closedir(void *)
{
}
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void
main(void) main(void)

View file

@ -30,10 +30,10 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $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 CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502 include $(CONTIKI_CPU)/Makefile.6502

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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__ #ifndef __CONTIKI_CONF_H__
@ -46,6 +46,10 @@
#define MOUSE_CONF_XTOC(x) ((x) / 4) #define MOUSE_CONF_XTOC(x) ((x) / 4)
#define MOUSE_CONF_YTOC(y) ((y) / 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 BORDERCOLOR COLOR_BLACK
#define SCREENCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK
#define BACKGROUNDCOLOR COLOR_BLACK #define BACKGROUNDCOLOR COLOR_BLACK

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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 <string.h> #include <string.h>
@ -58,29 +58,6 @@ PROCINIT(&etimer_process,
RESOLV_PROCESS RESOLV_PROCESS
&tcpip_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 void
main(void) main(void)

View file

@ -30,10 +30,10 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $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 CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502 include $(CONTIKI_CPU)/Makefile.6502

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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__ #ifndef __CONTIKI_CONF_H__
@ -46,6 +46,10 @@
#define MOUSE_CONF_XTOC(x) ((x) / 8) #define MOUSE_CONF_XTOC(x) ((x) / 8)
#define MOUSE_CONF_YTOC(y) ((y) / 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 BORDERCOLOR COLOR_BLACK
#define SCREENCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK
#define BACKGROUNDCOLOR COLOR_BLACK #define BACKGROUNDCOLOR COLOR_BLACK

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $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 <string.h> #include <string.h>
@ -58,29 +58,6 @@ PROCINIT(&etimer_process,
RESOLV_PROCESS RESOLV_PROCESS
&tcpip_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 void
main(void) main(void)