From fd3b299c77a1232e2ddd2bbe74b71eba4f1696f2 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 31 Jan 2024 14:10:03 -0500
Subject: [PATCH] ABI update

In order to guarantee ABI compatibility with previous versions, efivar
keeps XML descriptions of its ABI in src/libefiboot.abixml,
src/libefisec.abixml, and src/libefivar.abixmlsrc/libefivar.abixml .
For each release, these must be updated to avoid issues with any updates
to the tooling in libabigail.

This commit updates the .abixml files, which have been regenerated at
the efivar 38 tag (1753149d4176eb) using libabigail-2.2-2.fc38.x86_64,
so that the current ABI can be validated with abidiff against the efivar
38 release release before tagging 39.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 src/libefiboot.abixml | 2847 ++++++++++++++++++++--------------------
 src/libefisec.abixml  |  945 +++++++-------
 src/libefivar.abixml  | 2887 ++++++++++++++++++++---------------------
 3 files changed, 3345 insertions(+), 3334 deletions(-)

diff --git a/src/libefiboot.abixml b/src/libefiboot.abixml
index 07e89a82..e5e3dd6b 100644
--- a/src/libefiboot.abixml
+++ b/src/libefiboot.abixml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='libefiboot.so' architecture='elf-amd-x86_64' soname='libefiboot.so.1'>
+<abi-corpus version='2.1' path='libefiboot.so' architecture='elf-amd-x86_64' soname='libefiboot.so.1'>
   <elf-needed>
     <dependency name='libefivar.so.1'/>
     <dependency name='libc.so.6'/>
@@ -34,2329 +34,2350 @@
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='160' id='type-id-9'>
       <subrange length='20' type-id='type-id-3' id='type-id-10'/>
     </array-type-def>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-11'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-12'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-13'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-14'/>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-15'>
+    <enum-decl name='interface_type' filepath='src/linux.h' line='94' column='1' id='type-id-11'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='unknown' value='0'/>
+      <enumerator name='isa' value='1'/>
+      <enumerator name='acpi_root' value='2'/>
+      <enumerator name='pci_root' value='3'/>
+      <enumerator name='soc_root' value='4'/>
+      <enumerator name='virtual_root' value='5'/>
+      <enumerator name='pci' value='6'/>
+      <enumerator name='network' value='7'/>
+      <enumerator name='ata' value='8'/>
+      <enumerator name='atapi' value='9'/>
+      <enumerator name='scsi' value='10'/>
+      <enumerator name='sata' value='11'/>
+      <enumerator name='sas' value='12'/>
+      <enumerator name='usb' value='13'/>
+      <enumerator name='i1394' value='14'/>
+      <enumerator name='fibre' value='15'/>
+      <enumerator name='i2o' value='16'/>
+      <enumerator name='md' value='17'/>
+      <enumerator name='virtblk' value='18'/>
+      <enumerator name='nvme' value='19'/>
+      <enumerator name='nd_pmem' value='20'/>
+      <enumerator name='emmc' value='21'/>
+    </enum-decl>
+    <type-decl name='int' size-in-bits='32' id='type-id-13'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-14'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-15'/>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-16'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-16' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-16' visibility='default'/>
+        <var-decl name='_flags' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-17' visibility='default'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-17' visibility='default'/>
+        <var-decl name='_IO_read_end' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
       </data-member>
-    </class-decl>
-    <type-decl name='int' size-in-bits='32' id='type-id-18'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-19'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-20'/>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='48' id='type-id-22'>
-      <subrange length='6' type-id='type-id-3' id='type-id-23'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='64' id='type-id-24'>
-      <subrange length='8' type-id='type-id-3' id='type-id-25'/>
-    </array-type-def>
-    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-26'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-27'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-16'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-28'/>
-    <type-decl name='variadic parameter type' id='type-id-29'/>
-    <type-decl name='void' id='type-id-30'/>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-32'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='_IO_read_base' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='_IO_write_base' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='_IO_write_ptr' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='_IO_write_end' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-22' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='_IO_buf_base' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_guid_t' type-id='type-id-32' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-31'/>
-    <class-decl name='acpi_root_info' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/linux.h' line='18' column='1' id='type-id-35'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='acpi_hid' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='19' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='_IO_buf_end' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='acpi_uid' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='20' column='1'/>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='_IO_save_base' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='acpi_cid' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='21' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='_IO_backup_base' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='acpi_hid_str' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='22' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='_IO_save_end' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='acpi_uid_str' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='23' column='1'/>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='_markers' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='acpi_cid_str' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='24' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='_chain' type-id='type-id-19' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='pci_root_info' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/linux.h' line='27' column='1' id='type-id-38'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pci_domain' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='28' column='1'/>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='_fileno' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='pci_bus' type-id='type-id-21' visibility='default' filepath='src/linux.h' line='29' column='1'/>
+      <data-member access='public' layout-offset-in-bits='928'>
+        <var-decl name='_flags2' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='pci_dev_info' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/linux.h' line='32' column='1' id='type-id-39'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pci_domain' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='33' column='1'/>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='_old_offset' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='pci_bus' type-id='type-id-21' visibility='default' filepath='src/linux.h' line='34' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='_cur_column' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='pci_device' type-id='type-id-21' visibility='default' filepath='src/linux.h' line='35' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1040'>
+        <var-decl name='_vtable_offset' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pci_function' type-id='type-id-21' visibility='default' filepath='src/linux.h' line='36' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1048'>
+        <var-decl name='_shortbuf' type-id='type-id-7' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='79' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='driverlink' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='37' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='_lock' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='scsi_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/linux.h' line='40' column='1' id='type-id-40'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='scsi_bus' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='41' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='_offset' type-id='type-id-23' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='89' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='scsi_device' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='42' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='_codecvt' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='scsi_target' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='43' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='_wide_data' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='scsi_lun' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='44' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='_freeres_list' type-id='type-id-19' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='_freeres_buf' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='__pad5' type-id='type-id-27' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='_mode' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1568'>
+        <var-decl name='_unused2' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='98' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='sas_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='47' column='1' id='type-id-41'>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-28'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='scsi_bus' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='48' column='1'/>
+        <var-decl name='gp_offset' type-id='type-id-29' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='scsi_device' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='49' column='1'/>
+        <var-decl name='fp_offset' type-id='type-id-29' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='scsi_target' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='50' column='1'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='scsi_lun' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='51' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='53' column='1'/>
+        <var-decl name='reg_save_area' type-id='type-id-26' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sata_info' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/linux.h' line='56' column='1' id='type-id-42'>
+    <class-decl name='acpi_root_info' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/linux.h' line='18' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='scsi_bus' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='scsi_device' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='58' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='scsi_target' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='59' column='1'/>
+        <var-decl name='acpi_uid' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='scsi_lun' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='60' column='1'/>
+        <var-decl name='acpi_cid' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ata_devno' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='ata_port' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='63' column='1'/>
+        <var-decl name='acpi_hid_str' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='ata_pmp' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='64' column='1'/>
+        <var-decl name='acpi_uid_str' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='23' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ata_print_id' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='66' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='acpi_cid_str' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='24' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ata_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='69' column='1' id='type-id-43'>
+    <class-decl name='ata_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='69' column='1' id='type-id-33'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='scsi_bus' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='70' column='1'/>
+        <var-decl name='scsi_bus' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='scsi_device' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='71' column='1'/>
+        <var-decl name='scsi_device' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='scsi_target' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='72' column='1'/>
+        <var-decl name='scsi_target' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='scsi_lun' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='73' column='1'/>
+        <var-decl name='scsi_lun' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='scsi_host' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='75' column='1'/>
+        <var-decl name='scsi_host' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='75' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='nvme_info' size-in-bits='160' is-struct='yes' visibility='default' filepath='src/linux.h' line='78' column='1' id='type-id-44'>
+    <class-decl name='dev_probe' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/linux.h' line='329' column='1' id='type-id-34'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctrl_id' type-id='type-id-45' visibility='default' filepath='src/linux.h' line='79' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ns_id' type-id='type-id-45' visibility='default' filepath='src/linux.h' line='80' column='1'/>
+        <var-decl name='name' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='has_eui' type-id='type-id-18' visibility='default' filepath='src/linux.h' line='81' column='1'/>
+        <var-decl name='iftypes' type-id='type-id-35' visibility='default' filepath='src/linux.h' line='331' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='eui' type-id='type-id-24' visibility='default' filepath='src/linux.h' line='82' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='flags' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='332' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='nvdimm_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='85' column='1' id='type-id-46'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='namespace_label' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='86' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='parse' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='333' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='nvdimm_label' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='87' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='create' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='335' 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-47'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='slot_id' type-id='type-id-45' visibility='default' filepath='src/linux.h' line='91' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='make_part_name' type-id='type-id-38' visibility='default' filepath='src/linux.h' line='337' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='interface_type' filepath='src/linux.h' line='94' column='1' id='type-id-48'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='unknown' value='0'/>
-      <enumerator name='isa' value='1'/>
-      <enumerator name='acpi_root' value='2'/>
-      <enumerator name='pci_root' value='3'/>
-      <enumerator name='soc_root' value='4'/>
-      <enumerator name='virtual_root' value='5'/>
-      <enumerator name='pci' value='6'/>
-      <enumerator name='network' value='7'/>
-      <enumerator name='ata' value='8'/>
-      <enumerator name='atapi' value='9'/>
-      <enumerator name='scsi' value='10'/>
-      <enumerator name='sata' value='11'/>
-      <enumerator name='sas' value='12'/>
-      <enumerator name='usb' value='13'/>
-      <enumerator name='i1394' value='14'/>
-      <enumerator name='fibre' value='15'/>
-      <enumerator name='i2o' value='16'/>
-      <enumerator name='md' value='17'/>
-      <enumerator name='virtblk' value='18'/>
-      <enumerator name='nvme' value='19'/>
-      <enumerator name='nd_pmem' value='20'/>
-      <enumerator name='emmc' value='21'/>
-    </enum-decl>
-    <class-decl name='device' size-in-bits='2752' is-struct='yes' visibility='default' filepath='src/linux.h' line='107' column='1' id='type-id-49'>
+    <class-decl name='device' size-in-bits='2752' is-struct='yes' visibility='default' filepath='src/linux.h' line='107' column='1' id='type-id-39'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='interface_type' type-id='type-id-48' visibility='default' filepath='src/linux.h' line='108' column='1'/>
+        <var-decl name='interface_type' type-id='type-id-11' visibility='default' filepath='src/linux.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='flags' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='109' column='1'/>
+        <var-decl name='flags' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='109' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='link' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='110' column='1'/>
+        <var-decl name='link' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='device' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='111' column='1'/>
+        <var-decl name='device' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='driver' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='112' column='1'/>
+        <var-decl name='driver' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='probes' type-id='type-id-50' visibility='default' filepath='src/linux.h' line='114' column='1'/>
+        <var-decl name='probes' type-id='type-id-40' visibility='default' filepath='src/linux.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='n_probes' type-id='type-id-16' visibility='default' filepath='src/linux.h' line='115' column='1'/>
+        <var-decl name='n_probes' type-id='type-id-29' visibility='default' filepath='src/linux.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='' type-id='type-id-51' visibility='default'/>
+        <var-decl name='' type-id='type-id-41' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='2368' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='117' column='1' id='type-id-51'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-52' visibility='default'/>
+    <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'>
+      <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'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='ifname' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='146' column='1'/>
+      <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'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='2368' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='118' column='1' id='type-id-52'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stat' type-id='type-id-53' visibility='default' filepath='src/linux.h' line='119' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='controllernum' type-id='type-id-16' visibility='default' filepath='src/linux.h' line='121' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='disknum' type-id='type-id-16' visibility='default' filepath='src/linux.h' line='122' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='part' type-id='type-id-18' visibility='default' filepath='src/linux.h' line='123' column='1'/>
+    </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'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='slot_id' type-id='type-id-47' visibility='default' filepath='src/linux.h' line='91' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='major' type-id='type-id-36' visibility='default' filepath='src/linux.h' line='124' column='1'/>
+    </class-decl>
+    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/mntent.h' line='51' column='1' id='type-id-48'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='mnt_fsname' type-id='type-id-17' visibility='default' filepath='/usr/include/mntent.h' line='53' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='minor' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='125' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='mnt_dir' type-id='type-id-17' visibility='default' filepath='/usr/include/mntent.h' line='54' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='edd10_devicenum' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='126' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='mnt_type' type-id='type-id-17' visibility='default' filepath='/usr/include/mntent.h' line='55' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='disk_name' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='128' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='mnt_opts' type-id='type-id-17' visibility='default' filepath='/usr/include/mntent.h' line='56' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='part_name' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='129' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='mnt_freq' type-id='type-id-13' visibility='default' filepath='/usr/include/mntent.h' line='57' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='acpi_root' type-id='type-id-35' visibility='default' filepath='src/linux.h' line='131' column='1'/>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='mnt_passno' type-id='type-id-13' visibility='default' filepath='/usr/include/mntent.h' line='58' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='pci_root' type-id='type-id-38' visibility='default' filepath='src/linux.h' line='132' column='1'/>
+    </class-decl>
+    <class-decl name='nvdimm_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='85' column='1' id='type-id-49'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='namespace_label' type-id='type-id-42' visibility='default' filepath='src/linux.h' line='86' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1952'>
-        <var-decl name='n_pci_devs' type-id='type-id-16' visibility='default' filepath='src/linux.h' line='133' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='nvdimm_label' type-id='type-id-42' visibility='default' filepath='src/linux.h' line='87' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='pci_dev' type-id='type-id-54' visibility='default' filepath='src/linux.h' line='134' column='1'/>
+    </class-decl>
+    <class-decl name='nvme_info' size-in-bits='160' is-struct='yes' visibility='default' filepath='src/linux.h' line='78' column='1' id='type-id-50'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='ctrl_id' type-id='type-id-47' visibility='default' filepath='src/linux.h' line='79' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='' type-id='type-id-55' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='ns_id' type-id='type-id-47' visibility='default' filepath='src/linux.h' line='80' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='has_eui' type-id='type-id-13' visibility='default' filepath='src/linux.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='eui' type-id='type-id-51' visibility='default' filepath='src/linux.h' line='82' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__1' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='136' column='1' id='type-id-55'>
-      <data-member access='public'>
-        <var-decl name='scsi_info' type-id='type-id-40' visibility='default' filepath='src/linux.h' line='137' column='1'/>
+    <class-decl name='pci_dev_info' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/linux.h' line='32' column='1' id='type-id-52'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='pci_domain' type-id='type-id-44' visibility='default' filepath='src/linux.h' line='33' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='sas_info' type-id='type-id-41' visibility='default' filepath='src/linux.h' line='138' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='pci_bus' type-id='type-id-53' visibility='default' filepath='src/linux.h' line='34' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='sata_info' type-id='type-id-42' visibility='default' filepath='src/linux.h' line='139' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='pci_device' type-id='type-id-53' visibility='default' filepath='src/linux.h' line='35' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='ata_info' type-id='type-id-43' visibility='default' filepath='src/linux.h' line='140' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='pci_function' type-id='type-id-53' visibility='default' filepath='src/linux.h' line='36' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='nvme_info' type-id='type-id-44' visibility='default' filepath='src/linux.h' line='141' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='driverlink' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='37' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='emmc_info' type-id='type-id-47' visibility='default' filepath='src/linux.h' line='142' column='1'/>
+    </class-decl>
+    <class-decl name='pci_root_info' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/linux.h' line='27' column='1' id='type-id-54'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='pci_domain' type-id='type-id-44' visibility='default' filepath='src/linux.h' line='28' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='nvdimm_info' type-id='type-id-46' visibility='default' filepath='src/linux.h' line='143' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='pci_bus' type-id='type-id-53' visibility='default' filepath='src/linux.h' line='29' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='dev_probe' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/linux.h' line='329' column='1' id='type-id-56'>
+    </class-decl>
+    <class-decl name='sas_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/linux.h' line='47' column='1' id='type-id-55'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-37' visibility='default' filepath='src/linux.h' line='330' column='1'/>
+        <var-decl name='scsi_bus' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='48' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='scsi_device' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iftypes' type-id='type-id-57' visibility='default' filepath='src/linux.h' line='331' column='1'/>
+        <var-decl name='scsi_target' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='332' column='1'/>
+        <var-decl name='scsi_lun' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='parse' type-id='type-id-58' visibility='default' filepath='src/linux.h' line='333' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='create' type-id='type-id-59' visibility='default' filepath='src/linux.h' line='335' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='make_part_name' type-id='type-id-60' visibility='default' filepath='src/linux.h' line='337' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='int32_t' type-id='type-id-61' filepath='/usr/include/bits/stdint-intn.h' line='26' column='1' id='type-id-45'/>
-    <typedef-decl name='uint8_t' type-id='type-id-62' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-21'/>
-    <typedef-decl name='uint16_t' type-id='type-id-63' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-34'/>
-    <typedef-decl name='uint32_t' type-id='type-id-64' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-33'/>
-    <typedef-decl name='uint64_t' type-id='type-id-65' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-36'/>
-    <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-53'>
+    <class-decl name='sata_info' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/linux.h' line='56' column='1' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='st_dev' type-id='type-id-66' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='31' column='1'/>
+        <var-decl name='scsi_bus' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='scsi_device' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='st_ino' type-id='type-id-67' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='36' column='1'/>
+        <var-decl name='scsi_target' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='st_nlink' type-id='type-id-68' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='44' column='1'/>
+        <var-decl name='scsi_lun' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-69' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='45' column='1'/>
+        <var-decl name='ata_devno' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='st_uid' type-id='type-id-70' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='47' column='1'/>
+        <var-decl name='ata_port' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='st_gid' type-id='type-id-71' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='48' column='1'/>
+        <var-decl name='ata_pmp' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='__pad0' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='50' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='st_rdev' type-id='type-id-66' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='52' column='1'/>
+        <var-decl name='ata_print_id' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='st_size' type-id='type-id-72' 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-73' 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-74' 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-75' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='74' column='1'/>
+    </class-decl>
+    <class-decl name='scsi_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/linux.h' line='40' column='1' id='type-id-57'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='scsi_bus' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='41' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='st_mtim' type-id='type-id-75' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='75' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='scsi_device' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='42' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='st_ctim' type-id='type-id-75' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='76' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='scsi_target' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='43' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__glibc_reserved' type-id='type-id-2' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='89' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='scsi_lun' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='44' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__uint8_t' type-id='type-id-27' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-62'/>
-    <typedef-decl name='__uint16_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-63'/>
-    <typedef-decl name='__int32_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-61'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-64'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-65'/>
-    <typedef-decl name='__dev_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-66'/>
-    <typedef-decl name='__uid_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-70'/>
-    <typedef-decl name='__gid_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-71'/>
-    <typedef-decl name='__ino_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-67'/>
-    <typedef-decl name='__mode_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-69'/>
-    <typedef-decl name='__nlink_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-68'/>
-    <typedef-decl name='__off_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-72'/>
-    <typedef-decl name='__off64_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-76'/>
-    <typedef-decl name='__time_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='160' column='1' id='type-id-77'/>
-    <typedef-decl name='__blksize_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='175' column='1' id='type-id-73'/>
-    <typedef-decl name='__blkcnt_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-74'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-78'/>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='197' column='1' id='type-id-1'/>
-    <typedef-decl name='FILE' type-id='type-id-79' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-80'/>
-    <typedef-decl name='_IO_lock_t' type-id='type-id-30' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-81'/>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-79'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_flags' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
+    <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-58'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='st_dev' type-id='type-id-59' 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='_IO_read_ptr' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
+        <var-decl name='st_ino' type-id='type-id-60' 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='_IO_read_end' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
+        <var-decl name='st_nlink' type-id='type-id-61' 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='_IO_read_base' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
+        <var-decl name='st_mode' type-id='type-id-62' 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-63' 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='_IO_write_base' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
+        <var-decl name='st_gid' type-id='type-id-64' 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-13' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
+        <var-decl name='st_rdev' type-id='type-id-59' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
+        <var-decl name='st_size' type-id='type-id-20' 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='_IO_buf_base' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
+        <var-decl name='st_blksize' type-id='type-id-65' 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='_IO_buf_end' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
+        <var-decl name='st_blocks' type-id='type-id-66' 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='_IO_save_base' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
+        <var-decl name='st_atim' type-id='type-id-67' 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='_IO_save_end' type-id='type-id-37' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-82' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
+        <var-decl name='st_mtim' type-id='type-id-67' 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='_chain' type-id='type-id-83' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='_fileno' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='_flags2' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
+        <var-decl name='st_ctim' type-id='type-id-67' 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='_old_offset' type-id='type-id-72' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
+        <var-decl name='__glibc_reserved' type-id='type-id-2' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='89' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
+    </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-67'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='tv_sec' type-id='type-id-68' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='16' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1048'>
-        <var-decl name='_shortbuf' type-id='type-id-7' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='79' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='tv_nsec' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='21' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='_lock' type-id='type-id-84' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__' size-in-bits='2368' is-struct='yes' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='118' column='1' id='type-id-69'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='stat' type-id='type-id-58' visibility='default' filepath='src/linux.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='_offset' type-id='type-id-76' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='89' column='1'/>
+        <var-decl name='controllernum' type-id='type-id-29' visibility='default' filepath='src/linux.h' line='121' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1184'>
+        <var-decl name='disknum' type-id='type-id-29' visibility='default' filepath='src/linux.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='_codecvt' type-id='type-id-85' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
+        <var-decl name='part' type-id='type-id-13' visibility='default' filepath='src/linux.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='_wide_data' type-id='type-id-86' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
+        <var-decl name='major' type-id='type-id-32' visibility='default' filepath='src/linux.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='_freeres_list' type-id='type-id-83' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
+        <var-decl name='minor' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='125' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1376'>
+        <var-decl name='edd10_devicenum' type-id='type-id-31' visibility='default' filepath='src/linux.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='_freeres_buf' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
+        <var-decl name='disk_name' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-87' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+        <var-decl name='part_name' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='_mode' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
+        <var-decl name='acpi_root' type-id='type-id-30' visibility='default' filepath='src/linux.h' line='131' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='_unused2' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='98' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1920'>
+        <var-decl name='pci_root' type-id='type-id-54' visibility='default' filepath='src/linux.h' line='132' 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-75'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tv_sec' type-id='type-id-77' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='16' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1952'>
+        <var-decl name='n_pci_devs' type-id='type-id-29' visibility='default' filepath='src/linux.h' line='133' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='21' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1984'>
+        <var-decl name='pci_dev' type-id='type-id-70' visibility='default' filepath='src/linux.h' line='134' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='DIR' type-id='type-id-14' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-88'/>
-    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/mntent.h' line='51' column='1' id='type-id-89'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_fsname' type-id='type-id-37' visibility='default' filepath='/usr/include/mntent.h' line='53' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2048'>
+        <var-decl name='' type-id='type-id-71' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='DIR' type-id='type-id-72' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-73'/>
+    <typedef-decl name='FILE' type-id='type-id-16' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-74'/>
+    <typedef-decl name='_IO_lock_t' type-id='type-id-75' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-76'/>
+    <typedef-decl name='__blkcnt_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-66'/>
+    <typedef-decl name='__blksize_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='175' column='1' id='type-id-65'/>
+    <typedef-decl name='__dev_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-59'/>
+    <typedef-decl name='__gid_t' type-id='type-id-29' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-64'/>
+    <typedef-decl name='__ino_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-60'/>
+    <typedef-decl name='__int32_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-77'/>
+    <typedef-decl name='__mode_t' type-id='type-id-29' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-62'/>
+    <typedef-decl name='__nlink_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-61'/>
+    <typedef-decl name='__off64_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-23'/>
+    <typedef-decl name='__off_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-20'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-78'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='197' column='1' id='type-id-1'/>
+    <typedef-decl name='__time_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='160' column='1' id='type-id-68'/>
+    <typedef-decl name='__uid_t' type-id='type-id-29' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-63'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-79'/>
+    <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='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'/>
+    <typedef-decl name='uint16_t' type-id='type-id-79' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-44'/>
+    <typedef-decl name='uint32_t' type-id='type-id-80' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-31'/>
+    <typedef-decl name='uint64_t' type-id='type-id-81' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-32'/>
+    <typedef-decl name='uint8_t' type-id='type-id-83' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-53'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='48' id='type-id-45'>
+      <subrange length='6' type-id='type-id-3' id='type-id-85'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='64' id='type-id-51'>
+      <subrange length='8' type-id='type-id-3' id='type-id-86'/>
+    </array-type-def>
+    <union-decl name='__anonymous_union__1' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='136' column='1' id='type-id-71'>
+      <data-member access='public'>
+        <var-decl name='scsi_info' type-id='type-id-57' visibility='default' filepath='src/linux.h' line='137' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_dir' type-id='type-id-37' visibility='default' filepath='/usr/include/mntent.h' line='54' column='1'/>
+      <data-member access='public'>
+        <var-decl name='sas_info' type-id='type-id-55' visibility='default' filepath='src/linux.h' line='138' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_type' type-id='type-id-37' visibility='default' filepath='/usr/include/mntent.h' line='55' column='1'/>
+      <data-member access='public'>
+        <var-decl name='sata_info' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='139' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_opts' type-id='type-id-37' visibility='default' filepath='/usr/include/mntent.h' line='56' column='1'/>
+      <data-member access='public'>
+        <var-decl name='ata_info' type-id='type-id-33' visibility='default' filepath='src/linux.h' line='140' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='mnt_freq' type-id='type-id-18' visibility='default' filepath='/usr/include/mntent.h' line='57' column='1'/>
+      <data-member access='public'>
+        <var-decl name='nvme_info' type-id='type-id-50' visibility='default' filepath='src/linux.h' line='141' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='mnt_passno' type-id='type-id-18' visibility='default' filepath='/usr/include/mntent.h' line='58' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='ssize_t' type-id='type-id-78' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-90'/>
-    <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='209' column='1' id='type-id-87'/>
-    <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-92'/>
-    <qualified-type-def type-id='type-id-92' restrict='yes' id='type-id-93'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-82'/>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-94'/>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-37'/>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-60'/>
-    <qualified-type-def type-id='type-id-37' restrict='yes' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-97'/>
-    <qualified-type-def type-id='type-id-97' restrict='yes' id='type-id-98'/>
-    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-99'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
-    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-101'/>
-    <qualified-type-def type-id='type-id-100' restrict='yes' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-103'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-57'/>
-    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-54'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-107'/>
-    <qualified-type-def type-id='type-id-107' restrict='yes' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-58'/>
-    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-59'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-17'/>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-11'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-12'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-13'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-14'/>
+      <data-member access='public'>
+        <var-decl name='emmc_info' type-id='type-id-46' visibility='default' filepath='src/linux.h' line='142' column='1'/>
+      </data-member>
+      <data-member access='public'>
+        <var-decl name='nvdimm_info' type-id='type-id-49' visibility='default' filepath='src/linux.h' line='143' column='1'/>
+      </data-member>
+    </union-decl>
+    <union-decl name='__anonymous_union__' size-in-bits='2368' is-anonymous='yes' visibility='default' filepath='src/linux.h' line='117' column='1' id='type-id-41'>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-69' visibility='default'/>
+      </data-member>
+      <data-member access='public'>
+        <var-decl name='ifname' type-id='type-id-17' visibility='default' filepath='src/linux.h' line='146' 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-12'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-82'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-29'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-21'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-87'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-88'/>
+    <qualified-type-def type-id='type-id-88' restrict='yes' id='type-id-89'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-19'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-24'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-25'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-93'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-38'/>
+    <qualified-type-def type-id='type-id-17' restrict='yes' id='type-id-95'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-96'/>
+    <qualified-type-def type-id='type-id-96' restrict='yes' id='type-id-97'/>
+    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-98'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
+    <qualified-type-def type-id='type-id-99' const='yes' id='type-id-100'/>
+    <qualified-type-def type-id='type-id-99' restrict='yes' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-102'/>
+    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-40'/>
+    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-35'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-106' restrict='yes' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-37'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-26'/>
+    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-90'/>
+    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-91'/>
+    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-92'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-72'/>
+    <type-decl name='variadic parameter type' id='type-id-111'/>
+    <type-decl name='void' id='type-id-75'/>
     <function-decl name='efi_generate_file_device_path_from_esp' mangled-name='efi_generate_file_device_path_from_esp' filepath='src/creator.c' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path_from_esp@@libefiboot.so.0'>
-      <parameter type-id='type-id-111' name='buf' filepath='src/creator.c' line='318' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/creator.c' line='318' column='1'/>
-      <parameter type-id='type-id-100' name='devpath' filepath='src/creator.c' line='319' column='1'/>
-      <parameter type-id='type-id-18' name='partition' filepath='src/creator.c' line='319' column='1'/>
-      <parameter type-id='type-id-100' name='relpath' filepath='src/creator.c' line='320' column='1'/>
-      <parameter type-id='type-id-33' name='options' filepath='src/creator.c' line='321' column='1'/>
+      <parameter type-id='type-id-110' name='buf' filepath='src/creator.c' line='318' column='1'/>
+      <parameter type-id='type-id-84' name='size' filepath='src/creator.c' line='318' column='1'/>
+      <parameter type-id='type-id-99' name='devpath' filepath='src/creator.c' line='319' column='1'/>
+      <parameter type-id='type-id-13' name='partition' filepath='src/creator.c' line='319' column='1'/>
+      <parameter type-id='type-id-99' name='relpath' filepath='src/creator.c' line='320' column='1'/>
+      <parameter type-id='type-id-31' name='options' filepath='src/creator.c' line='321' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-90'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_generate_file_device_path' mangled-name='efi_generate_file_device_path' filepath='src/creator.c' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_file_device_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-111' name='buf' filepath='src/creator.c' line='370' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/creator.c' line='370' column='1'/>
-      <parameter type-id='type-id-101' name='filepath' filepath='src/creator.c' line='371' column='1'/>
-      <parameter type-id='type-id-33' name='options' filepath='src/creator.c' line='372' column='1'/>
+      <parameter type-id='type-id-110' name='buf' filepath='src/creator.c' line='370' column='1'/>
+      <parameter type-id='type-id-84' name='size' filepath='src/creator.c' line='370' column='1'/>
+      <parameter type-id='type-id-100' name='filepath' filepath='src/creator.c' line='371' column='1'/>
+      <parameter type-id='type-id-31' name='options' filepath='src/creator.c' line='372' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-90'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_generate_ipv4_device_path' mangled-name='efi_generate_ipv4_device_path' filepath='src/creator.c' line='461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_generate_ipv4_device_path@@libefiboot.so.0'>
-      <parameter type-id='type-id-111' name='buf' filepath='src/creator.c' line='461' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/creator.c' line='461' column='1'/>
-      <parameter type-id='type-id-101' name='ifname' filepath='src/creator.c' line='462' column='1'/>
-      <parameter type-id='type-id-101' name='local_addr' filepath='src/creator.c' line='463' column='1'/>
-      <parameter type-id='type-id-101' name='remote_addr' filepath='src/creator.c' line='464' column='1'/>
-      <parameter type-id='type-id-101' name='gateway_addr' filepath='src/creator.c' line='465' column='1'/>
-      <parameter type-id='type-id-101' name='netmask' filepath='src/creator.c' line='466' column='1'/>
-      <parameter type-id='type-id-34' name='local_port' filepath='src/creator.c' line='467' column='1'/>
-      <parameter type-id='type-id-34' name='remote_port' filepath='src/creator.c' line='468' column='1'/>
-      <parameter type-id='type-id-34' name='protocol' filepath='src/creator.c' line='469' column='1'/>
-      <parameter type-id='type-id-21' name='addr_origin' filepath='src/creator.c' line='470' column='1'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110' name='buf' filepath='src/creator.c' line='461' column='1'/>
+      <parameter type-id='type-id-84' name='size' filepath='src/creator.c' line='461' column='1'/>
+      <parameter type-id='type-id-100' name='ifname' filepath='src/creator.c' line='462' column='1'/>
+      <parameter type-id='type-id-100' name='local_addr' filepath='src/creator.c' line='463' column='1'/>
+      <parameter type-id='type-id-100' name='remote_addr' filepath='src/creator.c' line='464' column='1'/>
+      <parameter type-id='type-id-100' name='gateway_addr' filepath='src/creator.c' line='465' column='1'/>
+      <parameter type-id='type-id-100' name='netmask' filepath='src/creator.c' line='466' column='1'/>
+      <parameter type-id='type-id-44' name='local_port' filepath='src/creator.c' line='467' column='1'/>
+      <parameter type-id='type-id-44' name='remote_port' filepath='src/creator.c' line='468' column='1'/>
+      <parameter type-id='type-id-44' name='protocol' filepath='src/creator.c' line='469' column='1'/>
+      <parameter type-id='type-id-53' name='addr_origin' filepath='src/creator.c' line='470' column='1'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_get_libefiboot_version' mangled-name='efi_get_libefiboot_version' filepath='src/creator.c' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_libefiboot_version@@LIBEFIBOOT_1.31'>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='is_partitioned' filepath='src/disk.h' line='10' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-13'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='make_hd_dn' filepath='src/disk.h' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-33'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-47'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <return type-id='type-id-90'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-37'/>
-      <return type-id='type-id-90'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-90'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-53'/>
+      <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'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-99'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <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'>
-      <return type-id='type-id-30'/>
+      <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'>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-30'/>
+      <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'>
-      <return type-id='type-id-92'/>
+      <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'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-104'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='device_free' filepath='src/linux.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-104'/>
-      <return type-id='type-id-30'/>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-75'/>
     </function-decl>
     <function-decl name='set_part' filepath='src/linux.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='make_blockdev_path' filepath='src/linux.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-104'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='find_parent_devpath' filepath='src/linux.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-97'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-96'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='make_mac_path' filepath='src/linux.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-101'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-100'/>
+      <return type-id='type-id-84'/>
     </function-decl>
-    <function-decl name='closedir' filepath='/usr/include/dirent.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-18'/>
+    <function-decl name='closedir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-87'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <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-105'/>
+      <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'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-13'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </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-92'/>
-      <return type-id='type-id-106'/>
+      <parameter type-id='type-id-88'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='endmntent' filepath='/usr/include/mntent.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-88'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-18'/>
+    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-88'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fopen' filepath='/usr/include/stdio.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-92'/>
+    <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='344' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-102'/>
+    <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'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-89'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='asprintf' filepath='/usr/include/stdio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-98'/>
-      <parameter type-id='type-id-102'/>
+    <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-97'/>
+      <parameter type-id='type-id-101'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='feof' filepath='/usr/include/stdio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-18'/>
+    <function-decl name='feof' filepath='/usr/include/stdio.h' line='846' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-88'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='free' filepath='/usr/include/stdlib.h' line='554' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-30'/>
+    <function-decl name='free' filepath='/usr/include/stdlib.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-75'/>
     </function-decl>
     <function-decl name='memcpy' filepath='/usr/include/string.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-17'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
+    </function-decl>
+    <function-decl name='strcpy' filepath='/usr/include/string.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-87'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='strcpy' filepath='/usr/include/string.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-37'/>
+    <function-decl name='strcmp' filepath='/usr/include/string.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='strcmp' filepath='/usr/include/string.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-18'/>
-    </function-decl>
-    <function-decl name='strncmp' filepath='/usr/include/string.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-18'/>
+    <function-decl name='strncmp' filepath='/usr/include/string.h' line='159' 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-27'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='strdup' filepath='/usr/include/string.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-37'/>
+    <function-decl name='strdup' filepath='/usr/include/string.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='strlen' filepath='/usr/include/string.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-87'/>
+    <function-decl name='strlen' filepath='/usr/include/string.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <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-102'/>
-      <parameter type-id='type-id-108'/>
-      <return type-id='type-id-18'/>
+      <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-18'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='readlink' filepath='/usr/include/unistd.h' line='837' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-96'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-90'/>
+    <function-decl name='readlink' filepath='/usr/include/unistd.h' line='838' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-95'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-84'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-95'>
-      <parameter type-id='type-id-104'/>
-      <return type-id='type-id-37'/>
+    <function-type size-in-bits='64' id='type-id-94'>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-109'>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-101'/>
-      <return type-id='type-id-90'/>
+    <function-type size-in-bits='64' id='type-id-108'>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-100'/>
+      <return type-id='type-id-84'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-110'>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-90'/>
-      <return type-id='type-id-90'/>
+    <function-type size-in-bits='64' id='type-id-109'>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-84'/>
+      <return type-id='type-id-84'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='disk.c' comp-dir-path='src' language='LANG_C11'>
-    <typedef-decl name='__suseconds_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='162' column='1' id='type-id-112'/>
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='8' column='1' id='type-id-113'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='8' column='1' id='type-id-112'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tv_sec' type-id='type-id-77' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='14' column='1'/>
+        <var-decl name='tv_sec' type-id='type-id-68' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='14' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_usec' type-id='type-id-112' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='15' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-113' visibility='default' filepath='/usr/include/bits/types/struct_timeval.h' line='15' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-115'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='162' column='1' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-115'/>
     <qualified-type-def type-id='type-id-115' restrict='yes' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-117'/>
-    <qualified-type-def type-id='type-id-17' restrict='yes' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-117'/>
+    <qualified-type-def type-id='type-id-26' restrict='yes' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-119'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-120'/>
     <function-decl name='gpt_disk_get_partition_info' filepath='src/gpt.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-114'/>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-13'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-32'/>
+      <parameter type-id='type-id-32'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='get_sector_size' filepath='src/linux.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='posix_memalign' filepath='/usr/include/stdlib.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='posix_memalign' filepath='/usr/include/stdlib.h' line='718' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='ioctl' filepath='/usr/include/sys/ioctl.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-13'/>
       <parameter type-id='type-id-3'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <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-18'/>
-      <parameter type-id='type-id-107'/>
-      <return type-id='type-id-18'/>
+      <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-18'/>
+      <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-18'/>
-      <parameter type-id='type-id-72'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-72'/>
+      <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-18'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='write' filepath='/usr/include/unistd.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-84'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gpt.c' comp-dir-path='src' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='520' id='type-id-120'>
-      <subrange length='65' type-id='type-id-3' id='type-id-121'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='520' id='type-id-121'>
+      <subrange length='65' type-id='type-id-3' id='type-id-122'/>
     </array-type-def>
-    <class-decl name='utsname' size-in-bits='3120' is-struct='yes' visibility='default' filepath='/usr/include/sys/utsname.h' line='48' column='1' id='type-id-122'>
+    <class-decl name='utsname' size-in-bits='3120' is-struct='yes' visibility='default' filepath='/usr/include/sys/utsname.h' line='48' column='1' id='type-id-123'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sysname' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='51' column='1'/>
+        <var-decl name='sysname' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='520'>
-        <var-decl name='nodename' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='54' column='1'/>
+        <var-decl name='nodename' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='release' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='57' column='1'/>
+        <var-decl name='release' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1560'>
-        <var-decl name='version' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='59' column='1'/>
+        <var-decl name='version' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='machine' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='62' column='1'/>
+        <var-decl name='machine' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2600'>
-        <var-decl name='domainname' type-id='type-id-120' visibility='default' filepath='/usr/include/sys/utsname.h' line='67' column='1'/>
+        <var-decl name='domainname' type-id='type-id-121' visibility='default' filepath='/usr/include/sys/utsname.h' line='67' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-124'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-125'/>
     <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-17'/>
+      <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-33'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-31'/>
     </function-decl>
-    <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-17'/>
+    <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='672' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='memcmp' filepath='/usr/include/string.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='strerror' filepath='/usr/include/string.h' line='403' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-37'/>
+    <function-decl name='strerror' filepath='/usr/include/string.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='uname' filepath='/usr/include/sys/utsname.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-123'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-124'/>
+      <return type-id='type-id-13'/>
     </function-decl>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <return type-id='type-id-90'/>
+      <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='parse_acpi_hid_uid' filepath='src/linux.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-99'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <var-decl name='acpi_root_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='349' column='1'/>
-    <function-decl name='strndup' filepath='/usr/include/string.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-37'/>
+    <var-decl name='acpi_root_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='349' column='1'/>
+    <function-decl name='strndup' filepath='/usr/include/string.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='strchr' filepath='/usr/include/string.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-37'/>
+    <function-decl name='strchr' filepath='/usr/include/string.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='strnlen' filepath='/usr/include/string.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-87'/>
+    <function-decl name='strnlen' filepath='/usr/include/string.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-27'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr address-size='64' path='linux-acpi.c' comp-dir-path='src' language='LANG_C11'>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-127'/>
+    <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-13'/>
+    </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-97'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-13'/>
+    </function-decl>
+    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
+    </function-decl>
+    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='linux-ata.c' comp-dir-path='src' language='LANG_C11'>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-124'/>
+    <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-34'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='parse_scsi_link' filepath='src/linux.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-124'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-128'/>
+      <parameter type-id='type-id-128'/>
+      <parameter type-id='type-id-128'/>
+      <parameter type-id='type-id-128'/>
       <parameter type-id='type-id-117'/>
-      <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-124'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-128'/>
+      <parameter type-id='type-id-128'/>
+      <parameter type-id='type-id-128'/>
+      <return type-id='type-id-84'/>
+    </function-decl>
+    <var-decl name='ata_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='359' column='1'/>
+    <function-decl name='strrchr' filepath='/usr/include/string.h' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-17'/>
     </function-decl>
-    <var-decl name='ata_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='359' column='1'/>
-    <function-decl name='strstr' filepath='/usr/include/string.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-37'/>
+    <function-decl name='strstr' filepath='/usr/include/string.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-17'/>
     </function-decl>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <return type-id='type-id-90'/>
+      <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>
-    <var-decl name='emmc_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='360' column='1'/>
+    <var-decl name='emmc_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='360' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-i2o.c' comp-dir-path='src' language='LANG_C11'>
-    <var-decl name='i2o_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='357' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-131'/>
+    <var-decl name='i2o_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='357' column='1'/>
+  </abi-instr>
+  <abi-instr address-size='64' path='linux-md.c' comp-dir-path='src' language='LANG_C11'>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-132'/>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-111'/>
-      <return type-id='type-id-90'/>
+      <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'>
+      <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'/>
+    <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-99'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <var-decl name='nvme_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='355' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-pci-root.c' comp-dir-path='src' language='LANG_C11'>
-    <var-decl name='pci_root_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='348' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-134'/>
+    <var-decl name='pci_root_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='348' column='1'/>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-84'/>
     </function-decl>
-    <var-decl name='pci_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='352' column='1'/>
+    <var-decl name='pci_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='352' column='1'/>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-90'/>
+      <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'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-18'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <var-decl name='pmem_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='347' column='1'/>
-    <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-37'/>
+    <var-decl name='pmem_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='347' column='1'/>
+    <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-17'/>
     </function-decl>
   </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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-36'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-32'/>
+      <return type-id='type-id-84'/>
     </function-decl>
-    <var-decl name='sas_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='353' column='1'/>
+    <var-decl name='sas_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='353' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='linux-sata.c' comp-dir-path='src' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-125'>
-      <subrange length='256' type-id='type-id-3' id='type-id-126'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-138'>
+      <subrange length='256' type-id='type-id-3' id='type-id-139'/>
     </array-type-def>
-    <type-decl name='short int' size-in-bits='16' id='type-id-127'/>
-    <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-128'>
+    <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-67' visibility='default' filepath='/usr/include/bits/dirent.h' line='25' column='1'/>
+        <var-decl name='d_ino' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/dirent.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d_off' type-id='type-id-72' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
+        <var-decl name='d_off' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='d_reclen' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/dirent.h' line='31' column='1'/>
+        <var-decl name='d_reclen' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/dirent.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='d_type' type-id='type-id-27' visibility='default' filepath='/usr/include/bits/dirent.h' line='32' column='1'/>
+        <var-decl name='d_type' type-id='type-id-82' visibility='default' filepath='/usr/include/bits/dirent.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='d_name' type-id='type-id-125' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' column='1'/>
+        <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-129' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-130'/>
-    <typedef-decl name='__int16_t' type-id='type-id-127' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-131'/>
+    <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-34'/>
-      <return type-id='type-id-90'/>
+      <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-44'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='is_pata' filepath='src/linux.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <var-decl name='sata_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='354' column='1'/>
-    <function-decl name='opendir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-91'/>
+    <var-decl name='sata_parser' type-id='type-id-34' visibility='default' filepath='src/linux.h' line='354' 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-99'/>
+      <return type-id='type-id-87'/>
     </function-decl>
-    <function-decl name='readdir' filepath='/usr/include/dirent.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-131'/>
+    <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-34'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-84'/>
     </function-decl>
-    <var-decl name='scsi_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='358' column='1'/>
+    <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'>
-    <var-decl name='soc_root_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='350' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-147'/>
+    <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'>
-    <var-decl name='virtblk_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='356' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-148'/>
+    <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'>
-    <var-decl name='virtual_root_parser' type-id='type-id-56' visibility='default' filepath='src/linux.h' line='351' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-149'/>
+    <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-132' filepath='src/include/efivar/efivar-dp.h' line='885' column='1' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-134'/>
-    <qualified-type-def type-id='type-id-135' const='yes' id='type-id-136'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-132'/>
-    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-138'/>
-    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-139'/>
+    <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'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-139'/>
-      <parameter type-id='type-id-90'/>
-      <return type-id='type-id-90'/>
+      <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-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-140'/>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-133'/>
-      <parameter type-id='type-id-90'/>
-      <return type-id='type-id-90'/>
-    </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'>
-      <return type-id='type-id-30'/>
+      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-151'/>
+      <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-100'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-134'/>
-      <parameter type-id='type-id-141'/>
-      <return type-id='type-id-18'/>
-    </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-18'/>
-    </function-decl>
-    <function-decl name='vasprintf' filepath='/usr/include/stdio.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-98'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-152'/>
+      <parameter type-id='type-id-160'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-87'/>
+    <function-decl name='strncpy' filepath='/usr/include/string.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-27'/>
       <return type-id='type-id-17'/>
-    </function-decl>
-    <function-decl name='strncpy' filepath='/usr/include/string.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-37'/>
-    </function-decl>
-    <function-decl name='strrchr' filepath='/usr/include/string.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-37'/>
-    </function-decl>
-    <function-decl name='socket' filepath='/usr/include/sys/socket.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-18'/>
-    </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-100'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-18'/>
-    </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-142'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-143'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='infinite' id='type-id-145'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-143'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='infinite' id='type-id-146'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-143'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-147'>
-      <subrange length='4' type-id='type-id-3' id='type-id-148'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='infinite' id='type-id-149'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-143'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-36' size-in-bits='128' id='type-id-150'>
-      <subrange length='2' type-id='type-id-3' id='type-id-151'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='128' id='type-id-152'>
-      <subrange length='16' type-id='type-id-3' id='type-id-153'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='256' id='type-id-154'>
-      <subrange length='32' type-id='type-id-3' id='type-id-155'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='32' id='type-id-156'>
-      <subrange length='4' type-id='type-id-3' id='type-id-148'/>
+    </function-decl>
+    <function-decl name='socket' filepath='/usr/include/sys/socket.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
+    </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>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='infinite' id='type-id-157'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-143'/>
+    <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>
-    <typedef-decl name='efi_load_option' type-id='type-id-158' filepath='src/include/efivar/efiboot-loadopt.h' line='10' column='1' id='type-id-159'/>
-    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='23' column='1' id='type-id-161'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
+        <var-decl name='addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='25' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='26' column='1'/>
+    </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'>
+      <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>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_header' type-id='type-id-161' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-160'/>
-    <typedef-decl name='efidp_boolean' type-id='type-id-21' filepath='src/include/efivar/efivar-dp.h' line='30' column='1' id='type-id-162'/>
-    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-163' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='42' column='1' id='type-id-164'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='43' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='353' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
+      <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'/>
+      </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'>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pci' type-id='type-id-164' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-163'/>
-    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='51' column='1' id='type-id-166'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='52' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
+        <var-decl name='hid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' 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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pccard' type-id='type-id-166' filepath='src/include/efivar/efivar-dp.h' line='54' column='1' id='type-id-165'/>
-    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1' id='type-id-168'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='58' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='memory_type' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
+        <var-decl name='hid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='60' column='1'/>
+        <var-decl name='uid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='118' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-161' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_mmio' type-id='type-id-168' filepath='src/include/efivar/efivar-dp.h' line='62' column='1' id='type-id-167'/>
-    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1' id='type-id-170'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='66' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
+        <var-decl name='primary' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='68' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-170' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-169'/>
-    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='86' column='1' id='type-id-172'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='87' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='807' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='controller' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
+        <var-decl name='device_type' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_controller' type-id='type-id-172' filepath='src/include/efivar/efivar-dp.h' line='89' column='1' id='type-id-171'/>
-    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1' id='type-id-174'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='93' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-21' 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='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-36' 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='95' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bmc' type-id='type-id-174' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-173'/>
-    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='106' column='1' id='type-id-176'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='107' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='addr' type-id='type-id-45' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='109' column='1'/>
+    </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'>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-176' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-175'/>
-    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='115' column='1' id='type-id-178'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='116' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='736' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='117' column='1'/>
+        <var-decl name='boot_catalog_entry' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='118' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='cid' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
+        <var-decl name='sectors' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-178' filepath='src/include/efivar/efivar-dp.h' line='122' column='1' id='type-id-177'/>
-    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='156' column='1' id='type-id-180'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='157' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-149' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='158' column='1'/>
+        <var-decl name='controller' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-180' filepath='src/include/efivar/efivar-dp.h' line='159' column='1' id='type-id-179'/>
-    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='317' column='1' id='type-id-182'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='318' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='696' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='320' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1'/>
+        <var-decl name='addrs' type-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_atapi' type-id='type-id-182' filepath='src/include/efivar/efivar-dp.h' line='322' column='1' id='type-id-181'/>
-    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-183' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='327' column='1' id='type-id-184'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='328' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='329' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='330' column='1'/>
+        <var-decl name='slot' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_scsi' type-id='type-id-184' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-183'/>
-    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-185' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-186'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='337' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-33' 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='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-36' 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='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-36' 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='340' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fc' type-id='type-id-186' filepath='src/include/efivar/efivar-dp.h' line='341' column='1' id='type-id-185'/>
-    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1' id='type-id-188'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='345' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-33' 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='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-24' 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='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-24' 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='348' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fcex' type-id='type-id-188' filepath='src/include/efivar/efivar-dp.h' line='349' column='1' id='type-id-187'/>
-    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' column='1' id='type-id-190'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='353' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='755' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='355' column='1'/>
+        <var-decl name='name' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_1394' type-id='type-id-190' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-189'/>
-    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1' id='type-id-192'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='360' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb' type-id='type-id-192' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-191'/>
-    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-193' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1' id='type-id-194'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='367' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_id' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='product_id' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='369' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-194' filepath='src/include/efivar/efivar-dp.h' line='373' column='1' id='type-id-193'/>
-    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-195' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='393' column='1' id='type-id-196'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='394' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='vendor_id' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='396' column='1'/>
+        <var-decl name='partition_number' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='product_id' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1'/>
+        <var-decl name='start' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='serial_number' type-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-196' filepath='src/include/efivar/efivar-dp.h' line='399' column='1' id='type-id-195'/>
-    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' column='1' id='type-id-198'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='type' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_lun' type-id='type-id-198' filepath='src/include/efivar/efivar-dp.h' line='405' column='1' id='type-id-197'/>
-    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-199' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' column='1' id='type-id-200'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='409' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hba_port' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='port_multiplier_port' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='411' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sata' type-id='type-id-200' filepath='src/include/efivar/efivar-dp.h' line='413' column='1' id='type-id-199'/>
-    <class-decl name='efidp_i2o' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-201' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='419' column='1' id='type-id-202'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='420' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='420' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-33' 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='421' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_i2o' type-id='type-id-202' filepath='src/include/efivar/efivar-dp.h' line='422' column='1' id='type-id-201'/>
-    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-203' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' column='1' id='type-id-204'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='426' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
+        <var-decl name='resource_flags' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='428' column='1'/>
+      <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'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='' type-id='type-id-222' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-204' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-203'/>
-    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-205' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='437' column='1' id='type-id-206'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='438' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='438' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='439' column='1'/>
+        <var-decl name='local_ipv4_addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='439' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='440' column='1'/>
+        <var-decl name='remote_ipv4_addr' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='440' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='local_port' type-id='type-id-34' 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='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='remote_port' type-id='type-id-34' 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='442' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='protocol' type-id='type-id-34' 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='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
+        <var-decl name='static_ip_addr' type-id='type-id-225' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='444' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
+        <var-decl name='gateway' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
+        <var-decl name='netmask' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='446' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-206' filepath='src/include/efivar/efivar-dp.h' line='447' column='1' id='type-id-205'/>
-    <class-decl name='efidp_ipv6_addr' size-in-bits='360' is-struct='yes' naming-typedef-id='type-id-207' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='459' column='1' id='type-id-208'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='460' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='460' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='461' column='1'/>
+        <var-decl name='local_ipv6_addr' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='462' column='1'/>
+        <var-decl name='remote_ipv6_addr' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='local_port' type-id='type-id-34' 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='463' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='remote_port' type-id='type-id-34' 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='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='protocol' type-id='type-id-34' 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='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-21' 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='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-21' 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='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-208' filepath='src/include/efivar/efivar-dp.h' line='469' column='1' id='type-id-207'/>
-    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-209' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='476' column='1' id='type-id-210'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='477' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='603' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vlan_id' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_vlan' type-id='type-id-210' filepath='src/include/efivar/efivar-dp.h' line='479' column='1' id='type-id-209'/>
-    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-211' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1' id='type-id-212'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
+        <var-decl name='protocol' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='resource_flags' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
+      <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-150' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='485' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-213' visibility='default'/>
+        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1'/>
+      <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'/>
       </data-member>
     </class-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-213'>
-      <data-member access='public'>
-        <var-decl name='ioc_guid' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='service_id' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
-      </data-member>
-    </union-decl>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-212' filepath='src/include/efivar/efivar-dp.h' line='492' column='1' id='type-id-211'/>
-    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-214' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='501' column='1' id='type-id-215'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='502' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
+        <var-decl name='lun' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart' type-id='type-id-215' filepath='src/include/efivar/efivar-dp.h' line='508' column='1' id='type-id-214'/>
-    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-216' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='532' column='1' id='type-id-217'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='533' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-234' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-217' filepath='src/include/efivar/efivar-dp.h' line='536' column='1' id='type-id-216'/>
-    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-218' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-219'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='546' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-31' 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='745' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='flow_control_map' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-219' filepath='src/include/efivar/efivar-dp.h' line='549' column='1' id='type-id-218'/>
-    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-220' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='556' column='1' id='type-id-221'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='557' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reserved' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='559' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='560' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
+        <var-decl name='memory_type' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='rtp' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas' type-id='type-id-221' filepath='src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-220'/>
-    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-222' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='589' column='1' id='type-id-223'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='590' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-24' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-24' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='592' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='593' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='rtp' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-223' filepath='src/include/efivar/efivar-dp.h' line='596' column='1' id='type-id-222'/>
-    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-224' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='602' column='1' id='type-id-225'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='603' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='options' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='605' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-24' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpgt' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
+        <var-decl name='uuid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-225' filepath='src/include/efivar/efivar-dp.h' line='609' column='1' id='type-id-224'/>
-    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='637' column='1' id='type-id-227'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='638' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='638' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='namespace_id' type-id='type-id-33' 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='639' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-24' 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='640' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvme' type-id='type-id-227' filepath='src/include/efivar/efivar-dp.h' line='641' column='1' id='type-id-226'/>
-    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-228' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-229'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='647' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
+        <var-decl name='function' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uri' type-id='type-id-229' filepath='src/include/efivar/efivar-dp.h' line='649' column='1' id='type-id-228'/>
-    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-230' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1' id='type-id-231'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
+        <var-decl name='function' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='655' column='1'/>
+        <var-decl name='device' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ufs' type-id='type-id-231' filepath='src/include/efivar/efivar-dp.h' line='656' column='1' id='type-id-230'/>
-    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-232' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1' id='type-id-233'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='660' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='762' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='661' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sd' type-id='type-id-233' filepath='src/include/efivar/efivar-dp.h' line='662' column='1' id='type-id-232'/>
-    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-234' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-235'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='666' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-22' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_bt' type-id='type-id-235' filepath='src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-234'/>
-    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-236' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-237'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='673' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_wifi' type-id='type-id-237' filepath='src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-236'/>
-    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-238' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-239'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='678' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_emmc' type-id='type-id-239' filepath='src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-238'/>
-    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-240' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-241'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='686' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='557' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-22' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='688' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_btle' type-id='type-id-241' filepath='src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-240'/>
-    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-242' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='695' column='1' id='type-id-243'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='696' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-145' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_dns' type-id='type-id-243' filepath='src/include/efivar/efivar-dp.h' line='699' column='1' id='type-id-242'/>
-    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-244' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-245'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='703' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='590' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' 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'/>
+      </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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-245' filepath='src/include/efivar/efivar-dp.h' line='705' column='1' id='type-id-244'/>
-    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-246' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-247'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='711' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='409' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='partition_number' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
+        <var-decl name='hba_port' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
+        <var-decl name='lun' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='714' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
+    </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'>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hd' type-id='type-id-247' filepath='src/include/efivar/efivar-dp.h' line='721' column='1' id='type-id-246'/>
-    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-248' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='735' column='1' id='type-id-249'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='736' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='boot_catalog_entry' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
+        <var-decl name='reserved' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-32' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-249' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-248'/>
-    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-250' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1' id='type-id-251'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='744' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-31' 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='547' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='flow_control_map' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-251' filepath='src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-250'/>
-    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-252' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-253'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='755' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='653' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='name' type-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_file' type-id='type-id-253' filepath='src/include/efivar/efivar-dp.h' line='757' column='1' id='type-id-252'/>
-    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-254' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-255'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='target_id' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_protocol' type-id='type-id-255' filepath='src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-254'/>
-    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-256' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1' id='type-id-257'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='768' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='647' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='uri' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-257' filepath='src/include/efivar/efivar-dp.h' line='770' column='1' id='type-id-256'/>
-    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-258' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1' id='type-id-259'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='774' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' 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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-259' filepath='src/include/efivar/efivar-dp.h' line='776' column='1' id='type-id-258'/>
-    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-260' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1' id='type-id-261'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='780' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='367' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-33' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='device_class' type-id='type-id-53' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='783' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-261' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-260'/>
-    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-262' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1' id='type-id-263'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='788' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='interface' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-36' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='790' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-31' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='791' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='instance_number' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-263' filepath='src/include/efivar/efivar-dp.h' line='793' column='1' id='type-id-262'/>
-    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-264' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='806' column='1' id='type-id-265'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='807' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='device_type' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' column='1'/>
+        <var-decl name='vlan_id' type-id='type-id-44' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='status' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='809' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='810' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-265' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-264'/>
-    <union-decl name='efidp_data' size-in-bits='384' naming-typedef-id='type-id-135' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='825' column='1' id='type-id-266'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-267' visibility='default'/>
+    <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'>
+      <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'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='header' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
+      <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'/>
       </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'/>
+    </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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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'>
       <data-member access='public'>
-        <var-decl name='pci' type-id='type-id-163' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
+        <var-decl name='addr' type-id='type-id-289' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pccard' type-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
+        <var-decl name='v4' type-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mmio' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='v6' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' 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'>
       <data-member access='public'>
-        <var-decl name='hw_vendor' type-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='' type-id='type-id-283' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='controller' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
+        <var-decl name='header' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bmc' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
+        <var-decl name='pci' type-id='type-id-247' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='pccard' type-id='type-id-245' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='mmio' type-id='type-id-237' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_adr' type-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-215' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='atapi' type-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='controller' type-id='type-id-196' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='scsi' type-id='type-id-183' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='bmc' type-id='type-id-188' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fc' type-id='type-id-185' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fcex' type-id='type-id-187' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firewire' type-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb' type-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='atapi' type-id='type-id-183' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_class' type-id='type-id-193' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='scsi' type-id='type-id-261' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_wwid' type-id='type-id-195' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='fc' type-id='type-id-202' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='lun' type-id='type-id-197' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='fcex' type-id='type-id-204' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sata' type-id='type-id-199' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='firewire' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='i2o' type-id='type-id-201' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
+        <var-decl name='usb' type-id='type-id-273' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mac_addr' type-id='type-id-203' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-275' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv4_addr' type-id='type-id-205' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-277' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv6_addr' type-id='type-id-207' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='lun' type-id='type-id-230' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='vlan' type-id='type-id-209' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='sata' type-id='type-id-259' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='infiniband' type-id='type-id-211' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='i2o' type-id='type-id-217' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart' type-id='type-id-214' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-232' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='msg_vendor' type-id='type-id-216' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-223' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart_flow_control' type-id='type-id-218' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas' type-id='type-id-220' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='vlan' type-id='type-id-279' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas_ex' type-id='type-id-222' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-219' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='iscsi' type-id='type-id-224' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='uart' type-id='type-id-265' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvme' type-id='type-id-226' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-239' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uri' type-id='type-id-228' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-267' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ufs' type-id='type-id-230' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='sas' type-id='type-id-255' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sd' type-id='type-id-232' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-257' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bt' type-id='type-id-234' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-228' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='wifi' type-id='type-id-236' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='nvme' type-id='type-id-243' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='emmc' type-id='type-id-238' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='uri' type-id='type-id-271' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='btle' type-id='type-id-240' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='ufs' type-id='type-id-269' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='dns' type-id='type-id-242' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='sd' type-id='type-id-263' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvdimm' type-id='type-id-244' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='bt' type-id='type-id-190' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hd' type-id='type-id-246' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='wifi' type-id='type-id-281' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='cdrom' type-id='type-id-248' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='emmc' type-id='type-id-200' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='media_vendor' type-id='type-id-250' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='btle' type-id='type-id-192' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='file' type-id='type-id-252' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='dns' type-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='protocol' type-id='type-id-254' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-241' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_file' type-id='type-id-256' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='hd' type-id='type-id-212' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_volume' type-id='type-id-258' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-194' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='relative_offset' type-id='type-id-260' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-235' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ramdisk' type-id='type-id-262' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='file' type-id='type-id-206' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bios_boot' type-id='type-id-264' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
-      </data-member>
-    </union-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-267'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='827' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-21' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='828' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-34' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='829' column='1'/>
+        <var-decl name='protocol' type-id='type-id-249' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_data' type-id='type-id-266' filepath='src/include/efivar/efivar-dp.h' line='883' column='1' id='type-id-135'/>
-    <typedef-decl name='efidp' type-id='type-id-268' filepath='src/include/efivar/efivar-dp.h' line='884' column='1' id='type-id-269'/>
-    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-270' visibility='default' filepath='src/include/efivar/efivar-types.h' line='31' column='1' id='type-id-271'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-271' filepath='src/include/efivar/efivar-types.h' line='33' column='1' id='type-id-270'/>
-    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-272' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-273'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-152' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-273' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-272'/>
-    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-274'>
       <data-member access='public'>
-        <var-decl name='addr' type-id='type-id-147' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
+        <var-decl name='relative_offset' type-id='type-id-253' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v4' type-id='type-id-270' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
+        <var-decl name='ramdisk' type-id='type-id-251' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v6' type-id='type-id-272' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-185' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='efi_ip_addr_t' type-id='type-id-274' filepath='src/include/efivar/efivar-types.h' line='43' column='1' id='type-id-144'/>
-    <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-158'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='attributes' type-id='type-id-33' visibility='default' filepath='src/loadopt.c' line='18' column='1'/>
+    <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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='file_path_list_length' type-id='type-id-34' visibility='default' filepath='src/loadopt.c' line='19' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='description' type-id='type-id-146' visibility='default' filepath='src/loadopt.c' line='20' column='1'/>
-      </data-member>
-    </class-decl>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-277'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-140'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-282'/>
+    </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'/>
+    <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'>
-      <return type-id='type-id-18'/>
+      <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-111' name='buf' filepath='src/loadopt.c' line='26' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/loadopt.c' line='26' column='1'/>
-      <parameter type-id='type-id-33' name='attributes' filepath='src/loadopt.c' line='26' column='1'/>
-      <parameter type-id='type-id-269' name='dp' filepath='src/loadopt.c' line='27' column='1'/>
-      <parameter type-id='type-id-90' name='dp_size' filepath='src/loadopt.c' line='27' column='1'/>
-      <parameter type-id='type-id-140' name='description' filepath='src/loadopt.c' line='27' column='1'/>
-      <parameter type-id='type-id-111' name='optional_data' filepath='src/loadopt.c' line='28' column='1'/>
-      <parameter type-id='type-id-87' name='optional_data_size' filepath='src/loadopt.c' line='28' column='1'/>
-      <return type-id='type-id-90'/>
+      <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-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-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-280' name='opt' filepath='src/loadopt.c' line='102' column='1'/>
-      <parameter type-id='type-id-87' name='size' filepath='src/loadopt.c' line='102' column='1'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='152' column='1'/>
-      <parameter type-id='type-id-87' name='size' filepath='src/loadopt.c' line='152' column='1'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='161' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='167' column='1'/>
-      <parameter type-id='type-id-34' name='attr' filepath='src/loadopt.c' line='167' column='1'/>
-      <return type-id='type-id-30'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='173' column='1'/>
-      <parameter type-id='type-id-34' name='attr' filepath='src/loadopt.c' line='173' column='1'/>
-      <return type-id='type-id-30'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='180' column='1'/>
-      <parameter type-id='type-id-90' name='limit' filepath='src/loadopt.c' line='180' column='1'/>
-      <return type-id='type-id-34'/>
+      <parameter type-id='type-id-299' 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-280' name='opt' filepath='src/loadopt.c' line='194' column='1'/>
-      <parameter type-id='type-id-90' name='limit' filepath='src/loadopt.c' line='194' column='1'/>
-      <return type-id='type-id-269'/>
+      <parameter type-id='type-id-299' 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'/>
     </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-280' name='opt' filepath='src/loadopt.c' line='223' column='1'/>
-      <parameter type-id='type-id-87' name='opt_size' filepath='src/loadopt.c' line='223' column='1'/>
-      <parameter type-id='type-id-282' name='datap' filepath='src/loadopt.c' line='224' column='1'/>
-      <parameter type-id='type-id-141' name='len' filepath='src/loadopt.c' line='224' column='1'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-299' 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'/>
+      <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'>
-      <parameter type-id='type-id-111' name='buf' filepath='src/loadopt.c' line='256' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/loadopt.c' line='256' column='1'/>
-      <parameter type-id='type-id-37' name='filename' filepath='src/loadopt.c' line='256' column='1'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110' name='buf' filepath='src/loadopt.c' line='256' column='1'/>
+      <parameter type-id='type-id-84' name='size' filepath='src/loadopt.c' line='256' column='1'/>
+      <parameter type-id='type-id-17' name='filename' filepath='src/loadopt.c' line='256' column='1'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='efi_loadopt_args_as_utf8' mangled-name='efi_loadopt_args_as_utf8' filepath='src/loadopt.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_loadopt_args_as_utf8@@libefiboot.so.0'>
-      <parameter type-id='type-id-111' name='buf' filepath='src/loadopt.c' line='299' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/loadopt.c' line='299' column='1'/>
-      <parameter type-id='type-id-111' name='utf8' filepath='src/loadopt.c' line='299' column='1'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-110' name='buf' filepath='src/loadopt.c' line='299' column='1'/>
+      <parameter type-id='type-id-84' name='size' filepath='src/loadopt.c' line='299' column='1'/>
+      <parameter type-id='type-id-110' name='utf8' filepath='src/loadopt.c' line='299' column='1'/>
+      <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-281' name='buf' filepath='src/loadopt.c' line='324' column='1'/>
-      <parameter type-id='type-id-90' name='size' filepath='src/loadopt.c' line='324' column='1'/>
-      <parameter type-id='type-id-111' name='utf8' filepath='src/loadopt.c' line='324' column='1'/>
-      <return type-id='type-id-90'/>
+      <parameter type-id='type-id-300' 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-280' name='opt' filepath='src/loadopt.c' line='355' column='1'/>
-      <parameter type-id='type-id-90' name='limit' filepath='src/loadopt.c' line='355' column='1'/>
-      <return type-id='type-id-276'/>
+      <parameter type-id='type-id-299' 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'/>
     </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-279'/>
+      <return type-id='type-id-298'/>
     </function-decl>
-    <function-decl name='fclose' filepath='/usr/include/stdio.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-18'/>
+    <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'/>
+      <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fread' filepath='/usr/include/stdio.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fread' filepath='/usr/include/stdio.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-118'/>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-87'/>
-    </function-decl>
-    <function-decl name='fileno' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-18'/>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-89'/>
+      <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-17'/>
+    <function-decl name='fileno' filepath='/usr/include/stdio.h' line='867' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-88'/>
+      <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='path-helpers.c' comp-dir-path='src' language='LANG_C11'>
-    <function-decl name='strcspn' filepath='/usr/include/string.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-87'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
+    <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'/>
+      <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/src/libefisec.abixml b/src/libefisec.abixml
index eb5d7b9a..1c50d1ef 100644
--- a/src/libefisec.abixml
+++ b/src/libefisec.abixml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='libefisec.so' architecture='elf-amd-x86_64' soname='libefisec.so.1'>
+<abi-corpus version='2.1' path='libefisec.so' architecture='elf-amd-x86_64' soname='libefisec.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -16,143 +16,114 @@
     <elf-symbol name='efi_secdb_algs_' size='576' version='LIBEFISEC_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='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'>
+      <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'>
+      <parameter type-id='type-id-4'/>
+      <parameter type-id='type-id-4'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-4'/>
+      <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'>
+      <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'>
+      <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'>
+      <parameter type-id='type-id-7'/>
+      <return type-id='type-id-3'/>
+    </function-decl>
     <function-decl name='warnx' filepath='/usr/include/err.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-4'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-2'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <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-8'/>
+    </function-decl>
+    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-3'/>
+    </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-9'/>
+      <parameter type-id='type-id-10'/>
+      <parameter is-variadic='yes'/>
+      <return type-id='type-id-3'/>
+    </function-decl>
+    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-3'/>
+    </function-decl>
+    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-13'/>
+    </function-decl>
+    <function-decl name='free' filepath='/usr/include/stdlib.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-13'/>
+    </function-decl>
+    <function-decl name='memcmp' filepath='/usr/include/string.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-3'/>
+    </function-decl>
+    <function-decl name='strlen' filepath='/usr/include/string.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-4'/>
+      <return type-id='type-id-12'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='sec.c' comp-dir-path='src' language='LANG_C11'>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3'/>
-    <type-decl name='int' size-in-bits='32' id='type-id-4'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-5'/>
-    <typedef-decl name='uint32_t' type-id='type-id-6' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-7'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-5' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-6'/>
-    <typedef-decl name='DIR' type-id='type-id-3' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-8'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-9'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-3'/>
+    <typedef-decl name='DIR' type-id='type-id-14' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-15'/>
+    <typedef-decl name='__uint32_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-17'/>
+    <typedef-decl name='uint32_t' type-id='type-id-17' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-18'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-7'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-14'/>
     <function-decl name='efi_get_libefisec_version' mangled-name='efi_get_libefisec_version' filepath='src/sec.c' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_libefisec_version@@LIBEFISEC_1.38'>
-      <return type-id='type-id-7'/>
-    </function-decl>
-    <function-decl name='closedir' filepath='/usr/include/dirent.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-4'/>
+      <return type-id='type-id-18'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='secdb.c' comp-dir-path='src' language='LANG_C11'>
-    <type-decl name='bool' size-in-bits='8' id='type-id-10'/>
-    <type-decl name='char' size-in-bits='8' id='type-id-11'/>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8' id='type-id-12'>
-      <subrange length='1' type-id='type-id-13' id='type-id-14'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='160' id='type-id-15'>
-      <subrange length='20' type-id='type-id-13' id='type-id-16'/>
-    </array-type-def>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-17'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-18'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-19'/>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-20'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-5' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-5' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-21' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-21' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='esl_iter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-22'/>
-    <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='4608' id='type-id-24'>
-      <subrange length='12' type-id='type-id-13' id='type-id-25'/>
-    </array-type-def>
-    <type-decl name='long int' size-in-bits='64' id='type-id-26'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-27'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-28'/>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='160' id='type-id-30'>
-      <subrange length='20' type-id='type-id-13' id='type-id-16'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='2048' id='type-id-31'>
-      <subrange length='256' type-id='type-id-13' id='type-id-32'/>
+    <type-decl name='bool' size-in-bits='8' id='type-id-19'/>
+    <type-decl name='char' size-in-bits='8' id='type-id-20'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='8' id='type-id-21'>
+      <subrange length='1' type-id='type-id-22' id='type-id-23'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='224' id='type-id-33'>
-      <subrange length='28' type-id='type-id-13' id='type-id-34'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='160' id='type-id-24'>
+      <subrange length='20' type-id='type-id-22' id='type-id-25'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='256' id='type-id-35'>
-      <subrange length='32' type-id='type-id-13' id='type-id-36'/>
+    <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>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='384' id='type-id-37'>
-      <subrange length='48' type-id='type-id-13' id='type-id-38'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='512' id='type-id-39'>
-      <subrange length='64' type-id='type-id-13' id='type-id-40'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='48' id='type-id-41'>
-      <subrange length='6' type-id='type-id-13' id='type-id-42'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='infinite' id='type-id-43'>
-      <subrange length='infinite' type-id='type-id-13' id='type-id-44'/>
-    </array-type-def>
-    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-45'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-46'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-13'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-47'/>
-    <type-decl name='variadic parameter type' id='type-id-48'/>
-    <type-decl name='void' id='type-id-2'/>
-    <typedef-decl name='esl_iter' type-id='type-id-22' filepath='src/esl-iter.h' line='13' column='1' id='type-id-49'/>
-    <enum-decl name='esl_iter_status' filepath='src/esl-iter.h' line='35' column='1' id='type-id-50'>
-      <underlying-type type-id='type-id-45'/>
-      <enumerator name='ESL_ITER_ERROR' value='-1'/>
-      <enumerator name='ESL_ITER_DONE' value='0'/>
-      <enumerator name='ESL_ITER_NEW_DATA' value='1'/>
-      <enumerator name='ESL_ITER_NEW_LIST' value='2'/>
+    <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'>
+      <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>
-    <typedef-decl name='esl_iter_status_t' type-id='type-id-50' filepath='src/esl-iter.h' line='40' column='1' id='type-id-51'/>
-    <typedef-decl name='efi_secdb_t' type-id='type-id-52' filepath='src/include/efivar/efisec-secdb.h' line='10' column='1' id='type-id-53'/>
-    <union-decl name='efi_secdb_data_t' size-in-bits='2048' naming-typedef-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='12' column='1' id='type-id-55'>
-      <data-member access='public'>
-        <var-decl name='sha1' type-id='type-id-56' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='13' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='sha224' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='14' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='sha256' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='15' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='sha384' type-id='type-id-59' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='16' 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'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='rsa2048' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='18' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='rsa2048_sha1' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='19' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='rsa2048_sha256' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='20' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='x509_sha256_t' type-id='type-id-62' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='21' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='x509_sha384_t' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='22' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='x509_sha512_t' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='23' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='raw' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efisec-secdb.h' line='24' column='1'/>
-      </data-member>
-    </union-decl>
-    <typedef-decl name='efi_secdb_data_t' type-id='type-id-55' filepath='src/include/efivar/efisec-secdb.h' line='25' column='1' id='type-id-54'/>
-    <enum-decl name='efi_secdb_type_t' naming-typedef-id='type-id-65' filepath='src/include/efivar/efisec-secdb.h' line='27' column='1' id='type-id-66'>
-      <underlying-type type-id='type-id-45'/>
+    <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'>
+      <underlying-type type-id='type-id-31'/>
       <enumerator name='X509_CERT' value='0'/>
       <enumerator name='X509_SHA256' value='1'/>
       <enumerator name='SHA256' value='2'/>
@@ -167,485 +138,511 @@
       <enumerator name='RSA2048_SHA256' value='11'/>
       <enumerator name='MAX_SECDB_TYPE' value='12'/>
     </enum-decl>
-    <typedef-decl name='efi_secdb_type_t' type-id='type-id-66' filepath='src/include/efivar/efisec-secdb.h' line='41' column='1' id='type-id-65'/>
-    <enum-decl name='efi_secdb_flag_t' naming-typedef-id='type-id-67' filepath='src/include/efivar/efisec-secdb.h' line='43' column='1' id='type-id-68'>
-      <underlying-type type-id='type-id-45'/>
-      <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 name='esl_iter_status' filepath='src/esl-iter.h' line='35' column='1' id='type-id-34'>
+      <underlying-type type-id='type-id-31'/>
+      <enumerator name='ESL_ITER_ERROR' value='-1'/>
+      <enumerator name='ESL_ITER_DONE' value='0'/>
+      <enumerator name='ESL_ITER_NEW_DATA' value='1'/>
+      <enumerator name='ESL_ITER_NEW_LIST' value='2'/>
     </enum-decl>
-    <typedef-decl name='efi_secdb_flag_t' type-id='type-id-68' filepath='src/include/efivar/efisec-secdb.h' line='47' column='1' id='type-id-67'/>
-    <typedef-decl name='efi_sha1_hash_t' type-id='type-id-30' filepath='src/include/efivar/efisec-types.h' line='17' column='1' id='type-id-56'/>
-    <typedef-decl name='efi_sha224_hash_t' type-id='type-id-33' filepath='src/include/efivar/efisec-types.h' line='18' column='1' id='type-id-57'/>
-    <typedef-decl name='efi_sha256_hash_t' type-id='type-id-35' filepath='src/include/efivar/efisec-types.h' line='19' column='1' id='type-id-58'/>
-    <typedef-decl name='efi_sha384_hash_t' type-id='type-id-37' filepath='src/include/efivar/efisec-types.h' line='20' column='1' id='type-id-59'/>
-    <typedef-decl name='efi_sha512_hash_t' type-id='type-id-39' filepath='src/include/efivar/efisec-types.h' line='21' column='1' id='type-id-60'/>
-    <typedef-decl name='efi_rsa2048_sig_t' type-id='type-id-31' filepath='src/include/efivar/efisec-types.h' line='22' column='1' id='type-id-61'/>
-    <class-decl name='efi_cert_x509_sha256_t' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-62' visibility='default' filepath='src/include/efivar/efisec-types.h' line='35' column='1' id='type-id-69'>
+    <enum-decl name='secdb_entry_class_t' naming-typedef-id='type-id-35' filepath='src/secdb.h' line='13' column='1' id='type-id-36'>
+      <underlying-type type-id='type-id-31'/>
+      <enumerator name='BAD' value='0'/>
+      <enumerator name='HASH' value='1'/>
+      <enumerator name='SIGNATURE' value='2'/>
+      <enumerator name='CERTIFICATE_HASH' value='3'/>
+      <enumerator name='CERTIFICATE' value='4'/>
+    </enum-decl>
+    <type-decl name='long int' size-in-bits='64' id='type-id-37'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-38'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-39'/>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-40'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='to_be_signed_hash' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efisec-types.h' line='36' column='1'/>
+        <var-decl name='_flags' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='_IO_read_ptr' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='_IO_read_end' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='_IO_read_base' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='time_of_revocation' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efisec-types.h' line='37' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_cert_x509_sha256_t' type-id='type-id-69' filepath='src/include/efivar/efisec-types.h' line='38' column='1' id='type-id-62'/>
-    <class-decl name='efi_cert_x509_sha384_t' size-in-bits='512' is-struct='yes' naming-typedef-id='type-id-63' visibility='default' filepath='src/include/efivar/efisec-types.h' line='40' column='1' id='type-id-71'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='to_be_signed_hash' type-id='type-id-59' visibility='default' filepath='src/include/efivar/efisec-types.h' line='41' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='_IO_write_ptr' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='time_of_revocation' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efisec-types.h' line='42' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_cert_x509_sha384_t' type-id='type-id-71' filepath='src/include/efivar/efisec-types.h' line='43' column='1' id='type-id-63'/>
-    <class-decl name='efi_cert_x509_sha512_t' size-in-bits='640' is-struct='yes' naming-typedef-id='type-id-64' visibility='default' filepath='src/include/efivar/efisec-types.h' line='45' column='1' id='type-id-72'>
-      <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'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='_IO_buf_base' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='time_of_revocation' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efisec-types.h' line='47' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_cert_x509_sha512_t' type-id='type-id-72' filepath='src/include/efivar/efisec-types.h' line='48' column='1' id='type-id-64'/>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-74'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-7' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='_IO_save_base' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='_IO_backup_base' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='_IO_save_end' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='_markers' type-id='type-id-42' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-41' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='_chain' type-id='type-id-43' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_guid_t' type-id='type-id-74' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-73'/>
-    <class-decl name='efi_time_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-types.h' line='69' column='1' id='type-id-76'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='year' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-types.h' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='_fileno' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='month' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='71' column='1'/>
+      <data-member access='public' layout-offset-in-bits='928'>
+        <var-decl name='_flags2' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='day' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='72' column='1'/>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='_old_offset' type-id='type-id-44' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hour' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='73' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='_cur_column' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='minute' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='74' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1040'>
+        <var-decl name='_vtable_offset' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='second' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='75' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1048'>
+        <var-decl name='_shortbuf' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='79' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='pad1' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='76' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='_lock' type-id='type-id-46' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nanosecond' type-id='type-id-7' visibility='default' filepath='src/include/efivar/efivar-types.h' line='77' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='_offset' type-id='type-id-47' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='89' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='timezone' type-id='type-id-77' visibility='default' filepath='src/include/efivar/efivar-types.h' line='78' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='_codecvt' type-id='type-id-48' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='daylight' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='79' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='_wide_data' type-id='type-id-49' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='120'>
-        <var-decl name='pad2' type-id='type-id-29' visibility='default' filepath='src/include/efivar/efivar-types.h' line='80' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='_freeres_list' type-id='type-id-43' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_time_t' type-id='type-id-76' filepath='src/include/efivar/efivar-types.h' line='81' column='1' id='type-id-70'/>
-    <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-78'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-79' visibility='default' filepath='src/list.h' line='18' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='_freeres_buf' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-79' visibility='default' filepath='src/list.h' line='19' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='__pad5' type-id='type-id-12' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='_mode' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1568'>
+        <var-decl name='_unused2' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='98' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='list_t' type-id='type-id-78' filepath='src/list.h' line='22' column='1' id='type-id-80'/>
-    <enum-decl name='secdb_entry_class_t' naming-typedef-id='type-id-81' filepath='src/secdb.h' line='13' column='1' id='type-id-82'>
-      <underlying-type type-id='type-id-45'/>
-      <enumerator name='BAD' value='0'/>
-      <enumerator name='HASH' value='1'/>
-      <enumerator name='SIGNATURE' value='2'/>
-      <enumerator name='CERTIFICATE_HASH' value='3'/>
-      <enumerator name='CERTIFICATE' value='4'/>
-    </enum-decl>
-    <typedef-decl name='secdb_entry_class_t' type-id='type-id-82' filepath='src/secdb.h' line='19' column='1' id='type-id-81'/>
-    <class-decl name='secdb_alg_t' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-83' visibility='default' filepath='src/secdb.h' line='21' column='1' id='type-id-84'>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-50'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='class' type-id='type-id-85' visibility='default' filepath='src/secdb.h' line='22' column='1'/>
+        <var-decl name='gp_offset' type-id='type-id-16' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='fp_offset' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-86' visibility='default' filepath='src/secdb.h' line='23' column='1'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-13' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='guid' type-id='type-id-87' visibility='default' filepath='src/secdb.h' line='24' column='1'/>
+        <var-decl name='reg_save_area' type-id='type-id-13' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='header_size' type-id='type-id-88' visibility='default' filepath='src/secdb.h' line='25' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='has_owner' type-id='type-id-89' visibility='default' filepath='src/secdb.h' line='26' column='1'/>
+        <var-decl name='time_of_revocation' type-id='type-id-54' visibility='default' filepath='src/include/efivar/efisec-types.h' line='37' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='size' type-id='type-id-88' visibility='default' filepath='src/secdb.h' line='27' column='1'/>
+    </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'>
+      <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'/>
+      </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'/>
+      </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'>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='secdb_alg_t' type-id='type-id-84' filepath='src/secdb.h' line='28' column='1' id='type-id-83'/>
-    <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-52'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='list' type-id='type-id-80' visibility='default' filepath='src/secdb.h' line='44' column='1'/>
+        <var-decl name='a' type-id='type-id-18' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' 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'/>
+      </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'/>
+      </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'/>
+      </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'/>
+      </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'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='list' type-id='type-id-66' visibility='default' filepath='src/secdb.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-90' visibility='default' filepath='src/secdb.h' line='46' column='1'/>
+        <var-decl name='flags' type-id='type-id-67' visibility='default' filepath='src/secdb.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='algorithm' type-id='type-id-65' visibility='default' filepath='src/secdb.h' line='47' column='1'/>
+        <var-decl name='algorithm' type-id='type-id-32' visibility='default' filepath='src/secdb.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='listsz' type-id='type-id-7' visibility='default' filepath='src/secdb.h' line='48' column='1'/>
+        <var-decl name='listsz' type-id='type-id-18' visibility='default' filepath='src/secdb.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='hdrsz' type-id='type-id-7' visibility='default' filepath='src/secdb.h' line='49' column='1'/>
+        <var-decl name='hdrsz' type-id='type-id-18' visibility='default' filepath='src/secdb.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='sigsz' type-id='type-id-7' visibility='default' filepath='src/secdb.h' line='50' column='1'/>
+        <var-decl name='sigsz' type-id='type-id-18' visibility='default' filepath='src/secdb.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nsigs' type-id='type-id-91' visibility='default' filepath='src/secdb.h' line='51' column='1'/>
+        <var-decl name='nsigs' type-id='type-id-12' visibility='default' filepath='src/secdb.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='header' type-id='type-id-21' visibility='default' filepath='src/secdb.h' line='52' column='1'/>
+        <var-decl name='header' type-id='type-id-13' visibility='default' filepath='src/secdb.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='entries' type-id='type-id-80' visibility='default' filepath='src/secdb.h' line='53' column='1'/>
+        <var-decl name='entries' type-id='type-id-66' visibility='default' filepath='src/secdb.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='int16_t' type-id='type-id-92' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-77'/>
-    <typedef-decl name='uint8_t' type-id='type-id-93' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-29'/>
-    <typedef-decl name='uint16_t' type-id='type-id-94' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-75'/>
-    <typedef-decl name='uint64_t' type-id='type-id-95' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-90'/>
-    <typedef-decl name='__uint8_t' type-id='type-id-46' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-93'/>
-    <typedef-decl name='__int16_t' type-id='type-id-27' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-92'/>
-    <typedef-decl name='__uint16_t' type-id='type-id-47' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-94'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-95'/>
-    <typedef-decl name='__off_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-96'/>
-    <typedef-decl name='__off64_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-97'/>
-    <typedef-decl name='FILE' type-id='type-id-98' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-99'/>
-    <typedef-decl name='_IO_lock_t' type-id='type-id-2' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-100'/>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-98'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_flags' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
+        <var-decl name='year' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='70' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-101' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
+    </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'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='next' type-id='type-id-72' visibility='default' filepath='src/list.h' line='18' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-102' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='prev' type-id='type-id-72' visibility='default' filepath='src/list.h' line='19' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='_chain' type-id='type-id-103' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
+    </class-decl>
+    <class-decl name='secdb_alg_t' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-73' visibility='default' filepath='src/secdb.h' line='21' column='1' id='type-id-74'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='class' type-id='type-id-75' visibility='default' filepath='src/secdb.h' line='22' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='_fileno' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='name' type-id='type-id-76' visibility='default' filepath='src/secdb.h' line='23' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='_flags2' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='guid' type-id='type-id-2' visibility='default' filepath='src/secdb.h' line='24' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='_old_offset' type-id='type-id-96' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='header_size' type-id='type-id-77' visibility='default' filepath='src/secdb.h' line='25' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-47' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='has_owner' type-id='type-id-78' visibility='default' filepath='src/secdb.h' line='26' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='size' type-id='type-id-77' visibility='default' filepath='src/secdb.h' line='27' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1048'>
-        <var-decl name='_shortbuf' type-id='type-id-12' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='79' column='1'/>
+    </class-decl>
+    <typedef-decl name='FILE' type-id='type-id-40' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-79'/>
+    <typedef-decl name='_IO_lock_t' type-id='type-id-5' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-80'/>
+    <typedef-decl name='__compar_d_fn_t' type-id='type-id-81' filepath='/usr/include/stdlib.h' line='955' column='1' id='type-id-82'/>
+    <typedef-decl name='__int16_t' type-id='type-id-38' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-83'/>
+    <typedef-decl name='__off64_t' type-id='type-id-37' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-47'/>
+    <typedef-decl name='__off_t' type-id='type-id-37' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-44'/>
+    <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='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'/>
+    <typedef-decl name='intptr_t' type-id='type-id-37' filepath='/usr/include/stdint.h' line='87' column='1' id='type-id-103'/>
+    <typedef-decl name='list_t' type-id='type-id-71' filepath='src/list.h' line='22' column='1' id='type-id-66'/>
+    <typedef-decl name='secdb_alg_t' type-id='type-id-74' filepath='src/secdb.h' line='28' column='1' id='type-id-73'/>
+    <typedef-decl name='secdb_entry_class_t' type-id='type-id-36' filepath='src/secdb.h' line='19' column='1' id='type-id-35'/>
+    <typedef-decl name='size_t' type-id='type-id-22' filepath='/usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h' line='214' column='1' id='type-id-12'/>
+    <typedef-decl name='uint16_t' type-id='type-id-84' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-63'/>
+    <typedef-decl name='uint64_t' type-id='type-id-85' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-67'/>
+    <typedef-decl name='uint8_t' type-id='type-id-87' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-69'/>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='160' id='type-id-93'>
+      <subrange length='20' type-id='type-id-22' id='type-id-25'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='2048' id='type-id-88'>
+      <subrange length='256' type-id='type-id-22' id='type-id-104'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='224' id='type-id-95'>
+      <subrange length='28' type-id='type-id-22' id='type-id-105'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='256' id='type-id-97'>
+      <subrange length='32' type-id='type-id-22' id='type-id-106'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='384' id='type-id-98'>
+      <subrange length='48' type-id='type-id-22' id='type-id-107'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='512' id='type-id-99'>
+      <subrange length='64' type-id='type-id-22' id='type-id-108'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='48' id='type-id-64'>
+      <subrange length='6' type-id='type-id-22' id='type-id-109'/>
+    </array-type-def>
+    <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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='_lock' type-id='type-id-104' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='_offset' type-id='type-id-97' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='89' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='_codecvt' type-id='type-id-105' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='_wide_data' type-id='type-id-106' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='_freeres_list' type-id='type-id-103' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='_freeres_buf' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-91' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='_mode' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='_unused2' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='98' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='intptr_t' type-id='type-id-26' filepath='/usr/include/stdint.h' line='87' column='1' id='type-id-107'/>
-    <typedef-decl name='__compar_d_fn_t' type-id='type-id-108' filepath='/usr/include/stdlib.h' line='821' column='1' id='type-id-109'/>
-    <typedef-decl name='size_t' type-id='type-id-13' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='209' column='1' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-110'/>
-    <qualified-type-def type-id='type-id-110' restrict='yes' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-103'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-101'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-113'/>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-89'/>
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-1'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-86'/>
-    <qualified-type-def type-id='type-id-1' restrict='yes' id='type-id-115'/>
-    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-87'/>
-    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-23'/>
-    <qualified-type-def type-id='type-id-81' const='yes' id='type-id-85'/>
-    <qualified-type-def type-id='type-id-91' const='yes' id='type-id-88'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-79'/>
-    <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-125'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-126'/>
+      <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'/>
+      </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'/>
+      </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'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-86'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-22'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-45'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-6'/>
+    <qualified-type-def type-id='type-id-6' restrict='yes' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-43'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-48'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-46'/>
+    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-42'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-49'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-11'/>
+    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-115'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-78'/>
+    <qualified-type-def type-id='type-id-20' const='yes' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-4'/>
+    <qualified-type-def type-id='type-id-4' const='yes' id='type-id-76'/>
+    <qualified-type-def type-id='type-id-4' restrict='yes' id='type-id-10'/>
+    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-2'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-26'/>
+    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-77'/>
+    <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-120'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-122'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-8'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-125'/>
+    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-126'/>
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-21'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-128'/>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-17'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-18'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-19'/>
-    <class-decl name='esl_iter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-128'/>
+    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-112'/>
+    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-113'/>
+    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-114'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
+    <class-decl name='esl_iter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-100'/>
+    <type-decl name='variadic parameter type' id='type-id-130'/>
+    <type-decl name='void' id='type-id-5'/>
     <function-decl name='esl_iter_new' filepath='src/esl-iter.h' line='23' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-122'/>
+      <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-126'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='esl_iter_end' filepath='src/esl-iter.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-122'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='esl_iter_next' filepath='src/esl-iter.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-117'/>
-      <parameter type-id='type-id-117'/>
+      <parameter type-id='type-id-122'/>
+      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-125'/>
-      <return type-id='type-id-51'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='esl_iter_next_with_size_correction' filepath='src/esl-iter.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-117'/>
-      <parameter type-id='type-id-117'/>
+      <parameter type-id='type-id-122'/>
+      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-125'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-19'/>
+      <return type-id='type-id-3'/>
     </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-121'/>
-      <return type-id='type-id-107'/>
+      <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'>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-113'/>
-      <return type-id='type-id-4'/>
-    </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'>
-      <parameter type-id='type-id-87'/>
-      <parameter type-id='type-id-87'/>
-      <return type-id='type-id-4'/>
-    </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'>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-1'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-4'/>
-    </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'>
-      <parameter type-id='type-id-4'/>
-      <return type-id='type-id-2'/>
-    </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'>
-      <return type-id='type-id-110'/>
+      <parameter type-id='type-id-2'/>
+      <parameter type-id='type-id-115'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_new' mangled-name='efi_secdb_new' filepath='src/secdb.c' line='15' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_new@@LIBEFISEC_1.38'>
-      <return type-id='type-id-119'/>
+      <return type-id='type-id-120'/>
     </function-decl>
     <function-decl name='efi_secdb_del_entry' mangled-name='efi_secdb_del_entry' filepath='src/secdb.c' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_del_entry@@LIBEFISEC_1.38'>
-      <parameter type-id='type-id-119' name='top' filepath='src/secdb.c' line='132' column='1'/>
-      <parameter type-id='type-id-87' name='owner' filepath='src/secdb.c' line='133' column='1'/>
-      <parameter type-id='type-id-65' name='algorithm' filepath='src/secdb.c' line='134' column='1'/>
-      <parameter type-id='type-id-118' name='data' filepath='src/secdb.c' line='135' column='1'/>
-      <parameter type-id='type-id-91' name='datasz' filepath='src/secdb.c' line='136' column='1'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-120' name='top' filepath='src/secdb.c' line='132' column='1'/>
+      <parameter type-id='type-id-2' name='owner' filepath='src/secdb.c' line='133' column='1'/>
+      <parameter type-id='type-id-32' name='algorithm' filepath='src/secdb.c' line='134' column='1'/>
+      <parameter type-id='type-id-119' name='data' filepath='src/secdb.c' line='135' column='1'/>
+      <parameter type-id='type-id-12' name='datasz' filepath='src/secdb.c' line='136' column='1'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_add_entry' mangled-name='efi_secdb_add_entry' filepath='src/secdb.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_add_entry@@LIBEFISEC_1.38'>
-      <parameter type-id='type-id-119' name='top' filepath='src/secdb.c' line='289' column='1'/>
-      <parameter type-id='type-id-87' name='owner' filepath='src/secdb.c' line='290' column='1'/>
-      <parameter type-id='type-id-65' name='algorithm' filepath='src/secdb.c' line='291' column='1'/>
-      <parameter type-id='type-id-118' name='data' filepath='src/secdb.c' line='292' column='1'/>
-      <parameter type-id='type-id-91' name='datasz' filepath='src/secdb.c' line='293' column='1'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-120' name='top' filepath='src/secdb.c' line='289' column='1'/>
+      <parameter type-id='type-id-2' name='owner' filepath='src/secdb.c' line='290' column='1'/>
+      <parameter type-id='type-id-32' name='algorithm' filepath='src/secdb.c' line='291' column='1'/>
+      <parameter type-id='type-id-119' name='data' filepath='src/secdb.c' line='292' column='1'/>
+      <parameter type-id='type-id-12' name='datasz' filepath='src/secdb.c' line='293' column='1'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_set_bool' mangled-name='efi_secdb_set_bool' filepath='src/secdb.c' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_set_bool@@LIBEFISEC_1.38'>
-      <parameter type-id='type-id-119' name='secdb' filepath='src/secdb.c' line='300' column='1'/>
-      <parameter type-id='type-id-67' name='flag' filepath='src/secdb.c' line='300' column='1'/>
-      <parameter type-id='type-id-10' name='value' filepath='src/secdb.c' line='300' column='1'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-120' name='secdb' filepath='src/secdb.c' line='300' column='1'/>
+      <parameter type-id='type-id-29' name='flag' filepath='src/secdb.c' line='300' column='1'/>
+      <parameter type-id='type-id-19' name='value' filepath='src/secdb.c' line='300' column='1'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_parse' mangled-name='efi_secdb_parse' filepath='src/secdb.c' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_parse@@LIBEFISEC_1.38'>
       <parameter type-id='type-id-126' name='data' filepath='src/secdb.c' line='326' column='1'/>
-      <parameter type-id='type-id-91' name='datasz' filepath='src/secdb.c' line='326' column='1'/>
-      <parameter type-id='type-id-120' name='secdbp' filepath='src/secdb.c' line='326' column='1'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-12' name='datasz' filepath='src/secdb.c' line='326' column='1'/>
+      <parameter type-id='type-id-121' name='secdbp' filepath='src/secdb.c' line='326' column='1'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_realize' mangled-name='efi_secdb_realize' filepath='src/secdb.c' line='532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_realize@@LIBEFISEC_1.38'>
-      <parameter type-id='type-id-119' name='secdb' filepath='src/secdb.c' line='532' column='1'/>
+      <parameter type-id='type-id-120' name='secdb' filepath='src/secdb.c' line='532' column='1'/>
       <parameter type-id='type-id-128' name='out' filepath='src/secdb.c' line='532' column='1'/>
       <parameter type-id='type-id-125' name='outsize' filepath='src/secdb.c' line='532' column='1'/>
-      <return type-id='type-id-4'/>
+      <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='efi_secdb_free' mangled-name='efi_secdb_free' filepath='src/secdb.c' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_secdb_free@@LIBEFISEC_1.38'>
-      <parameter type-id='type-id-119' name='top' filepath='src/secdb.c' line='585' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <var-decl name='efi_secdb_algs_' type-id='type-id-24' mangled-name='efi_secdb_algs_' visibility='default' filepath='src/secdb.h' line='62' column='1' elf-symbol-id='efi_secdb_algs_@@LIBEFISEC_1.38'/>
-    <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-124'/>
-    </function-decl>
-    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-110'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
-    <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-115'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
-    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-111'/>
-      <parameter type-id='type-id-115'/>
-      <parameter type-id='type-id-112'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
-    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-91'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='free' filepath='/usr/include/stdlib.h' line='554' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <function-decl name='qsort_r' filepath='/usr/include/stdlib.h' line='839' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-91'/>
-      <parameter type-id='type-id-91'/>
-      <parameter type-id='type-id-109'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-2'/>
+      <parameter type-id='type-id-120' name='top' filepath='src/secdb.c' line='585' column='1'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <var-decl name='efi_secdb_algs_' type-id='type-id-27' mangled-name='efi_secdb_algs_' visibility='default' filepath='src/secdb.h' line='62' column='1' elf-symbol-id='efi_secdb_algs_@@LIBEFISEC_1.38'/>
+    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-13'/>
+    </function-decl>
+    <function-decl name='qsort_r' filepath='/usr/include/stdlib.h' line='973' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-82'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='memcpy' filepath='/usr/include/string.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='memcmp' filepath='/usr/include/string.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-91'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
-    <function-decl name='strlen' filepath='/usr/include/string.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-91'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-123'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-4'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-13'/>
+    </function-decl>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-3'/>
     </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-91' visibility='default' filepath='src/util.h' line='205' column='1'/>
+    <var-decl name='page_size' type-id='type-id-12' visibility='default' filepath='src/util.h' line='205' 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-4'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-37'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/src/libefivar.abixml b/src/libefivar.abixml
index 64379078..1e1580b2 100644
--- a/src/libefivar.abixml
+++ b/src/libefivar.abixml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='libefivar.so' architecture='elf-amd-x86_64' soname='libefivar.so.1'>
+<abi-corpus version='2.1' path='libefivar.so' architecture='elf-amd-x86_64' soname='libefivar.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
@@ -134,2432 +134,2425 @@
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-5'>
       <subrange length='20' type-id='type-id-3' id='type-id-6'/>
     </array-type-def>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-7'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-8'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-9'/>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-10'>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-7'/>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-8'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-11' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-11' visibility='default'/>
+        <var-decl name='_flags' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-12' visibility='default'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-12' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-13'/>
-    <typedef-decl name='__off_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-15'/>
-    <typedef-decl name='__off64_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-16'/>
-    <typedef-decl name='FILE' type-id='type-id-17' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-18'/>
-    <typedef-decl name='_IO_lock_t' type-id='type-id-19' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-20'/>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='49' column='1' id='type-id-17'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_flags' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
+        <var-decl name='_IO_write_ptr' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
+        <var-decl name='_IO_buf_base' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
+        <var-decl name='_IO_save_base' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
+        <var-decl name='_IO_backup_base' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
+        <var-decl name='_IO_save_end' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-23' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
+        <var-decl name='_markers' type-id='type-id-11' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='_chain' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
+        <var-decl name='_chain' type-id='type-id-12' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='_fileno' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
+        <var-decl name='_fileno' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='_flags2' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
+        <var-decl name='_flags2' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='_old_offset' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
+        <var-decl name='_old_offset' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
+        <var-decl name='_cur_column' type-id='type-id-14' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
+        <var-decl name='_vtable_offset' type-id='type-id-7' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1048'>
         <var-decl name='_shortbuf' type-id='type-id-2' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='_lock' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
+        <var-decl name='_lock' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='81' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <var-decl name='_offset' type-id='type-id-16' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='_codecvt' type-id='type-id-27' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
+        <var-decl name='_codecvt' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='_wide_data' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
+        <var-decl name='_wide_data' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='_freeres_list' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
+        <var-decl name='_freeres_list' type-id='type-id-12' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='_freeres_buf' type-id='type-id-12' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
+        <var-decl name='_freeres_buf' type-id='type-id-19' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-29' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+        <var-decl name='__pad5' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='_mode' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
+        <var-decl name='_mode' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
         <var-decl name='_unused2' type-id='type-id-5' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='98' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-30'/>
-    <qualified-type-def type-id='type-id-30' restrict='yes' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-26'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-23'/>
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-28'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-32'/>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-21'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='gp_offset' type-id='type-id-22' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='fp_offset' type-id='type-id-22' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='overflow_arg_area' type-id='type-id-19' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='reg_save_area' type-id='type-id-19' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='FILE' type-id='type-id-8' filepath='/usr/include/bits/types/FILE.h' line='7' column='1' id='type-id-23'/>
+    <typedef-decl name='_IO_lock_t' type-id='type-id-24' filepath='/usr/include/bits/types/struct_FILE.h' line='43' column='1' id='type-id-25'/>
+    <typedef-decl name='__off64_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-16'/>
+    <typedef-decl name='__off_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-27'/>
+    <qualified-type-def type-id='type-id-27' restrict='yes' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-12'/>
+    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-15'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-11'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-32'/>
     <qualified-type-def type-id='type-id-33' restrict='yes' id='type-id-34'/>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-7'/>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-8'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-9'/>
+    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-29'/>
+    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-30'/>
+    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-31'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-35'/>
     <function-decl name='efidp_make_acpi_hid' mangled-name='efidp_make_acpi_hid' filepath='src/dp-acpi.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp-acpi.c' line='268' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-acpi.c' line='268' column='1'/>
-      <parameter type-id='type-id-37' name='hid' filepath='src/dp-acpi.c' line='268' column='1'/>
-      <parameter type-id='type-id-37' name='uid' filepath='src/dp-acpi.c' line='268' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-acpi.c' line='268' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-acpi.c' line='268' column='1'/>
+      <parameter type-id='type-id-38' name='hid' filepath='src/dp-acpi.c' line='268' column='1'/>
+      <parameter type-id='type-id-38' name='uid' filepath='src/dp-acpi.c' line='268' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='efidp_make_acpi_hid_ex' mangled-name='efidp_make_acpi_hid_ex' filepath='src/dp-acpi.c' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_acpi_hid_ex@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp-acpi.c' line='288' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-acpi.c' line='288' column='1'/>
-      <parameter type-id='type-id-37' name='hid' filepath='src/dp-acpi.c' line='289' column='1'/>
-      <parameter type-id='type-id-37' name='uid' filepath='src/dp-acpi.c' line='289' column='1'/>
-      <parameter type-id='type-id-37' name='cid' filepath='src/dp-acpi.c' line='289' column='1'/>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-acpi.c' line='288' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-acpi.c' line='288' column='1'/>
+      <parameter type-id='type-id-38' name='hid' filepath='src/dp-acpi.c' line='289' column='1'/>
+      <parameter type-id='type-id-38' name='uid' filepath='src/dp-acpi.c' line='289' column='1'/>
+      <parameter type-id='type-id-38' name='cid' filepath='src/dp-acpi.c' line='289' column='1'/>
       <parameter type-id='type-id-33' name='hidstr' filepath='src/dp-acpi.c' line='290' column='1'/>
       <parameter type-id='type-id-33' name='uidstr' filepath='src/dp-acpi.c' line='290' column='1'/>
       <parameter type-id='type-id-33' name='cidstr' filepath='src/dp-acpi.c' line='291' column='1'/>
-      <return type-id='type-id-36'/>
+      <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='efi_set_loglevel' mangled-name='efi_set_loglevel' filepath='src/include/efivar/efivar.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_set_loglevel@@LIBEFIVAR_1.38'>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-19'/>
+    <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'>
+      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-37'/>
+      <parameter type-id='type-id-39'/>
+      <parameter type-id='type-id-39'/>
+      <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'>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-33'/>
+      <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'>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='efi_get_logfile' mangled-name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_logfile@@LIBEFIVAR_1.36'>
-      <return type-id='type-id-30'/>
+    <function-decl name='efi_get_logfile' filepath='src/include/efivar/efivar.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-21'/>
+    <function-decl name='closedir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-40'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
+    <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-41'/>
+    </function-decl>
+    <function-decl name='fflush' filepath='/usr/include/stdio.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-9'/>
+    </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-28'/>
       <parameter type-id='type-id-34'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
+    <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-34'/>
       <parameter type-id='type-id-32'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strcpy' filepath='/usr/include/string.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-22'/>
+    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-22'/>
+      <parameter is-variadic='yes'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strlen' filepath='/usr/include/string.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strcpy' filepath='/usr/include/string.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-29'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='strnlen' filepath='/usr/include/string.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strlen' filepath='/usr/include/string.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-29'/>
+      <return type-id='type-id-20'/>
+    </function-decl>
+    <function-decl name='strnlen' filepath='/usr/include/string.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-20'/>
     </function-decl>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-25'/>
   </abi-instr>
   <abi-instr address-size='64' path='dp-hw.c' comp-dir-path='src' language='LANG_C11'>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-38'/>
-    <qualified-type-def type-id='type-id-39' const='yes' id='type-id-40'/>
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-44'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-46'/>
     <function-decl name='efidp_make_pci' mangled-name='efidp_make_pci' filepath='src/dp-hw.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_pci@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp-hw.c' line='73' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-hw.c' line='73' column='1'/>
-      <parameter type-id='type-id-42' name='device' filepath='src/dp-hw.c' line='73' column='1'/>
-      <parameter type-id='type-id-42' name='function' filepath='src/dp-hw.c' line='73' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-hw.c' line='73' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-hw.c' line='73' column='1'/>
+      <parameter type-id='type-id-39' name='device' filepath='src/dp-hw.c' line='73' column='1'/>
+      <parameter type-id='type-id-39' name='function' filepath='src/dp-hw.c' line='73' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='efidp_make_edd10' mangled-name='efidp_make_edd10' filepath='src/dp-hw.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_edd10@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp-hw.c' line='92' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-hw.c' line='92' column='1'/>
-      <parameter type-id='type-id-37' name='hardware_device' filepath='src/dp-hw.c' line='92' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp-hw.c' line='92' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp-hw.c' line='92' column='1'/>
+      <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' mangled-name='efi_guid_to_str' filepath='src/include/efivar/efivar.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_str@@libefivar.so.0'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-38'/>
-      <return type-id='type-id-21'/>
+    <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'>
+      <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'>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_guid_cmp' mangled-name='efi_guid_cmp' filepath='src/include/efivar/efivar.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_cmp@@LIBEFIVAR_0.24'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-21'/>
+    <function-decl name='free' filepath='/usr/include/stdlib.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-19'/>
+      <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='free' filepath='/usr/include/stdlib.h' line='554' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
+    <function-decl name='memcpy' filepath='/usr/include/string.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
       <return type-id='type-id-19'/>
     </function-decl>
   </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-35' name='buf' filepath='src/dp-media.c' line='142' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-media.c' line='142' column='1'/>
-      <parameter type-id='type-id-22' name='filepath' filepath='src/dp-media.c' line='142' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-37' name='num' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-43' name='part_start' filepath='src/dp-media.c' line='170' column='1'/>
-      <parameter type-id='type-id-43' name='part_size' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-35' name='signature' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-42' name='format' filepath='src/dp-media.c' line='171' column='1'/>
-      <parameter type-id='type-id-42' name='signature_type' filepath='src/dp-media.c' line='172' column='1'/>
-      <return type-id='type-id-36'/>
-    </function-decl>
-    <function-decl name='efi_guid_is_zero' mangled-name='efi_guid_is_empty' filepath='src/include/efivar/efivar.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_is_empty@@libefivar.so.0'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-12'/>
+      <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'/>
+      <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'>
+      <parameter type-id='type-id-45'/>
+      <return type-id='type-id-9'/>
+    </function-decl>
+    <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='672' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-19'/>
+    </function-decl>
+    <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-19'/>
+    </function-decl>
+    <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-19'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='dp-message.c' comp-dir-path='src' language='LANG_C11'>
-    <type-decl name='short int' size-in-bits='16' id='type-id-44'/>
-    <typedef-decl name='int16_t' type-id='type-id-45' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-46'/>
-    <typedef-decl name='__int16_t' type-id='type-id-44' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-45'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-47'/>
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-49'/>
-    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-50'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-49'/>
+    <typedef-decl name='__int16_t' type-id='type-id-49' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-50'/>
+    <typedef-decl name='int16_t' type-id='type-id-50' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-51'/>
+    <qualified-type-def type-id='type-id-39' const='yes' id='type-id-52'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-53'/>
+    <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-35' name='buf' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-42' name='if_type' filepath='src/dp-message.c' line='621' column='1'/>
-      <parameter type-id='type-id-49' name='mac_addr' filepath='src/dp-message.c' line='622' column='1'/>
-      <parameter type-id='type-id-36' name='mac_addr_size' filepath='src/dp-message.c' line='622' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-37' name='local' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-37' name='remote' filepath='src/dp-message.c' line='642' column='1'/>
-      <parameter type-id='type-id-37' name='gateway' filepath='src/dp-message.c' line='643' column='1'/>
-      <parameter type-id='type-id-37' name='netmask' filepath='src/dp-message.c' line='643' column='1'/>
-      <parameter type-id='type-id-51' name='local_port' filepath='src/dp-message.c' line='644' column='1'/>
-      <parameter type-id='type-id-51' name='remote_port' filepath='src/dp-message.c' line='644' column='1'/>
-      <parameter type-id='type-id-51' name='protocol' filepath='src/dp-message.c' line='645' column='1'/>
-      <parameter type-id='type-id-21' name='is_static' filepath='src/dp-message.c' line='645' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-51' name='target' filepath='src/dp-message.c' line='671' column='1'/>
-      <parameter type-id='type-id-51' name='lun' filepath='src/dp-message.c' line='671' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-37' name='namespace_id' filepath='src/dp-message.c' line='689' column='1'/>
-      <parameter type-id='type-id-35' name='ieee_eui_64' filepath='src/dp-message.c' line='690' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp-message.c' line='715' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='715' column='1'/>
-      <parameter type-id='type-id-51' name='hba_port' filepath='src/dp-message.c' line='715' column='1'/>
-      <parameter type-id='type-id-46' name='port_multiplier_port' filepath='src/dp-message.c' line='716' column='1'/>
-      <parameter type-id='type-id-51' name='lun' filepath='src/dp-message.c' line='716' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-51' name='primary' filepath='src/dp-message.c' line='737' column='1'/>
-      <parameter type-id='type-id-51' name='slave' filepath='src/dp-message.c' line='738' column='1'/>
-      <parameter type-id='type-id-51' name='lun' filepath='src/dp-message.c' line='738' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='760' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='760' column='1'/>
-      <parameter type-id='type-id-43' name='sas_address' filepath='src/dp-message.c' line='760' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='785' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='785' column='1'/>
-      <parameter type-id='type-id-50' name='uuid' filepath='src/dp-message.c' line='785' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-35' name='buf' filepath='src/dp-message.c' line='804' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp-message.c' line='804' column='1'/>
-      <parameter type-id='type-id-37' name='slot_id' filepath='src/dp-message.c' line='804' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <return type-id='type-id-37'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='dp.c' comp-dir-path='src' language='LANG_C11'>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' id='type-id-52'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-53'/>
-    </array-type-def>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-54'/>
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='infinite' id='type-id-56'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-53'/>
-    </array-type-def>
-    <type-decl name='int' size-in-bits='32' id='type-id-21'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-14'/>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='infinite' id='type-id-57'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-53'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='128' id='type-id-58'>
-      <subrange length='4' type-id='type-id-3' id='type-id-59'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='infinite' id='type-id-60'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-53'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='128' id='type-id-61'>
-      <subrange length='2' type-id='type-id-3' id='type-id-62'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' id='type-id-58'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-59'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='128' id='type-id-63'>
-      <subrange length='16' type-id='type-id-3' id='type-id-64'/>
+    <array-type-def dimensions='1' type-id='type-id-60' size-in-bits='infinite' id='type-id-61'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-59'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='256' id='type-id-65'>
-      <subrange length='32' type-id='type-id-3' id='type-id-66'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='32' id='type-id-67'>
-      <subrange length='4' type-id='type-id-3' id='type-id-59'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='48' id='type-id-68'>
-      <subrange length='6' type-id='type-id-3' id='type-id-69'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='64' id='type-id-70'>
-      <subrange length='8' type-id='type-id-3' id='type-id-71'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='infinite' id='type-id-72'>
-      <subrange length='infinite' type-id='type-id-3' id='type-id-53'/>
-    </array-type-def>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-73'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-11'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-25'/>
-    <type-decl name='variadic parameter type' id='type-id-74'/>
-    <type-decl name='void' id='type-id-19'/>
-    <class-decl name='efidp_header' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='23' column='1' id='type-id-76'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
+        <var-decl name='a' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='25' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='26' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_header' type-id='type-id-76' filepath='src/include/efivar/efivar-dp.h' line='27' column='1' id='type-id-75'/>
-    <typedef-decl name='efidp_boolean' type-id='type-id-42' filepath='src/include/efivar/efivar-dp.h' line='30' column='1' id='type-id-77'/>
-    <class-decl name='efidp_pci' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='42' column='1' id='type-id-79'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='43' column='1'/>
+        <var-decl name='addr' type-id='type-id-66' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' 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'>
+      <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'/>
+      </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'>
+      <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='device' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pci' type-id='type-id-79' filepath='src/include/efivar/efivar-dp.h' line='46' column='1' id='type-id-78'/>
-    <class-decl name='efidp_pccard' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='51' column='1' id='type-id-81'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='function' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
+        <var-decl name='adr' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='158' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_pccard' type-id='type-id-81' filepath='src/include/efivar/efivar-dp.h' line='54' column='1' id='type-id-80'/>
-    <class-decl name='efidp_mmio' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='57' column='1' id='type-id-83'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='memory_type' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
+        <var-decl name='hid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='starting_address' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='60' column='1'/>
+        <var-decl name='uid' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='109' 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'>
+      <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'/>
+      </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'/>
+      </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'/>
+      </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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ending_address' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='61' column='1'/>
+        <var-decl name='hidstr' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_mmio' type-id='type-id-83' filepath='src/include/efivar/efivar-dp.h' line='62' column='1' id='type-id-82'/>
-    <class-decl name='efidp_hw_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='65' column='1' id='type-id-85'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
+        <var-decl name='primary' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='68' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hw_vendor' type-id='type-id-85' filepath='src/include/efivar/efivar-dp.h' line='69' column='1' id='type-id-84'/>
-    <class-decl name='efidp_controller' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-86' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='86' column='1' id='type-id-87'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='807' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='controller' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
+        <var-decl name='device_type' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_controller' type-id='type-id-87' filepath='src/include/efivar/efivar-dp.h' line='89' column='1' id='type-id-86'/>
-    <class-decl name='efidp_bmc' size-in-bits='104' is-struct='yes' naming-typedef-id='type-id-88' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='92' column='1' id='type-id-89'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface_type' type-id='type-id-42' 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='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='base_addr' type-id='type-id-43' 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='95' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bmc' type-id='type-id-89' filepath='src/include/efivar/efivar-dp.h' line='96' column='1' id='type-id-88'/>
-    <class-decl name='efidp_acpi_hid' size-in-bits='96' is-struct='yes' naming-typedef-id='type-id-90' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='106' column='1' id='type-id-91'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='666' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='108' column='1'/>
+        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='109' column='1'/>
+    </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'>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid' type-id='type-id-91' filepath='src/include/efivar/efivar-dp.h' line='110' column='1' id='type-id-90'/>
-    <class-decl name='efidp_acpi_hid_ex' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-92' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='115' column='1' id='type-id-93'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='736' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hid' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='117' column='1'/>
+        <var-decl name='boot_catalog_entry' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uid' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='118' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='cid' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='119' column='1'/>
+        <var-decl name='partition_rba' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hidstr' type-id='type-id-52' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='121' column='1'/>
+        <var-decl name='sectors' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_hid_ex' type-id='type-id-93' filepath='src/include/efivar/efivar-dp.h' line='122' column='1' id='type-id-92'/>
-    <class-decl name='efidp_acpi_adr' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-94' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='156' column='1' id='type-id-95'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adr' type-id='type-id-60' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='158' column='1'/>
+        <var-decl name='controller' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='88' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_acpi_adr' type-id='type-id-95' filepath='src/include/efivar/efivar-dp.h' line='159' column='1' id='type-id-94'/>
-    <class-decl name='efidp_atapi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-96' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='317' column='1' id='type-id-97'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='696' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='primary' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='319' column='1'/>
+        <var-decl name='is_ipv6' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='slave' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='320' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='321' column='1'/>
+        <var-decl name='addrs' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_atapi' type-id='type-id-97' filepath='src/include/efivar/efivar-dp.h' line='322' column='1' id='type-id-96'/>
-    <class-decl name='efidp_scsi' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-98' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='327' column='1' id='type-id-99'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='678' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='329' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='lun' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='330' column='1'/>
+        <var-decl name='slot' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_scsi' type-id='type-id-99' filepath='src/include/efivar/efivar-dp.h' line='331' column='1' id='type-id-98'/>
-    <class-decl name='efidp_fc' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-100' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='336' column='1' id='type-id-101'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-37' 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='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-43' 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='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-43' 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='340' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fc' type-id='type-id-101' filepath='src/include/efivar/efivar-dp.h' line='341' column='1' id='type-id-100'/>
-    <class-decl name='efidp_fcex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-102' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='344' column='1' id='type-id-103'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-37' 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='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wwn' type-id='type-id-70' 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='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lun' type-id='type-id-70' 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='348' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_fcex' type-id='type-id-103' filepath='src/include/efivar/efivar-dp.h' line='349' column='1' id='type-id-102'/>
-    <class-decl name='efidp_1394' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='352' 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='754' column='1' id='type-id-105'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='755' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='354' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='355' column='1'/>
+        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_1394' type-id='type-id-105' filepath='src/include/efivar/efivar-dp.h' line='356' column='1' id='type-id-104'/>
-    <class-decl name='efidp_usb' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='359' column='1' id='type-id-107'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='768' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='parent_port' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='interface' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='362' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb' type-id='type-id-107' filepath='src/include/efivar/efivar-dp.h' line='363' column='1' id='type-id-106'/>
-    <class-decl name='efidp_usb_class' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-108' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='366' column='1' id='type-id-109'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='774' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_id' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='product_id' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='369' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='device_class' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='device_subclass' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='371' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='device_protocol' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='372' column='1'/>
+        <var-decl name='pi_info' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_class' type-id='type-id-109' filepath='src/include/efivar/efivar-dp.h' line='373' column='1' id='type-id-108'/>
-    <class-decl name='efidp_usb_wwid' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-110' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='393' column='1' id='type-id-111'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='interface' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='vendor_id' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='396' column='1'/>
+        <var-decl name='partition_number' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='product_id' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='397' column='1'/>
+        <var-decl name='start' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='serial_number' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='398' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_usb_wwid' type-id='type-id-111' filepath='src/include/efivar/efivar-dp.h' line='399' column='1' id='type-id-110'/>
-    <class-decl name='efidp_lun' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-112' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='402' 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='23' column='1' id='type-id-113'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='403' column='1'/>
+        <var-decl name='type' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='24' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lun' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_lun' type-id='type-id-113' filepath='src/include/efivar/efivar-dp.h' line='405' column='1' id='type-id-112'/>
-    <class-decl name='efidp_sata' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='408' 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='65' column='1' id='type-id-115'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hba_port' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='67' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='port_multiplier_port' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='411' 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='412' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sata' type-id='type-id-115' filepath='src/include/efivar/efivar-dp.h' line='413' column='1' id='type-id-114'/>
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='420' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target' type-id='type-id-37' 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='421' column='1'/>
       </data-member>
     </class-decl>
-    <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'/>
-    <class-decl name='efidp_mac_addr' size-in-bits='296' is-struct='yes' naming-typedef-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='425' 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='482' column='1' id='type-id-119'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='483' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_addr' type-id='type-id-65' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
+        <var-decl name='resource_flags' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='if_type' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='428' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_mac_addr' type-id='type-id-119' filepath='src/include/efivar/efivar-dp.h' line='429' column='1' id='type-id-118'/>
-    <class-decl name='efidp_ipv4_addr' size-in-bits='216' is-struct='yes' naming-typedef-id='type-id-120' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='437' column='1' id='type-id-121'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='438' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv4_addr' type-id='type-id-67' 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='439' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='remote_ipv4_addr' type-id='type-id-67' 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='440' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='local_port' type-id='type-id-51' 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='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='remote_port' type-id='type-id-51' 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='442' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='protocol' type-id='type-id-51' 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='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='static_ip_addr' type-id='type-id-77' 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='444' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='gateway' type-id='type-id-67' 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='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='netmask' type-id='type-id-67' 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='446' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ipv4_addr' type-id='type-id-121' filepath='src/include/efivar/efivar-dp.h' line='447' column='1' id='type-id-120'/>
-    <class-decl name='efidp_ipv6_addr' size-in-bits='360' is-struct='yes' naming-typedef-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='459' column='1' id='type-id-123'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='460' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='local_ipv6_addr' type-id='type-id-63' 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='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='remote_ipv6_addr' type-id='type-id-63' 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='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='local_port' type-id='type-id-51' 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='463' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='remote_port' type-id='type-id-51' 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='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='protocol' type-id='type-id-51' 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='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='ip_addr_origin' type-id='type-id-42' 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='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='prefix_length' type-id='type-id-42' 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='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='gateway_ipv6_addr' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
+        <var-decl name='gateway_ipv6_addr' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='468' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ipv6_addr' type-id='type-id-123' filepath='src/include/efivar/efivar-dp.h' line='469' column='1' id='type-id-122'/>
-    <class-decl name='efidp_vlan' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-124' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='476' column='1' id='type-id-125'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='603' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vlan_id' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
+        <var-decl name='protocol' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_vlan' type-id='type-id-125' filepath='src/include/efivar/efivar-dp.h' line='479' column='1' id='type-id-124'/>
-    <class-decl name='efidp_infiniband' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-126' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='482' column='1' id='type-id-127'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='483' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='resource_flags' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='484' column='1'/>
+      <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='port_gid' type-id='type-id-61' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='485' column='1'/>
+        <var-decl name='lun' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-128' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='target_port_id' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='490' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_id' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='491' column='1'/>
+      <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'/>
       </data-member>
     </class-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-128'>
-      <data-member access='public'>
-        <var-decl name='ioc_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='service_id' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
-      </data-member>
-    </union-decl>
-    <typedef-decl name='efidp_infiniband' type-id='type-id-127' filepath='src/include/efivar/efivar-dp.h' line='492' column='1' id='type-id-126'/>
-    <class-decl name='efidp_uart' size-in-bits='152' is-struct='yes' naming-typedef-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='501' 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='402' column='1' id='type-id-130'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='baud_rate' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_bits' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='parity' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='506' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='stop_bits' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='507' column='1'/>
+        <var-decl name='lun' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='404' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart' type-id='type-id-130' filepath='src/include/efivar/efivar-dp.h' line='508' column='1' id='type-id-129'/>
-    <class-decl name='efidp_msg_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='532' 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='425' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='427' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_msg_vendor' type-id='type-id-132' filepath='src/include/efivar/efivar-dp.h' line='536' column='1' id='type-id-131'/>
-    <class-decl name='efidp_uart_flow_control' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='545' column='1' id='type-id-134'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='744' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-39' 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='745' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='flow_control_map' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uart_flow_control' type-id='type-id-134' filepath='src/include/efivar/efivar-dp.h' line='549' column='1' id='type-id-133'/>
-    <class-decl name='efidp_sas' size-in-bits='352' is-struct='yes' naming-typedef-id='type-id-135' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='556' column='1' id='type-id-136'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reserved' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='559' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sas_address' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='560' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='lun' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='561' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='device_topology_info' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='562' column='1'/>
+        <var-decl name='memory_type' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='59' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='drive_bay_id' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='563' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='rtp' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='564' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas' type-id='type-id-136' filepath='src/include/efivar/efivar-dp.h' line='565' column='1' id='type-id-135'/>
-    <class-decl name='efidp_sas_ex' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-137' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='589' column='1' id='type-id-138'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sas_address' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lun' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='592' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='device_topology_info' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='593' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='drive_bay_id' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='594' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='rtp' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='595' column='1'/>
+        <var-decl name='vendor_data' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='535' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sas_ex' type-id='type-id-138' filepath='src/include/efivar/efivar-dp.h' line='596' column='1' id='type-id-137'/>
-    <class-decl name='efidp_iscsi' size-in-bits='144' is-struct='yes' naming-typedef-id='type-id-139' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='602' column='1' id='type-id-140'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='703' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='604' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='options' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='605' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lun' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='606' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpgt' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='607' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='target_name' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='608' column='1'/>
+        <var-decl name='uuid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_iscsi' type-id='type-id-140' filepath='src/include/efivar/efivar-dp.h' line='609' column='1' id='type-id-139'/>
-    <class-decl name='efidp_nvme' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-141' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='637' column='1' id='type-id-142'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='638' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='namespace_id' type-id='type-id-37' 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='639' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ieee_eui_64' type-id='type-id-70' 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='640' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvme' type-id='type-id-142' filepath='src/include/efivar/efivar-dp.h' line='641' column='1' id='type-id-141'/>
-    <class-decl name='efidp_uri' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-143' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='646' column='1' id='type-id-144'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uri' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
+        <var-decl name='function' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_uri' type-id='type-id-144' filepath='src/include/efivar/efivar-dp.h' line='649' column='1' id='type-id-143'/>
-    <class-decl name='efidp_ufs' size-in-bits='48' is-struct='yes' naming-typedef-id='type-id-145' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='652' column='1' id='type-id-146'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='target_id' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
+        <var-decl name='function' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='lun' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='655' column='1'/>
+        <var-decl name='device' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='45' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ufs' type-id='type-id-146' filepath='src/include/efivar/efivar-dp.h' line='656' column='1' id='type-id-145'/>
-    <class-decl name='efidp_sd' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-147' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='659' column='1' id='type-id-148'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='762' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot_number' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='661' column='1'/>
+        <var-decl name='protocol_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_sd' type-id='type-id-148' filepath='src/include/efivar/efivar-dp.h' line='662' column='1' id='type-id-147'/>
-    <class-decl name='efidp_bt' size-in-bits='80' is-struct='yes' naming-typedef-id='type-id-149' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='665' column='1' id='type-id-150'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='788' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-68' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='667' column='1'/>
+        <var-decl name='start_addr' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_bt' type-id='type-id-150' filepath='src/include/efivar/efivar-dp.h' line='668' column='1' id='type-id-149'/>
-    <class-decl name='efidp_wifi' size-in-bits='288' is-struct='yes' naming-typedef-id='type-id-151' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='671' column='1' id='type-id-152'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='672' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ssid' type-id='type-id-65' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='673' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_wifi' type-id='type-id-152' filepath='src/include/efivar/efivar-dp.h' line='674' column='1' id='type-id-151'/>
-    <class-decl name='efidp_emmc' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-153' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='677' column='1' id='type-id-154'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='780' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='slot' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='679' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_emmc' type-id='type-id-154' filepath='src/include/efivar/efivar-dp.h' line='680' column='1' id='type-id-153'/>
-    <class-decl name='efidp_btle' size-in-bits='88' is-struct='yes' naming-typedef-id='type-id-155' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='685' column='1' id='type-id-156'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='557' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr' type-id='type-id-68' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='687' column='1'/>
+        <var-decl name='vendor_guid' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='558' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='addr_type' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='688' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_btle' type-id='type-id-156' filepath='src/include/efivar/efivar-dp.h' line='689' column='1' id='type-id-155'/>
-    <class-decl name='efidp_dns' size-in-bits='40' is-struct='yes' naming-typedef-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='695' column='1' id='type-id-158'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='696' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='is_ipv6' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='697' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='addrs' type-id='type-id-56' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='698' column='1'/>
+      <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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_dns' type-id='type-id-158' filepath='src/include/efivar/efivar-dp.h' line='699' column='1' id='type-id-157'/>
-    <class-decl name='efidp_nvdimm' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-159' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='702' column='1' id='type-id-160'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='590' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='uuid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='704' column='1'/>
+        <var-decl name='sas_address' type-id='type-id-103' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='591' 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'/>
+      </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'/>
+      </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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_nvdimm' type-id='type-id-160' filepath='src/include/efivar/efivar-dp.h' line='705' column='1' id='type-id-159'/>
-    <class-decl name='efidp_hd' size-in-bits='336' is-struct='yes' naming-typedef-id='type-id-161' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='710' column='1' id='type-id-162'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='409' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='partition_number' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='712' column='1'/>
+        <var-decl name='hba_port' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='410' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='713' column='1'/>
+        <var-decl name='lun' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='412' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='714' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='signature' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='715' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='format' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='716' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='signature_type' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='717' column='1'/>
+    </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'>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_hd' type-id='type-id-162' filepath='src/include/efivar/efivar-dp.h' line='721' column='1' id='type-id-161'/>
-    <class-decl name='efidp_cdrom' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-163' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='735' column='1' id='type-id-164'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='boot_catalog_entry' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='737' column='1'/>
+        <var-decl name='reserved' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='503' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='partition_rba' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='738' column='1'/>
+        <var-decl name='baud_rate' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='504' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sectors' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='739' column='1'/>
+        <var-decl name='data_bits' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='505' 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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_cdrom' type-id='type-id-164' filepath='src/include/efivar/efivar-dp.h' line='740' column='1' id='type-id-163'/>
-    <class-decl name='efidp_media_vendor' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='743' column='1' id='type-id-166'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vendor_guid' type-id='type-id-39' 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='547' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vendor_data' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='746' column='1'/>
+        <var-decl name='flow_control_map' type-id='type-id-38' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='548' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_media_vendor' type-id='type-id-166' filepath='src/include/efivar/efivar-dp.h' line='747' column='1' id='type-id-165'/>
-    <class-decl name='efidp_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='754' column='1' id='type-id-168'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='653' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='name' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='756' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_file' type-id='type-id-168' filepath='src/include/efivar/efivar-dp.h' line='757' column='1' id='type-id-167'/>
-    <class-decl name='efidp_protocol' size-in-bits='160' is-struct='yes' naming-typedef-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='761' column='1' id='type-id-170'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='762' column='1'/>
+        <var-decl name='target_id' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='654' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='protocol_guid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='763' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_protocol' type-id='type-id-170' filepath='src/include/efivar/efivar-dp.h' line='764' column='1' id='type-id-169'/>
-    <class-decl name='efidp_firmware_file' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='767' column='1' id='type-id-172'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='647' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='769' column='1'/>
+        <var-decl name='uri' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='648' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_file' type-id='type-id-172' filepath='src/include/efivar/efivar-dp.h' line='770' column='1' id='type-id-171'/>
-    <class-decl name='efidp_firmware_volume' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='773' column='1' id='type-id-174'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='pi_info' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='775' column='1'/>
+        <var-decl name='parent_port' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='361' 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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_firmware_volume' type-id='type-id-174' filepath='src/include/efivar/efivar-dp.h' line='776' column='1' id='type-id-173'/>
-    <class-decl name='efidp_relative_offset' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='779' column='1' id='type-id-176'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='367' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='781' column='1'/>
+        <var-decl name='vendor_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='368' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='first_byte' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='782' column='1'/>
+        <var-decl name='device_class' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='370' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='last_byte' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='783' column='1'/>
+      <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'/>
+      </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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_relative_offset' type-id='type-id-176' filepath='src/include/efivar/efivar-dp.h' line='784' column='1' id='type-id-175'/>
-    <class-decl name='efidp_ramdisk' size-in-bits='304' is-struct='yes' naming-typedef-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='787' column='1' id='type-id-178'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='start_addr' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='789' column='1'/>
+        <var-decl name='interface' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='395' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='end_addr' type-id='type-id-43' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='790' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='disk_type_guid' type-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='791' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='instance_number' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='792' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_ramdisk' type-id='type-id-178' filepath='src/include/efivar/efivar-dp.h' line='793' column='1' id='type-id-177'/>
-    <class-decl name='efidp_bios_boot' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='806' column='1' id='type-id-180'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='header' type-id='type-id-75' 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='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='device_type' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='808' column='1'/>
+        <var-decl name='vlan_id' type-id='type-id-57' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='478' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='status' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='809' column='1'/>
+    </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'>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='description' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='810' column='1'/>
+      <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'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_bios_boot' type-id='type-id-180' filepath='src/include/efivar/efivar-dp.h' line='811' column='1' id='type-id-179'/>
-    <union-decl name='efidp_data' size-in-bits='384' naming-typedef-id='type-id-181' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='825' column='1' id='type-id-182'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-183' visibility='default'/>
+    <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'>
+      <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'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='header' type-id='type-id-75' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
+      <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'/>
       </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'/>
+      </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'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-26' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-185'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-186'/>
+    <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='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'/>
+    <typedef-decl name='uint32_t' type-id='type-id-187' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-38'/>
+    <typedef-decl name='uint64_t' type-id='type-id-188' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-48'/>
+    <typedef-decl name='uint8_t' type-id='type-id-190' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-39'/>
+    <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='infinite' id='type-id-106'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-59'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-38' size-in-bits='128' id='type-id-198'>
+      <subrange length='4' type-id='type-id-3' id='type-id-199'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-38' size-in-bits='infinite' id='type-id-75'>
+      <subrange length='infinite' type-id='type-id-3' id='type-id-59'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='128' id='type-id-120'>
+      <subrange length='2' type-id='type-id-3' id='type-id-200'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='128' id='type-id-69'>
+      <subrange length='16' type-id='type-id-3' id='type-id-201'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='256' id='type-id-133'>
+      <subrange length='32' type-id='type-id-3' id='type-id-202'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='32' id='type-id-66'>
+      <subrange length='4' type-id='type-id-3' id='type-id-199'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='48' id='type-id-63'>
+      <subrange length='6' type-id='type-id-3' id='type-id-203'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='64' id='type-id-103'>
+      <subrange length='8' type-id='type-id-3' id='type-id-204'/>
+    </array-type-def>
+    <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'>
       <data-member access='public'>
-        <var-decl name='pci' type-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
+        <var-decl name='addr' type-id='type-id-198' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pccard' type-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
+        <var-decl name='v4' type-id='type-id-64' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mmio' type-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
+        <var-decl name='v6' type-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' 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'>
       <data-member access='public'>
-        <var-decl name='hw_vendor' type-id='type-id-84' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
+        <var-decl name='' type-id='type-id-182' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='controller' type-id='type-id-86' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
+        <var-decl name='header' type-id='type-id-72' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='831' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bmc' type-id='type-id-88' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
+        <var-decl name='pci' type-id='type-id-146' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='832' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid' type-id='type-id-90' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
+        <var-decl name='pccard' type-id='type-id-144' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='833' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_hid_ex' type-id='type-id-92' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
+        <var-decl name='mmio' type-id='type-id-136' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='834' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acpi_adr' type-id='type-id-94' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
+        <var-decl name='hw_vendor' type-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='835' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='atapi' type-id='type-id-96' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
+        <var-decl name='controller' type-id='type-id-93' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='836' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='scsi' type-id='type-id-98' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
+        <var-decl name='bmc' type-id='type-id-85' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='837' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fc' type-id='type-id-100' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
+        <var-decl name='acpi_hid' type-id='type-id-76' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='838' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fcex' type-id='type-id-102' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
+        <var-decl name='acpi_hid_ex' type-id='type-id-78' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='839' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firewire' type-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' column='1'/>
+        <var-decl name='acpi_adr' type-id='type-id-73' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='840' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb' type-id='type-id-106' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
+        <var-decl name='atapi' type-id='type-id-80' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='841' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_class' type-id='type-id-108' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
+        <var-decl name='scsi' type-id='type-id-160' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='842' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usb_wwid' type-id='type-id-110' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
+        <var-decl name='fc' type-id='type-id-99' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='843' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='lun' type-id='type-id-112' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
+        <var-decl name='fcex' type-id='type-id-101' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='844' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sata' type-id='type-id-114' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
+        <var-decl name='firewire' type-id='type-id-70' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='845' 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='usb' type-id='type-id-172' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='846' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='mac_addr' type-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
+        <var-decl name='usb_class' type-id='type-id-174' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='847' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv4_addr' type-id='type-id-120' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
+        <var-decl name='usb_wwid' type-id='type-id-176' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='848' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ipv6_addr' type-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
+        <var-decl name='lun' type-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='849' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='vlan' type-id='type-id-124' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
+        <var-decl name='sata' type-id='type-id-158' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='850' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='infiniband' type-id='type-id-126' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
+        <var-decl name='i2o' type-id='type-id-116' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='851' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart' type-id='type-id-129' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='852' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='msg_vendor' type-id='type-id-131' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
+        <var-decl name='ipv4_addr' type-id='type-id-122' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='853' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uart_flow_control' type-id='type-id-133' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
+        <var-decl name='ipv6_addr' type-id='type-id-125' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='854' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas' type-id='type-id-135' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
+        <var-decl name='vlan' type-id='type-id-178' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='855' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sas_ex' type-id='type-id-137' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
+        <var-decl name='infiniband' type-id='type-id-118' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='856' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='iscsi' type-id='type-id-139' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
+        <var-decl name='uart' type-id='type-id-164' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='857' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvme' type-id='type-id-141' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
+        <var-decl name='msg_vendor' type-id='type-id-138' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='858' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='uri' type-id='type-id-143' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
+        <var-decl name='uart_flow_control' type-id='type-id-166' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='859' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ufs' type-id='type-id-145' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
+        <var-decl name='sas' type-id='type-id-154' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='860' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='sd' type-id='type-id-147' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
+        <var-decl name='sas_ex' type-id='type-id-156' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='861' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bt' type-id='type-id-149' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
+        <var-decl name='iscsi' type-id='type-id-127' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='862' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='wifi' type-id='type-id-151' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
+        <var-decl name='nvme' type-id='type-id-142' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='863' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='emmc' type-id='type-id-153' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
+        <var-decl name='uri' type-id='type-id-170' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='864' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='btle' type-id='type-id-155' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
+        <var-decl name='ufs' type-id='type-id-168' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='865' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='dns' type-id='type-id-157' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
+        <var-decl name='sd' type-id='type-id-162' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='866' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='nvdimm' type-id='type-id-159' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
+        <var-decl name='bt' type-id='type-id-87' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='867' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='hd' type-id='type-id-161' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
+        <var-decl name='wifi' type-id='type-id-180' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='868' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='cdrom' type-id='type-id-163' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
+        <var-decl name='emmc' type-id='type-id-97' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='869' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='media_vendor' type-id='type-id-165' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
+        <var-decl name='btle' type-id='type-id-89' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='870' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='file' type-id='type-id-167' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
+        <var-decl name='dns' type-id='type-id-95' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='871' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='protocol' type-id='type-id-169' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
+        <var-decl name='nvdimm' type-id='type-id-140' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='872' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_file' type-id='type-id-171' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='878' column='1'/>
+        <var-decl name='hd' type-id='type-id-111' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='873' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='firmware_volume' type-id='type-id-173' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='879' column='1'/>
+        <var-decl name='cdrom' type-id='type-id-91' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='874' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='relative_offset' type-id='type-id-175' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='880' column='1'/>
+        <var-decl name='media_vendor' type-id='type-id-134' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='875' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='ramdisk' type-id='type-id-177' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='881' column='1'/>
+        <var-decl name='file' type-id='type-id-104' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='876' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bios_boot' type-id='type-id-179' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' column='1'/>
-      </data-member>
-    </union-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-183'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='827' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='subtype' type-id='type-id-42' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='828' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='length' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='829' column='1'/>
+        <var-decl name='protocol' type-id='type-id-148' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='877' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efidp_data' type-id='type-id-182' filepath='src/include/efivar/efivar-dp.h' line='883' column='1' id='type-id-181'/>
-    <typedef-decl name='efidp' type-id='type-id-184' filepath='src/include/efivar/efivar-dp.h' line='884' column='1' id='type-id-185'/>
-    <typedef-decl name='const_efidp' type-id='type-id-186' filepath='src/include/efivar/efivar-dp.h' line='885' column='1' id='type-id-187'/>
-    <class-decl name='efi_guid_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-39' visibility='default' filepath='src/include/efivar/efivar-types.h' line='13' column='1' id='type-id-188'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-37' visibility='default' filepath='src/include/efivar/efivar-types.h' line='14' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='b' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-types.h' line='15' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='c' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-types.h' line='16' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-51' visibility='default' filepath='src/include/efivar/efivar-types.h' line='17' column='1'/>
+      <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='e' type-id='type-id-68' visibility='default' filepath='src/include/efivar/efivar-types.h' line='18' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_guid_t' type-id='type-id-188' filepath='src/include/efivar/efivar-types.h' line='19' column='1' id='type-id-39'/>
-    <class-decl name='efi_ipv4_addr_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-types.h' line='31' column='1' id='type-id-190'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-67' visibility='default' filepath='src/include/efivar/efivar-types.h' line='32' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_ipv4_addr_t' type-id='type-id-190' filepath='src/include/efivar/efivar-types.h' line='33' column='1' id='type-id-189'/>
-    <class-decl name='efi_ipv6_addr_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-types.h' line='35' column='1' id='type-id-192'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-63' visibility='default' filepath='src/include/efivar/efivar-types.h' line='36' column='1'/>
+      <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'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='efi_ipv6_addr_t' type-id='type-id-192' filepath='src/include/efivar/efivar-types.h' line='37' column='1' id='type-id-191'/>
-    <union-decl name='efi_ip_addr_t' size-in-bits='128' naming-typedef-id='type-id-55' visibility='default' filepath='src/include/efivar/efivar-types.h' line='39' column='1' id='type-id-193'>
       <data-member access='public'>
-        <var-decl name='addr' type-id='type-id-58' visibility='default' filepath='src/include/efivar/efivar-types.h' line='40' column='1'/>
+        <var-decl name='bios_boot' type-id='type-id-82' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='882' 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'>
       <data-member access='public'>
-        <var-decl name='v4' type-id='type-id-189' visibility='default' filepath='src/include/efivar/efivar-types.h' line='41' column='1'/>
+        <var-decl name='ioc_guid' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='487' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='v6' type-id='type-id-191' visibility='default' filepath='src/include/efivar/efivar-types.h' line='42' column='1'/>
+        <var-decl name='service_id' type-id='type-id-48' visibility='default' filepath='src/include/efivar/efivar-dp.h' line='488' column='1'/>
       </data-member>
     </union-decl>
-    <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-55'/>
-    <typedef-decl name='uint8_t' type-id='type-id-194' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-42'/>
-    <typedef-decl name='uint16_t' type-id='type-id-195' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-51'/>
-    <typedef-decl name='uint32_t' type-id='type-id-196' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-37'/>
-    <typedef-decl name='uint64_t' type-id='type-id-197' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-43'/>
-    <typedef-decl name='__uint8_t' type-id='type-id-73' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-194'/>
-    <typedef-decl name='__uint16_t' type-id='type-id-25' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-195'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-196'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-197'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-198'/>
-    <typedef-decl name='DIR' type-id='type-id-54' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-199'/>
-    <typedef-decl name='ssize_t' type-id='type-id-198' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-36'/>
-    <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='209' column='1' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-22'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-33'/>
-    <qualified-type-def type-id='type-id-181' const='yes' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-204'/>
-    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-35'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-205'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-12'/>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-54'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-189'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-22'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-40'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-10'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-33'/>
+    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-19'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-183'/>
+    <type-decl name='variadic parameter type' id='type-id-209'/>
+    <type-decl name='void' id='type-id-24'/>
     <function-decl name='efidp_set_node_data' mangled-name='efidp_set_node_data' filepath='src/dp.c' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_set_node_data@@libefivar.so.0'>
-      <parameter type-id='type-id-187' name='dn' filepath='src/dp.c' line='33' column='1'/>
-      <parameter type-id='type-id-12' name='buf' filepath='src/dp.c' line='33' column='1'/>
-      <parameter type-id='type-id-29' name='bufsize' filepath='src/dp.c' line='33' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-192' name='dn' filepath='src/dp.c' line='33' column='1'/>
+      <parameter type-id='type-id-19' name='buf' filepath='src/dp.c' line='33' column='1'/>
+      <parameter type-id='type-id-20' name='bufsize' filepath='src/dp.c' line='33' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efidp_duplicate_path' mangled-name='efidp_duplicate_path' filepath='src/dp.c' line='87' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_duplicate_path@@libefivar.so.0'>
-      <parameter type-id='type-id-187' name='dp' filepath='src/dp.c' line='87' column='1'/>
-      <parameter type-id='type-id-203' name='out' filepath='src/dp.c' line='87' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-192' name='dp' filepath='src/dp.c' line='87' column='1'/>
+      <parameter type-id='type-id-207' name='out' filepath='src/dp.c' line='87' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efidp_append_path' mangled-name='efidp_append_path' filepath='src/dp.c' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_path@@libefivar.so.0'>
-      <parameter type-id='type-id-187' name='dp0' filepath='src/dp.c' line='97' column='1'/>
-      <parameter type-id='type-id-187' name='dp1' filepath='src/dp.c' line='97' column='1'/>
-      <parameter type-id='type-id-203' name='out' filepath='src/dp.c' line='97' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-192' name='dp0' filepath='src/dp.c' line='97' column='1'/>
+      <parameter type-id='type-id-192' name='dp1' filepath='src/dp.c' line='97' column='1'/>
+      <parameter type-id='type-id-207' name='out' filepath='src/dp.c' line='97' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efidp_append_node' mangled-name='efidp_append_node' filepath='src/dp.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_node@@libefivar.so.0'>
-      <parameter type-id='type-id-187' name='dp' filepath='src/dp.c' line='179' column='1'/>
-      <parameter type-id='type-id-187' name='dn' filepath='src/dp.c' line='179' column='1'/>
-      <parameter type-id='type-id-203' name='out' filepath='src/dp.c' line='179' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-192' name='dp' filepath='src/dp.c' line='179' column='1'/>
+      <parameter type-id='type-id-192' name='dn' filepath='src/dp.c' line='179' column='1'/>
+      <parameter type-id='type-id-207' name='out' filepath='src/dp.c' line='179' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efidp_append_instance' mangled-name='efidp_append_instance' filepath='src/dp.c' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_append_instance@@libefivar.so.0'>
-      <parameter type-id='type-id-187' name='dp' filepath='src/dp.c' line='241' column='1'/>
-      <parameter type-id='type-id-187' name='dpi' filepath='src/dp.c' line='241' column='1'/>
-      <parameter type-id='type-id-203' name='out' filepath='src/dp.c' line='241' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-192' name='dp' filepath='src/dp.c' line='241' column='1'/>
+      <parameter type-id='type-id-192' name='dpi' filepath='src/dp.c' line='241' column='1'/>
+      <parameter type-id='type-id-207' name='out' filepath='src/dp.c' line='241' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efidp_format_device_path' mangled-name='efidp_format_device_path' filepath='src/dp.c' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_format_device_path@@libefivar.so.0'>
-      <parameter type-id='type-id-205' name='buf' filepath='src/dp.c' line='288' column='1'/>
-      <parameter type-id='type-id-29' name='size' filepath='src/dp.c' line='288' column='1'/>
-      <parameter type-id='type-id-187' name='dp' filepath='src/dp.c' line='288' column='1'/>
-      <parameter type-id='type-id-36' name='limit' filepath='src/dp.c' line='289' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208' name='buf' filepath='src/dp.c' line='288' column='1'/>
+      <parameter type-id='type-id-20' name='size' filepath='src/dp.c' line='288' column='1'/>
+      <parameter type-id='type-id-192' name='dp' filepath='src/dp.c' line='288' column='1'/>
+      <parameter type-id='type-id-37' name='limit' filepath='src/dp.c' line='289' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='efidp_parse_device_node' mangled-name='efidp_parse_device_node' filepath='src/dp.c' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_node@@libefivar.so.0'>
-      <parameter type-id='type-id-205' name='path' filepath='src/dp.c' line='393' column='1'/>
-      <parameter type-id='type-id-185' name='out' filepath='src/dp.c' line='394' column='1'/>
-      <parameter type-id='type-id-29' name='size' filepath='src/dp.c' line='394' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208' name='path' filepath='src/dp.c' line='393' column='1'/>
+      <parameter type-id='type-id-195' name='out' filepath='src/dp.c' line='394' column='1'/>
+      <parameter type-id='type-id-20' name='size' filepath='src/dp.c' line='394' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='efidp_parse_device_path' mangled-name='efidp_parse_device_path' filepath='src/dp.c' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_parse_device_path@@libefivar.so.0'>
-      <parameter type-id='type-id-205' name='path' filepath='src/dp.c' line='402' column='1'/>
-      <parameter type-id='type-id-185' name='out' filepath='src/dp.c' line='402' column='1'/>
-      <parameter type-id='type-id-29' name='size' filepath='src/dp.c' line='403' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208' name='path' filepath='src/dp.c' line='402' column='1'/>
+      <parameter type-id='type-id-195' name='out' filepath='src/dp.c' line='402' column='1'/>
+      <parameter type-id='type-id-20' name='size' filepath='src/dp.c' line='403' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='efidp_make_vendor' mangled-name='efidp_make_vendor' filepath='src/dp.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_vendor@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp.c' line='411' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp.c' line='411' column='1'/>
-      <parameter type-id='type-id-42' name='type' filepath='src/dp.c' line='411' column='1'/>
-      <parameter type-id='type-id-42' name='subtype' filepath='src/dp.c' line='411' column='1'/>
-      <parameter type-id='type-id-39' name='vendor_guid' filepath='src/dp.c' line='412' column='1'/>
-      <parameter type-id='type-id-12' name='data' filepath='src/dp.c' line='412' column='1'/>
-      <parameter type-id='type-id-29' name='data_size' filepath='src/dp.c' line='412' column='1'/>
-      <return type-id='type-id-36'/>
-    </function-decl>
-    <function-decl name='efidp_make_generic' mangled-name='efidp_make_generic' filepath='src/dp.c' line='427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efidp_make_generic@@libefivar.so.0'>
-      <parameter type-id='type-id-35' name='buf' filepath='src/dp.c' line='427' column='1'/>
-      <parameter type-id='type-id-36' name='size' filepath='src/dp.c' line='427' column='1'/>
-      <parameter type-id='type-id-42' name='type' filepath='src/dp.c' line='427' column='1'/>
-      <parameter type-id='type-id-42' name='subtype' filepath='src/dp.c' line='427' column='1'/>
-      <parameter type-id='type-id-36' name='total_size' filepath='src/dp.c' line='428' column='1'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-36' name='buf' filepath='src/dp.c' line='411' column='1'/>
+      <parameter type-id='type-id-37' name='size' filepath='src/dp.c' line='411' column='1'/>
+      <parameter type-id='type-id-39' name='type' filepath='src/dp.c' line='411' column='1'/>
+      <parameter type-id='type-id-39' name='subtype' filepath='src/dp.c' line='411' column='1'/>
+      <parameter type-id='type-id-43' name='vendor_guid' filepath='src/dp.c' line='412' column='1'/>
+      <parameter type-id='type-id-19' name='data' filepath='src/dp.c' line='412' column='1'/>
+      <parameter type-id='type-id-20' name='data_size' filepath='src/dp.c' line='412' column='1'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='_format_hw_dn' filepath='src/dp.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-205'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-187'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-192'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='_format_acpi_dn' filepath='src/dp.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-205'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-187'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-192'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='_format_message_dn' filepath='src/dp.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-205'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-187'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-192'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='_format_media_dn' filepath='src/dp.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-205'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-187'/>
-      <return type-id='type-id-36'/>
-    </function-decl>
-    <function-decl name='efi_error_set' mangled-name='efi_error_set' filepath='src/include/efivar/efivar.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_set@@LIBEFIVAR_1.30'>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-33'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='closedir' filepath='/usr/include/dirent.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-200'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <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-204'/>
-    </function-decl>
-    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-33'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-12'/>
-    </function-decl>
-    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-12'/>
-    </function-decl>
-    <function-decl name='memcpy' filepath='/usr/include/string.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-12'/>
+      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-192'/>
+      <return type-id='type-id-37'/>
     </function-decl>
-    <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-12'/>
+    <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-19'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='efivarfs.c' comp-dir-path='src' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-206' size-in-bits='256' id='type-id-207'>
-      <subrange length='4' type-id='type-id-3' id='type-id-59'/>
+    <array-type-def dimensions='1' type-id='type-id-210' size-in-bits='256' id='type-id-211'>
+      <subrange length='4' type-id='type-id-3' id='type-id-199'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-208' size-in-bits='192' id='type-id-209'>
-      <subrange length='3' type-id='type-id-3' id='type-id-210'/>
+    <array-type-def dimensions='1' type-id='type-id-212' size-in-bits='192' id='type-id-213'>
+      <subrange length='3' type-id='type-id-3' id='type-id-214'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2040' id='type-id-211'>
-      <subrange length='255' type-id='type-id-3' id='type-id-212'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2040' id='type-id-215'>
+      <subrange length='255' type-id='type-id-3' id='type-id-216'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2048' id='type-id-213'>
-      <subrange length='256' type-id='type-id-3' id='type-id-214'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2048' id='type-id-217'>
+      <subrange length='256' type-id='type-id-3' id='type-id-218'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='64' id='type-id-215'>
-      <subrange length='2' type-id='type-id-3' id='type-id-62'/>
+    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='64' id='type-id-219'>
+      <subrange length='2' type-id='type-id-3' id='type-id-200'/>
     </array-type-def>
-    <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-216'>
+    <class-decl name='__fsid_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-220' visibility='default' filepath='/usr/include/bits/types.h' line='155' column='1' id='type-id-221'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__val' type-id='type-id-219' visibility='default' filepath='/usr/include/bits/types.h' line='155' column='1'/>
+      </data-member>
+    </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'/>
+      </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'/>
+      </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'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='d_type' type-id='type-id-189' visibility='default' filepath='/usr/include/bits/dirent.h' line='32' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-211' 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='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='probe' type-id='type-id-217' 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='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='set_variable' type-id='type-id-218' 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='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='del_variable' type-id='type-id-219' 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='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='get_variable' type-id='type-id-220' 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='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='get_variable_attributes' type-id='type-id-221' 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='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='get_variable_size' type-id='type-id-222' 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='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='get_next_variable_name' type-id='type-id-223' 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='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='append_variable' type-id='type-id-224' 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='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='chmod_variable' type-id='type-id-225' 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='37' column='1'/>
       </data-member>
     </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-226'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='d_ino' type-id='type-id-227' visibility='default' filepath='/usr/include/bits/dirent.h' line='25' column='1'/>
+        <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='d_off' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
+        <var-decl name='st_ino' type-id='type-id-223' 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='d_reclen' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/dirent.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='d_type' type-id='type-id-73' visibility='default' filepath='/usr/include/bits/dirent.h' line='32' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='d_name' type-id='type-id-213' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' 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-228'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='f_type' type-id='type-id-206' visibility='default' filepath='/usr/include/bits/statfs.h' line='26' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='f_bsize' type-id='type-id-206' 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-229' visibility='default' filepath='/usr/include/bits/statfs.h' line='29' column='1'/>
+        <var-decl name='st_nlink' type-id='type-id-236' 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='f_bfree' type-id='type-id-229' visibility='default' filepath='/usr/include/bits/statfs.h' line='30' column='1'/>
+        <var-decl name='st_mode' type-id='type-id-237' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='f_bavail' type-id='type-id-229' visibility='default' filepath='/usr/include/bits/statfs.h' line='31' column='1'/>
+        <var-decl name='st_gid' type-id='type-id-239' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='f_files' type-id='type-id-230' visibility='default' filepath='/usr/include/bits/statfs.h' line='32' column='1'/>
+        <var-decl name='st_rdev' type-id='type-id-235' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='f_ffree' type-id='type-id-230' visibility='default' filepath='/usr/include/bits/statfs.h' line='33' column='1'/>
+        <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='f_fsid' type-id='type-id-231' visibility='default' filepath='/usr/include/bits/statfs.h' line='41' column='1'/>
+        <var-decl name='st_blksize' type-id='type-id-240' 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='f_namelen' type-id='type-id-206' visibility='default' filepath='/usr/include/bits/statfs.h' line='42' column='1'/>
+        <var-decl name='st_blocks' type-id='type-id-241' 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='f_frsize' type-id='type-id-206' visibility='default' filepath='/usr/include/bits/statfs.h' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='f_flags' type-id='type-id-206' visibility='default' filepath='/usr/include/bits/statfs.h' line='44' column='1'/>
+        <var-decl name='st_atim' type-id='type-id-242' 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='f_spare' type-id='type-id-207' visibility='default' filepath='/usr/include/bits/statfs.h' line='45' column='1'/>
+        <var-decl name='st_mtim' type-id='type-id-242' 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'/>
+      </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='stat' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='26' column='1' id='type-id-232'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='st_dev' type-id='type-id-233' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='31' column='1'/>
+        <var-decl name='f_type' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='st_ino' type-id='type-id-227' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='36' column='1'/>
+        <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='st_nlink' type-id='type-id-234' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='44' column='1'/>
+        <var-decl name='f_blocks' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-235' 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-236' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='47' column='1'/>
+        <var-decl name='f_bfree' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='st_gid' type-id='type-id-237' 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-21' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='50' column='1'/>
+        <var-decl name='f_bavail' type-id='type-id-244' visibility='default' filepath='/usr/include/bits/statfs.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='st_rdev' type-id='type-id-233' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='52' column='1'/>
+        <var-decl name='f_files' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='st_size' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='57' column='1'/>
+        <var-decl name='f_ffree' type-id='type-id-245' visibility='default' filepath='/usr/include/bits/statfs.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='st_blksize' type-id='type-id-238' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='61' column='1'/>
+        <var-decl name='f_fsid' type-id='type-id-220' visibility='default' filepath='/usr/include/bits/statfs.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='st_blocks' type-id='type-id-239' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='63' column='1'/>
+        <var-decl name='f_namelen' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='st_atim' type-id='type-id-240' 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-240' 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-240' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='76' column='1'/>
+        <var-decl name='f_frsize' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='43' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__glibc_reserved' type-id='type-id-209' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='89' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='f_flags' type-id='type-id-210' visibility='default' filepath='/usr/include/bits/statfs.h' line='44' column='1'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='__dev_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-233'/>
-    <typedef-decl name='__uid_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-236'/>
-    <typedef-decl name='__gid_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-237'/>
-    <typedef-decl name='__ino_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-227'/>
-    <typedef-decl name='__mode_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-235'/>
-    <typedef-decl name='__nlink_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-234'/>
-    <class-decl name='__fsid_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-231' visibility='default' filepath='/usr/include/bits/types.h' line='155' column='1' id='type-id-241'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__val' type-id='type-id-215' visibility='default' filepath='/usr/include/bits/types.h' line='155' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <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>
-    <typedef-decl name='__fsid_t' type-id='type-id-241' filepath='/usr/include/bits/types.h' line='155' column='1' id='type-id-231'/>
-    <typedef-decl name='__time_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='160' column='1' id='type-id-242'/>
-    <typedef-decl name='__useconds_t' type-id='type-id-11' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-243'/>
-    <typedef-decl name='__blksize_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='175' column='1' id='type-id-238'/>
-    <typedef-decl name='__blkcnt_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-239'/>
-    <typedef-decl name='__fsblkcnt_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='184' column='1' id='type-id-229'/>
-    <typedef-decl name='__fsfilcnt_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='188' column='1' id='type-id-230'/>
-    <typedef-decl name='__fsword_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='192' column='1' id='type-id-206'/>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-14' filepath='/usr/include/bits/types.h' line='197' column='1' id='type-id-208'/>
-    <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-240'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tv_sec' type-id='type-id-242' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='16' column='1'/>
+        <var-decl name='tv_sec' type-id='type-id-246' 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-208' visibility='default' filepath='/usr/include/bits/types/struct_timespec.h' line='21' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='mode_t' type-id='type-id-235' filepath='/usr/include/fcntl.h' line='50' column='1' id='type-id-244'/>
-    <qualified-type-def type-id='type-id-38' restrict='yes' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-247'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-223'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-219'/>
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-222'/>
+        <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='__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='__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='__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-221'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-258' restrict='yes' id='type-id-259'/>
-    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-261'/>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-262'/>
-    <function-decl name='efi_get_variable' mangled-name='efi_get_variable' filepath='src/include/efivar/efivar.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-39'/>
+    <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'>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-262'/>
-      <parameter type-id='type-id-257'/>
+      <parameter type-id='type-id-266'/>
       <parameter type-id='type-id-261'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-265'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_error_clear' mangled-name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_clear@@LIBEFIVAR_1.30'>
-      <return type-id='type-id-19'/>
+    <function-decl name='efi_error_clear' filepath='src/include/efivar/efivar.h' line='137' 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-216' visibility='default' filepath='src/lib.h' line='43' column='1'/>
-    <function-decl name='opendir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <var-decl name='efivarfs_ops' type-id='type-id-224' visibility='default' filepath='src/lib.h' line='43' 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-200'/>
+      <return type-id='type-id-40'/>
     </function-decl>
-    <function-decl name='readdir' filepath='/usr/include/dirent.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-200'/>
-      <return type-id='type-id-246'/>
+    <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='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-200'/>
-      <return type-id='type-id-21'/>
+    <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'/>
     </function-decl>
     <function-decl name='err' filepath='/usr/include/err.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-33'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-19'/>
+      <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-21'/>
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-9'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <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-21'/>
+      <parameter type-id='type-id-9'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <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-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='asprintf' filepath='/usr/include/stdio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-245'/>
+    <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-34'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-245'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-3'/>
-    </function-decl>
-    <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='secure_getenv' filepath='/usr/include/stdlib.h' line='644' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='secure_getenv' filepath='/usr/include/stdlib.h' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='memcmp' filepath='/usr/include/string.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strncpy' filepath='/usr/include/string.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-22'/>
+    <function-decl name='strncpy' filepath='/usr/include/string.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-22'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='strcmp' filepath='/usr/include/string.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strcmp' filepath='/usr/include/string.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strdup' filepath='/usr/include/string.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strdup' filepath='/usr/include/string.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='ioctl' filepath='/usr/include/sys/ioctl.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-3'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <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-259'/>
-      <return type-id='type-id-21'/>
+      <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-21'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-21'/>
+      <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-235'/>
-      <return type-id='type-id-21'/>
+      <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-260'/>
-      <return type-id='type-id-21'/>
+      <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-21'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
+      <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'>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-9'/>
     </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-21'/>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='write' filepath='/usr/include/unistd.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
+      <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-243'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-247'/>
+      <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-236'/>
+      <return type-id='type-id-238'/>
     </function-decl>
-    <function-decl name='unlink' filepath='/usr/include/unistd.h' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <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-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-248'>
-      <return type-id='type-id-21'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-249'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-38'/>
-      <return type-id='type-id-21'/>
+    <function-type size-in-bits='64' id='type-id-252'>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-250'>
-      <parameter type-id='type-id-39'/>
+    <function-type size-in-bits='64' id='type-id-254'>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-251'>
-      <parameter type-id='type-id-39'/>
+    <function-type size-in-bits='64' id='type-id-255'>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-257'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-261'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-252'>
-      <parameter type-id='type-id-39'/>
+    <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-244'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-265'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-253'>
-      <parameter type-id='type-id-39'/>
+    <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'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-265'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-254'>
-      <parameter type-id='type-id-39'/>
+    <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-262'/>
-      <parameter type-id='type-id-257'/>
-      <parameter type-id='type-id-261'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36'/>
+      <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-255'>
-      <parameter type-id='type-id-39'/>
+    <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-35'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-37'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-38'/>
+      <parameter type-id='type-id-248'/>
+      <return type-id='type-id-9'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-256'>
-      <parameter type-id='type-id-39'/>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-35'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-244'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-248'/>
+      <return type-id='type-id-9'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-253'>
+      <parameter type-id='type-id-251'/>
+      <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'>
-    <typedef-decl name='cookie_read_function_t' type-id='type-id-263' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='27' column='1' id='type-id-264'/>
-    <typedef-decl name='cookie_write_function_t' type-id='type-id-265' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='36' column='1' id='type-id-266'/>
-    <typedef-decl name='cookie_seek_function_t' type-id='type-id-267' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='45' column='1' id='type-id-268'/>
-    <typedef-decl name='cookie_close_function_t' type-id='type-id-269' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='48' column='1' id='type-id-270'/>
-    <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-271'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='read' type-id='type-id-272' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='57' column='1'/>
+        <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='write' type-id='type-id-273' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='58' column='1'/>
+        <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='seek' type-id='type-id-274' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='59' column='1'/>
+        <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='close' type-id='type-id-275' visibility='default' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='60' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='cookie_io_functions_t' type-id='type-id-271' filepath='/usr/include/bits/types/cookie_io_functions_t.h' line='61' column='1' id='type-id-276'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-277'/>
-    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-273'/>
-    <qualified-type-def type-id='type-id-12' restrict='yes' id='type-id-279'/>
+        <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'/>
     <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-11' name='n' filepath='src/error.c' line='33' column='1'/>
-      <parameter type-id='type-id-278' name='filename' filepath='src/error.c' line='34' column='1'/>
-      <parameter type-id='type-id-278' name='function' filepath='src/error.c' line='35' column='1'/>
-      <parameter type-id='type-id-204' name='line' filepath='src/error.c' line='36' column='1'/>
-      <parameter type-id='type-id-278' name='message' filepath='src/error.c' line='37' column='1'/>
-      <parameter type-id='type-id-204' name='error' filepath='src/error.c' line='38' column='1'/>
-      <return type-id='type-id-21'/>
+      <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-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-41' name='error' filepath='src/error.c' line='38' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_error_pop' mangled-name='efi_error_pop' filepath='src/error.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_error_pop@@LIBEFIVAR_1.38'>
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='efi_set_verbose' mangled-name='efi_set_verbose' filepath='src/error.c' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_set_verbose@@LIBEFIVAR_1.36'>
-      <parameter type-id='type-id-21' name='verbosity' filepath='src/error.c' line='279' column='1'/>
-      <parameter type-id='type-id-30' name='errlog' filepath='src/error.c' line='279' column='1'/>
-      <return type-id='type-id-19'/>
+      <parameter type-id='type-id-9' name='verbosity' filepath='src/error.c' line='279' column='1'/>
+      <parameter type-id='type-id-27' name='errlog' filepath='src/error.c' line='279' column='1'/>
+      <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='efi_get_verbose' mangled-name='efi_get_verbose' filepath='src/error.c' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_verbose@@LIBEFIVAR_1.36'>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='fclose' filepath='/usr/include/stdio.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-21'/>
+    <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-27'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='fopencookie' filepath='/usr/include/stdio.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-279'/>
+    <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-34'/>
-      <parameter type-id='type-id-276'/>
-      <return type-id='type-id-30'/>
+      <parameter type-id='type-id-275'/>
+      <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='vasprintf' filepath='/usr/include/stdio.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-245'/>
+    <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-34'/>
       <parameter type-id='type-id-32'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='fwrite' filepath='/usr/include/stdio.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-279'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-29'/>
+    <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-20'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-28'/>
+      <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='fseek' filepath='/usr/include/stdio.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-21'/>
+    <function-decl name='fseek' filepath='/usr/include/stdio.h' line='771' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='ftell' filepath='/usr/include/stdio.h' line='712' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-14'/>
+    <function-decl name='ftell' filepath='/usr/include/stdio.h' line='776' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-26'/>
     </function-decl>
-    <function-decl name='feof' filepath='/usr/include/stdio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-21'/>
+    <function-decl name='feof' filepath='/usr/include/stdio.h' line='846' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='ferror' filepath='/usr/include/stdio.h' line='784' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-21'/>
+    <function-decl name='ferror' filepath='/usr/include/stdio.h' line='848' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-27'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='getrandom' filepath='/usr/include/sys/random.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-11'/>
-      <return type-id='type-id-36'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-269'>
-      <parameter type-id='type-id-12'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
+      <return type-id='type-id-37'/>
+    </function-decl>
+    <function-type size-in-bits='64' id='type-id-273'>
+      <parameter type-id='type-id-19'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-267'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-277'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-21'/>
+    <function-type size-in-bits='64' id='type-id-278'>
+      <parameter type-id='type-id-19'/>
+      <parameter type-id='type-id-282'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-263'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-198'/>
+    <function-type size-in-bits='64' id='type-id-276'>
+      <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-265'>
-      <parameter type-id='type-id-12'/>
+    <function-type size-in-bits='64' id='type-id-280'>
+      <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-198'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-185'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='export.c' comp-dir-path='src' language='LANG_C11'>
-    <typedef-decl name='efi_variable_t' type-id='type-id-280' filepath='src/include/efivar/efivar.h' line='79' column='1' id='type-id-281'/>
-    <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-280'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='attrs' type-id='type-id-43' 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='14' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='guid' type-id='type-id-50' 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='15' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='name' type-id='type-id-205' 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='16' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-35' 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='17' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='data_size' type-id='type-id-29' 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='18' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-284'/>
+    <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'/>
+    <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'/>
     <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-12'/>
+      <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-37'/>
-      <return type-id='type-id-37'/>
+      <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-35' name='data' filepath='src/export.c' line='315' column='1'/>
-      <parameter type-id='type-id-29' name='size' filepath='src/export.c' line='315' column='1'/>
-      <parameter type-id='type-id-283' name='var_out' filepath='src/export.c' line='315' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='328' column='1'/>
-      <parameter type-id='type-id-35' name='data' filepath='src/export.c' line='328' column='1'/>
-      <parameter type-id='type-id-29' name='datasz' filepath='src/export.c' line='328' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='458' column='1'/>
-      <parameter type-id='type-id-35' name='data' filepath='src/export.c' line='458' column='1'/>
-      <parameter type-id='type-id-29' name='datasz' filepath='src/export.c' line='458' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-282'/>
+      <return type-id='type-id-288'/>
     </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-282' name='var' filepath='src/export.c' line='607' column='1'/>
-      <parameter type-id='type-id-21' name='free_data' filepath='src/export.c' line='607' column='1'/>
-      <return type-id='type-id-19'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='628' column='1'/>
-      <parameter type-id='type-id-205' name='name' filepath='src/export.c' line='628' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='635' column='1'/>
-      <return type-id='type-id-205'/>
+      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='635' 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-282' name='var' filepath='src/export.c' line='646' column='1'/>
-      <parameter type-id='type-id-50' name='guid' filepath='src/export.c' line='646' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='653' column='1'/>
-      <parameter type-id='type-id-247' name='guid' filepath='src/export.c' line='653' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='665' column='1'/>
-      <parameter type-id='type-id-35' name='data' filepath='src/export.c' line='665' column='1'/>
-      <parameter type-id='type-id-29' name='size' filepath='src/export.c' line='665' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='678' column='1'/>
-      <parameter type-id='type-id-262' name='data' filepath='src/export.c' line='678' column='1'/>
-      <parameter type-id='type-id-257' name='size' filepath='src/export.c' line='678' column='1'/>
-      <return type-id='type-id-36'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='691' column='1'/>
-      <parameter type-id='type-id-43' name='attrs' filepath='src/export.c' line='691' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='698' column='1'/>
-      <parameter type-id='type-id-284' name='attrs' filepath='src/export.c' line='698' column='1'/>
-      <return type-id='type-id-21'/>
+      <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'/>
+      <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-282' name='var' filepath='src/export.c' line='710' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-288' name='var' filepath='src/export.c' line='710' 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'>
-      <parameter type-id='type-id-39'/>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-35'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-244'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-38'/>
+      <parameter type-id='type-id-248'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='efi_append_variable' mangled-name='efi_append_variable' filepath='src/include/efivar/efivar.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_append_variable@@libefivar.so.0'>
-      <parameter type-id='type-id-39'/>
+    <function-decl name='efi_append_variable' filepath='src/include/efivar/efivar.h' line='48' 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-35'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-37'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36'/>
+      <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-285' size-in-bits='263424' id='type-id-286'>
-      <subrange length='42' type-id='type-id-3' id='type-id-287'/>
+    <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>
-    <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-288'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='guid' type-id='type-id-39' visibility='default' filepath='src/guid-symbols.c' line='202' column='1'/>
+        <var-decl name='guid' type-id='type-id-43' visibility='default' filepath='src/guid-symbols.c' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='symbol' type-id='type-id-213' visibility='default' filepath='src/guid-symbols.c' line='203' column='1'/>
+        <var-decl name='symbol' type-id='type-id-217' visibility='default' filepath='src/guid-symbols.c' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='name' type-id='type-id-213' visibility='default' filepath='src/guid-symbols.c' line='204' column='1'/>
+        <var-decl name='name' type-id='type-id-217' visibility='default' filepath='src/guid-symbols.c' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='description' type-id='type-id-213' visibility='default' filepath='src/guid-symbols.c' line='205' column='1'/>
-      </data-member>
-    </class-decl>
-    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-289'/>
-    <var-decl name='efi_guid_empty' type-id='type-id-40' 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-40' 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-40' 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'/>
-    <var-decl name='efi_guid_redhat' type-id='type-id-40' mangled-name='efi_guid_redhat' visibility='default' filepath='src/guid-symbols.c' line='36' column='1' elf-symbol-id='efi_guid_redhat@@libefivar.so.0'/>
-    <var-decl name='efi_guid_sha512' type-id='type-id-40' mangled-name='efi_guid_sha512' visibility='default' filepath='src/guid-symbols.c' line='40' column='1' elf-symbol-id='efi_guid_sha512@@libefivar.so.0'/>
-    <var-decl name='efi_guid_fwupdate' type-id='type-id-40' mangled-name='efi_guid_fwupdate' visibility='default' filepath='src/guid-symbols.c' line='44' column='1' elf-symbol-id='efi_guid_fwupdate@@LIBEFIVAR_1.35'/>
-    <var-decl name='efi_guid_sha224' type-id='type-id-40' mangled-name='efi_guid_sha224' visibility='default' filepath='src/guid-symbols.c' line='48' column='1' elf-symbol-id='efi_guid_sha224@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_boot_menu' type-id='type-id-40' mangled-name='efi_guid_lenovo_boot_menu' visibility='default' filepath='src/guid-symbols.c' line='52' column='1' elf-symbol-id='efi_guid_lenovo_boot_menu@@libefivar.so.0'/>
-    <var-decl name='efi_guid_supermicro' type-id='type-id-40' mangled-name='efi_guid_supermicro' visibility='default' filepath='src/guid-symbols.c' line='56' column='1' elf-symbol-id='efi_guid_supermicro@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_asus' type-id='type-id-40' mangled-name='efi_guid_asus' visibility='default' filepath='src/guid-symbols.c' line='60' column='1' elf-symbol-id='efi_guid_asus@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_ux_capsule' type-id='type-id-40' mangled-name='efi_guid_ux_capsule' visibility='default' filepath='src/guid-symbols.c' line='64' column='1' elf-symbol-id='efi_guid_ux_capsule@@LIBEFIVAR_1.33'/>
-    <var-decl name='efi_guid_x509_sha256' type-id='type-id-40' mangled-name='efi_guid_x509_sha256' visibility='default' filepath='src/guid-symbols.c' line='68' column='1' elf-symbol-id='efi_guid_x509_sha256@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048' type-id='type-id-40' mangled-name='efi_guid_rsa2048' visibility='default' filepath='src/guid-symbols.c' line='72' column='1' elf-symbol-id='efi_guid_rsa2048@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo' type-id='type-id-40' mangled-name='efi_guid_lenovo' visibility='default' filepath='src/guid-symbols.c' line='76' column='1' elf-symbol-id='efi_guid_lenovo@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_diag' type-id='type-id-40' mangled-name='efi_guid_lenovo_diag' visibility='default' filepath='src/guid-symbols.c' line='80' column='1' elf-symbol-id='efi_guid_lenovo_diag@@libefivar.so.0'/>
-    <var-decl name='efi_guid_x509_sha512' type-id='type-id-40' mangled-name='efi_guid_x509_sha512' visibility='default' filepath='src/guid-symbols.c' line='84' column='1' elf-symbol-id='efi_guid_x509_sha512@@libefivar.so.0'/>
-    <var-decl name='efi_guid_external_management' type-id='type-id-40' mangled-name='efi_guid_external_management' visibility='default' filepath='src/guid-symbols.c' line='88' column='1' elf-symbol-id='efi_guid_external_management@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_pkcs7_cert' type-id='type-id-40' mangled-name='efi_guid_pkcs7_cert' visibility='default' filepath='src/guid-symbols.c' line='92' column='1' elf-symbol-id='efi_guid_pkcs7_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_fives' type-id='type-id-40' mangled-name='efi_guid_fives' visibility='default' filepath='src/guid-symbols.c' line='96' column='1' elf-symbol-id='efi_guid_fives@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_shim' type-id='type-id-40' mangled-name='efi_guid_shim' visibility='default' filepath='src/guid-symbols.c' line='100' column='1' elf-symbol-id='efi_guid_shim@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_rescue' type-id='type-id-40' mangled-name='efi_guid_lenovo_rescue' visibility='default' filepath='src/guid-symbols.c' line='104' column='1' elf-symbol-id='efi_guid_lenovo_rescue@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha1' type-id='type-id-40' mangled-name='efi_guid_rsa2048_sha1' visibility='default' filepath='src/guid-symbols.c' line='108' column='1' elf-symbol-id='efi_guid_rsa2048_sha1@@libefivar.so.0'/>
-    <var-decl name='efi_guid_canonical' type-id='type-id-40' mangled-name='efi_guid_canonical' visibility='default' filepath='src/guid-symbols.c' line='112' column='1' elf-symbol-id='efi_guid_canonical@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_dell' type-id='type-id-40' mangled-name='efi_guid_dell' visibility='default' filepath='src/guid-symbols.c' line='116' column='1' elf-symbol-id='efi_guid_dell@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_x509_sha384' type-id='type-id-40' mangled-name='efi_guid_x509_sha384' visibility='default' filepath='src/guid-symbols.c' line='120' column='1' elf-symbol-id='efi_guid_x509_sha384@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_setup' type-id='type-id-40' mangled-name='efi_guid_lenovo_setup' visibility='default' filepath='src/guid-symbols.c' line='124' column='1' elf-symbol-id='efi_guid_lenovo_setup@@libefivar.so.0'/>
-    <var-decl name='efi_guid_microsoft' type-id='type-id-40' mangled-name='efi_guid_microsoft' visibility='default' filepath='src/guid-symbols.c' line='128' column='1' elf-symbol-id='efi_guid_microsoft@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_2' type-id='type-id-40' mangled-name='efi_guid_lenovo_2' visibility='default' filepath='src/guid-symbols.c' line='132' column='1' elf-symbol-id='efi_guid_lenovo_2@@libefivar.so.0'/>
-    <var-decl name='efi_guid_auto_created_boot_option' type-id='type-id-40' mangled-name='efi_guid_auto_created_boot_option' visibility='default' filepath='src/guid-symbols.c' line='136' column='1' elf-symbol-id='efi_guid_auto_created_boot_option@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_sha1' type-id='type-id-40' mangled-name='efi_guid_sha1' visibility='default' filepath='src/guid-symbols.c' line='140' column='1' elf-symbol-id='efi_guid_sha1@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_me_config' type-id='type-id-40' mangled-name='efi_guid_lenovo_me_config' visibility='default' filepath='src/guid-symbols.c' line='144' column='1' elf-symbol-id='efi_guid_lenovo_me_config@@libefivar.so.0'/>
-    <var-decl name='efi_guid_global' type-id='type-id-40' mangled-name='efi_guid_global' visibility='default' filepath='src/guid-symbols.c' line='148' column='1' elf-symbol-id='efi_guid_global@@libefivar.so.0'/>
-    <var-decl name='efi_guid_grub' type-id='type-id-40' mangled-name='efi_guid_grub' visibility='default' filepath='src/guid-symbols.c' line='152' column='1' elf-symbol-id='efi_guid_grub@@LIBEFIVAR_1.38'/>
-    <var-decl name='efi_guid_x509_cert' type-id='type-id-40' mangled-name='efi_guid_x509_cert' visibility='default' filepath='src/guid-symbols.c' line='156' column='1' elf-symbol-id='efi_guid_x509_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha256_cert' type-id='type-id-40' mangled-name='efi_guid_rsa2048_sha256_cert' visibility='default' filepath='src/guid-symbols.c' line='160' column='1' elf-symbol-id='efi_guid_rsa2048_sha256_cert@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_diag_splash' type-id='type-id-40' mangled-name='efi_guid_lenovo_diag_splash' visibility='default' filepath='src/guid-symbols.c' line='164' column='1' elf-symbol-id='efi_guid_lenovo_diag_splash@@libefivar.so.0'/>
-    <var-decl name='efi_guid_lenovo_msg' type-id='type-id-40' mangled-name='efi_guid_lenovo_msg' visibility='default' filepath='src/guid-symbols.c' line='168' column='1' elf-symbol-id='efi_guid_lenovo_msg@@libefivar.so.0'/>
-    <var-decl name='efi_guid_sha256' type-id='type-id-40' mangled-name='efi_guid_sha256' visibility='default' filepath='src/guid-symbols.c' line='172' column='1' elf-symbol-id='efi_guid_sha256@@libefivar.so.0'/>
-    <var-decl name='efi_guid_shell' type-id='type-id-40' mangled-name='efi_guid_shell' visibility='default' filepath='src/guid-symbols.c' line='176' column='1' elf-symbol-id='efi_guid_shell@@libefivar.so.0'/>
-    <var-decl name='efi_guid_security' type-id='type-id-40' mangled-name='efi_guid_security' visibility='default' filepath='src/guid-symbols.c' line='180' column='1' elf-symbol-id='efi_guid_security@@libefivar.so.0'/>
-    <var-decl name='efi_guid_rsa2048_sha256' type-id='type-id-40' 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-40' 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-40' 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-289' 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-289' 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-286' 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-286' 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='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'/>
+    <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'/>
+    <var-decl name='efi_guid_redhat' type-id='type-id-44' mangled-name='efi_guid_redhat' visibility='default' filepath='src/guid-symbols.c' line='36' column='1' elf-symbol-id='efi_guid_redhat@@libefivar.so.0'/>
+    <var-decl name='efi_guid_sha512' type-id='type-id-44' mangled-name='efi_guid_sha512' visibility='default' filepath='src/guid-symbols.c' line='40' column='1' elf-symbol-id='efi_guid_sha512@@libefivar.so.0'/>
+    <var-decl name='efi_guid_fwupdate' type-id='type-id-44' mangled-name='efi_guid_fwupdate' visibility='default' filepath='src/guid-symbols.c' line='44' column='1' elf-symbol-id='efi_guid_fwupdate@@LIBEFIVAR_1.35'/>
+    <var-decl name='efi_guid_sha224' type-id='type-id-44' mangled-name='efi_guid_sha224' visibility='default' filepath='src/guid-symbols.c' line='48' column='1' elf-symbol-id='efi_guid_sha224@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_boot_menu' type-id='type-id-44' mangled-name='efi_guid_lenovo_boot_menu' visibility='default' filepath='src/guid-symbols.c' line='52' column='1' elf-symbol-id='efi_guid_lenovo_boot_menu@@libefivar.so.0'/>
+    <var-decl name='efi_guid_supermicro' type-id='type-id-44' mangled-name='efi_guid_supermicro' visibility='default' filepath='src/guid-symbols.c' line='56' column='1' elf-symbol-id='efi_guid_supermicro@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_asus' type-id='type-id-44' mangled-name='efi_guid_asus' visibility='default' filepath='src/guid-symbols.c' line='60' column='1' elf-symbol-id='efi_guid_asus@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_ux_capsule' type-id='type-id-44' mangled-name='efi_guid_ux_capsule' visibility='default' filepath='src/guid-symbols.c' line='64' column='1' elf-symbol-id='efi_guid_ux_capsule@@LIBEFIVAR_1.33'/>
+    <var-decl name='efi_guid_x509_sha256' type-id='type-id-44' mangled-name='efi_guid_x509_sha256' visibility='default' filepath='src/guid-symbols.c' line='68' column='1' elf-symbol-id='efi_guid_x509_sha256@@libefivar.so.0'/>
+    <var-decl name='efi_guid_rsa2048' type-id='type-id-44' mangled-name='efi_guid_rsa2048' visibility='default' filepath='src/guid-symbols.c' line='72' column='1' elf-symbol-id='efi_guid_rsa2048@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo' type-id='type-id-44' mangled-name='efi_guid_lenovo' visibility='default' filepath='src/guid-symbols.c' line='76' column='1' elf-symbol-id='efi_guid_lenovo@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_diag' type-id='type-id-44' mangled-name='efi_guid_lenovo_diag' visibility='default' filepath='src/guid-symbols.c' line='80' column='1' elf-symbol-id='efi_guid_lenovo_diag@@libefivar.so.0'/>
+    <var-decl name='efi_guid_x509_sha512' type-id='type-id-44' mangled-name='efi_guid_x509_sha512' visibility='default' filepath='src/guid-symbols.c' line='84' column='1' elf-symbol-id='efi_guid_x509_sha512@@libefivar.so.0'/>
+    <var-decl name='efi_guid_external_management' type-id='type-id-44' mangled-name='efi_guid_external_management' visibility='default' filepath='src/guid-symbols.c' line='88' column='1' elf-symbol-id='efi_guid_external_management@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_pkcs7_cert' type-id='type-id-44' mangled-name='efi_guid_pkcs7_cert' visibility='default' filepath='src/guid-symbols.c' line='92' column='1' elf-symbol-id='efi_guid_pkcs7_cert@@libefivar.so.0'/>
+    <var-decl name='efi_guid_fives' type-id='type-id-44' mangled-name='efi_guid_fives' visibility='default' filepath='src/guid-symbols.c' line='96' column='1' elf-symbol-id='efi_guid_fives@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_shim' type-id='type-id-44' mangled-name='efi_guid_shim' visibility='default' filepath='src/guid-symbols.c' line='100' column='1' elf-symbol-id='efi_guid_shim@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_rescue' type-id='type-id-44' mangled-name='efi_guid_lenovo_rescue' visibility='default' filepath='src/guid-symbols.c' line='104' column='1' elf-symbol-id='efi_guid_lenovo_rescue@@libefivar.so.0'/>
+    <var-decl name='efi_guid_rsa2048_sha1' type-id='type-id-44' mangled-name='efi_guid_rsa2048_sha1' visibility='default' filepath='src/guid-symbols.c' line='108' column='1' elf-symbol-id='efi_guid_rsa2048_sha1@@libefivar.so.0'/>
+    <var-decl name='efi_guid_canonical' type-id='type-id-44' mangled-name='efi_guid_canonical' visibility='default' filepath='src/guid-symbols.c' line='112' column='1' elf-symbol-id='efi_guid_canonical@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_dell' type-id='type-id-44' mangled-name='efi_guid_dell' visibility='default' filepath='src/guid-symbols.c' line='116' column='1' elf-symbol-id='efi_guid_dell@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_x509_sha384' type-id='type-id-44' mangled-name='efi_guid_x509_sha384' visibility='default' filepath='src/guid-symbols.c' line='120' column='1' elf-symbol-id='efi_guid_x509_sha384@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_setup' type-id='type-id-44' mangled-name='efi_guid_lenovo_setup' visibility='default' filepath='src/guid-symbols.c' line='124' column='1' elf-symbol-id='efi_guid_lenovo_setup@@libefivar.so.0'/>
+    <var-decl name='efi_guid_microsoft' type-id='type-id-44' mangled-name='efi_guid_microsoft' visibility='default' filepath='src/guid-symbols.c' line='128' column='1' elf-symbol-id='efi_guid_microsoft@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_2' type-id='type-id-44' mangled-name='efi_guid_lenovo_2' visibility='default' filepath='src/guid-symbols.c' line='132' column='1' elf-symbol-id='efi_guid_lenovo_2@@libefivar.so.0'/>
+    <var-decl name='efi_guid_auto_created_boot_option' type-id='type-id-44' mangled-name='efi_guid_auto_created_boot_option' visibility='default' filepath='src/guid-symbols.c' line='136' column='1' elf-symbol-id='efi_guid_auto_created_boot_option@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_sha1' type-id='type-id-44' mangled-name='efi_guid_sha1' visibility='default' filepath='src/guid-symbols.c' line='140' column='1' elf-symbol-id='efi_guid_sha1@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_me_config' type-id='type-id-44' mangled-name='efi_guid_lenovo_me_config' visibility='default' filepath='src/guid-symbols.c' line='144' column='1' elf-symbol-id='efi_guid_lenovo_me_config@@libefivar.so.0'/>
+    <var-decl name='efi_guid_global' type-id='type-id-44' mangled-name='efi_guid_global' visibility='default' filepath='src/guid-symbols.c' line='148' column='1' elf-symbol-id='efi_guid_global@@libefivar.so.0'/>
+    <var-decl name='efi_guid_grub' type-id='type-id-44' mangled-name='efi_guid_grub' visibility='default' filepath='src/guid-symbols.c' line='152' column='1' elf-symbol-id='efi_guid_grub@@LIBEFIVAR_1.38'/>
+    <var-decl name='efi_guid_x509_cert' type-id='type-id-44' mangled-name='efi_guid_x509_cert' visibility='default' filepath='src/guid-symbols.c' line='156' column='1' elf-symbol-id='efi_guid_x509_cert@@libefivar.so.0'/>
+    <var-decl name='efi_guid_rsa2048_sha256_cert' type-id='type-id-44' mangled-name='efi_guid_rsa2048_sha256_cert' visibility='default' filepath='src/guid-symbols.c' line='160' column='1' elf-symbol-id='efi_guid_rsa2048_sha256_cert@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_diag_splash' type-id='type-id-44' mangled-name='efi_guid_lenovo_diag_splash' visibility='default' filepath='src/guid-symbols.c' line='164' column='1' elf-symbol-id='efi_guid_lenovo_diag_splash@@libefivar.so.0'/>
+    <var-decl name='efi_guid_lenovo_msg' type-id='type-id-44' mangled-name='efi_guid_lenovo_msg' visibility='default' filepath='src/guid-symbols.c' line='168' column='1' elf-symbol-id='efi_guid_lenovo_msg@@libefivar.so.0'/>
+    <var-decl name='efi_guid_sha256' type-id='type-id-44' mangled-name='efi_guid_sha256' visibility='default' filepath='src/guid-symbols.c' line='172' column='1' elf-symbol-id='efi_guid_sha256@@libefivar.so.0'/>
+    <var-decl name='efi_guid_shell' type-id='type-id-44' mangled-name='efi_guid_shell' visibility='default' filepath='src/guid-symbols.c' line='176' column='1' elf-symbol-id='efi_guid_shell@@libefivar.so.0'/>
+    <var-decl name='efi_guid_security' type-id='type-id-44' mangled-name='efi_guid_security' visibility='default' filepath='src/guid-symbols.c' line='180' column='1' elf-symbol-id='efi_guid_security@@libefivar.so.0'/>
+    <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'/>
   </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'/>
     <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-50' name='guid' filepath='src/guid.c' line='36' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-55' name='guid' filepath='src/guid.c' line='36' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_guid_to_name' mangled-name='efi_guid_to_name' filepath='src/guid.c' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_name@@libefivar.so.0'>
-      <parameter type-id='type-id-50' name='guid' filepath='src/guid.c' line='105' column='1'/>
-      <parameter type-id='type-id-38' name='name' filepath='src/guid.c' line='105' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-55' name='guid' filepath='src/guid.c' line='105' column='1'/>
+      <parameter type-id='type-id-42' name='name' filepath='src/guid.c' line='105' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_guid_to_symbol' mangled-name='efi_guid_to_symbol' filepath='src/guid.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_symbol@@libefivar.so.0'>
-      <parameter type-id='type-id-50' name='guid' filepath='src/guid.c' line='120' column='1'/>
-      <parameter type-id='type-id-38' name='symbol' filepath='src/guid.c' line='120' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-55' name='guid' filepath='src/guid.c' line='120' column='1'/>
+      <parameter type-id='type-id-42' name='symbol' filepath='src/guid.c' line='120' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_guid_to_id_guid' mangled-name='efi_guid_to_id_guid' filepath='src/guid.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_guid_to_id_guid@@libefivar.so.0'>
-      <parameter type-id='type-id-41' name='guid' filepath='src/guid.c' line='134' column='1'/>
-      <parameter type-id='type-id-38' name='sp' filepath='src/guid.c' line='134' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-45' name='guid' filepath='src/guid.c' line='134' column='1'/>
+      <parameter type-id='type-id-42' name='sp' filepath='src/guid.c' line='134' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_name_to_guid' mangled-name='efi_name_to_guid' filepath='src/guid.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_name_to_guid@@libefivar.so.0'>
       <parameter type-id='type-id-33' name='name' filepath='src/guid.c' line='186' column='1'/>
-      <parameter type-id='type-id-50' name='guid' filepath='src/guid.c' line='186' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-55' name='guid' filepath='src/guid.c' line='186' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='dlopen' filepath='/usr/include/dlfcn.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-12'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='dlclose' filepath='/usr/include/dlfcn.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-12'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-19'/>
+      <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-279'/>
+      <parameter type-id='type-id-284'/>
       <parameter type-id='type-id-34'/>
-      <return type-id='type-id-12'/>
+      <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='strncmp' filepath='/usr/include/string.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strncmp' filepath='/usr/include/string.h' line='159' 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-29'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='strndup' filepath='/usr/include/string.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strndup' filepath='/usr/include/string.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-22'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-10'/>
     </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'/>
     <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-39' name='guid' filepath='src/lib.c' line='33' column='1'/>
+      <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-35' name='data' filepath='src/lib.c' line='33' column='1'/>
-      <parameter type-id='type-id-29' name='data_size' filepath='src/lib.c' line='34' column='1'/>
-      <parameter type-id='type-id-37' name='attributes' filepath='src/lib.c' line='34' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36' 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'/>
     </function-decl>
     <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-39' name='guid' filepath='src/lib.c' line='50' column='1'/>
+      <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-35' name='data' filepath='src/lib.c' line='50' column='1'/>
-      <parameter type-id='type-id-29' name='data_size' filepath='src/lib.c' line='51' column='1'/>
-      <parameter type-id='type-id-37' name='attributes' filepath='src/lib.c' line='51' column='1'/>
+      <parameter type-id='type-id-36' 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'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <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-39' name='guid' filepath='src/lib.c' line='67' column='1'/>
+      <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-35' name='data' filepath='src/lib.c' line='67' column='1'/>
-      <parameter type-id='type-id-29' name='data_size' filepath='src/lib.c' line='68' column='1'/>
-      <parameter type-id='type-id-37' name='attributes' filepath='src/lib.c' line='68' column='1'/>
-      <parameter type-id='type-id-244' name='mode' filepath='src/lib.c' line='68' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-36' 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'/>
+      <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'>
-      <parameter type-id='type-id-39' name='guid' filepath='src/lib.c' line='112' column='1'/>
+      <parameter type-id='type-id-43' name='guid' filepath='src/lib.c' line='112' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='112' column='1'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <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-39' name='guid' filepath='src/lib.c' line='147' column='1'/>
+      <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-261' name='attributes' filepath='src/lib.c' line='148' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-265' 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'>
-      <parameter type-id='type-id-39' name='guid' filepath='src/lib.c' line='165' column='1'/>
+      <parameter type-id='type-id-43' name='guid' filepath='src/lib.c' line='165' column='1'/>
       <parameter type-id='type-id-33' name='name' filepath='src/lib.c' line='165' column='1'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <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-39' name='guid' filepath='src/lib.c' line='172' column='1'/>
+      <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-257' name='size' filepath='src/lib.c' line='172' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-261' 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-247' name='guid' filepath='src/lib.c' line='189' column='1'/>
-      <parameter type-id='type-id-38' name='name' filepath='src/lib.c' line='189' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-251' 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-39' name='guid' filepath='src/lib.c' line='206' column='1'/>
+      <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-244' name='mode' filepath='src/lib.c' line='206' column='1'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-248' 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'>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='efi_get_libefivar_version' mangled-name='efi_get_libefivar_version' filepath='src/lib.c' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_get_libefivar_version@@LIBEFIVAR_1.38'>
-      <return type-id='type-id-37'/>
+      <return type-id='type-id-38'/>
     </function-decl>
-    <function-decl name='printf' filepath='/usr/include/stdio.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='printf' filepath='/usr/include/stdio.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='exit' filepath='/usr/include/stdlib.h' line='622' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-19'/>
+    <function-decl name='exit' filepath='/usr/include/stdlib.h' line='756' 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='strcasestr' filepath='/usr/include/string.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='strcasestr' filepath='/usr/include/string.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-10'/>
     </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-290'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tm_sec' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='9' column='1'/>
+        <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>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='tm_min' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='10' column='1'/>
+        <var-decl name='tm_min' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='10' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tm_hour' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='11' column='1'/>
+        <var-decl name='tm_hour' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='11' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='tm_mday' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='12' column='1'/>
+        <var-decl name='tm_mday' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='12' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tm_mon' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='13' column='1'/>
+        <var-decl name='tm_mon' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='13' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='tm_year' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='14' column='1'/>
+        <var-decl name='tm_year' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='14' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='tm_wday' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='15' column='1'/>
+        <var-decl name='tm_wday' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='15' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='tm_yday' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='16' column='1'/>
+        <var-decl name='tm_yday' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='16' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='tm_isdst' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='17' column='1'/>
+        <var-decl name='tm_isdst' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='17' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='tm_gmtoff' type-id='type-id-14' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='20' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <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-242' filepath='/usr/include/bits/types/time_t.h' line='10' column='1' id='type-id-291'/>
-    <qualified-type-def type-id='type-id-22' restrict='yes' id='type-id-292'/>
-    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
-    <qualified-type-def type-id='type-id-294' restrict='yes' id='type-id-295'/>
-    <qualified-type-def type-id='type-id-290' 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-297' restrict='yes' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-299'/>
-    <qualified-type-def type-id='type-id-299' restrict='yes' id='type-id-300'/>
-    <function-decl name='setenv' filepath='/usr/include/stdlib.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <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'/>
+    <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'/>
+    <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'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='unsetenv' filepath='/usr/include/stdlib.h' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='unsetenv' filepath='/usr/include/stdlib.h' line='796' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-21'/>
+      <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-299'/>
-      <return type-id='type-id-291'/>
+      <parameter type-id='type-id-308'/>
+      <return type-id='type-id-300'/>
     </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-292'/>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-298'/>
-      <return type-id='type-id-29'/>
+      <parameter type-id='type-id-307'/>
+      <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='strptime' filepath='/usr/include/time.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <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-299'/>
-      <return type-id='type-id-22'/>
+      <parameter type-id='type-id-308'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='gmtime_r' filepath='/usr/include/time.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-295'/>
-      <parameter type-id='type-id-300'/>
-      <return type-id='type-id-299'/>
+    <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'/>
     </function-decl>
-    <function-decl name='localtime_r' filepath='/usr/include/time.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-295'/>
-      <parameter type-id='type-id-300'/>
-      <return type-id='type-id-299'/>
+    <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'/>
     </function-decl>
-    <function-decl name='asctime' filepath='/usr/include/time.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-297'/>
-      <return type-id='type-id-22'/>
+    <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'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='asctime_r' filepath='/usr/include/time.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-298'/>
-      <parameter type-id='type-id-292'/>
-      <return type-id='type-id-22'/>
+    <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'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='tzset' filepath='/usr/include/time.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-19'/>
+    <function-decl name='tzset' filepath='/usr/include/time.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-24'/>
     </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-301'/>
-    <var-decl name='vars_ops' type-id='type-id-216' visibility='default' filepath='src/lib.h' line='42' column='1'/>
+    <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-21'/>
+      <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-9'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-21'/>
-    </function-decl>
-    <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-34'/>
-      <parameter type-id='type-id-245'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-301'/>
+      <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-235'/>
-      <return type-id='type-id-235'/>
+      <parameter type-id='type-id-237'/>
+      <return type-id='type-id-237'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>