Module Name: src
Committed By: pooka
Date: Fri Mar 26 15:51:55 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_bat.c
src/sys/rump/dev/lib/libubt: ubt_at_usb.c
src/sys/rump/dev/lib/libucom: ucom_at_usb.c
src/sys/rump/dev/lib/libugenhc: ugenhc_at_mainbus.c
src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c
src/sys/rump/dev/lib/libumass: sd_at_scsibus_at_umass.c
src/sys/rump/dev/lib/libusb: usb_at_ugenhc.c
src/sys/rump/dev/lib/libwscons: component.c
Log Message:
Catch up with cosmetic changes to output from config(1)
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libubt/ubt_at_usb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/component.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/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.96 src/sys/dev/acpi/acpi_bat.c:1.97
--- src/sys/dev/acpi/acpi_bat.c:1.96 Fri Mar 26 05:59:26 2010
+++ src/sys/dev/acpi/acpi_bat.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.96 2010/03/26 05:59:26 pooka Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.97 2010/03/26 15:51:55 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.96 2010/03/26 05:59:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.97 2010/03/26 15:51:55 pooka Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -799,12 +799,12 @@
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_comp_acpibat,
- cfattach_comp_acpibat, cfdata_acpibat);
+ return config_init_component(cfdriver_ioconf_acpibat,
+ cfattach_ioconf_acpibat, cfdata_ioconf_acpibat);
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_comp_acpibat,
- cfattach_comp_acpibat, cfdata_acpibat);
+ return config_fini_component(cfdriver_ioconf_acpibat,
+ cfattach_ioconf_acpibat, cfdata_ioconf_acpibat);
default:
return ENOTTY;
Index: src/sys/rump/dev/lib/libubt/ubt_at_usb.c
diff -u src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.3 src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.4
--- src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.3 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libubt/ubt_at_usb.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt_at_usb.c,v 1.3 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: ubt_at_usb.c,v 1.4 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -14,5 +14,6 @@
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
- config_init_component(cfdriver_comp_ubt, cfattach_comp_ubt, cfdata_ubt);
+ config_init_component(cfdriver_ioconf_ubt,
+ cfattach_ioconf_ubt, cfdata_ioconf_ubt);
}
Index: src/sys/rump/dev/lib/libucom/ucom_at_usb.c
diff -u src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.6 src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.7
--- src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.6 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libucom/ucom_at_usb.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom_at_usb.c,v 1.6 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: ucom_at_usb.c,v 1.7 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -20,8 +20,8 @@
extern struct cdevsw ucom_cdevsw;
devmajor_t cmaj, bmaj;
- config_init_component(cfdriver_comp_ucom,
- cfattach_comp_ucom, cfdata_ucom);
+ config_init_component(cfdriver_ioconf_ucom,
+ cfattach_ioconf_ucom, cfdata_ioconf_ucom);
bmaj = cmaj = -1;
FLAWLESSCALL(devsw_attach("ucom", NULL, &bmaj, &ucom_cdevsw, &cmaj));
Index: src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c:1.2 src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c:1.3
--- src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c:1.2 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc_at_mainbus.c,v 1.2 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: ugenhc_at_mainbus.c,v 1.3 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -17,6 +17,6 @@
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
- config_init_component(cfdriver_comp_ugenhc,
- cfattach_comp_ugenhc, cfdata_ugenhc);
+ config_init_component(cfdriver_ioconf_ugenhc,
+ cfattach_ioconf_ugenhc, cfdata_ioconf_ugenhc);
}
Index: src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
diff -u src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.4 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.5
--- src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.4 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt_at_usb.c,v 1.4 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: ulpt_at_usb.c,v 1.5 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/conf.h>
@@ -17,8 +17,8 @@
extern struct cdevsw ulpt_cdevsw;
devmajor_t bmaj, cmaj;
- config_init_component(cfdriver_comp_ulpt,
- cfattach_comp_ulpt, cfdata_ulpt);
+ config_init_component(cfdriver_ioconf_ulpt,
+ cfattach_ioconf_ulpt, cfdata_ioconf_ulpt);
bmaj = cmaj = -1;
FLAWLESSCALL(devsw_attach("ulpt", NULL, &bmaj, &ulpt_cdevsw, &cmaj));
Index: src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c
diff -u src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c:1.4 src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c:1.5
--- src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c:1.4 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sd_at_scsibus_at_umass.c,v 1.4 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: sd_at_scsibus_at_umass.c,v 1.5 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/conf.h>
@@ -20,8 +20,8 @@
extern struct cdevsw sd_cdevsw, cd_cdevsw;
devmajor_t bmaj, cmaj;
- config_init_component(cfdriver_comp_umass,
- cfattach_comp_umass, cfdata_umass);
+ config_init_component(cfdriver_ioconf_umass,
+ cfattach_ioconf_umass, cfdata_ioconf_umass);
bmaj = cmaj = -1;
FLAWLESSCALL(devsw_attach("sd", &sd_bdevsw, &bmaj, &sd_cdevsw, &cmaj));
Index: src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c
diff -u src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c:1.2 src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c:1.3
--- src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c:1.2 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_at_ugenhc.c,v 1.2 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: usb_at_ugenhc.c,v 1.3 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -17,5 +17,6 @@
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
- config_init_component(cfdriver_comp_usb, cfattach_comp_usb, cfdata_usb);
+ config_init_component(cfdriver_ioconf_usb,
+ cfattach_ioconf_usb, cfdata_ioconf_usb);
}
Index: src/sys/rump/dev/lib/libwscons/component.c
diff -u src/sys/rump/dev/lib/libwscons/component.c:1.4 src/sys/rump/dev/lib/libwscons/component.c:1.5
--- src/sys/rump/dev/lib/libwscons/component.c:1.4 Thu Mar 25 19:54:08 2010
+++ src/sys/rump/dev/lib/libwscons/component.c Fri Mar 26 15:51:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.4 2010/03/25 19:54:08 pooka Exp $ */
+/* $NetBSD: component.c,v 1.5 2010/03/26 15:51:55 pooka Exp $ */
#include <sys/param.h>
#include <sys/conf.h>
@@ -17,8 +17,8 @@
extern struct cdevsw wskbd_cdevsw, wsmouse_cdevsw;
devmajor_t bmaj, cmaj;
- config_init_component(cfdriver_comp_wscons,
- cfattach_comp_wscons, cfdata_wscons);
+ config_init_component(cfdriver_ioconf_wscons,
+ cfattach_ioconf_wscons, cfdata_ioconf_wscons);
bmaj = cmaj = -1;
FLAWLESSCALL(devsw_attach("wskbd", NULL, &bmaj, &wskbd_cdevsw, &cmaj));
