Merge pull request #1343 from oliverschmidt/master

Added 80 column IRC client / web browser for the C64.
This commit is contained in:
Oliver Schmidt 2015-10-31 15:18:10 +01:00
commit 692fbf5422
42 changed files with 234 additions and 92 deletions

View file

@ -66,9 +66,13 @@ high-level configuration macros may be set:
- Default: 0 - Default: 0
- Purpose: Enable UDP support and initialize resolver process on startup. - Purpose: Enable UDP support and initialize resolver process on startup.
- WITH_80COL
- Default: 0
- Purpose: Enable 80 column screen.
- WITH_GUI - WITH_GUI
- Default: 0 - Default: 0
- Purpose: Initialize the the CTK process on startup. - Purpose: Initialize the CTK process on startup.
- WITH_MOUSE - WITH_MOUSE
- Default: 0 - Default: 0

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_PFS

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI

View file

@ -1 +0,0 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -0,0 +1,8 @@
CONTIKI_PROJECT = irc-client
all: $(CONTIKI_PROJECT)
APPS = irc
CONTIKI = ../..
CONTIKI_WITH_IPV4 = 1
include $(CONTIKI)/Makefile.include

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=1000

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -0,0 +1 @@
DEFINES = WITH_GUI

View file

@ -0,0 +1 @@
DEFINES = WITH_GUI

View file

@ -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);
/*---------------------------------------------------------------------------*/

View file

@ -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

View file

@ -1 +1 @@
DEFINES = WITH_LOGGING DEFINES = WITH_LOGGING,WITH_80COL

View file

@ -0,0 +1,8 @@
CONTIKI_PROJECT = webbrowser
all: $(CONTIKI_PROJECT)
APPS = webbrowser
CONTIKI = ../..
CONTIKI_WITH_IPV4 = 1
include $(CONTIKI)/Makefile.include

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=500

View file

@ -0,0 +1 @@
DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

View file

@ -0,0 +1 @@
DEFINES = WITH_GUI

View file

@ -0,0 +1 @@
DEFINES = WITH_GUI

View file

@ -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);
/*---------------------------------------------------------------------------*/

View file

@ -1 +1 @@
DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL

View file

@ -1 +1 @@
DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_PFS DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL,WITH_PFS

View file

@ -1 +1 @@
DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_ARGS DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_ARGS

View file

@ -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

View file

@ -42,23 +42,29 @@
#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 */
#if WITH_80COL
#define MOUSE_CONF_XTOC(x) ((x) * 2 / 7) #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 MOUSE_CONF_YTOC(y) ((y) / 8)
#define EMAIL_CONF_WIDTH 79 #if WITH_80COL
#define EMAIL_CONF_HEIGHT 19
#define EMAIL_CONF_ERASE 0
#define FTP_CONF_WIDTH 38
#define FTP_CONF_HEIGHT 21
#define IRC_CONF_WIDTH 80 #define IRC_CONF_WIDTH 80
#else
#define IRC_CONF_WIDTH 40
#endif
#define IRC_CONF_HEIGHT 23 #define IRC_CONF_HEIGHT 23
#ifndef TELNETD_CONF_MAX_IDLE_TIME #ifndef TELNETD_CONF_MAX_IDLE_TIME
#define TELNETD_CONF_MAX_IDLE_TIME 300 #define TELNETD_CONF_MAX_IDLE_TIME 300
#endif #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_WEBPAGE_HEIGHT 19
#define WWW_CONF_HISTORY_SIZE 4 #define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_WGET_EXEC(url) exec("wget", url) #define WWW_CONF_WGET_EXEC(url) exec("wget", url)

View file

@ -83,7 +83,9 @@ main(void)
rebootafterexit(); rebootafterexit();
#endif /* WITH_REBOOT */ #endif /* WITH_REBOOT */
#if WITH_80COL
videomode(VIDEOMODE_80COL); videomode(VIDEOMODE_80COL);
#endif /* WITH_80COL */
process_init(); process_init();

View file

@ -50,13 +50,6 @@
#define BORDERCOLOR COLOR_BLACK #define BORDERCOLOR COLOR_BLACK
#define SCREENCOLOR 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_WIDTH 40
#define IRC_CONF_HEIGHT 23 #define IRC_CONF_HEIGHT 23

View file

@ -42,7 +42,11 @@
#define CTK_CONF_WIDGETUP_KEY CH_F5 #define CTK_CONF_WIDGETUP_KEY CH_F5
#define CTK_CONF_WIDGETDOWN_KEY CH_F7 #define CTK_CONF_WIDGETDOWN_KEY CH_F7
#if WITH_80COL
#define MOUSE_CONF_XTOC(x) ((x) / 4) #define MOUSE_CONF_XTOC(x) ((x) / 4)
#else
#define MOUSE_CONF_XTOC(x) ((x) / 8)
#endif
#define MOUSE_CONF_YTOC(y) ((y) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8)
#define BORDERCOLOR COLOR_BLACK #define BORDERCOLOR COLOR_BLACK
@ -55,20 +59,23 @@
#define WIDGETCOLOR_FWIN COLOR_WHITE #define WIDGETCOLOR_FWIN COLOR_WHITE
#define WIDGETCOLOR_HLINK COLOR_CYAN #define WIDGETCOLOR_HLINK COLOR_CYAN
#define EMAIL_CONF_WIDTH 79 #if WITH_80COL
#define EMAIL_CONF_HEIGHT 20
#define EMAIL_CONF_ERASE 0
#define FTP_CONF_WIDTH 38
#define FTP_CONF_HEIGHT 22
#define IRC_CONF_WIDTH 80 #define IRC_CONF_WIDTH 80
#else
#define IRC_CONF_WIDTH 40
#endif
#define IRC_CONF_HEIGHT 24 #define IRC_CONF_HEIGHT 24
#ifndef TELNETD_CONF_MAX_IDLE_TIME #ifndef TELNETD_CONF_MAX_IDLE_TIME
#define TELNETD_CONF_MAX_IDLE_TIME 300 #define TELNETD_CONF_MAX_IDLE_TIME 300
#endif #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_HISTORY_SIZE 0
#define WWW_CONF_FORMS 0 #define WWW_CONF_FORMS 0
#define WWW_CONF_PAGEATTRIB_SIZE 1500 #define WWW_CONF_PAGEATTRIB_SIZE 1500

View file

@ -32,8 +32,6 @@
* *
*/ */
#include <string.h>
#include "contiki-net.h" #include "contiki-net.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "sys/log.h" #include "sys/log.h"
@ -79,7 +77,9 @@ main(void)
#endif /* WITH_ARGS */ #endif /* WITH_ARGS */
#if WITH_80COL
videomode(VIDEOMODE_80COL); videomode(VIDEOMODE_80COL);
#endif /* WITH_80COL */
process_init(); process_init();

View file

@ -38,6 +38,10 @@ include $(CONTIKI_CPU)/Makefile.6502
CFLAGS += -DWITH_PETSCII CFLAGS += -DWITH_PETSCII
ifeq ($(findstring WITH_80COL,$(DEFINES)),WITH_80COL)
LDFLAGS += c64-soft80.o
endif
ifeq ($(MAKECMDGOALS),disk) ifeq ($(MAKECMDGOALS),disk)
ifndef C1541 ifndef C1541
${error C1541 not defined! You must specify where VICE c1541 resides} ${error C1541 not defined! You must specify where VICE c1541 resides}

View file

@ -42,7 +42,11 @@
#define CTK_CONF_WIDGETUP_KEY CH_F5 #define CTK_CONF_WIDGETUP_KEY CH_F5
#define CTK_CONF_WIDGETDOWN_KEY CH_F7 #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) #define MOUSE_CONF_XTOC(x) ((x) / 8)
#endif
#define MOUSE_CONF_YTOC(y) ((y) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8)
#define BORDERCOLOR COLOR_BLACK #define BORDERCOLOR COLOR_BLACK
@ -55,21 +59,23 @@
#define WIDGETCOLOR_FWIN COLOR_GRAY3 #define WIDGETCOLOR_FWIN COLOR_GRAY3
#define WIDGETCOLOR_HLINK COLOR_CYAN #define WIDGETCOLOR_HLINK COLOR_CYAN
#define EMAIL_CONF_WIDTH 39 #if WITH_80COL
#define EMAIL_CONF_HEIGHT 20 #define IRC_CONF_WIDTH 80
#define EMAIL_CONF_ERASE 0 #else
#define FTP_CONF_WIDTH 18
#define FTP_CONF_HEIGHT 22
#define IRC_CONF_WIDTH 40 #define IRC_CONF_WIDTH 40
#endif
#define IRC_CONF_HEIGHT 24 #define IRC_CONF_HEIGHT 24
#ifndef TELNETD_CONF_MAX_IDLE_TIME #ifndef TELNETD_CONF_MAX_IDLE_TIME
#define TELNETD_CONF_MAX_IDLE_TIME 300 #define TELNETD_CONF_MAX_IDLE_TIME 300
#endif #endif
#if WITH_80COL
#define WWW_CONF_WEBPAGE_WIDTH 80
#else
#define WWW_CONF_WEBPAGE_WIDTH 40 #define WWW_CONF_WEBPAGE_WIDTH 40
#endif
#define WWW_CONF_WEBPAGE_HEIGHT 20
#define WWW_CONF_HISTORY_SIZE 4 #define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_WGET_EXEC(url) exec("wget", url) #define WWW_CONF_WGET_EXEC(url) exec("wget", url)

View file

@ -32,7 +32,7 @@
* *
*/ */
#include <string.h> #include <stdlib.h>
#include "contiki-net.h" #include "contiki-net.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
@ -79,6 +79,10 @@ main(void)
#endif /* WITH_ARGS */ #endif /* WITH_ARGS */
#if WITH_80COL
_heapadd((void *)0x0400, 0x0400);
#endif /* WITH_80COL */
process_init(); process_init();
#if 1 #if 1

View file

@ -2,19 +2,19 @@ EXAMPLESDIR=../../examples
TOOLSDIR=../../tools TOOLSDIR=../../tools
EXAMPLES = \ EXAMPLES = \
email/c64 \
ftp/c64 \
irc/c64 \ irc/c64 \
irc-80col/c64 \
telnet-server/c64 \ telnet-server/c64 \
wget/c64 \
webbrowser/c64 \ webbrowser/c64 \
webbrowser/c128 \ webbrowser-80col/c64 \
webbrowser/atarixl \
webbrowser/apple2enh \
webserver/c64 \ webserver/c64 \
webserver/c128 \ wget/c64 \
webserver/atarixl \ telnet-server/apple2enh \
webserver/apple2enh \ telnet-server/atarixl \
telnet-server/c128 \
webbrowser-80col/apple2enh \
webbrowser-80col/atarixl \
webbrowser-80col/c128 \
TOOLS= TOOLS=

View file

@ -71,8 +71,10 @@ $1-makes:
$(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1 $(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1
$(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1
$(MAKE) -C ../../examples/webbrowser TARGET=$1 $(MAKE) -C ../../examples/webbrowser TARGET=$1
$(MAKE) -C ../../examples/webbrowser-80col TARGET=$1
$(MAKE) -C ../../examples/wget TARGET=$1 $(MAKE) -C ../../examples/wget TARGET=$1
$(MAKE) -C ../../examples/irc 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/webserver TARGET=$1 HTTPD-CFS=1
$(MAKE) -C ../../examples/telnet-server TARGET=$1 $(MAKE) -C ../../examples/telnet-server TARGET=$1
endef endef
@ -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) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh 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) -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) -p $@ wget.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg 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) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh 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) -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 $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth 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 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) -p $@ ipconfig.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh 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) -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) -p $@ wget.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh 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) -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) -p $@ webserv.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys < $(CC65_HOME)/targetutil/loader.system java -jar $(AC) -p $@ telnetd.system sys < $(CC65_HOME)/targetutil/loader.system
@ -255,15 +257,15 @@ $(eval $(call makes,c64))
c64: contiki-c64.zip c64: contiki-c64.zip
contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64.d71 contiki-c64.d81 contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
contiki-c64-1.d64: c64-makes contiki-c64-1.d64: c64-makes
$(C1541) -format contiki-1,00 d64 $@ $(C1541) -format contiki-1,00 d64 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,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/lan91c96.eth lan91c96.eth,s
@ -273,6 +275,20 @@ contiki-c64-1.d64: c64-makes
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou pot.mou,s $(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou pot.mou,s
contiki-c64-2.d64: c64-makes contiki-c64-2.d64: c64-makes
$(C1541) -format contiki-2,00 d64 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p
$(C1541) -attach $@ -write ../c64/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 $(CC65_HOME)/mou/c64-1351.mou contiki.mou,s
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou inkwell.mou,s
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou joy.mou,s
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou pot.mou,s
contiki-c64-3.d64: c64-makes
$(C1541) -format contiki-3,00 d64 $@ $(C1541) -format contiki-3,00 d64 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
@ -295,8 +311,10 @@ contiki-c64.d71: c64-makes
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p $(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s
@ -316,8 +334,10 @@ contiki-c64.d81: c64-makes
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p $(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s
@ -342,9 +362,9 @@ contiki-c128-1.d64: c128-makes
$(C1541) -format contiki-1,00 d64 $@ $(C1541) -format contiki-1,00 d64 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,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/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 ../c128/default.cfg contiki.cfg,s $(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/cs8900a.eth cs8900a.eth,s
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s
@ -367,9 +387,9 @@ contiki-c128.d71: c128-makes
$(C1541) -format contiki,00 d71 $@ $(C1541) -format contiki,00 d71 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,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/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/webserver/webserver-example.c128 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s
@ -384,9 +404,9 @@ contiki-c128.d81: c128-makes
$(C1541) -format contiki,00 d81 $@ $(C1541) -format contiki,00 d81 $@
$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128 ethconfig,p
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,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/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/webserver/webserver-example.c128 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s

View file

@ -6,7 +6,7 @@ all:
compile: 6502 msp430 native avr arm compile: 6502 msp430 native avr arm
6502: c64.platform c128.platform apple2enh.platform atari.platform 6502: c64.platform c128.platform apple2enh.platform atarixl.platform
msp430: sky.platform esb.platform z1.platform msp430: sky.platform esb.platform z1.platform
native: native.platform minimal-net.platform native: native.platform minimal-net.platform
avr: avr-raven.platform avr: avr-raven.platform