From 69317ad1db82cfd60846d967e8cbc109b621aef6 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Fri, 1 Feb 2013 21:20:21 +0100 Subject: [PATCH] Renamed retro 'dhcp-client' to 'ipconfig' as it can as well be used for interactive manual configuration. --- cpu/6502/{dhcp => ipconfig}/Makefile | 2 +- .../Makefile.apple2enh.defines | 0 .../{dhcp => ipconfig}/Makefile.atari.defines | 0 .../{dhcp => ipconfig}/Makefile.c128.defines | 0 .../{dhcp => ipconfig}/Makefile.c64.defines | 0 cpu/6502/{dhcp => ipconfig}/Makefile.target | 0 .../dhcp-client.c => ipconfig/ipconfig.c} | 4 +- tools/6502/Makefile | 70 +++++++++---------- 8 files changed, 38 insertions(+), 38 deletions(-) rename cpu/6502/{dhcp => ipconfig}/Makefile (72%) rename cpu/6502/{dhcp => ipconfig}/Makefile.apple2enh.defines (100%) rename cpu/6502/{dhcp => ipconfig}/Makefile.atari.defines (100%) rename cpu/6502/{dhcp => ipconfig}/Makefile.c128.defines (100%) rename cpu/6502/{dhcp => ipconfig}/Makefile.c64.defines (100%) rename cpu/6502/{dhcp => ipconfig}/Makefile.target (100%) rename cpu/6502/{dhcp/dhcp-client.c => ipconfig/ipconfig.c} (98%) diff --git a/cpu/6502/dhcp/Makefile b/cpu/6502/ipconfig/Makefile similarity index 72% rename from cpu/6502/dhcp/Makefile rename to cpu/6502/ipconfig/Makefile index caedebd0a..a946180a2 100644 --- a/cpu/6502/dhcp/Makefile +++ b/cpu/6502/ipconfig/Makefile @@ -1,4 +1,4 @@ -CONTIKI_PROJECT = dhcp-client +CONTIKI_PROJECT = ipconfig all: $(CONTIKI_PROJECT) CONTIKI = ../../.. diff --git a/cpu/6502/dhcp/Makefile.apple2enh.defines b/cpu/6502/ipconfig/Makefile.apple2enh.defines similarity index 100% rename from cpu/6502/dhcp/Makefile.apple2enh.defines rename to cpu/6502/ipconfig/Makefile.apple2enh.defines diff --git a/cpu/6502/dhcp/Makefile.atari.defines b/cpu/6502/ipconfig/Makefile.atari.defines similarity index 100% rename from cpu/6502/dhcp/Makefile.atari.defines rename to cpu/6502/ipconfig/Makefile.atari.defines diff --git a/cpu/6502/dhcp/Makefile.c128.defines b/cpu/6502/ipconfig/Makefile.c128.defines similarity index 100% rename from cpu/6502/dhcp/Makefile.c128.defines rename to cpu/6502/ipconfig/Makefile.c128.defines diff --git a/cpu/6502/dhcp/Makefile.c64.defines b/cpu/6502/ipconfig/Makefile.c64.defines similarity index 100% rename from cpu/6502/dhcp/Makefile.c64.defines rename to cpu/6502/ipconfig/Makefile.c64.defines diff --git a/cpu/6502/dhcp/Makefile.target b/cpu/6502/ipconfig/Makefile.target similarity index 100% rename from cpu/6502/dhcp/Makefile.target rename to cpu/6502/ipconfig/Makefile.target diff --git a/cpu/6502/dhcp/dhcp-client.c b/cpu/6502/ipconfig/ipconfig.c similarity index 98% rename from cpu/6502/dhcp/dhcp-client.c rename to cpu/6502/ipconfig/ipconfig.c index 8a4914338..d92158bac 100644 --- a/cpu/6502/dhcp/dhcp-client.c +++ b/cpu/6502/ipconfig/ipconfig.c @@ -70,7 +70,7 @@ static struct ctk_button savebutton = static struct ctk_button cancelbutton = {CTK_BUTTON(20, 13, 6, "Cancel")}; -PROCESS(dhcp_process, "DHCP client"); +PROCESS(dhcp_process, "IP Config"); AUTOSTART_PROCESSES(&dhcp_process); @@ -178,7 +178,7 @@ PROCESS_THREAD(dhcp_process, ev, data) { PROCESS_BEGIN(); - ctk_window_new(&window, 29, 14, "DHCP client"); + ctk_window_new(&window, 29, 14, "IP Config"); CTK_WIDGET_ADD(&window, &requestbutton); CTK_WIDGET_ADD(&window, &statuslabel); diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 48a8996f3..a4bbbc63e 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -60,7 +60,7 @@ disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk apple2enh-4-disk \ define makes $1-makes: - $(MAKE) -C ../../cpu/6502/dhcp TARGET=$1 + $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 $(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 $(MAKE) -C ../../examples/webbrowser TARGET=$1 $(MAKE) -C ../../examples/wget TARGET=$1 @@ -76,14 +76,14 @@ apple2enh-1-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-1.dsk java -jar $(AC) -p contiki-1.dsk contiki.cfg bin 0 < dummy.cfg java -jar $(AC) -p contiki-1.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-1.dsk dhcp.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-1.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh + java -jar $(AC) -p contiki-1.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-1.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p contiki-1.dsk webserve.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-1.dsk webserve bin < ../../examples/webserver/webserver-example.apple2enh java -jar $(AC) -p contiki-1.dsk webbrows.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-1.dsk webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh - java -jar $(AC) -p contiki-1.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth - java -jar $(AC) -p contiki-1.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth + java -jar $(AC) -p contiki-1.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-1.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth java -jar $(AC) -p contiki-1.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou java -jar $(AC) -p contiki-1.dsk index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm java -jar $(AC) -p contiki-1.dsk backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif @@ -94,40 +94,40 @@ apple2enh-2-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-2.dsk java -jar $(AC) -p contiki-2.dsk contiki.cfg bin 0 < dummy.cfg java -jar $(AC) -p contiki-2.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-2.dsk dhcp.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-2.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh + java -jar $(AC) -p contiki-2.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-2.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p contiki-2.dsk wget.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-2.dsk wget bin < ../../examples/wget/wget.apple2enh java -jar $(AC) -p contiki-2.dsk irc.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-2.dsk irc bin < ../../examples/irc/irc-client.apple2enh - java -jar $(AC) -p contiki-2.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth - java -jar $(AC) -p contiki-2.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth + java -jar $(AC) -p contiki-2.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-2.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth java -jar $(AC) -p contiki-2.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou apple2enh-3-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-3.dsk java -jar $(AC) -p contiki-3.dsk contiki.cfg bin 0 < dummy.cfg java -jar $(AC) -p contiki-3.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-3.dsk dhcp.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-3.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh + java -jar $(AC) -p contiki-3.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-3.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p contiki-3.dsk email.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-3.dsk email bin < ../../examples/email/email-client.apple2enh java -jar $(AC) -p contiki-3.dsk ftp.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-3.dsk ftp bin < ../../examples/ftp/ftp-client.apple2enh - java -jar $(AC) -p contiki-3.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth - java -jar $(AC) -p contiki-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth + java -jar $(AC) -p contiki-3.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth java -jar $(AC) -p contiki-3.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou apple2enh-4-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-4.dsk java -jar $(AC) -p contiki-4.dsk contiki.cfg bin 0 < dummy.cfg java -jar $(AC) -p contiki-4.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-4.dsk dhcp.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-4.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh + java -jar $(AC) -p contiki-4.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-4.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh java -jar $(AC) -p contiki-4.dsk breadbox.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-4.dsk breadbox bin < ../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh - java -jar $(AC) -p contiki-4.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth - java -jar $(AC) -p contiki-4.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth + java -jar $(AC) -p contiki-4.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-4.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth java -jar $(AC) -p contiki-4.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou $(eval $(call makes,c64)) @@ -135,13 +135,13 @@ $(eval $(call makes,c64)) c64-1-disk: c64-makes $(C1541) -format contiki,00 d64 contiki-1.d64 $(C1541) -attach contiki-1.d64 -write dummy.cfg contiki.cfg,u - $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/dhcp/dhcp-client.c64 dhcp,p + $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/webserver-example.c64 webserver,p $(C1541) -attach contiki-1.d64 -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p $(C1541) -attach contiki-1.d64 -write ../../examples/wget/wget.c64 wget,p $(C1541) -attach contiki-1.d64 -write ../../examples/irc/irc-client.c64 irc,p - $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u $(C1541) -attach contiki-1.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u @@ -151,12 +151,12 @@ c64-1-disk: c64-makes c64-2-disk: c64-makes $(C1541) -format contiki,00 d64 contiki-2.d64 $(C1541) -attach contiki-2.d64 -write dummy.cfg contiki.cfg,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/dhcp-client.c64 dhcp,p + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(C1541) -attach contiki-2.d64 -write ../../examples/email/email-client.c64 email,p $(C1541) -attach contiki-2.d64 -write ../../examples/ftp/ftp-client.c64 ftp,p $(C1541) -attach contiki-2.d64 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u $(C1541) -attach contiki-2.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u $(eval $(call makes,c128)) @@ -164,7 +164,7 @@ $(eval $(call makes,c128)) c128-1-disk: c128-makes $(C1541) -format contiki,00 d71 contiki-1.d71 $(C1541) -attach contiki-1.d71 -write dummy.cfg contiki.cfg,u - $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/dhcp-client.c128 dhcp,p + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p $(C1541) -attach contiki-1.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p $(C1541) -attach contiki-1.d71 -write ../../examples/wget/wget.c128 wget,p @@ -172,8 +172,8 @@ c128-1-disk: c128-makes $(C1541) -attach contiki-1.d71 -write ../../examples/email/email-client.c128 email,p $(C1541) -attach contiki-1.d71 -write ../../examples/ftp/ftp-client.c128 ftp,p $(C1541) -attach contiki-1.d71 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p - $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u $(C1541) -attach contiki-1.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou,u $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u @@ -187,7 +187,7 @@ atari-1-disk: atari-makes cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys cp dummy.cfg atr/contiki.cfg - cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com + cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/webserver/webserver-example.atari atr/webserve.com cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm @@ -199,12 +199,12 @@ atari-1-disk: atari-makes atari-2-disk: atari-makes mkdir -p atr - cp ../atari/dos.sys atr/dos.sys - cp ../atari/dup.sys atr/dup.sys - cp dummy.cfg atr/contiki.cfg - cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com - cp ../../examples/wget/wget.atari atr/wget.com - cp ../../examples/irc/irc-client.atari atr/irc.com + cp ../atari/dos.sys atr/dos.sys + cp ../atari/dup.sys atr/dup.sys + cp dummy.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com + cp ../../examples/wget/wget.atari atr/wget.com + cp ../../examples/irc/irc-client.atari atr/irc.com $(DIR2ATR) -b Dos25 1040 contiki-2.atr atr rm -r atr @@ -213,7 +213,7 @@ atari-3-disk: atari-makes cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys cp dummy.cfg atr/contiki.cfg - cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com + cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/email/email-client.atari atr/email.com cp ../../examples/ftp/ftp-client.atari atr/ftp.com $(DIR2ATR) -b Dos25 1040 contiki-3.atr atr @@ -224,7 +224,7 @@ atari-4-disk: atari-makes cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys cp dummy.cfg atr/contiki.cfg - cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com + cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com $(DIR2ATR) -b Dos25 1040 contiki-4.atr atr rm -r atr