From de013768d8dadc96d3c3aa22dba6b8292cdc8dfa Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 6 Jun 2018 17:27:13 -0400
Subject: [PATCH] Rebuild efivar-35's abixml files with newer abidw.

abidiff is not that good at recognizing its own format changes, so if we
just do the normal abicheck we get a lot of:

  [C]'function ssize_t efidp_make_atapi(uint8_t*, ssize_t, uint16_t, uint16_t, uint16_t)' has some indirect sub-type changes:
    parameter 6 of type 'uint8_t*' was added
    parameter 7 of type 'typedef ssize_t' was added
    parameter 8 of type 'typedef uint16_t' was added
    parameter 9 of type 'typedef uint16_t' was added
    parameter 10 of type 'typedef uint16_t' was added

Which is obviously just plain wrong (efidp_make_atapi()'s arguments have
not changed at all, and it still has only 5 of them.)

So the answer is to re-build efivar-35's .abixml files with newer abidw,
and *then* do abicheck.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 src/libefiboot.abixml | 1063 +++++++++++++++------------
 src/libefivar.abixml  | 1922 +++++++++++++++++++++++++++++--------------------
 2 files changed, 1746 insertions(+), 1239 deletions(-)

diff --git a/src/libefiboot.abixml b/src/libefiboot.abixml
index c8f7f7d..b90dd8a 100644
--- a/src/libefiboot.abixml
+++ b/src/libefiboot.abixml
@@ -42,287 +42,295 @@
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-10'/>
     <typedef-decl name='__uint16_t' type-id='type-id-10' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-11'/>
     <typedef-decl name='uint16_t' type-id='type-id-11' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-6'/>
-    <array-type-def dimensions='0' type-id='type-id-6' size-in-bits='infinite' id='type-id-7'/>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-12'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-13'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='181' column='1' id='type-id-14'/>
-    <typedef-decl name='ssize_t' type-id='type-id-14' filepath='/usr/include/sys/types.h' line='109' column='1' id='type-id-15'/>
-    <function-decl name='efi_loadopt_desc' mangled-name='efi_loadopt_desc' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_desc@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='378' column='1'/>
-      <parameter type-id='type-id-15' name='limit' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='378' column='1'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-12'/>
+
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='16' id='type-id-7'>
+      <subrange length='1' type-id='type-id-12' id='type-id-13'/>
+
+    </array-type-def>
+    <typedef-decl name='efi_load_option' type-id='type-id-4' filepath='include/efivar/efiboot-loadopt.h' line='24' column='1' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-15'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-16'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='181' column='1' id='type-id-17'/>
+    <typedef-decl name='ssize_t' type-id='type-id-17' filepath='/usr/include/sys/types.h' line='109' column='1' id='type-id-18'/>
+    <function-decl name='efi_loadopt_desc' mangled-name='efi_loadopt_desc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_desc@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-18' name='limit'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-16'/>
-    <typedef-decl name='__uint8_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='37' column='1' id='type-id-17'/>
-    <typedef-decl name='uint8_t' type-id='type-id-17' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-18'/>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-19'/>
-    <function-decl name='efi_loadopt_args_as_ucs2' mangled-name='efi_loadopt_args_as_ucs2' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_as_ucs2@@libefiboot.so.0'>
-      <parameter type-id='type-id-16' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='344' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='344' column='1'/>
-      <parameter type-id='type-id-19' name='utf8' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='344' column='1'/>
-      <return type-id='type-id-15'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-19'/>
+    <typedef-decl name='__uint8_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='37' column='1' id='type-id-20'/>
+    <typedef-decl name='uint8_t' type-id='type-id-20' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-21'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-22'/>
+    <function-decl name='efi_loadopt_args_as_ucs2' mangled-name='efi_loadopt_args_as_ucs2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_as_ucs2@@libefiboot.so.0'>
+      <parameter type-id='type-id-19' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-22' name='utf8'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <function-decl name='efi_loadopt_args_as_utf8' mangled-name='efi_loadopt_args_as_utf8' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_as_utf8@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='317' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='317' column='1'/>
-      <parameter type-id='type-id-19' name='utf8' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='317' column='1'/>
-      <return type-id='type-id-15'/>
+    <function-decl name='efi_loadopt_args_as_utf8' mangled-name='efi_loadopt_args_as_utf8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_as_utf8@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-22' name='utf8'/>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-22' name='utf8'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <type-decl name='char' size-in-bits='8' id='type-id-20'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-21'/>
-    <function-decl name='efi_loadopt_args_from_file' mangled-name='efi_loadopt_args_from_file' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_from_file@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='272' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='272' column='1'/>
-      <parameter type-id='type-id-21' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='272' column='1'/>
-      <return type-id='type-id-15'/>
+    <type-decl name='char' size-in-bits='8' id='type-id-23'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-24'/>
+    <function-decl name='efi_loadopt_args_from_file' mangled-name='efi_loadopt_args_from_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_from_file@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-24' name='filename'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <type-decl name='int' size-in-bits='32' id='type-id-22'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-23'/>
-    <typedef-decl name='size_t' type-id='type-id-23' filepath='/usr/lib/gcc/x86_64-redhat-linux/7/include/stddef.h' line='216' column='1' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-25'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-26'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-27'/>
-    <function-decl name='efi_loadopt_optional_data' mangled-name='efi_loadopt_optional_data' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_optional_data@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='237' column='1'/>
-      <parameter type-id='type-id-24' name='opt_size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='237' column='1'/>
-      <parameter type-id='type-id-26' name='datap' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='238' column='1'/>
-      <parameter type-id='type-id-27' name='len' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='238' column='1'/>
-      <return type-id='type-id-22'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-25'/>
+    <typedef-decl name='size_t' type-id='type-id-12' filepath='/usr/lib/gcc/x86_64-redhat-linux/8/include/stddef.h' line='216' column='1' id='type-id-26'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-29'/>
+    <function-decl name='efi_loadopt_optional_data' mangled-name='efi_loadopt_optional_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_optional_data@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-26' name='opt_size'/>
+      <parameter type-id='type-id-28' name='datap'/>
+      <parameter type-id='type-id-29' name='len'/>
+      <return type-id='type-id-25'/>
     </function-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='832' column='1' id='type-id-28'>
+    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='832' column='1' id='type-id-30'>
       <data-member access='private'>
-        <var-decl name='' type-id='type-id-29' visibility='default'/>
+        <var-decl name='' type-id='type-id-31' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pci' type-id='type-id-31' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='pci' type-id='type-id-33' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pccard' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='pccard' type-id='type-id-34' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mmio' type-id='type-id-33' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='mmio' type-id='type-id-35' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='hw_vendor' type-id='type-id-34' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-36' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='controller' type-id='type-id-35' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='controller' type-id='type-id-37' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bmc' type-id='type-id-36' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='bmc' type-id='type-id-38' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_hid' type-id='type-id-37' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-39' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='845' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-38' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-40' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_adr' type-id='type-id-39' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-41' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='atapi' type-id='type-id-40' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='atapi' type-id='type-id-42' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='scsi' type-id='type-id-41' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='scsi' type-id='type-id-43' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='fc' type-id='type-id-42' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='fc' type-id='type-id-44' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='fcex' type-id='type-id-43' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='851' column='1'/>
+        <var-decl name='fcex' type-id='type-id-45' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firewire' type-id='type-id-44' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='firewire' type-id='type-id-46' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb' type-id='type-id-45' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='usb' type-id='type-id-47' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb_class' type-id='type-id-46' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-48' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb_wwid' type-id='type-id-47' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-49' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='lun' type-id='type-id-48' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='lun' type-id='type-id-50' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sata' type-id='type-id-49' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='sata' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='i2o' type-id='type-id-50' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='i2o' type-id='type-id-52' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac_addr' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ipv4_addr' type-id='type-id-52' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ipv6_addr' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='vlan' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='vlan' type-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='infiniband' type-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-57' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uart' type-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uart' type-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='msg_vendor' type-id='type-id-57' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uart_flow_control' type-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sas' type-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='sas' type-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sas_ex' type-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='iscsi' type-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='nvme' type-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='nvme' type-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uri' type-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='uri' type-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ufs' type-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='ufs' type-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sd' type-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='sd' type-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bt' type-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='bt' type-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='wifi' type-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='wifi' type-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='emmc' type-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='emmc' type-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='btle' type-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='btle' type-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='dns' type-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='dns' type-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='878' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='nvdimm' type-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='879' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='hd' type-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='hd' type-id='type-id-74' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='880' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='cdrom' type-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='881' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='media_vendor' type-id='type-id-74' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='882' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='882' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='file' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='883' column='1'/>
+        <var-decl name='file' type-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='883' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='protocol' type-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='884' column='1'/>
+        <var-decl name='protocol' type-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='884' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firmware_file' type-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='885' column='1'/>
+        <var-decl name='firmware_file' type-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='885' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firmware_volume' type-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='886' column='1'/>
+        <var-decl name='firmware_volume' type-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='886' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='relative_offset' type-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='887' column='1'/>
+        <var-decl name='relative_offset' type-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='887' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ramdisk' type-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='888' column='1'/>
+        <var-decl name='ramdisk' type-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='888' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bios_boot' type-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='889' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='889' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='833' column='1' id='type-id-29'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='833' column='1' id='type-id-31'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='834' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='subtype' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='835' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='length' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-82'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-84'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='37' column='1'/>
+        <var-decl name='type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='38' column='1'/>
+        <var-decl name='subtype' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='length' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='39' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_header' type-id='type-id-82' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='40' column='1' id='type-id-30'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-31' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-83'>
+    <typedef-decl name='efidp_header' type-id='type-id-84' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='40' column='1' id='type-id-32'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-33' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-85'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='56' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='57' column='1'/>
+        <var-decl name='function' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='58' column='1'/>
+        <var-decl name='device' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='58' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pci' type-id='type-id-83' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='59' column='1' id='type-id-31'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='64' column='1' id='type-id-84'>
+    <typedef-decl name='efidp_pci' type-id='type-id-85' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='59' column='1' id='type-id-33'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-34' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='64' column='1' id='type-id-86'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='65' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='66' column='1'/>
+        <var-decl name='function' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='66' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pccard' type-id='type-id-84' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='67' column='1' id='type-id-32'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-33' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='70' column='1' id='type-id-85'>
+    <typedef-decl name='efidp_pccard' type-id='type-id-86' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='67' column='1' id='type-id-34'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-35' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='70' column='1' id='type-id-87'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='71' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='memory_type' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='73' column='1'/>
+        <var-decl name='starting_address' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='74' column='1'/>
+        <var-decl name='ending_address' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='74' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__uint64_t' type-id='type-id-23' filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-87'/>
-    <typedef-decl name='uint64_t' type-id='type-id-87' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-86'/>
-    <typedef-decl name='efidp_mmio' type-id='type-id-85' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='75' column='1' id='type-id-33'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-34' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='750' column='1' id='type-id-88'>
+    <typedef-decl name='__uint64_t' type-id='type-id-12' filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-89'/>
+    <typedef-decl name='uint64_t' type-id='type-id-89' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-88'/>
+    <typedef-decl name='efidp_mmio' type-id='type-id-87' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='75' column='1' id='type-id-35'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-36' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='78' column='1' id='type-id-90'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='751' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='752' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='753' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='81' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='33' column='1' id='type-id-91'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='33' column='1' id='type-id-93'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='a' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='34' column='1'/>
       </data-member>
@@ -336,39 +344,45 @@
         <var-decl name='d' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='38' column='1'/>
+        <var-decl name='e' type-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='38' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='48' id='type-id-92'>
-      <subrange length='6'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='48' id='type-id-94'>
+      <subrange length='6' type-id='type-id-12' id='type-id-95'/>
+
+    </array-type-def>
+    <typedef-decl name='efi_guid_t' type-id='type-id-93' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='39' column='1' id='type-id-91'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='8' id='type-id-92'>
+      <subrange length='1' type-id='type-id-12' id='type-id-13'/>
+
     </array-type-def>
-    <typedef-decl name='efi_guid_t' type-id='type-id-91' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='39' column='1' id='type-id-89'/>
-    <array-type-def dimensions='0' type-id='type-id-18' size-in-bits='infinite' id='type-id-90'/>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-88' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='82' column='1' id='type-id-34'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-35' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='99' column='1' id='type-id-93'>
+    <typedef-decl name='efidp_hw_vendor' type-id='type-id-90' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='82' column='1' id='type-id-36'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-37' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='99' column='1' id='type-id-96'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='100' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='controller' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='101' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_controller' type-id='type-id-93' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='102' column='1' id='type-id-35'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='104' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-36' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='105' column='1' id='type-id-94'>
+    <typedef-decl name='efidp_controller' type-id='type-id-96' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='102' column='1' id='type-id-37'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='104' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-38' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='105' column='1' id='type-id-97'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='107' column='1'/>
+        <var-decl name='interface_type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='base_addr' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='108' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bmc' type-id='type-id-94' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='109' column='1' id='type-id-36'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-37' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-95'>
+    <typedef-decl name='efidp_bmc' type-id='type-id-97' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='109' column='1' id='type-id-38'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-39' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-98'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='120' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='hid' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='121' column='1'/>
@@ -377,10 +391,10 @@
         <var-decl name='uid' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='122' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-95' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='123' column='1' id='type-id-37'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-38' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='128' column='1' id='type-id-96'>
+    <typedef-decl name='efidp_acpi_hid' type-id='type-id-98' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='123' column='1' id='type-id-39'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-40' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='128' column='1' id='type-id-99'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='129' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='hid' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='130' column='1'/>
@@ -392,39 +406,47 @@
         <var-decl name='cid' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-97' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='134' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-100' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-20' size-in-bits='infinite' id='type-id-97'/>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-96' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='135' column='1' id='type-id-38'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-39' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='165' column='1' id='type-id-98'>
+
+    <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='8' id='type-id-100'>
+      <subrange length='1' type-id='type-id-12' id='type-id-13'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-99' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='135' column='1' id='type-id-40'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-41' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='165' column='1' id='type-id-101'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='166' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-99' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='167' column='1'/>
+        <var-decl name='adr' type-id='type-id-102' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='167' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-5' size-in-bits='infinite' id='type-id-99'/>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-98' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='168' column='1' id='type-id-39'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-40' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-100'>
+
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='32' id='type-id-102'>
+      <subrange length='1' type-id='type-id-12' id='type-id-13'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_acpi_adr' type-id='type-id-101' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='168' column='1' id='type-id-41'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-42' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-103'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='327' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='328' column='1'/>
+        <var-decl name='primary' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='329' column='1'/>
+        <var-decl name='slave' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <var-decl name='lun' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='330' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_atapi' type-id='type-id-100' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-40'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-41' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-101'>
+    <typedef-decl name='efidp_atapi' type-id='type-id-103' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-42'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-43' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='337' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='target' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='338' column='1'/>
@@ -433,67 +455,69 @@
         <var-decl name='lun' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='339' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_scsi' type-id='type-id-101' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-41'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-42' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-102'>
+    <typedef-decl name='efidp_scsi' type-id='type-id-104' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-43'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-44' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-105'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='346' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='348' column='1'/>
+        <var-decl name='wwn' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='348' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='349' column='1'/>
+        <var-decl name='lun' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='349' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fc' type-id='type-id-102' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='350' column='1' id='type-id-42'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-43' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-103'>
+    <typedef-decl name='efidp_fc' type-id='type-id-105' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='350' column='1' id='type-id-44'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-45' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-106'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='354' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='356' column='1'/>
+        <var-decl name='wwn' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='357' column='1'/>
+        <var-decl name='lun' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='357' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='64' id='type-id-104'>
-      <subrange length='8'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='64' id='type-id-107'>
+      <subrange length='8' type-id='type-id-12' id='type-id-108'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_fcex' type-id='type-id-103' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='358' column='1' id='type-id-43'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-44' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='361' column='1' id='type-id-105'>
+    <typedef-decl name='efidp_fcex' type-id='type-id-106' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='358' column='1' id='type-id-45'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-46' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='361' column='1' id='type-id-109'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='363' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='364' column='1'/>
+        <var-decl name='guid' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='364' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_1394' type-id='type-id-105' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='365' column='1' id='type-id-44'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-45' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='368' column='1' id='type-id-106'>
+    <typedef-decl name='efidp_1394' type-id='type-id-109' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='365' column='1' id='type-id-46'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-47' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='368' column='1' id='type-id-110'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='369' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='369' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='370' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='371' column='1'/>
+        <var-decl name='interface' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='371' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb' type-id='type-id-106' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='372' column='1' id='type-id-45'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-46' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='375' column='1' id='type-id-107'>
+    <typedef-decl name='efidp_usb' type-id='type-id-110' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='372' column='1' id='type-id-47'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-48' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='375' column='1' id='type-id-111'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='376' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='376' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='vendor_id' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='377' column='1'/>
@@ -502,19 +526,19 @@
         <var-decl name='product_id' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='379' column='1'/>
+        <var-decl name='device_class' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='380' column='1'/>
+        <var-decl name='device_subclass' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='381' column='1'/>
+        <var-decl name='device_protocol' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='381' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-107' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='382' column='1' id='type-id-46'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-47' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-108'>
+    <typedef-decl name='efidp_usb_class' type-id='type-id-111' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='382' column='1' id='type-id-48'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-49' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-112'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='interface' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='404' column='1'/>
@@ -529,19 +553,19 @@
         <var-decl name='serial_number' type-id='type-id-7' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='407' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-108' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-47'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-48' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='411' column='1' id='type-id-109'>
+    <typedef-decl name='efidp_usb_wwid' type-id='type-id-112' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-49'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-50' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='411' column='1' id='type-id-113'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='412' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='412' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='413' column='1'/>
+        <var-decl name='lun' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='413' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_lun' type-id='type-id-109' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='414' column='1' id='type-id-48'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-49' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-110'>
+    <typedef-decl name='efidp_lun' type-id='type-id-113' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='414' column='1' id='type-id-50'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-114'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='418' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='hba_port' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='419' column='1'/>
@@ -553,40 +577,42 @@
         <var-decl name='lun' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='421' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sata' type-id='type-id-110' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-49'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-50' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='428' column='1' id='type-id-111'>
+    <typedef-decl name='efidp_sata' type-id='type-id-114' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-51'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-52' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='428' column='1' id='type-id-115'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='429' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='429' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='target' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='430' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_i2o' type-id='type-id-111' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='431' column='1' id='type-id-50'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='296' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='434' column='1' id='type-id-112'>
+    <typedef-decl name='efidp_i2o' type-id='type-id-115' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='431' column='1' id='type-id-52'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='296' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='434' column='1' id='type-id-116'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='435' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='435' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-113' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='436' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-117' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='437' column='1'/>
+        <var-decl name='if_type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='437' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='256' id='type-id-113'>
-      <subrange length='32'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='256' id='type-id-117'>
+      <subrange length='32' type-id='type-id-12' id='type-id-118'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-112' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='438' column='1' id='type-id-51'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-52' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='446' column='1' id='type-id-114'>
+    <typedef-decl name='efidp_mac_addr' type-id='type-id-116' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='438' column='1' id='type-id-53'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='446' column='1' id='type-id-119'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='447' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='448' column='1'/>
+        <var-decl name='local_ipv4_addr' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='449' column='1'/>
+        <var-decl name='remote_ipv4_addr' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='local_port' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='450' column='1'/>
@@ -598,29 +624,31 @@
         <var-decl name='protocol' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='452' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-116' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='453' column='1'/>
+        <var-decl name='static_ip_addr' type-id='type-id-121' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='454' column='1'/>
+        <var-decl name='gateway' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='455' column='1'/>
+        <var-decl name='netmask' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='455' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32' id='type-id-115'>
-      <subrange length='4'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='32' id='type-id-120'>
+      <subrange length='4' type-id='type-id-12' id='type-id-122'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_boolean' type-id='type-id-18' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='43' column='1' id='type-id-116'/>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-114' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='456' column='1' id='type-id-52'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='360' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='468' column='1' id='type-id-117'>
+    <typedef-decl name='efidp_boolean' type-id='type-id-21' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='43' column='1' id='type-id-121'/>
+    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-119' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='456' column='1' id='type-id-54'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='360' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='468' column='1' id='type-id-123'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='469' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='470' column='1'/>
+        <var-decl name='local_ipv6_addr' type-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='471' column='1'/>
+        <var-decl name='remote_ipv6_addr' type-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='local_port' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='472' column='1'/>
@@ -632,145 +660,160 @@
         <var-decl name='protocol' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='475' column='1'/>
+        <var-decl name='ip_addr_origin' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='476' column='1'/>
+        <var-decl name='prefix_length' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='477' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='477' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='128' id='type-id-118'>
-      <subrange length='16'/>
+
+    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='128' id='type-id-124'>
+      <subrange length='16' type-id='type-id-12' id='type-id-125'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-117' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='478' column='1' id='type-id-53'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='485' column='1' id='type-id-119'>
+    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-123' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='478' column='1' id='type-id-55'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='485' column='1' id='type-id-126'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='486' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='vlan_id' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_vlan' type-id='type-id-119' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='488' column='1' id='type-id-54'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-120'>
+    <typedef-decl name='efidp_vlan' type-id='type-id-126' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='488' column='1' id='type-id-56'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-57' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-127'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='492' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='492' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='resource_flags' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-121' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='494' column='1'/>
+        <var-decl name='port_gid' type-id='type-id-128' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='494' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-122' visibility='default'/>
+        <var-decl name='' type-id='type-id-129' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='499' column='1'/>
+        <var-decl name='target_port_id' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='499' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='500' column='1'/>
+        <var-decl name='device_id' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='500' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-86' size-in-bits='128' id='type-id-121'>
-      <subrange length='2'/>
+
+    <array-type-def dimensions='1' type-id='type-id-88' size-in-bits='128' id='type-id-128'>
+      <subrange length='2' type-id='type-id-12' id='type-id-130'/>
+
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='495' column='1' id='type-id-122'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='495' column='1' id='type-id-129'>
       <data-member access='private'>
-        <var-decl name='ioc_guid' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='496' column='1'/>
+        <var-decl name='ioc_guid' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='496' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='service_id' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='497' column='1'/>
+        <var-decl name='service_id' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='497' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-120' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-55'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='152' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='510' column='1' id='type-id-123'>
+    <typedef-decl name='efidp_infiniband' type-id='type-id-127' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-57'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='152' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='510' column='1' id='type-id-131'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='511' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='513' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='514' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='515' column='1'/>
+        <var-decl name='parity' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='516' column='1'/>
+        <var-decl name='stop_bits' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='516' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart' type-id='type-id-123' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='517' column='1' id='type-id-56'/>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-88' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-57'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-124'>
+    <typedef-decl name='efidp_uart' type-id='type-id-131' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='517' column='1' id='type-id-58'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='541' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='555' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='542' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='556' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='543' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='vendor_data' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='544' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_msg_vendor' type-id='type-id-132' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-59'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-133'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='555' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='vendor_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='flow_control_map' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='557' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-124' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='558' column='1' id='type-id-58'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='352' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-125'>
+    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-133' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='558' column='1' id='type-id-60'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='352' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='566' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='566' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='567' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='567' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='568' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='569' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='569' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='570' column='1'/>
+        <var-decl name='lun' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='570' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='571' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='572' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='572' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
         <var-decl name='rtp' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='573' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas' type-id='type-id-125' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='574' column='1' id='type-id-59'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='598' column='1' id='type-id-126'>
+    <typedef-decl name='efidp_sas' type-id='type-id-134' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='574' column='1' id='type-id-61'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='598' column='1' id='type-id-135'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='599' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='599' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='600' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='600' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='601' column='1'/>
+        <var-decl name='lun' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='601' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='602' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='602' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='603' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='603' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='176'>
         <var-decl name='rtp' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='604' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-126' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='605' column='1' id='type-id-60'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='144' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='611' column='1' id='type-id-127'>
+    <typedef-decl name='efidp_sas_ex' type-id='type-id-135' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='605' column='1' id='type-id-62'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='144' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='611' column='1' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='612' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='612' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='protocol' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='613' column='1'/>
@@ -779,250 +822,275 @@
         <var-decl name='options' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='614' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='615' column='1'/>
+        <var-decl name='lun' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='615' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='tpgt' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='616' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='617' column='1'/>
+        <var-decl name='target_name' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='617' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-127' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='618' column='1' id='type-id-61'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-128'>
+    <typedef-decl name='efidp_iscsi' type-id='type-id-136' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='618' column='1' id='type-id-63'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='647' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='647' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='namespace_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='648' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='649' column='1'/>
+        <var-decl name='ieee_eui_64' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='649' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvme' type-id='type-id-128' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='650' column='1' id='type-id-62'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='655' column='1' id='type-id-129'>
+    <typedef-decl name='efidp_nvme' type-id='type-id-137' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='650' column='1' id='type-id-64'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='655' column='1' id='type-id-138'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='656' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='656' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='657' column='1'/>
+        <var-decl name='uri' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='657' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uri' type-id='type-id-129' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='658' column='1' id='type-id-63'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-130'>
+    <typedef-decl name='efidp_uri' type-id='type-id-138' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='658' column='1' id='type-id-65'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-139'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='662' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='662' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='663' column='1'/>
+        <var-decl name='target_id' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='663' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='664' column='1'/>
+        <var-decl name='lun' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='664' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ufs' type-id='type-id-130' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-64'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-131'>
+    <typedef-decl name='efidp_ufs' type-id='type-id-139' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-66'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-140'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='669' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='669' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='670' column='1'/>
+        <var-decl name='slot_number' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='670' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sd' type-id='type-id-131' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-65'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-132'>
+    <typedef-decl name='efidp_sd' type-id='type-id-140' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-67'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-141'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='675' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='675' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='676' column='1'/>
+        <var-decl name='addr' type-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='676' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bt' type-id='type-id-132' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-66'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='288' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-133'>
+    <typedef-decl name='efidp_bt' type-id='type-id-141' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-68'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='288' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-142'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='681' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='681' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-113' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='682' column='1'/>
+        <var-decl name='ssid' type-id='type-id-117' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='682' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_wifi' type-id='type-id-133' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='683' column='1' id='type-id-67'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='686' column='1' id='type-id-134'>
+    <typedef-decl name='efidp_wifi' type-id='type-id-142' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='683' column='1' id='type-id-69'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='686' column='1' id='type-id-143'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='687' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='688' column='1'/>
+        <var-decl name='slot' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='688' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_emmc' type-id='type-id-134' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-68'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='692' column='1' id='type-id-135'>
+    <typedef-decl name='efidp_emmc' type-id='type-id-143' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-70'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='692' column='1' id='type-id-144'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='693' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='693' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='694' column='1'/>
+        <var-decl name='addr' type-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='694' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='695' column='1'/>
+        <var-decl name='addr_type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='695' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_btle' type-id='type-id-135' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='696' column='1' id='type-id-69'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-136'>
+    <typedef-decl name='efidp_btle' type-id='type-id-144' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='696' column='1' id='type-id-71'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-145'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='703' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='703' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='704' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-137' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='705' column='1'/>
+        <var-decl name='addrs' type-id='type-id-146' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='705' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='49' column='1' id='type-id-138'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='49' column='1' id='type-id-147'>
       <data-member access='private'>
-        <var-decl name='addr' type-id='type-id-139' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='50' column='1'/>
+        <var-decl name='addr' type-id='type-id-148' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='50' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='v4' type-id='type-id-140' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='51' column='1'/>
+        <var-decl name='v4' type-id='type-id-149' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='51' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='v6' type-id='type-id-141' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='52' column='1'/>
+        <var-decl name='v6' type-id='type-id-150' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='52' column='1'/>
       </data-member>
     </union-decl>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-139'>
-      <subrange length='4'/>
+
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-148'>
+      <subrange length='4' type-id='type-id-12' id='type-id-122'/>
+
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-140' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='41' column='1' id='type-id-142'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-149' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='41' column='1' id='type-id-151'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='42' column='1'/>
+        <var-decl name='addr' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='42' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-142' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='43' column='1' id='type-id-140'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-141' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='45' column='1' id='type-id-143'>
+    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-151' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='43' column='1' id='type-id-149'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-150' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='45' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='46' column='1'/>
+        <var-decl name='addr' type-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-143' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='47' column='1' id='type-id-141'/>
-    <typedef-decl name='efi_ip_addr_t' type-id='type-id-138' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='53' column='1' id='type-id-144'/>
-    <array-type-def dimensions='0' type-id='type-id-144' size-in-bits='infinite' id='type-id-137'/>
-    <typedef-decl name='efidp_dns' type-id='type-id-136' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='706' column='1' id='type-id-70'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='709' column='1' id='type-id-145'>
+    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-152' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='47' column='1' id='type-id-150'/>
+    <typedef-decl name='efi_ip_addr_t' type-id='type-id-147' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='53' column='1' id='type-id-153'/>
+
+    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='128' id='type-id-146'>
+      <subrange length='1' type-id='type-id-12' id='type-id-13'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_dns' type-id='type-id-145' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='706' column='1' id='type-id-72'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='709' column='1' id='type-id-154'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='710' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='710' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='711' column='1'/>
+        <var-decl name='uuid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='711' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-145' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='712' column='1' id='type-id-71'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='336' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='717' column='1' id='type-id-146'>
+    <typedef-decl name='efidp_nvdimm' type-id='type-id-154' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='712' column='1' id='type-id-73'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='336' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-74' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='717' column='1' id='type-id-155'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='718' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='718' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='partition_number' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='719' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='720' column='1'/>
+        <var-decl name='start' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='720' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='721' column='1'/>
+        <var-decl name='size' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='721' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='722' column='1'/>
+        <var-decl name='signature' type-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='722' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='723' column='1'/>
+        <var-decl name='format' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='723' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='724' column='1'/>
+        <var-decl name='signature_type' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='724' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hd' type-id='type-id-146' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='728' column='1' id='type-id-72'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='742' column='1' id='type-id-147'>
+    <typedef-decl name='efidp_hd' type-id='type-id-155' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='728' column='1' id='type-id-74'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='742' column='1' id='type-id-156'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='743' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='743' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='boot_catalog_entry' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='744' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='745' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='745' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='sectors' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='746' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_cdrom' type-id='type-id-156' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-75'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='750' column='1' id='type-id-157'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='751' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='vendor_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='752' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='vendor_data' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='753' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-147' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-73'/>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-88' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-74'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-148'>
+    <typedef-decl name='efidp_media_vendor' type-id='type-id-157' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-76'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='762' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='name' type-id='type-id-7' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='763' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_file' type-id='type-id-148' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-75'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='768' column='1' id='type-id-149'>
+    <typedef-decl name='efidp_file' type-id='type-id-158' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-77'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='768' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='769' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='770' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='770' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_protocol' type-id='type-id-149' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='771' column='1' id='type-id-76'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='780' column='1' id='type-id-150'>
+    <typedef-decl name='efidp_protocol' type-id='type-id-159' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='771' column='1' id='type-id-78'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='774' column='1' id='type-id-160'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='775' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='776' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-150' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='777' column='1' id='type-id-77'/>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-150' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='783' column='1' id='type-id-78'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='786' column='1' id='type-id-151'>
+    <typedef-decl name='efidp_firmware_file' type-id='type-id-160' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='777' column='1' id='type-id-79'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='780' column='1' id='type-id-161'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='787' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='781' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='pi_info' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='782' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_firmware_volume' type-id='type-id-161' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='783' column='1' id='type-id-80'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='786' column='1' id='type-id-162'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='787' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='reserved' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='788' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='first_byte' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='789' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='790' column='1'/>
+        <var-decl name='last_byte' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='790' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-151' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='791' column='1' id='type-id-79'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='304' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='794' column='1' id='type-id-152'>
+    <typedef-decl name='efidp_relative_offset' type-id='type-id-162' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='791' column='1' id='type-id-81'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='304' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='794' column='1' id='type-id-163'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='795' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='795' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='796' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='796' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='797' column='1'/>
+        <var-decl name='end_addr' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='797' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='798' column='1'/>
+        <var-decl name='disk_type_guid' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='798' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='instance_number' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='799' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-152' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='800' column='1' id='type-id-80'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='813' column='1' id='type-id-153'>
+    <typedef-decl name='efidp_ramdisk' type-id='type-id-163' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='800' column='1' id='type-id-82'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='813' column='1' id='type-id-164'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-30' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='814' column='1'/>
+        <var-decl name='header' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='814' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='device_type' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='815' column='1'/>
@@ -1031,100 +1099,209 @@
         <var-decl name='status' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='816' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='817' column='1'/>
+        <var-decl name='description' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='817' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-153' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='818' column='1' id='type-id-81'/>
-    <typedef-decl name='efidp_data' type-id='type-id-28' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
-    <typedef-decl name='efidp' type-id='type-id-155' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='891' column='1' id='type-id-156'/>
-    <function-decl name='efi_loadopt_path' mangled-name='efi_loadopt_path' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='206' column='1'/>
-      <parameter type-id='type-id-15' name='limit' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='206' column='1'/>
-      <return type-id='type-id-156'/>
+    <typedef-decl name='efidp_bios_boot' type-id='type-id-164' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='818' column='1' id='type-id-83'/>
+    <typedef-decl name='efidp_data' type-id='type-id-30' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-166'/>
+    <typedef-decl name='efidp' type-id='type-id-166' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='891' column='1' id='type-id-167'/>
+    <function-decl name='efi_loadopt_path' mangled-name='efi_loadopt_path' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_path@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-18' name='limit'/>
+      <return type-id='type-id-167'/>
     </function-decl>
-    <function-decl name='efi_loadopt_pathlen' mangled-name='efi_loadopt_pathlen' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_pathlen@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='190' column='1'/>
-      <parameter type-id='type-id-15' name='limit' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='190' column='1'/>
+    <function-decl name='efi_loadopt_pathlen' mangled-name='efi_loadopt_pathlen' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_pathlen@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-18' name='limit'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <type-decl name='void' id='type-id-157'/>
-    <function-decl name='efi_loadopt_attr_clear' mangled-name='efi_loadopt_attr_clear' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attr_clear@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='181' column='1'/>
-      <parameter type-id='type-id-6' name='attr' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='181' column='1'/>
-      <return type-id='type-id-157'/>
+    <type-decl name='void' id='type-id-168'/>
+    <function-decl name='efi_loadopt_attr_clear' mangled-name='efi_loadopt_attr_clear' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attr_clear@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-6' name='attr'/>
+      <return type-id='type-id-168'/>
     </function-decl>
-    <function-decl name='efi_loadopt_attr_set' mangled-name='efi_loadopt_attr_set' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attr_set@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='181' column='1'/>
-      <parameter type-id='type-id-6' name='attr' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='181' column='1'/>
-      <return type-id='type-id-157'/>
+    <function-decl name='efi_loadopt_attr_set' mangled-name='efi_loadopt_attr_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attr_set@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-6' name='attr'/>
+      <return type-id='type-id-168'/>
     </function-decl>
-    <function-decl name='efi_loadopt_attrs' mangled-name='efi_loadopt_attrs' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attrs@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='165' column='1'/>
+    <function-decl name='efi_loadopt_attrs' mangled-name='efi_loadopt_attrs' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attrs@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='efi_loadopt_optional_data_size' mangled-name='efi_loadopt_optional_data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_optional_data_size@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='104' column='1'/>
-      <parameter type-id='type-id-24' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='104' column='1'/>
-      <return type-id='type-id-15'/>
+    <function-decl name='efi_loadopt_is_valid' mangled-name='efi_loadopt_is_valid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_is_valid@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-26' name='size'/>
+      <return type-id='type-id-25'/>
     </function-decl>
-    <function-decl name='efi_loadopt_is_valid' mangled-name='efi_loadopt_is_valid' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_is_valid@@libefiboot.so.0'>
-      <parameter type-id='type-id-12' name='opt' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='154' column='1'/>
-      <parameter type-id='type-id-24' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='154' column='1'/>
-      <return type-id='type-id-22'/>
+    <function-decl name='efi_loadopt_optional_data_size' mangled-name='efi_loadopt_optional_data_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_optional_data_size@@libefiboot.so.0'>
+      <parameter type-id='type-id-15' name='opt'/>
+      <parameter type-id='type-id-26' name='size'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <function-decl name='efi_loadopt_create' mangled-name='efi_loadopt_create' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_create@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='41' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='41' column='1'/>
-      <parameter type-id='type-id-5' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='41' column='1'/>
-      <parameter type-id='type-id-156' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='42' column='1'/>
-      <parameter type-id='type-id-15' name='dp_size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='42' column='1'/>
-      <parameter type-id='type-id-25' name='description' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='42' column='1'/>
-      <parameter type-id='type-id-19' name='optional_data' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='43' column='1'/>
-      <parameter type-id='type-id-24' name='optional_data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/loadopt.c' line='43' column='1'/>
-      <return type-id='type-id-15'/>
+    <function-decl name='efi_loadopt_create' mangled-name='efi_loadopt_create' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_create@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-5' name='attributes'/>
+      <parameter type-id='type-id-167' name='dp'/>
+      <parameter type-id='type-id-18' name='dp_size'/>
+      <parameter type-id='type-id-27' name='description'/>
+      <parameter type-id='type-id-22' name='optional_data'/>
+      <parameter type-id='type-id-26' name='optional_data_size'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-20' const='yes' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
-    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-160'/>
-    <function-decl name='efi_generate_ipv4_device_path' mangled-name='efi_generate_ipv4_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_ipv4_device_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='428' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='428' column='1'/>
-      <parameter type-id='type-id-160' name='ifname' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='429' column='1'/>
-      <parameter type-id='type-id-160' name='local_addr' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='430' column='1'/>
-      <parameter type-id='type-id-160' name='remote_addr' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='431' column='1'/>
-      <parameter type-id='type-id-160' name='gateway_addr' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='432' column='1'/>
-      <parameter type-id='type-id-160' name='netmask' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='433' column='1'/>
-      <parameter type-id='type-id-6' name='local_port' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='434' column='1'/>
-      <parameter type-id='type-id-6' name='remote_port' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='435' column='1'/>
-      <parameter type-id='type-id-6' name='protocol' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='436' column='1'/>
-      <parameter type-id='type-id-18' name='addr_origin' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='437' column='1'/>
-      <return type-id='type-id-15'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-170'/>
+    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-171'/>
+    <function-decl name='efi_generate_ipv4_device_path' mangled-name='efi_generate_ipv4_device_path' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_ipv4_device_path@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-171' name='ifname'/>
+      <parameter type-id='type-id-171' name='local_addr'/>
+      <parameter type-id='type-id-171' name='remote_addr'/>
+      <parameter type-id='type-id-171' name='gateway_addr'/>
+      <parameter type-id='type-id-171' name='netmask'/>
+      <parameter type-id='type-id-6' name='local_port'/>
+      <parameter type-id='type-id-6' name='remote_port'/>
+      <parameter type-id='type-id-6' name='protocol'/>
+      <parameter type-id='type-id-21' name='addr_origin'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <function-decl name='efi_generate_file_device_path' mangled-name='efi_generate_file_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='341' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='341' column='1'/>
-      <parameter type-id='type-id-160' name='filepath' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='342' column='1'/>
-      <parameter type-id='type-id-5' name='options' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='343' column='1'/>
-      <return type-id='type-id-15'/>
+    <function-decl name='efi_generate_file_device_path' mangled-name='efi_generate_file_device_path' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-171' name='filepath'/>
+      <parameter type-id='type-id-5' name='options'/>
+      <return type-id='type-id-18'/>
     </function-decl>
-    <function-decl name='efi_generate_file_device_path_from_esp' mangled-name='efi_generate_file_device_path_from_esp' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path_from_esp@@libefiboot.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='317' column='1'/>
-      <parameter type-id='type-id-15' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='317' column='1'/>
-      <parameter type-id='type-id-159' name='devpath' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='318' column='1'/>
-      <parameter type-id='type-id-22' name='partition' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='318' column='1'/>
-      <parameter type-id='type-id-159' name='relpath' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='319' column='1'/>
-      <parameter type-id='type-id-5' name='options' filepath='/home/pjones/devel/github.com/efivar/master/src/creator.c' line='320' column='1'/>
-      <return type-id='type-id-15'/>
+    <function-decl name='efi_generate_file_device_path_from_esp' mangled-name='efi_generate_file_device_path_from_esp' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path_from_esp@@libefiboot.so.0'>
+      <parameter type-id='type-id-22' name='buf'/>
+      <parameter type-id='type-id-18' name='size'/>
+      <parameter type-id='type-id-170' name='devpath'/>
+      <parameter type-id='type-id-25' name='partition'/>
+      <parameter type-id='type-id-170' name='relpath'/>
+      <parameter type-id='type-id-5' name='options'/>
+      <return type-id='type-id-18'/>
     </function-decl>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/libio.h' line='245' column='1' id='type-id-172'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='_flags' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/libio.h' line='246' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='_IO_read_ptr' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='251' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='_IO_read_end' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='252' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='_IO_read_base' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='253' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='_IO_write_base' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='254' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='_IO_write_ptr' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='255' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='_IO_write_end' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='256' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='_IO_buf_base' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='257' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='_IO_buf_end' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='258' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='_IO_save_base' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='260' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='_IO_backup_base' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='261' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='_IO_save_end' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/libio.h' line='262' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='_markers' type-id='type-id-173' visibility='default' filepath='/usr/include/bits/libio.h' line='264' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='_chain' type-id='type-id-174' visibility='default' filepath='/usr/include/bits/libio.h' line='266' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='_fileno' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/libio.h' line='268' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='928'>
+        <var-decl name='_flags2' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/libio.h' line='272' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='_old_offset' type-id='type-id-175' visibility='default' filepath='/usr/include/bits/libio.h' line='274' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='_cur_column' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/libio.h' line='278' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1040'>
+        <var-decl name='_vtable_offset' type-id='type-id-176' visibility='default' filepath='/usr/include/bits/libio.h' line='279' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1048'>
+        <var-decl name='_shortbuf' type-id='type-id-100' visibility='default' filepath='/usr/include/bits/libio.h' line='280' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='_offset' type-id='type-id-177' visibility='default' filepath='/usr/include/bits/libio.h' line='293' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='__pad1' type-id='type-id-178' visibility='default' filepath='/usr/include/bits/libio.h' line='301' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='__pad2' type-id='type-id-178' visibility='default' filepath='/usr/include/bits/libio.h' line='302' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='__pad3' type-id='type-id-178' visibility='default' filepath='/usr/include/bits/libio.h' line='303' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='__pad4' type-id='type-id-178' visibility='default' filepath='/usr/include/bits/libio.h' line='304' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='__pad5' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/libio.h' line='306' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='_mode' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/libio.h' line='307' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1568'>
+        <var-decl name='_unused2' type-id='type-id-179' visibility='default' filepath='/usr/include/bits/libio.h' line='309' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/bits/libio.h' line='160' column='1' id='type-id-180'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='_next' type-id='type-id-173' visibility='default' filepath='/usr/include/bits/libio.h' line='161' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='_sbuf' type-id='type-id-174' visibility='default' filepath='/usr/include/bits/libio.h' line='162' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='_pos' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/libio.h' line='166' column='1'/>
+      </data-member>
+    </class-decl>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-173'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-174'/>
+    <typedef-decl name='__off_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='140' column='1' id='type-id-175'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-176'/>
+    <typedef-decl name='__off64_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-178'/>
+
+    <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='160' id='type-id-179'>
+      <subrange length='20' type-id='type-id-12' id='type-id-181'/>
+
+    </array-type-def>
+    <var-decl name='stderr' type-id='type-id-174' visibility='default' filepath='/usr/include/stdio.h' line='137' column='1'/>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-168'/>
     </function-decl>
     <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-168'/>
     </function-decl>
     <function-decl name='__builtin_calloc' mangled-name='calloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-168'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/src/libefivar.abixml b/src/libefivar.abixml
index 2d545bf..6ba4063 100644
--- a/src/libefivar.abixml
+++ b/src/libefivar.abixml
@@ -104,1424 +104,1754 @@
     <elf-symbol name='efi_well_known_guids' size='18480' version='libefivar.so.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_well_known_guids_end' size='1' version='libefivar.so.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='&lt;artificial&gt;' comp-dir-path='/home/pjones/devel/github.com/efivar/master/src' language='LANG_C99'>
-    <type-decl name='int' size-in-bits='32' id='type-id-1'/>
-    <function-decl name='efi_variables_supported' mangled-name='efi_variables_supported' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variables_supported@@libefivar.so.0'>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='33' column='1' id='type-id-3'>
+  <abi-instr version='1.0' address-size='64' path='efivarfs.c' comp-dir-path='/home/pjones/devel/github.com/efivar/master/src' language='LANG_C99'>
+    <class-decl name='efi_var_operations' size-in-bits='2624' is-struct='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='31' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='34' column='1'/>
+        <var-decl name='name' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='32' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='35' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2048'>
+        <var-decl name='probe' type-id='type-id-3' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='33' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='36' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2112'>
+        <var-decl name='set_variable' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='34' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='37' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2176'>
+        <var-decl name='del_variable' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='36' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='38' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2240'>
+        <var-decl name='get_variable' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2304'>
+        <var-decl name='get_variable_attributes' type-id='type-id-7' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='39' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2368'>
+        <var-decl name='get_variable_size' type-id='type-id-8' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='41' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='get_next_variable_name' type-id='type-id-9' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2496'>
+        <var-decl name='append_variable' type-id='type-id-10' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='44' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2560'>
+        <var-decl name='chmod_variable' type-id='type-id-11' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='47' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-7'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-7' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-8'/>
-    <typedef-decl name='uint32_t' type-id='type-id-8' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-4'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-9'/>
-    <typedef-decl name='__uint16_t' type-id='type-id-9' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-10'/>
-    <typedef-decl name='uint16_t' type-id='type-id-10' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-5'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-11'/>
-    <typedef-decl name='__uint8_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='37' column='1' id='type-id-12'/>
-    <typedef-decl name='uint8_t' type-id='type-id-12' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-13'/>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='48' id='type-id-6'>
-      <subrange length='6'/>
+    <type-decl name='char' size-in-bits='8' id='type-id-12'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-13'/>
+
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='2040' id='type-id-2'>
+      <subrange length='255' type-id='type-id-13' id='type-id-14'/>
+
     </array-type-def>
-    <qualified-type-def type-id='type-id-3' const='yes' id='type-id-14'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-15'/>
-    <function-decl name='efi_guid_cmp' mangled-name='efi_guid_cmp' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_cmp@@LIBEFIVAR_0.24'>
-      <parameter type-id='type-id-15' name='a' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='35' column='1'/>
-      <parameter type-id='type-id-15' name='b' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='35' column='1'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <class-decl name='efi_variable' size-in-bits='320' is-struct='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='34' column='1' id='type-id-16'>
+    <type-decl name='int' size-in-bits='32' id='type-id-15'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-3'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='33' column='1' id='type-id-18'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='attrs' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='35' column='1'/>
+        <var-decl name='a' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='34' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-18' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='36' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='b' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='35' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='name' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='37' column='1'/>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='c' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='36' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='38' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='d' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='37' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='data_size' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='39' column='1'/>
+      <data-member access='public' layout-offset-in-bits='80'>
+        <var-decl name='e' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='38' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-22'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-23'/>
-    <typedef-decl name='uint64_t' type-id='type-id-23' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-17'/>
-    <typedef-decl name='efi_guid_t' type-id='type-id-3' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='39' column='1' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-18'/>
-    <type-decl name='char' size-in-bits='8' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-19'/>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-20'/>
-    <typedef-decl name='size_t' type-id='type-id-22' filepath='/usr/lib/gcc/x86_64-redhat-linux/7/include/stddef.h' line='216' column='1' id='type-id-21'/>
-    <typedef-decl name='efi_variable_t' type-id='type-id-16' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='133' column='1' id='type-id-25'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-26'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-27'/>
-    <function-decl name='efi_variable_get_attributes' mangled-name='efi_variable_get_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_attributes@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='337' column='1'/>
-      <parameter type-id='type-id-27' name='attrs' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='337' column='1'/>
-      <return type-id='type-id-1'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-22'/>
+    <typedef-decl name='__uint32_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-23'/>
+    <typedef-decl name='uint32_t' type-id='type-id-23' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-19'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-24'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-24' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-25'/>
+    <typedef-decl name='uint16_t' type-id='type-id-25' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-20'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-26'/>
+    <typedef-decl name='__uint8_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='37' column='1' id='type-id-27'/>
+    <typedef-decl name='uint8_t' type-id='type-id-27' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-28'/>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='48' id='type-id-21'>
+      <subrange length='6' type-id='type-id-13' id='type-id-29'/>
+
+    </array-type-def>
+    <typedef-decl name='efi_guid_t' type-id='type-id-18' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='39' column='1' id='type-id-17'/>
+    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-32'/>
+    <typedef-decl name='size_t' type-id='type-id-13' filepath='/usr/lib/gcc/x86_64-redhat-linux/8/include/stddef.h' line='216' column='1' id='type-id-33'/>
+    <typedef-decl name='__mode_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='138' column='1' id='type-id-34'/>
+    <typedef-decl name='mode_t' type-id='type-id-34' filepath='/usr/include/fcntl.h' line='50' column='1' id='type-id-35'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-4'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-5'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-38'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-40'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-6'/>
+    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-8'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-44'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-46'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-10'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-11'/>
+    <var-decl name='efivarfs_ops' type-id='type-id-1' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='53' column='1'/>
+    <function-type size-in-bits='64' id='type-id-16'>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-48'>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-47'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-37'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-43'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-39'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-50'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-35'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-42'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-40'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-41'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-38'/>
+      <parameter type-id='type-id-39'/>
+      <parameter type-id='type-id-40'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-49'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-32'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-19'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-36'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-32'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-35'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='guid-symbols.c' comp-dir-path='/home/pjones/devel/github.com/efivar/master/src' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-51'/>
+    <var-decl name='efi_guid_empty' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='4' column='1'/>
+    <var-decl name='efi_guid_zero' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='5' column='1'/>
+    <var-decl name='efi_guid_sha512' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='6' column='1'/>
+    <var-decl name='efi_guid_redhat' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='7' column='1'/>
+    <var-decl name='efi_guid_fwupdate' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='8' column='1'/>
+    <var-decl name='efi_guid_sha224' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='9' column='1'/>
+    <var-decl name='efi_guid_lenovo_boot_menu' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='10' column='1'/>
+    <var-decl name='efi_guid_ux_capsule' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='11' column='1'/>
+    <var-decl name='efi_guid_x509_sha256' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='12' column='1'/>
+    <var-decl name='efi_guid_rsa2048' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='13' column='1'/>
+    <var-decl name='efi_guid_lenovo' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='14' column='1'/>
+    <var-decl name='efi_guid_lenovo_diag' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='15' column='1'/>
+    <var-decl name='efi_guid_x509_sha512' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='16' column='1'/>
+    <var-decl name='efi_guid_external_management' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='17' column='1'/>
+    <var-decl name='efi_guid_pkcs7_cert' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='18' column='1'/>
+    <var-decl name='efi_guid_shim' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='19' column='1'/>
+    <var-decl name='efi_guid_lenovo_rescue' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='20' column='1'/>
+    <var-decl name='efi_guid_rsa2048_sha1' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='21' column='1'/>
+    <var-decl name='efi_guid_x509_sha384' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='22' column='1'/>
+    <var-decl name='efi_guid_lenovo_setup' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='23' column='1'/>
+    <var-decl name='efi_guid_microsoft' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='24' column='1'/>
+    <var-decl name='efi_guid_lenovo_2' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='25' column='1'/>
+    <var-decl name='efi_guid_sha1' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='26' column='1'/>
+    <var-decl name='efi_guid_lenovo_me_config' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='27' column='1'/>
+    <var-decl name='efi_guid_global' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='28' column='1'/>
+    <var-decl name='efi_guid_x509_cert' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='29' column='1'/>
+    <var-decl name='efi_guid_rsa2048_sha256_cert' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='30' column='1'/>
+    <var-decl name='efi_guid_lenovo_diag_splash' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='31' column='1'/>
+    <var-decl name='efi_guid_redhat_2' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='32' column='1'/>
+    <var-decl name='efi_guid_lenovo_msg' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='33' column='1'/>
+    <var-decl name='efi_guid_sha256' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='34' column='1'/>
+    <var-decl name='efi_guid_shell' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='35' column='1'/>
+    <var-decl name='efi_guid_security' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='36' column='1'/>
+    <var-decl name='efi_guid_rsa2048_sha256' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='37' column='1'/>
+    <var-decl name='efi_guid_sha384' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='38' column='1'/>
+    <var-decl name='efi_guid_lenovo_startup_interrupt' type-id='type-id-51' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-guids.h' line='39' column='1'/>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='vars.c' comp-dir-path='/home/pjones/devel/github.com/efivar/master/src' language='LANG_C99'>
+    <var-decl name='vars_ops' type-id='type-id-1' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.h' line='52' column='1'/>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='&lt;artificial&gt;' comp-dir-path='/home/pjones/devel/github.com/efivar/master/src' language='LANG_C99'>
+    <function-decl name='efi_variables_supported' mangled-name='efi_variables_supported' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variables_supported@@libefivar.so.0'>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_set_attributes' mangled-name='efi_variable_set_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_attributes@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='328' column='1'/>
-      <parameter type-id='type-id-17' name='attrs' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='328' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_chmod_variable' mangled-name='efi_chmod_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_chmod_variable@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <parameter type-id='type-id-35' name='mode' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <parameter type-id='type-id-35' name='mode' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='228' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <type-decl name='long int' size-in-bits='64' id='type-id-28'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='181' column='1' id='type-id-29'/>
-    <typedef-decl name='ssize_t' type-id='type-id-29' filepath='/usr/include/sys/types.h' line='109' column='1' id='type-id-30'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-32'/>
-    <function-decl name='efi_variable_get_data' mangled-name='efi_variable_get_data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_data@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='313' column='1'/>
-      <parameter type-id='type-id-31' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='313' column='1'/>
-      <parameter type-id='type-id-32' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='313' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efi_get_next_variable_name' mangled-name='efi_get_next_variable_name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_next_variable_name@@libefivar.so.0'>
+      <parameter type-id='type-id-45' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='209' column='1'/>
+      <parameter type-id='type-id-47' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='209' column='1'/>
+      <parameter type-id='type-id-45' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='209' column='1'/>
+      <parameter type-id='type-id-47' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='209' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_set_data' mangled-name='efi_variable_set_data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_data@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='298' column='1'/>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='298' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='298' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_get_variable_size' mangled-name='efi_get_variable_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_size@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <parameter type-id='type-id-39' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <parameter type-id='type-id-39' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='190' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-33'/>
-    <function-decl name='efi_variable_get_guid' mangled-name='efi_variable_get_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='284' column='1'/>
-      <parameter type-id='type-id-33' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='284' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_get_variable_exists' mangled-name='efi_get_variable_exists' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_exists@@LIBEFIVAR_1.35'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='181' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='181' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_set_guid' mangled-name='efi_variable_set_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='275' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='275' column='1'/>
-      <parameter type-id='type-id-18' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='275' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_get_variable_attributes' mangled-name='efi_get_variable_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_attributes@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='161' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='161' column='1'/>
+      <parameter type-id='type-id-40' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='162' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='161' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='161' column='1'/>
+      <parameter type-id='type-id-40' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='162' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_get_name' mangled-name='efi_variable_get_name' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_name@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='262' column='1'/>
-      <return type-id='type-id-19'/>
+    <function-decl name='efi_get_variable' mangled-name='efi_get_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-38' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-39' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='142' column='1'/>
+      <parameter type-id='type-id-40' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='142' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-38' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='141' column='1'/>
+      <parameter type-id='type-id-39' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='142' column='1'/>
+      <parameter type-id='type-id-40' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='142' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_set_name' mangled-name='efi_variable_set_name' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_name@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='248' column='1'/>
-      <parameter type-id='type-id-19' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='248' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_del_variable' mangled-name='efi_del_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_del_variable@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='122' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='122' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='122' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='122' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <type-decl name='void' id='type-id-34'/>
-    <function-decl name='efi_variable_free' mangled-name='efi_variable_free' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_free@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='225' column='1'/>
-      <parameter type-id='type-id-1' name='free_data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='225' column='1'/>
-      <return type-id='type-id-34'/>
+    <function-decl name='efi_append_variable' mangled-name='efi_append_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_append_variable@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='98' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='98' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='98' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='99' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='99' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_export' mangled-name='efi_variable_export' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='153' column='1'/>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='153' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='153' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='_efi_set_variable_mode' mangled-name='efi_set_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_set_variable@@LIBEFIVAR_0.24'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <parameter type-id='type-id-35' name='mode' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='75' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <parameter type-id='type-id-35' name='mode' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='76' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-35'/>
-    <function-decl name='efi_variable_import' mangled-name='efi_variable_import' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_import@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='59' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='59' column='1'/>
-      <parameter type-id='type-id-35' name='var_out' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='59' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='_efi_set_variable_variadic' mangled-name='_efi_set_variable_variadic' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_efi_set_variable_variadic@@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_error_clear' mangled-name='efi_error_clear' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_clear@@LIBEFIVAR_1.30'>
-      <return type-id='type-id-34'/>
+    <function-decl name='_efi_set_variable' mangled-name='_efi_set_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_efi_set_variable@libefivar.so.0'>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-17' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-31' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='61' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <parameter type-id='type-id-19' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='62' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-36'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-37'/>
-    <function-decl name='efi_error_set' mangled-name='efi_error_set' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_set@@LIBEFIVAR_1.30'>
-      <parameter type-id='type-id-37' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='82' column='1'/>
-      <parameter type-id='type-id-37' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='83' column='1'/>
-      <parameter type-id='type-id-1' name='line' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='84' column='1'/>
-      <parameter type-id='type-id-1' name='error' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='85' column='1'/>
-      <parameter type-id='type-id-37' name='fmt' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='86' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_name_to_guid' mangled-name='efi_name_to_guid' filepath='/usr/include/sys/stat.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_name_to_guid@@libefivar.so.0'>
+      <parameter type-id='type-id-31' name='name' filepath='/usr/include/sys/stat.h' line='269' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='269' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <typedef-decl name='__mode_t' type-id='type-id-7' filepath='/usr/include/bits/types.h' line='138' column='1' id='type-id-38'/>
-    <typedef-decl name='mode_t' type-id='type-id-38' filepath='/usr/include/fcntl.h' line='50' column='1' id='type-id-39'/>
-    <function-decl name='efi_chmod_variable' mangled-name='efi_chmod_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_chmod_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='228' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='228' column='1'/>
-      <parameter type-id='type-id-39' name='mode' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='228' column='1'/>
-      <return type-id='type-id-1'/>
+    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-52'/>
+    <function-decl name='efi_guid_to_id_guid' mangled-name='efi_guid_to_id_guid' filepath='/usr/include/sys/stat.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_id_guid@@libefivar.so.0'>
+      <parameter type-id='type-id-52' name='guid' filepath='/usr/include/sys/stat.h' line='197' column='1'/>
+      <parameter type-id='type-id-47' name='sp' filepath='/usr/include/sys/stat.h' line='197' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-40'/>
-    <function-decl name='efi_get_next_variable_name' mangled-name='efi_get_next_variable_name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_next_variable_name@@libefivar.so.0'>
-      <parameter type-id='type-id-33' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='209' column='1'/>
-      <parameter type-id='type-id-40' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='209' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_guid_to_symbol' mangled-name='efi_guid_to_symbol' filepath='/usr/include/sys/stat.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_symbol@@libefivar.so.0'>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-47' name='symbol' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-47' name='symbol' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <return type-id='type-id-15'/>
+    </function-decl>
+    <function-decl name='efi_guid_to_name' mangled-name='efi_guid_to_name' filepath='/usr/include/sys/stat.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_name@@libefivar.so.0'>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-47' name='symbol' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <parameter type-id='type-id-47' name='symbol' filepath='/usr/include/sys/stat.h' line='181' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_get_variable_size' mangled-name='efi_get_variable_size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_size@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='190' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='190' column='1'/>
-      <parameter type-id='type-id-32' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='190' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_guid_to_str' mangled-name='efi_guid_to_str' filepath='/usr/include/sys/stat.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_str@@libefivar.so.0'>
+      <parameter type-id='type-id-52' name='guid' filepath='/usr/include/sys/stat.h' line='69' column='1'/>
+      <parameter type-id='type-id-47' name='sp' filepath='/usr/include/sys/stat.h' line='69' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-41'/>
-    <function-decl name='efi_get_variable_attributes' mangled-name='efi_get_variable_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_attributes@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='161' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='161' column='1'/>
-      <parameter type-id='type-id-41' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='162' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_str_to_guid' mangled-name='efi_str_to_guid' filepath='/usr/include/sys/stat.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_str_to_guid@@libefivar.so.0'>
+      <parameter type-id='type-id-31' name='s' filepath='/usr/include/sys/stat.h' line='57' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='57' column='1'/>
+      <parameter type-id='type-id-31' name='s' filepath='/usr/include/sys/stat.h' line='57' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/usr/include/sys/stat.h' line='57' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_get_variable_exists' mangled-name='efi_get_variable_exists' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_exists@@LIBEFIVAR_1.35'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='181' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='181' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_guid_is_zero' mangled-name='efi_guid_is_empty' filepath='/usr/include/sys/stat.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_is_empty@@libefivar.so.0'>
+      <parameter type-id='type-id-52' name='guid' filepath='/usr/include/sys/stat.h' line='43' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_get_variable' mangled-name='efi_get_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='141' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='141' column='1'/>
-      <parameter type-id='type-id-31' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='141' column='1'/>
-      <parameter type-id='type-id-32' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='142' column='1'/>
-      <parameter type-id='type-id-41' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='142' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_guid_cmp' mangled-name='efi_guid_cmp' filepath='/usr/include/sys/stat.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_cmp@@LIBEFIVAR_0.24'>
+      <parameter type-id='type-id-52' name='a' filepath='/usr/include/sys/stat.h' line='35' column='1'/>
+      <parameter type-id='type-id-52' name='b' filepath='/usr/include/sys/stat.h' line='35' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_del_variable' mangled-name='efi_del_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_del_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='122' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='122' column='1'/>
-      <return type-id='type-id-1'/>
+    <class-decl name='efi_variable' size-in-bits='320' is-struct='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='34' column='1' id='type-id-53'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='attrs' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='35' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='guid' type-id='type-id-44' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='36' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='name' type-id='type-id-46' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='data' type-id='type-id-32' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='38' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='data_size' type-id='type-id-33' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='39' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='__uint64_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-55'/>
+    <typedef-decl name='uint64_t' type-id='type-id-55' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-54'/>
+    <typedef-decl name='efi_variable_t' type-id='type-id-53' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='133' column='1' id='type-id-56'/>
+    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-57'/>
+    <function-decl name='efi_variable_realize' mangled-name='efi_variable_realize' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_realize@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='351' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_append_variable' mangled-name='efi_append_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_append_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='98' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='98' column='1'/>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='98' column='1'/>
-      <parameter type-id='type-id-21' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='99' column='1'/>
-      <parameter type-id='type-id-4' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='99' column='1'/>
-      <return type-id='type-id-1'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-58'/>
+    <function-decl name='efi_variable_get_attributes' mangled-name='efi_variable_get_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_attributes@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='337' column='1'/>
+      <parameter type-id='type-id-58' name='attrs' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='337' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_variable_realize' mangled-name='efi_variable_realize' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_realize@@libefivar.so.0'>
-      <parameter type-id='type-id-26' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/export.c' line='351' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_get_guid' mangled-name='efi_variable_get_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_guid@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='284' column='1'/>
+      <parameter type-id='type-id-45' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='284' column='1'/>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='284' column='1'/>
+      <parameter type-id='type-id-45' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='284' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='_efi_set_variable_variadic' mangled-name='_efi_set_variable_variadic' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_efi_set_variable_variadic@@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-21' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='62' column='1'/>
-      <parameter type-id='type-id-4' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='62' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_set_attributes' mangled-name='efi_variable_set_attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_attributes@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='328' column='1'/>
+      <parameter type-id='type-id-54' name='attrs' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='328' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='_efi_set_variable' mangled-name='_efi_set_variable' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_efi_set_variable@libefivar.so.0'>
-      <parameter type-id='type-id-2' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-20' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='61' column='1'/>
-      <parameter type-id='type-id-21' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='62' column='1'/>
-      <parameter type-id='type-id-4' name='attributes' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='62' column='1'/>
-      <return type-id='type-id-1'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-59'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-59' filepath='/usr/include/bits/types.h' line='181' column='1' id='type-id-60'/>
+    <typedef-decl name='ssize_t' type-id='type-id-60' filepath='/usr/include/sys/types.h' line='109' column='1' id='type-id-61'/>
+    <function-decl name='efi_variable_get_data' mangled-name='efi_variable_get_data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_data@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <parameter type-id='type-id-38' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <parameter type-id='type-id-39' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <parameter type-id='type-id-38' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <parameter type-id='type-id-39' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='313' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efi_guid_to_id_guid' mangled-name='efi_guid_to_id_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_id_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-15' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='197' column='1'/>
-      <parameter type-id='type-id-40' name='sp' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='197' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_set_data' mangled-name='efi_variable_set_data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_data@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='298' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_guid_to_symbol' mangled-name='efi_guid_to_symbol' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_symbol@@libefivar.so.0'>
-      <parameter type-id='type-id-18' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='181' column='1'/>
-      <parameter type-id='type-id-40' name='symbol' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='181' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_set_guid' mangled-name='efi_variable_set_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_guid@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='275' column='1'/>
+      <parameter type-id='type-id-44' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='275' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_guid_to_str' mangled-name='efi_guid_to_str' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_str@@libefivar.so.0'>
-      <parameter type-id='type-id-15' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='69' column='1'/>
-      <parameter type-id='type-id-40' name='sp' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='69' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_get_name' mangled-name='efi_variable_get_name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_get_name@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='262' column='1'/>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='262' column='1'/>
+      <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='efi_guid_to_name' mangled-name='efi_guid_to_name' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_name@@libefivar.so.0'>
-      <parameter type-id='type-id-18' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='181' column='1'/>
-      <parameter type-id='type-id-40' name='symbol' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='181' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_set_name' mangled-name='efi_variable_set_name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_set_name@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='248' column='1'/>
+      <parameter type-id='type-id-46' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='248' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efi_str_to_guid' mangled-name='efi_str_to_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_str_to_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-37' name='s' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='57' column='1'/>
-      <parameter type-id='type-id-18' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='57' column='1'/>
-      <return type-id='type-id-1'/>
+    <type-decl name='void' id='type-id-62'/>
+    <function-decl name='efi_variable_free' mangled-name='efi_variable_free' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_free@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='225' column='1'/>
+      <parameter type-id='type-id-15' name='free_data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='225' column='1'/>
+      <return type-id='type-id-62'/>
     </function-decl>
-    <function-decl name='efi_name_to_guid' mangled-name='efi_name_to_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_name_to_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-37' name='name' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='269' column='1'/>
-      <parameter type-id='type-id-18' name='guid' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='269' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efi_variable_export' mangled-name='efi_variable_export' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export@@libefivar.so.0'>
+      <parameter type-id='type-id-57' name='var' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='153' column='1'/>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='153' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='153' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-42'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-43'/>
-    <function-decl name='efi_error_get' mangled-name='efi_error_get' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_get@@LIBEFIVAR_1.30'>
-      <parameter type-id='type-id-7' name='n' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='53' column='1'/>
-      <parameter type-id='type-id-42' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='54' column='1'/>
-      <parameter type-id='type-id-42' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='55' column='1'/>
-      <parameter type-id='type-id-43' name='line' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='56' column='1'/>
-      <parameter type-id='type-id-42' name='message' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='57' column='1'/>
-      <parameter type-id='type-id-43' name='error' filepath='/home/pjones/devel/github.com/efivar/master/src/error.c' line='58' column='1'/>
-      <return type-id='type-id-1'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-63'/>
+    <function-decl name='efi_variable_import' mangled-name='efi_variable_import' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_import@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='59' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='59' column='1'/>
+      <parameter type-id='type-id-63' name='var_out' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='59' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_generic' mangled-name='efidp_make_generic' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_generic@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='451' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='451' column='1'/>
-      <parameter type-id='type-id-13' name='type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='451' column='1'/>
-      <parameter type-id='type-id-13' name='subtype' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='451' column='1'/>
-      <parameter type-id='type-id-30' name='total_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='452' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efi_error_clear' mangled-name='efi_error_clear' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_clear@@LIBEFIVAR_1.30'>
+      <return type-id='type-id-62'/>
     </function-decl>
-    <function-decl name='efidp_make_nvdimm' mangled-name='efidp_make_nvdimm' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='813' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvdimm@@LIBEFIVAR_1.33'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='813' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='813' column='1'/>
-      <parameter type-id='type-id-18' name='uuid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='813' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efi_error_set' mangled-name='efi_error_set' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_set@@LIBEFIVAR_1.30'>
+      <parameter type-id='type-id-31' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='82' column='1'/>
+      <parameter type-id='type-id-31' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='83' column='1'/>
+      <parameter type-id='type-id-15' name='line' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='84' column='1'/>
+      <parameter type-id='type-id-15' name='error' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='85' column='1'/>
+      <parameter type-id='type-id-31' name='fmt' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='86' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_make_sas' mangled-name='efidp_make_sas' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sas@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='787' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='787' column='1'/>
-      <parameter type-id='type-id-17' name='sas_address' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='787' column='1'/>
-      <return type-id='type-id-30'/>
+    <qualified-type-def type-id='type-id-47' const='yes' id='type-id-64'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-65'/>
+    <function-decl name='efi_error_get' mangled-name='efi_error_get' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_get@@LIBEFIVAR_1.30'>
+      <parameter type-id='type-id-22' name='n' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='53' column='1'/>
+      <parameter type-id='type-id-64' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='54' column='1'/>
+      <parameter type-id='type-id-64' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='55' column='1'/>
+      <parameter type-id='type-id-65' name='line' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='56' column='1'/>
+      <parameter type-id='type-id-64' name='message' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='57' column='1'/>
+      <parameter type-id='type-id-65' name='error' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='58' column='1'/>
+      <parameter type-id='type-id-22' name='n' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='53' column='1'/>
+      <parameter type-id='type-id-64' name='filename' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='54' column='1'/>
+      <parameter type-id='type-id-64' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='55' column='1'/>
+      <parameter type-id='type-id-65' name='line' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='56' column='1'/>
+      <parameter type-id='type-id-64' name='message' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='57' column='1'/>
+      <parameter type-id='type-id-65' name='error' filepath='/home/pjones/devel/github.com/efivar/master/src/util.h' line='58' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_make_atapi' mangled-name='efidp_make_atapi' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_atapi@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='763' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='763' column='1'/>
-      <parameter type-id='type-id-5' name='primary' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='763' column='1'/>
-      <parameter type-id='type-id-5' name='slave' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='764' column='1'/>
-      <parameter type-id='type-id-5' name='lun' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='764' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_nvdimm' mangled-name='efidp_make_nvdimm' filepath='/usr/include/bits/byteswap.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvdimm@@LIBEFIVAR_1.33'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <parameter type-id='type-id-44' name='uuid' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <parameter type-id='type-id-44' name='uuid' filepath='/usr/include/bits/byteswap.h' line='813' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <type-decl name='short int' size-in-bits='16' id='type-id-44'/>
-    <typedef-decl name='__int16_t' type-id='type-id-44' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-45'/>
-    <typedef-decl name='int16_t' type-id='type-id-45' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-46'/>
-    <function-decl name='efidp_make_sata' mangled-name='efidp_make_sata' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sata@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='740' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='740' column='1'/>
-      <parameter type-id='type-id-5' name='hba_port' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='740' column='1'/>
-      <parameter type-id='type-id-46' name='port_multiplier_port' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='741' column='1'/>
-      <parameter type-id='type-id-5' name='lun' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='741' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_sas' mangled-name='efidp_make_sas' filepath='/usr/include/bits/byteswap.h' line='787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sas@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <parameter type-id='type-id-54' name='sas_address' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <parameter type-id='type-id-54' name='sas_address' filepath='/usr/include/bits/byteswap.h' line='787' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_nvme' mangled-name='efidp_make_nvme' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvme@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='713' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='713' column='1'/>
-      <parameter type-id='type-id-4' name='namespace_id' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='713' column='1'/>
-      <parameter type-id='type-id-20' name='ieee_eui_64' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='714' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_atapi' mangled-name='efidp_make_atapi' filepath='/usr/include/bits/byteswap.h' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_atapi@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-20' name='primary' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-20' name='slave' filepath='/usr/include/bits/byteswap.h' line='764' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='764' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-20' name='primary' filepath='/usr/include/bits/byteswap.h' line='763' column='1'/>
+      <parameter type-id='type-id-20' name='slave' filepath='/usr/include/bits/byteswap.h' line='764' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='764' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_scsi' mangled-name='efidp_make_scsi' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_scsi@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='694' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='694' column='1'/>
-      <parameter type-id='type-id-5' name='target' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='694' column='1'/>
-      <parameter type-id='type-id-5' name='lun' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='694' column='1'/>
-      <return type-id='type-id-30'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-66'/>
+    <typedef-decl name='__int16_t' type-id='type-id-66' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-67'/>
+    <typedef-decl name='int16_t' type-id='type-id-67' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-68'/>
+    <function-decl name='efidp_make_sata' mangled-name='efidp_make_sata' filepath='/usr/include/bits/byteswap.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sata@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-20' name='hba_port' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-68' name='port_multiplier_port' filepath='/usr/include/bits/byteswap.h' line='741' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='741' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-20' name='hba_port' filepath='/usr/include/bits/byteswap.h' line='740' column='1'/>
+      <parameter type-id='type-id-68' name='port_multiplier_port' filepath='/usr/include/bits/byteswap.h' line='741' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='741' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_ipv4' mangled-name='efidp_make_ipv4' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='664' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_ipv4@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='664' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='664' column='1'/>
-      <parameter type-id='type-id-4' name='local' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='664' column='1'/>
-      <parameter type-id='type-id-4' name='remote' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='664' column='1'/>
-      <parameter type-id='type-id-4' name='gateway' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='665' column='1'/>
-      <parameter type-id='type-id-4' name='netmask' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='665' column='1'/>
-      <parameter type-id='type-id-5' name='local_port' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='666' column='1'/>
-      <parameter type-id='type-id-5' name='remote_port' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='666' column='1'/>
-      <parameter type-id='type-id-5' name='protocol' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='667' column='1'/>
-      <parameter type-id='type-id-1' name='is_static' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='667' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_nvme' mangled-name='efidp_make_nvme' filepath='/usr/include/bits/byteswap.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvme@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-19' name='namespace_id' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-32' name='ieee_eui_64' filepath='/usr/include/bits/byteswap.h' line='714' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-19' name='namespace_id' filepath='/usr/include/bits/byteswap.h' line='713' column='1'/>
+      <parameter type-id='type-id-32' name='ieee_eui_64' filepath='/usr/include/bits/byteswap.h' line='714' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-47'/>
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-49'/>
-    <function-decl name='efidp_make_mac_addr' mangled-name='efidp_make_mac_addr' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_mac_addr@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-13' name='if_type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-49' name='mac_addr' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='643' column='1'/>
-      <parameter type-id='type-id-30' name='mac_addr_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-message.c' line='643' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_scsi' mangled-name='efidp_make_scsi' filepath='/usr/include/bits/byteswap.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_scsi@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-20' name='target' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-20' name='target' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <parameter type-id='type-id-20' name='lun' filepath='/usr/include/bits/byteswap.h' line='694' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_hd' mangled-name='efidp_make_hd' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_hd@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='179' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='179' column='1'/>
-      <parameter type-id='type-id-4' name='num' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='179' column='1'/>
-      <parameter type-id='type-id-17' name='part_start' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='179' column='1'/>
-      <parameter type-id='type-id-17' name='part_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='180' column='1'/>
-      <parameter type-id='type-id-20' name='signature' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='180' column='1'/>
-      <parameter type-id='type-id-13' name='format' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='180' column='1'/>
-      <parameter type-id='type-id-13' name='signature_type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='181' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_ipv4' mangled-name='efidp_make_ipv4' filepath='/usr/include/bits/byteswap.h' line='664' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_ipv4@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='664' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='664' column='1'/>
+      <parameter type-id='type-id-19' name='local' filepath='/usr/include/bits/byteswap.h' line='664' column='1'/>
+      <parameter type-id='type-id-19' name='remote' filepath='/usr/include/bits/byteswap.h' line='664' column='1'/>
+      <parameter type-id='type-id-19' name='gateway' filepath='/usr/include/bits/byteswap.h' line='665' column='1'/>
+      <parameter type-id='type-id-19' name='netmask' filepath='/usr/include/bits/byteswap.h' line='665' column='1'/>
+      <parameter type-id='type-id-20' name='local_port' filepath='/usr/include/bits/byteswap.h' line='666' column='1'/>
+      <parameter type-id='type-id-20' name='remote_port' filepath='/usr/include/bits/byteswap.h' line='666' column='1'/>
+      <parameter type-id='type-id-20' name='protocol' filepath='/usr/include/bits/byteswap.h' line='667' column='1'/>
+      <parameter type-id='type-id-15' name='is_static' filepath='/usr/include/bits/byteswap.h' line='667' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_file' mangled-name='efidp_make_file' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_file@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='157' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='157' column='1'/>
-      <parameter type-id='type-id-19' name='filepath' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='157' column='1'/>
-      <return type-id='type-id-30'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-69'/>
+    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-70'/>
+    <qualified-type-def type-id='type-id-70' const='yes' id='type-id-71'/>
+    <function-decl name='efidp_make_mac_addr' mangled-name='efidp_make_mac_addr' filepath='/usr/include/bits/byteswap.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_mac_addr@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-28' name='if_type' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-71' name='mac_addr' filepath='/usr/include/bits/byteswap.h' line='643' column='1'/>
+      <parameter type-id='type-id-61' name='mac_addr_size' filepath='/usr/include/bits/byteswap.h' line='643' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-28' name='if_type' filepath='/usr/include/bits/byteswap.h' line='642' column='1'/>
+      <parameter type-id='type-id-71' name='mac_addr' filepath='/usr/include/bits/byteswap.h' line='643' column='1'/>
+      <parameter type-id='type-id-61' name='mac_addr_size' filepath='/usr/include/bits/byteswap.h' line='643' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_edd10' mangled-name='efidp_make_edd10' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_edd10@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='106' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='106' column='1'/>
-      <parameter type-id='type-id-4' name='hardware_device' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='106' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_hd' mangled-name='efidp_make_hd' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_hd@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-19' name='num' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-54' name='part_start' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-54' name='part_size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-32' name='signature' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-28' name='signature_type' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='181' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-19' name='num' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-54' name='part_start' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='179' column='1'/>
+      <parameter type-id='type-id-54' name='part_size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-32' name='signature' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='180' column='1'/>
+      <parameter type-id='type-id-28' name='signature_type' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='181' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_pci' mangled-name='efidp_make_pci' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_pci@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='86' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='86' column='1'/>
-      <parameter type-id='type-id-13' name='device' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='86' column='1'/>
-      <parameter type-id='type-id-13' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-hw.c' line='86' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_file' mangled-name='efidp_make_file' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_file@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <parameter type-id='type-id-46' name='filepath' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <parameter type-id='type-id-46' name='filepath' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='157' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_acpi_hid_ex' mangled-name='efidp_make_acpi_hid_ex' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid_ex@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='239' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='239' column='1'/>
-      <parameter type-id='type-id-4' name='hid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='240' column='1'/>
-      <parameter type-id='type-id-4' name='uid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='240' column='1'/>
-      <parameter type-id='type-id-4' name='cid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='240' column='1'/>
-      <parameter type-id='type-id-19' name='hidstr' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='241' column='1'/>
-      <parameter type-id='type-id-19' name='uidstr' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='241' column='1'/>
-      <parameter type-id='type-id-19' name='cidstr' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='241' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_edd10' mangled-name='efidp_make_edd10' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_edd10@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <parameter type-id='type-id-19' name='hardware_device' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <parameter type-id='type-id-19' name='hardware_device' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_make_acpi_hid' mangled-name='efidp_make_acpi_hid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='217' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='217' column='1'/>
-      <parameter type-id='type-id-4' name='hid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='217' column='1'/>
-      <parameter type-id='type-id-4' name='uid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-acpi.c' line='217' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_pci' mangled-name='efidp_make_pci' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_pci@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='device' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='device' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='function' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='86' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-50'/>
-    <function-decl name='efidp_make_vendor' mangled-name='efidp_make_vendor' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_vendor@@libefivar.so.0'>
-      <parameter type-id='type-id-20' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='434' column='1'/>
-      <parameter type-id='type-id-30' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='434' column='1'/>
-      <parameter type-id='type-id-13' name='type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='434' column='1'/>
-      <parameter type-id='type-id-13' name='subtype' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='434' column='1'/>
-      <parameter type-id='type-id-2' name='vendor_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='435' column='1'/>
-      <parameter type-id='type-id-50' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='435' column='1'/>
-      <parameter type-id='type-id-21' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='435' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_make_acpi_hid_ex' mangled-name='efidp_make_acpi_hid_ex' filepath='/usr/include/sys/stat.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid_ex@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/sys/stat.h' line='239' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/sys/stat.h' line='239' column='1'/>
+      <parameter type-id='type-id-19' name='hid' filepath='/usr/include/sys/stat.h' line='240' column='1'/>
+      <parameter type-id='type-id-19' name='uid' filepath='/usr/include/sys/stat.h' line='240' column='1'/>
+      <parameter type-id='type-id-19' name='cid' filepath='/usr/include/sys/stat.h' line='240' column='1'/>
+      <parameter type-id='type-id-46' name='hidstr' filepath='/usr/include/sys/stat.h' line='241' column='1'/>
+      <parameter type-id='type-id-46' name='uidstr' filepath='/usr/include/sys/stat.h' line='241' column='1'/>
+      <parameter type-id='type-id-46' name='cidstr' filepath='/usr/include/sys/stat.h' line='241' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='832' column='1' id='type-id-51'>
+    <function-decl name='efidp_make_acpi_hid' mangled-name='efidp_make_acpi_hid' filepath='/usr/include/sys/stat.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-19' name='hid' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-19' name='uid' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-19' name='hid' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <parameter type-id='type-id-19' name='uid' filepath='/usr/include/sys/stat.h' line='217' column='1'/>
+      <return type-id='type-id-61'/>
+    </function-decl>
+    <function-decl name='efidp_make_generic' mangled-name='efidp_make_generic' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_generic@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-28' name='subtype' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-61' name='total_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='452' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-28' name='subtype' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='451' column='1'/>
+      <parameter type-id='type-id-61' name='total_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='452' column='1'/>
+      <return type-id='type-id-61'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-72'/>
+    <function-decl name='efidp_make_vendor' mangled-name='efidp_make_vendor' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_vendor@@libefivar.so.0'>
+      <parameter type-id='type-id-32' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='434' column='1'/>
+      <parameter type-id='type-id-61' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='434' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='434' column='1'/>
+      <parameter type-id='type-id-28' name='subtype' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='434' column='1'/>
+      <parameter type-id='type-id-17' name='vendor_guid' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='435' column='1'/>
+      <parameter type-id='type-id-72' name='data' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='435' column='1'/>
+      <parameter type-id='type-id-33' name='data_size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='435' column='1'/>
+      <return type-id='type-id-61'/>
+    </function-decl>
+    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='832' column='1' id='type-id-73'>
       <data-member access='private'>
-        <var-decl name='' type-id='type-id-52' visibility='default'/>
+        <var-decl name='' type-id='type-id-74' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pci' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='pci' type-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pccard' type-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='pccard' type-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mmio' type-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='mmio' type-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='hw_vendor' type-id='type-id-57' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='controller' type-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='controller' type-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bmc' type-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='bmc' type-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_hid' type-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='845' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='acpi_adr' type-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-84' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='atapi' type-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='atapi' type-id='type-id-85' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='scsi' type-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='scsi' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='fc' type-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='fc' type-id='type-id-87' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='fcex' type-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='851' column='1'/>
+        <var-decl name='fcex' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firewire' type-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='firewire' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb' type-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='usb' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb_class' type-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='usb_wwid' type-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='lun' type-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='lun' type-id='type-id-93' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sata' type-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='sata' type-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='i2o' type-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='i2o' type-id='type-id-95' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac_addr' type-id='type-id-74' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-96' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ipv4_addr' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-97' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ipv6_addr' type-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-98' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='vlan' type-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='vlan' type-id='type-id-99' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='infiniband' type-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-100' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uart' type-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uart' type-id='type-id-101' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='msg_vendor' type-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-102' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uart_flow_control' type-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-103' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sas' type-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='sas' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sas_ex' type-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-105' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='iscsi' type-id='type-id-84' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-106' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='nvme' type-id='type-id-85' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='nvme' type-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='uri' type-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='uri' type-id='type-id-108' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ufs' type-id='type-id-87' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='ufs' type-id='type-id-109' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='sd' type-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='sd' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bt' type-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='bt' type-id='type-id-111' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='wifi' type-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='wifi' type-id='type-id-112' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='emmc' type-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='emmc' type-id='type-id-113' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='btle' type-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='btle' type-id='type-id-114' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='dns' type-id='type-id-93' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='dns' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='878' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='nvdimm' type-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-116' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='879' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='hd' type-id='type-id-95' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='hd' type-id='type-id-117' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='880' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='cdrom' type-id='type-id-96' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='881' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='media_vendor' type-id='type-id-97' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='882' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-119' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='882' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='file' type-id='type-id-98' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='883' column='1'/>
+        <var-decl name='file' type-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='883' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='protocol' type-id='type-id-99' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='884' column='1'/>
+        <var-decl name='protocol' type-id='type-id-121' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='884' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firmware_file' type-id='type-id-100' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='885' column='1'/>
+        <var-decl name='firmware_file' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='885' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='firmware_volume' type-id='type-id-101' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='886' column='1'/>
+        <var-decl name='firmware_volume' type-id='type-id-123' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='886' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='relative_offset' type-id='type-id-102' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='887' column='1'/>
+        <var-decl name='relative_offset' type-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='887' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ramdisk' type-id='type-id-103' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='888' column='1'/>
+        <var-decl name='ramdisk' type-id='type-id-125' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='888' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='bios_boot' type-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='889' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-126' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='889' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='833' column='1' id='type-id-52'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='833' column='1' id='type-id-74'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='834' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='subtype' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='835' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='836' column='1'/>
+        <var-decl name='length' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-105'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-127'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='37' column='1'/>
+        <var-decl name='type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='38' column='1'/>
+        <var-decl name='subtype' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='39' column='1'/>
+        <var-decl name='length' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='39' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_header' type-id='type-id-105' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='40' column='1' id='type-id-53'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-106'>
+    <typedef-decl name='efidp_header' type-id='type-id-127' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='40' column='1' id='type-id-75'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='56' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='57' column='1'/>
+        <var-decl name='function' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='58' column='1'/>
+        <var-decl name='device' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='58' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pci' type-id='type-id-106' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='59' column='1' id='type-id-54'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-55' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='64' column='1' id='type-id-107'>
+    <typedef-decl name='efidp_pci' type-id='type-id-128' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='59' column='1' id='type-id-76'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='64' column='1' id='type-id-129'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='65' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='66' column='1'/>
+        <var-decl name='function' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='66' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pccard' type-id='type-id-107' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='67' column='1' id='type-id-55'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-56' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='70' column='1' id='type-id-108'>
+    <typedef-decl name='efidp_pccard' type-id='type-id-129' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='67' column='1' id='type-id-77'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='70' column='1' id='type-id-130'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='71' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='memory_type' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='72' column='1'/>
+        <var-decl name='memory_type' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='73' column='1'/>
+        <var-decl name='starting_address' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='74' column='1'/>
+        <var-decl name='ending_address' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='74' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_mmio' type-id='type-id-108' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='75' column='1' id='type-id-56'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-57' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='750' column='1' id='type-id-109'>
+    <typedef-decl name='efidp_mmio' type-id='type-id-130' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='75' column='1' id='type-id-78'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='78' column='1' id='type-id-131'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='751' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='752' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='753' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='81' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-13' size-in-bits='infinite' id='type-id-110'/>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-109' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='82' column='1' id='type-id-57'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-58' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='99' column='1' id='type-id-111'>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='8' id='type-id-132'>
+      <subrange length='1' type-id='type-id-13' id='type-id-133'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_hw_vendor' type-id='type-id-131' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='82' column='1' id='type-id-79'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-80' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='99' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='100' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='controller' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='101' column='1'/>
+        <var-decl name='controller' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='101' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_controller' type-id='type-id-111' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='102' column='1' id='type-id-58'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='104' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-59' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='105' column='1' id='type-id-112'>
+    <typedef-decl name='efidp_controller' type-id='type-id-134' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='102' column='1' id='type-id-80'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='104' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='105' column='1' id='type-id-135'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='107' column='1'/>
+        <var-decl name='interface_type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='base_addr' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='108' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bmc' type-id='type-id-112' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='109' column='1' id='type-id-59'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-60' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-113'>
+    <typedef-decl name='efidp_bmc' type-id='type-id-135' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='109' column='1' id='type-id-81'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='120' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='121' column='1'/>
+        <var-decl name='hid' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='122' column='1'/>
+        <var-decl name='uid' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='122' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-113' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='123' column='1' id='type-id-60'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-61' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='128' column='1' id='type-id-114'>
+    <typedef-decl name='efidp_acpi_hid' type-id='type-id-136' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='123' column='1' id='type-id-82'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='128' column='1' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='129' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='130' column='1'/>
+        <var-decl name='hid' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='131' column='1'/>
+        <var-decl name='uid' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='cid' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='132' column='1'/>
+        <var-decl name='cid' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='134' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-138' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-24' size-in-bits='infinite' id='type-id-115'/>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-114' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='135' column='1' id='type-id-61'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-62' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='165' column='1' id='type-id-116'>
+
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='8' id='type-id-138'>
+      <subrange length='1' type-id='type-id-13' id='type-id-133'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-137' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='135' column='1' id='type-id-83'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-84' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='165' column='1' id='type-id-139'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='166' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-117' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='167' column='1'/>
+        <var-decl name='adr' type-id='type-id-140' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='167' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-4' size-in-bits='infinite' id='type-id-117'/>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-116' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='168' column='1' id='type-id-62'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-63' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-118'>
+
+    <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='32' id='type-id-140'>
+      <subrange length='1' type-id='type-id-13' id='type-id-133'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_acpi_adr' type-id='type-id-139' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='168' column='1' id='type-id-84'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-85' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-141'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='327' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='328' column='1'/>
+        <var-decl name='primary' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='329' column='1'/>
+        <var-decl name='slave' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='330' column='1'/>
+        <var-decl name='lun' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='330' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_atapi' type-id='type-id-118' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-63'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-64' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-119'>
+    <typedef-decl name='efidp_atapi' type-id='type-id-141' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-85'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-142'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='337' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='338' column='1'/>
+        <var-decl name='target' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='339' column='1'/>
+        <var-decl name='lun' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='339' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_scsi' type-id='type-id-119' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-64'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-65' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-120'>
+    <typedef-decl name='efidp_scsi' type-id='type-id-142' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-86'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-87' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-143'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='346' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='347' column='1'/>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='348' column='1'/>
+        <var-decl name='wwn' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='348' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='349' column='1'/>
+        <var-decl name='lun' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='349' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fc' type-id='type-id-120' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='350' column='1' id='type-id-65'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-66' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-121'>
+    <typedef-decl name='efidp_fc' type-id='type-id-143' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='350' column='1' id='type-id-87'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-144'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='354' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='355' column='1'/>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='356' column='1'/>
+        <var-decl name='wwn' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='357' column='1'/>
+        <var-decl name='lun' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='357' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='64' id='type-id-122'>
-      <subrange length='8'/>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='64' id='type-id-145'>
+      <subrange length='8' type-id='type-id-13' id='type-id-146'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_fcex' type-id='type-id-121' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='358' column='1' id='type-id-66'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-67' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='361' column='1' id='type-id-123'>
+    <typedef-decl name='efidp_fcex' type-id='type-id-144' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='358' column='1' id='type-id-88'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='361' column='1' id='type-id-147'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='363' column='1'/>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='363' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='364' column='1'/>
+        <var-decl name='guid' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='364' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_1394' type-id='type-id-123' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='365' column='1' id='type-id-67'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-68' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='368' column='1' id='type-id-124'>
+    <typedef-decl name='efidp_1394' type-id='type-id-147' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='365' column='1' id='type-id-89'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='368' column='1' id='type-id-148'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='369' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='369' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='370' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='371' column='1'/>
+        <var-decl name='interface' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='371' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb' type-id='type-id-124' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='372' column='1' id='type-id-68'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-69' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='375' column='1' id='type-id-125'>
+    <typedef-decl name='efidp_usb' type-id='type-id-148' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='372' column='1' id='type-id-90'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='375' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='376' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='376' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='377' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='377' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='product_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='378' column='1'/>
+        <var-decl name='product_id' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='379' column='1'/>
+        <var-decl name='device_class' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='380' column='1'/>
+        <var-decl name='device_subclass' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='381' column='1'/>
+        <var-decl name='device_protocol' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='381' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-125' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='382' column='1' id='type-id-69'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-70' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-126'>
+    <typedef-decl name='efidp_usb_class' type-id='type-id-149' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='382' column='1' id='type-id-91'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-150'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='404' column='1'/>
+        <var-decl name='interface' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='vendor_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='405' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='405' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='product_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='406' column='1'/>
+        <var-decl name='product_id' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='406' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='serial_number' type-id='type-id-127' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='407' column='1'/>
+        <var-decl name='serial_number' type-id='type-id-151' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='407' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='0' type-id='type-id-5' size-in-bits='infinite' id='type-id-127'/>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-126' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-70'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-71' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='411' column='1' id='type-id-128'>
+
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='16' id='type-id-151'>
+      <subrange length='1' type-id='type-id-13' id='type-id-133'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_usb_wwid' type-id='type-id-150' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-92'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-93' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='411' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='412' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='412' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='413' column='1'/>
+        <var-decl name='lun' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='413' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_lun' type-id='type-id-128' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='414' column='1' id='type-id-71'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-72' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-129'>
+    <typedef-decl name='efidp_lun' type-id='type-id-152' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='414' column='1' id='type-id-93'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-153'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='418' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hba_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='419' column='1'/>
+        <var-decl name='hba_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='419' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='port_multiplier_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='420' column='1'/>
+        <var-decl name='port_multiplier_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='420' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='421' column='1'/>
+        <var-decl name='lun' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='421' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sata' type-id='type-id-129' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-72'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-73' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='428' column='1' id='type-id-130'>
+    <typedef-decl name='efidp_sata' type-id='type-id-153' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-94'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='428' column='1' id='type-id-154'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='429' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='429' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='430' column='1'/>
+        <var-decl name='target' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='430' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_i2o' type-id='type-id-130' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='431' column='1' id='type-id-73'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='296' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-74' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='434' column='1' id='type-id-131'>
+    <typedef-decl name='efidp_i2o' type-id='type-id-154' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='431' column='1' id='type-id-95'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='296' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-96' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='434' column='1' id='type-id-155'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='435' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='435' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='436' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-156' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='437' column='1'/>
+        <var-decl name='if_type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='437' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='256' id='type-id-132'>
-      <subrange length='32'/>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='256' id='type-id-156'>
+      <subrange length='32' type-id='type-id-13' id='type-id-157'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-131' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='438' column='1' id='type-id-74'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='446' column='1' id='type-id-133'>
+    <typedef-decl name='efidp_mac_addr' type-id='type-id-155' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='438' column='1' id='type-id-96'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-97' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='446' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='447' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-134' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='448' column='1'/>
+        <var-decl name='local_ipv4_addr' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-134' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='449' column='1'/>
+        <var-decl name='remote_ipv4_addr' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='local_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='450' column='1'/>
+        <var-decl name='local_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='remote_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='451' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='protocol' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='452' column='1'/>
+        <var-decl name='protocol' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='452' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-135' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='453' column='1'/>
+        <var-decl name='static_ip_addr' type-id='type-id-160' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-134' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='454' column='1'/>
+        <var-decl name='gateway' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-134' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='455' column='1'/>
+        <var-decl name='netmask' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='455' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='32' id='type-id-134'>
-      <subrange length='4'/>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='32' id='type-id-159'>
+      <subrange length='4' type-id='type-id-13' id='type-id-161'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_boolean' type-id='type-id-13' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='43' column='1' id='type-id-135'/>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-133' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='456' column='1' id='type-id-75'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='360' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-76' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='468' column='1' id='type-id-136'>
+    <typedef-decl name='efidp_boolean' type-id='type-id-28' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='43' column='1' id='type-id-160'/>
+    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-158' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='456' column='1' id='type-id-97'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='360' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='468' column='1' id='type-id-162'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='469' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-137' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='470' column='1'/>
+        <var-decl name='local_ipv6_addr' type-id='type-id-163' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-137' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='471' column='1'/>
+        <var-decl name='remote_ipv6_addr' type-id='type-id-163' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='local_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='472' column='1'/>
+        <var-decl name='local_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='remote_port' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='473' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='protocol' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='474' column='1'/>
+        <var-decl name='protocol' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='475' column='1'/>
+        <var-decl name='ip_addr_origin' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='476' column='1'/>
+        <var-decl name='prefix_length' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='477' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='477' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='128' id='type-id-137'>
-      <subrange length='16'/>
+
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='128' id='type-id-163'>
+      <subrange length='16' type-id='type-id-13' id='type-id-164'/>
+
     </array-type-def>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-136' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='478' column='1' id='type-id-76'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-77' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='485' column='1' id='type-id-138'>
+    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-162' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='478' column='1' id='type-id-98'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-99' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='485' column='1' id='type-id-165'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='486' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vlan_id' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='487' column='1'/>
+        <var-decl name='vlan_id' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_vlan' type-id='type-id-138' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='488' column='1' id='type-id-77'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-78' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-139'>
+    <typedef-decl name='efidp_vlan' type-id='type-id-165' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='488' column='1' id='type-id-99'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-100' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-166'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='492' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='492' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='resource_flags' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='493' column='1'/>
+        <var-decl name='resource_flags' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-140' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='494' column='1'/>
+        <var-decl name='port_gid' type-id='type-id-167' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='494' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-141' visibility='default'/>
+        <var-decl name='' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='499' column='1'/>
+        <var-decl name='target_port_id' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='499' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='500' column='1'/>
+        <var-decl name='device_id' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='500' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='128' id='type-id-140'>
-      <subrange length='2'/>
+
+    <array-type-def dimensions='1' type-id='type-id-54' size-in-bits='128' id='type-id-167'>
+      <subrange length='2' type-id='type-id-13' id='type-id-169'/>
+
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='495' column='1' id='type-id-141'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='495' column='1' id='type-id-168'>
       <data-member access='private'>
-        <var-decl name='ioc_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='496' column='1'/>
+        <var-decl name='ioc_guid' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='496' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='service_id' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='497' column='1'/>
+        <var-decl name='service_id' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='497' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-139' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-78'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='152' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='510' column='1' id='type-id-142'>
+    <typedef-decl name='efidp_infiniband' type-id='type-id-166' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-100'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='152' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-101' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='510' column='1' id='type-id-170'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='511' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='512' column='1'/>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='513' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='514' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='515' column='1'/>
+        <var-decl name='parity' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='516' column='1'/>
+        <var-decl name='stop_bits' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='516' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart' type-id='type-id-142' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='517' column='1' id='type-id-79'/>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-109' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-80'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-81' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-143'>
+    <typedef-decl name='efidp_uart' type-id='type-id-170' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='517' column='1' id='type-id-101'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-102' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='541' column='1' id='type-id-171'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='555' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='542' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='556' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='flow_control_map' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='557' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='544' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-143' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='558' column='1' id='type-id-81'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='352' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-82' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-144'>
+    <typedef-decl name='efidp_msg_vendor' type-id='type-id-171' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-102'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-103' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-172'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='566' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='555' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='567' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='568' column='1'/>
+        <var-decl name='flow_control_map' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='557' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-172' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='558' column='1' id='type-id-103'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='352' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-173'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='566' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='vendor_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='567' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='568' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='569' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='569' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='570' column='1'/>
+        <var-decl name='lun' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='570' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='571' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='572' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='572' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='rtp' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='573' column='1'/>
+        <var-decl name='rtp' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='573' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas' type-id='type-id-144' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='574' column='1' id='type-id-82'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-83' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='598' column='1' id='type-id-145'>
+    <typedef-decl name='efidp_sas' type-id='type-id-173' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='574' column='1' id='type-id-104'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-105' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='598' column='1' id='type-id-174'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='599' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='599' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='600' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='600' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='601' column='1'/>
+        <var-decl name='lun' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='601' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='602' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='602' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='603' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='603' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='rtp' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='604' column='1'/>
+        <var-decl name='rtp' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='604' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-145' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='605' column='1' id='type-id-83'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='144' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-84' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='611' column='1' id='type-id-146'>
+    <typedef-decl name='efidp_sas_ex' type-id='type-id-174' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='605' column='1' id='type-id-105'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='144' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-106' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='611' column='1' id='type-id-175'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='612' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='612' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='613' column='1'/>
+        <var-decl name='protocol' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='613' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='options' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='614' column='1'/>
+        <var-decl name='options' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='614' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='615' column='1'/>
+        <var-decl name='lun' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='615' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpgt' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='616' column='1'/>
+        <var-decl name='tpgt' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='616' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='617' column='1'/>
+        <var-decl name='target_name' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='617' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-146' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='618' column='1' id='type-id-84'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-85' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-147'>
+    <typedef-decl name='efidp_iscsi' type-id='type-id-175' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='618' column='1' id='type-id-106'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-107' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='647' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='647' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='namespace_id' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='648' column='1'/>
+        <var-decl name='namespace_id' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='648' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='649' column='1'/>
+        <var-decl name='ieee_eui_64' type-id='type-id-145' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='649' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvme' type-id='type-id-147' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='650' column='1' id='type-id-85'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-86' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='655' column='1' id='type-id-148'>
+    <typedef-decl name='efidp_nvme' type-id='type-id-176' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='650' column='1' id='type-id-107'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-108' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='655' column='1' id='type-id-177'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='656' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='656' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='657' column='1'/>
+        <var-decl name='uri' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='657' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uri' type-id='type-id-148' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='658' column='1' id='type-id-86'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-87' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-149'>
+    <typedef-decl name='efidp_uri' type-id='type-id-177' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='658' column='1' id='type-id-108'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-109' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='662' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='662' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='663' column='1'/>
+        <var-decl name='target_id' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='663' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='664' column='1'/>
+        <var-decl name='lun' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='664' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ufs' type-id='type-id-149' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-87'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-88' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-150'>
+    <typedef-decl name='efidp_ufs' type-id='type-id-178' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-109'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='669' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='669' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='670' column='1'/>
+        <var-decl name='slot_number' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='670' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sd' type-id='type-id-150' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-88'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-89' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-151'>
+    <typedef-decl name='efidp_sd' type-id='type-id-179' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-110'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='80' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-111' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='675' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='675' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='676' column='1'/>
+        <var-decl name='addr' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='676' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bt' type-id='type-id-151' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-89'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='288' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-90' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-152'>
+    <typedef-decl name='efidp_bt' type-id='type-id-180' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-111'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='288' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-112' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-181'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='681' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='681' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='682' column='1'/>
+        <var-decl name='ssid' type-id='type-id-156' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='682' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_wifi' type-id='type-id-152' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='683' column='1' id='type-id-90'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-91' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='686' column='1' id='type-id-153'>
+    <typedef-decl name='efidp_wifi' type-id='type-id-181' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='683' column='1' id='type-id-112'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-113' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='686' column='1' id='type-id-182'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='687' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='688' column='1'/>
+        <var-decl name='slot' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='688' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_emmc' type-id='type-id-153' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-91'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-92' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='692' column='1' id='type-id-154'>
+    <typedef-decl name='efidp_emmc' type-id='type-id-182' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-113'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='88' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-114' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='692' column='1' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='693' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='693' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-6' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='694' column='1'/>
+        <var-decl name='addr' type-id='type-id-21' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='694' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='695' column='1'/>
+        <var-decl name='addr_type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='695' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_btle' type-id='type-id-154' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='696' column='1' id='type-id-92'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-93' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-155'>
+    <typedef-decl name='efidp_btle' type-id='type-id-183' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='696' column='1' id='type-id-114'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='40' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-115' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-184'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='703' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='703' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='704' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-156' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='705' column='1'/>
+        <var-decl name='addrs' type-id='type-id-185' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='705' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='49' column='1' id='type-id-157'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='49' column='1' id='type-id-186'>
       <data-member access='private'>
-        <var-decl name='addr' type-id='type-id-158' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='50' column='1'/>
+        <var-decl name='addr' type-id='type-id-187' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='50' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='v4' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='51' column='1'/>
+        <var-decl name='v4' type-id='type-id-188' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='51' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='v6' type-id='type-id-160' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='52' column='1'/>
+        <var-decl name='v6' type-id='type-id-189' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='52' column='1'/>
       </data-member>
     </union-decl>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='128' id='type-id-158'>
-      <subrange length='4'/>
+
+    <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='128' id='type-id-187'>
+      <subrange length='4' type-id='type-id-13' id='type-id-161'/>
+
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='41' column='1' id='type-id-161'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-188' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='41' column='1' id='type-id-190'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-134' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='42' column='1'/>
+        <var-decl name='addr' type-id='type-id-159' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='42' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-161' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='43' column='1' id='type-id-159'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-160' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='45' column='1' id='type-id-162'>
+    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-190' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='43' column='1' id='type-id-188'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-189' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='45' column='1' id='type-id-191'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-137' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='46' column='1'/>
+        <var-decl name='addr' type-id='type-id-163' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-162' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='47' column='1' id='type-id-160'/>
-    <typedef-decl name='efi_ip_addr_t' type-id='type-id-157' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='53' column='1' id='type-id-163'/>
-    <array-type-def dimensions='0' type-id='type-id-163' size-in-bits='infinite' id='type-id-156'/>
-    <typedef-decl name='efidp_dns' type-id='type-id-155' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='706' column='1' id='type-id-93'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-94' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='709' column='1' id='type-id-164'>
+    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-191' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='47' column='1' id='type-id-189'/>
+    <typedef-decl name='efi_ip_addr_t' type-id='type-id-186' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar.h' line='53' column='1' id='type-id-192'/>
+
+    <array-type-def dimensions='1' type-id='type-id-192' size-in-bits='128' id='type-id-185'>
+      <subrange length='1' type-id='type-id-13' id='type-id-133'/>
+
+    </array-type-def>
+    <typedef-decl name='efidp_dns' type-id='type-id-184' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='706' column='1' id='type-id-115'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-116' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='709' column='1' id='type-id-193'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='710' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='710' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='711' column='1'/>
+        <var-decl name='uuid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='711' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-164' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='712' column='1' id='type-id-94'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='336' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='717' column='1' id='type-id-165'>
+    <typedef-decl name='efidp_nvdimm' type-id='type-id-193' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='712' column='1' id='type-id-116'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='336' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-117' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='717' column='1' id='type-id-194'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='718' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='718' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='partition_number' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='719' column='1'/>
+        <var-decl name='partition_number' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='719' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='720' column='1'/>
+        <var-decl name='start' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='720' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='721' column='1'/>
+        <var-decl name='size' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='721' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-137' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='722' column='1'/>
+        <var-decl name='signature' type-id='type-id-163' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='722' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='723' column='1'/>
+        <var-decl name='format' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='723' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-13' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='724' column='1'/>
+        <var-decl name='signature_type' type-id='type-id-28' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='724' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hd' type-id='type-id-165' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='728' column='1' id='type-id-95'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-96' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='742' column='1' id='type-id-166'>
+    <typedef-decl name='efidp_hd' type-id='type-id-194' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='728' column='1' id='type-id-117'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-118' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='742' column='1' id='type-id-195'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='743' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='743' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='boot_catalog_entry' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='744' column='1'/>
+        <var-decl name='boot_catalog_entry' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='744' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='745' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='745' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='sectors' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='746' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_cdrom' type-id='type-id-195' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-118'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-119' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='750' column='1' id='type-id-196'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='751' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='vendor_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='752' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='vendor_data' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='753' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efidp_media_vendor' type-id='type-id-196' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-119'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-120' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-197'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='762' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='name' type-id='type-id-151' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='763' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-166' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-96'/>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-109' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-97'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-167'>
+    <typedef-decl name='efidp_file' type-id='type-id-197' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-120'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-121' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='768' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='769' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='name' type-id='type-id-127' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='763' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='770' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_file' type-id='type-id-167' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-98'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='160' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-99' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='768' column='1' id='type-id-168'>
+    <typedef-decl name='efidp_protocol' type-id='type-id-198' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='771' column='1' id='type-id-121'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-122' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='774' column='1' id='type-id-199'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='775' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='770' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='776' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_protocol' type-id='type-id-168' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='771' column='1' id='type-id-99'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-100' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='780' column='1' id='type-id-169'>
+    <typedef-decl name='efidp_firmware_file' type-id='type-id-199' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='777' column='1' id='type-id-122'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='780' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='781' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='782' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-169' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='777' column='1' id='type-id-100'/>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-169' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='783' column='1' id='type-id-101'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-102' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='786' column='1' id='type-id-170'>
+    <typedef-decl name='efidp_firmware_volume' type-id='type-id-200' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='783' column='1' id='type-id-123'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-124' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='786' column='1' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='787' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='787' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-4' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='788' column='1'/>
+        <var-decl name='reserved' type-id='type-id-19' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='788' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='first_byte' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='789' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='790' column='1'/>
+        <var-decl name='last_byte' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='790' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-170' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='791' column='1' id='type-id-102'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='304' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-103' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='794' column='1' id='type-id-171'>
+    <typedef-decl name='efidp_relative_offset' type-id='type-id-201' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='791' column='1' id='type-id-124'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='304' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-125' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='794' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='795' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='795' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='796' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='796' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='797' column='1'/>
+        <var-decl name='end_addr' type-id='type-id-54' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='797' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='798' column='1'/>
+        <var-decl name='disk_type_guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='798' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='instance_number' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='799' column='1'/>
+        <var-decl name='instance_number' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='799' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-171' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='800' column='1' id='type-id-103'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-104' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='813' column='1' id='type-id-172'>
+    <typedef-decl name='efidp_ramdisk' type-id='type-id-202' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='800' column='1' id='type-id-125'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-126' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='813' column='1' id='type-id-203'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-53' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='814' column='1'/>
+        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='814' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='device_type' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='815' column='1'/>
+        <var-decl name='device_type' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='815' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='status' type-id='type-id-5' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='816' column='1'/>
+        <var-decl name='status' type-id='type-id-20' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='816' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-110' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='817' column='1'/>
+        <var-decl name='description' type-id='type-id-132' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='817' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-172' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='818' column='1' id='type-id-104'/>
-    <typedef-decl name='efidp_data' type-id='type-id-51' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-173'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-174'/>
-    <typedef-decl name='efidp' type-id='type-id-174' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='891' column='1' id='type-id-175'/>
-    <function-decl name='efidp_parse_device_path' mangled-name='efidp_parse_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_path@@libefivar.so.0'>
-      <parameter type-id='type-id-19' name='path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='423' column='1'/>
-      <parameter type-id='type-id-175' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='424' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='425' column='1'/>
-      <return type-id='type-id-30'/>
+    <typedef-decl name='efidp_bios_boot' type-id='type-id-203' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='818' column='1' id='type-id-126'/>
+    <typedef-decl name='efidp_data' type-id='type-id-73' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
+    <typedef-decl name='efidp' type-id='type-id-205' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='891' column='1' id='type-id-206'/>
+    <function-decl name='efidp_parse_device_path' mangled-name='efidp_parse_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_path@@libefivar.so.0'>
+      <parameter type-id='type-id-46' name='path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='423' column='1'/>
+      <parameter type-id='type-id-206' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='424' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='425' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <function-decl name='efidp_parse_device_node' mangled-name='efidp_parse_device_node' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_node@@libefivar.so.0'>
-      <parameter type-id='type-id-19' name='path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='423' column='1'/>
-      <parameter type-id='type-id-175' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='424' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='425' column='1'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='efidp_parse_device_node' mangled-name='efidp_parse_device_node' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_node@@libefivar.so.0'>
+      <parameter type-id='type-id-46' name='path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='423' column='1'/>
+      <parameter type-id='type-id-206' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='424' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='425' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-176'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
-    <typedef-decl name='const_efidp' type-id='type-id-177' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='892' column='1' id='type-id-178'/>
-    <function-decl name='efidp_format_device_path' mangled-name='efidp_format_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_format_device_path@@libefivar.so.0'>
-      <parameter type-id='type-id-19' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='307' column='1'/>
-      <parameter type-id='type-id-21' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='307' column='1'/>
-      <parameter type-id='type-id-178' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='307' column='1'/>
-      <parameter type-id='type-id-30' name='limit' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='307' column='1'/>
-      <return type-id='type-id-30'/>
+    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-208'/>
+    <typedef-decl name='const_efidp' type-id='type-id-208' filepath='/home/pjones/devel/github.com/efivar/master/src/include/efivar/efivar-dp.h' line='892' column='1' id='type-id-209'/>
+    <function-decl name='efidp_format_device_path' mangled-name='efidp_format_device_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_format_device_path@@libefivar.so.0'>
+      <parameter type-id='type-id-46' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='307' column='1'/>
+      <parameter type-id='type-id-33' name='size' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='307' column='1'/>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='307' column='1'/>
+      <parameter type-id='type-id-61' name='limit' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='307' column='1'/>
+      <return type-id='type-id-61'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-179'/>
-    <function-decl name='efidp_append_node' mangled-name='efidp_append_node' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_node@@libefivar.so.0'>
-      <parameter type-id='type-id-178' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='197' column='1'/>
-      <parameter type-id='type-id-178' name='dn' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='197' column='1'/>
-      <parameter type-id='type-id-179' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='197' column='1'/>
-      <return type-id='type-id-1'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-210'/>
+    <function-decl name='efidp_append_instance' mangled-name='efidp_append_instance' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_instance@@libefivar.so.0'>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <parameter type-id='type-id-209' name='dpi' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <parameter type-id='type-id-209' name='dpi' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='259' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_duplicate_path' mangled-name='efidp_duplicate_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_duplicate_path@@libefivar.so.0'>
-      <parameter type-id='type-id-178' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='103' column='1'/>
-      <parameter type-id='type-id-179' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='103' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efidp_append_node' mangled-name='efidp_append_node' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_node@@libefivar.so.0'>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='197' column='1'/>
+      <parameter type-id='type-id-209' name='dn' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='197' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='197' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_append_instance' mangled-name='efidp_append_instance' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_instance@@libefivar.so.0'>
-      <parameter type-id='type-id-178' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='259' column='1'/>
-      <parameter type-id='type-id-178' name='dpi' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='259' column='1'/>
-      <parameter type-id='type-id-179' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='259' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efidp_append_path' mangled-name='efidp_append_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_path@@libefivar.so.0'>
+      <parameter type-id='type-id-209' name='dp0' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='114' column='1'/>
+      <parameter type-id='type-id-209' name='dp1' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='114' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='114' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_append_path' mangled-name='efidp_append_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_path@@libefivar.so.0'>
-      <parameter type-id='type-id-178' name='dp0' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='114' column='1'/>
-      <parameter type-id='type-id-178' name='dp1' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='114' column='1'/>
-      <parameter type-id='type-id-179' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='114' column='1'/>
-      <return type-id='type-id-1'/>
+    <function-decl name='efidp_duplicate_path' mangled-name='efidp_duplicate_path' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_duplicate_path@@libefivar.so.0'>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='103' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='103' column='1'/>
+      <parameter type-id='type-id-209' name='dp' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='103' column='1'/>
+      <parameter type-id='type-id-210' name='out' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='103' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
-    <function-decl name='efidp_set_node_data' mangled-name='efidp_set_node_data' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_set_node_data@@libefivar.so.0'>
-      <parameter type-id='type-id-178' name='dn' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='48' column='1'/>
-      <parameter type-id='type-id-50' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='48' column='1'/>
-      <parameter type-id='type-id-21' name='bufsize' filepath='/home/pjones/devel/github.com/efivar/master/src/dp.c' line='48' column='1'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <var-decl name='efi_guid_sha512' type-id='type-id-14' mangled-name='efi_guid_sha512' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='26' column='1' elf-symbol-id='efi_guid_sha512@@libefivar.so.0'/>
-    <var-decl name='efi_guid_redhat' type-id='type-id-14' mangled-name='efi_guid_redhat' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='31' column='1' elf-symbol-id='efi_guid_redhat@@libefivar.so.0'/>
-    <var-decl name='efi_guid_fwupdate' type-id='type-id-14' mangled-name='efi_guid_fwupdate' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='35' column='1' elf-symbol-id='efi_guid_fwupdate@@LIBEFIVAR_1.35'/>
-    <var-decl name='efi_guid_sha224' type-id='type-id-14' mangled-name='efi_guid_sha224' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='39' column='1' elf-symbol-id='efi_guid_sha224@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_boot_menu' type-id='type-id-14' mangled-name='efi_guid_lenovo_boot_menu' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='43' column='1' elf-symbol-id='efi_guid_lenovo_boot_menu@@libefivar.so.0'/>
-    <var-decl name='efi_guid_ux_capsule' type-id='type-id-14' mangled-name='efi_guid_ux_capsule' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='47' column='1' elf-symbol-id='efi_guid_ux_capsule@@LIBEFIVAR_1.33'/>
-    <var-decl name='efi_guid_x509_sha256' type-id='type-id-14' mangled-name='efi_guid_x509_sha256' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='51' column='1' elf-symbol-id='efi_guid_x509_sha256@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048' type-id='type-id-14' mangled-name='efi_guid_rsa2048' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='55' column='1' elf-symbol-id='efi_guid_rsa2048@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo' type-id='type-id-14' mangled-name='efi_guid_lenovo' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='59' column='1' elf-symbol-id='efi_guid_lenovo@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_diag' type-id='type-id-14' mangled-name='efi_guid_lenovo_diag' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='63' column='1' elf-symbol-id='efi_guid_lenovo_diag@@libefivar.so.0'/>
-    <var-decl name='efi_guid_x509_sha512' type-id='type-id-14' mangled-name='efi_guid_x509_sha512' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='67' column='1' elf-symbol-id='efi_guid_x509_sha512@@libefivar.so.0'/>
-    <var-decl name='efi_guid_pkcs7_cert' type-id='type-id-14' mangled-name='efi_guid_pkcs7_cert' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='75' column='1' elf-symbol-id='efi_guid_pkcs7_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_shim' type-id='type-id-14' mangled-name='efi_guid_shim' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='79' column='1' elf-symbol-id='efi_guid_shim@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_rescue' type-id='type-id-14' mangled-name='efi_guid_lenovo_rescue' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='83' column='1' elf-symbol-id='efi_guid_lenovo_rescue@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha1' type-id='type-id-14' mangled-name='efi_guid_rsa2048_sha1' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='87' column='1' elf-symbol-id='efi_guid_rsa2048_sha1@@libefivar.so.0'/>
-    <var-decl name='efi_guid_x509_sha384' type-id='type-id-14' mangled-name='efi_guid_x509_sha384' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='91' column='1' elf-symbol-id='efi_guid_x509_sha384@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_setup' type-id='type-id-14' mangled-name='efi_guid_lenovo_setup' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='95' column='1' elf-symbol-id='efi_guid_lenovo_setup@@libefivar.so.0'/>
-    <var-decl name='efi_guid_microsoft' type-id='type-id-14' mangled-name='efi_guid_microsoft' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='99' column='1' elf-symbol-id='efi_guid_microsoft@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_2' type-id='type-id-14' mangled-name='efi_guid_lenovo_2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='103' column='1' elf-symbol-id='efi_guid_lenovo_2@@libefivar.so.0'/>
-    <var-decl name='efi_guid_sha1' type-id='type-id-14' mangled-name='efi_guid_sha1' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='107' column='1' elf-symbol-id='efi_guid_sha1@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_me_config' type-id='type-id-14' mangled-name='efi_guid_lenovo_me_config' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='111' column='1' elf-symbol-id='efi_guid_lenovo_me_config@@libefivar.so.0'/>
-    <var-decl name='efi_guid_global' type-id='type-id-14' mangled-name='efi_guid_global' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='115' column='1' elf-symbol-id='efi_guid_global@@libefivar.so.0'/>
-    <var-decl name='efi_guid_x509_cert' type-id='type-id-14' mangled-name='efi_guid_x509_cert' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='119' column='1' elf-symbol-id='efi_guid_x509_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha256_cert' type-id='type-id-14' mangled-name='efi_guid_rsa2048_sha256_cert' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='123' column='1' elf-symbol-id='efi_guid_rsa2048_sha256_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_diag_splash' type-id='type-id-14' mangled-name='efi_guid_lenovo_diag_splash' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='127' column='1' elf-symbol-id='efi_guid_lenovo_diag_splash@@libefivar.so.0'/>
-    <var-decl name='efi_guid_redhat_2' type-id='type-id-14' mangled-name='efi_guid_redhat_2' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='131' column='1' elf-symbol-id='efi_guid_redhat_2@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_msg' type-id='type-id-14' mangled-name='efi_guid_lenovo_msg' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='135' column='1' elf-symbol-id='efi_guid_lenovo_msg@@libefivar.so.0'/>
-    <var-decl name='efi_guid_sha256' type-id='type-id-14' mangled-name='efi_guid_sha256' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='139' column='1' elf-symbol-id='efi_guid_sha256@@libefivar.so.0'/>
-    <var-decl name='efi_guid_shell' type-id='type-id-14' mangled-name='efi_guid_shell' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='143' column='1' elf-symbol-id='efi_guid_shell@@libefivar.so.0'/>
-    <var-decl name='efi_guid_security' type-id='type-id-14' mangled-name='efi_guid_security' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='147' column='1' elf-symbol-id='efi_guid_security@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha256' type-id='type-id-14' mangled-name='efi_guid_rsa2048_sha256' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='151' column='1' elf-symbol-id='efi_guid_rsa2048_sha256@@libefivar.so.0'/>
-    <var-decl name='efi_guid_sha384' type-id='type-id-14' mangled-name='efi_guid_sha384' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='155' column='1' elf-symbol-id='efi_guid_sha384@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_startup_interrupt' type-id='type-id-14' mangled-name='efi_guid_lenovo_startup_interrupt' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='159' column='1' elf-symbol-id='efi_guid_lenovo_startup_interrupt@@libefivar.so.0'/>
-    <var-decl name='efi_guid_empty' type-id='type-id-14' mangled-name='efi_guid_empty' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='18' column='1' elf-symbol-id='efi_guid_empty@@libefivar.so.0'/>
-    <var-decl name='efi_guid_zero' type-id='type-id-14' mangled-name='efi_guid_zero' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid-symbols.c' line='22' column='1' elf-symbol-id='efi_guid_zero@@libefivar.so.0'/>
-    <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-34'/>
+    <function-decl name='efidp_set_node_data' mangled-name='efidp_set_node_data' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_set_node_data@@libefivar.so.0'>
+      <parameter type-id='type-id-209' name='dn' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <parameter type-id='type-id-72' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <parameter type-id='type-id-33' name='bufsize' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <parameter type-id='type-id-209' name='dn' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <parameter type-id='type-id-72' name='buf' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <parameter type-id='type-id-33' name='bufsize' filepath='/home/pjones/devel/github.com/efivar/master/src/dp-media.c' line='48' column='1'/>
+      <return type-id='type-id-15'/>
     </function-decl>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-211'/>
+    <var-decl name='ops' type-id='type-id-211' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='42' column='1'/>
+    <var-decl name='default_ops' type-id='type-id-1' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/lib.c' line='37' column='1'/>
+    <class-decl name='guidname' size-in-bits='4224' is-struct='yes' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.h' line='182' column='1' id='type-id-212'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='guid' type-id='type-id-17' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.h' line='183' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='symbol' type-id='type-id-213' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.h' line='184' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2176'>
+        <var-decl name='name' type-id='type-id-213' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.h' line='185' column='1'/>
+      </data-member>
+    </class-decl>
+
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='2048' id='type-id-213'>
+      <subrange length='256' type-id='type-id-13' id='type-id-214'/>
+
+    </array-type-def>
+    <var-decl name='efi_well_known_names_end' type-id='type-id-212' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='112' column='1'/>
+    <var-decl name='efi_well_known_names' type-id='type-id-212' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='108' column='1'/>
+    <var-decl name='efi_well_known_guids_end' type-id='type-id-212' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='110' column='1'/>
+    <var-decl name='efi_well_known_guids' type-id='type-id-212' visibility='default' filepath='/home/pjones/devel/github.com/efivar/master/src/guid.c' line='106' column='1'/>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-34'/>
+      <return type-id='type-id-62'/>
+    </function-decl>
+    <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-62'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
-- 
2.11.0