Merge pull request #1150 from oliverschmidt/master

Several retrocomputing config changes.
This commit is contained in:
Oliver Schmidt 2015-07-06 09:42:55 +02:00
commit a0be26d9f1
9 changed files with 18 additions and 41 deletions

2
.gitignore vendored
View file

@ -80,7 +80,7 @@ contiki-cc2530dk.lib
*.S
*.eth
*.dsk
*.2mg
*.po
*.atr
*.d64
*.d71

View file

@ -1 +1 @@
DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,MTU_SIZE=1000
DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_REBOOT

View file

@ -41,7 +41,7 @@ LC_SOURCEFILES = process.c tcpip.c
ifeq ($(findstring WITH_REBOOT,$(DEFINES)),WITH_REBOOT)
LDFLAGS += -D __LCADDR__=0xD000 -D __LCSIZE__=0x1000
LC_SOURCEFILES += etimer.c
LC_SOURCEFILES += autostart.c timer.c uip_arch.c uiplib.c
endif
# Set a target-specific variable value

View file

@ -55,15 +55,8 @@
#define IRC_CONF_WIDTH 80
#define IRC_CONF_HEIGHT 23
#define WWW_CONF_WEBPAGE_WIDTH 80
#define WWW_CONF_WEBPAGE_HEIGHT 19
#define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_MAX_URLLEN 78
#define WWW_CONF_MAX_NUMPAGEWIDGETS 20
#define WWW_CONF_FORMS 1
#define WWW_CONF_MAX_FORMACTIONLEN 20
#define WWW_CONF_MAX_INPUTNAMELEN 20
#define WWW_CONF_MAX_INPUTVALUELEN 20
#define WWW_CONF_WGET_EXEC(url) exec("wget", url)
#endif /* CONTIKI_CONF_H_ */

View file

@ -63,11 +63,5 @@
#define WWW_CONF_WEBPAGE_WIDTH 40
#define WWW_CONF_WEBPAGE_HEIGHT 19
#define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_MAX_URLLEN 80
#define WWW_CONF_MAX_NUMPAGEWIDGETS 20
#define WWW_CONF_FORMS 1
#define WWW_CONF_MAX_FORMACTIONLEN 20
#define WWW_CONF_MAX_INPUTNAMELEN 20
#define WWW_CONF_MAX_INPUTVALUELEN 20
#endif /* CONTIKI_CONF_H_ */

View file

@ -65,11 +65,8 @@
#define IRC_CONF_WIDTH 80
#define IRC_CONF_HEIGHT 24
#define WWW_CONF_WEBPAGE_WIDTH 80
#define WWW_CONF_WEBPAGE_HEIGHT 20
#define WWW_CONF_HISTORY_SIZE 0
#define WWW_CONF_MAX_URLLEN 78
#define WWW_CONF_MAX_NUMPAGEWIDGETS 20
#define WWW_CONF_FORMS 0
#define WWW_CONF_PAGEATTRIB_SIZE 1500
#endif /* CONTIKI_CONF_H_ */

View file

@ -66,14 +66,7 @@
#define IRC_CONF_HEIGHT 24
#define WWW_CONF_WEBPAGE_WIDTH 40
#define WWW_CONF_WEBPAGE_HEIGHT 20
#define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_MAX_URLLEN 80
#define WWW_CONF_MAX_NUMPAGEWIDGETS 20
#define WWW_CONF_FORMS 1
#define WWW_CONF_MAX_FORMACTIONLEN 20
#define WWW_CONF_MAX_INPUTNAMELEN 20
#define WWW_CONF_MAX_INPUTVALUELEN 20
#define WWW_CONF_WGET_EXEC(url) exec("wget", url)
#endif /* CONTIKI_CONF_H_ */

View file

@ -66,7 +66,7 @@ endef
$(eval $(call makes,apple2enh))
apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.2mg
apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po
contiki-apple2-1.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
@ -121,8 +121,8 @@ contiki-apple2-3.dsk: apple2enh-makes
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
contiki-apple2.2mg: apple2enh-makes
cp ../apple2enh/prodos.2mg $@
contiki-apple2.po: apple2enh-makes
cp ../apple2enh/prodos.po $@
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ ethconfi.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ethconfi bin < ../../cpu/6502/ethconfig/ethconfig.apple2enh