diff --git a/cpu/6502/README.md b/cpu/6502/README.md index 3ab367a52..601aee288 100644 --- a/cpu/6502/README.md +++ b/cpu/6502/README.md @@ -66,9 +66,13 @@ high-level configuration macros may be set: - Default: 0 - Purpose: Enable UDP support and initialize resolver process on startup. +- WITH_80COL + - Default: 0 + - Purpose: Enable 80 column screen. + - WITH_GUI - Default: 0 - - Purpose: Initialize the the CTK process on startup. + - Purpose: Initialize the CTK process on startup. - WITH_MOUSE - Default: 0 diff --git a/examples/email/Makefile.apple2enh.defines b/examples/email/Makefile.apple2enh.defines deleted file mode 100644 index 05a72fd5d..000000000 --- a/examples/email/Makefile.apple2enh.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/email/Makefile.atarixl.defines b/examples/email/Makefile.atarixl.defines deleted file mode 100644 index 5a292701b..000000000 --- a/examples/email/Makefile.atarixl.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE diff --git a/examples/email/Makefile.c128.defines b/examples/email/Makefile.c128.defines deleted file mode 100644 index 688d85113..000000000 --- a/examples/email/Makefile.c128.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_PFS diff --git a/examples/email/Makefile.c64.defines b/examples/email/Makefile.c64.defines deleted file mode 100644 index 05a72fd5d..000000000 --- a/examples/email/Makefile.c64.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/ftp/Makefile.apple2enh.defines b/examples/ftp/Makefile.apple2enh.defines deleted file mode 100644 index 5a292701b..000000000 --- a/examples/ftp/Makefile.apple2enh.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE diff --git a/examples/ftp/Makefile.atarixl.defines b/examples/ftp/Makefile.atarixl.defines deleted file mode 100644 index 5a292701b..000000000 --- a/examples/ftp/Makefile.atarixl.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE diff --git a/examples/ftp/Makefile.c128.defines b/examples/ftp/Makefile.c128.defines deleted file mode 100644 index 7f438d1d1..000000000 --- a/examples/ftp/Makefile.c128.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI diff --git a/examples/ftp/Makefile.c64.defines b/examples/ftp/Makefile.c64.defines deleted file mode 100644 index 05a72fd5d..000000000 --- a/examples/ftp/Makefile.c64.defines +++ /dev/null @@ -1 +0,0 @@ -DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/irc-80col/Makefile b/examples/irc-80col/Makefile new file mode 100644 index 000000000..bad574e70 --- /dev/null +++ b/examples/irc-80col/Makefile @@ -0,0 +1,8 @@ +CONTIKI_PROJECT = irc-client +all: $(CONTIKI_PROJECT) + +APPS = irc + +CONTIKI = ../.. +CONTIKI_WITH_IPV4 = 1 +include $(CONTIKI)/Makefile.include diff --git a/examples/irc-80col/Makefile.apple2enh.defines b/examples/irc-80col/Makefile.apple2enh.defines new file mode 100644 index 000000000..71fb932e2 --- /dev/null +++ b/examples/irc-80col/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/irc-80col/Makefile.atarixl.defines b/examples/irc-80col/Makefile.atarixl.defines new file mode 100644 index 000000000..962070b58 --- /dev/null +++ b/examples/irc-80col/Makefile.atarixl.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE diff --git a/examples/irc-80col/Makefile.c128.defines b/examples/irc-80col/Makefile.c128.defines new file mode 100644 index 000000000..6a6a52d5c --- /dev/null +++ b/examples/irc-80col/Makefile.c128.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=1000 diff --git a/examples/irc-80col/Makefile.c64.defines b/examples/irc-80col/Makefile.c64.defines new file mode 100644 index 000000000..71fb932e2 --- /dev/null +++ b/examples/irc-80col/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/irc-80col/Makefile.native.defines b/examples/irc-80col/Makefile.native.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/irc-80col/Makefile.native.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/irc-80col/Makefile.win32.defines b/examples/irc-80col/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/irc-80col/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/irc-80col/irc-client.c b/examples/irc-80col/irc-client.c new file mode 100644 index 000000000..da28f9440 --- /dev/null +++ b/examples/irc-80col/irc-client.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + */ + +#include "contiki-net.h" +#include "irc.h" + +/*---------------------------------------------------------------------------*/ +AUTOSTART_PROCESSES(&irc_process); +/*---------------------------------------------------------------------------*/ diff --git a/examples/telnet-server/Makefile.apple2enh.defines b/examples/telnet-server/Makefile.apple2enh.defines index 64d673103..2ee328994 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,WITH_REBOOT +DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_REBOOT diff --git a/examples/telnet-server/Makefile.c128.defines b/examples/telnet-server/Makefile.c128.defines index 5e74716aa..062a12cd7 100644 --- a/examples/telnet-server/Makefile.c128.defines +++ b/examples/telnet-server/Makefile.c128.defines @@ -1 +1 @@ -DEFINES = WITH_LOGGING +DEFINES = WITH_LOGGING,WITH_80COL diff --git a/examples/webbrowser-80col/Makefile b/examples/webbrowser-80col/Makefile new file mode 100644 index 000000000..5067c2d9c --- /dev/null +++ b/examples/webbrowser-80col/Makefile @@ -0,0 +1,8 @@ +CONTIKI_PROJECT = webbrowser +all: $(CONTIKI_PROJECT) + +APPS = webbrowser + +CONTIKI = ../.. +CONTIKI_WITH_IPV4 = 1 +include $(CONTIKI)/Makefile.include diff --git a/examples/webbrowser-80col/Makefile.apple2enh.defines b/examples/webbrowser-80col/Makefile.apple2enh.defines new file mode 100644 index 000000000..71fb932e2 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/webbrowser-80col/Makefile.atarixl.defines b/examples/webbrowser-80col/Makefile.atarixl.defines new file mode 100644 index 000000000..962070b58 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.atarixl.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE diff --git a/examples/webbrowser-80col/Makefile.c128.defines b/examples/webbrowser-80col/Makefile.c128.defines new file mode 100644 index 000000000..1b47d0cb1 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.c128.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=500 diff --git a/examples/webbrowser-80col/Makefile.c64.defines b/examples/webbrowser-80col/Makefile.c64.defines new file mode 100644 index 000000000..71fb932e2 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/webbrowser-80col/Makefile.native.defines b/examples/webbrowser-80col/Makefile.native.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.native.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/webbrowser-80col/Makefile.win32.defines b/examples/webbrowser-80col/Makefile.win32.defines new file mode 100644 index 000000000..1b5caf200 --- /dev/null +++ b/examples/webbrowser-80col/Makefile.win32.defines @@ -0,0 +1 @@ +DEFINES = WITH_GUI diff --git a/examples/webbrowser-80col/webbrowser.c b/examples/webbrowser-80col/webbrowser.c new file mode 100644 index 000000000..0453fe0d2 --- /dev/null +++ b/examples/webbrowser-80col/webbrowser.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2007, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + */ + +#include "contiki-net.h" +#include "www.h" + +/*---------------------------------------------------------------------------*/ +AUTOSTART_PROCESSES(&www_process); +/*---------------------------------------------------------------------------*/ diff --git a/examples/webserver/Makefile.apple2enh.defines b/examples/webserver/Makefile.apple2enh.defines index 461a038bb..5d8fdd62e 100644 --- a/examples/webserver/Makefile.apple2enh.defines +++ b/examples/webserver/Makefile.apple2enh.defines @@ -1 +1 @@ -DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST +DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL diff --git a/examples/webserver/Makefile.c128.defines b/examples/webserver/Makefile.c128.defines index 43f7fe613..d4b3027dc 100644 --- a/examples/webserver/Makefile.c128.defines +++ b/examples/webserver/Makefile.c128.defines @@ -1 +1 @@ -DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_PFS +DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL,WITH_PFS diff --git a/examples/wget/Makefile.apple2enh.defines b/examples/wget/Makefile.apple2enh.defines index a4bbe71fb..f596f97ce 100644 --- a/examples/wget/Makefile.apple2enh.defines +++ b/examples/wget/Makefile.apple2enh.defines @@ -1 +1 @@ -DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_ARGS +DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_ARGS diff --git a/examples/wget/Makefile.c128.defines b/examples/wget/Makefile.c128.defines index 91a6f26ad..adbaf5689 100644 --- a/examples/wget/Makefile.c128.defines +++ b/examples/wget/Makefile.c128.defines @@ -1 +1 @@ -DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_PFS,WITH_ARGS +DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_PFS,WITH_ARGS diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h index 2ad5ceb7f..d3a684d3c 100644 --- a/platform/apple2enh/contiki-conf.h +++ b/platform/apple2enh/contiki-conf.h @@ -42,23 +42,29 @@ #define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */ #define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */ +#if WITH_80COL #define MOUSE_CONF_XTOC(x) ((x) * 2 / 7) +#else +#define MOUSE_CONF_XTOC(x) ((x) / 7) +#endif #define MOUSE_CONF_YTOC(y) ((y) / 8) -#define EMAIL_CONF_WIDTH 79 -#define EMAIL_CONF_HEIGHT 19 -#define EMAIL_CONF_ERASE 0 - -#define FTP_CONF_WIDTH 38 -#define FTP_CONF_HEIGHT 21 - +#if WITH_80COL #define IRC_CONF_WIDTH 80 +#else +#define IRC_CONF_WIDTH 40 +#endif #define IRC_CONF_HEIGHT 23 #ifndef TELNETD_CONF_MAX_IDLE_TIME #define TELNETD_CONF_MAX_IDLE_TIME 300 #endif +#if WITH_80COL +#define WWW_CONF_WEBPAGE_WIDTH 80 +#else +#define WWW_CONF_WEBPAGE_WIDTH 40 +#endif #define WWW_CONF_WEBPAGE_HEIGHT 19 #define WWW_CONF_HISTORY_SIZE 4 #define WWW_CONF_WGET_EXEC(url) exec("wget", url) diff --git a/platform/apple2enh/contiki-main.c b/platform/apple2enh/contiki-main.c index 8a42a53da..f65a4fe94 100644 --- a/platform/apple2enh/contiki-main.c +++ b/platform/apple2enh/contiki-main.c @@ -83,7 +83,9 @@ main(void) rebootafterexit(); #endif /* WITH_REBOOT */ +#if WITH_80COL videomode(VIDEOMODE_80COL); +#endif /* WITH_80COL */ process_init(); diff --git a/platform/atarixl/contiki-conf.h b/platform/atarixl/contiki-conf.h index 8c43fdcae..9adcdd93f 100644 --- a/platform/atarixl/contiki-conf.h +++ b/platform/atarixl/contiki-conf.h @@ -50,13 +50,6 @@ #define BORDERCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK -#define EMAIL_CONF_WIDTH 39 -#define EMAIL_CONF_HEIGHT 19 -#define EMAIL_CONF_ERASE 0 - -#define FTP_CONF_WIDTH 18 -#define FTP_CONF_HEIGHT 21 - #define IRC_CONF_WIDTH 40 #define IRC_CONF_HEIGHT 23 diff --git a/platform/c128/contiki-conf.h b/platform/c128/contiki-conf.h index 53a6878f9..057d6473d 100644 --- a/platform/c128/contiki-conf.h +++ b/platform/c128/contiki-conf.h @@ -42,7 +42,11 @@ #define CTK_CONF_WIDGETUP_KEY CH_F5 #define CTK_CONF_WIDGETDOWN_KEY CH_F7 +#if WITH_80COL #define MOUSE_CONF_XTOC(x) ((x) / 4) +#else +#define MOUSE_CONF_XTOC(x) ((x) / 8) +#endif #define MOUSE_CONF_YTOC(y) ((y) / 8) #define BORDERCOLOR COLOR_BLACK @@ -55,20 +59,23 @@ #define WIDGETCOLOR_FWIN COLOR_WHITE #define WIDGETCOLOR_HLINK COLOR_CYAN -#define EMAIL_CONF_WIDTH 79 -#define EMAIL_CONF_HEIGHT 20 -#define EMAIL_CONF_ERASE 0 - -#define FTP_CONF_WIDTH 38 -#define FTP_CONF_HEIGHT 22 - +#if WITH_80COL #define IRC_CONF_WIDTH 80 +#else +#define IRC_CONF_WIDTH 40 +#endif #define IRC_CONF_HEIGHT 24 #ifndef TELNETD_CONF_MAX_IDLE_TIME #define TELNETD_CONF_MAX_IDLE_TIME 300 #endif +#if WITH_80COL +#define WWW_CONF_WEBPAGE_WIDTH 80 +#else +#define WWW_CONF_WEBPAGE_WIDTH 40 +#endif +#define WWW_CONF_WEBPAGE_HEIGHT 20 #define WWW_CONF_HISTORY_SIZE 0 #define WWW_CONF_FORMS 0 #define WWW_CONF_PAGEATTRIB_SIZE 1500 diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c index 1eae9b359..bec91bc4d 100644 --- a/platform/c128/contiki-main.c +++ b/platform/c128/contiki-main.c @@ -79,7 +79,9 @@ main(void) #endif /* WITH_ARGS */ +#if WITH_80COL videomode(VIDEOMODE_80COL); +#endif /* WITH_80COL */ process_init(); diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index bfaf1c956..252c0d981 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -55,13 +55,6 @@ #define WIDGETCOLOR_FWIN COLOR_GRAY3 #define WIDGETCOLOR_HLINK COLOR_CYAN -#define EMAIL_CONF_WIDTH 39 -#define EMAIL_CONF_HEIGHT 20 -#define EMAIL_CONF_ERASE 0 - -#define FTP_CONF_WIDTH 18 -#define FTP_CONF_HEIGHT 22 - #define IRC_CONF_WIDTH 40 #define IRC_CONF_HEIGHT 24 @@ -70,6 +63,7 @@ #endif #define WWW_CONF_WEBPAGE_WIDTH 40 +#define WWW_CONF_WEBPAGE_HEIGHT 20 #define WWW_CONF_HISTORY_SIZE 4 #define WWW_CONF_WGET_EXEC(url) exec("wget", url) diff --git a/tools/6502/Makefile b/tools/6502/Makefile index a7dc1385e..57574a840 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -68,13 +68,15 @@ endif define makes $1-makes: - $(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1 - $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 - $(MAKE) -C ../../examples/webbrowser TARGET=$1 - $(MAKE) -C ../../examples/wget TARGET=$1 - $(MAKE) -C ../../examples/irc TARGET=$1 - $(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 - $(MAKE) -C ../../examples/telnet-server TARGET=$1 + $(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1 + $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 + $(MAKE) -C ../../examples/webbrowser TARGET=$1 + $(MAKE) -C ../../examples/webbrowser-80col TARGET=$1 + $(MAKE) -C ../../examples/wget TARGET=$1 + $(MAKE) -C ../../examples/irc TARGET=$1 + $(MAKE) -C ../../examples/irc-80col TARGET=$1 + $(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 + $(MAKE) -C ../../examples/telnet-server TARGET=$1 endef $(eval $(call makes,apple2enh)) @@ -95,7 +97,7 @@ contiki-apple2-1.dsk: apple2enh-makes java -jar $(AC) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p $@ webbrows.system sys < $(CC65_HOME)/targetutil/loader.system - java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh + java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh java -jar $(AC) -p $@ wget.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg @@ -112,7 +114,7 @@ contiki-apple2-2.dsk: apple2enh-makes java -jar $(AC) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p $@ irc.system sys < $(CC65_HOME)/targetutil/loader.system - java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc/irc-client.apple2enh + java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth @@ -148,11 +150,11 @@ contiki-apple2.po: apple2enh-makes java -jar $(AC) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p $@ webbrows.system sys < $(CC65_HOME)/targetutil/loader.system - java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh + java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh java -jar $(AC) -p $@ wget.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh java -jar $(AC) -p $@ irc.system sys < $(CC65_HOME)/targetutil/loader.system - java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc/irc-client.apple2enh + java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh java -jar $(AC) -p $@ webserv.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh java -jar $(AC) -p $@ telnetd.system sys < $(CC65_HOME)/targetutil/loader.system @@ -340,14 +342,14 @@ contiki-c128.zip: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki contiki-c128-1.d64: c128-makes $(C1541) -format contiki-1,00 d64 $@ - $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p - $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p - $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p - $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p - $(C1541) -attach $@ -write ../../examples/irc/irc-client.c128 irc,p - $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s - $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s - $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s + $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p + $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p + $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p + $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p + $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p + $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s + $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s + $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s contiki-c128-2.d64: c128-makes $(C1541) -format contiki-3,00 d64 $@ @@ -367,9 +369,9 @@ contiki-c128.d71: c128-makes $(C1541) -format contiki,00 d71 $@ $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p - $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p - $(C1541) -attach $@ -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s @@ -384,9 +386,9 @@ contiki-c128.d81: c128-makes $(C1541) -format contiki,00 d81 $@ $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p - $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p - $(C1541) -attach $@ -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s