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

Merge pull request #522 from oliverschmidt/master

Browse source 
Added mouse support for the Atari.
This commit is contained in:
Oliver Schmidt 2014-01-20 14:26:52 -08:00
parent 38cadabebb 510678bed0
commit 792d60f03e
8 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/6502/ipconfig/Makefile.atarixl.defines
View file

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

2
examples/email/Makefile.atarixl.defines
View file

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

2
examples/ftp/Makefile.atarixl.defines
View file

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

2
examples/irc/Makefile.atarixl.defines
View file

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

2
examples/webbrowser/Makefile.atarixl.defines
View file

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

3
platform/atarixl/Makefile.atarixl
View file

@ -54,6 +54,9 @@ disk: all
cp $(CONTIKI_PROJECT).$(TARGET) atr/autorun.sys cp $(CONTIKI_PROJECT).$(TARGET) atr/autorun.sys
cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg
cp cs8900a.eth atr/cs8900a.eth cp cs8900a.eth atr/cs8900a.eth
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
endif
ifeq ($(HTTPD-CFS),1) ifeq ($(HTTPD-CFS),1)
cp httpd-cfs/index.htm atr/index.htm cp httpd-cfs/index.htm atr/index.htm
cp httpd-cfs/backgrnd.gif atr/backgrnd.gif cp httpd-cfs/backgrnd.gif atr/backgrnd.gif

3
platform/atarixl/contiki-conf.h
View file

@ -42,6 +42,9 @@
#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 MOUSE_CONF_XTOC(x) ((x) / 8)
#define MOUSE_CONF_YTOC(y) ((y) / 8)
#define textcolor(color) COLOR_WHITE #define textcolor(color) COLOR_WHITE
#define BORDERCOLOR COLOR_BLACK #define BORDERCOLOR COLOR_BLACK

25
tools/6502/Makefile
View file

@ -189,6 +189,11 @@ contiki-atari-1.atr: atarixl-makes
cp ../../examples/wget/wget.atarixl atr/wget.com cp ../../examples/wget/wget.atarixl atr/wget.com
cp ../atarixl/default.cfg atr/contiki.cfg cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_HOME)/mou/atrxami.mou atr/ami.mou
cp $(CC65_HOME)/mou/atrxjoy.mou atr/joy.mou
cp $(CC65_HOME)/mou/atrxtrk.mou atr/trk.mou
cp $(CC65_HOME)/mou/atrxtt.mou atr/tt.mou
$(DIR2ATR) -b Dos25 1040 $@ atr $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr rm -r atr
@ -201,6 +206,11 @@ contiki-atari-2.atr: atarixl-makes
cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atarixl/breadbox64.atarixl atr/breadbox.com cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atarixl/breadbox64.atarixl atr/breadbox.com
cp ../atarixl/default.cfg atr/contiki.cfg cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_HOME)/mou/atrxami.mou atr/ami.mou
cp $(CC65_HOME)/mou/atrxjoy.mou atr/joy.mou
cp $(CC65_HOME)/mou/atrxtrk.mou atr/trk.mou
cp $(CC65_HOME)/mou/atrxtt.mou atr/tt.mou
$(DIR2ATR) -b Dos25 1040 $@ atr $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr rm -r atr
@ -213,6 +223,11 @@ contiki-atari-3.atr: atarixl-makes
cp ../../examples/ftp/ftp-client.atarixl atr/ftp.com cp ../../examples/ftp/ftp-client.atarixl atr/ftp.com
cp ../atarixl/default.cfg atr/contiki.cfg cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_HOME)/mou/atrxami.mou atr/ami.mou
cp $(CC65_HOME)/mou/atrxjoy.mou atr/joy.mou
cp $(CC65_HOME)/mou/atrxtrk.mou atr/trk.mou
cp $(CC65_HOME)/mou/atrxtt.mou atr/tt.mou
$(DIR2ATR) -b Dos25 1040 $@ atr $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr rm -r atr
@ -225,6 +240,11 @@ contiki-atari-4.atr: atarixl-makes
cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
cp ../atarixl/default.cfg atr/contiki.cfg cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_HOME)/mou/atrxami.mou atr/ami.mou
cp $(CC65_HOME)/mou/atrxjoy.mou atr/joy.mou
cp $(CC65_HOME)/mou/atrxtrk.mou atr/trk.mou
cp $(CC65_HOME)/mou/atrxtt.mou atr/tt.mou
cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif
@ -247,6 +267,11 @@ contiki-atari.atr: atarixl-makes
cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
cp ../atarixl/default.cfg atr/contiki.cfg cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_HOME)/mou/atrxami.mou atr/ami.mou
cp $(CC65_HOME)/mou/atrxjoy.mou atr/joy.mou
cp $(CC65_HOME)/mou/atrxtrk.mou atr/trk.mou
cp $(CC65_HOME)/mou/atrxtt.mou atr/tt.mou
cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif