From 2827b2d8008cac5c13418e8963460f7361af6f1e Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 28 Jun 2015 22:12:44 +0200 Subject: [PATCH 1/4] Rearrange Apple II language card usage. The code of etimer.o has become to large to fit into $D000-$D400. So other object file have been chosen. --- platform/apple2enh/Makefile.apple2enh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh index 2bc8c4626..b59c82e44 100644 --- a/platform/apple2enh/Makefile.apple2enh +++ b/platform/apple2enh/Makefile.apple2enh @@ -41,7 +41,7 @@ LC_SOURCEFILES = process.c tcpip.c ifeq ($(findstring WITH_REBOOT,$(DEFINES)),WITH_REBOOT) LDFLAGS += -D __LCADDR__=0xD000 -D __LCSIZE__=0x1000 - LC_SOURCEFILES += etimer.c + LC_SOURCEFILES += autostart.c timer.c uip_arch.c uiplib.c endif # Set a target-specific variable value From 00f9eebfabf9d94cf9328396c6b356b6e797f2e5 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 28 Jun 2015 22:25:28 +0200 Subject: [PATCH 2/4] Changed Telnet server configuration for the Apple II. Having the Telnet server reboot on exit (via ctrl-reset) allows to bring back the full MTU. --- examples/telnet-server/Makefile.apple2enh.defines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/telnet-server/Makefile.apple2enh.defines b/examples/telnet-server/Makefile.apple2enh.defines index c11112c3c..64d673103 100644 --- a/examples/telnet-server/Makefile.apple2enh.defines +++ b/examples/telnet-server/Makefile.apple2enh.defines @@ -1 +1 @@ -DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,MTU_SIZE=1000 +DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_REBOOT From a3dba2e25c77bd476271d3b7e8a00a0b4ed3f0f2 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 5 Jul 2015 14:21:03 +0200 Subject: [PATCH 3/4] Changed Apple II 800kB floppy image type. The .2mg image format contains a header which is missing from our file. So our file is rather a .po image. I opted to not add the .2mg header as it is only necessary if the metadata it contains differs from the values "guessed" when using the "naked" .po image format. On the other hand there are image file consumers not understanding the .2mg image format. --- .gitignore | 2 +- tools/6502/Makefile | 6 +++--- tools/apple2enh/{prodos.2mg => prodos.po} | Bin 3 files changed, 4 insertions(+), 4 deletions(-) rename tools/apple2enh/{prodos.2mg => prodos.po} (100%) diff --git a/.gitignore b/.gitignore index c8e57f080..ca86d3acd 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,7 @@ contiki-cc2530dk.lib *.S *.eth *.dsk -*.2mg +*.po *.atr *.d64 *.d71 diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 8bce87bb4..e409bf389 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -66,7 +66,7 @@ endef $(eval $(call makes,apple2enh)) -apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.2mg +apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po contiki-apple2-1.dsk: apple2enh-makes cp ../apple2enh/prodos.dsk $@ @@ -121,8 +121,8 @@ contiki-apple2-3.dsk: apple2enh-makes java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm -contiki-apple2.2mg: apple2enh-makes - cp ../apple2enh/prodos.2mg $@ +contiki-apple2.po: apple2enh-makes + cp ../apple2enh/prodos.po $@ java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system java -jar $(AC) -p $@ ethconfi.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ ethconfi bin < ../../cpu/6502/ethconfig/ethconfig.apple2enh diff --git a/tools/apple2enh/prodos.2mg b/tools/apple2enh/prodos.po similarity index 100% rename from tools/apple2enh/prodos.2mg rename to tools/apple2enh/prodos.po From 5d039d9848262a0c8319f9fdce65a76382c1174a Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 5 Jul 2015 16:56:25 +0200 Subject: [PATCH 4/4] Optimized retro webbrowser configs. The change https://github.com/contiki-os/contiki/commit/c7b8bac0065f1292ecd1701fc7e2bbb121556f5e optimized memory usage and thus allowed to adjust the retro webbrowser configs for improved web page compatibility. --- platform/apple2enh/contiki-conf.h | 13 +++---------- platform/atarixl/contiki-conf.h | 12 +++--------- platform/c128/contiki-conf.h | 9 +++------ platform/c64/contiki-conf.h | 13 +++---------- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h index 4326efe2d..58316ca6d 100644 --- a/platform/apple2enh/contiki-conf.h +++ b/platform/apple2enh/contiki-conf.h @@ -55,15 +55,8 @@ #define IRC_CONF_WIDTH 80 #define IRC_CONF_HEIGHT 23 -#define WWW_CONF_WEBPAGE_WIDTH 80 -#define WWW_CONF_WEBPAGE_HEIGHT 19 -#define WWW_CONF_HISTORY_SIZE 4 -#define WWW_CONF_MAX_URLLEN 78 -#define WWW_CONF_MAX_NUMPAGEWIDGETS 20 -#define WWW_CONF_FORMS 1 -#define WWW_CONF_MAX_FORMACTIONLEN 20 -#define WWW_CONF_MAX_INPUTNAMELEN 20 -#define WWW_CONF_MAX_INPUTVALUELEN 20 -#define WWW_CONF_WGET_EXEC(url) exec("wget", url) +#define WWW_CONF_WEBPAGE_HEIGHT 19 +#define WWW_CONF_HISTORY_SIZE 4 +#define WWW_CONF_WGET_EXEC(url) exec("wget", url) #endif /* CONTIKI_CONF_H_ */ diff --git a/platform/atarixl/contiki-conf.h b/platform/atarixl/contiki-conf.h index 047e473ed..967112637 100644 --- a/platform/atarixl/contiki-conf.h +++ b/platform/atarixl/contiki-conf.h @@ -60,14 +60,8 @@ #define IRC_CONF_WIDTH 40 #define IRC_CONF_HEIGHT 23 -#define WWW_CONF_WEBPAGE_WIDTH 40 -#define WWW_CONF_WEBPAGE_HEIGHT 19 -#define WWW_CONF_HISTORY_SIZE 4 -#define WWW_CONF_MAX_URLLEN 80 -#define WWW_CONF_MAX_NUMPAGEWIDGETS 20 -#define WWW_CONF_FORMS 1 -#define WWW_CONF_MAX_FORMACTIONLEN 20 -#define WWW_CONF_MAX_INPUTNAMELEN 20 -#define WWW_CONF_MAX_INPUTVALUELEN 20 +#define WWW_CONF_WEBPAGE_WIDTH 40 +#define WWW_CONF_WEBPAGE_HEIGHT 19 +#define WWW_CONF_HISTORY_SIZE 4 #endif /* CONTIKI_CONF_H_ */ diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h index 8aabcca03..2bad0a6e6 100644 --- a/platform/c128/contiki-conf.h +++ b/platform/c128/contiki-conf.h @@ -65,11 +65,8 @@ #define IRC_CONF_WIDTH 80 #define IRC_CONF_HEIGHT 24 -#define WWW_CONF_WEBPAGE_WIDTH 80 -#define WWW_CONF_WEBPAGE_HEIGHT 20 -#define WWW_CONF_HISTORY_SIZE 0 -#define WWW_CONF_MAX_URLLEN 78 -#define WWW_CONF_MAX_NUMPAGEWIDGETS 20 -#define WWW_CONF_FORMS 0 +#define WWW_CONF_HISTORY_SIZE 0 +#define WWW_CONF_FORMS 0 +#define WWW_CONF_PAGEATTRIB_SIZE 1500 #endif /* CONTIKI_CONF_H_ */ diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index 0e5581aae..868d4dcd1 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -65,15 +65,8 @@ #define IRC_CONF_WIDTH 40 #define IRC_CONF_HEIGHT 24 -#define WWW_CONF_WEBPAGE_WIDTH 40 -#define WWW_CONF_WEBPAGE_HEIGHT 20 -#define WWW_CONF_HISTORY_SIZE 4 -#define WWW_CONF_MAX_URLLEN 80 -#define WWW_CONF_MAX_NUMPAGEWIDGETS 20 -#define WWW_CONF_FORMS 1 -#define WWW_CONF_MAX_FORMACTIONLEN 20 -#define WWW_CONF_MAX_INPUTNAMELEN 20 -#define WWW_CONF_MAX_INPUTVALUELEN 20 -#define WWW_CONF_WGET_EXEC(url) exec("wget", url) +#define WWW_CONF_WEBPAGE_WIDTH 40 +#define WWW_CONF_HISTORY_SIZE 4 +#define WWW_CONF_WGET_EXEC(url) exec("wget", url) #endif /* CONTIKI_CONF_H_ */