Module Name: src
Committed By: thorpej
Date: Tue Aug 3 23:20:34 UTC 2021
Modified Files:
src/sys/arch/algor/dev [thorpej-cfargs2]: bonito_mainbus.c mainbus.c
vtpbc_mainbus.c
src/sys/arch/algor/pci [thorpej-cfargs2]: pcib.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/algor/dev/bonito_mainbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/algor/dev/vtpbc_mainbus.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/algor/pci/pcib.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/algor/dev/bonito_mainbus.c
diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.18 src/sys/arch/algor/dev/bonito_mainbus.c:1.18.8.1
--- src/sys/arch/algor/dev/bonito_mainbus.c:1.18 Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/bonito_mainbus.c Tue Aug 3 23:20:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $");
#include "opt_algor_p6032.h"
@@ -113,5 +113,5 @@ bonito_mainbus_attach(device_t parent, d
}
#endif /* ALGOR_P6032 */
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
Index: src/sys/arch/algor/dev/mainbus.c
diff -u src/sys/arch/algor/dev/mainbus.c:1.29 src/sys/arch/algor/dev/mainbus.c:1.29.8.1
--- src/sys/arch/algor/dev/mainbus.c:1.29 Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/mainbus.c Tue Aug 3 23:20:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -221,8 +221,7 @@ mainbus_attach(device_t parent, device_t
ma.ma_addr = md->md_addr;
ma.ma_irq = md->md_irq;
config_found(self, &ma, mainbus_print,
- CFARG_SUBMATCH, mainbus_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = mainbus_submatch));
}
}
Index: src/sys/arch/algor/dev/vtpbc_mainbus.c
diff -u src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20 src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20.8.1
--- src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20 Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/vtpbc_mainbus.c Tue Aug 3 23:20:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -128,5 +128,5 @@ vtpbc_mainbus_attach(device_t parent, de
}
#endif /* ALGOR_P4032 || ALGOR_P5064 */
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
Index: src/sys/arch/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.27 src/sys/arch/algor/pci/pcib.c:1.27.8.1
--- src/sys/arch/algor/pci/pcib.c:1.27 Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/pci/pcib.c Tue Aug 3 23:20:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 thorpej Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -317,7 +317,7 @@ pcib_bridge_callback(device_t self)
iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook;
iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook;
- config_found(sc->sc_dev, &iba, isabusprint, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, isabusprint, CFARGS_NONE);
}
void
