Module Name: src
Committed By: riastradh
Date: Thu Sep 22 14:41:49 UTC 2022
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c tco.c tco.h
Log Message:
tco(4): Rename lpcib_tco_attach_args -> tco_attach_args.
No longer hangs off LPC bus, newer devices hang it off SMBus.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/pci/tco.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/tco.h
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/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.55 src/sys/arch/x86/pci/ichlpcib.c:1.56
--- src/sys/arch/x86/pci/ichlpcib.c:1.55 Thu Sep 22 14:41:26 2022
+++ src/sys/arch/x86/pci/ichlpcib.c Thu Sep 22 14:41:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.55 2022/09/22 14:41:26 riastradh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.56 2022/09/22 14:41:49 riastradh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.55 2022/09/22 14:41:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.56 2022/09/22 14:41:49 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -633,7 +633,7 @@ static void
tcotimer_configure(device_t self)
{
struct lpcib_softc *sc = device_private(self);
- struct lpcib_tco_attach_args arg;
+ struct tco_attach_args arg;
if (sc->sc_has_rcba)
arg.ta_version = TCO_VERSION_RCBA;
Index: src/sys/arch/x86/pci/tco.c
diff -u src/sys/arch/x86/pci/tco.c:1.4 src/sys/arch/x86/pci/tco.c:1.5
--- src/sys/arch/x86/pci/tco.c:1.4 Thu Sep 22 14:41:26 2022
+++ src/sys/arch/x86/pci/tco.c Thu Sep 22 14:41:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tco.c,v 1.4 2022/09/22 14:41:26 riastradh Exp $ */
+/* $NetBSD: tco.c,v 1.5 2022/09/22 14:41:49 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tco.c,v 1.4 2022/09/22 14:41:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tco.c,v 1.5 2022/09/22 14:41:49 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -88,7 +88,7 @@ CFATTACH_DECL3_NEW(tco, sizeof(struct tc
static int
tco_match(device_t parent, cfdata_t match, void *aux)
{
- struct lpcib_tco_attach_args *ta = aux;
+ struct tco_attach_args *ta = aux;
if (ta->ta_iot == 0)
return 0;
@@ -108,7 +108,7 @@ static void
tco_attach(device_t parent, device_t self, void *aux)
{
struct tco_softc *sc = device_private(self);
- struct lpcib_tco_attach_args *ta = aux;
+ struct tco_attach_args *ta = aux;
uint32_t ioreg;
/* Retrieve bus info shared with parent/siblings */
Index: src/sys/arch/x86/pci/tco.h
diff -u src/sys/arch/x86/pci/tco.h:1.2 src/sys/arch/x86/pci/tco.h:1.3
--- src/sys/arch/x86/pci/tco.h:1.2 Thu Sep 22 14:41:26 2022
+++ src/sys/arch/x86/pci/tco.h Thu Sep 22 14:41:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tco.h,v 1.2 2022/09/22 14:41:26 riastradh Exp $ */
+/* $NetBSD: tco.h,v 1.3 2022/09/22 14:41:49 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#ifndef _X86_PCI_TCO_H_
#define _X86_PCI_TCO_H_
-struct lpcib_tco_attach_args {
+struct tco_attach_args {
enum {
TCO_VERSION_PCIB = 0,
TCO_VERSION_RCBA = 1,
