patch-2.4.0-test9 linux/arch/ppc/amiga/time.c
Next file: linux/arch/ppc/chrpboot/Makefile
Previous file: linux/arch/ppc/8xx_io/fec.c
Back to the patch index
Back to the overall index
- Lines: 50
- Date:
Mon Sep 11 08:39:48 2000
- Orig file:
v2.4.0-test8/linux/arch/ppc/amiga/time.c
- Orig date:
Thu Oct 7 10:17:08 1999
diff -u --recursive --new-file v2.4.0-test8/linux/arch/ppc/amiga/time.c linux/arch/ppc/amiga/time.c
@@ -11,10 +11,6 @@
#include <linux/timex.h>
-static inline unsigned long mktime(unsigned int year, unsigned int mon,
- unsigned int day, unsigned int hour,
- unsigned int min, unsigned int sec);
-
unsigned long m68k_get_rtc_time(void)
{
unsigned int year, mon, day, hour, min, sec;
@@ -36,38 +32,6 @@
return mach_set_clock_mmss (nowtime);
return -1;
}
-
-/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
- * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
- * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
- *
- * [For the Julian calendar (which was used in Russia before 1917,
- * Britain & colonies before 1752, anywhere else before 1582,
- * and is still in use by some communities) leave out the
- * -year/100+year/400 terms, and add 10.]
- *
- * This algorithm was first published by Gauss (I think).
- *
- * WARNING: this function will overflow on 2106-02-07 06:28:16 on
- * machines were long is 32-bit! (However, as time_t is signed, we
- * will already get problems at other places on 2038-01-19 03:14:08)
- */
-static inline unsigned long mktime(unsigned int year, unsigned int mon,
- unsigned int day, unsigned int hour,
- unsigned int min, unsigned int sec)
-{
- if (0 >= (int) (mon -= 2)) { /* 1..12 -> 11,12,1..10 */
- mon += 12; /* Puts Feb last since it has leap day */
- year -= 1;
- }
- return (((
- (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12 + day) +
- year*365 - 719499
- )*24 + hour /* now have hours */
- )*60 + min /* now have minutes */
- )*60 + sec; /* finally seconds */
-}
-
void apus_heartbeat (void)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)