diff options
Diffstat (limited to 'sys/arch/mvme68k/stand/sboot')
| -rw-r--r-- | sys/arch/mvme68k/stand/sboot/clock.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/sboot/etherfun.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/sboot/if_le.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/sboot/sboot.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/mvme68k/stand/sboot/clock.c b/sys/arch/mvme68k/stand/sboot/clock.c index 3da630d92b1..cfd70c846f6 100644 --- a/sys/arch/mvme68k/stand/sboot/clock.c +++ b/sys/arch/mvme68k/stand/sboot/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.4 1996/10/16 13:49:59 mickey Exp $ */ +/* $OpenBSD: clock.c,v 1.5 1997/01/29 07:58:35 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -106,7 +106,7 @@ chiptotime(sec, min, hour, day, mon, year) * Set up the system's time, given a `reasonable' time value. */ u_long -time() +ttime() { register struct clockreg *cl = clockreg; int sec, min, hour, day, mon, year; diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.c b/sys/arch/mvme68k/stand/sboot/etherfun.c index 7128320f141..cfdf24147e6 100644 --- a/sys/arch/mvme68k/stand/sboot/etherfun.c +++ b/sys/arch/mvme68k/stand/sboot/etherfun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: etherfun.c,v 1.3 1996/10/16 13:50:00 mickey Exp $ */ +/* $OpenBSD: etherfun.c,v 1.4 1997/01/29 07:58:37 deraadt Exp $ */ /* * @@ -105,7 +105,7 @@ do_send_tftp(mesgtype) if (mesgtype == 0) { tot = tftp_r + (sizeof(MSG) - 1); - myport = (u_short) time(); + myport = (u_short) ttime(); if (myport < 1000) myport += 1000; servport = FTP_PORT; /* to start */ diff --git a/sys/arch/mvme68k/stand/sboot/if_le.c b/sys/arch/mvme68k/stand/sboot/if_le.c index 2adc5626747..c76ef5fa1ac 100644 --- a/sys/arch/mvme68k/stand/sboot/if_le.c +++ b/sys/arch/mvme68k/stand/sboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.4 1996/10/16 13:50:01 mickey Exp $ */ +/* $OpenBSD: if_le.c,v 1.5 1997/01/29 07:58:38 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -292,11 +292,11 @@ le_get(pkt, len, timeout) { int cc; int now, then; - int stopat = time() + timeout; + int stopat = ttime() + timeout; then = 0; cc = 0; - while ((now = time()) < stopat && !cc) { + while ((now = ttime()) < stopat && !cc) { cc = le_poll(pkt, len); if (then != now) { #ifdef LE_DEBUG diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h index ada208b9a16..10db9e19a92 100644 --- a/sys/arch/mvme68k/stand/sboot/sboot.h +++ b/sys/arch/mvme68k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.4 1996/10/16 13:50:02 mickey Exp $ */ +/* $OpenBSD: sboot.h,v 1.5 1997/01/29 07:58:39 deraadt Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -66,7 +66,7 @@ int do_get_file __P((void)); void tftp_file __P((char *, u_long)); /* clock */ -u_long time __P((void)); +u_long ttime __P((void)); /* checksum */ u_long oc_cksum __P((void *, u_long, u_long)); |