Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename clockattach() to todr_attach().

This commit is contained in:
tsutsui 2003-07-19 02:39:27 +00:00
parent 5d2194fdc0
commit 7d2ff25d49
3 changed files with 7 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/hp300/dev/rtc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtc.c,v 1.7 2003/07/05 16:48:12 tsutsui Exp $ */
/* $NetBSD: rtc.c,v 1.8 2003/07/19 02:39:27 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2003/07/05 16:48:12 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.8 2003/07/19 02:39:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2003/07/05 16:48:12 tsutsui Exp $");
#include <hp300/dev/rtcreg.h>
#include <dev/clock_subr.h>
#include <hp300/hp300/clockvar.h>
struct rtc_softc {
struct device sc_dev;
@ -125,7 +124,7 @@ rtcattach(parent, self, aux)
todr_handle->todr_setcal = rtc_setcal;
todr_handle->todr_setwen = NULL;
clockattach(todr_handle);
todr_attach(todr_handle);
}
static int

9
sys/arch/hp300/hp300/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.27 2002/03/15 05:55:37 gmcgarry Exp $ */
/* $NetBSD: clock.c,v 1.28 2003/07/19 02:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.27 2002/03/15 05:55:37 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.28 2003/07/19 02:39:28 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.27 2002/03/15 05:55:37 gmcgarry Exp $");
#include <dev/clock_subr.h>
#include <hp300/hp300/clockreg.h>
#include <hp300/hp300/clockvar.h>
#ifdef GPROF
#include <sys/gmon.h>
@ -91,10 +90,10 @@ static int timer3min; /* current, from above choices */
static int statprev; /* previous value in stat timer */
void
clockattach(todr_chip_handle_t handle)
todr_attach(todr_chip_handle_t handle)
{
if (todr_handle != NULL)
panic("clockattach: multiple clocks");
panic("todr_attach: multiple clocks");
todr_handle = handle;
}

39
sys/arch/hp300/hp300/clockvar.h
View File

@ -1,39 +0,0 @@
/* $NetBSD: clockvar.h,v 1.1 2001/11/17 23:51:03 gmcgarry Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Gregory McGarry.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
void clockattach(todr_chip_handle_t handle);