diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-01-28 17:52:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-01-28 17:52:10 +0000 |
| commit | 93ada84f7885794f61fccaca02a2f5b4767fde71 (patch) | |
| tree | 653688d48f5a77313986d05f85dceb27908d8280 | |
| parent | 2003-01-28 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-93ada84f7885794f61fccaca02a2f5b4767fde71.tar.bz2 | |
2003-01-28 Joel Sherrill <joel@OARcorp.com>
* include/DP8570A.h, include/bsp.h, start/start.c,
startup/efi68k_tcp.c: Rename tcp_init() to bsp_tcp_init()
to avoid conflict with TCP/IP stack internal routine.
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi68k/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi68k/include/DP8570A.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi68k/include/bsp.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi68k/start/start.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/efi68k/startup/efi68k_tcp.c | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog index 2ab27f983d..60344d258e 100644 --- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog @@ -1,3 +1,9 @@ +2003-01-28 Joel Sherrill <joel@OARcorp.com> + + * include/DP8570A.h, include/bsp.h, start/start.c, + startup/efi68k_tcp.c: Rename tcp_init() to bsp_tcp_init() + to avoid conflict with TCP/IP stack internal routine. + 2003-01-20 Joel Sherrill <joel@OARcorp.com> * startup/linkcmds*: Add FreeBSD sysctl() sections. diff --git a/c/src/lib/libbsp/m68k/efi68k/include/DP8570A.h b/c/src/lib/libbsp/m68k/efi68k/include/DP8570A.h index 8739a4a793..5cf9b47314 100644 --- a/c/src/lib/libbsp/m68k/efi68k/include/DP8570A.h +++ b/c/src/lib/libbsp/m68k/efi68k/include/DP8570A.h @@ -270,6 +270,6 @@ extern struct clock_ram * const tcp_power_down; extern struct clock_counters * const tcp_clock; extern struct clock_ram * const tcp_save_ram; -void tcp_init(void); +void bsp_tcp_init(void); #endif /* _DP8570A_H_ */ diff --git a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h index bcee50c305..fdf84aad25 100644 --- a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h +++ b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h @@ -156,7 +156,7 @@ void console_init(void); void watch_dog_init(void); -void tcp_init(void); +void bsp_tcp_init(void); void Spurious_Initialize(void); diff --git a/c/src/lib/libbsp/m68k/efi68k/start/start.c b/c/src/lib/libbsp/m68k/efi68k/start/start.c index 45ddb63abb..850533cf17 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start/start.c +++ b/c/src/lib/libbsp/m68k/efi68k/start/start.c @@ -59,7 +59,7 @@ void boot_card(); Spurious_Initialize(); console_init(); watch_dog_init(); - tcp_init(); + bsp_tcp_init(); /* * Execute main with arguments argv and environment env diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_tcp.c b/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_tcp.c index 6173f6d706..5eeef21ac6 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_tcp.c +++ b/c/src/lib/libbsp/m68k/efi68k/startup/efi68k_tcp.c @@ -41,7 +41,7 @@ void tcp_delay(int count) for (i=0;i<count/4;i++); } -void tcp_init() +void bsp_tcp_init() { unsigned char low_bat, osc_fail, power_up; unsigned char mon, dom, hrs, min, sec; @@ -164,7 +164,7 @@ void tcp_init() Vcc,.... *except* for battery switched on for the first time before power up in which case the chip will still be in single suppy mode till restarted (a - second call to tcp_init such as when the time is set + second call to bsp_tcp_init such as when the time is set or a reboot.) The timer/clock itself should always be completely functional regardless of the supply mode. */ |