From c47820c37ac26286559ec004de07d48d05f3308c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 31 Jan 2024 14:04:53 -0500
Subject: [PATCH] Update version to efivar 39

This updates the version number in the makefile and also updates the
abixml files with the current exposed ABI.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 src/include/version.mk |    2 +-
 src/libefiboot.abixml  |  989 ++++++++++++++--------------
 src/libefisec.abixml   |  129 ++--
 src/libefivar.abixml   | 1419 ++++++++++++++++++++--------------------
 4 files changed, 1242 insertions(+), 1297 deletions(-)

diff --git a/src/include/version.mk b/src/include/version.mk
index eeaf6c59..ae55d310 100644
--- a/src/include/version.mk
+++ b/src/include/version.mk
@@ -1 +1 @@
-VERSION=38
+VERSION=39
diff --git a/src/libefiboot.abixml b/src/libefiboot.abixml
index e5e3dd6b..a1f6fba9 100644
--- a/src/libefiboot.abixml
+++ b/src/libefiboot.abixml
@@ -248,21 +248,21 @@
         <var-decl name='' type-id='type-id-41' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-43'>
+    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1' id='type-id-43'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
+        <var-decl name='a' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
+        <var-decl name='b' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
+        <var-decl name='c' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+        <var-decl name='d' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-types.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+        <var-decl name='e' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-types.h' line='22' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='emmc_info' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/linux.h' line='90' column='1' id='type-id-46'>
@@ -514,7 +514,7 @@
     <typedef-decl name='__uint32_t' type-id='type-id-29' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-80'/>
     <typedef-decl name='__uint64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-81'/>
     <typedef-decl name='__uint8_t' type-id='type-id-82' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-83'/>
-    <typedef-decl name='efi_guid_t' type-id='type-id-43' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-42'/>
+    <typedef-decl name='efi_guid_t' type-id='type-id-43' filepath='src/include/efivar/efivar-types.h' line='23' column='1' id='type-id-42'/>
     <typedef-decl name='int32_t' type-id='type-id-77' filepath='/usr/include/bits/stdint-intn.h' line='26' column='1' id='type-id-47'/>
     <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h' line='214' column='1' id='type-id-27'/>
     <typedef-decl name='ssize_t' type-id='type-id-78' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-84'/>
@@ -648,13 +648,13 @@
       <parameter type-id='type-id-31'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_make_edd10' filepath='src/include/efivar/efivar-dp.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_edd10' filepath='src/include/efivar/efivar-dp.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_make_ipv4' filepath='src/include/efivar/efivar-dp.h' line='449' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_ipv4' filepath='src/include/efivar/efivar-dp.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
@@ -667,13 +667,13 @@
       <parameter type-id='type-id-13'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_make_file' filepath='src/include/efivar/efivar-dp.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_file' filepath='src/include/efivar/efivar-dp.h' line='763' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_make_generic' filepath='src/include/efivar/efivar-dp.h' line='1204' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_generic' filepath='src/include/efivar/efivar-dp.h' line='1209' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-53'/>
@@ -681,7 +681,7 @@
       <parameter type-id='type-id-84'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-13'/>
@@ -690,14 +690,14 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-75'/>
     </function-decl>
-    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-13'/>
       <return type-id='type-id-75'/>
     </function-decl>
-    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-88'/>
     </function-decl>
     <function-decl name='device_get' filepath='src/linux.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -738,11 +738,10 @@
     <function-decl name='__errno_location' filepath='/usr/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-104'/>
     </function-decl>
-    <function-decl name='open' filepath='/usr/include/fcntl.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='setmntent' filepath='/usr/include/mntent.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99'/>
-      <parameter type-id='type-id-13'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-13'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-88'/>
     </function-decl>
     <function-decl name='getmntent' filepath='/usr/include/mntent.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-88'/>
@@ -756,11 +755,6 @@
       <parameter type-id='type-id-88'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fopen' filepath='/usr/include/stdio.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-101'/>
-      <return type-id='type-id-88'/>
-    </function-decl>
     <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-89'/>
       <parameter type-id='type-id-101'/>
@@ -823,11 +817,6 @@
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='stat' filepath='/usr/include/sys/stat.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-107'/>
-      <return type-id='type-id-13'/>
-    </function-decl>
     <function-decl name='close' filepath='/usr/include/unistd.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-13'/>
       <return type-id='type-id-13'/>
@@ -885,7 +874,7 @@
       <parameter type-id='type-id-13'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='efidp_make_hd' filepath='src/include/efivar/efivar-dp.h' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_hd' filepath='src/include/efivar/efivar-dp.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
@@ -912,22 +901,11 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fstat' filepath='/usr/include/sys/stat.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-13'/>
-      <parameter type-id='type-id-106'/>
-      <return type-id='type-id-13'/>
-    </function-decl>
     <function-decl name='gettimeofday' filepath='/usr/include/sys/time.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-118'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='lseek' filepath='/usr/include/unistd.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-13'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-13'/>
-      <return type-id='type-id-20'/>
-    </function-decl>
     <function-decl name='read' filepath='/usr/include/unistd.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-13'/>
       <parameter type-id='type-id-26'/>
@@ -994,14 +972,14 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-acpi-root.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-126'/>
-    <function-decl name='efidp_make_acpi_hid' filepath='src/include/efivar/efivar-dp.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_acpi_hid' filepath='src/include/efivar/efivar-dp.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-31'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_make_acpi_hid_ex' filepath='src/include/efivar/efivar-dp.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_acpi_hid_ex' filepath='src/include/efivar/efivar-dp.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
@@ -1060,7 +1038,7 @@
   <abi-instr address-size='64' path='linux-ata.c' comp-dir-path='src' language='LANG_C11'>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-128'/>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
-    <function-decl name='efidp_make_atapi' filepath='src/include/efivar/efivar-dp.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_atapi' filepath='src/include/efivar/efivar-dp.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-44'/>
@@ -1094,7 +1072,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-emmc.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-130'/>
-    <function-decl name='efidp_make_emmc' filepath='src/include/efivar/efivar-dp.h' line='682' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_emmc' filepath='src/include/efivar/efivar-dp.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
@@ -1111,14 +1089,14 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-nvme.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-133'/>
-    <function-decl name='efidp_make_nvme' filepath='src/include/efivar/efivar-dp.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_nvme' filepath='src/include/efivar/efivar-dp.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-110'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efi_error_pop' filepath='src/include/efivar/efivar.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_pop' filepath='src/include/efivar/efivar.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-75'/>
     </function-decl>
     <var-decl name='nvme_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='355' column='1'/>
@@ -1134,7 +1112,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-pci.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-135'/>
-    <function-decl name='efidp_make_pci' filepath='src/include/efivar/efivar-dp.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_pci' filepath='src/include/efivar/efivar-dp.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-53'/>
@@ -1145,13 +1123,13 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-pmem.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-136'/>
-    <function-decl name='efidp_make_nvdimm' filepath='src/include/efivar/efivar-dp.h' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_nvdimm' filepath='src/include/efivar/efivar-dp.h' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efi_str_to_guid' filepath='src/include/efivar/efivar.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_str_to_guid' filepath='src/include/efivar/efivar.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-13'/>
@@ -1164,7 +1142,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='linux-sas.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-137'/>
-    <function-decl name='efidp_make_sas' filepath='src/include/efivar/efivar-dp.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_sas' filepath='src/include/efivar/efivar-dp.h' line='571' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-32'/>
@@ -1179,10 +1157,10 @@
     <type-decl name='short int' size-in-bits='16' id='type-id-140'/>
     <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='22' column='1' id='type-id-141'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='d_ino' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/dirent.h' line='25' column='1'/>
+        <var-decl name='d_ino' type-id='type-id-142' visibility='default' filepath='/usr/include/bits/dirent.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d_off' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
+        <var-decl name='d_off' type-id='type-id-23' visibility='default' filepath='/usr/include/bits/dirent.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='d_reclen' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/dirent.h' line='31' column='1'/>
@@ -1194,15 +1172,16 @@
         <var-decl name='d_name' type-id='type-id-138' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__int16_t' type-id='type-id-140' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-142'/>
-    <typedef-decl name='int16_t' type-id='type-id-142' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-144'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-145'/>
-    <function-decl name='efidp_make_sata' filepath='src/include/efivar/efivar-dp.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <typedef-decl name='__ino64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-142'/>
+    <typedef-decl name='__int16_t' type-id='type-id-140' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-143'/>
+    <typedef-decl name='int16_t' type-id='type-id-143' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-145'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-146'/>
+    <function-decl name='efidp_make_sata' filepath='src/include/efivar/efivar-dp.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-44'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-144'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-84'/>
     </function-decl>
@@ -1215,14 +1194,10 @@
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-87'/>
     </function-decl>
-    <function-decl name='readdir' filepath='/usr/include/dirent.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-144'/>
-    </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='linux-scsi.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-146'/>
-    <function-decl name='efidp_make_scsi' filepath='src/include/efivar/efivar-dp.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-147'/>
+    <function-decl name='efidp_make_scsi' filepath='src/include/efivar/efivar-dp.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-44'/>
@@ -1232,46 +1207,46 @@
     <var-decl name='scsi_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='358' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-soc-root.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-147'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-148'/>
     <var-decl name='soc_root_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='350' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-virtblk.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-148'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-149'/>
     <var-decl name='virtblk_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='356' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-virtual-root.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-149'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-150'/>
     <var-decl name='virtual_root_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='351' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux.c' comp-dir-path='src' language='LANG_C11'>
-    <typedef-decl name='const_efidp' type-id='type-id-150' filepath='src/include/efivar/efivar-dp.h' line='885' column='1' id='type-id-151'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-152'/>
-    <qualified-type-def type-id='type-id-153' const='yes' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-150'/>
-    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-156'/>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-157'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-158'/>
-    <function-decl name='efidp_make_mac_addr' filepath='src/include/efivar/efivar-dp.h' line='430' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <typedef-decl name='const_efidp' type-id='type-id-151' filepath='src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-153'/>
+    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-151'/>
+    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
+    <qualified-type-def type-id='type-id-157' const='yes' id='type-id-158'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-159'/>
+    <function-decl name='efidp_make_mac_addr' filepath='src/include/efivar/efivar-dp.h' line='434' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-110'/>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-53'/>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-84'/>
       <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='efidp_format_device_path' filepath='src/include/efivar/efivar-dp.h' line='1199' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-159'/>
+    <function-decl name='efidp_format_device_path' filepath='src/include/efivar/efivar-dp.h' line='1204' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-160'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-151'/>
+      <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-84'/>
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='find_path_segment' filepath='src/path-helpers.h' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-13'/>
-      <parameter type-id='type-id-152'/>
-      <parameter type-id='type-id-160'/>
+      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-161'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='strncpy' filepath='/usr/include/string.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1288,23 +1263,23 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='loadopt.c' comp-dir-path='src' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='infinite' id='type-id-161'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='infinite' id='type-id-162'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-163'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-163' size-in-bits='infinite' id='type-id-164'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='infinite' id='type-id-165'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-163'/>
     </array-type-def>
-    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-types.h' line='31' column='1' id='type-id-166'>
+    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-167'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' column='1'/>
+        <var-decl name='addr' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-169'>
+    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-170'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
+        <var-decl name='addr' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_load_option_s' size-in-bits='48' is-struct='yes' visibility='default' filepath='src/loadopt.c' line='17' column='1' id='type-id-171'>
+    <class-decl name='efi_load_option_s' size-in-bits='48' is-struct='yes' visibility='default' filepath='src/loadopt.c' line='17' column='1' id='type-id-172'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='attributes' type-id='type-id-31' visibility='default' filepath='src/loadopt.c' line='18' column='1'/>
       </data-member>
@@ -1312,1022 +1287,1022 @@
         <var-decl name='file_path_list_length' type-id='type-id-44' visibility='default' filepath='src/loadopt.c' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='description' type-id='type-id-172' visibility='default' filepath='src/loadopt.c' line='20' column='1'/>
+        <var-decl name='description' type-id='type-id-173' visibility='default' filepath='src/loadopt.c' line='20' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' column='1' id='type-id-174'>
+    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-175'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='353' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='355' column='1'/>
+        <var-decl name='guid' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='156' column='1' id='type-id-177'>
+    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='160' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='157' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='158' column='1'/>
+        <var-decl name='adr' type-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='162' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='106' column='1' id='type-id-180'>
+    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-181'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='107' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='hid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='109' column='1'/>
+        <var-decl name='uid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='113' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='115' column='1' id='type-id-182'>
+    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-182' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='116' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='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-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='117' column='1'/>
+        <var-decl name='hid' type-id='type-id-31' visibility='default' filepath='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-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='118' column='1'/>
+        <var-decl name='uid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='cid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1'/>
+        <var-decl name='cid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-161' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='125' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-183' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='317' column='1' id='type-id-184'>
+    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-184' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='318' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
+        <var-decl name='primary' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='320' column='1'/>
+        <var-decl name='slave' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1'/>
+        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='325' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-185' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='806' column='1' id='type-id-186'>
+    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-186' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='807' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='812' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='device_type' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' column='1'/>
+        <var-decl name='device_type' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='813' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='status' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='809' column='1'/>
+        <var-decl name='status' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='814' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='810' column='1'/>
+        <var-decl name='description' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='815' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1' id='type-id-189'>
+    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-190'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='93' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='94' column='1'/>
+        <var-decl name='interface_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='95' column='1'/>
+        <var-decl name='base_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='99' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-190' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-191'>
+    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='670' column='1' id='type-id-192'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
+        <var-decl name='addr' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-192' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-193'>
+    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-193' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='690' column='1' id='type-id-194'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='686' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='691' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='addr' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='692' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='688' column='1'/>
+        <var-decl name='addr_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='693' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-194' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='735' column='1' id='type-id-195'>
+    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-195' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-196'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='736' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='741' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='boot_catalog_entry' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
+        <var-decl name='boot_catalog_entry' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='742' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
+        <var-decl name='sectors' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-196' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='86' column='1' id='type-id-197'>
+    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='90' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='87' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='controller' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
+        <var-decl name='controller' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='695' column='1' id='type-id-199'>
+    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-199' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='700' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='696' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='701' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
+        <var-decl name='addrs' type-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-200' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-201'>
+    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-201' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='682' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='683' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
+        <var-decl name='slot' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='684' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-202' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-203'>
+    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-203' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-204'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='337' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='338' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='339' column='1'/>
+        <var-decl name='wwn' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='343' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='340' column='1'/>
+        <var-decl name='lun' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-204' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1' id='type-id-205'>
+    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-205' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='348' column='1' id='type-id-206'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='345' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='349' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='346' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='347' column='1'/>
+        <var-decl name='wwn' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='348' column='1'/>
+        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-206' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-207'>
+    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-207' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='759' column='1' id='type-id-208'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='755' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='760' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='name' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
+        <var-decl name='name' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-208' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1' id='type-id-209'>
+    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-209' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='772' column='1' id='type-id-210'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-210' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1' id='type-id-211'>
+    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-211' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='778' column='1' id='type-id-212'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-212' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-213'>
+    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-213' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='711' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='partition_number' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
+        <var-decl name='partition_number' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
+        <var-decl name='start' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='718' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='714' column='1'/>
+        <var-decl name='size' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='719' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1'/>
+        <var-decl name='signature' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='720' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
+        <var-decl name='format' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='721' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
+        <var-decl name='signature_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='722' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='23' column='1' id='type-id-214'>
+    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
+        <var-decl name='type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='25' column='1'/>
+        <var-decl name='subtype' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='26' column='1'/>
+        <var-decl name='length' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-215' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1' id='type-id-216'>
+    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-216' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='66' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='68' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='72' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_i2o' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-217' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='419' column='1' id='type-id-218'>
+    <class-decl name='efidp_i2o' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-218' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='423' column='1' id='type-id-219'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='420' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='424' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='421' column='1'/>
+        <var-decl name='target' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-219' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1' id='type-id-220'>
+    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-220' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='resource_flags' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
+        <var-decl name='resource_flags' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-221' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='485' column='1'/>
+        <var-decl name='port_gid' type-id='type-id-222' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-222' visibility='default'/>
+        <var-decl name='' type-id='type-id-223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
+        <var-decl name='target_port_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='495' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1'/>
+        <var-decl name='device_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='496' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-223' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='437' column='1' id='type-id-224'>
+    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-224' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='441' column='1' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='438' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='442' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='439' column='1'/>
+        <var-decl name='local_ipv4_addr' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='440' column='1'/>
+        <var-decl name='remote_ipv4_addr' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='local_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='441' column='1'/>
+        <var-decl name='local_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='remote_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='442' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='443' column='1'/>
+        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-225' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
+        <var-decl name='static_ip_addr' type-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
+        <var-decl name='gateway' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
+        <var-decl name='netmask' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='450' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ipv6_addr' size-in-bits='360' is-struct='yes' naming-typedef-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='459' column='1' id='type-id-227'>
+    <class-decl name='efidp_ipv6_addr' size-in-bits='480' is-struct='yes' naming-typedef-id='type-id-227' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='463' column='1' id='type-id-228'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='460' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='461' column='1'/>
+        <var-decl name='local_ipv6_addr' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='462' column='1'/>
+        <var-decl name='remote_ipv6_addr' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='local_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='463' column='1'/>
+        <var-decl name='local_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='remote_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='464' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='465' column='1'/>
+        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='466' column='1'/>
+        <var-decl name='ip_addr_origin' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='467' column='1'/>
+        <var-decl name='prefix_length' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='472' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-228' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='602' column='1' id='type-id-229'>
+    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-229' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1' id='type-id-230'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='603' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
+        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='609' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='options' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='605' column='1'/>
+        <var-decl name='options' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='610' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
+        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='611' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpgt' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1'/>
+        <var-decl name='tpgt' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='612' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
+        <var-decl name='target_name' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='613' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-230' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-231'>
+    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-231' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='406' column='1' id='type-id-232'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
+        <var-decl name='lun' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-232' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' column='1' id='type-id-233'>
+    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-233' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-234'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='426' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='430' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-234' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-235' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='428' column='1'/>
+        <var-decl name='if_type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='432' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-235' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1' id='type-id-236'>
+    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-236' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='748' column='1' id='type-id-237'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='749' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='745' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='750' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='751' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-237' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1' id='type-id-238'>
+    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-238' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1' id='type-id-239'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='58' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='memory_type' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
+        <var-decl name='memory_type' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='60' column='1'/>
+        <var-decl name='starting_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1'/>
+        <var-decl name='ending_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-239' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='532' column='1' id='type-id-240'>
+    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-240' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='537' column='1' id='type-id-241'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='533' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='538' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='539' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='540' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-241' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-242'>
+    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-242' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='707' column='1' id='type-id-243'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='708' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='uuid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='709' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-243' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='637' column='1' id='type-id-244'>
+    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-244' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='642' column='1' id='type-id-245'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='638' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='643' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='namespace_id' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='639' column='1'/>
+        <var-decl name='namespace_id' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='644' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='640' column='1'/>
+        <var-decl name='ieee_eui_64' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='645' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-245' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='51' column='1' id='type-id-246'>
+    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-246' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-247'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='52' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='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-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
+        <var-decl name='function' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-247' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='42' column='1' id='type-id-248'>
+    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-248' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-249'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='43' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
+        <var-decl name='function' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
+        <var-decl name='device' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='49' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-249' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-250'>
+    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-250' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='766' column='1' id='type-id-251'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-251' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1' id='type-id-252'>
+    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-252' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1' id='type-id-253'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='793' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='794' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='790' column='1'/>
+        <var-decl name='end_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='795' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='791' column='1'/>
+        <var-decl name='disk_type_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='796' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='instance_number' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1'/>
+        <var-decl name='instance_number' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='797' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-253' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1' id='type-id-254'>
+    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-254' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-255'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='785' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='786' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='first_byte' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='783' column='1'/>
+        <var-decl name='last_byte' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-255' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='556' column='1' id='type-id-256'>
+    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-256' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1' id='type-id-257'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='557' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='559' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='560' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='565' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1'/>
+        <var-decl name='lun' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='566' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='567' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='568' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='rtp' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
+        <var-decl name='rtp' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='569' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-257' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='589' column='1' id='type-id-258'>
+    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-258' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1' id='type-id-259'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='590' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='596' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='592' column='1'/>
+        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='597' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='593' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='598' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='599' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='rtp' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
+        <var-decl name='rtp' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='600' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-259' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-260'>
+    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-260' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1' id='type-id-261'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='409' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='413' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hba_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' column='1'/>
+        <var-decl name='hba_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='414' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='port_multiplier_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='411' column='1'/>
+        <var-decl name='port_multiplier_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='415' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1'/>
+        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='416' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-261' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='327' column='1' id='type-id-262'>
+    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-262' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='328' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='329' column='1'/>
+        <var-decl name='target' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='330' column='1'/>
+        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='334' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-263' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1' id='type-id-264'>
+    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-264' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='664' column='1' id='type-id-265'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='660' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='661' column='1'/>
+        <var-decl name='slot_number' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-265' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-266'>
+    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-266' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1' id='type-id-267'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='502' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='509' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1'/>
+        <var-decl name='parity' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
+        <var-decl name='stop_bits' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='512' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-267' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-268'>
+    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-268' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='550' column='1' id='type-id-269'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='546' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='551' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='547' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='552' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='flow_control_map' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
+        <var-decl name='flow_control_map' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-269' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1' id='type-id-270'>
+    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-270' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='657' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='658' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
+        <var-decl name='target_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='655' column='1'/>
+        <var-decl name='lun' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='660' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-271' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-272'>
+    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-272' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='651' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='647' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
+        <var-decl name='uri' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-273' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1' id='type-id-274'>
+    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-274' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='360' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='365' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='interface' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-275' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1' id='type-id-276'>
+    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-276' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1' id='type-id-277'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='367' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='product_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='369' column='1'/>
+        <var-decl name='product_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
+        <var-decl name='device_class' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
+        <var-decl name='device_subclass' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
+        <var-decl name='device_protocol' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='376' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-277' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='393' column='1' id='type-id-278'>
+    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-278' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1' id='type-id-279'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='394' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
+        <var-decl name='interface' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='vendor_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='396' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='product_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1'/>
+        <var-decl name='product_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='401' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='serial_number' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
+        <var-decl name='serial_number' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-279' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='476' column='1' id='type-id-280'>
+    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-280' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='481' column='1' id='type-id-281'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='477' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vlan_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
+        <var-decl name='vlan_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-281' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-282'>
+    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-282' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='676' column='1' id='type-id-283'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-234' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='673' column='1'/>
+        <var-decl name='ssid' type-id='type-id-235' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='826' column='1' id='type-id-283'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1' id='type-id-284'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='827' column='1'/>
+        <var-decl name='type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='828' column='1'/>
+        <var-decl name='subtype' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='829' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='efi_ip_addr_t' type-id='type-id-284' filepath='src/include/efivar/efivar-types.h' line='43' column='1' id='type-id-163'/>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-166' filepath='src/include/efivar/efivar-types.h' line='33' column='1' id='type-id-165'/>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-169' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-168'/>
-    <typedef-decl name='efi_load_option' type-id='type-id-171' filepath='src/include/efivar/efiboot-loadopt.h' line='10' column='1' id='type-id-285'/>
-    <typedef-decl name='efidp' type-id='type-id-286' filepath='src/include/efivar/efivar-dp.h' line='884' column='1' id='type-id-287'/>
-    <typedef-decl name='efidp_1394' type-id='type-id-174' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-173'/>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-177' filepath='src/include/efivar/efivar-dp.h' line='159' column='1' id='type-id-176'/>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-180' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-179'/>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-182' filepath='src/include/efivar/efivar-dp.h' line='122' column='1' id='type-id-181'/>
-    <typedef-decl name='efidp_atapi' type-id='type-id-184' filepath='src/include/efivar/efivar-dp.h' line='322' column='1' id='type-id-183'/>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-186' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-185'/>
-    <typedef-decl name='efidp_bmc' type-id='type-id-189' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-188'/>
-    <typedef-decl name='efidp_boolean' type-id='type-id-53' filepath='src/include/efivar/efivar-dp.h' line='30' column='1' id='type-id-225'/>
-    <typedef-decl name='efidp_bt' type-id='type-id-191' filepath='src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-190'/>
-    <typedef-decl name='efidp_btle' type-id='type-id-193' filepath='src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-192'/>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-195' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-194'/>
-    <typedef-decl name='efidp_controller' type-id='type-id-197' filepath='src/include/efivar/efivar-dp.h' line='89' column='1' id='type-id-196'/>
-    <typedef-decl name='efidp_data' type-id='type-id-288' filepath='src/include/efivar/efivar-dp.h' line='883' column='1' id='type-id-153'/>
-    <typedef-decl name='efidp_dns' type-id='type-id-199' filepath='src/include/efivar/efivar-dp.h' line='699' column='1' id='type-id-198'/>
-    <typedef-decl name='efidp_emmc' type-id='type-id-201' filepath='src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-200'/>
-    <typedef-decl name='efidp_fc' type-id='type-id-203' filepath='src/include/efivar/efivar-dp.h' line='341' column='1' id='type-id-202'/>
-    <typedef-decl name='efidp_fcex' type-id='type-id-205' filepath='src/include/efivar/efivar-dp.h' line='349' column='1' id='type-id-204'/>
-    <typedef-decl name='efidp_file' type-id='type-id-207' filepath='src/include/efivar/efivar-dp.h' line='757' column='1' id='type-id-206'/>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-209' filepath='src/include/efivar/efivar-dp.h' line='770' column='1' id='type-id-208'/>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-211' filepath='src/include/efivar/efivar-dp.h' line='776' column='1' id='type-id-210'/>
-    <typedef-decl name='efidp_hd' type-id='type-id-213' filepath='src/include/efivar/efivar-dp.h' line='721' column='1' id='type-id-212'/>
-    <typedef-decl name='efidp_header' type-id='type-id-214' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-175'/>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-216' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-215'/>
-    <typedef-decl name='efidp_i2o' type-id='type-id-218' filepath='src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-217'/>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-220' filepath='src/include/efivar/efivar-dp.h' line='492' column='1' id='type-id-219'/>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-224' filepath='src/include/efivar/efivar-dp.h' line='447' column='1' id='type-id-223'/>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-227' filepath='src/include/efivar/efivar-dp.h' line='469' column='1' id='type-id-226'/>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-229' filepath='src/include/efivar/efivar-dp.h' line='609' column='1' id='type-id-228'/>
-    <typedef-decl name='efidp_lun' type-id='type-id-231' filepath='src/include/efivar/efivar-dp.h' line='405' column='1' id='type-id-230'/>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-233' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-232'/>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-236' filepath='src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-235'/>
-    <typedef-decl name='efidp_mmio' type-id='type-id-238' filepath='src/include/efivar/efivar-dp.h' line='62' column='1' id='type-id-237'/>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-240' filepath='src/include/efivar/efivar-dp.h' line='536' column='1' id='type-id-239'/>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-242' filepath='src/include/efivar/efivar-dp.h' line='705' column='1' id='type-id-241'/>
-    <typedef-decl name='efidp_nvme' type-id='type-id-244' filepath='src/include/efivar/efivar-dp.h' line='641' column='1' id='type-id-243'/>
-    <typedef-decl name='efidp_pccard' type-id='type-id-246' filepath='src/include/efivar/efivar-dp.h' line='54' column='1' id='type-id-245'/>
-    <typedef-decl name='efidp_pci' type-id='type-id-248' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-247'/>
-    <typedef-decl name='efidp_protocol' type-id='type-id-250' filepath='src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-249'/>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-252' filepath='src/include/efivar/efivar-dp.h' line='793' column='1' id='type-id-251'/>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-254' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-253'/>
-    <typedef-decl name='efidp_sas' type-id='type-id-256' filepath='src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-255'/>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-258' filepath='src/include/efivar/efivar-dp.h' line='596' column='1' id='type-id-257'/>
-    <typedef-decl name='efidp_sata' type-id='type-id-260' filepath='src/include/efivar/efivar-dp.h' line='413' column='1' id='type-id-259'/>
-    <typedef-decl name='efidp_scsi' type-id='type-id-262' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-261'/>
-    <typedef-decl name='efidp_sd' type-id='type-id-264' filepath='src/include/efivar/efivar-dp.h' line='662' column='1' id='type-id-263'/>
-    <typedef-decl name='efidp_uart' type-id='type-id-266' filepath='src/include/efivar/efivar-dp.h' line='508' column='1' id='type-id-265'/>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-268' filepath='src/include/efivar/efivar-dp.h' line='549' column='1' id='type-id-267'/>
-    <typedef-decl name='efidp_ufs' type-id='type-id-270' filepath='src/include/efivar/efivar-dp.h' line='656' column='1' id='type-id-269'/>
-    <typedef-decl name='efidp_uri' type-id='type-id-272' filepath='src/include/efivar/efivar-dp.h' line='649' column='1' id='type-id-271'/>
-    <typedef-decl name='efidp_usb' type-id='type-id-274' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-273'/>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-276' filepath='src/include/efivar/efivar-dp.h' line='373' column='1' id='type-id-275'/>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-278' filepath='src/include/efivar/efivar-dp.h' line='399' column='1' id='type-id-277'/>
-    <typedef-decl name='efidp_vlan' type-id='type-id-280' filepath='src/include/efivar/efivar-dp.h' line='479' column='1' id='type-id-279'/>
-    <typedef-decl name='efidp_wifi' type-id='type-id-282' filepath='src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-281'/>
-    <array-type-def dimensions='1' type-id='type-id-44' size-in-bits='infinite' id='type-id-172'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-162'/>
+        <var-decl name='length' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='efi_ip_addr_t' type-id='type-id-285' filepath='src/include/efivar/efivar-types.h' line='47' column='1' id='type-id-164'/>
+    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-167' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-166'/>
+    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-170' filepath='src/include/efivar/efivar-types.h' line='41' column='1' id='type-id-169'/>
+    <typedef-decl name='efi_load_option' type-id='type-id-172' filepath='src/include/efivar/efiboot-loadopt.h' line='14' column='1' id='type-id-286'/>
+    <typedef-decl name='efidp' type-id='type-id-287' filepath='src/include/efivar/efivar-dp.h' line='889' column='1' id='type-id-288'/>
+    <typedef-decl name='efidp_1394' type-id='type-id-175' filepath='src/include/efivar/efivar-dp.h' line='360' column='1' id='type-id-174'/>
+    <typedef-decl name='efidp_acpi_adr' type-id='type-id-178' filepath='src/include/efivar/efivar-dp.h' line='163' column='1' id='type-id-177'/>
+    <typedef-decl name='efidp_acpi_hid' type-id='type-id-181' filepath='src/include/efivar/efivar-dp.h' line='114' column='1' id='type-id-180'/>
+    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-183' filepath='src/include/efivar/efivar-dp.h' line='126' column='1' id='type-id-182'/>
+    <typedef-decl name='efidp_atapi' type-id='type-id-185' filepath='src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-184'/>
+    <typedef-decl name='efidp_bios_boot' type-id='type-id-187' filepath='src/include/efivar/efivar-dp.h' line='816' column='1' id='type-id-186'/>
+    <typedef-decl name='efidp_bmc' type-id='type-id-190' filepath='src/include/efivar/efivar-dp.h' line='100' column='1' id='type-id-189'/>
+    <typedef-decl name='efidp_boolean' type-id='type-id-53' filepath='src/include/efivar/efivar-dp.h' line='34' column='1' id='type-id-226'/>
+    <typedef-decl name='efidp_bt' type-id='type-id-192' filepath='src/include/efivar/efivar-dp.h' line='673' column='1' id='type-id-191'/>
+    <typedef-decl name='efidp_btle' type-id='type-id-194' filepath='src/include/efivar/efivar-dp.h' line='694' column='1' id='type-id-193'/>
+    <typedef-decl name='efidp_cdrom' type-id='type-id-196' filepath='src/include/efivar/efivar-dp.h' line='745' column='1' id='type-id-195'/>
+    <typedef-decl name='efidp_controller' type-id='type-id-198' filepath='src/include/efivar/efivar-dp.h' line='93' column='1' id='type-id-197'/>
+    <typedef-decl name='efidp_data' type-id='type-id-289' filepath='src/include/efivar/efivar-dp.h' line='888' column='1' id='type-id-154'/>
+    <typedef-decl name='efidp_dns' type-id='type-id-200' filepath='src/include/efivar/efivar-dp.h' line='704' column='1' id='type-id-199'/>
+    <typedef-decl name='efidp_emmc' type-id='type-id-202' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-201'/>
+    <typedef-decl name='efidp_fc' type-id='type-id-204' filepath='src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-203'/>
+    <typedef-decl name='efidp_fcex' type-id='type-id-206' filepath='src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-205'/>
+    <typedef-decl name='efidp_file' type-id='type-id-208' filepath='src/include/efivar/efivar-dp.h' line='762' column='1' id='type-id-207'/>
+    <typedef-decl name='efidp_firmware_file' type-id='type-id-210' filepath='src/include/efivar/efivar-dp.h' line='775' column='1' id='type-id-209'/>
+    <typedef-decl name='efidp_firmware_volume' type-id='type-id-212' filepath='src/include/efivar/efivar-dp.h' line='781' column='1' id='type-id-211'/>
+    <typedef-decl name='efidp_hd' type-id='type-id-214' filepath='src/include/efivar/efivar-dp.h' line='726' column='1' id='type-id-213'/>
+    <typedef-decl name='efidp_header' type-id='type-id-215' filepath='src/include/efivar/efivar-dp.h' line='31' column='1' id='type-id-176'/>
+    <typedef-decl name='efidp_hw_vendor' type-id='type-id-217' filepath='src/include/efivar/efivar-dp.h' line='73' column='1' id='type-id-216'/>
+    <typedef-decl name='efidp_i2o' type-id='type-id-219' filepath='src/include/efivar/efivar-dp.h' line='426' column='1' id='type-id-218'/>
+    <typedef-decl name='efidp_infiniband' type-id='type-id-221' filepath='src/include/efivar/efivar-dp.h' line='497' column='1' id='type-id-220'/>
+    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-225' filepath='src/include/efivar/efivar-dp.h' line='451' column='1' id='type-id-224'/>
+    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-228' filepath='src/include/efivar/efivar-dp.h' line='473' column='1' id='type-id-227'/>
+    <typedef-decl name='efidp_iscsi' type-id='type-id-230' filepath='src/include/efivar/efivar-dp.h' line='614' column='1' id='type-id-229'/>
+    <typedef-decl name='efidp_lun' type-id='type-id-232' filepath='src/include/efivar/efivar-dp.h' line='409' column='1' id='type-id-231'/>
+    <typedef-decl name='efidp_mac_addr' type-id='type-id-234' filepath='src/include/efivar/efivar-dp.h' line='433' column='1' id='type-id-233'/>
+    <typedef-decl name='efidp_media_vendor' type-id='type-id-237' filepath='src/include/efivar/efivar-dp.h' line='752' column='1' id='type-id-236'/>
+    <typedef-decl name='efidp_mmio' type-id='type-id-239' filepath='src/include/efivar/efivar-dp.h' line='66' column='1' id='type-id-238'/>
+    <typedef-decl name='efidp_msg_vendor' type-id='type-id-241' filepath='src/include/efivar/efivar-dp.h' line='541' column='1' id='type-id-240'/>
+    <typedef-decl name='efidp_nvdimm' type-id='type-id-243' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-242'/>
+    <typedef-decl name='efidp_nvme' type-id='type-id-245' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-244'/>
+    <typedef-decl name='efidp_pccard' type-id='type-id-247' filepath='src/include/efivar/efivar-dp.h' line='58' column='1' id='type-id-246'/>
+    <typedef-decl name='efidp_pci' type-id='type-id-249' filepath='src/include/efivar/efivar-dp.h' line='50' column='1' id='type-id-248'/>
+    <typedef-decl name='efidp_protocol' type-id='type-id-251' filepath='src/include/efivar/efivar-dp.h' line='769' column='1' id='type-id-250'/>
+    <typedef-decl name='efidp_ramdisk' type-id='type-id-253' filepath='src/include/efivar/efivar-dp.h' line='798' column='1' id='type-id-252'/>
+    <typedef-decl name='efidp_relative_offset' type-id='type-id-255' filepath='src/include/efivar/efivar-dp.h' line='789' column='1' id='type-id-254'/>
+    <typedef-decl name='efidp_sas' type-id='type-id-257' filepath='src/include/efivar/efivar-dp.h' line='570' column='1' id='type-id-256'/>
+    <typedef-decl name='efidp_sas_ex' type-id='type-id-259' filepath='src/include/efivar/efivar-dp.h' line='601' column='1' id='type-id-258'/>
+    <typedef-decl name='efidp_sata' type-id='type-id-261' filepath='src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-260'/>
+    <typedef-decl name='efidp_scsi' type-id='type-id-263' filepath='src/include/efivar/efivar-dp.h' line='335' column='1' id='type-id-262'/>
+    <typedef-decl name='efidp_sd' type-id='type-id-265' filepath='src/include/efivar/efivar-dp.h' line='667' column='1' id='type-id-264'/>
+    <typedef-decl name='efidp_uart' type-id='type-id-267' filepath='src/include/efivar/efivar-dp.h' line='513' column='1' id='type-id-266'/>
+    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-269' filepath='src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-268'/>
+    <typedef-decl name='efidp_ufs' type-id='type-id-271' filepath='src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-270'/>
+    <typedef-decl name='efidp_uri' type-id='type-id-273' filepath='src/include/efivar/efivar-dp.h' line='654' column='1' id='type-id-272'/>
+    <typedef-decl name='efidp_usb' type-id='type-id-275' filepath='src/include/efivar/efivar-dp.h' line='367' column='1' id='type-id-274'/>
+    <typedef-decl name='efidp_usb_class' type-id='type-id-277' filepath='src/include/efivar/efivar-dp.h' line='377' column='1' id='type-id-276'/>
+    <typedef-decl name='efidp_usb_wwid' type-id='type-id-279' filepath='src/include/efivar/efivar-dp.h' line='403' column='1' id='type-id-278'/>
+    <typedef-decl name='efidp_vlan' type-id='type-id-281' filepath='src/include/efivar/efivar-dp.h' line='484' column='1' id='type-id-280'/>
+    <typedef-decl name='efidp_wifi' type-id='type-id-283' filepath='src/include/efivar/efivar-dp.h' line='679' column='1' id='type-id-282'/>
+    <array-type-def dimensions='1' type-id='type-id-44' size-in-bits='infinite' id='type-id-173'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-163'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-31' size-in-bits='128' id='type-id-289'>
-      <subrange length='4' type-id='type-id-3' id='type-id-290'/>
+    <array-type-def dimensions='1' type-id='type-id-31' size-in-bits='128' id='type-id-290'>
+      <subrange length='4' type-id='type-id-3' id='type-id-291'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-31' size-in-bits='infinite' id='type-id-178'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-31' size-in-bits='infinite' id='type-id-179'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-163'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-32' size-in-bits='128' id='type-id-221'>
-      <subrange length='2' type-id='type-id-3' id='type-id-291'/>
+    <array-type-def dimensions='1' type-id='type-id-32' size-in-bits='128' id='type-id-222'>
+      <subrange length='2' type-id='type-id-3' id='type-id-292'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='128' id='type-id-170'>
-      <subrange length='16' type-id='type-id-3' id='type-id-292'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='128' id='type-id-171'>
+      <subrange length='16' type-id='type-id-3' id='type-id-293'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='256' id='type-id-234'>
-      <subrange length='32' type-id='type-id-3' id='type-id-293'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='256' id='type-id-235'>
+      <subrange length='32' type-id='type-id-3' id='type-id-294'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='32' id='type-id-167'>
-      <subrange length='4' type-id='type-id-3' id='type-id-290'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='32' id='type-id-168'>
+      <subrange length='4' type-id='type-id-3' id='type-id-291'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='infinite' id='type-id-187'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='infinite' id='type-id-188'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-163'/>
     </array-type-def>
-    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-163' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-284'>
+    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-types.h' line='43' column='1' id='type-id-285'>
       <data-member access='public'>
-        <var-decl name='addr' type-id='type-id-289' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
+        <var-decl name='addr' type-id='type-id-290' visibility='default' filepath='src/include/efivar/efivar-types.h' line='44' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v4' type-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
+        <var-decl name='v4' type-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-types.h' line='45' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v6' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' column='1'/>
+        <var-decl name='v6' type-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-types.h' line='46' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='efidp_data' size-in-bits='384' naming-typedef-id='type-id-153' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='825' column='1' id='type-id-288'>
+    <union-decl name='efidp_data' size-in-bits='480' naming-typedef-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='830' column='1' id='type-id-289'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-283' visibility='default'/>
+        <var-decl name='' type-id='type-id-284' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
+        <var-decl name='header' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pci' type-id='type-id-247' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
+        <var-decl name='pci' type-id='type-id-248' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pccard' type-id='type-id-245' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
+        <var-decl name='pccard' type-id='type-id-246' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mmio' type-id='type-id-237' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='mmio' type-id='type-id-238' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hw_vendor' type-id='type-id-215' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-216' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='controller' type-id='type-id-196' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
+        <var-decl name='controller' type-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bmc' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
+        <var-decl name='bmc' type-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid' type-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-182' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_adr' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='atapi' type-id='type-id-183' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='atapi' type-id='type-id-184' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='scsi' type-id='type-id-261' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='scsi' type-id='type-id-262' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fc' type-id='type-id-202' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='fc' type-id='type-id-203' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fcex' type-id='type-id-204' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='fcex' type-id='type-id-205' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firewire' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='firewire' type-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb' type-id='type-id-273' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='usb' type-id='type-id-274' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_class' type-id='type-id-275' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-276' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_wwid' type-id='type-id-277' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-278' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='lun' type-id='type-id-230' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='lun' type-id='type-id-231' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sata' type-id='type-id-259' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='sata' type-id='type-id-260' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='i2o' type-id='type-id-217' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
+        <var-decl name='i2o' type-id='type-id-218' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mac_addr' type-id='type-id-232' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-233' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv4_addr' type-id='type-id-223' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-224' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv6_addr' type-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-227' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='vlan' type-id='type-id-279' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='vlan' type-id='type-id-280' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='infiniband' type-id='type-id-219' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-220' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart' type-id='type-id-265' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='uart' type-id='type-id-266' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='msg_vendor' type-id='type-id-239' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-240' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart_flow_control' type-id='type-id-267' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-268' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas' type-id='type-id-255' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='sas' type-id='type-id-256' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas_ex' type-id='type-id-257' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-258' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='iscsi' type-id='type-id-228' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-229' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvme' type-id='type-id-243' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='nvme' type-id='type-id-244' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uri' type-id='type-id-271' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uri' type-id='type-id-272' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ufs' type-id='type-id-269' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='ufs' type-id='type-id-270' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sd' type-id='type-id-263' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='sd' type-id='type-id-264' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bt' type-id='type-id-190' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='bt' type-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='wifi' type-id='type-id-281' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='wifi' type-id='type-id-282' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='emmc' type-id='type-id-200' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='emmc' type-id='type-id-201' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='btle' type-id='type-id-192' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='btle' type-id='type-id-193' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='dns' type-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='dns' type-id='type-id-199' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvdimm' type-id='type-id-241' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-242' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hd' type-id='type-id-212' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='hd' type-id='type-id-213' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='cdrom' type-id='type-id-194' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-195' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='media_vendor' type-id='type-id-235' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-236' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='file' type-id='type-id-206' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='file' type-id='type-id-207' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='protocol' type-id='type-id-249' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='protocol' type-id='type-id-250' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_file' type-id='type-id-208' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='firmware_file' type-id='type-id-209' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='883' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_volume' type-id='type-id-210' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='firmware_volume' type-id='type-id-211' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='884' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='relative_offset' type-id='type-id-253' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='relative_offset' type-id='type-id-254' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='885' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ramdisk' type-id='type-id-251' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='ramdisk' type-id='type-id-252' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='886' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bios_boot' type-id='type-id-185' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-186' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='887' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='486' column='1' id='type-id-222'>
+    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-223'>
       <data-member access='public'>
-        <var-decl name='ioc_guid' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1'/>
+        <var-decl name='ioc_guid' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='492' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='service_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
+        <var-decl name='service_id' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='493' column='1'/>
       </data-member>
     </union-decl>
-    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
-    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-297'/>
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-286'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-301'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-302'/>
-    <function-decl name='efi_get_verbose' filepath='src/include/efivar/efivar.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-302'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
+    <function-decl name='efi_get_verbose' filepath='src/include/efivar/efivar.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='efi_loadopt_create' mangled-name='efi_loadopt_create' filepath='src/loadopt.c' line='26' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_create@@libefiboot.so.0'>
       <parameter type-id='type-id-110' name='buf' filepath='src/loadopt.c' line='26' column='1'/>
       <parameter type-id='type-id-84' name='size' filepath='src/loadopt.c' line='26' column='1'/>
       <parameter type-id='type-id-31' name='attributes' filepath='src/loadopt.c' line='26' column='1'/>
-      <parameter type-id='type-id-287' name='dp' filepath='src/loadopt.c' line='27' column='1'/>
+      <parameter type-id='type-id-288' name='dp' filepath='src/loadopt.c' line='27' column='1'/>
       <parameter type-id='type-id-84' name='dp_size' filepath='src/loadopt.c' line='27' column='1'/>
-      <parameter type-id='type-id-159' name='description' filepath='src/loadopt.c' line='27' column='1'/>
+      <parameter type-id='type-id-160' name='description' filepath='src/loadopt.c' line='27' column='1'/>
       <parameter type-id='type-id-110' name='optional_data' filepath='src/loadopt.c' line='28' column='1'/>
       <parameter type-id='type-id-27' name='optional_data_size' filepath='src/loadopt.c' line='28' column='1'/>
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_loadopt_optional_data_size' mangled-name='efi_loadopt_optional_data_size' filepath='src/loadopt.c' line='102' 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-299' name='opt' filepath='src/loadopt.c' line='102' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='102' column='1'/>
       <parameter type-id='type-id-27' name='size' filepath='src/loadopt.c' line='102' column='1'/>
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_loadopt_is_valid' mangled-name='efi_loadopt_is_valid' filepath='src/loadopt.c' line='152' 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-299' name='opt' filepath='src/loadopt.c' line='152' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='152' column='1'/>
       <parameter type-id='type-id-27' name='size' filepath='src/loadopt.c' line='152' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='efi_loadopt_attrs' mangled-name='efi_loadopt_attrs' filepath='src/loadopt.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_attrs@@libefiboot.so.0'>
-      <parameter type-id='type-id-299' name='opt' filepath='src/loadopt.c' line='161' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='161' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='efi_loadopt_attr_set' mangled-name='efi_loadopt_attr_set' filepath='src/loadopt.c' line='167' 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-299' name='opt' filepath='src/loadopt.c' line='167' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='167' column='1'/>
       <parameter type-id='type-id-44' name='attr' filepath='src/loadopt.c' line='167' column='1'/>
       <return type-id='type-id-75'/>
     </function-decl>
     <function-decl name='efi_loadopt_attr_clear' mangled-name='efi_loadopt_attr_clear' filepath='src/loadopt.c' line='173' 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-299' name='opt' filepath='src/loadopt.c' line='173' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='173' column='1'/>
       <parameter type-id='type-id-44' name='attr' filepath='src/loadopt.c' line='173' column='1'/>
       <return type-id='type-id-75'/>
     </function-decl>
     <function-decl name='efi_loadopt_pathlen' mangled-name='efi_loadopt_pathlen' filepath='src/loadopt.c' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_pathlen@@libefiboot.so.0'>
-      <parameter type-id='type-id-299' name='opt' filepath='src/loadopt.c' line='180' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='180' column='1'/>
       <parameter type-id='type-id-84' name='limit' filepath='src/loadopt.c' line='180' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='efi_loadopt_path' mangled-name='efi_loadopt_path' filepath='src/loadopt.c' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-299' name='opt' filepath='src/loadopt.c' line='194' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='194' column='1'/>
       <parameter type-id='type-id-84' name='limit' filepath='src/loadopt.c' line='194' column='1'/>
-      <return type-id='type-id-287'/>
+      <return type-id='type-id-288'/>
     </function-decl>
     <function-decl name='efi_loadopt_optional_data' mangled-name='efi_loadopt_optional_data' filepath='src/loadopt.c' line='223' 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-299' name='opt' filepath='src/loadopt.c' line='223' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='223' column='1'/>
       <parameter type-id='type-id-27' name='opt_size' filepath='src/loadopt.c' line='223' column='1'/>
-      <parameter type-id='type-id-301' name='datap' filepath='src/loadopt.c' line='224' column='1'/>
-      <parameter type-id='type-id-160' name='len' filepath='src/loadopt.c' line='224' column='1'/>
+      <parameter type-id='type-id-302' name='datap' filepath='src/loadopt.c' line='224' column='1'/>
+      <parameter type-id='type-id-161' name='len' filepath='src/loadopt.c' line='224' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='efi_loadopt_args_from_file' mangled-name='efi_loadopt_args_from_file' filepath='src/loadopt.c' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_from_file@@libefiboot.so.0'>
@@ -2343,18 +2318,18 @@
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_loadopt_args_as_ucs2' mangled-name='efi_loadopt_args_as_ucs2' filepath='src/loadopt.c' line='324' 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-300' name='buf' filepath='src/loadopt.c' line='324' column='1'/>
+      <parameter type-id='type-id-301' name='buf' filepath='src/loadopt.c' line='324' column='1'/>
       <parameter type-id='type-id-84' name='size' filepath='src/loadopt.c' line='324' column='1'/>
       <parameter type-id='type-id-110' name='utf8' filepath='src/loadopt.c' line='324' column='1'/>
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_loadopt_desc' mangled-name='efi_loadopt_desc' filepath='src/loadopt.c' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_desc@@libefiboot.so.0'>
-      <parameter type-id='type-id-299' name='opt' filepath='src/loadopt.c' line='355' column='1'/>
+      <parameter type-id='type-id-300' name='opt' filepath='src/loadopt.c' line='355' column='1'/>
       <parameter type-id='type-id-84' name='limit' filepath='src/loadopt.c' line='355' column='1'/>
-      <return type-id='type-id-295'/>
+      <return type-id='type-id-296'/>
     </function-decl>
     <function-decl name='__ctype_b_loc' filepath='/usr/include/ctype.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-298'/>
+      <return type-id='type-id-299'/>
     </function-decl>
     <function-decl name='fclose' filepath='/usr/include/stdio.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-88'/>
@@ -2373,7 +2348,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='path-helpers.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-304'/>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-99'/>
diff --git a/src/libefisec.abixml b/src/libefisec.abixml
index 1c50d1ef..27b3c813 100644
--- a/src/libefisec.abixml
+++ b/src/libefisec.abixml
@@ -17,12 +17,12 @@
   </elf-variable-symbols>
   <abi-instr address-size='64' path='esl-iter.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1'/>
-    <function-decl name='efi_guid_cmp' filepath='src/include/efivar/efivar.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_guid_cmp' filepath='src/include/efivar/efivar.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-3'/>
@@ -31,11 +31,11 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -116,13 +116,13 @@
     <array-type-def dimensions='1' type-id='type-id-26' size-in-bits='4608' id='type-id-27'>
       <subrange length='12' type-id='type-id-22' id='type-id-28'/>
     </array-type-def>
-    <enum-decl name='efi_secdb_flag_t' naming-typedef-id='type-id-29' filepath='src/include/efivar/efisec-secdb.h' line='43' column='1' id='type-id-30'>
+    <enum-decl name='efi_secdb_flag_t' naming-typedef-id='type-id-29' filepath='src/include/efivar/efisec-secdb.h' line='47' column='1' id='type-id-30'>
       <underlying-type type-id='type-id-31'/>
       <enumerator name='EFI_SECDB_SORT' value='0'/>
       <enumerator name='EFI_SECDB_SORT_DATA' value='1'/>
       <enumerator name='EFI_SECDB_SORT_DESCENDING' value='2'/>
     </enum-decl>
-    <enum-decl name='efi_secdb_type_t' naming-typedef-id='type-id-32' filepath='src/include/efivar/efisec-secdb.h' line='27' column='1' id='type-id-33'>
+    <enum-decl name='efi_secdb_type_t' naming-typedef-id='type-id-32' filepath='src/include/efivar/efisec-secdb.h' line='31' column='1' id='type-id-33'>
       <underlying-type type-id='type-id-31'/>
       <enumerator name='X509_CERT' value='0'/>
       <enumerator name='X509_SHA256' value='1'/>
@@ -259,45 +259,45 @@
         <var-decl name='reg_save_area' type-id='type-id-13' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_cert_x509_sha256_t' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-51' visibility='default' filepath='src/include/efivar/efisec-types.h' line='35' column='1' id='type-id-52'>
+    <class-decl name='efi_cert_x509_sha256_t' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-51' visibility='default' filepath='src/include/efivar/efisec-types.h' line='39' column='1' id='type-id-52'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='to_be_signed_hash' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efisec-types.h' line='36' column='1'/>
+        <var-decl name='to_be_signed_hash' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efisec-types.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='37' column='1'/>
+        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='41' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_cert_x509_sha384_t' size-in-bits='512' is-struct='yes' naming-typedef-id='type-id-55' visibility='default' filepath='src/include/efivar/efisec-types.h' line='40' column='1' id='type-id-56'>
+    <class-decl name='efi_cert_x509_sha384_t' size-in-bits='512' is-struct='yes' naming-typedef-id='type-id-55' visibility='default' filepath='src/include/efivar/efisec-types.h' line='44' column='1' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='to_be_signed_hash' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efisec-types.h' line='41' column='1'/>
+        <var-decl name='to_be_signed_hash' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efisec-types.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='42' column='1'/>
+        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_cert_x509_sha512_t' size-in-bits='640' is-struct='yes' naming-typedef-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-types.h' line='45' column='1' id='type-id-59'>
+    <class-decl name='efi_cert_x509_sha512_t' size-in-bits='640' is-struct='yes' naming-typedef-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-types.h' line='49' column='1' id='type-id-59'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='to_be_signed_hash' type-id='type-id-60' visibility='default' filepath='src/include/efivar/efisec-types.h' line='46' column='1'/>
+        <var-decl name='to_be_signed_hash' type-id='type-id-60' visibility='default' filepath='src/include/efivar/efisec-types.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='47' column='1'/>
+        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-62'>
+    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-18' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
+        <var-decl name='a' type-id='type-id-18' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
+        <var-decl name='b' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
+        <var-decl name='c' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+        <var-decl name='d' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+        <var-decl name='e' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='22' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='efi_secdb' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/secdb.h' line='43' column='1' id='type-id-65'>
@@ -329,39 +329,39 @@
         <var-decl name='entries' type-id='type-id-66' visibility='default' filepath='src/secdb.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_time_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-54' visibility='default' filepath='src/include/efivar/efivar-types.h' line='69' column='1' id='type-id-68'>
+    <class-decl name='efi_time_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-54' visibility='default' filepath='src/include/efivar/efivar-types.h' line='73' column='1' id='type-id-68'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='year' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='70' column='1'/>
+        <var-decl name='year' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='month' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='71' column='1'/>
+        <var-decl name='month' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='day' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='72' column='1'/>
+        <var-decl name='day' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hour' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='73' column='1'/>
+        <var-decl name='hour' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='minute' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='74' column='1'/>
+        <var-decl name='minute' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='second' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='75' column='1'/>
+        <var-decl name='second' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='pad1' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='76' column='1'/>
+        <var-decl name='pad1' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nanosecond' type-id='type-id-18' visibility='default' filepath='src/include/efivar/efivar-types.h' line='77' column='1'/>
+        <var-decl name='nanosecond' type-id='type-id-18' visibility='default' filepath='src/include/efivar/efivar-types.h' line='81' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='timezone' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-types.h' line='78' column='1'/>
+        <var-decl name='timezone' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-types.h' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='daylight' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='79' column='1'/>
+        <var-decl name='daylight' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='83' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='120'>
-        <var-decl name='pad2' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='80' column='1'/>
+        <var-decl name='pad2' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='84' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='list_head' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/list.h' line='17' column='1' id='type-id-71'>
@@ -401,21 +401,21 @@
     <typedef-decl name='__uint16_t' type-id='type-id-45' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-84'/>
     <typedef-decl name='__uint64_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-85'/>
     <typedef-decl name='__uint8_t' type-id='type-id-86' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-87'/>
-    <typedef-decl name='efi_cert_x509_sha256_t' type-id='type-id-52' filepath='src/include/efivar/efisec-types.h' line='38' column='1' id='type-id-51'/>
-    <typedef-decl name='efi_cert_x509_sha384_t' type-id='type-id-56' filepath='src/include/efivar/efisec-types.h' line='43' column='1' id='type-id-55'/>
-    <typedef-decl name='efi_cert_x509_sha512_t' type-id='type-id-59' filepath='src/include/efivar/efisec-types.h' line='48' column='1' id='type-id-58'/>
-    <typedef-decl name='efi_guid_t' type-id='type-id-62' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-61'/>
-    <typedef-decl name='efi_rsa2048_sig_t' type-id='type-id-88' filepath='src/include/efivar/efisec-types.h' line='22' column='1' id='type-id-89'/>
-    <typedef-decl name='efi_secdb_data_t' type-id='type-id-90' filepath='src/include/efivar/efisec-secdb.h' line='25' column='1' id='type-id-91'/>
-    <typedef-decl name='efi_secdb_flag_t' type-id='type-id-30' filepath='src/include/efivar/efisec-secdb.h' line='47' column='1' id='type-id-29'/>
-    <typedef-decl name='efi_secdb_t' type-id='type-id-65' filepath='src/include/efivar/efisec-secdb.h' line='10' column='1' id='type-id-92'/>
-    <typedef-decl name='efi_secdb_type_t' type-id='type-id-33' filepath='src/include/efivar/efisec-secdb.h' line='41' column='1' id='type-id-32'/>
-    <typedef-decl name='efi_sha1_hash_t' type-id='type-id-93' filepath='src/include/efivar/efisec-types.h' line='17' column='1' id='type-id-94'/>
-    <typedef-decl name='efi_sha224_hash_t' type-id='type-id-95' filepath='src/include/efivar/efisec-types.h' line='18' column='1' id='type-id-96'/>
-    <typedef-decl name='efi_sha256_hash_t' type-id='type-id-97' filepath='src/include/efivar/efisec-types.h' line='19' column='1' id='type-id-53'/>
-    <typedef-decl name='efi_sha384_hash_t' type-id='type-id-98' filepath='src/include/efivar/efisec-types.h' line='20' column='1' id='type-id-57'/>
-    <typedef-decl name='efi_sha512_hash_t' type-id='type-id-99' filepath='src/include/efivar/efisec-types.h' line='21' column='1' id='type-id-60'/>
-    <typedef-decl name='efi_time_t' type-id='type-id-68' filepath='src/include/efivar/efivar-types.h' line='81' column='1' id='type-id-54'/>
+    <typedef-decl name='efi_cert_x509_sha256_t' type-id='type-id-52' filepath='src/include/efivar/efisec-types.h' line='42' column='1' id='type-id-51'/>
+    <typedef-decl name='efi_cert_x509_sha384_t' type-id='type-id-56' filepath='src/include/efivar/efisec-types.h' line='47' column='1' id='type-id-55'/>
+    <typedef-decl name='efi_cert_x509_sha512_t' type-id='type-id-59' filepath='src/include/efivar/efisec-types.h' line='52' column='1' id='type-id-58'/>
+    <typedef-decl name='efi_guid_t' type-id='type-id-62' filepath='src/include/efivar/efivar-types.h' line='23' column='1' id='type-id-61'/>
+    <typedef-decl name='efi_rsa2048_sig_t' type-id='type-id-88' filepath='src/include/efivar/efisec-types.h' line='26' column='1' id='type-id-89'/>
+    <typedef-decl name='efi_secdb_data_t' type-id='type-id-90' filepath='src/include/efivar/efisec-secdb.h' line='29' column='1' id='type-id-91'/>
+    <typedef-decl name='efi_secdb_flag_t' type-id='type-id-30' filepath='src/include/efivar/efisec-secdb.h' line='51' column='1' id='type-id-29'/>
+    <typedef-decl name='efi_secdb_t' type-id='type-id-65' filepath='src/include/efivar/efisec-secdb.h' line='14' column='1' id='type-id-92'/>
+    <typedef-decl name='efi_secdb_type_t' type-id='type-id-33' filepath='src/include/efivar/efisec-secdb.h' line='45' column='1' id='type-id-32'/>
+    <typedef-decl name='efi_sha1_hash_t' type-id='type-id-93' filepath='src/include/efivar/efisec-types.h' line='21' column='1' id='type-id-94'/>
+    <typedef-decl name='efi_sha224_hash_t' type-id='type-id-95' filepath='src/include/efivar/efisec-types.h' line='22' column='1' id='type-id-96'/>
+    <typedef-decl name='efi_sha256_hash_t' type-id='type-id-97' filepath='src/include/efivar/efisec-types.h' line='23' column='1' id='type-id-53'/>
+    <typedef-decl name='efi_sha384_hash_t' type-id='type-id-98' filepath='src/include/efivar/efisec-types.h' line='24' column='1' id='type-id-57'/>
+    <typedef-decl name='efi_sha512_hash_t' type-id='type-id-99' filepath='src/include/efivar/efisec-types.h' line='25' column='1' id='type-id-60'/>
+    <typedef-decl name='efi_time_t' type-id='type-id-68' filepath='src/include/efivar/efivar-types.h' line='85' column='1' id='type-id-54'/>
     <typedef-decl name='esl_iter' type-id='type-id-100' filepath='src/esl-iter.h' line='13' column='1' id='type-id-101'/>
     <typedef-decl name='esl_iter_status_t' type-id='type-id-34' filepath='src/esl-iter.h' line='40' column='1' id='type-id-102'/>
     <typedef-decl name='int16_t' type-id='type-id-83' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-70'/>
@@ -451,42 +451,42 @@
     <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='infinite' id='type-id-110'>
       <subrange length='infinite' type-id='type-id-22' id='type-id-111'/>
     </array-type-def>
-    <union-decl name='efi_secdb_data_t' size-in-bits='2048' naming-typedef-id='type-id-91' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='12' column='1' id='type-id-90'>
+    <union-decl name='efi_secdb_data_t' size-in-bits='2048' naming-typedef-id='type-id-91' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='16' column='1' id='type-id-90'>
       <data-member access='public'>
-        <var-decl name='sha1' type-id='type-id-94' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='13' column='1'/>
+        <var-decl name='sha1' type-id='type-id-94' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='17' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sha224' type-id='type-id-96' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='14' column='1'/>
+        <var-decl name='sha224' type-id='type-id-96' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='18' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sha256' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='15' column='1'/>
+        <var-decl name='sha256' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='19' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sha384' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='16' column='1'/>
+        <var-decl name='sha384' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='20' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sha512' type-id='type-id-60' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='17' column='1'/>
+        <var-decl name='sha512' type-id='type-id-60' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='21' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='rsa2048' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='18' column='1'/>
+        <var-decl name='rsa2048' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='22' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='rsa2048_sha1' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='19' column='1'/>
+        <var-decl name='rsa2048_sha1' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='23' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='rsa2048_sha256' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='20' column='1'/>
+        <var-decl name='rsa2048_sha256' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='24' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='x509_sha256_t' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='21' column='1'/>
+        <var-decl name='x509_sha256_t' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='25' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='x509_sha384_t' type-id='type-id-55' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='22' column='1'/>
+        <var-decl name='x509_sha384_t' type-id='type-id-55' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='26' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='x509_sha512_t' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='23' column='1'/>
+        <var-decl name='x509_sha512_t' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='27' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='raw' type-id='type-id-110' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='24' column='1'/>
+        <var-decl name='raw' type-id='type-id-110' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='28' column='1'/>
       </data-member>
     </union-decl>
     <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-31'/>
@@ -559,13 +559,13 @@
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-19'/>
-      <return type-id='type-id-3'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='esd_get_esl_offset' filepath='src/esl-iter.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-122'/>
       <return type-id='type-id-103'/>
     </function-decl>
-    <function-decl name='efi_guid_to_id_guid' filepath='src/include/efivar/efivar.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_guid_to_id_guid' filepath='src/include/efivar/efivar.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-115'/>
       <return type-id='type-id-3'/>
@@ -639,7 +639,8 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='util.c' comp-dir-path='src' language='LANG_C11'>
-    <var-decl name='page_size' type-id='type-id-12' visibility='default' filepath='src/util.h' line='205' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-131'/>
+    <var-decl name='page_size' type-id='type-id-12' visibility='default' filepath='src/util.h' line='204' column='1'/>
     <function-decl name='sysconf' filepath='/usr/include/unistd.h' line='640' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-37'/>
diff --git a/src/libefivar.abixml b/src/libefivar.abixml
index 1e1580b2..b059962b 100644
--- a/src/libefivar.abixml
+++ b/src/libefivar.abixml
@@ -120,12 +120,12 @@
     <elf-symbol name='efi_guid_zero' size='16' version='libefivar.so.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_n_well_known_guids' size='8' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_n_well_known_names' size='8' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='efi_well_known_guids' 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_' size='32928' version='libefivar.so.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' alias='efi_well_known_guids@@libefivar.so.0' is-defined='yes'/>
-    <elf-symbol name='efi_well_known_guids_end' 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_names' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='efi_well_known_names_' size='32928' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' alias='efi_well_known_names@@LIBEFIVAR_1.38' is-defined='yes'/>
-    <elf-symbol name='efi_well_known_names_end' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='efi_well_known_guids' size='8' 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_' size='32928' 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='8' 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_names' size='8' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='efi_well_known_names_' size='32928' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='efi_well_known_names_end' size='8' version='LIBEFIVAR_1.38' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' path='dp-acpi.c' comp-dir-path='src' language='LANG_C11'>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8' id='type-id-2'>
@@ -273,7 +273,7 @@
       <parameter type-id='type-id-33' name='cidstr' filepath='src/dp-acpi.c' line='291' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_generic' filepath='src/include/efivar/efivar-dp.h' line='1204' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efidp_make_generic' filepath='src/include/efivar/efivar-dp.h' line='1209' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-36'/>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-39'/>
@@ -281,7 +281,7 @@
       <parameter type-id='type-id-37'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_set' filepath='src/include/efivar/efivar.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-9'/>
@@ -290,11 +290,11 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -360,12 +360,12 @@
       <parameter type-id='type-id-38' name='hardware_device' filepath='src/dp-hw.c' line='92' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_guid_to_str' filepath='src/include/efivar/efivar.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_guid_to_str' filepath='src/include/efivar/efivar.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_guid_cmp' filepath='src/include/efivar/efivar.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_guid_cmp' filepath='src/include/efivar/efivar.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-9'/>
@@ -383,24 +383,24 @@
   </abi-instr>
   <abi-instr address-size='64' path='dp-media.c' comp-dir-path='src' language='LANG_C11'>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-47'/>
-    <function-decl name='efidp_make_file' mangled-name='efidp_make_file' filepath='src/dp-media.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_file@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-media.c' line='142' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-media.c' line='142' column='1'/>
-      <parameter type-id='type-id-10' name='filepath' filepath='src/dp-media.c' line='142' column='1'/>
+    <function-decl name='efidp_make_file' mangled-name='efidp_make_file' filepath='src/dp-media.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_file@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-media.c' line='140' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-media.c' line='140' column='1'/>
+      <parameter type-id='type-id-10' name='filepath' filepath='src/dp-media.c' line='140' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_hd' mangled-name='efidp_make_hd' filepath='src/dp-media.c' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_hd@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-38' name='num' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-48' name='part_start' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-48' name='part_size' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-36' name='signature' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-39' name='format' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-39' name='signature_type' filepath='src/dp-media.c' line='172' column='1'/>
+    <function-decl name='efidp_make_hd' mangled-name='efidp_make_hd' filepath='src/dp-media.c' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_hd@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-media.c' line='168' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-media.c' line='168' column='1'/>
+      <parameter type-id='type-id-38' name='num' filepath='src/dp-media.c' line='168' column='1'/>
+      <parameter type-id='type-id-48' name='part_start' filepath='src/dp-media.c' line='168' column='1'/>
+      <parameter type-id='type-id-48' name='part_size' filepath='src/dp-media.c' line='169' column='1'/>
+      <parameter type-id='type-id-36' name='signature' filepath='src/dp-media.c' line='169' column='1'/>
+      <parameter type-id='type-id-39' name='format' filepath='src/dp-media.c' line='169' column='1'/>
+      <parameter type-id='type-id-39' name='signature_type' filepath='src/dp-media.c' line='170' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_guid_is_zero' filepath='src/include/efivar/efivar.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_guid_is_zero' filepath='src/include/efivar/efivar.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-9'/>
     </function-decl>
@@ -429,73 +429,73 @@
     <qualified-type-def type-id='type-id-53' const='yes' id='type-id-54'/>
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-55'/>
     <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-56'/>
-    <function-decl name='efidp_make_mac_addr' mangled-name='efidp_make_mac_addr' filepath='src/dp-message.c' line='621' 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-36' name='buf' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-39' name='if_type' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-54' name='mac_addr' filepath='src/dp-message.c' line='622' column='1'/>
-      <parameter type-id='type-id-37' name='mac_addr_size' filepath='src/dp-message.c' line='622' column='1'/>
+    <function-decl name='efidp_make_mac_addr' mangled-name='efidp_make_mac_addr' filepath='src/dp-message.c' line='647' 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-36' name='buf' filepath='src/dp-message.c' line='647' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='647' column='1'/>
+      <parameter type-id='type-id-39' name='if_type' filepath='src/dp-message.c' line='647' column='1'/>
+      <parameter type-id='type-id-54' name='mac_addr' filepath='src/dp-message.c' line='648' column='1'/>
+      <parameter type-id='type-id-37' name='mac_addr_size' filepath='src/dp-message.c' line='648' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_ipv4' mangled-name='efidp_make_ipv4' filepath='src/dp-message.c' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_ipv4@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-38' name='local' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-38' name='remote' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-38' name='gateway' filepath='src/dp-message.c' line='643' column='1'/>
-      <parameter type-id='type-id-38' name='netmask' filepath='src/dp-message.c' line='643' column='1'/>
-      <parameter type-id='type-id-57' name='local_port' filepath='src/dp-message.c' line='644' column='1'/>
-      <parameter type-id='type-id-57' name='remote_port' filepath='src/dp-message.c' line='644' column='1'/>
-      <parameter type-id='type-id-57' name='protocol' filepath='src/dp-message.c' line='645' column='1'/>
-      <parameter type-id='type-id-9' name='is_static' filepath='src/dp-message.c' line='645' column='1'/>
+    <function-decl name='efidp_make_ipv4' mangled-name='efidp_make_ipv4' filepath='src/dp-message.c' line='668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_ipv4@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='668' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='668' column='1'/>
+      <parameter type-id='type-id-38' name='local' filepath='src/dp-message.c' line='668' column='1'/>
+      <parameter type-id='type-id-38' name='remote' filepath='src/dp-message.c' line='668' column='1'/>
+      <parameter type-id='type-id-38' name='gateway' filepath='src/dp-message.c' line='669' column='1'/>
+      <parameter type-id='type-id-38' name='netmask' filepath='src/dp-message.c' line='669' column='1'/>
+      <parameter type-id='type-id-57' name='local_port' filepath='src/dp-message.c' line='670' column='1'/>
+      <parameter type-id='type-id-57' name='remote_port' filepath='src/dp-message.c' line='670' column='1'/>
+      <parameter type-id='type-id-57' name='protocol' filepath='src/dp-message.c' line='671' column='1'/>
+      <parameter type-id='type-id-9' name='is_static' filepath='src/dp-message.c' line='671' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_scsi' mangled-name='efidp_make_scsi' filepath='src/dp-message.c' line='671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_scsi@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-57' name='target' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='671' column='1'/>
+    <function-decl name='efidp_make_scsi' mangled-name='efidp_make_scsi' filepath='src/dp-message.c' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_scsi@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='697' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='697' column='1'/>
+      <parameter type-id='type-id-57' name='target' filepath='src/dp-message.c' line='697' column='1'/>
+      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='697' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_nvme' mangled-name='efidp_make_nvme' filepath='src/dp-message.c' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvme@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-38' name='namespace_id' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-36' name='ieee_eui_64' filepath='src/dp-message.c' line='690' column='1'/>
-      <return type-id='type-id-37'/>
-    </function-decl>
-    <function-decl name='efidp_make_sata' mangled-name='efidp_make_sata' filepath='src/dp-message.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sata@@libefivar.so.0'>
+    <function-decl name='efidp_make_nvme' mangled-name='efidp_make_nvme' filepath='src/dp-message.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvme@@libefivar.so.0'>
       <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='715' column='1'/>
       <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='715' column='1'/>
-      <parameter type-id='type-id-57' name='hba_port' filepath='src/dp-message.c' line='715' column='1'/>
-      <parameter type-id='type-id-51' name='port_multiplier_port' filepath='src/dp-message.c' line='716' column='1'/>
-      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='716' column='1'/>
+      <parameter type-id='type-id-38' name='namespace_id' filepath='src/dp-message.c' line='715' column='1'/>
+      <parameter type-id='type-id-36' name='ieee_eui_64' filepath='src/dp-message.c' line='716' column='1'/>
+      <return type-id='type-id-37'/>
+    </function-decl>
+    <function-decl name='efidp_make_sata' mangled-name='efidp_make_sata' filepath='src/dp-message.c' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sata@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='741' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='741' column='1'/>
+      <parameter type-id='type-id-57' name='hba_port' filepath='src/dp-message.c' line='741' column='1'/>
+      <parameter type-id='type-id-51' name='port_multiplier_port' filepath='src/dp-message.c' line='742' column='1'/>
+      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='742' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_atapi' mangled-name='efidp_make_atapi' filepath='src/dp-message.c' line='737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_atapi@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-57' name='primary' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-57' name='slave' filepath='src/dp-message.c' line='738' column='1'/>
-      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='738' column='1'/>
+    <function-decl name='efidp_make_atapi' mangled-name='efidp_make_atapi' filepath='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-36' name='buf' filepath='src/dp-message.c' line='763' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='763' column='1'/>
+      <parameter type-id='type-id-57' name='primary' filepath='src/dp-message.c' line='763' column='1'/>
+      <parameter type-id='type-id-57' name='slave' filepath='src/dp-message.c' line='764' column='1'/>
+      <parameter type-id='type-id-57' name='lun' filepath='src/dp-message.c' line='764' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_sas' mangled-name='efidp_make_sas' filepath='src/dp-message.c' line='760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sas@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='760' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='760' column='1'/>
-      <parameter type-id='type-id-48' name='sas_address' filepath='src/dp-message.c' line='760' column='1'/>
+    <function-decl name='efidp_make_sas' mangled-name='efidp_make_sas' filepath='src/dp-message.c' line='786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_sas@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='786' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='786' column='1'/>
+      <parameter type-id='type-id-48' name='sas_address' filepath='src/dp-message.c' line='786' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_nvdimm' mangled-name='efidp_make_nvdimm' filepath='src/dp-message.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvdimm@@LIBEFIVAR_1.33'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='785' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='785' column='1'/>
-      <parameter type-id='type-id-55' name='uuid' filepath='src/dp-message.c' line='785' column='1'/>
+    <function-decl name='efidp_make_nvdimm' mangled-name='efidp_make_nvdimm' filepath='src/dp-message.c' line='811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_nvdimm@@LIBEFIVAR_1.33'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='811' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='811' column='1'/>
+      <parameter type-id='type-id-55' name='uuid' filepath='src/dp-message.c' line='811' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efidp_make_emmc' mangled-name='efidp_make_emmc' filepath='src/dp-message.c' line='804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_emmc@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='804' column='1'/>
-      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='804' column='1'/>
-      <parameter type-id='type-id-38' name='slot_id' filepath='src/dp-message.c' line='804' column='1'/>
+    <function-decl name='efidp_make_emmc' mangled-name='efidp_make_emmc' filepath='src/dp-message.c' line='830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_emmc@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-message.c' line='830' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-message.c' line='830' column='1'/>
+      <parameter type-id='type-id-38' name='slot_id' filepath='src/dp-message.c' line='830' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
   </abi-instr>
@@ -509,716 +509,716 @@
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-26'/>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-62'>
+    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
+        <var-decl name='a' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
+        <var-decl name='b' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
+        <var-decl name='c' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+        <var-decl name='d' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-types.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+        <var-decl name='e' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='22' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='31' column='1' id='type-id-65'>
+    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-65'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' column='1'/>
+        <var-decl name='addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-68'>
+    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-68'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
+        <var-decl name='addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' column='1' id='type-id-71'>
+    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-71'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='353' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='355' column='1'/>
+        <var-decl name='guid' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='156' column='1' id='type-id-74'>
+    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='160' column='1' id='type-id-74'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='157' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='158' column='1'/>
+        <var-decl name='adr' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='162' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-76' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='106' column='1' id='type-id-77'>
+    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-76' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-77'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='107' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='hid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='109' column='1'/>
+        <var-decl name='uid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='113' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='115' column='1' id='type-id-79'>
+    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1' id='type-id-79'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='116' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='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-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='117' column='1'/>
+        <var-decl name='hid' type-id='type-id-38' visibility='default' filepath='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-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='118' column='1'/>
+        <var-decl name='uid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='cid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1'/>
+        <var-decl name='cid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='125' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='317' column='1' id='type-id-81'>
+    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1' id='type-id-81'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='318' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
+        <var-decl name='primary' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='320' column='1'/>
+        <var-decl name='slave' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1'/>
+        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='325' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='806' column='1' id='type-id-83'>
+    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-83'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='807' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='812' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='device_type' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' column='1'/>
+        <var-decl name='device_type' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='813' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='status' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='809' column='1'/>
+        <var-decl name='status' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='814' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='810' column='1'/>
+        <var-decl name='description' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='815' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-85' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1' id='type-id-86'>
+    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-85' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-86'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='93' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='94' column='1'/>
+        <var-decl name='interface_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='95' column='1'/>
+        <var-decl name='base_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='99' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-87' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-88'>
+    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-87' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='670' column='1' id='type-id-88'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
+        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-89' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-90'>
+    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-89' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='690' column='1' id='type-id-90'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='686' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='691' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='692' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='688' column='1'/>
+        <var-decl name='addr_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='693' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-91' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='735' column='1' id='type-id-92'>
+    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-91' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-92'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='736' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='741' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='boot_catalog_entry' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
+        <var-decl name='boot_catalog_entry' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='742' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
+        <var-decl name='sectors' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-93' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='86' column='1' id='type-id-94'>
+    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-93' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='90' column='1' id='type-id-94'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='87' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='controller' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
+        <var-decl name='controller' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-95' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='695' column='1' id='type-id-96'>
+    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-95' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='700' column='1' id='type-id-96'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='696' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='701' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
+        <var-decl name='addrs' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-97' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-98'>
+    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-97' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='682' column='1' id='type-id-98'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='683' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
+        <var-decl name='slot' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='684' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-99' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-100'>
+    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-99' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='340' column='1' id='type-id-100'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='337' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='338' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='339' column='1'/>
+        <var-decl name='wwn' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='343' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='340' column='1'/>
+        <var-decl name='lun' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-101' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1' id='type-id-102'>
+    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-101' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='348' column='1' id='type-id-102'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='345' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='349' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='346' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='347' column='1'/>
+        <var-decl name='wwn' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='348' column='1'/>
+        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-105'>
+    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='759' column='1' id='type-id-105'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='755' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='760' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
+        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-107' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1' id='type-id-108'>
+    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-107' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='772' column='1' id='type-id-108'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-109' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1' id='type-id-110'>
+    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-109' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='778' column='1' id='type-id-110'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-111' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-112'>
+    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-111' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1' id='type-id-112'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='711' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='partition_number' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
+        <var-decl name='partition_number' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
+        <var-decl name='start' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='718' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='714' column='1'/>
+        <var-decl name='size' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='719' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1'/>
+        <var-decl name='signature' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='720' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
+        <var-decl name='format' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='721' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
+        <var-decl name='signature_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='722' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='23' column='1' id='type-id-113'>
+    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-113'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
+        <var-decl name='type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='25' column='1'/>
+        <var-decl name='subtype' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='26' column='1'/>
+        <var-decl name='length' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1' id='type-id-115'>
+    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-115'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='66' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='68' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='72' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_i2o' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-116' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='419' column='1' id='type-id-117'>
+    <class-decl name='efidp_i2o' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-116' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='423' column='1' id='type-id-117'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='420' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='424' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='421' column='1'/>
+        <var-decl name='target' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1' id='type-id-119'>
+    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1' id='type-id-119'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='resource_flags' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
+        <var-decl name='resource_flags' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-120' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='485' column='1'/>
+        <var-decl name='port_gid' type-id='type-id-120' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='' type-id='type-id-121' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
+        <var-decl name='target_port_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='495' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1'/>
+        <var-decl name='device_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='496' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='437' column='1' id='type-id-123'>
+    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='441' column='1' id='type-id-123'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='438' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='442' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='439' column='1'/>
+        <var-decl name='local_ipv4_addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='440' column='1'/>
+        <var-decl name='remote_ipv4_addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='local_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='441' column='1'/>
+        <var-decl name='local_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='remote_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='442' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='443' column='1'/>
+        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-124' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
+        <var-decl name='static_ip_addr' type-id='type-id-124' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
+        <var-decl name='gateway' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
+        <var-decl name='netmask' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='450' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ipv6_addr' size-in-bits='360' is-struct='yes' naming-typedef-id='type-id-125' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='459' column='1' id='type-id-126'>
+    <class-decl name='efidp_ipv6_addr' size-in-bits='480' is-struct='yes' naming-typedef-id='type-id-125' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='463' column='1' id='type-id-126'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='460' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='461' column='1'/>
+        <var-decl name='local_ipv6_addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='462' column='1'/>
+        <var-decl name='remote_ipv6_addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='local_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='463' column='1'/>
+        <var-decl name='local_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='remote_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='464' column='1'/>
+        <var-decl name='remote_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='465' column='1'/>
+        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='466' column='1'/>
+        <var-decl name='ip_addr_origin' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='467' column='1'/>
+        <var-decl name='prefix_length' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-69' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='472' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-127' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='602' column='1' id='type-id-128'>
+    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-127' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='603' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
+        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='609' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='options' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='605' column='1'/>
+        <var-decl name='options' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='610' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
+        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='611' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpgt' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1'/>
+        <var-decl name='tpgt' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='612' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
+        <var-decl name='target_name' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='613' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-130'>
+    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='406' column='1' id='type-id-130'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
+        <var-decl name='lun' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' column='1' id='type-id-132'>
+    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='426' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='430' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='428' column='1'/>
+        <var-decl name='if_type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='432' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-134' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1' id='type-id-135'>
+    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-134' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='748' column='1' id='type-id-135'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='749' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='745' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='750' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='751' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-136' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1' id='type-id-137'>
+    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-136' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='58' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='memory_type' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
+        <var-decl name='memory_type' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='60' column='1'/>
+        <var-decl name='starting_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1'/>
+        <var-decl name='ending_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-138' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='532' column='1' id='type-id-139'>
+    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-138' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='537' column='1' id='type-id-139'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='533' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='538' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='539' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='540' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-140' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-141'>
+    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-140' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='707' column='1' id='type-id-141'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='708' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='uuid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='709' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='637' column='1' id='type-id-143'>
+    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='642' column='1' id='type-id-143'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='638' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='643' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='namespace_id' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='639' column='1'/>
+        <var-decl name='namespace_id' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='644' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='640' column='1'/>
+        <var-decl name='ieee_eui_64' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='645' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='51' column='1' id='type-id-145'>
+    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='55' column='1' id='type-id-145'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='52' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='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-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
+        <var-decl name='function' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='42' column='1' id='type-id-147'>
+    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-147'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='43' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
+        <var-decl name='function' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
+        <var-decl name='device' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='49' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-148' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-149'>
+    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-148' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='766' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-150' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1' id='type-id-151'>
+    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-150' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1' id='type-id-151'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='793' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='794' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='790' column='1'/>
+        <var-decl name='end_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='795' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='791' column='1'/>
+        <var-decl name='disk_type_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='796' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='instance_number' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1'/>
+        <var-decl name='instance_number' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='797' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1' id='type-id-153'>
+    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-153'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='785' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='786' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='first_byte' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='783' column='1'/>
+        <var-decl name='last_byte' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='556' column='1' id='type-id-155'>
+    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1' id='type-id-155'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='557' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='559' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='560' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='565' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1'/>
+        <var-decl name='lun' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='566' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='567' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='568' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='rtp' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
+        <var-decl name='rtp' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='569' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='589' column='1' id='type-id-157'>
+    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1' id='type-id-157'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='590' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='596' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='592' column='1'/>
+        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='597' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='593' column='1'/>
+        <var-decl name='device_topology_info' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='598' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1'/>
+        <var-decl name='drive_bay_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='599' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='rtp' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
+        <var-decl name='rtp' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='600' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-158' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-159'>
+    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-158' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='409' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='413' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hba_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' column='1'/>
+        <var-decl name='hba_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='414' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='port_multiplier_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='411' column='1'/>
+        <var-decl name='port_multiplier_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='415' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1'/>
+        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='416' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='327' column='1' id='type-id-161'>
+    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-161'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='328' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='329' column='1'/>
+        <var-decl name='target' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='330' column='1'/>
+        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='334' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1' id='type-id-163'>
+    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='664' column='1' id='type-id-163'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='660' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='661' column='1'/>
+        <var-decl name='slot_number' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-165'>
+    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1' id='type-id-165'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='502' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='509' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1'/>
+        <var-decl name='parity' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
+        <var-decl name='stop_bits' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='512' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-167'>
+    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='550' column='1' id='type-id-167'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='546' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='551' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='547' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='552' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='flow_control_map' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
+        <var-decl name='flow_control_map' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1' id='type-id-169'>
+    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='657' column='1' id='type-id-169'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='658' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
+        <var-decl name='target_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='655' column='1'/>
+        <var-decl name='lun' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='660' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-171'>
+    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='651' column='1' id='type-id-171'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='647' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
+        <var-decl name='uri' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1' id='type-id-173'>
+    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-173'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='360' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='365' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='interface' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1' id='type-id-175'>
+    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1' id='type-id-175'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='367' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='product_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='369' column='1'/>
+        <var-decl name='product_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
+        <var-decl name='device_class' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
+        <var-decl name='device_subclass' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
+        <var-decl name='device_protocol' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='376' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='393' column='1' id='type-id-177'>
+    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1' id='type-id-177'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='394' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
+        <var-decl name='interface' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='vendor_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='396' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='product_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1'/>
+        <var-decl name='product_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='401' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='serial_number' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
+        <var-decl name='serial_number' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='476' column='1' id='type-id-179'>
+    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='481' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='477' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vlan_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
+        <var-decl name='vlan_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-181'>
+    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='676' column='1' id='type-id-181'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='673' column='1'/>
+        <var-decl name='ssid' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='826' column='1' id='type-id-182'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1' id='type-id-182'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='827' column='1'/>
+        <var-decl name='type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='828' column='1'/>
+        <var-decl name='subtype' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='829' column='1'/>
+        <var-decl name='length' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='DIR' type-id='type-id-183' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-184'/>
@@ -1227,66 +1227,66 @@
     <typedef-decl name='__uint32_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-187'/>
     <typedef-decl name='__uint64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-188'/>
     <typedef-decl name='__uint8_t' type-id='type-id-189' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-190'/>
-    <typedef-decl name='const_efidp' type-id='type-id-191' filepath='src/include/efivar/efivar-dp.h' line='885' column='1' id='type-id-192'/>
-    <typedef-decl name='efi_guid_t' type-id='type-id-62' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-43'/>
-    <typedef-decl name='efi_ip_addr_t' type-id='type-id-193' filepath='src/include/efivar/efivar-types.h' line='43' column='1' id='type-id-60'/>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-65' filepath='src/include/efivar/efivar-types.h' line='33' column='1' id='type-id-64'/>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-68' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-67'/>
-    <typedef-decl name='efidp' type-id='type-id-194' filepath='src/include/efivar/efivar-dp.h' line='884' column='1' id='type-id-195'/>
-    <typedef-decl name='efidp_1394' type-id='type-id-71' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-70'/>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-74' filepath='src/include/efivar/efivar-dp.h' line='159' column='1' id='type-id-73'/>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-77' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-76'/>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-79' filepath='src/include/efivar/efivar-dp.h' line='122' column='1' id='type-id-78'/>
-    <typedef-decl name='efidp_atapi' type-id='type-id-81' filepath='src/include/efivar/efivar-dp.h' line='322' column='1' id='type-id-80'/>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-83' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-82'/>
-    <typedef-decl name='efidp_bmc' type-id='type-id-86' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-85'/>
-    <typedef-decl name='efidp_boolean' type-id='type-id-39' filepath='src/include/efivar/efivar-dp.h' line='30' column='1' id='type-id-124'/>
-    <typedef-decl name='efidp_bt' type-id='type-id-88' filepath='src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-87'/>
-    <typedef-decl name='efidp_btle' type-id='type-id-90' filepath='src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-89'/>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-92' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-91'/>
-    <typedef-decl name='efidp_controller' type-id='type-id-94' filepath='src/include/efivar/efivar-dp.h' line='89' column='1' id='type-id-93'/>
-    <typedef-decl name='efidp_data' type-id='type-id-196' filepath='src/include/efivar/efivar-dp.h' line='883' column='1' id='type-id-197'/>
-    <typedef-decl name='efidp_dns' type-id='type-id-96' filepath='src/include/efivar/efivar-dp.h' line='699' column='1' id='type-id-95'/>
-    <typedef-decl name='efidp_emmc' type-id='type-id-98' filepath='src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-97'/>
-    <typedef-decl name='efidp_fc' type-id='type-id-100' filepath='src/include/efivar/efivar-dp.h' line='341' column='1' id='type-id-99'/>
-    <typedef-decl name='efidp_fcex' type-id='type-id-102' filepath='src/include/efivar/efivar-dp.h' line='349' column='1' id='type-id-101'/>
-    <typedef-decl name='efidp_file' type-id='type-id-105' filepath='src/include/efivar/efivar-dp.h' line='757' column='1' id='type-id-104'/>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-108' filepath='src/include/efivar/efivar-dp.h' line='770' column='1' id='type-id-107'/>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-110' filepath='src/include/efivar/efivar-dp.h' line='776' column='1' id='type-id-109'/>
-    <typedef-decl name='efidp_hd' type-id='type-id-112' filepath='src/include/efivar/efivar-dp.h' line='721' column='1' id='type-id-111'/>
-    <typedef-decl name='efidp_header' type-id='type-id-113' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-72'/>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-115' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-114'/>
-    <typedef-decl name='efidp_i2o' type-id='type-id-117' filepath='src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-116'/>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-119' filepath='src/include/efivar/efivar-dp.h' line='492' column='1' id='type-id-118'/>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-123' filepath='src/include/efivar/efivar-dp.h' line='447' column='1' id='type-id-122'/>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-126' filepath='src/include/efivar/efivar-dp.h' line='469' column='1' id='type-id-125'/>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-128' filepath='src/include/efivar/efivar-dp.h' line='609' column='1' id='type-id-127'/>
-    <typedef-decl name='efidp_lun' type-id='type-id-130' filepath='src/include/efivar/efivar-dp.h' line='405' column='1' id='type-id-129'/>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-132' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-131'/>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-135' filepath='src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-134'/>
-    <typedef-decl name='efidp_mmio' type-id='type-id-137' filepath='src/include/efivar/efivar-dp.h' line='62' column='1' id='type-id-136'/>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-139' filepath='src/include/efivar/efivar-dp.h' line='536' column='1' id='type-id-138'/>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-141' filepath='src/include/efivar/efivar-dp.h' line='705' column='1' id='type-id-140'/>
-    <typedef-decl name='efidp_nvme' type-id='type-id-143' filepath='src/include/efivar/efivar-dp.h' line='641' column='1' id='type-id-142'/>
-    <typedef-decl name='efidp_pccard' type-id='type-id-145' filepath='src/include/efivar/efivar-dp.h' line='54' column='1' id='type-id-144'/>
-    <typedef-decl name='efidp_pci' type-id='type-id-147' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-146'/>
-    <typedef-decl name='efidp_protocol' type-id='type-id-149' filepath='src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-148'/>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-151' filepath='src/include/efivar/efivar-dp.h' line='793' column='1' id='type-id-150'/>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-153' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-152'/>
-    <typedef-decl name='efidp_sas' type-id='type-id-155' filepath='src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-154'/>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-157' filepath='src/include/efivar/efivar-dp.h' line='596' column='1' id='type-id-156'/>
-    <typedef-decl name='efidp_sata' type-id='type-id-159' filepath='src/include/efivar/efivar-dp.h' line='413' column='1' id='type-id-158'/>
-    <typedef-decl name='efidp_scsi' type-id='type-id-161' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-160'/>
-    <typedef-decl name='efidp_sd' type-id='type-id-163' filepath='src/include/efivar/efivar-dp.h' line='662' column='1' id='type-id-162'/>
-    <typedef-decl name='efidp_uart' type-id='type-id-165' filepath='src/include/efivar/efivar-dp.h' line='508' column='1' id='type-id-164'/>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-167' filepath='src/include/efivar/efivar-dp.h' line='549' column='1' id='type-id-166'/>
-    <typedef-decl name='efidp_ufs' type-id='type-id-169' filepath='src/include/efivar/efivar-dp.h' line='656' column='1' id='type-id-168'/>
-    <typedef-decl name='efidp_uri' type-id='type-id-171' filepath='src/include/efivar/efivar-dp.h' line='649' column='1' id='type-id-170'/>
-    <typedef-decl name='efidp_usb' type-id='type-id-173' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-172'/>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-175' filepath='src/include/efivar/efivar-dp.h' line='373' column='1' id='type-id-174'/>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-177' filepath='src/include/efivar/efivar-dp.h' line='399' column='1' id='type-id-176'/>
-    <typedef-decl name='efidp_vlan' type-id='type-id-179' filepath='src/include/efivar/efivar-dp.h' line='479' column='1' id='type-id-178'/>
-    <typedef-decl name='efidp_wifi' type-id='type-id-181' filepath='src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-180'/>
+    <typedef-decl name='const_efidp' type-id='type-id-191' filepath='src/include/efivar/efivar-dp.h' line='890' column='1' id='type-id-192'/>
+    <typedef-decl name='efi_guid_t' type-id='type-id-62' filepath='src/include/efivar/efivar-types.h' line='23' column='1' id='type-id-43'/>
+    <typedef-decl name='efi_ip_addr_t' type-id='type-id-193' filepath='src/include/efivar/efivar-types.h' line='47' column='1' id='type-id-60'/>
+    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-65' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-64'/>
+    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-68' filepath='src/include/efivar/efivar-types.h' line='41' column='1' id='type-id-67'/>
+    <typedef-decl name='efidp' type-id='type-id-194' filepath='src/include/efivar/efivar-dp.h' line='889' column='1' id='type-id-195'/>
+    <typedef-decl name='efidp_1394' type-id='type-id-71' filepath='src/include/efivar/efivar-dp.h' line='360' column='1' id='type-id-70'/>
+    <typedef-decl name='efidp_acpi_adr' type-id='type-id-74' filepath='src/include/efivar/efivar-dp.h' line='163' column='1' id='type-id-73'/>
+    <typedef-decl name='efidp_acpi_hid' type-id='type-id-77' filepath='src/include/efivar/efivar-dp.h' line='114' column='1' id='type-id-76'/>
+    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-79' filepath='src/include/efivar/efivar-dp.h' line='126' column='1' id='type-id-78'/>
+    <typedef-decl name='efidp_atapi' type-id='type-id-81' filepath='src/include/efivar/efivar-dp.h' line='326' column='1' id='type-id-80'/>
+    <typedef-decl name='efidp_bios_boot' type-id='type-id-83' filepath='src/include/efivar/efivar-dp.h' line='816' column='1' id='type-id-82'/>
+    <typedef-decl name='efidp_bmc' type-id='type-id-86' filepath='src/include/efivar/efivar-dp.h' line='100' column='1' id='type-id-85'/>
+    <typedef-decl name='efidp_boolean' type-id='type-id-39' filepath='src/include/efivar/efivar-dp.h' line='34' column='1' id='type-id-124'/>
+    <typedef-decl name='efidp_bt' type-id='type-id-88' filepath='src/include/efivar/efivar-dp.h' line='673' column='1' id='type-id-87'/>
+    <typedef-decl name='efidp_btle' type-id='type-id-90' filepath='src/include/efivar/efivar-dp.h' line='694' column='1' id='type-id-89'/>
+    <typedef-decl name='efidp_cdrom' type-id='type-id-92' filepath='src/include/efivar/efivar-dp.h' line='745' column='1' id='type-id-91'/>
+    <typedef-decl name='efidp_controller' type-id='type-id-94' filepath='src/include/efivar/efivar-dp.h' line='93' column='1' id='type-id-93'/>
+    <typedef-decl name='efidp_data' type-id='type-id-196' filepath='src/include/efivar/efivar-dp.h' line='888' column='1' id='type-id-197'/>
+    <typedef-decl name='efidp_dns' type-id='type-id-96' filepath='src/include/efivar/efivar-dp.h' line='704' column='1' id='type-id-95'/>
+    <typedef-decl name='efidp_emmc' type-id='type-id-98' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-97'/>
+    <typedef-decl name='efidp_fc' type-id='type-id-100' filepath='src/include/efivar/efivar-dp.h' line='345' column='1' id='type-id-99'/>
+    <typedef-decl name='efidp_fcex' type-id='type-id-102' filepath='src/include/efivar/efivar-dp.h' line='353' column='1' id='type-id-101'/>
+    <typedef-decl name='efidp_file' type-id='type-id-105' filepath='src/include/efivar/efivar-dp.h' line='762' column='1' id='type-id-104'/>
+    <typedef-decl name='efidp_firmware_file' type-id='type-id-108' filepath='src/include/efivar/efivar-dp.h' line='775' column='1' id='type-id-107'/>
+    <typedef-decl name='efidp_firmware_volume' type-id='type-id-110' filepath='src/include/efivar/efivar-dp.h' line='781' column='1' id='type-id-109'/>
+    <typedef-decl name='efidp_hd' type-id='type-id-112' filepath='src/include/efivar/efivar-dp.h' line='726' column='1' id='type-id-111'/>
+    <typedef-decl name='efidp_header' type-id='type-id-113' filepath='src/include/efivar/efivar-dp.h' line='31' column='1' id='type-id-72'/>
+    <typedef-decl name='efidp_hw_vendor' type-id='type-id-115' filepath='src/include/efivar/efivar-dp.h' line='73' column='1' id='type-id-114'/>
+    <typedef-decl name='efidp_i2o' type-id='type-id-117' filepath='src/include/efivar/efivar-dp.h' line='426' column='1' id='type-id-116'/>
+    <typedef-decl name='efidp_infiniband' type-id='type-id-119' filepath='src/include/efivar/efivar-dp.h' line='497' column='1' id='type-id-118'/>
+    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-123' filepath='src/include/efivar/efivar-dp.h' line='451' column='1' id='type-id-122'/>
+    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-126' filepath='src/include/efivar/efivar-dp.h' line='473' column='1' id='type-id-125'/>
+    <typedef-decl name='efidp_iscsi' type-id='type-id-128' filepath='src/include/efivar/efivar-dp.h' line='614' column='1' id='type-id-127'/>
+    <typedef-decl name='efidp_lun' type-id='type-id-130' filepath='src/include/efivar/efivar-dp.h' line='409' column='1' id='type-id-129'/>
+    <typedef-decl name='efidp_mac_addr' type-id='type-id-132' filepath='src/include/efivar/efivar-dp.h' line='433' column='1' id='type-id-131'/>
+    <typedef-decl name='efidp_media_vendor' type-id='type-id-135' filepath='src/include/efivar/efivar-dp.h' line='752' column='1' id='type-id-134'/>
+    <typedef-decl name='efidp_mmio' type-id='type-id-137' filepath='src/include/efivar/efivar-dp.h' line='66' column='1' id='type-id-136'/>
+    <typedef-decl name='efidp_msg_vendor' type-id='type-id-139' filepath='src/include/efivar/efivar-dp.h' line='541' column='1' id='type-id-138'/>
+    <typedef-decl name='efidp_nvdimm' type-id='type-id-141' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-140'/>
+    <typedef-decl name='efidp_nvme' type-id='type-id-143' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-142'/>
+    <typedef-decl name='efidp_pccard' type-id='type-id-145' filepath='src/include/efivar/efivar-dp.h' line='58' column='1' id='type-id-144'/>
+    <typedef-decl name='efidp_pci' type-id='type-id-147' filepath='src/include/efivar/efivar-dp.h' line='50' column='1' id='type-id-146'/>
+    <typedef-decl name='efidp_protocol' type-id='type-id-149' filepath='src/include/efivar/efivar-dp.h' line='769' column='1' id='type-id-148'/>
+    <typedef-decl name='efidp_ramdisk' type-id='type-id-151' filepath='src/include/efivar/efivar-dp.h' line='798' column='1' id='type-id-150'/>
+    <typedef-decl name='efidp_relative_offset' type-id='type-id-153' filepath='src/include/efivar/efivar-dp.h' line='789' column='1' id='type-id-152'/>
+    <typedef-decl name='efidp_sas' type-id='type-id-155' filepath='src/include/efivar/efivar-dp.h' line='570' column='1' id='type-id-154'/>
+    <typedef-decl name='efidp_sas_ex' type-id='type-id-157' filepath='src/include/efivar/efivar-dp.h' line='601' column='1' id='type-id-156'/>
+    <typedef-decl name='efidp_sata' type-id='type-id-159' filepath='src/include/efivar/efivar-dp.h' line='417' column='1' id='type-id-158'/>
+    <typedef-decl name='efidp_scsi' type-id='type-id-161' filepath='src/include/efivar/efivar-dp.h' line='335' column='1' id='type-id-160'/>
+    <typedef-decl name='efidp_sd' type-id='type-id-163' filepath='src/include/efivar/efivar-dp.h' line='667' column='1' id='type-id-162'/>
+    <typedef-decl name='efidp_uart' type-id='type-id-165' filepath='src/include/efivar/efivar-dp.h' line='513' column='1' id='type-id-164'/>
+    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-167' filepath='src/include/efivar/efivar-dp.h' line='554' column='1' id='type-id-166'/>
+    <typedef-decl name='efidp_ufs' type-id='type-id-169' filepath='src/include/efivar/efivar-dp.h' line='661' column='1' id='type-id-168'/>
+    <typedef-decl name='efidp_uri' type-id='type-id-171' filepath='src/include/efivar/efivar-dp.h' line='654' column='1' id='type-id-170'/>
+    <typedef-decl name='efidp_usb' type-id='type-id-173' filepath='src/include/efivar/efivar-dp.h' line='367' column='1' id='type-id-172'/>
+    <typedef-decl name='efidp_usb_class' type-id='type-id-175' filepath='src/include/efivar/efivar-dp.h' line='377' column='1' id='type-id-174'/>
+    <typedef-decl name='efidp_usb_wwid' type-id='type-id-177' filepath='src/include/efivar/efivar-dp.h' line='403' column='1' id='type-id-176'/>
+    <typedef-decl name='efidp_vlan' type-id='type-id-179' filepath='src/include/efivar/efivar-dp.h' line='484' column='1' id='type-id-178'/>
+    <typedef-decl name='efidp_wifi' type-id='type-id-181' filepath='src/include/efivar/efivar-dp.h' line='679' column='1' id='type-id-180'/>
     <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h' line='214' column='1' id='type-id-20'/>
     <typedef-decl name='ssize_t' type-id='type-id-185' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-37'/>
     <typedef-decl name='uint16_t' type-id='type-id-186' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-57'/>
@@ -1323,184 +1323,184 @@
     <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='infinite' id='type-id-84'>
       <subrange length='infinite' type-id='type-id-3' id='type-id-59'/>
     </array-type-def>
-    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-60' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-193'>
+    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-60' visibility='default' filepath='src/include/efivar/efivar-types.h' line='43' column='1' id='type-id-193'>
       <data-member access='public'>
-        <var-decl name='addr' type-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
+        <var-decl name='addr' type-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-types.h' line='44' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v4' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
+        <var-decl name='v4' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='45' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v6' type-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' column='1'/>
+        <var-decl name='v6' type-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='46' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='efidp_data' size-in-bits='384' naming-typedef-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='825' column='1' id='type-id-196'>
+    <union-decl name='efidp_data' size-in-bits='480' naming-typedef-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='830' column='1' id='type-id-196'>
       <data-member access='public'>
         <var-decl name='' type-id='type-id-182' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pci' type-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
+        <var-decl name='pci' type-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pccard' type-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
+        <var-decl name='pccard' type-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mmio' type-id='type-id-136' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='mmio' type-id='type-id-136' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hw_vendor' type-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='controller' type-id='type-id-93' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
+        <var-decl name='controller' type-id='type-id-93' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bmc' type-id='type-id-85' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
+        <var-decl name='bmc' type-id='type-id-85' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid' type-id='type-id-76' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-76' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_adr' type-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='atapi' type-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='atapi' type-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='scsi' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='scsi' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fc' type-id='type-id-99' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='fc' type-id='type-id-99' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fcex' type-id='type-id-101' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='fcex' type-id='type-id-101' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firewire' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='firewire' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='usb' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_class' type-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_wwid' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='lun' type-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='lun' type-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sata' type-id='type-id-158' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='sata' type-id='type-id-158' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='i2o' type-id='type-id-116' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
+        <var-decl name='i2o' type-id='type-id-116' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mac_addr' type-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv4_addr' type-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv6_addr' type-id='type-id-125' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-125' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='vlan' type-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='vlan' type-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='infiniband' type-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart' type-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='uart' type-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='msg_vendor' type-id='type-id-138' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-138' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart_flow_control' type-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas' type-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='sas' type-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas_ex' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='iscsi' type-id='type-id-127' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-127' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvme' type-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='nvme' type-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uri' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uri' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ufs' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='ufs' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sd' type-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='sd' type-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bt' type-id='type-id-87' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='bt' type-id='type-id-87' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='wifi' type-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='wifi' type-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='emmc' type-id='type-id-97' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='emmc' type-id='type-id-97' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='btle' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='btle' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='dns' type-id='type-id-95' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='dns' type-id='type-id-95' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvdimm' type-id='type-id-140' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-140' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hd' type-id='type-id-111' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='hd' type-id='type-id-111' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='cdrom' type-id='type-id-91' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-91' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='media_vendor' type-id='type-id-134' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-134' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='file' type-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='file' type-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='protocol' type-id='type-id-148' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='protocol' type-id='type-id-148' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_file' type-id='type-id-107' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='firmware_file' type-id='type-id-107' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='883' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_volume' type-id='type-id-109' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='firmware_volume' type-id='type-id-109' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='884' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='relative_offset' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='relative_offset' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='885' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ramdisk' type-id='type-id-150' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='ramdisk' type-id='type-id-150' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='886' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bios_boot' type-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='887' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='486' column='1' id='type-id-121'>
+    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1' id='type-id-121'>
       <data-member access='public'>
-        <var-decl name='ioc_guid' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1'/>
+        <var-decl name='ioc_guid' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='492' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='service_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
+        <var-decl name='service_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='493' column='1'/>
       </data-member>
     </union-decl>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-189'/>
@@ -1633,10 +1633,10 @@
     </class-decl>
     <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='22' column='1' id='type-id-222'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='d_ino' type-id='type-id-223' visibility='default' filepath='/usr/include/bits/dirent.h' line='25' column='1'/>
+        <var-decl name='d_ino' type-id='type-id-223' visibility='default' filepath='/usr/include/bits/dirent.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d_off' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
+        <var-decl name='d_off' type-id='type-id-16' visibility='default' filepath='/usr/include/bits/dirent.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='d_reclen' type-id='type-id-14' visibility='default' filepath='/usr/include/bits/dirent.h' line='31' column='1'/>
@@ -1648,36 +1648,36 @@
         <var-decl name='d_name' type-id='type-id-217' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='efi_var_operations' size-in-bits='2624' is-struct='yes' visibility='default' filepath='src/lib.h' line='21' column='1' id='type-id-224'>
+    <class-decl name='efi_var_operations' size-in-bits='2624' is-struct='yes' visibility='default' filepath='src/lib.h' line='26' column='1' id='type-id-224'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-215' visibility='default' filepath='src/lib.h' line='22' column='1'/>
+        <var-decl name='name' type-id='type-id-215' visibility='default' filepath='src/lib.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='probe' type-id='type-id-225' visibility='default' filepath='src/lib.h' line='23' column='1'/>
+        <var-decl name='probe' type-id='type-id-225' visibility='default' filepath='src/lib.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='set_variable' type-id='type-id-226' visibility='default' filepath='src/lib.h' line='24' column='1'/>
+        <var-decl name='set_variable' type-id='type-id-226' visibility='default' filepath='src/lib.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='del_variable' type-id='type-id-227' visibility='default' filepath='src/lib.h' line='26' column='1'/>
+        <var-decl name='del_variable' type-id='type-id-227' visibility='default' filepath='src/lib.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='get_variable' type-id='type-id-228' visibility='default' filepath='src/lib.h' line='27' column='1'/>
+        <var-decl name='get_variable' type-id='type-id-228' visibility='default' filepath='src/lib.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='get_variable_attributes' type-id='type-id-229' visibility='default' filepath='src/lib.h' line='29' column='1'/>
+        <var-decl name='get_variable_attributes' type-id='type-id-229' visibility='default' filepath='src/lib.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='get_variable_size' type-id='type-id-230' visibility='default' filepath='src/lib.h' line='31' column='1'/>
+        <var-decl name='get_variable_size' type-id='type-id-230' visibility='default' filepath='src/lib.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='get_next_variable_name' type-id='type-id-231' visibility='default' filepath='src/lib.h' line='33' column='1'/>
+        <var-decl name='get_next_variable_name' type-id='type-id-231' visibility='default' filepath='src/lib.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='append_variable' type-id='type-id-232' visibility='default' filepath='src/lib.h' line='34' column='1'/>
+        <var-decl name='append_variable' type-id='type-id-232' visibility='default' filepath='src/lib.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='chmod_variable' type-id='type-id-233' visibility='default' filepath='src/lib.h' line='37' column='1'/>
+        <var-decl name='chmod_variable' type-id='type-id-233' visibility='default' filepath='src/lib.h' line='42' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='stat' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='26' column='1' id='type-id-234'>
@@ -1685,19 +1685,19 @@
         <var-decl name='st_dev' type-id='type-id-235' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='st_ino' type-id='type-id-223' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='36' column='1'/>
+        <var-decl name='st_ino' type-id='type-id-236' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='st_nlink' type-id='type-id-236' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='44' column='1'/>
+        <var-decl name='st_nlink' type-id='type-id-237' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-237' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='45' column='1'/>
+        <var-decl name='st_mode' type-id='type-id-238' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='st_uid' type-id='type-id-238' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='47' column='1'/>
+        <var-decl name='st_uid' type-id='type-id-239' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='st_gid' type-id='type-id-239' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='48' column='1'/>
+        <var-decl name='st_gid' type-id='type-id-240' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='__pad0' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='50' column='1'/>
@@ -1709,25 +1709,25 @@
         <var-decl name='st_size' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='st_blksize' type-id='type-id-240' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='61' column='1'/>
+        <var-decl name='st_blksize' type-id='type-id-241' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='st_blocks' type-id='type-id-241' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='63' column='1'/>
+        <var-decl name='st_blocks' type-id='type-id-242' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='st_atim' type-id='type-id-242' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='74' column='1'/>
+        <var-decl name='st_atim' type-id='type-id-243' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='st_mtim' type-id='type-id-242' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='75' column='1'/>
+        <var-decl name='st_mtim' type-id='type-id-243' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='st_ctim' type-id='type-id-242' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='76' column='1'/>
+        <var-decl name='st_ctim' type-id='type-id-243' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='__glibc_reserved' type-id='type-id-213' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='89' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='statfs' size-in-bits='960' is-struct='yes' visibility='default' filepath='/usr/include/bits/statfs.h' line='24' column='1' id='type-id-243'>
+    <class-decl name='statfs' size-in-bits='960' is-struct='yes' visibility='default' filepath='/usr/include/bits/statfs.h' line='24' column='1' id='type-id-244'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='f_type' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='26' column='1'/>
       </data-member>
@@ -1735,19 +1735,19 @@
         <var-decl name='f_bsize' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='f_blocks' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='29' column='1'/>
+        <var-decl name='f_blocks' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='f_bfree' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='30' column='1'/>
+        <var-decl name='f_bfree' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='f_bavail' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='31' column='1'/>
+        <var-decl name='f_bavail' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='f_files' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='32' column='1'/>
+        <var-decl name='f_files' type-id='type-id-246' visibility='default' filepath='/usr/include/bits/statfs.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='f_ffree' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='33' column='1'/>
+        <var-decl name='f_ffree' type-id='type-id-246' visibility='default' filepath='/usr/include/bits/statfs.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='f_fsid' type-id='type-id-220' visibility='default' filepath='/usr/include/bits/statfs.h' line='41' column='1'/>
@@ -1765,69 +1765,66 @@
         <var-decl name='f_spare' type-id='type-id-211' visibility='default' filepath='/usr/include/bits/statfs.h' line='45' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='11' column='1' id='type-id-242'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='11' column='1' id='type-id-243'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tv_sec' type-id='type-id-246' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='16' column='1'/>
+        <var-decl name='tv_sec' type-id='type-id-247' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='16' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='tv_nsec' type-id='type-id-212' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='21' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__blkcnt_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-241'/>
-    <typedef-decl name='__blksize_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='175' column='1' id='type-id-240'/>
+    <typedef-decl name='__blkcnt_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-242'/>
+    <typedef-decl name='__blksize_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='175' column='1' id='type-id-241'/>
     <typedef-decl name='__dev_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-235'/>
-    <typedef-decl name='__fsblkcnt_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='184' column='1' id='type-id-244'/>
-    <typedef-decl name='__fsfilcnt_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='188' column='1' id='type-id-245'/>
+    <typedef-decl name='__fsblkcnt64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='185' column='1' id='type-id-245'/>
+    <typedef-decl name='__fsfilcnt64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-246'/>
     <typedef-decl name='__fsid_t' type-id='type-id-221' filepath='/usr/include/bits/types.h' line='155' column='1' id='type-id-220'/>
     <typedef-decl name='__fsword_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='192' column='1' id='type-id-210'/>
-    <typedef-decl name='__gid_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-239'/>
-    <typedef-decl name='__ino_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-223'/>
-    <typedef-decl name='__mode_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-237'/>
-    <typedef-decl name='__nlink_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-236'/>
+    <typedef-decl name='__gid_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-240'/>
+    <typedef-decl name='__ino64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-223'/>
+    <typedef-decl name='__ino_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-236'/>
+    <typedef-decl name='__mode_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-238'/>
+    <typedef-decl name='__nlink_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-237'/>
     <typedef-decl name='__syscall_slong_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='197' column='1' id='type-id-212'/>
-    <typedef-decl name='__time_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='160' column='1' id='type-id-246'/>
-    <typedef-decl name='__uid_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-238'/>
-    <typedef-decl name='__useconds_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-247'/>
-    <typedef-decl name='mode_t' type-id='type-id-237' filepath='/usr/include/fcntl.h' line='50' column='1' id='type-id-248'/>
-    <qualified-type-def type-id='type-id-42' restrict='yes' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-250'/>
-    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-225'/>
-    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-231'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-230'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-229'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-228'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-232'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-226'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-261'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-262'/>
-    <qualified-type-def type-id='type-id-262' restrict='yes' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-264'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-265'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-266'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-267'/>
-    <function-decl name='efi_get_variable' filepath='src/include/efivar/efivar.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <typedef-decl name='__time_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='160' column='1' id='type-id-247'/>
+    <typedef-decl name='__uid_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-239'/>
+    <typedef-decl name='__useconds_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-248'/>
+    <typedef-decl name='mode_t' type-id='type-id-238' filepath='/usr/include/fcntl.h' line='50' column='1' id='type-id-249'/>
+    <qualified-type-def type-id='type-id-42' restrict='yes' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-227'/>
+    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-232'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-226'/>
+    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-263'/>
+    <qualified-type-def type-id='type-id-263' restrict='yes' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-267'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-268'/>
+    <function-decl name='efi_get_variable' filepath='src/include/efivar/efivar.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-262'/>
       <parameter type-id='type-id-266'/>
-      <parameter type-id='type-id-261'/>
-      <parameter type-id='type-id-265'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-24'/>
     </function-decl>
-    <var-decl name='efivarfs_ops' type-id='type-id-224' visibility='default' filepath='src/lib.h' line='43' column='1'/>
+    <var-decl name='efivarfs_ops' type-id='type-id-224' visibility='default' filepath='src/lib.h' line='48' column='1'/>
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-40'/>
     </function-decl>
-    <function-decl name='readdir' filepath='/usr/include/dirent.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-40'/>
-      <return type-id='type-id-250'/>
-    </function-decl>
     <function-decl name='dirfd' filepath='/usr/include/dirent.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
       <return type-id='type-id-9'/>
@@ -1838,23 +1835,11 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
-    <function-decl name='open' filepath='/usr/include/fcntl.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-9'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
     <function-decl name='sched_yield' filepath='/usr/include/sched.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='asprintf' filepath='/usr/include/stdio.h' line='401' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-34'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-9'/>
@@ -1894,29 +1879,9 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='stat' filepath='/usr/include/sys/stat.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-263'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
-    <function-decl name='fstat' filepath='/usr/include/sys/stat.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-262'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
     <function-decl name='chmod' filepath='/usr/include/sys/stat.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
-    <function-decl name='statfs' filepath='/usr/include/sys/statfs.h' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-264'/>
-      <return type-id='type-id-9'/>
-    </function-decl>
-    <function-decl name='access' filepath='/usr/include/unistd.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-238'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='close' filepath='/usr/include/unistd.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1936,107 +1901,107 @@
       <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='usleep' filepath='/usr/include/unistd.h' line='480' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-247'/>
+      <parameter type-id='type-id-248'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='geteuid' filepath='/usr/include/unistd.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <function-decl name='unlink' filepath='/usr/include/unistd.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-252'>
+    <function-type size-in-bits='64' id='type-id-253'>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-254'>
+    <function-type size-in-bits='64' id='type-id-255'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-255'>
+    <function-type size-in-bits='64' id='type-id-256'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-261'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-38'/>
       <return type-id='type-id-9'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-257'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-38'/>
+      <parameter type-id='type-id-249'/>
       <return type-id='type-id-9'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-258'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-266'/>
-      <parameter type-id='type-id-261'/>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-262'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-259'>
+    <function-type size-in-bits='64' id='type-id-260'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-38'/>
+      <parameter type-id='type-id-266'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-260'>
+    <function-type size-in-bits='64' id='type-id-261'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-266'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-256'>
+    <function-type size-in-bits='64' id='type-id-259'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-249'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-253'>
-      <parameter type-id='type-id-251'/>
+    <function-type size-in-bits='64' id='type-id-254'>
+      <parameter type-id='type-id-252'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-9'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='error.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='_IO_cookie_io_functions_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='55' column='1' id='type-id-268'>
+    <class-decl name='_IO_cookie_io_functions_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='55' column='1' id='type-id-269'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='read' type-id='type-id-269' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='57' column='1'/>
+        <var-decl name='read' type-id='type-id-270' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='write' type-id='type-id-270' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='58' column='1'/>
+        <var-decl name='write' type-id='type-id-271' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='seek' type-id='type-id-271' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='59' column='1'/>
+        <var-decl name='seek' type-id='type-id-272' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='close' type-id='type-id-272' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='60' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='cookie_close_function_t' type-id='type-id-273' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='48' column='1' id='type-id-274'/>
-    <typedef-decl name='cookie_io_functions_t' type-id='type-id-268' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='61' column='1' id='type-id-275'/>
-    <typedef-decl name='cookie_read_function_t' type-id='type-id-276' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='27' column='1' id='type-id-277'/>
-    <typedef-decl name='cookie_seek_function_t' type-id='type-id-278' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='45' column='1' id='type-id-279'/>
-    <typedef-decl name='cookie_write_function_t' type-id='type-id-280' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='36' column='1' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-283'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-270'/>
-    <qualified-type-def type-id='type-id-19' restrict='yes' id='type-id-284'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-285'/>
+        <var-decl name='close' type-id='type-id-273' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='60' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='cookie_close_function_t' type-id='type-id-274' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='48' column='1' id='type-id-275'/>
+    <typedef-decl name='cookie_io_functions_t' type-id='type-id-269' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='61' column='1' id='type-id-276'/>
+    <typedef-decl name='cookie_read_function_t' type-id='type-id-277' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='27' column='1' id='type-id-278'/>
+    <typedef-decl name='cookie_seek_function_t' type-id='type-id-279' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='45' column='1' id='type-id-280'/>
+    <typedef-decl name='cookie_write_function_t' type-id='type-id-281' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='36' column='1' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-19' restrict='yes' id='type-id-285'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-286'/>
     <function-decl name='efi_error_get' mangled-name='efi_error_get' filepath='src/error.c' line='33' 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='src/error.c' line='33' column='1'/>
-      <parameter type-id='type-id-283' name='filename' filepath='src/error.c' line='34' column='1'/>
-      <parameter type-id='type-id-283' name='function' filepath='src/error.c' line='35' column='1'/>
+      <parameter type-id='type-id-284' name='filename' filepath='src/error.c' line='34' column='1'/>
+      <parameter type-id='type-id-284' name='function' filepath='src/error.c' line='35' column='1'/>
       <parameter type-id='type-id-41' name='line' filepath='src/error.c' line='36' column='1'/>
-      <parameter type-id='type-id-283' name='message' filepath='src/error.c' line='37' column='1'/>
+      <parameter type-id='type-id-284' name='message' filepath='src/error.c' line='37' column='1'/>
       <parameter type-id='type-id-41' name='error' filepath='src/error.c' line='38' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
@@ -2056,19 +2021,19 @@
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='fopencookie' filepath='/usr/include/stdio.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-285'/>
       <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='vasprintf' filepath='/usr/include/stdio.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-34'/>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='fwrite' filepath='/usr/include/stdio.h' line='739' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-285'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-28'/>
@@ -2098,23 +2063,23 @@
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-273'>
+    <function-type size-in-bits='64' id='type-id-274'>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-278'>
+    <function-type size-in-bits='64' id='type-id-279'>
       <parameter type-id='type-id-19'/>
-      <parameter type-id='type-id-282'/>
+      <parameter type-id='type-id-283'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-276'>
+    <function-type size-in-bits='64' id='type-id-277'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-185'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-280'>
+    <function-type size-in-bits='64' id='type-id-281'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-20'/>
@@ -2122,128 +2087,128 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='export.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='efi_variable' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/lib.h' line='13' column='1' id='type-id-286'>
+    <class-decl name='efi_variable' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/lib.h' line='18' column='1' id='type-id-287'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='attrs' type-id='type-id-48' visibility='default' filepath='src/lib.h' line='14' column='1'/>
+        <var-decl name='attrs' type-id='type-id-48' visibility='default' filepath='src/lib.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-55' visibility='default' filepath='src/lib.h' line='15' column='1'/>
+        <var-decl name='guid' type-id='type-id-55' visibility='default' filepath='src/lib.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='name' type-id='type-id-208' visibility='default' filepath='src/lib.h' line='16' column='1'/>
+        <var-decl name='name' type-id='type-id-208' visibility='default' filepath='src/lib.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-36' visibility='default' filepath='src/lib.h' line='17' column='1'/>
+        <var-decl name='data' type-id='type-id-36' visibility='default' filepath='src/lib.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='data_size' type-id='type-id-20' visibility='default' filepath='src/lib.h' line='18' column='1'/>
+        <var-decl name='data_size' type-id='type-id-20' visibility='default' filepath='src/lib.h' line='23' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_variable_t' type-id='type-id-286' filepath='src/include/efivar/efivar.h' line='79' column='1' id='type-id-287'/>
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
+    <typedef-decl name='efi_variable_t' type-id='type-id-287' filepath='src/include/efivar/efivar.h' line='82' column='1' id='type-id-288'/>
     <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-290'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-291'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-292'/>
     <function-decl name='crc32' filepath='src/crc32.h' line='17' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-38'/>
     </function-decl>
-    <function-decl name='efi_variable_import' mangled-name='efi_variable_import' filepath='src/export.c' line='315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_import@@libefivar.so.0'>
-      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='315' column='1'/>
-      <parameter type-id='type-id-20' name='size' filepath='src/export.c' line='315' column='1'/>
-      <parameter type-id='type-id-289' name='var_out' filepath='src/export.c' line='315' column='1'/>
+    <function-decl name='efi_variable_import' mangled-name='efi_variable_import' filepath='src/export.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_import@@libefivar.so.0'>
+      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='314' column='1'/>
+      <parameter type-id='type-id-20' name='size' filepath='src/export.c' line='314' column='1'/>
+      <parameter type-id='type-id-290' name='var_out' filepath='src/export.c' line='314' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_variable_export_dmpstore' mangled-name='efi_variable_export_dmpstore' filepath='src/export.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export_dmpstore@@LIBEFIVAR_1.38'>
-      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='328' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='328' column='1'/>
-      <parameter type-id='type-id-20' name='datasz' filepath='src/export.c' line='328' column='1'/>
+    <function-decl name='efi_variable_export_dmpstore' mangled-name='efi_variable_export_dmpstore' filepath='src/export.c' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export_dmpstore@@LIBEFIVAR_1.38'>
+      <parameter type-id='type-id-289' name='var' filepath='src/export.c' line='327' column='1'/>
+      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='327' column='1'/>
+      <parameter type-id='type-id-20' name='datasz' filepath='src/export.c' line='327' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_variable_export' mangled-name='efi_variable_export' filepath='src/export.c' line='458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export@@libefivar.so.0'>
-      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='458' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='458' column='1'/>
-      <parameter type-id='type-id-20' name='datasz' filepath='src/export.c' line='458' column='1'/>
+    <function-decl name='efi_variable_export' mangled-name='efi_variable_export' filepath='src/export.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_export@@libefivar.so.0'>
+      <parameter type-id='type-id-289' name='var' filepath='src/export.c' line='457' column='1'/>
+      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='457' column='1'/>
+      <parameter type-id='type-id-20' name='datasz' filepath='src/export.c' line='457' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_variable_alloc' mangled-name='efi_variable_alloc' filepath='src/export.c' line='596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_alloc@@LIBEFIVAR_1.38'>
-      <return type-id='type-id-288'/>
+    <function-decl name='efi_variable_alloc' mangled-name='efi_variable_alloc' filepath='src/export.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_alloc@@LIBEFIVAR_1.38'>
+      <return type-id='type-id-289'/>
     </function-decl>
-    <function-decl name='efi_variable_free' mangled-name='efi_variable_free' filepath='src/export.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_free@@libefivar.so.0'>
-      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='607' column='1'/>
-      <parameter type-id='type-id-9' name='free_data' filepath='src/export.c' line='607' column='1'/>
+    <function-decl name='efi_variable_free' mangled-name='efi_variable_free' filepath='src/export.c' line='606' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_free@@libefivar.so.0'>
+      <parameter type-id='type-id-289' name='var' filepath='src/export.c' line='606' column='1'/>
+      <parameter type-id='type-id-9' name='free_data' filepath='src/export.c' line='606' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='efi_variable_set_name' mangled-name='efi_variable_set_name' filepath='src/export.c' line='628' 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-288' name='var' filepath='src/export.c' line='628' column='1'/>
-      <parameter type-id='type-id-208' name='name' filepath='src/export.c' line='628' column='1'/>
+    <function-decl name='efi_variable_set_name' mangled-name='efi_variable_set_name' filepath='src/export.c' line='627' 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-289' name='var' filepath='src/export.c' line='627' column='1'/>
+      <parameter type-id='type-id-208' name='name' filepath='src/export.c' line='627' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_get_name' mangled-name='efi_variable_get_name' filepath='src/export.c' line='635' 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-288' name='var' filepath='src/export.c' line='635' column='1'/>
+    <function-decl name='efi_variable_get_name' mangled-name='efi_variable_get_name' filepath='src/export.c' line='634' 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-289' name='var' filepath='src/export.c' line='634' column='1'/>
       <return type-id='type-id-208'/>
     </function-decl>
-    <function-decl name='efi_variable_set_guid' mangled-name='efi_variable_set_guid' filepath='src/export.c' line='646' 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-288' name='var' filepath='src/export.c' line='646' column='1'/>
-      <parameter type-id='type-id-55' name='guid' filepath='src/export.c' line='646' column='1'/>
+    <function-decl name='efi_variable_set_guid' mangled-name='efi_variable_set_guid' filepath='src/export.c' line='645' 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-289' name='var' filepath='src/export.c' line='645' column='1'/>
+      <parameter type-id='type-id-55' name='guid' filepath='src/export.c' line='645' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_get_guid' mangled-name='efi_variable_get_guid' filepath='src/export.c' line='653' 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-288' name='var' filepath='src/export.c' line='653' column='1'/>
-      <parameter type-id='type-id-251' name='guid' filepath='src/export.c' line='653' column='1'/>
+    <function-decl name='efi_variable_get_guid' mangled-name='efi_variable_get_guid' filepath='src/export.c' line='652' 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-289' name='var' filepath='src/export.c' line='652' column='1'/>
+      <parameter type-id='type-id-252' name='guid' filepath='src/export.c' line='652' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_set_data' mangled-name='efi_variable_set_data' filepath='src/export.c' line='665' 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-288' name='var' filepath='src/export.c' line='665' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='665' column='1'/>
-      <parameter type-id='type-id-20' name='size' filepath='src/export.c' line='665' column='1'/>
+    <function-decl name='efi_variable_set_data' mangled-name='efi_variable_set_data' filepath='src/export.c' line='664' 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-289' name='var' filepath='src/export.c' line='664' column='1'/>
+      <parameter type-id='type-id-36' name='data' filepath='src/export.c' line='664' column='1'/>
+      <parameter type-id='type-id-20' name='size' filepath='src/export.c' line='664' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_get_data' mangled-name='efi_variable_get_data' filepath='src/export.c' line='678' 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-288' name='var' filepath='src/export.c' line='678' column='1'/>
-      <parameter type-id='type-id-266' name='data' filepath='src/export.c' line='678' column='1'/>
-      <parameter type-id='type-id-261' name='size' filepath='src/export.c' line='678' column='1'/>
+    <function-decl name='efi_variable_get_data' mangled-name='efi_variable_get_data' filepath='src/export.c' line='677' 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-289' name='var' filepath='src/export.c' line='677' column='1'/>
+      <parameter type-id='type-id-267' name='data' filepath='src/export.c' line='677' column='1'/>
+      <parameter type-id='type-id-262' name='size' filepath='src/export.c' line='677' column='1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_variable_set_attributes' mangled-name='efi_variable_set_attributes' filepath='src/export.c' line='691' 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-288' name='var' filepath='src/export.c' line='691' column='1'/>
-      <parameter type-id='type-id-48' name='attrs' filepath='src/export.c' line='691' column='1'/>
+    <function-decl name='efi_variable_set_attributes' mangled-name='efi_variable_set_attributes' filepath='src/export.c' line='690' 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-289' name='var' filepath='src/export.c' line='690' column='1'/>
+      <parameter type-id='type-id-48' name='attrs' filepath='src/export.c' line='690' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_get_attributes' mangled-name='efi_variable_get_attributes' filepath='src/export.c' line='698' 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-288' name='var' filepath='src/export.c' line='698' column='1'/>
-      <parameter type-id='type-id-290' name='attrs' filepath='src/export.c' line='698' column='1'/>
+    <function-decl name='efi_variable_get_attributes' mangled-name='efi_variable_get_attributes' filepath='src/export.c' line='697' 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-289' name='var' filepath='src/export.c' line='697' column='1'/>
+      <parameter type-id='type-id-291' name='attrs' filepath='src/export.c' line='697' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_variable_realize' mangled-name='efi_variable_realize' filepath='src/export.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_realize@@libefivar.so.0'>
-      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='710' column='1'/>
+    <function-decl name='efi_variable_realize' mangled-name='efi_variable_realize' filepath='src/export.c' line='709' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variable_realize@@libefivar.so.0'>
+      <parameter type-id='type-id-289' name='var' filepath='src/export.c' line='709' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_set_variable' filepath='src/include/efivar/efivar.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_set_variable' filepath='src/include/efivar/efivar.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-249'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_append_variable' filepath='src/include/efivar/efivar.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='efi_append_variable' filepath='src/include/efivar/efivar.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='guid-symbols.c' comp-dir-path='src' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-292' size-in-bits='263424' id='type-id-293'>
-      <subrange length='42' type-id='type-id-3' id='type-id-294'/>
+    <array-type-def dimensions='1' type-id='type-id-293' size-in-bits='263424' id='type-id-294'>
+      <subrange length='42' type-id='type-id-3' id='type-id-295'/>
     </array-type-def>
-    <class-decl name='efivar_guidname' size-in-bits='6272' is-struct='yes' visibility='default' filepath='src/guid-symbols.c' line='201' column='1' id='type-id-295'>
+    <class-decl name='efivar_guidname' size-in-bits='6272' is-struct='yes' visibility='default' filepath='src/guid-symbols.c' line='201' column='1' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='guid' type-id='type-id-43' visibility='default' filepath='src/guid-symbols.c' line='202' column='1'/>
       </data-member>
@@ -2257,8 +2222,10 @@
         <var-decl name='description' type-id='type-id-217' visibility='default' filepath='src/guid-symbols.c' line='205' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-292'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-299'/>
     <var-decl name='efi_guid_empty' type-id='type-id-44' mangled-name='efi_guid_empty' visibility='default' filepath='src/guid-symbols.c' line='23' column='1' elf-symbol-id='efi_guid_empty@@libefivar.so.0'/>
     <var-decl name='efi_guid_zero' type-id='type-id-44' mangled-name='efi_guid_zero' visibility='default' filepath='src/guid-symbols.c' line='27' column='1' elf-symbol-id='efi_guid_zero@@libefivar.so.0'/>
     <var-decl name='efi_guid_redhat_2' type-id='type-id-44' mangled-name='efi_guid_redhat_2' visibility='default' filepath='src/guid-symbols.c' line='32' column='1' elf-symbol-id='efi_guid_redhat_2@@libefivar.so.0'/>
@@ -2302,13 +2269,17 @@
     <var-decl name='efi_guid_rsa2048_sha256' type-id='type-id-44' mangled-name='efi_guid_rsa2048_sha256' visibility='default' filepath='src/guid-symbols.c' line='184' column='1' elf-symbol-id='efi_guid_rsa2048_sha256@@libefivar.so.0'/>
     <var-decl name='efi_guid_lenovo_startup_interrupt' type-id='type-id-44' mangled-name='efi_guid_lenovo_startup_interrupt' visibility='default' filepath='src/guid-symbols.c' line='188' column='1' elf-symbol-id='efi_guid_lenovo_startup_interrupt@@libefivar.so.0'/>
     <var-decl name='efi_guid_sha384' type-id='type-id-44' mangled-name='efi_guid_sha384' visibility='default' filepath='src/guid-symbols.c' line='192' column='1' elf-symbol-id='efi_guid_sha384@@libefivar.so.0'/>
-    <var-decl name='efi_n_well_known_guids' type-id='type-id-296' mangled-name='efi_n_well_known_guids' visibility='default' filepath='src/guid-symbols.c' line='196' column='1' elf-symbol-id='efi_n_well_known_guids@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_n_well_known_names' type-id='type-id-296' mangled-name='efi_n_well_known_names' visibility='default' filepath='src/guid-symbols.c' line='199' column='1' elf-symbol-id='efi_n_well_known_names@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_well_known_guids_' type-id='type-id-293' mangled-name='efi_well_known_guids_' visibility='default' filepath='src/guid-symbols.c' line='210' column='1' elf-symbol-id='efi_well_known_guids_@@libefivar.so.0'/>
-    <var-decl name='efi_well_known_names_' type-id='type-id-293' mangled-name='efi_well_known_names_' visibility='default' filepath='src/guid-symbols.c' line='592' column='1' elf-symbol-id='efi_well_known_names_@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_n_well_known_guids' type-id='type-id-299' mangled-name='efi_n_well_known_guids' visibility='default' filepath='src/guid-symbols.c' line='196' column='1' elf-symbol-id='efi_n_well_known_guids@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_n_well_known_names' type-id='type-id-299' mangled-name='efi_n_well_known_names' visibility='default' filepath='src/guid-symbols.c' line='199' column='1' elf-symbol-id='efi_n_well_known_names@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_well_known_guids_' type-id='type-id-294' mangled-name='efi_well_known_guids_' visibility='default' filepath='src/guid-symbols.c' line='210' column='1' elf-symbol-id='efi_well_known_guids_@@libefivar.so.0'/>
+    <var-decl name='efi_well_known_guids' type-id='type-id-298' mangled-name='efi_well_known_guids' visibility='default' filepath='src/guid-symbols.c' line='592' column='1' elf-symbol-id='efi_well_known_guids@@libefivar.so.0'/>
+    <var-decl name='efi_well_known_guids_end' type-id='type-id-298' mangled-name='efi_well_known_guids_end' visibility='default' filepath='src/guid-symbols.c' line='595' column='1' elf-symbol-id='efi_well_known_guids_end@@libefivar.so.0'/>
+    <var-decl name='efi_well_known_names_' type-id='type-id-294' mangled-name='efi_well_known_names_' visibility='default' filepath='src/guid-symbols.c' line='599' column='1' elf-symbol-id='efi_well_known_names_@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_well_known_names' type-id='type-id-298' mangled-name='efi_well_known_names' visibility='default' filepath='src/guid-symbols.c' line='981' column='1' elf-symbol-id='efi_well_known_names@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_well_known_names_end' type-id='type-id-298' mangled-name='efi_well_known_names_end' visibility='default' filepath='src/guid-symbols.c' line='984' column='1' elf-symbol-id='efi_well_known_names_end@@LIBEFIVAR_1.38'/>
   </abi-instr>
   <abi-instr address-size='64' path='guid.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-297'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-300'/>
     <function-decl name='efi_str_to_guid' mangled-name='efi_str_to_guid' filepath='src/guid.c' line='36' 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-33' name='s' filepath='src/guid.c' line='36' column='1'/>
       <parameter type-id='type-id-55' name='guid' filepath='src/guid.c' line='36' column='1'/>
@@ -2344,7 +2315,7 @@
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='dlsym' filepath='/usr/include/dlfcn.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-285'/>
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-19'/>
     </function-decl>
@@ -2361,11 +2332,11 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='lib.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-298'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-301'/>
     <function-decl name='_efi_set_variable' mangled-name='_efi_set_variable' filepath='src/lib.c' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_efi_set_variable@libefivar.so.0'>
       <parameter type-id='type-id-43' name='guid' filepath='src/lib.c' line='33' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='33' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/lib.c' line='33' column='1'/>
+      <parameter type-id='type-id-53' name='data' filepath='src/lib.c' line='33' column='1'/>
       <parameter type-id='type-id-20' name='data_size' filepath='src/lib.c' line='34' column='1'/>
       <parameter type-id='type-id-38' name='attributes' filepath='src/lib.c' line='34' column='1'/>
       <return type-id='type-id-9'/>
@@ -2373,7 +2344,7 @@
     <function-decl name='_efi_set_variable_variadic' mangled-name='_efi_set_variable_variadic' filepath='src/lib.c' line='50' 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-43' name='guid' filepath='src/lib.c' line='50' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='50' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/lib.c' line='50' column='1'/>
+      <parameter type-id='type-id-53' name='data' filepath='src/lib.c' line='50' column='1'/>
       <parameter type-id='type-id-20' name='data_size' filepath='src/lib.c' line='51' column='1'/>
       <parameter type-id='type-id-38' name='attributes' filepath='src/lib.c' line='51' column='1'/>
       <parameter is-variadic='yes'/>
@@ -2382,10 +2353,10 @@
     <function-decl name='_efi_set_variable_mode' mangled-name='efi_set_variable' filepath='src/lib.c' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_set_variable@@LIBEFIVAR_0.24'>
       <parameter type-id='type-id-43' name='guid' filepath='src/lib.c' line='67' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='67' column='1'/>
-      <parameter type-id='type-id-36' name='data' filepath='src/lib.c' line='67' column='1'/>
+      <parameter type-id='type-id-53' name='data' filepath='src/lib.c' line='67' column='1'/>
       <parameter type-id='type-id-20' name='data_size' filepath='src/lib.c' line='68' column='1'/>
       <parameter type-id='type-id-38' name='attributes' filepath='src/lib.c' line='68' column='1'/>
-      <parameter type-id='type-id-248' name='mode' filepath='src/lib.c' line='68' column='1'/>
+      <parameter type-id='type-id-249' name='mode' filepath='src/lib.c' line='68' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_del_variable' mangled-name='efi_del_variable' filepath='src/lib.c' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_del_variable@@libefivar.so.0'>
@@ -2396,7 +2367,7 @@
     <function-decl name='efi_get_variable_attributes' mangled-name='efi_get_variable_attributes' filepath='src/lib.c' line='147' 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-43' name='guid' filepath='src/lib.c' line='147' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='147' column='1'/>
-      <parameter type-id='type-id-265' name='attributes' filepath='src/lib.c' line='148' column='1'/>
+      <parameter type-id='type-id-266' name='attributes' filepath='src/lib.c' line='148' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_get_variable_exists' mangled-name='efi_get_variable_exists' filepath='src/lib.c' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable_exists@@LIBEFIVAR_1.35'>
@@ -2407,18 +2378,18 @@
     <function-decl name='efi_get_variable_size' mangled-name='efi_get_variable_size' filepath='src/lib.c' line='172' 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-43' name='guid' filepath='src/lib.c' line='172' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='172' column='1'/>
-      <parameter type-id='type-id-261' name='size' filepath='src/lib.c' line='172' column='1'/>
+      <parameter type-id='type-id-262' name='size' filepath='src/lib.c' line='172' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_get_next_variable_name' mangled-name='efi_get_next_variable_name' filepath='src/lib.c' line='189' 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-251' name='guid' filepath='src/lib.c' line='189' column='1'/>
+      <parameter type-id='type-id-252' name='guid' filepath='src/lib.c' line='189' column='1'/>
       <parameter type-id='type-id-42' name='name' filepath='src/lib.c' line='189' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_chmod_variable' mangled-name='efi_chmod_variable' filepath='src/lib.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_chmod_variable@@libefivar.so.0'>
       <parameter type-id='type-id-43' name='guid' filepath='src/lib.c' line='206' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='206' column='1'/>
-      <parameter type-id='type-id-248' name='mode' filepath='src/lib.c' line='206' column='1'/>
+      <parameter type-id='type-id-249' name='mode' filepath='src/lib.c' line='206' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_variables_supported' mangled-name='efi_variables_supported' filepath='src/lib.c' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_variables_supported@@libefivar.so.0'>
@@ -2443,7 +2414,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='time.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='7' column='1' id='type-id-299'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='7' column='1' id='type-id-302'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='9' column='1'/>
       </data-member>
@@ -2478,17 +2449,17 @@
         <var-decl name='tm_zone' type-id='type-id-33' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='21' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='time_t' type-id='type-id-246' filepath='/usr/include/bits/types/time_t.h' line='10' column='1' id='type-id-300'/>
-    <qualified-type-def type-id='type-id-10' restrict='yes' id='type-id-301'/>
-    <qualified-type-def type-id='type-id-300' const='yes' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-303' restrict='yes' id='type-id-304'/>
-    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-305'/>
+    <typedef-decl name='time_t' type-id='type-id-247' filepath='/usr/include/bits/types/time_t.h' line='10' column='1' id='type-id-303'/>
+    <qualified-type-def type-id='type-id-10' restrict='yes' id='type-id-304'/>
+    <qualified-type-def type-id='type-id-303' const='yes' id='type-id-305'/>
     <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
     <qualified-type-def type-id='type-id-306' restrict='yes' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-308'/>
-    <qualified-type-def type-id='type-id-308' restrict='yes' id='type-id-309'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-309'/>
+    <qualified-type-def type-id='type-id-309' restrict='yes' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-311'/>
+    <qualified-type-def type-id='type-id-311' restrict='yes' id='type-id-312'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-313'/>
     <function-decl name='setenv' filepath='/usr/include/stdlib.h' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
@@ -2500,39 +2471,39 @@
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='mktime' filepath='/usr/include/time.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-308'/>
-      <return type-id='type-id-300'/>
+      <parameter type-id='type-id-311'/>
+      <return type-id='type-id-303'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-304'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-307'/>
+      <parameter type-id='type-id-310'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='strptime' filepath='/usr/include/time.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-34'/>
       <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-308'/>
+      <parameter type-id='type-id-311'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gmtime_r' filepath='/usr/include/time.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-304'/>
-      <parameter type-id='type-id-309'/>
-      <return type-id='type-id-308'/>
+      <parameter type-id='type-id-307'/>
+      <parameter type-id='type-id-312'/>
+      <return type-id='type-id-311'/>
     </function-decl>
     <function-decl name='localtime_r' filepath='/usr/include/time.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-304'/>
-      <parameter type-id='type-id-309'/>
-      <return type-id='type-id-308'/>
+      <parameter type-id='type-id-307'/>
+      <parameter type-id='type-id-312'/>
+      <return type-id='type-id-311'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-306'/>
+      <parameter type-id='type-id-309'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='asctime_r' filepath='/usr/include/time.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-307'/>
-      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-310'/>
+      <parameter type-id='type-id-304'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='tzset' filepath='/usr/include/time.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2540,19 +2511,17 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='vars.c' comp-dir-path='src' language='LANG_C11'>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-311'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-312'/>
-    <var-decl name='vars_ops' type-id='type-id-224' visibility='default' filepath='src/lib.h' line='42' column='1'/>
-    <function-decl name='openat' filepath='/usr/include/fcntl.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-314'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-315'/>
+    <var-decl name='vars_ops' type-id='type-id-224' visibility='default' filepath='src/lib.h' line='47' column='1'/>
+    <function-decl name='umask' filepath='/usr/include/sys/stat.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-238'/>
+      <return type-id='type-id-238'/>
+    </function-decl>
+    <function-decl name='access' filepath='/usr/include/unistd.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-9'/>
-      <parameter is-variadic='yes'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='umask' filepath='/usr/include/sys/stat.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-237'/>
-    </function-decl>
   </abi-instr>
 </abi-corpus>