Module Name: src
Committed By: riastradh
Date: Thu Mar 3 06:25:46 UTC 2022
Modified Files:
src/sys/kern: subr_device.c
src/sys/sys: device.h
Log Message:
driver(9): New device_set_private.
Used to initialize a device_t's private pointer at most once. Only
for drivers with zero cfattach size so autoconf doesn't preallocate;
KASSERT checks for this mistake.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/subr_device.c
cvs rdiff -u -r1.178 -r1.179 src/sys/sys/device.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/kern/subr_device.c
diff -u src/sys/kern/subr_device.c:1.11 src/sys/kern/subr_device.c:1.12
--- src/sys/kern/subr_device.c:1.11 Sat Jan 22 11:58:15 2022
+++ src/sys/kern/subr_device.c Thu Mar 3 06:25:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_device.c,v 1.11 2022/01/22 11:58:15 thorpej Exp $ */
+/* $NetBSD: subr_device.c,v 1.12 2022/03/03 06:25:46 riastradh Exp $ */
/*
* Copyright (c) 2006, 2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.11 2022/01/22 11:58:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.12 2022/03/03 06:25:46 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -278,6 +278,17 @@ device_private(device_t dev)
return dev == NULL ? NULL : dev->dv_private;
}
+void
+device_set_private(device_t dev, void *private)
+{
+
+ KASSERTMSG(dev->dv_private == NULL, "device_set_private(%p, %p):"
+ " device %s already has private set to %p",
+ dev, private, device_xname(dev), device_private(dev));
+ KASSERT(private != NULL);
+ dev->dv_private = private;
+}
+
prop_dictionary_t
device_properties(device_t dev)
{
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.178 src/sys/sys/device.h:1.179
--- src/sys/sys/device.h:1.178 Sat Jan 22 11:58:15 2022
+++ src/sys/sys/device.h Thu Mar 3 06:25:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.178 2022/01/22 11:58:15 thorpej Exp $ */
+/* $NetBSD: device.h,v 1.179 2022/03/03 06:25:46 riastradh Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -667,6 +667,7 @@ bool device_is_enabled(device_t);
bool device_has_power(device_t);
int device_locator(device_t, u_int);
void *device_private(device_t);
+void device_set_private(device_t, void *);
prop_dictionary_t device_properties(device_t);
void device_set_handle(device_t, devhandle_t);
devhandle_t device_handle(device_t);
