diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2010-08-10 02:06:44 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2010-08-10 02:06:44 +0000 |
| commit | 35beca4905c308d6cf85c7986431b130e44721bd (patch) | |
| tree | 8dbd68686e296df513b4a12143dbac99ea9eff4f /sys/arch | |
| parent | b2368139f7d075bf7204ebb07e9baf5497b643af (diff) | |
Someone went nuts with spaces and tabs. No binary change.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/isa/clock.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c index 3d74e902e19..5980edd031b 100644 --- a/sys/arch/amd64/isa/clock.c +++ b/sys/arch/amd64/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.15 2010/07/29 13:36:30 kettenis Exp $ */ +/* $OpenBSD: clock.c,v 1.16 2010/08/10 02:06:43 marco Exp $ */ /* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -35,28 +35,28 @@ * * @(#)clock.c 7.2 (Berkeley) 5/12/91 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -108,7 +108,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dev/ic/i8253reg.h> #include <amd64/isa/nvram.h> #include <dev/clock_subr.h> -#include <machine/specialreg.h> +#include <machine/specialreg.h> /* Timecounter on the i8254 */ u_int32_t i8254_lastcount; @@ -128,7 +128,7 @@ int gettick(void); void rtcdrain(void *v); int rtcget(mc_todregs *); void rtcput(mc_todregs *); -int bcdtobin(int); +int bcdtobin(int); int bintobcd(int); __inline u_int mc146818_read(void *, u_int); @@ -350,7 +350,7 @@ rtcget(mc_todregs *regs) return (-1); MC146818_GETTOD(NULL, regs); /* XXX softc */ return (0); -} +} void rtcput(mc_todregs *regs) @@ -505,7 +505,7 @@ inittodr(time_t base) dt.dt_year = clock_expandyear(bcdtobin(rtclk[MC_YEAR])); /* - * If time_t is 32 bits, then the "End of Time" is + * If time_t is 32 bits, then the "End of Time" is * Mon Jan 18 22:14:07 2038 (US/Eastern) * This code copes with RTC's past the end of time if time_t * is an int32 or less. Needed because sometimes RTCs screw |