Module Name: src
Committed By: thorpej
Date: Wed Mar 6 06:30:49 UTC 2024
Modified Files:
src/sys/arch/alpha/alpha: mcclock.c mcclockvar.h
src/sys/arch/alpha/gbus: mcclock_gbus.c
src/sys/arch/alpha/isa: mcclock_isa.c
src/sys/arch/alpha/jensenio: mcclock_jensenio.c
src/sys/arch/alpha/tc: mcclock_ioasic.c
Log Message:
Wrap the mcclock driver's mc146818_softc inside a new mcclock_softc.
This commit represents no functional change, but forms the basis for
a future functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/alpha/mcclock.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/alpha/mcclockvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/gbus/mcclock_gbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/isa/mcclock_isa.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/jensenio/mcclock_jensenio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/tc/mcclock_ioasic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/mcclock.c
diff -u src/sys/arch/alpha/alpha/mcclock.c:1.21 src/sys/arch/alpha/alpha/mcclock.c:1.22
--- src/sys/arch/alpha/alpha/mcclock.c:1.21 Thu Oct 1 07:21:36 2020
+++ src/sys/arch/alpha/alpha/mcclock.c Wed Mar 6 06:30:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.21 2020/10/01 07:21:36 skrll Exp $ */
+/* $NetBSD: mcclock.c,v 1.22 2024/03/06 06:30:48 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.21 2020/10/01 07:21:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.22 2024/03/06 06:30:48 thorpej Exp $");
#include "opt_clock_compat_osf1.h"
@@ -69,8 +69,9 @@ static void mcclock_set_pcc_freq(struct
static void mcclock_init(void *);
void
-mcclock_attach(struct mc146818_softc *sc)
+mcclock_attach(struct mcclock_softc *msc)
{
+ struct mc146818_softc *sc = &msc->sc_mc146818;
sc->sc_year0 = 1900 + UNIX_YEAR_OFFSET;
sc->sc_flag = 0; /* BINARY, 24HR */
Index: src/sys/arch/alpha/alpha/mcclockvar.h
diff -u src/sys/arch/alpha/alpha/mcclockvar.h:1.5 src/sys/arch/alpha/alpha/mcclockvar.h:1.6
--- src/sys/arch/alpha/alpha/mcclockvar.h:1.5 Sat Jul 21 11:59:56 2007
+++ src/sys/arch/alpha/alpha/mcclockvar.h Wed Mar 6 06:30:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclockvar.h,v 1.5 2007/07/21 11:59:56 tsutsui Exp $ */
+/* $NetBSD: mcclockvar.h,v 1.6 2024/03/06 06:30:48 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -27,4 +27,13 @@
* rights to redistribute these changes.
*/
-void mcclock_attach(struct mc146818_softc *);
+#ifndef _ALPHA_ALPHA_MCCLOCKVAR_H_
+#define _ALPHA_ALPHA_MCCLOCKVAR_H_
+
+struct mcclock_softc {
+ struct mc146818_softc sc_mc146818;
+};
+
+void mcclock_attach(struct mcclock_softc *);
+
+#endif /* _ALPHA_ALPHA_MCCLOCKVAR_H_ */
Index: src/sys/arch/alpha/gbus/mcclock_gbus.c
diff -u src/sys/arch/alpha/gbus/mcclock_gbus.c:1.3 src/sys/arch/alpha/gbus/mcclock_gbus.c:1.4
--- src/sys/arch/alpha/gbus/mcclock_gbus.c:1.3 Wed Mar 6 05:44:44 2024
+++ src/sys/arch/alpha/gbus/mcclock_gbus.c Wed Mar 6 06:30:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_gbus.c,v 1.3 2024/03/06 05:44:44 thorpej Exp $ */
+/* $NetBSD: mcclock_gbus.c,v 1.4 2024/03/06 06:30:49 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_gbus.c,v 1.3 2024/03/06 05:44:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_gbus.c,v 1.4 2024/03/06 06:30:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_gbus
static int mcclock_gbus_match(device_t, cfdata_t, void *);
static void mcclock_gbus_attach(device_t, device_t, void *);
-CFATTACH_DECL_NEW(mcclock_gbus, sizeof(struct mc146818_softc),
+CFATTACH_DECL_NEW(mcclock_gbus, sizeof(struct mcclock_softc),
mcclock_gbus_match, mcclock_gbus_attach, NULL, NULL);
static void mcclock_gbus_write(struct mc146818_softc *, u_int, u_int);
@@ -74,7 +74,8 @@ mcclock_gbus_match(device_t parent, cfda
static void
mcclock_gbus_attach(device_t parent, device_t self, void *aux)
{
- struct mc146818_softc *sc = device_private(self);
+ struct mcclock_softc *msc = device_private(self);
+ struct mc146818_softc *sc = &msc->sc_mc146818;
struct gbus_attach_args *ga = aux;
sc->sc_dev = self;
@@ -88,7 +89,7 @@ mcclock_gbus_attach(device_t parent, dev
sc->sc_mcread = mcclock_gbus_read;
sc->sc_mcwrite = mcclock_gbus_write;
- mcclock_attach(sc);
+ mcclock_attach(msc);
}
static void
Index: src/sys/arch/alpha/isa/mcclock_isa.c
diff -u src/sys/arch/alpha/isa/mcclock_isa.c:1.21 src/sys/arch/alpha/isa/mcclock_isa.c:1.22
--- src/sys/arch/alpha/isa/mcclock_isa.c:1.21 Fri May 7 16:58:33 2021
+++ src/sys/arch/alpha/isa/mcclock_isa.c Wed Mar 6 06:30:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.21 2021/05/07 16:58:33 thorpej Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.22 2024/03/06 06:30:49 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.21 2021/05/07 16:58:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.22 2024/03/06 06:30:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
static int mcclock_isa_match(device_t, cfdata_t, void *);
static void mcclock_isa_attach(device_t, device_t, void *);
-CFATTACH_DECL_NEW(mcclock_isa, sizeof(struct mc146818_softc),
+CFATTACH_DECL_NEW(mcclock_isa, sizeof(struct mcclock_softc),
mcclock_isa_match, mcclock_isa_attach, NULL, NULL);
static void mcclock_isa_write(struct mc146818_softc *, u_int, u_int);
@@ -97,7 +97,8 @@ mcclock_isa_match(device_t parent, cfdat
static void
mcclock_isa_attach(device_t parent, device_t self, void *aux)
{
- struct mc146818_softc *sc = device_private(self);
+ struct mcclock_softc *msc = device_private(self);
+ struct mc146818_softc *sc = &msc->sc_mc146818;
struct isa_attach_args *ia = aux;
sc->sc_dev = self;
@@ -109,7 +110,7 @@ mcclock_isa_attach(device_t parent, devi
sc->sc_mcread = mcclock_isa_read;
sc->sc_mcwrite = mcclock_isa_write;
- mcclock_attach(sc);
+ mcclock_attach(msc);
}
static void
Index: src/sys/arch/alpha/jensenio/mcclock_jensenio.c
diff -u src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.11 src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.12
--- src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.11 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/jensenio/mcclock_jensenio.c Wed Mar 6 06:30:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_jensenio.c,v 1.11 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: mcclock_jensenio.c,v 1.12 2024/03/06 06:30:49 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_jensenio.c,v 1.11 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_jensenio.c,v 1.12 2024/03/06 06:30:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_jens
#include <alpha/alpha/mcclockvar.h>
struct mcclock_jensenio_softc {
- struct mc146818_softc sc_mc146818;
+ struct mcclock_softc sc_mcclock;
bus_space_handle_t sc_std_rtc_ioh;
};
@@ -109,7 +109,7 @@ mcclock_jensenio_attach(device_t parent,
{
struct mcclock_jensenio_softc *jsc = device_private(self);
struct jensenio_attach_args *ja = aux;
- struct mc146818_softc *sc = &jsc->sc_mc146818;
+ struct mc146818_softc *sc = &jsc->sc_mcclock.sc_mc146818;
sc->sc_dev = self;
sc->sc_bst = ja->ja_iot;
@@ -127,7 +127,7 @@ mcclock_jensenio_attach(device_t parent,
sc->sc_mcread = mcclock_jensenio_read;
sc->sc_mcwrite = mcclock_jensenio_write;
- mcclock_attach(sc);
+ mcclock_attach(&jsc->sc_mcclock);
}
static void
Index: src/sys/arch/alpha/tc/mcclock_ioasic.c
diff -u src/sys/arch/alpha/tc/mcclock_ioasic.c:1.18 src/sys/arch/alpha/tc/mcclock_ioasic.c:1.19
--- src/sys/arch/alpha/tc/mcclock_ioasic.c:1.18 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/tc/mcclock_ioasic.c Wed Mar 6 06:30:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ioasic.c,v 1.18 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: mcclock_ioasic.c,v 1.19 2024/03/06 06:30:49 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.18 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.19 2024/03/06 06:30:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -53,7 +53,7 @@ struct mcclock_ioasic_clockdatum {
};
struct mcclock_ioasic_softc {
- struct mc146818_softc sc_mc146818;
+ struct mcclock_softc sc_mcclock;
struct mcclock_ioasic_clockdatum *sc_dp;
};
@@ -83,7 +83,7 @@ mcclock_ioasic_attach(device_t parent, d
{
struct mcclock_ioasic_softc *isc = device_private(self);
struct ioasicdev_attach_args *ioasicdev = aux;
- struct mc146818_softc *sc = &isc->sc_mc146818;
+ struct mc146818_softc *sc = &isc->sc_mcclock.sc_mc146818;
/* XXX no bus_space(9) for TURBOchannel yet */
isc->sc_dp = (void *)ioasicdev->iada_addr;
@@ -93,7 +93,7 @@ mcclock_ioasic_attach(device_t parent, d
sc->sc_mcwrite = mcclock_ioasic_write;
/* call alpha common mcclock attachment */
- mcclock_attach(sc);
+ mcclock_attach(&isc->sc_mcclock);
}
static void
