deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Up to now *all* Contiki apps for the Apple2 were built for maximal RAM - which means that they can't return to OS level but must reboot on exit. However many apps can get along well with 1kB less memory - which allows them to exit to the OS.

Browse source 
Therefore now the default is 1kB less memory - and apps actually needing maximal RAM can get it by adding WITH_REBOOT to their DEFINES.
This commit is contained in:
oliverschmidt 2010-09-08 22:50:56 +00:00
parent 51477dae23
commit 6e5e560e33
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/apple2enh/Makefile.apple2enh
View file

@ -30,20 +30,25 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.apple2enh,v 1.14 2010/05/08 07:26:20 oliverschmidt Exp $ # $Id: Makefile.apple2enh,v 1.15 2010/09/08 22:50:57 oliverschmidt Exp $
# #
CONTIKI_SOURCEFILES += pfs.S CONTIKI_SOURCEFILES += pfs.S
HIGHCODE_SOURCEFILES = process.c etimer.c uip_arp.c
CONTIKI_CPU = $(CONTIKI)/cpu/6502 CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502 include $(CONTIKI_CPU)/Makefile.6502
ifeq ($(findstring WITH_REBOOT,$(DEFINES)),WITH_REBOOT)
HIGHCODE_SOURCEFILES = process.c etimer.c uip_arp.c
LDFLAGS += -C apple2enh-reboot.cfg
else
HIGHCODE_SOURCEFILES = process.c etimer.c ethernet.c
LDFLAGS += -C apple2enh-loader.cfg
endif
# Set a target-specific variable value # Set a target-specific variable value
${addprefix $(OBJECTDIR)/,${call oname, $(HIGHCODE_SOURCEFILES)}}: CFLAGS += --code-name HIGHCODE ${addprefix $(OBJECTDIR)/,${call oname, $(HIGHCODE_SOURCEFILES)}}: CFLAGS += --code-name HIGHCODE
LDFLAGS += -C apple2enh-reboot.cfg
ifeq ($(MAKECMDGOALS),disk) ifeq ($(MAKECMDGOALS),disk)
ifndef AC ifndef AC
${error AC not defined! You must specify where the AppleCommander jar resides} ${error AC not defined! You must specify where the AppleCommander jar resides}

5
platform/apple2enh/contiki-main.c
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.20 2010/02/10 07:43:25 oliverschmidt Exp $ * $Id: contiki-main.c,v 1.21 2010/09/08 22:50:56 oliverschmidt Exp $
*/ */
#include "contiki-net.h" #include "contiki-net.h"
@ -70,7 +70,10 @@ main(void)
{ {
struct ethernet_config *ethernet_config; struct ethernet_config *ethernet_config;
#if WITH_REBOOT
rebootafterexit(); rebootafterexit();
#endif /* WITH_REBOOT */
videomode(VIDEOMODE_80COL); videomode(VIDEOMODE_80COL);
process_init(); process_init();