From a24865de721e802a8f0f3b410876bfa0ca0a6ca7 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Fri, 17 Jan 2014 23:45:59 +0100 Subject: [PATCH] Add somewhat more support to use different mouse drivers. - The default mouse driver is now always named 'contiki.mou'. - Alternative mouse drivers are present in the disk images. - Users can select their mouse driver by renaming the files. --- cpu/6502/ctk/ctk-mouse.c | 2 +- platform/apple2enh/Makefile.apple2enh | 2 +- platform/c128/Makefile.c128 | 2 +- platform/c64/Makefile.c64 | 2 +- tools/6502/Makefile | 35 +++++++++++++++++++-------- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/cpu/6502/ctk/ctk-mouse.c b/cpu/6502/ctk/ctk-mouse.c index 0c63d5f8a..e578dfb0a 100644 --- a/cpu/6502/ctk/ctk-mouse.c +++ b/cpu/6502/ctk/ctk-mouse.c @@ -51,7 +51,7 @@ ctk_mouse_init(void) { struct mod_ctrl module_control = {cfs_read}; - module_control.callerdata = cfs_open(mouse_stddrv, CFS_READ); + module_control.callerdata = cfs_open("contiki.mou", CFS_READ); okay = module_control.callerdata >= 0; if(okay) { okay = mod_load(&module_control) == MLOAD_OK; diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh index 2ee17b0fc..ca1d45970 100644 --- a/platform/apple2enh/Makefile.apple2enh +++ b/platform/apple2enh/Makefile.apple2enh @@ -62,7 +62,7 @@ disk: all java -jar $(AC) -p contiki.dsk lan91c96.eth rel 0 < lan91c96.eth java -jar $(AC) -p contiki.dsk w5100.eth rel 0 < w5100.eth ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - java -jar $(AC) -p contiki.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p contiki.dsk contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou endif ifeq ($(HTTPD-CFS),1) java -jar $(AC) -p contiki.dsk index.htm bin 0 < httpd-cfs/index.htm diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128 index fa642ff7e..6b73ff04c 100644 --- a/platform/c128/Makefile.c128 +++ b/platform/c128/Makefile.c128 @@ -51,7 +51,7 @@ disk: all $(C1541) -attach contiki.d71 -write cs8900a.eth cs8900a.eth,s $(C1541) -attach contiki.d71 -write lan91c96.eth lan91c96.eth,s ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - $(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou,s + $(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou contiki.mou,s endif ifeq ($(HTTPD-CFS),1) $(C1541) -attach contiki.d71 -write httpd-cfs/index.htm index.htm,s diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64 index bec90e48d..ddc94d586 100644 --- a/platform/c64/Makefile.c64 +++ b/platform/c64/Makefile.c64 @@ -51,7 +51,7 @@ disk: all $(C1541) -attach contiki.d64 -write cs8900a.eth cs8900a.eth,s $(C1541) -attach contiki.d64 -write lan91c96.eth lan91c96.eth,s ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - $(C1541) -attach contiki.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,s + $(C1541) -attach contiki.d64 -write $(CC65_HOME)/mou/c64-1351.mou contiki.mou,s endif ifeq ($(HTTPD-CFS),1) $(C1541) -attach contiki.d64 -write httpd-cfs/index.htm index.htm,s diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 798cc56cb..390ce0968 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -86,7 +86,7 @@ contiki-apple2-1.dsk: apple2enh-makes 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 $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth - java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou contiki-apple2-2.dsk: apple2enh-makes cp ../apple2enh/prodos.dsk $@ @@ -103,7 +103,7 @@ contiki-apple2-2.dsk: apple2enh-makes 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 $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth - java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou contiki-apple2-3.dsk: apple2enh-makes cp ../apple2enh/prodos.dsk $@ @@ -120,7 +120,7 @@ contiki-apple2-3.dsk: apple2enh-makes 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 $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth - java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou contiki-apple2-4.dsk: apple2enh-makes cp ../apple2enh/prodos.dsk $@ @@ -137,7 +137,7 @@ contiki-apple2-4.dsk: apple2enh-makes 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 $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth - java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif @@ -170,7 +170,7 @@ contiki-apple2.2mg: apple2enh-makes 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 $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth - java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif @@ -268,7 +268,10 @@ contiki-c64-1.d64: c64-makes $(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 c64-1351.mou,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-2.d64: c64-makes $(C1541) -format contiki-2,00 d64 $@ @@ -280,7 +283,10 @@ contiki-c64-2.d64: c64-makes $(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 c64-1351.mou,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 $@ @@ -291,7 +297,10 @@ contiki-c64-3.d64: c64-makes $(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 c64-1351.mou,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 $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s @@ -312,7 +321,10 @@ contiki-c64.d71: c64-makes $(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 c64-1351.mou,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 $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s @@ -333,7 +345,10 @@ contiki-c64.d81: c64-makes $(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 c64-1351.mou,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 $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s