Revert to static Ethernet driver for the ATARI.
After all there's no momentum for a W5100-based Ethernet solution on the ATARI. So I revert to static linkage of the CS8900A driver as this improves program load times.
This commit is contained in:
parent
7b7781360f
commit
a6472c8dd9
5 changed files with 14 additions and 17 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 = ÐERNET;
|
||||
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 */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue