[device] Add device__init for initializing to defaults

Now you know why a previous commit renamed the older
device__init() function. :)

diff --git a/src/include/device.h b/src/include/device.h
index c37158b..f5392c4 100644 (file)
--- a/src/include/device.h
+++ b/src/include/device.h
@@ -94,6 +94,7 @@ typedef void STDCALL device__free_func(IN struct device__type *);
 
 extern winvblock__lib_func device__free_func device__free;
 
+extern winvblock__lib_func void device__init(struct device__type *);
 extern winvblock__lib_func struct device__type * device__create(void);
 
 winvblock__def_struct(device__ops) {

diff --git a/src/winvblock/device.c b/src/winvblock/device.c
index 64a7cc8..df3fa7a 100644 (file)
--- a/src/winvblock/device.c
+++ b/src/winvblock/device.c
@@ -38,6 +38,19 @@
 static device__free_func device__free_dev_;
 static device__create_pdo_func device__make_pdo_;
 
+/**
+ * Initialize device defaults.
+ *
+ * @v dev               Points to the device to initialize with defaults.
+ */
+winvblock__lib_func void device__init(struct device__type * dev) {
+    RtlZeroMemory(dev, sizeof dev);
+    /* Populate non-zero device defaults. */
+    dev->DriverObject = driver__obj_ptr;
+    dev->ops.create_pdo = device__make_pdo_;
+    dev->ops.free = device__free_dev_;
+  }
+
 /**
  * Create a new device.
  *
@@ -45,8 +58,7 @@ static device__create_pdo_func device__make_pdo_;
  *
  * This function should not be confused with a PDO creation routine, which is
  * actually implemented for each device type.  This routine will allocate a
- * device__type, track it in a global list, as well as populate the device
- * with default values.
+ * device__type and populate the device with default values.
  */
 winvblock__lib_func struct device__type * device__create(void) {
     struct device__type * dev;
@@ -55,14 +67,11 @@ winvblock__lib_func struct device__type * device__create(void) {
      * Devices might be used for booting and should
      * not be allocated from a paged memory pool.
      */
-    dev = wv_mallocz(sizeof *dev);
+    dev = wv_malloc(sizeof *dev);
     if (dev == NULL)
       return NULL;
-    /* Populate non-zero device defaults. */
-    dev->DriverObject = driver__obj_ptr;
-    dev->ops.create_pdo = device__make_pdo_;
-    dev->ops.free = device__free_dev_;
 
+    device__init(dev);
     return dev;
   }