Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/dev Pull up following revision(s) (requested by riast...
details: https://anonhg.NetBSD.org/src/rev/ef0753e85a46
branches: netbsd-9
changeset: 369726:ef0753e85a46
user: martin <martin%NetBSD.org@localhost>
date: Mon Aug 29 15:48:30 2022 +0000
description:
Pull up following revision(s) (requested by riastradh in ticket #1505):
sys/dev/isa/tpm_isa.c: revision 1.8
sys/dev/ic/tpm.c: revision 1.20
Add missing printing-of-newlines in the attach routine.
Remove extra newline from boot messages (isa and acpi front-ends
already provide the newline).
diffstat:
sys/dev/ic/tpm.c | 7 ++-----
sys/dev/isa/tpm_isa.c | 7 +++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (56 lines):
diff -r 6863297233a4 -r ef0753e85a46 sys/dev/ic/tpm.c
--- a/sys/dev/ic/tpm.c Mon Aug 29 15:45:10 2022 +0000
+++ b/sys/dev/ic/tpm.c Mon Aug 29 15:48:30 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.13.2.2 2022/08/03 16:00:47 martin Exp $ */
+/* $NetBSD: tpm.c,v 1.13.2.3 2022/08/29 15:48:31 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.13.2.2 2022/08/03 16:00:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.13.2.3 2022/08/29 15:48:31 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -821,9 +821,6 @@
{
int rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_caps = bus_space_read_4(sc->sc_bt, sc->sc_bh,
TPM_INTF_CAPABILITY);
sc->sc_devid = bus_space_read_4(sc->sc_bt, sc->sc_bh, TPM_ID);
diff -r 6863297233a4 -r ef0753e85a46 sys/dev/isa/tpm_isa.c
--- a/sys/dev/isa/tpm_isa.c Mon Aug 29 15:45:10 2022 +0000
+++ b/sys/dev/isa/tpm_isa.c Mon Aug 29 15:48:30 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_isa.c,v 1.4.2.1 2019/10/16 09:52:38 martin Exp $ */
+/* $NetBSD: tpm_isa.c,v 1.4.2.2 2022/08/29 15:48:30 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.4.2.1 2019/10/16 09:52:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.4.2.2 2022/08/29 15:48:30 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,6 +113,9 @@
base = (unsigned int)ia->ia_iomem[0].ir_addr;
size = TPM_SPACE_SIZE;
+ aprint_normal("\n");
+ aprint_naive("\n");
+
sc->sc_dev = self;
sc->sc_ver = TPM_1_2;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
Home |
Main Index |
Thread Index |
Old Index