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

Merge pull request #2091 from oliverschmidt/master

Browse source 
Revert to static Ethernet driver for the ATARI.
This commit is contained in:
Oliver Schmidt 2017-01-27 11:34:44 +01:00 committed by GitHub
parent 7b7781360f a6472c8dd9
commit 8248f524f5
5 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/6502/README.md
View file

@ -40,9 +40,9 @@ high-level configuration macros may be set:
- Default: 2
- Purpose: Set the maximum number of concurrent TCP connections.
- ETHERNET
- STATIC_DRIVER
- Default: N/A
- Purpose: Link Ethernet driver statically instead of loading it dynamically
- Purpose: Link device driver statically instead of loading it dynamically
using the network configuration file.
- WITH_LOGGING

6
cpu/6502/lib/config.c
View file

@ -90,15 +90,15 @@ config_read(char *filename)
log_message("Def. Router: ", ipaddrtoa(&config.draddr, uip_buf));
log_message("DNS Server: ", ipaddrtoa(&config.resolvaddr, uip_buf));
#ifndef ETHERNET
#ifndef STATIC_DRIVER
log_message("Eth. Driver: ", config.ethernetcfg.name);
#else /* !ETHERNET */
#else /* !STATIC_DRIVER */
#define _stringize(arg) #arg
#define stringize(arg) _stringize(arg)
log_message("Eth. Driver: ", stringize(ETHERNET));
#undef _stringize
#undef stringize
#endif /* !ETHERNET */
#endif /* !STATIC_DRIVER */
log_message("Driver Port: $", utoa(config.ethernetcfg.addr, uip_buf, 16));
uip_sethostaddr(&config.hostaddr);

14
cpu/6502/net/ethernet.c
View file

@ -63,7 +63,7 @@ ethernet_init(struct ethernet_config *config)
{
static const char signature[4] = {0x65, 0x74, 0x68, 0x01};
#ifndef ETHERNET
#ifndef STATIC_DRIVER
struct mod_ctrl module_control = {cfs_read};
uint8_t byte;
@ -91,13 +91,13 @@ ethernet_init(struct ethernet_config *config)
}
}
#else /* !ETHERNET */
#else /* !STATIC_DRIVER */
extern void ETHERNET;
extern void STATIC_DRIVER;
module = &ETHERNET;
module = &STATIC_DRIVER;
#endif /* !ETHERNET */
#endif /* !STATIC_DRIVER */
module->buffer = uip_buf;
module->buffer_size = UIP_BUFSIZE;
@ -126,8 +126,8 @@ ethernet_exit(void)
{
module->exit();
#ifndef ETHERNET
#ifndef STATIC_DRIVER
mod_free(module);
#endif /* !ETHERNET */
#endif /* !STATIC_DRIVER */
}
/*---------------------------------------------------------------------------*/

3
platform/atarixl/Makefile.atarixl
View file

@ -31,6 +31,8 @@
# Author: Oliver Schmidt <ol.sc@web.de>
#
DEFINES += STATIC_DRIVER=cs8900a
CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502
@ -53,7 +55,6 @@ disk: all
cp $(CONTIKI)/tools/$(TARGET)/dos25/dup.sys atr/dup.sys
cp $(CONTIKI_PROJECT).$(TARGET) atr/autorun.sys
cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg
cp cs8900a.eth atr/cs8900a.eth
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou atr/contiki.mou
endif

4
tools/6502/Makefile
View file

@ -189,7 +189,6 @@ contiki-atari-1.atr: atarixl-makes
cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
cp ../../examples/wget/wget.atarixl atr/wget.com
cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
@ -205,7 +204,6 @@ contiki-atari-2.atr: atarixl-makes
cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
cp ../../examples/irc/irc-client.atarixl atr/irc.com
cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
@ -222,7 +220,6 @@ contiki-atari-3.atr: atarixl-makes
cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
@ -246,7 +243,6 @@ contiki-atari.atr: atarixl-makes
cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
cp ../atarixl/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ethconfig/cs8900a.eth atr/cs8900a.eth
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou