[applied] dwarf-reader: Support Ada subranges having upper_bound < lower_bound

Message ID 87pm8il3ga.fsf@redhat.com
State New
Headers
Series [applied] dwarf-reader: Support Ada subranges having upper_bound < lower_bound |

Commit Message

Dodji Seketeli April 5, 2023, 4:05 p.m. UTC
  Hello,

If the subrange's upper_bound is lower than its lower_bound, that
means the subrange has a length of zero.  This is Ada lingo.  You can
learn more about this at
https://en.wikibooks.org/wiki/Ada_Programming/Types/array#Array_Attributes,
for instance.

This patch teaches the DWARF reader about this.

	* src/abg-dwarf-reader.cc (build_subrange_type): Be aware that
	the upper_bound can be lower than lower_bound..  This most
	likely means the length of the subrange is zero.
	* src/abg-ir.cc (array_type_def::subrange_type::get_length): If
	lower_bound > upper_bound, then length is zero.  This is Ada
	lingo.
	* src/abg-writer.cc (write_array_subrange_type): Always emit
	lower_bound and upper_bound.  Acknowledge that if lower_bound >
	upper_bound, it means length is zero.
	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Adjust.
	* tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise.
	* tests/data/test-annotate/test13-pr18894.so.abi: Likewise.
	* tests/data/test-annotate/test14-pr18893.so.abi: Likewise.
	* tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
	* tests/data/test-annotate/test17-pr19027.so.abi: Likewise.
	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Likewise.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Likewise.
	* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
	* tests/data/test-annotate/test7.so.abi: Likewise.
	* tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi:
	Likewise.
	* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi:
	Likewise.
	* tests/data/test-read-btf/test0.o.abi: Likewise.
	* tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi:
	Likewise.
	* tests/data/test-read-ctf/test-array-mdimension.abi: Likewise.
	* tests/data/test-read-ctf/test-array-of-pointers.abi: Likewise.
	* tests/data/test-read-ctf/test-array-size.abi: Likewise.
	* tests/data/test-read-ctf/test-const-array.abi: Likewise.
	* tests/data/test-read-ctf/test-dynamic-array.o.abi: Likewise.
	* tests/data/test-read-ctf/test0.abi: Likewise.
	* tests/data/test-read-ctf/test0.hash.abi: Likewise.
	* tests/data/test-read-ctf/test9.o.abi: Likewise.
	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
	* tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi:
	Likewise.
	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise.
	* tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test7.so.abi: Likewise.
	* tests/data/test-read-dwarf/test7.so.hash.abi: Likewise.
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise.
	* tests/data/test-read-write/test25.xml: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-dwarf-reader.cc                       |    29 +-
 src/abg-ir.cc                                 |     8 +-
 src/abg-writer.cc                             |    16 +-
 .../test-annotate/libtest24-drop-fns-2.so.abi |     4 +-
 .../test-annotate/libtest24-drop-fns.so.abi   |     4 +-
 .../data/test-annotate/test13-pr18894.so.abi  |     6 +-
 .../data/test-annotate/test14-pr18893.so.abi  |    82 +-
 .../data/test-annotate/test15-pr18892.so.abi  |   106 +-
 .../data/test-annotate/test17-pr19027.so.abi  |   146 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    22 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |    72 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |    12 +-
 .../data/test-annotate/test21-pr19092.so.abi  |    54 +-
 tests/data/test-annotate/test7.so.abi         |    16 +-
 .../PR25409-librte_bus_dpaa.so.20.0.abi       |  7195 +++---
 ...-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt |   315 -
 .../test0-pr19026-libvtkIOSQL-6.1.so.1.abi    | 18400 ++++++++--------
 tests/data/test-read-btf/test0.o.abi          |     4 +-
 .../test-ambiguous-struct-A.o.hash.abi        |     2 +-
 .../test-read-ctf/test-array-mdimension.abi   |     8 +-
 .../test-read-ctf/test-array-of-pointers.abi  |     2 +-
 tests/data/test-read-ctf/test-array-size.abi  |     6 +-
 tests/data/test-read-ctf/test-const-array.abi |     2 +-
 .../test-read-ctf/test-dynamic-array.o.abi    |     2 +-
 tests/data/test-read-ctf/test0.abi            |     2 +-
 tests/data/test-read-ctf/test0.hash.abi       |     2 +-
 tests/data/test-read-ctf/test9.o.abi          |    14 +-
 .../PR22015-libboost_iostreams.so.abi         |     2 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    |    54 +-
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi |  2278 +-
 .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi |    20 +-
 .../libtest24-drop-fns-2.so.abi               |     4 +-
 .../test-read-dwarf/libtest24-drop-fns.so.abi |     4 +-
 .../test-read-dwarf/test-libaaudio.so.abi     |     2 +-
 .../test-read-dwarf/test-libandroid.so.abi    |    68 +-
 .../test-read-dwarf/test10-pr18818-gcc.so.abi |    14 +-
 .../test-read-dwarf/test11-pr18828.so.abi     |    36 +-
 .../test-read-dwarf/test12-pr18844.so.abi     |    46 +-
 .../test-read-dwarf/test13-pr18894.so.abi     |     6 +-
 .../test-read-dwarf/test14-pr18893.so.abi     |    82 +-
 .../test-read-dwarf/test15-pr18892.so.abi     |   106 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |    54 +-
 .../test-read-dwarf/test17-pr19027.so.abi     |   146 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    22 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |    72 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |    12 +-
 .../test-read-dwarf/test21-pr19092.so.abi     |    54 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |    86 +-
 tests/data/test-read-dwarf/test7.so.abi       |    16 +-
 tests/data/test-read-dwarf/test7.so.hash.abi  |    16 +-
 .../test9-pr18818-clang.so.abi                |     6 +-
 tests/data/test-read-write/test25.xml         |    14 +-
 52 files changed, 15135 insertions(+), 14616 deletions(-)
  

Patch

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 5ca1cee7..4b43cf54 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -14115,6 +14115,7 @@  build_subrange_type(reader&		rdr,
   array_type_def::subrange_type::bound_value upper_bound;
   uint64_t count = 0;
   bool is_infinite = false;
+  bool count_present = false;
 
   // The DWARF 4 specifications says, in [5.11 Subrange
   // Type Entries]:
@@ -14141,15 +14142,17 @@  build_subrange_type(reader&		rdr,
       //
       // So, as DW_AT_upper_bound is not present in this
       // case, let's see if there is a DW_AT_count.
-      die_unsigned_constant_attribute(die, DW_AT_count, count);
-
-      // We can deduce the upper_bound from the
-      // lower_bound and the number of elements of the
-      // array:
-      if (int64_t u = lower_bound.get_signed_value() + count)
-	upper_bound = u - 1;
+      if (die_unsigned_constant_attribute(die, DW_AT_count, count))
+	{
+	  count_present = true;
+	  // We can deduce the upper_bound from the
+	  // lower_bound and the number of elements of the
+	  // array:
+	  int64_t u = lower_bound.get_signed_value() + count;
+	  upper_bound = u - 1;
+	}
 
-      if (upper_bound.get_unsigned_value() == 0 && count == 0)
+      if (!count_present)
 	// No upper_bound nor count was present on the DIE, this means
 	// the array is considered to have an infinite (or rather not
 	// known) size.
@@ -14157,12 +14160,9 @@  build_subrange_type(reader&		rdr,
     }
 
   if (UINT64_MAX == upper_bound.get_unsigned_value())
-    {
-      // If the upper_bound size is the max of the integer value, then
-      // it most certainly means infinite size.
-      is_infinite = true;
-      upper_bound.set_unsigned(0);
-    }
+    // If the upper_bound size is the max of the integer value
+    // then it most certainly means unknown size.
+    is_infinite = true;
 
   result.reset
     (new array_type_def::subrange_type(rdr.env(),
@@ -14175,6 +14175,7 @@  build_subrange_type(reader&		rdr,
   if (underlying_type)
     result->set_underlying_type(underlying_type);
 
+  // Let's ensure the resulting subrange looks metabolically healhty.
   ABG_ASSERT(result->is_infinite()
 	     || (result->get_length() ==
 		 (uint64_t) (result->get_upper_bound()
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index ce553653..64dfee79 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -17396,8 +17396,12 @@  array_type_def::subrange_type::get_length() const
   if (is_infinite())
     return 0;
 
-  ABG_ASSERT(get_upper_bound() >= get_lower_bound());
-  return get_upper_bound() - get_lower_bound() + 1;
+  // A subrange can have an upper bound that is lower than its lower
+  // bound.  This is possible in Ada for instance.  In that case, the
+  // length of the subrange is considered to be zero.
+  if (get_upper_bound() >= get_lower_bound())
+    return get_upper_bound() - get_lower_bound() + 1;
+  return 0;
 }
 
 /// Test if the length of the subrange type is infinite.
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index bd3f8db7..dbe43e22 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -2906,15 +2906,13 @@  write_array_subrange_type(const array_type_def::subrange_sptr&	decl,
 
   o << "'";
 
-  if (decl->get_lower_bound())
-    {
-      ABG_ASSERT(decl->is_infinite()
-		 || (decl->get_length() ==
-		     (uint64_t) (decl->get_upper_bound()
-				 - decl->get_lower_bound() + 1)));
-      o << " lower-bound='" << decl->get_lower_bound() << "' upper-bound='"
-	<< decl->get_upper_bound() << "'";
-    }
+  ABG_ASSERT(decl->is_infinite()
+	     || decl->get_length() == 0
+	     || (decl->get_length() ==
+		 (uint64_t) (decl->get_upper_bound()
+			     - decl->get_lower_bound() + 1)));
+  o << " lower-bound='" << decl->get_lower_bound() << "' upper-bound='"
+    << decl->get_upper_bound() << "'";
 
   type_base_sptr underlying_type = decl->get_underlying_type();
   if (underlying_type)
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index 5cd5a8e6..538e6c9d 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -25,7 +25,7 @@ 
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-6'/>
@@ -257,7 +257,7 @@ 
     <!-- unsigned long int[] -->
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='unknown' id='type-id-34'>
       <!-- <anonymous range>[] -->
-      <subrange length='unknown' id='type-id-35'/>
+      <subrange length='unknown' lower-bound='0' upper-bound='0' id='type-id-35'/>
     </array-type-def>
     <!-- unsigned long long int -->
     <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-36'/>
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 5cd5a8e6..538e6c9d 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -25,7 +25,7 @@ 
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-6'/>
@@ -257,7 +257,7 @@ 
     <!-- unsigned long int[] -->
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='unknown' id='type-id-34'>
       <!-- <anonymous range>[] -->
-      <subrange length='unknown' id='type-id-35'/>
+      <subrange length='unknown' lower-bound='0' upper-bound='0' id='type-id-35'/>
     </array-type-def>
     <!-- unsigned long long int -->
     <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-36'/>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 2d8ae965..cf0f97ea 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -987,7 +987,7 @@ 
     <!-- DBusHeaderField[10] -->
     <array-type-def dimensions='1' type-id='type-id-49' size-in-bits='320' id='type-id-50'>
       <!-- <anonymous range>[10] -->
-      <subrange length='10' type-id='type-id-30' id='type-id-51'/>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-30' id='type-id-51'/>
     </array-type-def>
     <!-- enum DBusDispatchStatus -->
     <enum-decl name='DBusDispatchStatus' naming-typedef-id='type-id-47' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='80' column='1' id='type-id-52'>
@@ -3344,12 +3344,12 @@ 
     <!-- char[16] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-155'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-30' id='type-id-156'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-30' id='type-id-156'/>
     </array-type-def>
     <!-- dbus_uint32_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-157'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-30' id='type-id-158'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-30' id='type-id-158'/>
     </array-type-def>
     <!-- struct DBusServer -->
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-159'>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 10613f41..d34adb81 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -130,12 +130,12 @@ 
     <!-- REAL[160] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
       <!-- <anonymous range>[160] -->
-      <subrange length='160' type-id='type-id-3' id='type-id-4'/>
+      <subrange length='160' lower-bound='0' upper-bound='159' type-id='type-id-3' id='type-id-4'/>
     </array-type-def>
     <!-- REAL[40] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
       <!-- <anonymous range>[40] -->
-      <subrange length='40' type-id='type-id-3' id='type-id-6'/>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-3' id='type-id-6'/>
     </array-type-def>
     <!-- class OpenGLCurveEvaluator -->
     <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-7'>
@@ -2084,7 +2084,7 @@ 
     <!-- GLfloat[4] -->
     <array-type-def dimensions='1' type-id='type-id-32' size-in-bits='128' id='type-id-61'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-3' id='type-id-62'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- struct GLUnurbs -->
     <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-42'>
@@ -2744,34 +2744,34 @@ 
     <!-- GLint[2] -->
     <array-type-def dimensions='1' type-id='type-id-60' size-in-bits='64' id='type-id-55'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- REAL[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-83'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- REAL[3] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-84'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-3' id='type-id-85'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-85'/>
     </array-type-def>
     <!-- REAL[40][4] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='5120' id='type-id-57'>
       <!-- <anonymous range>[40] -->
-      <subrange length='40' type-id='type-id-3' id='type-id-6'/>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-3' id='type-id-6'/>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-3' id='type-id-62'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- REAL[6400] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='204800' id='type-id-58'>
       <!-- <anonymous range>[6400] -->
-      <subrange length='6400' type-id='type-id-3' id='type-id-86'/>
+      <subrange length='6400' lower-bound='0' upper-bound='6399' type-id='type-id-3' id='type-id-86'/>
     </array-type-def>
     <!-- StoredVertex*[3] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='192' id='type-id-54'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-3' id='type-id-85'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-85'/>
     </array-type-def>
     <!-- class StoredVertex -->
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-88'>
@@ -2848,7 +2848,7 @@ 
     <!-- long int[2] -->
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='128' id='type-id-89'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- struct OpenGLSurfaceEvaluator -->
     <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-44'>
@@ -4321,7 +4321,7 @@ 
     <!-- char*[32] -->
     <array-type-def dimensions='1' type-id='type-id-106' size-in-bits='2048' id='type-id-107'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-3' id='type-id-108'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-3' id='type-id-108'/>
     </array-type-def>
     <!-- class Buffer -->
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-109'>
@@ -6790,21 +6790,21 @@ 
     <!-- REAL[4] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-133'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-3' id='type-id-62'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- REAL[][24][24] -->
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='unknown' id='type-id-134'>
       <!-- <anonymous range>[] -->
-      <subrange length='unknown' id='type-id-135'/>
+      <subrange length='unknown' lower-bound='0' upper-bound='0' id='type-id-135'/>
       <!-- <anonymous range>[24] -->
-      <subrange length='24' type-id='type-id-3' id='type-id-136'/>
+      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-3' id='type-id-136'/>
       <!-- <anonymous range>[24] -->
-      <subrange length='24' type-id='type-id-3' id='type-id-136'/>
+      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-3' id='type-id-136'/>
     </array-type-def>
     <!-- __jmp_buf_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-137' size-in-bits='1600' id='type-id-138'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-3' id='type-id-139'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-3' id='type-id-139'/>
     </array-type-def>
     <!-- class ArcSdirSorter -->
     <class-decl name='ArcSdirSorter' size-in-bits='192' visibility='default' filepath='libnurbs/internals/arcsorter.h' line='57' column='1' id='type-id-140'>
@@ -10250,9 +10250,9 @@ 
     <!-- REAL[3][4] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-188'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-3' id='type-id-85'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-85'/>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-3' id='type-id-62'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- class Backend -->
     <class-decl name='Backend' size-in-bits='640' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-65'>
@@ -12867,24 +12867,24 @@ 
     <!-- Quiltspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-217' size-in-bits='640' id='type-id-218'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- REAL[120] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-219'>
       <!-- <anonymous range>[120] -->
-      <subrange length='120' type-id='type-id-3' id='type-id-220'/>
+      <subrange length='120' lower-bound='0' upper-bound='119' type-id='type-id-3' id='type-id-220'/>
     </array-type-def>
     <!-- REAL[5] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-221'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-3' id='type-id-222'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-222'/>
     </array-type-def>
     <!-- REAL[5][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-223'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-3' id='type-id-222'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-222'/>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-3' id='type-id-222'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-222'/>
     </array-type-def>
     <!-- class Curve -->
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-224'>
@@ -13015,12 +13015,12 @@ 
     <!-- float[4] -->
     <array-type-def dimensions='1' type-id='type-id-27' size-in-bits='128' id='type-id-227'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-3' id='type-id-62'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-228'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- struct Mapdesc -->
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-229'>
@@ -14056,7 +14056,7 @@ 
     <!-- float[3] -->
     <array-type-def dimensions='1' type-id='type-id-27' size-in-bits='96' id='type-id-193'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-3' id='type-id-85'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-85'/>
     </array-type-def>
     <!-- struct Curve -->
     <class-decl name='Curve' size-in-bits='8128' is-struct='yes' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-244'>
@@ -15616,7 +15616,7 @@ 
     <!-- GridTrimVertex*[2] -->
     <array-type-def dimensions='1' type-id='type-id-191' size-in-bits='128' id='type-id-268'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- class Mesher -->
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-182'>
@@ -15884,7 +15884,7 @@ 
     <!-- Real[2] -->
     <array-type-def dimensions='1' type-id='type-id-272' size-in-bits='64' id='type-id-273'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- class primStream -->
     <class-decl name='primStream' size-in-bits='384' visibility='default' filepath='libnurbs/nurbtess/primitiveStream.h' line='44' column='1' id='type-id-274'>
@@ -17772,19 +17772,19 @@ 
     <!-- Patchspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-301' size-in-bits='640' id='type-id-302'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- REAL[2880] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='92160' id='type-id-303'>
       <!-- <anonymous range>[2880] -->
-      <subrange length='2880' type-id='type-id-3' id='type-id-304'/>
+      <subrange length='2880' lower-bound='0' upper-bound='2879' type-id='type-id-3' id='type-id-304'/>
     </array-type-def>
     <!-- REAL[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='320' id='type-id-305'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-3' id='type-id-222'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-222'/>
     </array-type-def>
     <!-- class Patch -->
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-306'>
@@ -18103,7 +18103,7 @@ 
     <!-- Pspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-308' size-in-bits='512' id='type-id-196'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-82'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-82'/>
     </array-type-def>
     <!-- class Patchlist -->
     <class-decl name='Patchlist' size-in-bits='640' visibility='default' filepath='libnurbs/internals/patchlist.h' line='45' column='1' id='type-id-175'>
@@ -20394,7 +20394,7 @@ 
     <!-- REAL[1000] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-337'>
       <!-- <anonymous range>[1000] -->
-      <subrange length='1000' type-id='type-id-3' id='type-id-338'/>
+      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-3' id='type-id-338'/>
     </array-type-def>
     <!-- class Varray -->
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-339'>
@@ -20494,7 +20494,7 @@ 
     <!-- long int[1000] -->
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='64000' id='type-id-340'>
       <!-- <anonymous range>[1000] -->
-      <subrange length='1000' type-id='type-id-3' id='type-id-338'/>
+      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-3' id='type-id-338'/>
     </array-type-def>
     <!-- Varray* -->
     <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-341'/>
@@ -22212,17 +22212,17 @@ 
     <!-- CachedVertex[100] -->
     <array-type-def dimensions='1' type-id='type-id-355' size-in-bits='25600' id='type-id-356'>
       <!-- <anonymous range>[100] -->
-      <subrange length='100' type-id='type-id-3' id='type-id-357'/>
+      <subrange length='100' lower-bound='0' upper-bound='99' type-id='type-id-3' id='type-id-357'/>
     </array-type-def>
     <!-- GLdouble[3] -->
     <array-type-def dimensions='1' type-id='type-id-358' size-in-bits='192' id='type-id-359'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-3' id='type-id-85'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-85'/>
     </array-type-def>
     <!-- __jmp_buf_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-360' size-in-bits='1600' id='type-id-361'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-3' id='type-id-139'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-3' id='type-id-139'/>
     </array-type-def>
     <!-- enum TessState -->
     <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-362'>
@@ -22238,7 +22238,7 @@ 
     <!-- long int[8] -->
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='512' id='type-id-363'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-3' id='type-id-364'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-3' id='type-id-364'/>
     </array-type-def>
     <!-- struct ActiveRegion -->
     <class-decl name='ActiveRegion' size-in-bits='192' is-struct='yes' visibility='default' filepath='libtess/sweep.h' line='59' column='1' id='type-id-365'>
@@ -22720,7 +22720,7 @@ 
     <!-- unsigned long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-173'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-3' id='type-id-419'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-3' id='type-id-419'/>
     </array-type-def>
     <!-- ActiveRegion* -->
     <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-378'/>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index f14d6c3d..0c604c24 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3668,22 +3668,22 @@ 
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-44' size-in-bits='8448' id='type-id-45'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-46' id='type-id-47'/>
+      <subrange length='33' lower-bound='0' upper-bound='32' type-id='type-id-46' id='type-id-47'/>
     </array-type-def>
     <!-- const demangle_operator_info[62] -->
     <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='11904' id='type-id-49'>
       <!-- <anonymous range>[62] -->
-      <subrange length='62' type-id='type-id-46' id='type-id-50'/>
+      <subrange length='62' lower-bound='0' upper-bound='61' type-id='type-id-46' id='type-id-50'/>
     </array-type-def>
     <!-- demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='8448' id='type-id-52'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-46' id='type-id-47'/>
+      <subrange length='33' lower-bound='0' upper-bound='32' type-id='type-id-46' id='type-id-47'/>
     </array-type-def>
     <!-- demangle_operator_info[62] -->
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='11904' id='type-id-54'>
       <!-- <anonymous range>[62] -->
-      <subrange length='62' type-id='type-id-46' id='type-id-50'/>
+      <subrange length='62' lower-bound='0' upper-bound='61' type-id='type-id-46' id='type-id-50'/>
     </array-type-def>
     <!-- enum d_builtin_type_print -->
     <enum-decl name='d_builtin_type_print' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='51' column='1' id='type-id-55'>
@@ -4598,12 +4598,12 @@ 
     <!-- __sanitizer::LoadedModule::AddressRange[6] -->
     <array-type-def dimensions='1' type-id='type-id-118' size-in-bits='768' id='type-id-119'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-46' id='type-id-120'/>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-46' id='type-id-120'/>
     </array-type-def>
     <!-- char[4096] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='32768' id='type-id-122'>
       <!-- <anonymous range>[4096] -->
-      <subrange length='4096' type-id='type-id-46' id='type-id-123'/>
+      <subrange length='4096' lower-bound='0' upper-bound='4095' type-id='type-id-46' id='type-id-123'/>
     </array-type-def>
     <!-- __sanitizer::InternalScopedString* -->
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
@@ -6072,7 +6072,7 @@ 
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='2048' id='type-id-199'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-46' id='type-id-200'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-46' id='type-id-200'/>
     </array-type-def>
     <!-- struct Elf64_Dyn -->
     <class-decl name='Elf64_Dyn' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-201' visibility='default' filepath='/usr/include/elf.h' line='643' column='1' id='type-id-202'>
@@ -6756,7 +6756,7 @@ 
     <!-- char[56] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='448' id='type-id-246'>
       <!-- <anonymous range>[56] -->
-      <subrange length='56' type-id='type-id-46' id='type-id-247'/>
+      <subrange length='56' lower-bound='0' upper-bound='55' type-id='type-id-46' id='type-id-247'/>
     </array-type-def>
     <!-- enum _Unwind_Reason_Code -->
     <enum-decl name='_Unwind_Reason_Code' naming-typedef-id='type-id-248' linkage-name='19_Unwind_Reason_Code' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='66' column='1' id='type-id-249'>
@@ -8161,7 +8161,7 @@ 
     <!-- unsigned long int[1] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-273'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-46' id='type-id-274'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-46' id='type-id-274'/>
     </array-type-def>
     <!-- __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>* -->
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
@@ -9030,7 +9030,7 @@ 
     <!-- char[16384] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='131072' id='type-id-320'>
       <!-- <anonymous range>[16384] -->
-      <subrange length='16384' type-id='type-id-46' id='type-id-321'/>
+      <subrange length='16384' lower-bound='0' upper-bound='16383' type-id='type-id-46' id='type-id-321'/>
     </array-type-def>
     <!-- __sanitizer::ExternalSymbolizer* -->
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
@@ -9861,7 +9861,7 @@ 
     <!-- unsigned long long int[16384] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1048576' id='type-id-337'>
       <!-- <anonymous range>[16384] -->
-      <subrange length='16384' type-id='type-id-46' id='type-id-321'/>
+      <subrange length='16384' lower-bound='0' upper-bound='16383' type-id='type-id-46' id='type-id-321'/>
     </array-type-def>
     <!-- __tsan::SyncClock* -->
     <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-339'/>
@@ -10650,27 +10650,27 @@ 
     <!-- __sanitizer::LibIgnore::LibCodeRange[128] -->
     <array-type-def dimensions='1' type-id='type-id-362' size-in-bits='16384' id='type-id-363'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- __sanitizer::LibIgnore::Lib[128] -->
     <array-type-def dimensions='1' type-id='type-id-365' size-in-bits='32768' id='type-id-366'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- __tsan::SignalDesc[64] -->
     <array-type-def dimensions='1' type-id='type-id-367' size-in-bits='552960' id='type-id-368'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-46' id='type-id-369'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-369'/>
     </array-type-def>
     <!-- bool[128] -->
     <array-type-def dimensions='1' type-id='type-id-113' size-in-bits='1024' id='type-id-370'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- char[14] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='112' id='type-id-371'>
       <!-- <anonymous range>[14] -->
-      <subrange length='14' type-id='type-id-46' id='type-id-372'/>
+      <subrange length='14' lower-bound='0' upper-bound='13' type-id='type-id-46' id='type-id-372'/>
     </array-type-def>
     <!-- class AtExitContext -->
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-373'>
@@ -10822,7 +10822,7 @@ 
     <!-- ioctl_desc[500] -->
     <array-type-def dimensions='1' type-id='type-id-383' size-in-bits='64000' id='type-id-384'>
       <!-- <anonymous range>[500] -->
-      <subrange length='500' type-id='type-id-46' id='type-id-385'/>
+      <subrange length='500' lower-bound='0' upper-bound='499' type-id='type-id-46' id='type-id-385'/>
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-386'/>
@@ -11713,37 +11713,37 @@ 
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='48' id='type-id-922'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-46' id='type-id-120'/>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-46' id='type-id-120'/>
     </array-type-def>
     <!-- unsigned char[8] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='64' id='type-id-923'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-46' id='type-id-924'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-46' id='type-id-924'/>
     </array-type-def>
     <!-- unsigned long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1024' id='type-id-925'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-46' id='type-id-926'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-926'/>
     </array-type-def>
     <!-- unsigned long int[4] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='256' id='type-id-927'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-46' id='type-id-928'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-46' id='type-id-928'/>
     </array-type-def>
     <!-- unsigned long long int[118] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='7552' id='type-id-410'>
       <!-- <anonymous range>[118] -->
-      <subrange length='118' type-id='type-id-46' id='type-id-929'/>
+      <subrange length='118' lower-bound='0' upper-bound='117' type-id='type-id-46' id='type-id-929'/>
     </array-type-def>
     <!-- unsigned long long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1024' id='type-id-397'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-46' id='type-id-926'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-926'/>
     </array-type-def>
     <!-- void ()*[128] -->
     <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='8192' id='type-id-376'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-930'/>
@@ -27367,7 +27367,7 @@ 
     <!-- char[128] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='1024' id='type-id-1260'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- __tsan::DynamicAnnContext* -->
     <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-1262'/>
@@ -28079,42 +28079,42 @@ 
     <!-- __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::SizeClassInfo[53] -->
     <array-type-def dimensions='1' type-id='type-id-1276' size-in-bits='27136' id='type-id-1277'>
       <!-- <anonymous range>[53] -->
-      <subrange length='53' type-id='type-id-46' id='type-id-1278'/>
+      <subrange length='53' lower-bound='0' upper-bound='52' type-id='type-id-46' id='type-id-1278'/>
     </array-type-def>
     <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-182' size-in-bits='440960' id='type-id-186'>
       <!-- <anonymous range>[53] -->
-      <subrange length='53' type-id='type-id-46' id='type-id-1278'/>
+      <subrange length='53' lower-bound='0' upper-bound='52' type-id='type-id-46' id='type-id-1278'/>
     </array-type-def>
     <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-1279' size-in-bits='875136' id='type-id-1280'>
       <!-- <anonymous range>[53] -->
-      <subrange length='53' type-id='type-id-46' id='type-id-1278'/>
+      <subrange length='53' lower-bound='0' upper-bound='52' type-id='type-id-46' id='type-id-1278'/>
     </array-type-def>
     <!-- __sanitizer::atomic_uint64_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-1281' size-in-bits='256' id='type-id-1282'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-46' id='type-id-928'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-46' id='type-id-928'/>
     </array-type-def>
     <!-- __sanitizer::atomic_uintptr_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1235' size-in-bits='131072' id='type-id-1283'>
       <!-- <anonymous range>[2048] -->
-      <subrange length='2048' type-id='type-id-46' id='type-id-1284'/>
+      <subrange length='2048' lower-bound='0' upper-bound='2047' type-id='type-id-46' id='type-id-1284'/>
     </array-type-def>
     <!-- __tsan::MD5Hash[2] -->
     <array-type-def dimensions='1' type-id='type-id-1285' size-in-bits='256' id='type-id-1286'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-46' id='type-id-1287'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-46' id='type-id-1287'/>
     </array-type-def>
     <!-- __tsan::MutexSet::Desc[16] -->
     <array-type-def dimensions='1' type-id='type-id-1288' size-in-bits='3072' id='type-id-1289'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-46' id='type-id-926'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-926'/>
     </array-type-def>
     <!-- __tsan::SyncTab::Part[1009] -->
     <array-type-def dimensions='1' type-id='type-id-1290' size-in-bits='516608' id='type-id-1291'>
       <!-- <anonymous range>[1009] -->
-      <subrange length='1009' type-id='type-id-46' id='type-id-1292'/>
+      <subrange length='1009' lower-bound='0' upper-bound='1008' type-id='type-id-46' id='type-id-1292'/>
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-113'/>
@@ -28123,12 +28123,12 @@ 
     <!-- char[32] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='256' id='type-id-1293'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-46' id='type-id-1294'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-46' id='type-id-1294'/>
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='384' id='type-id-1295'>
       <!-- <anonymous range>[48] -->
-      <subrange length='48' type-id='type-id-46' id='type-id-1296'/>
+      <subrange length='48' lower-bound='0' upper-bound='47' type-id='type-id-46' id='type-id-1296'/>
     </array-type-def>
     <!-- class ScopedAtomic -->
     <class-decl name='ScopedAtomic' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='53' column='1' id='type-id-1297'>
@@ -28215,42 +28215,42 @@ 
     <!-- unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-173' size-in-bits='512' id='type-id-1313'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-46' id='type-id-926'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-926'/>
     </array-type-def>
     <!-- unsigned long int[10] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='640' id='type-id-1314'>
       <!-- <anonymous range>[10] -->
-      <subrange length='10' type-id='type-id-46' id='type-id-1315'/>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-46' id='type-id-1315'/>
     </array-type-def>
     <!-- unsigned long long int[11] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='704' id='type-id-1316'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-46' id='type-id-1317'/>
+      <subrange length='11' lower-bound='0' upper-bound='10' type-id='type-id-46' id='type-id-1317'/>
     </array-type-def>
     <!-- unsigned long long int[23] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1472' id='type-id-1318'>
       <!-- <anonymous range>[23] -->
-      <subrange length='23' type-id='type-id-46' id='type-id-1319'/>
+      <subrange length='23' lower-bound='0' upper-bound='22' type-id='type-id-46' id='type-id-1319'/>
     </array-type-def>
     <!-- unsigned long long int[2] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='128' id='type-id-1320'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-46' id='type-id-1287'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-46' id='type-id-1287'/>
     </array-type-def>
     <!-- unsigned long long int[438] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='28032' id='type-id-1321'>
       <!-- <anonymous range>[438] -->
-      <subrange length='438' type-id='type-id-46' id='type-id-1322'/>
+      <subrange length='438' lower-bound='0' upper-bound='437' type-id='type-id-46' id='type-id-1322'/>
     </array-type-def>
     <!-- void*[128] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='8192' id='type-id-183'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-46' id='type-id-364'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-364'/>
     </array-type-def>
     <!-- void*[256] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='16384' id='type-id-1323'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-46' id='type-id-200'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-46' id='type-id-200'/>
     </array-type-def>
     <!-- ScopedAtomic* -->
     <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
@@ -35521,7 +35521,7 @@ 
     <!-- unsigned char[64] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='512' id='type-id-1511'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-46' id='type-id-369'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-369'/>
     </array-type-def>
     <!-- __tsan::__anonymous_struct__* -->
     <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
@@ -35584,22 +35584,22 @@ 
     <!-- __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>::Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1517' size-in-bits='16777216' id='type-id-1518'>
       <!-- <anonymous range>[262144] -->
-      <subrange length='262144' type-id='type-id-46' id='type-id-1519'/>
+      <subrange length='262144' lower-bound='0' upper-bound='262143' type-id='type-id-46' id='type-id-1519'/>
     </array-type-def>
     <!-- __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback>::Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1520' size-in-bits='16777216' id='type-id-1521'>
       <!-- <anonymous range>[262144] -->
-      <subrange length='262144' type-id='type-id-46' id='type-id-1519'/>
+      <subrange length='262144' lower-bound='0' upper-bound='262143' type-id='type-id-46' id='type-id-1519'/>
     </array-type-def>
     <!-- unsigned long int[64] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-1522'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-46' id='type-id-369'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-369'/>
     </array-type-def>
     <!-- void*[64] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='4096' id='type-id-1495'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-46' id='type-id-369'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-369'/>
     </array-type-def>
     <!-- __sanitizer::CombinedAllocator<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >, __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap> >* -->
     <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-1523'/>
@@ -39059,7 +39059,7 @@ 
     <!-- char[431104] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='3448832' id='type-id-1659'>
       <!-- <anonymous range>[431104] -->
-      <subrange length='431104' type-id='type-id-46' id='type-id-1660'/>
+      <subrange length='431104' lower-bound='0' upper-bound='431103' type-id='type-id-46' id='type-id-1660'/>
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::StaticSpinMutex>* -->
     <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-1662'/>
@@ -40849,22 +40849,22 @@ 
     <!-- __tsan::TraceHeader[256] -->
     <array-type-def dimensions='1' type-id='type-id-1689' size-in-bits='5062656' id='type-id-1690'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-46' id='type-id-200'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-46' id='type-id-200'/>
     </array-type-def>
     <!-- char[64] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='512' id='type-id-1500'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-46' id='type-id-369'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-369'/>
     </array-type-def>
     <!-- unsigned long int[256] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-143'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-46' id='type-id-200'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-46' id='type-id-200'/>
     </array-type-def>
     <!-- unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4194304' id='type-id-1691'>
       <!-- <anonymous range>[65536] -->
-      <subrange length='65536' type-id='type-id-46' id='type-id-1692'/>
+      <subrange length='65536' lower-bound='0' upper-bound='65535' type-id='type-id-46' id='type-id-1692'/>
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>* -->
     <pointer-type-def type-id='type-id-1693' size-in-bits='64' id='type-id-1694'/>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 8a88ef0e..ba558ba5 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -526,7 +526,7 @@ 
     <!-- char[40] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-3'>
       <!-- <anonymous range>[40] -->
-      <subrange length='40' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- enum hb_memory_mode_t -->
     <enum-decl name='hb_memory_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.h' line='58' column='1' id='type-id-6'>
@@ -539,7 +539,7 @@ 
     <!-- hb_user_data_array_t::hb_user_data_item_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-8' size-in-bits='384' id='type-id-9'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-11'/>
@@ -1211,7 +1211,7 @@ 
     <!-- const char*[8] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-62'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-63'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- enum hb_buffer_content_type_t -->
     <enum-decl name='hb_buffer_content_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='119' column='1' id='type-id-64'>
@@ -1483,19 +1483,19 @@ 
     <!-- hb_codepoint_t[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-72' size-in-bits='320' id='type-id-73'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-4' id='type-id-74'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-74'/>
     </array-type-def>
     <!-- int16_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-75' size-in-bits='32' id='type-id-76'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- int8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-77' size-in-bits='32' id='type-id-78'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-79'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-79'/>
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-80'/>
@@ -2430,17 +2430,17 @@ 
     <!-- uint16_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-137' size-in-bits='32' id='type-id-140'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- uint8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='32' id='type-id-141'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-79'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-79'/>
     </array-type-def>
     <!-- uint8_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='64' id='type-id-88'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-63'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- union _hb_var_int_t -->
     <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-135'>
@@ -2474,7 +2474,7 @@ 
     <!-- unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='64' id='type-id-90'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- unsigned short int -->
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-136'/>
@@ -3687,12 +3687,12 @@ 
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-178'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- const char[1] -->
     <array-type-def dimensions='1' type-id='type-id-49' size-in-bits='8' id='type-id-165'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- struct hb_language_impl_t -->
     <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-146'>
@@ -3870,12 +3870,12 @@ 
     <!-- OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='32' id='type-id-187'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::TableRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-189'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- struct hb_auto_trace_t<0, bool> -->
     <class-decl name='hb_auto_trace_t&lt;0, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-190'>
@@ -4865,7 +4865,7 @@ 
     <!-- uint8_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='16' id='type-id-237'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-239'/>
@@ -10659,52 +10659,52 @@ 
     <!-- OT::BYTE[256] -->
     <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='2048' id='type-id-671'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-672'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-4' id='type-id-672'/>
     </array-type-def>
     <!-- OT::CmapSubtableLongGroup[1] -->
     <array-type-def dimensions='1' type-id='type-id-673' size-in-bits='96' id='type-id-674'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::EncodingRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-675' size-in-bits='64' id='type-id-676'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::IntType<short unsigned int, 2u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-256' size-in-bits='16' id='type-id-677'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::LongMetric[1] -->
     <array-type-def dimensions='1' type-id='type-id-678' size-in-bits='32' id='type-id-679'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::SHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-574' size-in-bits='16' id='type-id-680'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::USHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-372' size-in-bits='16' id='type-id-681'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::UVSMapping[1] -->
     <array-type-def dimensions='1' type-id='type-id-682' size-in-bits='40' id='type-id-683'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::UnicodeValueRange[1] -->
     <array-type-def dimensions='1' type-id='type-id-684' size-in-bits='32' id='type-id-685'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::VariationSelectorRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-686' size-in-bits='88' id='type-id-687'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- struct hb_ot_face_cmap_accelerator_t -->
     <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-688'>
@@ -10819,7 +10819,7 @@ 
     <!-- uint8_t[3] -->
     <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='24' id='type-id-696'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-697'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-697'/>
     </array-type-def>
     <!-- OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-699'/>
@@ -12817,167 +12817,167 @@ 
     <!-- OT::EntryExitRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-851' size-in-bits='32' id='type-id-852'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Index[1] -->
     <array-type-def dimensions='1' type-id='type-id-853' size-in-bits='16' id='type-id-854'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::IntType<unsigned int, 3u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-735' size-in-bits='24' id='type-id-855'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::LookupRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-856' size-in-bits='32' id='type-id-857'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::MarkRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-858' size-in-bits='32' id='type-id-859'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Offset<OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-860' size-in-bits='16' id='type-id-861'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-862' size-in-bits='16' id='type-id-863'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-864' size-in-bits='16' id='type-id-865'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-866' size-in-bits='16' id='type-id-867'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-868' size-in-bits='16' id='type-id-869'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-870' size-in-bits='16' id='type-id-871'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-872' size-in-bits='16' id='type-id-873'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-874' size-in-bits='16' id='type-id-875'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-876' size-in-bits='32' id='type-id-877'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-878' size-in-bits='16' id='type-id-879'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-880' size-in-bits='16' id='type-id-881'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-882' size-in-bits='16' id='type-id-883'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-884' size-in-bits='16' id='type-id-885'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-886' size-in-bits='16' id='type-id-887'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-888' size-in-bits='16' id='type-id-889'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='16' id='type-id-891'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-892' size-in-bits='16' id='type-id-893'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-894' size-in-bits='16' id='type-id-895'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-896' size-in-bits='16' id='type-id-897'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-898' size-in-bits='16' id='type-id-899'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-900' size-in-bits='16' id='type-id-901'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='16' id='type-id-903'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::RangeRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='48' id='type-id-905'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Record<OT::Feature>[1] -->
     <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='48' id='type-id-907'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Record<OT::LangSys>[1] -->
     <array-type-def dimensions='1' type-id='type-id-908' size-in-bits='48' id='type-id-909'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Record<OT::Script>[1] -->
     <array-type-def dimensions='1' type-id='type-id-910' size-in-bits='48' id='type-id-911'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OT::Value[1] -->
     <array-type-def dimensions='1' type-id='type-id-912' size-in-bits='16' id='type-id-913'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-914'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- enum hb_ot_layout_glyph_class_t -->
     <enum-decl name='hb_ot_layout_glyph_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.h' line='54' column='1' id='type-id-915'>
@@ -12991,32 +12991,32 @@ 
     <!-- hb_ot_map_t::feature_map_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-916' size-in-bits='2304' id='type-id-917'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-63'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- hb_ot_map_t::lookup_map_t[32] -->
     <array-type-def dimensions='1' type-id='type-id-918' size-in-bits='2048' id='type-id-919'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-4' id='type-id-920'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-4' id='type-id-920'/>
     </array-type-def>
     <!-- hb_ot_map_t::stage_map_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-921' size-in-bits='512' id='type-id-922'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-79'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-79'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-923' size-in-bits='4352' id='type-id-924'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-925' size-in-bits='1280' id='type-id-926'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- hb_tag_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-184' size-in-bits='64' id='type-id-927'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- struct GPOSProxy -->
     <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-928'>
@@ -14162,7 +14162,7 @@ 
     <!-- void*[3] -->
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='192' id='type-id-996'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-697'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-697'/>
     </array-type-def>
     <!-- GPOSProxy* -->
     <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-934'/>
@@ -29821,17 +29821,17 @@ 
     <!-- hb_ot_map_builder_t::feature_info_t[32] -->
     <array-type-def dimensions='1' type-id='type-id-1902' size-in-bits='7168' id='type-id-1903'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-4' id='type-id-920'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-4' id='type-id-920'/>
     </array-type-def>
     <!-- hb_ot_map_builder_t::stage_info_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-1904' size-in-bits='1024' id='type-id-1905'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-63'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-1906' size-in-bits='2304' id='type-id-1907'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-10'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-10'/>
     </array-type-def>
     <!-- struct hb_ot_map_builder_t -->
     <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1908'>
@@ -30607,7 +30607,7 @@ 
     <!-- hb_mask_t[21] -->
     <array-type-def dimensions='1' type-id='type-id-92' size-in-bits='672' id='type-id-1996'>
       <!-- <anonymous range>[21] -->
-      <subrange length='21' type-id='type-id-4' id='type-id-1997'/>
+      <subrange length='21' lower-bound='0' upper-bound='20' type-id='type-id-4' id='type-id-1997'/>
     </array-type-def>
     <!-- struct indic_config_t -->
     <class-decl name='indic_config_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='305' column='1' id='type-id-1998'>
@@ -30788,7 +30788,7 @@ 
     <!-- char[8] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-2016'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-63'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- enum hb_ot_shape_normalization_mode_t -->
     <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-2017'>
@@ -31200,7 +31200,7 @@ 
     <!-- hb_set_t::elt_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-2042' size-in-bits='65536' id='type-id-2043'>
       <!-- <anonymous range>[2048] -->
-      <subrange length='2048' type-id='type-id-4' id='type-id-2044'/>
+      <subrange length='2048' lower-bound='0' upper-bound='2047' type-id='type-id-4' id='type-id-2044'/>
     </array-type-def>
     <!-- struct hb_set_t -->
     <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-2045'>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index d279ce6e..7e595474 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -874,17 +874,17 @@ 
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-4' id='type-id-7'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-8'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- class vtkImageDataLIC2D -->
     <class-decl name='vtkImageDataLIC2D' size-in-bits='1472' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.h' line='45' column='1' id='type-id-10'>
@@ -6824,7 +6824,7 @@ 
     <!-- int[4] -->
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='128' id='type-id-33'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-59'/>
@@ -12013,7 +12013,7 @@ 
     <!-- int[6] -->
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='192' id='type-id-231'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-4' id='type-id-257'/>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-4' id='type-id-257'/>
     </array-type-def>
     <!-- const std::ctype<char> -->
     <qualified-type-def type-id='type-id-258' const='yes' id='type-id-259'/>
@@ -13855,24 +13855,24 @@ 
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='64' id='type-id-286'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-294'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-294'/>
     </array-type-def>
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-38' size-in-bits='256' id='type-id-295'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- typedef long int ptrdiff_t -->
     <typedef-decl name='ptrdiff_t' type-id='type-id-60' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='149' column='1' id='type-id-296'/>
     <!-- unsigned int*[2] -->
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='128' id='type-id-279'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-294'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-294'/>
     </array-type-def>
     <!-- unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='64' id='type-id-278'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-294'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-294'/>
     </array-type-def>
     <!-- __gnu_cxx::new_allocator<char>* -->
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
@@ -25260,7 +25260,7 @@ 
     <!-- double[3] -->
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='192' id='type-id-602'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-669'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-669'/>
     </array-type-def>
     <!-- typedef float GLfloat -->
     <typedef-decl name='GLfloat' type-id='type-id-58' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-670'/>
@@ -25269,7 +25269,7 @@ 
     <!-- vtkSmartPointer<vtkOpenGLLightMonitor>[8] -->
     <array-type-def dimensions='1' type-id='type-id-641' size-in-bits='512' id='type-id-586'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-4' id='type-id-672'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-672'/>
     </array-type-def>
     <!-- GLfloat* -->
     <pointer-type-def type-id='type-id-670' size-in-bits='64' id='type-id-45'/>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 970bd614..a0b9f255 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2317,7 +2317,7 @@ 
     <!-- unsigned char[16] -->
     <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='128' id='type-id-26'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-19' id='type-id-43'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-19' id='type-id-43'/>
     </array-type-def>
     <!-- base::ElfMemImage* -->
     <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
@@ -2826,7 +2826,7 @@ 
     <!-- low_level_alloc_internal::AllocList*[30] -->
     <array-type-def dimensions='1' type-id='type-id-86' size-in-bits='1920' id='type-id-87'>
       <!-- <anonymous range>[30] -->
-      <subrange length='30' type-id='type-id-19' id='type-id-88'/>
+      <subrange length='30' lower-bound='0' upper-bound='29' type-id='type-id-19' id='type-id-88'/>
     </array-type-def>
     <!-- low_level_alloc_internal::AllocList* -->
     <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-86'/>
@@ -3103,12 +3103,12 @@ 
     <!-- char[10] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='80' id='type-id-109'>
       <!-- <anonymous range>[10] -->
-      <subrange length='10' type-id='type-id-19' id='type-id-110'/>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-19' id='type-id-110'/>
     </array-type-def>
     <!-- char[5120] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='40960' id='type-id-111'>
       <!-- <anonymous range>[5120] -->
-      <subrange length='5120' type-id='type-id-19' id='type-id-112'/>
+      <subrange length='5120' lower-bound='0' upper-bound='5119' type-id='type-id-19' id='type-id-112'/>
     </array-type-def>
     <!-- class ProcMapsIterator -->
     <class-decl name='ProcMapsIterator' size-in-bits='640' visibility='default' filepath='./src/base/sysinfo.h' line='102' column='1' id='type-id-113'>
@@ -4157,12 +4157,12 @@ 
     <!-- AtomicWord[8] -->
     <array-type-def dimensions='1' type-id='type-id-174' size-in-bits='512' id='type-id-175'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-19' id='type-id-176'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-19' id='type-id-176'/>
     </array-type-def>
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='unknown' id='type-id-177'>
       <!-- <anonymous range>[] -->
-      <subrange length='unknown' id='type-id-178'/>
+      <subrange length='unknown' lower-bound='0' upper-bound='0' id='type-id-178'/>
     </array-type-def>
     <!-- class AddressMap<HeapProfileTable::AllocValue> -->
     <class-decl name='AddressMap&lt;HeapProfileTable::AllocValue&gt;' size-in-bits='320' visibility='default' filepath='src/addressmap-inl.h' line='104' column='1' id='type-id-179'>
@@ -7955,7 +7955,7 @@ 
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='256' id='type-id-366'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-19' id='type-id-367'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-19' id='type-id-367'/>
     </array-type-def>
     <!-- struct AllocObject -->
     <class-decl name='AllocObject' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='356' column='1' id='type-id-368'>
@@ -8062,7 +8062,7 @@ 
     <!-- void*[32] -->
     <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='2048' id='type-id-292'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-19' id='type-id-388'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-19' id='type-id-388'/>
     </array-type-def>
     <!-- AddressMap<HeapProfileTable::AllocValue>* -->
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-192'/>
@@ -17583,7 +17583,7 @@ 
     <!-- char[200] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='1600' id='type-id-997'>
       <!-- <anonymous range>[200] -->
-      <subrange length='200' type-id='type-id-19' id='type-id-998'/>
+      <subrange length='200' lower-bound='0' upper-bound='199' type-id='type-id-19' id='type-id-998'/>
     </array-type-def>
     <!-- const tcmalloc::LogItem -->
     <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1000'/>
@@ -19397,7 +19397,7 @@ 
     <!-- HeapProfileBucket[20] -->
     <array-type-def dimensions='1' type-id='type-id-249' size-in-bits='8960' id='type-id-307'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-19' id='type-id-1095'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-19' id='type-id-1095'/>
     </array-type-def>
     <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
     <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1096'>
@@ -19531,9 +19531,9 @@ 
     <!-- void*[20][32] -->
     <array-type-def dimensions='2' type-id='type-id-74' size-in-bits='40960' id='type-id-308'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-19' id='type-id-1095'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-19' id='type-id-1095'/>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-19' id='type-id-388'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-19' id='type-id-388'/>
     </array-type-def>
     <!-- HeapProfileBucket** -->
     <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-306'/>
@@ -21511,17 +21511,17 @@ 
     <!-- ProfileData::Entry::Slot[64] -->
     <array-type-def dimensions='1' type-id='type-id-1224' size-in-bits='4096' id='type-id-1225'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-19' id='type-id-1226'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-19' id='type-id-1226'/>
     </array-type-def>
     <!-- ProfileData::Entry[4] -->
     <array-type-def dimensions='1' type-id='type-id-1227' size-in-bits='16896' id='type-id-1228'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-19' id='type-id-367'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-19' id='type-id-367'/>
     </array-type-def>
     <!-- char[1024] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='8192' id='type-id-1229'>
       <!-- <anonymous range>[1024] -->
-      <subrange length='1024' type-id='type-id-19' id='type-id-1230'/>
+      <subrange length='1024' lower-bound='0' upper-bound='1023' type-id='type-id-19' id='type-id-1230'/>
     </array-type-def>
     <!-- class CpuProfiler -->
     <class-decl name='CpuProfiler' size-in-bits='704' visibility='default' filepath='src/profiler.cc' line='89' column='1' id='type-id-1231'>
@@ -21965,7 +21965,7 @@ 
     <!-- int[28] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1251'>
       <!-- <anonymous range>[28] -->
-      <subrange length='28' type-id='type-id-19' id='type-id-1252'/>
+      <subrange length='28' lower-bound='0' upper-bound='27' type-id='type-id-19' id='type-id-1252'/>
     </array-type-def>
     <!-- struct ProfilerOptions -->
     <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1253'>
@@ -24304,12 +24304,12 @@ 
     <!-- SysAllocator*[2] -->
     <array-type-def dimensions='1' type-id='type-id-1013' size-in-bits='128' id='type-id-1358'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-19' id='type-id-1359'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-19' id='type-id-1359'/>
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-1360'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-19' id='type-id-1359'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-19' id='type-id-1359'/>
     </array-type-def>
     <!-- class DefaultSysAllocator -->
     <class-decl name='DefaultSysAllocator' size-in-bits='384' visibility='default' filepath='src/system-alloc.cc' line='173' column='1' id='type-id-1361'>
@@ -24461,7 +24461,7 @@ 
     <!-- const char*[2] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='128' id='type-id-1362'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-19' id='type-id-1359'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-19' id='type-id-1359'/>
     </array-type-def>
     <!-- DefaultSysAllocator* -->
     <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-1363'/>
@@ -24617,7 +24617,7 @@ 
     <!-- AtomicWord[8] -->
     <array-type-def dimensions='1' type-id='type-id-1079' size-in-bits='512' id='type-id-1080'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-19' id='type-id-176'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-19' id='type-id-176'/>
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-76'/>
@@ -24626,22 +24626,22 @@ 
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='8' id='type-id-152'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-19' id='type-id-1370'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-19' id='type-id-1370'/>
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='160' id='type-id-155'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-19' id='type-id-1095'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-19' id='type-id-1095'/>
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='384' id='type-id-303'>
       <!-- <anonymous range>[48] -->
-      <subrange length='48' type-id='type-id-19' id='type-id-1371'/>
+      <subrange length='48' lower-bound='0' upper-bound='47' type-id='type-id-19' id='type-id-1371'/>
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='32' id='type-id-1372'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-19' id='type-id-367'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-19' id='type-id-367'/>
     </array-type-def>
     <!-- class MallocHook -->
     <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1373'>
@@ -26643,7 +26643,7 @@ 
     <!-- double[1024] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='65536' id='type-id-1413'>
       <!-- <anonymous range>[1024] -->
-      <subrange length='1024' type-id='type-id-19' id='type-id-1230'/>
+      <subrange length='1024' lower-bound='0' upper-bound='1023' type-id='type-id-19' id='type-id-1230'/>
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-16'/>
@@ -26652,12 +26652,12 @@ 
     <!-- int64[128] -->
     <array-type-def dimensions='1' type-id='type-id-103' size-in-bits='8192' id='type-id-1414'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-19' id='type-id-1415'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-19' id='type-id-1415'/>
     </array-type-def>
     <!-- int[88] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1416'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-19' id='type-id-1417'/>
+      <subrange length='88' lower-bound='0' upper-bound='87' type-id='type-id-19' id='type-id-1417'/>
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-17'/>
@@ -26670,7 +26670,7 @@ 
     <!-- size_t[88] -->
     <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='5632' id='type-id-1418'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-19' id='type-id-1417'/>
+      <subrange length='88' lower-bound='0' upper-bound='87' type-id='type-id-19' id='type-id-1417'/>
     </array-type-def>
     <!-- struct TCMallocStats -->
     <class-decl name='TCMallocStats' size-in-bits='512' is-struct='yes' visibility='default' filepath='src/tcmalloc.cc' line='295' column='1' id='type-id-1419'>
@@ -27097,22 +27097,22 @@ 
     <!-- tcmalloc::CentralFreeList::TCEntry[64] -->
     <array-type-def dimensions='1' type-id='type-id-1428' size-in-bits='8192' id='type-id-1429'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-19' id='type-id-1226'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-19' id='type-id-1226'/>
     </array-type-def>
     <!-- tcmalloc::CentralFreeListPadded[88] -->
     <array-type-def dimensions='1' type-id='type-id-1430' size-in-bits='856064' id='type-id-1431'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-19' id='type-id-1417'/>
+      <subrange length='88' lower-bound='0' upper-bound='87' type-id='type-id-19' id='type-id-1417'/>
     </array-type-def>
     <!-- tcmalloc::PageHeap::SpanList[128] -->
     <array-type-def dimensions='1' type-id='type-id-1432' size-in-bits='98304' id='type-id-1433'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-19' id='type-id-1415'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-19' id='type-id-1415'/>
     </array-type-def>
     <!-- tcmalloc::ThreadCache::FreeList[88] -->
     <array-type-def dimensions='1' type-id='type-id-1434' size-in-bits='16896' id='type-id-1435'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-19' id='type-id-1417'/>
+      <subrange length='88' lower-bound='0' upper-bound='87' type-id='type-id-19' id='type-id-1417'/>
     </array-type-def>
     <!-- typedef int32_t Atomic32 -->
     <typedef-decl name='Atomic32' type-id='type-id-141' filepath='./src/base/atomicops-internals-x86.h' line='43' column='1' id='type-id-93'/>
@@ -27175,7 +27175,7 @@ 
     <!-- unsigned char[2169] -->
     <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='17352' id='type-id-1442'>
       <!-- <anonymous range>[2169] -->
-      <subrange length='2169' type-id='type-id-19' id='type-id-1443'/>
+      <subrange length='2169' lower-bound='0' upper-bound='2168' type-id='type-id-19' id='type-id-1443'/>
     </array-type-def>
     <!-- unsigned int -->
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-157'/>
@@ -27184,7 +27184,7 @@ 
     <!-- unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='4194304' id='type-id-1444'>
       <!-- <anonymous range>[65536] -->
-      <subrange length='65536' type-id='type-id-19' id='type-id-1445'/>
+      <subrange length='65536' lower-bound='0' upper-bound='65535' type-id='type-id-19' id='type-id-1445'/>
     </array-type-def>
     <!-- unsigned long long int -->
     <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-21'/>
@@ -27193,12 +27193,12 @@ 
     <!-- void*[31] -->
     <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='1984' id='type-id-1446'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-19' id='type-id-1447'/>
+      <subrange length='31' lower-bound='0' upper-bound='30' type-id='type-id-19' id='type-id-1447'/>
     </array-type-def>
     <!-- volatile unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-1448' size-in-bits='4194304' id='type-id-1385'>
       <!-- <anonymous range>[65536] -->
-      <subrange length='65536' type-id='type-id-19' id='type-id-1445'/>
+      <subrange length='65536' lower-bound='0' upper-bound='65535' type-id='type-id-19' id='type-id-1445'/>
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-9'/>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 13a511f1..52cf75d0 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -760,17 +760,17 @@ 
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-4' id='type-id-7'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-8'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- class vtkBoundingBox -->
     <class-decl name='vtkBoundingBox' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/DataModel/vtkBoundingBox.h' line='30' column='1' id='type-id-10'>
@@ -3658,7 +3658,7 @@ 
     <!-- double[3] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-11'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-127'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-127'/>
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-100'/>
@@ -21569,7 +21569,7 @@ 
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-78' size-in-bits='256' id='type-id-404'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- __gnu_cxx::__normal_iterator<const unsigned char*, std::vector<unsigned char, std::allocator<unsigned char> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-365' size-in-bits='64' id='type-id-1066'/>
@@ -30208,7 +30208,7 @@ 
     <!-- int[20] -->
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1410'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-4' id='type-id-7'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
     <!-- const vtkSubGroup -->
     <qualified-type-def type-id='type-id-1408' const='yes' id='type-id-1415'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index ddf2d32f..2cf71186 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -935,27 +935,27 @@ 
     <!-- char[128] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='1024' id='type-id-7'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-8' id='type-id-9'/>
+      <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-8' id='type-id-9'/>
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='8' id='type-id-10'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-8' id='type-id-11'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-8' id='type-id-11'/>
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='160' id='type-id-12'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-8' id='type-id-13'/>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-8' id='type-id-13'/>
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='32' id='type-id-14'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-8' id='type-id-15'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-8' id='type-id-15'/>
     </array-type-def>
     <!-- const char*[60] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-16'>
       <!-- <anonymous range>[60] -->
-      <subrange length='60' type-id='type-id-8' id='type-id-17'/>
+      <subrange length='60' lower-bound='0' upper-bound='59' type-id='type-id-8' id='type-id-17'/>
     </array-type-def>
     <!-- enum diagnostic_prefixing_rule_t -->
     <enum-decl name='diagnostic_prefixing_rule_t' naming-typedef-id='type-id-18' linkage-name='27diagnostic_prefixing_rule_t' filepath='../.././gcc/pretty-print.h' line='48' column='1' id='type-id-19'>
@@ -1003,14 +1003,14 @@ 
     <!-- int[12] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='384' id='type-id-26'>
       <!-- <anonymous range>[12] -->
-      <subrange length='12' type-id='type-id-8' id='type-id-27'/>
+      <subrange length='12' lower-bound='0' upper-bound='11' type-id='type-id-8' id='type-id-27'/>
     </array-type-def>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-28'/>
     <!-- long int[3] -->
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='192' id='type-id-29'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-8' id='type-id-30'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-8' id='type-id-30'/>
     </array-type-def>
     <!-- signed char -->
     <type-decl name='signed char' size-in-bits='8' id='type-id-31'/>
@@ -1700,7 +1700,7 @@ 
     <!-- typedef __va_list_tag __va_list_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-97' size-in-bits='192' id='type-id-102'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-8' id='type-id-11'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-8' id='type-id-11'/>
     </array-type-def>
     <!-- typedef diagnostic_classification_change_t diagnostic_classification_change_t -->
     <typedef-decl name='diagnostic_classification_change_t' type-id='type-id-45' filepath='../.././gcc/diagnostic.h' line='52' column='1' id='type-id-106'/>
@@ -4746,32 +4746,32 @@ 
     <!-- char[31] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='248' id='type-id-211'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-8' id='type-id-212'/>
+      <subrange length='31' lower-bound='0' upper-bound='30' type-id='type-id-8' id='type-id-212'/>
     </array-type-def>
     <!-- char[6] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='48' id='type-id-213'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-8' id='type-id-214'/>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-8' id='type-id-214'/>
     </array-type-def>
     <!-- char[7] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='56' id='type-id-215'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-8' id='type-id-216'/>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-8' id='type-id-216'/>
     </array-type-def>
     <!-- const char[31] -->
     <array-type-def dimensions='1' type-id='type-id-120' size-in-bits='248' id='type-id-217'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-8' id='type-id-212'/>
+      <subrange length='31' lower-bound='0' upper-bound='30' type-id='type-id-8' id='type-id-212'/>
     </array-type-def>
     <!-- const char[6] -->
     <array-type-def dimensions='1' type-id='type-id-120' size-in-bits='48' id='type-id-218'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-8' id='type-id-214'/>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-8' id='type-id-214'/>
     </array-type-def>
     <!-- const char[7] -->
     <array-type-def dimensions='1' type-id='type-id-120' size-in-bits='56' id='type-id-219'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-8' id='type-id-216'/>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-8' id='type-id-216'/>
     </array-type-def>
     <!-- const char bug_report_url[31] -->
     <var-decl name='bug_report_url' type-id='type-id-217' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
@@ -5769,7 +5769,7 @@ 
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-265'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-8' id='type-id-266'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-8' id='type-id-266'/>
     </array-type-def>
     <!-- struct _cpp_file -->
     <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-247'>
@@ -6381,12 +6381,12 @@ 
     <!-- const unsigned char[256] -->
     <array-type-def dimensions='1' type-id='type-id-286' size-in-bits='2048' id='type-id-287'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-8' id='type-id-266'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-8' id='type-id-266'/>
     </array-type-def>
     <!-- unsigned char[256] -->
     <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='2048' id='type-id-288'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-8' id='type-id-266'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-8' id='type-id-266'/>
     </array-type-def>
     <!-- unsigned char _cpp_trigraph_map[256] -->
     <var-decl name='_cpp_trigraph_map' type-id='type-id-288' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
@@ -6788,7 +6788,7 @@ 
     <!-- cpp_token[1] -->
     <array-type-def dimensions='1' type-id='type-id-301' size-in-bits='192' id='type-id-302'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-8' id='type-id-11'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-8' id='type-id-11'/>
     </array-type-def>
     <!-- enum cpp_builtin_type -->
     <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-303'>
@@ -9520,22 +9520,22 @@ 
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-431' size-in-bits='8448' id='type-id-432'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-8' id='type-id-433'/>
+      <subrange length='33' lower-bound='0' upper-bound='32' type-id='type-id-8' id='type-id-433'/>
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
     <array-type-def dimensions='1' type-id='type-id-434' size-in-bits='11136' id='type-id-435'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-8' id='type-id-436'/>
+      <subrange length='58' lower-bound='0' upper-bound='57' type-id='type-id-8' id='type-id-436'/>
     </array-type-def>
     <!-- demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-437' size-in-bits='8448' id='type-id-438'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-8' id='type-id-433'/>
+      <subrange length='33' lower-bound='0' upper-bound='32' type-id='type-id-8' id='type-id-433'/>
     </array-type-def>
     <!-- demangle_operator_info[58] -->
     <array-type-def dimensions='1' type-id='type-id-439' size-in-bits='11136' id='type-id-440'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-8' id='type-id-436'/>
+      <subrange length='58' lower-bound='0' upper-bound='57' type-id='type-id-8' id='type-id-436'/>
     </array-type-def>
     <!-- enum d_builtin_type_print -->
     <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-441'>
@@ -10118,12 +10118,12 @@ 
     <!-- const demangler_engine[11] -->
     <array-type-def dimensions='1' type-id='type-id-471' size-in-bits='2112' id='type-id-472'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-8' id='type-id-473'/>
+      <subrange length='11' lower-bound='0' upper-bound='10' type-id='type-id-8' id='type-id-473'/>
     </array-type-def>
     <!-- demangler_engine[11] -->
     <array-type-def dimensions='1' type-id='type-id-474' size-in-bits='2112' id='type-id-475'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-8' id='type-id-473'/>
+      <subrange length='11' lower-bound='0' upper-bound='10' type-id='type-id-8' id='type-id-473'/>
     </array-type-def>
     <!-- enum demangling_styles -->
     <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-476'>
@@ -10502,7 +10502,7 @@ 
     <!-- md5_uint32[2] -->
     <array-type-def dimensions='1' type-id='type-id-480' size-in-bits='64' id='type-id-481'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-8' id='type-id-482'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-8' id='type-id-482'/>
     </array-type-def>
     <!-- struct md5_ctx -->
     <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-483'>
@@ -11180,12 +11180,12 @@ 
     <!-- const unsigned short int[256] -->
     <array-type-def dimensions='1' type-id='type-id-517' size-in-bits='4096' id='type-id-518'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-8' id='type-id-266'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-8' id='type-id-266'/>
     </array-type-def>
     <!-- unsigned short int[256] -->
     <array-type-def dimensions='1' type-id='type-id-36' size-in-bits='4096' id='type-id-519'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-8' id='type-id-266'/>
+      <subrange length='256' lower-bound='0' upper-bound='255' type-id='type-id-8' id='type-id-266'/>
     </array-type-def>
     <!-- const unsigned short int -->
     <qualified-type-def type-id='type-id-36' const='yes' id='type-id-517'/>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 85062a82..1ceb92af 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -9,43 +9,43 @@ 
     <!-- char*[7] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' id='type-id-3'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-4' id='type-id-5'/>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-4' id='type-id-5'/>
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8' id='type-id-6'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-7'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='unknown' id='type-id-8'>
       <!-- <anonymous range>[] -->
-      <subrange length='unknown' type-id='type-id-4' id='type-id-9'/>
+      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-4' id='type-id-9'/>
     </array-type-def>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-10'/>
     <!-- double[5][3] -->
     <array-type-def dimensions='2' type-id='type-id-10' size-in-bits='960' id='type-id-11'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-4' id='type-id-12'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-12'/>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-13'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-13'/>
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
     <!-- int*[4] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-4' id='type-id-17'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-17'/>
     </array-type-def>
     <!-- int*[4]*[10] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
       <!-- <anonymous range>[10] -->
-      <subrange length='10' type-id='type-id-4' id='type-id-20'/>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-20'/>
     </array-type-def>
     <!-- int[5] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-4' id='type-id-12'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-12'/>
     </array-type-def>
     <!-- sizetype -->
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
diff --git a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
index 51fd6e9e..9537612b 100644
--- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
+++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
@@ -1,4 +1,4 @@ 
-<abi-corpus version='2.1' soname='librte_bus_dpaa.so.20.0'>
+<abi-corpus version='2.2' soname='librte_bus_dpaa.so.20.0'>
   <elf-needed>
     <dependency name='libm.so.6'/>
     <dependency name='libdl.so.2'/>
@@ -116,42 +116,33 @@ 
   </elf-variable-symbols>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-3'/>
-    <var-decl name='fman_ip_rev' type-id='type-id-4' mangled-name='fman_ip_rev' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='24' column='1' elf-symbol-id='fman_ip_rev@@DPDK_20.0'/>
-    <var-decl name='fman_dealloc_bufs_mask_hi' type-id='type-id-5' mangled-name='fman_dealloc_bufs_mask_hi' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='26' column='1' elf-symbol-id='fman_dealloc_bufs_mask_hi@@DPDK_20.0'/>
-    <var-decl name='fman_dealloc_bufs_mask_lo' type-id='type-id-5' mangled-name='fman_dealloc_bufs_mask_lo' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='27' column='1' elf-symbol-id='fman_dealloc_bufs_mask_lo@@DPDK_20.0'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-3'/>
+    <typedef-decl name='__uint32_t' type-id='type-id-4' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-5'/>
+    <typedef-decl name='u16' type-id='type-id-6' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='105' column='1' id='type-id-7'/>
+    <typedef-decl name='u32' type-id='type-id-8' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='106' column='1' id='type-id-9'/>
+    <typedef-decl name='uint16_t' type-id='type-id-3' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-6'/>
+    <typedef-decl name='uint32_t' type-id='type-id-5' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-8'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-2'/>
+    <var-decl name='fman_ip_rev' type-id='type-id-7' mangled-name='fman_ip_rev' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='24' column='1' elf-symbol-id='fman_ip_rev@@DPDK_20.0'/>
+    <var-decl name='fman_dealloc_bufs_mask_hi' type-id='type-id-9' mangled-name='fman_dealloc_bufs_mask_hi' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='26' column='1' elf-symbol-id='fman_dealloc_bufs_mask_hi@@DPDK_20.0'/>
+    <var-decl name='fman_dealloc_bufs_mask_lo' type-id='type-id-9' mangled-name='fman_dealloc_bufs_mask_lo' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='27' column='1' elf-symbol-id='fman_dealloc_bufs_mask_lo@@DPDK_20.0'/>
     <var-decl name='fman_ccsr_map_fd' type-id='type-id-1' mangled-name='fman_ccsr_map_fd' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='29' column='1' elf-symbol-id='fman_ccsr_map_fd@@DPDK_20.0'/>
-    <typedef-decl name='u16' type-id='type-id-6' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='105' column='1' id='type-id-4'/>
-    <typedef-decl name='u32' type-id='type-id-7' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='106' column='1' id='type-id-5'/>
-    <typedef-decl name='uint16_t' type-id='type-id-8' filepath='/usr/include/bits/stdint-uintn.h' line='25' column='1' id='type-id-6'/>
-    <typedef-decl name='uint32_t' type-id='type-id-9' filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' id='type-id-7'/>
-    <typedef-decl name='__uint16_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-8'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-9'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-10'/>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='1024' id='type-id-12'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='48' id='type-id-15'>
-      <subrange length='6' type-id='type-id-10' id='type-id-16'/>
-    </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-17'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-18'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-19'/>
-    <enum-decl name='fman_mac_type' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='71' column='1' id='type-id-20'>
-      <underlying-type type-id='type-id-17'/>
+    <enum-decl name='fman_mac_type' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='71' column='1' id='type-id-11'>
+      <underlying-type type-id='type-id-12'/>
       <enumerator name='fman_offline' value='0'/>
       <enumerator name='fman_mac_1g' value='1'/>
       <enumerator name='fman_mac_10g' value='2'/>
     </enum-decl>
-    <class-decl name='fman_if' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='306' column='1' id='type-id-21'>
+    <class-decl name='fman_if' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='306' column='1' id='type-id-13'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fman_idx' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mac_type' type-id='type-id-20' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='310' column='1'/>
+        <var-decl name='mac_type' type-id='type-id-11' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='is_memac' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='312' column='1'/>
@@ -163,31 +154,31 @@ 
         <var-decl name='mac_idx' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='316' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='mac_addr' type-id='type-id-22' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='318' column='1'/>
+        <var-decl name='mac_addr' type-id='type-id-15' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='tx_channel_id' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='320' column='1'/>
+        <var-decl name='tx_channel_id' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='320' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='fqid_rx_def' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='325' column='1'/>
+        <var-decl name='fqid_rx_def' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fqid_rx_err' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='326' column='1'/>
+        <var-decl name='fqid_rx_err' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='fqid_tx_err' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='327' column='1'/>
+        <var-decl name='fqid_tx_err' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fqid_tx_confirm' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='328' column='1'/>
+        <var-decl name='fqid_tx_confirm' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='bpool_list' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='330' column='1'/>
+        <var-decl name='bpool_list' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='node' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='332' column='1'/>
+        <var-decl name='node' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='332' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='fman_if_ic_params' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='348' column='1' id='type-id-24'>
+    <class-decl name='fman_if_ic_params' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='348' column='1' id='type-id-17'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='iceof' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='350' column='1'/>
       </data-member>
@@ -198,204 +189,213 @@ 
         <var-decl name='icsz' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fman.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='list_head' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='14' column='1' id='type-id-23'>
+    <class-decl name='list_head' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='14' column='1' id='type-id-16'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='prev' type-id='type-id-25' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='15' column='1'/>
+        <var-decl name='prev' type-id='type-id-18' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='15' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-25' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='16' column='1'/>
+        <var-decl name='next' type-id='type-id-18' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_list.h' line='16' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_eth_stats' size-in-bits='5632' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='243' column='1' id='type-id-26'>
+    <class-decl name='rte_eth_stats' size-in-bits='5632' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='243' column='1' id='type-id-19'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ipackets' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='244' column='1'/>
+        <var-decl name='ipackets' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='opackets' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='245' column='1'/>
+        <var-decl name='opackets' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='245' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ibytes' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='246' column='1'/>
+        <var-decl name='ibytes' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='obytes' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='247' column='1'/>
+        <var-decl name='obytes' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='247' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='imissed' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='248' column='1'/>
+        <var-decl name='imissed' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='ierrors' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='252' column='1'/>
+        <var-decl name='ierrors' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='oerrors' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='253' column='1'/>
+        <var-decl name='oerrors' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='253' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='rx_nombuf' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='254' column='1'/>
+        <var-decl name='rx_nombuf' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='q_ipackets' type-id='type-id-12' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='255' column='1'/>
+        <var-decl name='q_ipackets' type-id='type-id-21' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='255' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='q_opackets' type-id='type-id-12' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='257' column='1'/>
+        <var-decl name='q_opackets' type-id='type-id-21' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='257' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='q_ibytes' type-id='type-id-12' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='259' column='1'/>
+        <var-decl name='q_ibytes' type-id='type-id-21' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='259' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='q_obytes' type-id='type-id-12' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='261' column='1'/>
+        <var-decl name='q_obytes' type-id='type-id-21' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='261' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='q_errors' type-id='type-id-12' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='263' column='1'/>
+        <var-decl name='q_errors' type-id='type-id-21' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='263' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_net/rte_ether.h' line='60' column='1' id='type-id-22'>
+    <class-decl name='rte_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_net/rte_ether.h' line='60' column='1' id='type-id-15'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr_bytes' type-id='type-id-15' visibility='default' filepath='../../dpdk/lib/librte_net/rte_ether.h' line='61' column='1'/>
+        <var-decl name='addr_bytes' type-id='type-id-22' visibility='default' filepath='../../dpdk/lib/librte_net/rte_ether.h' line='61' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-28'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-25'/>
-    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-30'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-32'/>
-    <type-decl name='void' id='type-id-33'/>
+    <typedef-decl name='__uint64_t' type-id='type-id-23' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-24'/>
+    <typedef-decl name='__uint8_t' type-id='type-id-25' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-26'/>
+    <typedef-decl name='size_t' type-id='type-id-23' filepath='/usr/lib64/clang/8.0.0/include/stddef.h' line='62' column='1' id='type-id-27'/>
+    <typedef-decl name='uint64_t' type-id='type-id-24' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-20'/>
+    <typedef-decl name='uint8_t' type-id='type-id-26' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-14'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='1024' id='type-id-21'>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-10' id='type-id-28'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='48' id='type-id-22'>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-10' id='type-id-29'/>
+    </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-12'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-25'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-23'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-33'/>
+    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-34'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-35'/>
+    <type-decl name='void' id='type-id-36'/>
     <function-decl name='fman_if_set_mcast_filter_table' mangled-name='fman_if_set_mcast_filter_table' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_mcast_filter_table@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='36' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='36' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_reset_mcast_filter_table' mangled-name='fman_if_reset_mcast_filter_table' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_reset_mcast_filter_table@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='48' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='48' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_clear_mac_addr' mangled-name='fman_if_clear_mac_addr' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_clear_mac_addr@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='128' column='1'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='128' column='1'/>
       <parameter type-id='type-id-14' name='addr_num' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='128' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_add_mac_addr' mangled-name='fman_if_add_mac_addr' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_add_mac_addr@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1'/>
-      <parameter type-id='type-id-32' name='eth' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1'/>
+      <parameter type-id='type-id-35' name='eth' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1'/>
       <parameter type-id='type-id-14' name='addr_num' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='149' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_stats_get' mangled-name='fman_if_stats_get' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_stats_get@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='216' column='1'/>
-      <parameter type-id='type-id-30' name='stats' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='216' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='216' column='1'/>
+      <parameter type-id='type-id-33' name='stats' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='216' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_stats_get_all' mangled-name='fman_if_stats_get_all' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_stats_get_all@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1'/>
-      <parameter type-id='type-id-31' name='value' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1'/>
       <parameter type-id='type-id-1' name='n' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='239' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_stats_reset' mangled-name='fman_if_stats_reset' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_stats_reset@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='254' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='254' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_promiscuous_enable' mangled-name='fman_if_promiscuous_enable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_promiscuous_enable@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='271' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='271' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_promiscuous_disable' mangled-name='fman_if_promiscuous_disable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_promiscuous_disable@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='284' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='284' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_enable_rx' mangled-name='fman_if_enable_rx' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_enable_rx@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='297' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='297' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_disable_rx' mangled-name='fman_if_disable_rx' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_disable_rx@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='308' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='308' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_loopback_enable' mangled-name='fman_if_loopback_enable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_loopback_enable@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='319' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='319' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_loopback_disable' mangled-name='fman_if_loopback_disable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_loopback_disable@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='338' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='338' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_set_bp' mangled-name='fman_if_set_bp' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_bp@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='356' column='1'/>
-      <parameter type-id='type-id-2' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='356' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='356' column='1'/>
+      <parameter type-id='type-id-4' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='356' column='1'/>
       <parameter type-id='type-id-1' name='bpid' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='357' column='1'/>
-      <parameter type-id='type-id-34' name='bufsize' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='357' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-27' name='bufsize' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='357' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_get_fc_threshold' mangled-name='fman_if_get_fc_threshold' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_get_fc_threshold@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='377' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='377' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_set_fc_threshold' mangled-name='fman_if_set_fc_threshold' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_fc_threshold@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='389' column='1'/>
-      <parameter type-id='type-id-5' name='high_water' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='389' column='1'/>
-      <parameter type-id='type-id-5' name='low_water' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='390' column='1'/>
-      <parameter type-id='type-id-5' name='bpid' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='390' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='389' column='1'/>
+      <parameter type-id='type-id-9' name='high_water' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='389' column='1'/>
+      <parameter type-id='type-id-9' name='low_water' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='390' column='1'/>
+      <parameter type-id='type-id-9' name='bpid' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='390' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_get_fc_quanta' mangled-name='fman_if_get_fc_quanta' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_get_fc_quanta@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='404' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='404' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_set_fc_quanta' mangled-name='fman_if_set_fc_quanta' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_fc_quanta@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='414' column='1'/>
-      <parameter type-id='type-id-4' name='pause_quanta' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='414' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='414' column='1'/>
+      <parameter type-id='type-id-7' name='pause_quanta' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='414' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_get_fdoff' mangled-name='fman_if_get_fdoff' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_get_fdoff@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='426' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='426' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_set_ic_params' mangled-name='fman_if_set_ic_params' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_ic_params@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='477' column='1'/>
-      <parameter type-id='type-id-28' name='icp' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='478' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='477' column='1'/>
+      <parameter type-id='type-id-31' name='icp' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='478' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_set_fdoff' mangled-name='fman_if_set_fdoff' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_fdoff@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
-      <parameter type-id='type-id-7' name='fd_offset' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
+      <parameter type-id='type-id-8' name='fd_offset' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_set_maxfrm' mangled-name='fman_if_set_maxfrm' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='517' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_maxfrm@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='517' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='517' column='1'/>
       <parameter type-id='type-id-6' name='max_frm' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='517' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_get_sg_enable' mangled-name='fman_if_get_sg_enable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_get_sg_enable@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='550' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='550' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fman_if_set_sg' mangled-name='fman_if_set_sg' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_sg@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='564' column='1'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='564' column='1'/>
       <parameter type-id='type-id-1' name='enable' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='564' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fman_if_discard_rx_errors' mangled-name='fman_if_discard_rx_errors' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_discard_rx_errors@@DPDK_20.0'>
-      <parameter type-id='type-id-29' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='597' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-32' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='597' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
-    <typedef-decl name='uint8_t' type-id='type-id-35' filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' id='type-id-14'/>
-    <typedef-decl name='uint64_t' type-id='type-id-36' filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' id='type-id-11'/>
-    <typedef-decl name='__uint8_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='38' column='1' id='type-id-35'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-36'/>
-    <typedef-decl name='size_t' type-id='type-id-19' filepath='/usr/lib64/clang/8.0.0/include/stddef.h' line='62' column='1' id='type-id-34'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/netcfg_layer.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
-    <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='infinite' id='type-id-38'>
-      <subrange length='infinite' type-id='type-id-10' id='type-id-39'/>
+    <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='unknown' id='type-id-38'>
+      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-10' id='type-id-39'/>
     </array-type-def>
     <class-decl name='fm_eth_port_cfg' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='15' column='1' id='type-id-37'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='list' type-id='type-id-25' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='17' column='1'/>
+        <var-decl name='list' type-id='type-id-18' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='17' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rx_def' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='19' column='1'/>
+        <var-decl name='rx_def' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fman_if' type-id='type-id-29' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='21' column='1'/>
+        <var-decl name='fman_if' type-id='type-id-32' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='21' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='netcfg_info' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/netcfg.h' line='24' column='1' id='type-id-40'>
@@ -412,134 +412,101 @@ 
     </function-decl>
     <function-decl name='netcfg_release' mangled-name='netcfg_release' filepath='../../dpdk/drivers/bus/dpaa/base/fman/netcfg_layer.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netcfg_release@@DPDK_20.0'>
       <parameter type-id='type-id-41' name='cfg_ptr' filepath='../../dpdk/drivers/bus/dpaa/base/fman/netcfg_layer.c' line='152' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <array-type-def dimensions='1' type-id='type-id-42' size-in-bits='512' id='type-id-43'>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-10' id='type-id-44'/>
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-45'/>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='128' id='type-id-46'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='64' id='type-id-47'>
-      <subrange length='2' type-id='type-id-10' id='type-id-48'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-49'>
-      <subrange length='4' type-id='type-id-10' id='type-id-50'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='256' id='type-id-52'>
-      <subrange length='32' type-id='type-id-10' id='type-id-53'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='496' id='type-id-54'>
-      <subrange length='62' type-id='type-id-10' id='type-id-55'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-10' id='type-id-28'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='504' id='type-id-56'>
-      <subrange length='63' type-id='type-id-10' id='type-id-57'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='64' id='type-id-58'>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-59' size-in-bits='128' id='type-id-60'>
-      <subrange length='2' type-id='type-id-10' id='type-id-48'/>
-    </array-type-def>
-    <class-decl name='bman_portal' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='16' column='1' id='type-id-61'>
+    <class-decl name='bm_addr' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='126' column='1' id='type-id-47'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p' type-id='type-id-62' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='17' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='pools' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='19' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='thresh_set' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='20' column='1'/>
+        <var-decl name='ce' type-id='type-id-48' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='127' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='irq_sources' type-id='type-id-19' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='21' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='slowpoll' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='22' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='config' type-id='type-id-64' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='24' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='irqname' type-id='type-id-46' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='25' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='ci' type-id='type-id-48' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='128' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bman_pool' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='42' column='1' id='type-id-65'>
+    <class-decl name='bm_buffer' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='42' column='1' id='type-id-42'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-66' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='portal' type-id='type-id-67' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='45' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='next' type-id='type-id-68' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='46' column='1'/>
+        <var-decl name='' type-id='type-id-49' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_rcr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='100' column='1' id='type-id-69'>
+    <class-decl name='bm_mc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='110' column='1' id='type-id-50'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ring' type-id='type-id-70' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='101' column='1'/>
+        <var-decl name='cr' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cursor' type-id='type-id-70' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='101' column='1'/>
+        <var-decl name='rr' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ci' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
+        <var-decl name='rridx' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='available' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='113' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='ithresh' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
+    </class-decl>
+    <class-decl name='bm_mc_command' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='112' column='1' id='type-id-54'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__dont_write_directly__verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='113' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='' type-id='type-id-55' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='114' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_mc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='110' column='1' id='type-id-71'>
+    <class-decl name='bm_mc_result' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='137' column='1' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cr' type-id='type-id-72' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='111' column='1'/>
+        <var-decl name='' type-id='type-id-57' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='138' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rr' type-id='type-id-73' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='112' column='1'/>
+    </class-decl>
+    <class-decl name='bm_mcc_acquire' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='105' column='1' id='type-id-58'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bpid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='106' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rridx' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='113' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='__reserved1' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='107' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='113' column='1'/>
+    </class-decl>
+    <class-decl name='bm_mcc_query' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='109' column='1' id='type-id-60'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved2' type-id='type-id-61' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='110' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_addr' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='126' column='1' id='type-id-74'>
+    <class-decl name='bm_pool_state' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='127' column='1' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ce' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='127' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='128' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ci' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='128' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='as' type-id='type-id-64' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='134' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='ds' type-id='type-id-64' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_portal' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='131' column='1' id='type-id-62'>
+    <class-decl name='bm_portal' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='131' column='1' id='type-id-65'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-74' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='132' column='1'/>
+        <var-decl name='addr' type-id='type-id-47' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rcr' type-id='type-id-69' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='133' column='1'/>
+        <var-decl name='rcr' type-id='type-id-66' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='mc' type-id='type-id-71' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='134' column='1'/>
+        <var-decl name='mc' type-id='type-id-50' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='134' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='config' type-id='type-id-75' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='135' column='1'/>
+        <var-decl name='config' type-id='type-id-67' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='135' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_portal_config' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='50' column='1' id='type-id-75'>
+    <class-decl name='bm_portal_config' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='50' column='1' id='type-id-67'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr_virt' type-id='type-id-60' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='55' column='1'/>
+        <var-decl name='addr_virt' type-id='type-id-68' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='list' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='57' column='1'/>
+        <var-decl name='list' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='cpu' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='63' column='1'/>
@@ -548,1774 +515,1755 @@ 
         <var-decl name='irq' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='index' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='67' column='1'/>
+        <var-decl name='index' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
         <var-decl name='is_shared' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='mask' type-id='type-id-76' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='73' column='1'/>
+        <var-decl name='mask' type-id='type-id-69' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_priv.h' line='73' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bman_depletion' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='17' column='1' id='type-id-76'>
+    <class-decl name='bm_rcr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='100' column='1' id='type-id-66'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='state' type-id='type-id-47' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='18' column='1'/>
+        <var-decl name='ring' type-id='type-id-70' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='101' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='bm_buffer' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='42' column='1' id='type-id-42'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-77' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='cursor' type-id='type-id-70' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='101' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43' column='1' id='type-id-77'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-78' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='ci' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-79' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57' column='1'/>
+      <data-member access='public' layout-offset-in-bits='136'>
+        <var-decl name='available' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='opaque' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='66' column='1'/>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='ithresh' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44' column='1' id='type-id-78'>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='102' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='bm_rcr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='87' column='1' id='type-id-71'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='51' column='1'/>
+        <var-decl name='' type-id='type-id-72' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='88' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hi' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='52' column='1'/>
+    </class-decl>
+    <class-decl name='bman_depletion' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='17' column='1' id='type-id-69'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='state' type-id='type-id-73' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='18' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='bpid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='53' column='1'/>
+    </class-decl>
+    <class-decl name='bman_pool' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='42' column='1' id='type-id-74'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='params' type-id='type-id-75' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='43' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='__reserved' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='54' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='portal' type-id='type-id-76' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='45' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='next' type-id='type-id-77' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__2' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57' column='1' id='type-id-79'>
+    <class-decl name='bman_pool_params' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='170' column='1' id='type-id-75'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='62' column='1'/>
+        <var-decl name='bpid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='174' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='__notaddress' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='63' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='flags' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='176' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='thresholds' type-id='type-id-78' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='182' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_rcr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='87' column='1' id='type-id-81'>
+    <class-decl name='bman_portal' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='16' column='1' id='type-id-79'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-82' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='88' column='1'/>
+        <var-decl name='p' type-id='type-id-65' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='17' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='88' column='1' id='type-id-82'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-83' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='89' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='pools' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='19' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='94' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='thresh_set' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='20' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='89' column='1' id='type-id-83'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__dont_write_directly__verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='90' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='irq_sources' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='21' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='bpid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='91' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='slowpoll' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='22' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved1' type-id='type-id-54' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='92' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='config' type-id='type-id-81' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='24' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='irqname' type-id='type-id-46' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='25' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_mcc_acquire' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='105' column='1' id='type-id-84'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44' column='1' id='type-id-82'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bpid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='106' column='1'/>
+        <var-decl name='lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='51' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='__reserved1' type-id='type-id-54' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='107' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='hi' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='bpid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='53' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='__reserved' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='54' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_mcc_query' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='109' column='1' id='type-id-85'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57' column='1' id='type-id-83'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved2' type-id='type-id-56' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='110' column='1'/>
+        <var-decl name='addr' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='__notaddress' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='63' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_mc_command' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='112' column='1' id='type-id-86'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='89' column='1' id='type-id-85'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__dont_write_directly__verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='113' column='1'/>
+        <var-decl name='__dont_write_directly__verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='' type-id='type-id-87' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='114' column='1'/>
-      </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__2' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='114' column='1' id='type-id-87'>
-      <data-member access='public'>
-        <var-decl name='acquire' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='115' column='1'/>
+        <var-decl name='bpid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='91' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='query' type-id='type-id-85' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='116' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved1' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='92' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='bm_pool_state' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='127' column='1' id='type-id-88'>
+    </class-decl>
+    <class-decl name='__anonymous_struct__4' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144' column='1' id='type-id-86'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='128' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='145' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='as' type-id='type-id-89' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='134' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='bpid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='146' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ds' type-id='type-id-89' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='134' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved2' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='130' column='1' id='type-id-89'>
+    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='130' column='1' id='type-id-64'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-58' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='131' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-87' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='state' type-id='type-id-76' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='133' column='1'/>
+        <var-decl name='state' type-id='type-id-69' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='bm_mc_result' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='137' column='1' id='type-id-90'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139' column='1' id='type-id-88'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-91' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='138' column='1'/>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='140' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='__reserved1' type-id='type-id-61' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='141' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__3' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='138' column='1' id='type-id-91'>
+    <typedef-decl name='u64' type-id='type-id-20' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='107' column='1' id='type-id-84'/>
+    <typedef-decl name='u8' type-id='type-id-14' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='104' column='1' id='type-id-53'/>
+    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='64' id='type-id-73'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-10' id='type-id-89'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='128' id='type-id-78'>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-10' id='type-id-90'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='256' id='type-id-63'>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-10' id='type-id-91'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='496' id='type-id-59'>
+      <subrange length='62' lower-bound='0' upper-bound='61' type-id='type-id-10' id='type-id-92'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='504' id='type-id-61'>
+      <subrange length='63' lower-bound='0' upper-bound='62' type-id='type-id-10' id='type-id-93'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='64' id='type-id-87'>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-10' id='type-id-44'/>
+    </array-type-def>
+    <union-decl name='__anonymous_union__2' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='114' column='1' id='type-id-55'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-92' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139' column='1'/>
+        <var-decl name='acquire' type-id='type-id-58' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='115' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='acquire' type-id='type-id-93' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='150' column='1'/>
+        <var-decl name='query' type-id='type-id-60' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='116' column='1'/>
       </data-member>
+    </union-decl>
+    <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43' column='1' id='type-id-49'>
       <data-member access='public'>
-        <var-decl name='query' type-id='type-id-88' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='151' column='1'/>
+        <var-decl name='' type-id='type-id-82' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__3' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139' column='1' id='type-id-92'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='140' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-83' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='__reserved1' type-id='type-id-56' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='141' column='1'/>
+      <data-member access='public'>
+        <var-decl name='opaque' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='66' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__4' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='143' column='1' id='type-id-93'>
+    </union-decl>
+    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='88' column='1' id='type-id-72'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-94' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144' column='1'/>
+        <var-decl name='' type-id='type-id-85' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='89' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='149' column='1'/>
+        <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='94' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__4' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144' column='1' id='type-id-94'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='145' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='bpid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='146' column='1'/>
+    <union-decl name='__anonymous_union__4' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='143' column='1' id='type-id-94'>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-86' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved2' type-id='type-id-54' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='147' column='1'/>
+      <data-member access='public'>
+        <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='149' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='bman_pool_params' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='170' column='1' id='type-id-66'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bpid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='174' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__3' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='138' column='1' id='type-id-57'>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-88' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='flags' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='176' column='1'/>
+      <data-member access='public'>
+        <var-decl name='acquire' type-id='type-id-94' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='150' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='thresholds' type-id='type-id-49' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='182' column='1'/>
+      <data-member access='public'>
+        <var-decl name='query' type-id='type-id-62' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='151' column='1'/>
       </data-member>
-    </class-decl>
+    </union-decl>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='128' id='type-id-68'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-10' id='type-id-89'/>
+    </array-type-def>
     <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-95'/>
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-72'/>
-    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-73'/>
-    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-70'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-63'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-68'/>
-    <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-67'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-51'/>
+    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-52'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-80'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-77'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-76'/>
     <qualified-type-def type-id='type-id-42' const='yes' id='type-id-96'/>
     <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-97'/>
-    <qualified-type-def type-id='type-id-75' const='yes' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-64'/>
-    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-99'/>
+    <qualified-type-def type-id='type-id-67' const='yes' id='type-id-98'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-81'/>
+    <qualified-type-def type-id='type-id-74' 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-66' const='yes' id='type-id-101'/>
+    <qualified-type-def type-id='type-id-75' const='yes' id='type-id-101'/>
     <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-59'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-48'/>
     <function-decl name='bman_new_pool' mangled-name='bman_new_pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_new_pool@@DPDK_20.0'>
       <parameter type-id='type-id-102' name='params' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='183' column='1'/>
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-77'/>
     </function-decl>
     <function-decl name='bman_free_pool' mangled-name='bman_free_pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_free_pool@@DPDK_20.0'>
-      <parameter type-id='type-id-68' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='227' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-77' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='227' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='bman_get_params' mangled-name='bman_get_params' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_get_params@@DPDK_20.0'>
       <parameter type-id='type-id-100' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='236' column='1'/>
       <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='bman_release' mangled-name='bman_release' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_release@@DPDK_20.0'>
-      <parameter type-id='type-id-68' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1'/>
+      <parameter type-id='type-id-77' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1'/>
       <parameter type-id='type-id-97' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1'/>
-      <parameter type-id='type-id-51' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='251' column='1'/>
+      <parameter type-id='type-id-53' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='250' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='251' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='bman_acquire' mangled-name='bman_acquire' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_acquire@@DPDK_20.0'>
-      <parameter type-id='type-id-68' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1'/>
+      <parameter type-id='type-id-77' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1'/>
       <parameter type-id='type-id-95' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1'/>
-      <parameter type-id='type-id-51' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='293' column='1'/>
+      <parameter type-id='type-id-53' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='292' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='293' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='bman_query_free_buffers' mangled-name='bman_query_free_buffers' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_query_free_buffers@@DPDK_20.0'>
-      <parameter type-id='type-id-68' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='343' column='1'/>
-      <return type-id='type-id-5'/>
+      <parameter type-id='type-id-77' name='pool' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' line='343' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
-    <typedef-decl name='u8' type-id='type-id-14' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='104' column='1' id='type-id-51'/>
-    <typedef-decl name='u64' type-id='type-id-11' filepath='../../dpdk/drivers/common/dpaax/compat.h' line='107' column='1' id='type-id-80'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <function-decl name='bman_thread_irq' mangled-name='bman_thread_irq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_driver.c' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_thread_irq@@DPDK_20.0'>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-103'/>
     <function-decl name='qman_reserve_fqid_range' mangled-name='qman_reserve_fqid_range' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_reserve_fqid_range@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1'/>
-      <parameter type-id='type-id-2' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1'/>
+      <parameter type-id='type-id-9' name='fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1'/>
+      <parameter type-id='type-id-4' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_alloc_pool_range' mangled-name='qman_alloc_pool_range' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_alloc_pool_range@@DPDK_20.0'>
       <parameter type-id='type-id-103' name='result' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
-      <parameter type-id='type-id-5' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
-      <parameter type-id='type-id-5' name='align' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
+      <parameter type-id='type-id-9' name='align' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
       <parameter type-id='type-id-1' name='partial' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='43' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_alloc_cgrid_range' mangled-name='qman_alloc_cgrid_range' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_alloc_cgrid_range@@DPDK_20.0'>
       <parameter type-id='type-id-103' name='result' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
-      <parameter type-id='type-id-5' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
-      <parameter type-id='type-id-5' name='align' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
+      <parameter type-id='type-id-9' name='align' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
       <parameter type-id='type-id-1' name='partial' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='58' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_release_cgrid_range' mangled-name='qman_release_cgrid_range' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_release_cgrid_range@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='cgrid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='63' column='1'/>
-      <parameter type-id='type-id-5' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='63' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-9' name='cgrid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='63' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='63' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='2040' id='type-id-104'>
-      <subrange length='255' type-id='type-id-10' id='type-id-105'/>
+      <subrange length='255' lower-bound='0' upper-bound='254' type-id='type-id-10' id='type-id-105'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='256' id='type-id-106'>
-      <subrange length='32' type-id='type-id-10' id='type-id-53'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-10' id='type-id-91'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='32768' id='type-id-107'>
-      <subrange length='4096' type-id='type-id-10' id='type-id-108'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-109' size-in-bits='8192' id='type-id-110'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
-    </array-type-def>
-    <type-decl name='short int' size-in-bits='16' id='type-id-111'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-112'/>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='256' id='type-id-113'>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='80' id='type-id-114'>
-      <subrange length='10' type-id='type-id-10' id='type-id-115'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='128' id='type-id-116'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='184' id='type-id-117'>
-      <subrange length='23' type-id='type-id-10' id='type-id-118'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='224' id='type-id-119'>
-      <subrange length='28' type-id='type-id-10' id='type-id-120'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='16' id='type-id-121'>
-      <subrange length='2' type-id='type-id-10' id='type-id-48'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='240' id='type-id-122'>
-      <subrange length='30' type-id='type-id-10' id='type-id-123'/>
+      <subrange length='4096' lower-bound='0' upper-bound='4095' type-id='type-id-10' id='type-id-108'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='24' id='type-id-124'>
-      <subrange length='3' type-id='type-id-10' id='type-id-125'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='320' id='type-id-126'>
-      <subrange length='40' type-id='type-id-10' id='type-id-127'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='448' id='type-id-128'>
-      <subrange length='56' type-id='type-id-10' id='type-id-129'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='40' id='type-id-130'>
-      <subrange length='5' type-id='type-id-10' id='type-id-131'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='480' id='type-id-132'>
-      <subrange length='60' type-id='type-id-10' id='type-id-133'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='488' id='type-id-134'>
-      <subrange length='61' type-id='type-id-10' id='type-id-135'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='48' id='type-id-136'>
-      <subrange length='6' type-id='type-id-10' id='type-id-16'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='128' id='type-id-137'>
-      <subrange length='2' type-id='type-id-10' id='type-id-48'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='infinite' id='type-id-138'>
-      <subrange length='infinite' type-id='type-id-10' id='type-id-39'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-59' size-in-bits='98304' id='type-id-139'>
-      <subrange length='1536' type-id='type-id-10' id='type-id-140'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-59' size-in-bits='infinite' id='type-id-141'>
-      <subrange length='infinite' type-id='type-id-10' id='type-id-39'/>
+    <enum-decl name='qm_dc_portal' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='40' column='1' id='type-id-109'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='qm_dc_portal_fman0' value='0'/>
+      <enumerator name='qm_dc_portal_fman1' value='1'/>
+      <enumerator name='qm_dc_portal_caam' value='2'/>
+      <enumerator name='qm_dc_portal_pme' value='3'/>
+    </enum-decl>
+    <enum-decl name='qm_fd_format' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='95' column='1' id='type-id-110'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='qm_fd_contig' value='0'/>
+      <enumerator name='qm_fd_contig_big' value='2'/>
+      <enumerator name='qm_fd_sg' value='4'/>
+      <enumerator name='qm_fd_sg_big' value='6'/>
+      <enumerator name='qm_fd_compound' value='1'/>
+    </enum-decl>
+    <enum-decl name='qman_cb_dqrr_result' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1105' column='1' id='type-id-111'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='qman_cb_dqrr_consume' value='0'/>
+      <enumerator name='qman_cb_dqrr_park' value='1'/>
+      <enumerator name='qman_cb_dqrr_defer' value='2'/>
+      <enumerator name='qman_cb_dqrr_stop' value='3'/>
+      <enumerator name='qman_cb_dqrr_consume_stop' value='4'/>
+    </enum-decl>
+    <enum-decl name='qman_fq_state' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1167' column='1' id='type-id-112'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='qman_fq_state_oos' value='0'/>
+      <enumerator name='qman_fq_state_parked' value='1'/>
+      <enumerator name='qman_fq_state_sched' value='2'/>
+      <enumerator name='qman_fq_state_retired' value='3'/>
+    </enum-decl>
+    <array-type-def dimensions='1' type-id='type-id-113' size-in-bits='8192' id='type-id-114'>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-10' id='type-id-28'/>
     </array-type-def>
-    <class-decl name='qman_portal' size-in-bits='16384' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='63' column='1' id='type-id-142'>
+    <type-decl name='short int' size-in-bits='16' id='type-id-115'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-116'/>
+    <class-decl name='__qm_mc_cgr' size-in-bits='200' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='662' column='1' id='type-id-117'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p' type-id='type-id-143' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='64' column='1'/>
+        <var-decl name='wr_parm_g' type-id='type-id-118' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='663' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='bits' type-id='type-id-19' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='66' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='irq_sources' type-id='type-id-19' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='68' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='wr_parm_y' type-id='type-id-118' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='664' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='use_eqcr_ci_stashing' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='69' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='wr_parm_r' type-id='type-id-118' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='665' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='slowpoll' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='wr_en_g' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='666' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='vdqcr_owned' type-id='type-id-144' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='72' column='1'/>
+      <data-member access='public' layout-offset-in-bits='104'>
+        <var-decl name='wr_en_y' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='667' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='sdqcr' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='73' column='1'/>
+      <data-member access='public' layout-offset-in-bits='112'>
+        <var-decl name='wr_en_r' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='668' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='dqrr_disable_ref' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='74' column='1'/>
+      <data-member access='public' layout-offset-in-bits='120'>
+        <var-decl name='cscn_en' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='669' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='cb_dc_ern' type-id='type-id-145' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='78' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='' type-id='type-id-119' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='670' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='config' type-id='type-id-146' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='80' column='1'/>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='cstd_en' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='682' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='retire_table' type-id='type-id-147' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='81' column='1'/>
+      <data-member access='public' layout-offset-in-bits='168'>
+        <var-decl name='cs' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='683' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='irqname' type-id='type-id-46' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='82' column='1'/>
+      <data-member access='public' layout-offset-in-bits='176'>
+        <var-decl name='' type-id='type-id-120' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='684' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='cgrs' type-id='type-id-148' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='84' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='mode' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='689' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='cgr_cbs' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='86' column='1'/>
+    </class-decl>
+    <class-decl name='__qm_mcr_querycongestion' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='988' column='1' id='type-id-121'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='state' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='989' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='cgr_lock' type-id='type-id-149' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='88' column='1'/>
+    </class-decl>
+    <class-decl name='device_node' size-in-bits='34808' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='66' column='1' id='type-id-123'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='name' type-id='type-id-104' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='67' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='shadow_dqrr' type-id='type-id-110' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='96' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2040'>
+        <var-decl name='full_name' type-id='type-id-107' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='68' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_eqcr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='147' column='1' id='type-id-150'>
+    <class-decl name='dpa_rbtree' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='36' column='1' id='type-id-124'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ring' type-id='type-id-151' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='148' column='1'/>
+        <var-decl name='head' type-id='type-id-125' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cursor' type-id='type-id-151' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='148' column='1'/>
+        <var-decl name='tail' type-id='type-id-125' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='37' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ci' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
+    </class-decl>
+    <class-decl name='qm_addr' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='193' column='1' id='type-id-126'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='ce' type-id='type-id-48' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='194' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='available' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='ci' type-id='type-id-48' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='195' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='ithresh' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
+    </class-decl>
+    <class-decl name='qm_cgr_cs_thres' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='641' column='1' id='type-id-127'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='' type-id='type-id-128' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='642' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
+    </class-decl>
+    <class-decl name='qm_cgr_wr_parm' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='614' column='1' id='type-id-118'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='' type-id='type-id-129' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='615' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_dqrr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='156' column='1' id='type-id-152'>
+    <class-decl name='qm_dqrr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='156' column='1' id='type-id-130'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ring' type-id='type-id-153' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='157' column='1'/>
+        <var-decl name='ring' type-id='type-id-131' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cursor' type-id='type-id-153' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='157' column='1'/>
+        <var-decl name='cursor' type-id='type-id-131' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pi' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
+        <var-decl name='pi' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='ci' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
+        <var-decl name='ci' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='fill' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
+        <var-decl name='fill' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='ithresh' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
+        <var-decl name='ithresh' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='158' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='166' column='1' id='type-id-154'>
+    <class-decl name='qm_dqrr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='301' column='1' id='type-id-113'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ring' type-id='type-id-155' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='167' column='1'/>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='302' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cursor' type-id='type-id-155' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='167' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='stat' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='303' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pi' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='seqnum' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='304' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='ci' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='tok' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='305' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='fill' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='__reserved2' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='306' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='ithresh' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='307' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='contextB' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='308' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='fd' type-id='type-id-133' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='309' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='__reserved4' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='310' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='175' column='1' id='type-id-156'>
+    <class-decl name='qm_eqcr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='147' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cr' type-id='type-id-157' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='176' column='1'/>
+        <var-decl name='ring' type-id='type-id-135' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='148' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rr' type-id='type-id-158' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='177' column='1'/>
+        <var-decl name='cursor' type-id='type-id-135' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='148' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rridx' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='178' column='1'/>
+        <var-decl name='ci' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
-        <var-decl name='vbit' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='178' column='1'/>
+        <var-decl name='available' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_addr' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='193' column='1' id='type-id-159'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ce' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='194' column='1'/>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='ithresh' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ci' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='195' column='1'/>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='149' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_portal' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='198' column='1' id='type-id-143'>
+    <class-decl name='qm_eqcr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='288' column='1' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr' type-id='type-id-159' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='199' column='1'/>
+        <var-decl name='__dont_write_directly__verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='289' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='eqcr' type-id='type-id-150' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='200' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='dca' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='290' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='dqrr' type-id='type-id-152' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='201' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='seqnum' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='291' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='mr' type-id='type-id-154' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='202' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='orp' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='292' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='mc' type-id='type-id-156' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='203' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='293' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='tag' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='294' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='fd' type-id='type-id-133' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='295' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='__reserved3' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='296' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qman_cgrs' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='21' column='1' id='type-id-160'>
+    <class-decl name='qm_fd' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='120' column='1' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='q' type-id='type-id-161' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='22' column='1'/>
+        <var-decl name='' type-id='type-id-137' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='' type-id='type-id-138' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='' type-id='type-id-139' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_portal_config' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='97' column='1' id='type-id-162'>
+    <class-decl name='qm_fqd' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='441' column='1' id='type-id-140'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='addr_virt' type-id='type-id-60' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='102' column='1'/>
+        <var-decl name='' type-id='type-id-141' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='442' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='node' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='103' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='cgid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='458' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='list' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='105' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='fq_ctrl' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='459' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='cpu' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='114' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='' type-id='type-id-142' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='460' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='irq' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='116' column='1'/>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='__reserved2' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='476' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='index' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='118' column='1'/>
+      <data-member access='public' layout-offset-in-bits='49'>
+        <var-decl name='ics_cred' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='477' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='is_shared' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='122' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='' type-id='type-id-143' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='485' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='channel' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='126' column='1'/>
+      <data-member access='public' layout-offset-in-bits='80'>
+        <var-decl name='context_b' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='490' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='pools' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='130' column='1'/>
+      <data-member access='public' layout-offset-in-bits='112'>
+        <var-decl name='context_a' type-id='type-id-144' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='520' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='176'>
+        <var-decl name='oac_query' type-id='type-id-145' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='521' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rb_node' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='32' column='1' id='type-id-164'>
+    <class-decl name='qm_fqd_oac' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='429' column='1' id='type-id-145'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='prev' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='33' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='435' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='33' column='1'/>
+      <data-member access='public' layout-offset-in-bits='6'>
+        <var-decl name='oac' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='436' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='oal' type-id='type-id-116' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='439' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='dpa_rbtree' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='36' column='1' id='type-id-147'>
+    <class-decl name='qm_fqd_stashing' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='401' column='1' id='type-id-146'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='37' column='1'/>
+        <var-decl name='context_cl' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='411' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='37' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2'>
+        <var-decl name='data_cl' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='412' column='1'/>
       </data-member>
-    </class-decl>
-    <enum-decl name='qm_dc_portal' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='40' column='1' id='type-id-166'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='qm_dc_portal_fman0' value='0'/>
-      <enumerator name='qm_dc_portal_fman1' value='1'/>
-      <enumerator name='qm_dc_portal_caam' value='2'/>
-      <enumerator name='qm_dc_portal_pme' value='3'/>
-    </enum-decl>
-    <enum-decl name='qm_fd_format' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='95' column='1' id='type-id-167'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='qm_fd_contig' value='0'/>
-      <enumerator name='qm_fd_contig_big' value='2'/>
-      <enumerator name='qm_fd_sg' value='4'/>
-      <enumerator name='qm_fd_sg_big' value='6'/>
-      <enumerator name='qm_fd_compound' value='1'/>
-    </enum-decl>
-    <class-decl name='qm_fd' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='120' column='1' id='type-id-168'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-169' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121' column='1'/>
+      <data-member access='public' layout-offset-in-bits='4'>
+        <var-decl name='annotation_cl' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='413' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='' type-id='type-id-170' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154' column='1'/>
+      <data-member access='public' layout-offset-in-bits='6'>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='414' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='' type-id='type-id-171' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='exclusive' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='415' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121' column='1' id='type-id-169'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-172' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122' column='1'/>
+    <class-decl name='qm_fqd_taildrop' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='418' column='1' id='type-id-147'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='exp' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='424' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-173' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141' column='1'/>
+      <data-member access='public' layout-offset-in-bits='5'>
+        <var-decl name='mant' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='425' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='opaque_addr' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='146' column='1'/>
+      <data-member access='public' layout-offset-in-bits='13'>
+        <var-decl name='__reserved1' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='426' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122' column='1' id='type-id-172'>
+    </class-decl>
+    <class-decl name='qm_mc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='175' column='1' id='type-id-148'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='liodn_offset' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='132' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='6'>
-        <var-decl name='dd' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='133' column='1'/>
+        <var-decl name='cr' type-id='type-id-149' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='176' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='bpid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='134' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='rr' type-id='type-id-150' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='177' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='135' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='rridx' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='178' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20'>
-        <var-decl name='eliodn_offset' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='136' column='1'/>
+      <data-member access='public' layout-offset-in-bits='136'>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='178' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='addr_hi' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='137' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mc_command' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='798' column='1' id='type-id-151'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__dont_write_directly__verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='799' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='addr_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='138' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='' type-id='type-id-152' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='800' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141' column='1' id='type-id-173'>
+    <class-decl name='qm_mc_result' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1014' column='1' id='type-id-153'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__notaddress' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='142' column='1'/>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1015' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='addr' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='144' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='result' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1016' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='' type-id='type-id-154' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1017' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154' column='1' id='type-id-170'>
-      <data-member access='public'>
-        <var-decl name='opaque' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='158' column='1'/>
+    <class-decl name='qm_mcc_alterfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='747' column='1' id='type-id-155'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved1' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='748' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-174' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='749' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-175' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172' column='1'/>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='__reserved2' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='750' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-176' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='count' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='751' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__2' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160' column='1' id='type-id-174'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='length20' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='166' column='1'/>
+      <data-member access='public' layout-offset-in-bits='72'>
+        <var-decl name='__reserved3' type-id='type-id-156' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='752' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20'>
-        <var-decl name='offset' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='167' column='1'/>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <var-decl name='context_b' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='753' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='29'>
-        <var-decl name='format' type-id='type-id-167' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='168' column='1'/>
+      <data-member access='public' layout-offset-in-bits='184'>
+        <var-decl name='__reserved4' type-id='type-id-157' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='754' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__3' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172' column='1' id='type-id-175'>
+    <class-decl name='qm_mcc_cgrtestwrite' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='764' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='length29' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='177' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-159' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='765' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='29'>
-        <var-decl name='_format1' type-id='type-id-167' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='178' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='i_bcnt_hi' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='766' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__4' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182' column='1' id='type-id-176'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cong_weight' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='187' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='i_bcnt_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='767' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='29'>
-        <var-decl name='_format2' type-id='type-id-167' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='188' column='1'/>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='__reserved2' type-id='type-id-160' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='768' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__2' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192' column='1' id='type-id-171'>
-      <data-member access='public'>
-        <var-decl name='cmd' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='193' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='cgid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='769' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='status' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='194' column='1'/>
+      <data-member access='public' layout-offset-in-bits='248'>
+        <var-decl name='__reserved3' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='770' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='qm_eqcr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='288' column='1' id='type-id-177'>
+    </class-decl>
+    <class-decl name='qm_mcc_initcgr' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='756' column='1' id='type-id-161'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__dont_write_directly__verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='289' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='757' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='dca' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='290' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='seqnum' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='291' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='orp' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='292' column='1'/>
+        <var-decl name='we_mask' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='758' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='293' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='cgr' type-id='type-id-117' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='759' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='tag' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='294' column='1'/>
+      <data-member access='public' layout-offset-in-bits='224'>
+        <var-decl name='__reserved2' type-id='type-id-159' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='760' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fd' type-id='type-id-168' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='295' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='cgid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='761' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='__reserved3' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='296' column='1'/>
+      <data-member access='public' layout-offset-in-bits='248'>
+        <var-decl name='__reserved4' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='762' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_dqrr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='301' column='1' id='type-id-109'>
+    <class-decl name='qm_mcc_initfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='729' column='1' id='type-id-162'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='302' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='730' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='stat' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='303' column='1'/>
+        <var-decl name='we_mask' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='731' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='seqnum' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='304' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='732' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='tok' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='305' column='1'/>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='count' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='733' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='__reserved2' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='306' column='1'/>
+      <data-member access='public' layout-offset-in-bits='72'>
+        <var-decl name='fqd' type-id='type-id-140' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='734' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='307' column='1'/>
+      <data-member access='public' layout-offset-in-bits='264'>
+        <var-decl name='__reserved3' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='735' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='contextB' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='308' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mcc_querycgr' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='772' column='1' id='type-id-164'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved1' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='773' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fd' type-id='type-id-168' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='309' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='cgid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='774' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='__reserved4' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='310' column='1'/>
+      <data-member access='public' layout-offset-in-bits='248'>
+        <var-decl name='__reserved2' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='775' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='326' column='1' id='type-id-178'>
+    <class-decl name='qm_mcc_querycongestion' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='777' column='1' id='type-id-165'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-179' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='327' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='__reserved2' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='365' column='1'/>
+        <var-decl name='__reserved' type-id='type-id-61' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='778' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__3' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='327' column='1' id='type-id-179'>
-      <data-member access='public'>
-        <var-decl name='ern' type-id='type-id-180' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='337' column='1'/>
+    <class-decl name='qm_mcc_queryfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='737' column='1' id='type-id-166'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved1' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='738' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='dcern' type-id='type-id-181' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='355' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='739' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='fq' type-id='type-id-182' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='363' column='1'/>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='__reserved2' type-id='type-id-167' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='740' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__5' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='328' column='1' id='type-id-180'>
+    </class-decl>
+    <class-decl name='qm_mcc_queryfq_np' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='742' column='1' id='type-id-168'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='329' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='743' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='dca' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='330' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='744' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='seqnum' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='331' column='1'/>
+      <data-member access='public' layout-offset-in-bits='56'>
+        <var-decl name='__reserved2' type-id='type-id-167' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='745' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rc' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='332' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mcc_querywq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='780' column='1' id='type-id-169'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='781' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='orp' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='333' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='' type-id='type-id-170' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='783' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='334' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='__reserved2' type-id='type-id-171' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='795' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='tag' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='335' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mcr_alterfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='927' column='1' id='type-id-172'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='fqs' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='928' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fd' type-id='type-id-168' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='336' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='__reserved1' type-id='type-id-173' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='929' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__6' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='338' column='1' id='type-id-181'>
+    <class-decl name='qm_mcr_cgrtestwrite' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='934' column='1' id='type-id-174'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='339' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='935' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='portal' type-id='type-id-166' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='345' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='cgr' type-id='type-id-117' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='936' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='346' column='1'/>
+      <data-member access='public' layout-offset-in-bits='216'>
+        <var-decl name='__reserved2' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='937' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14'>
-        <var-decl name='colour' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='347' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='__reserved3' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='938' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved2' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='349' column='1'/>
+      <data-member access='public' layout-offset-in-bits='264'>
+        <var-decl name='i_bcnt_hi' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='939' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rc' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='350' column='1'/>
+      <data-member access='public' layout-offset-in-bits='272'>
+        <var-decl name='i_bcnt_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='940' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='__reserved3' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='351' column='1'/>
+      <data-member access='public' layout-offset-in-bits='304'>
+        <var-decl name='__reserved4' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='941' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='352' column='1'/>
+      <data-member access='public' layout-offset-in-bits='328'>
+        <var-decl name='a_bcnt_hi' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='942' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='tag' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='353' column='1'/>
+      <data-member access='public' layout-offset-in-bits='336'>
+        <var-decl name='a_bcnt_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='943' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fd' type-id='type-id-168' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='354' column='1'/>
+      <data-member access='public' layout-offset-in-bits='368'>
+        <var-decl name='lgt' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='944' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__7' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='356' column='1' id='type-id-182'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='357' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='wr_prob_g' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='945' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='fqs' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='358' column='1'/>
+      <data-member access='public' layout-offset-in-bits='400'>
+        <var-decl name='wr_prob_y' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='946' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved1' type-id='type-id-136' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='359' column='1'/>
+      <data-member access='public' layout-offset-in-bits='416'>
+        <var-decl name='wr_prob_r' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='947' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='360' column='1'/>
+      <data-member access='public' layout-offset-in-bits='432'>
+        <var-decl name='__reserved5' type-id='type-id-87' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='948' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='contextB' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='361' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mcr_initcgr' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='931' column='1' id='type-id-175'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved1' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='932' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='__reserved2' type-id='type-id-116' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='362' column='1'/>
+    </class-decl>
+    <class-decl name='qm_mcr_initfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='838' column='1' id='type-id-176'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved1' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='839' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_fqd_stashing' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='401' column='1' id='type-id-183'>
+    <class-decl name='qm_mcr_querycgr' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='950' column='1' id='type-id-177'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='context_cl' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='411' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='951' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2'>
-        <var-decl name='data_cl' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='412' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='cgr' type-id='type-id-117' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='952' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4'>
-        <var-decl name='annotation_cl' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='413' column='1'/>
+      <data-member access='public' layout-offset-in-bits='216'>
+        <var-decl name='__reserved2' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='953' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='6'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='414' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='' type-id='type-id-178' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='954' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='exclusive' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='415' column='1'/>
+      <data-member access='public' layout-offset-in-bits='304'>
+        <var-decl name='' type-id='type-id-179' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='968' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='368'>
+        <var-decl name='' type-id='type-id-180' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='982' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_fqd_taildrop' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='418' column='1' id='type-id-184'>
+    <class-decl name='qm_mcr_querycongestion' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='992' column='1' id='type-id-181'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='exp' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='424' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='5'>
-        <var-decl name='mant' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='425' column='1'/>
+        <var-decl name='__reserved' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='993' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13'>
-        <var-decl name='__reserved1' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='426' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='state' type-id='type-id-121' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='995' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_fqd_oac' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='429' column='1' id='type-id-185'>
+    <class-decl name='qm_mcr_queryfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='841' column='1' id='type-id-182'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='435' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-87' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='842' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='6'>
-        <var-decl name='oac' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='436' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fqd' type-id='type-id-140' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='843' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='oal' type-id='type-id-112' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='439' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='__reserved2' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='844' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_fqd' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='441' column='1' id='type-id-186'>
+    <class-decl name='qm_mcr_queryfq_np' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='846' column='1' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-187' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='442' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='847' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='cgid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='458' column='1'/>
+        <var-decl name='state' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='848' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='fq_ctrl' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='459' column='1'/>
+        <var-decl name='__reserved2' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='883' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='' type-id='type-id-188' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='460' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='fqd_link' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='884' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='__reserved2' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='476' column='1'/>
+        <var-decl name='odp_seq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='886' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='49'>
-        <var-decl name='ics_cred' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='477' column='1'/>
+      <data-member access='public' layout-offset-in-bits='62'>
+        <var-decl name='__reserved3' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='887' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='' type-id='type-id-189' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='485' column='1'/>
+        <var-decl name='orp_nesn' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='889' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='78'>
+        <var-decl name='__reserved4' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='890' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='context_b' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='490' column='1'/>
+        <var-decl name='orp_ea_hseq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='892' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='context_a' type-id='type-id-190' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='520' column='1'/>
+      <data-member access='public' layout-offset-in-bits='95'>
+        <var-decl name='__reserved5' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='893' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='oac_query' type-id='type-id-185' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='521' column='1'/>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='orp_ea_tseq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='895' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__5' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='442' column='1' id='type-id-187'>
-      <data-member access='public'>
-        <var-decl name='orpc' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='443' column='1'/>
+      <data-member access='public' layout-offset-in-bits='111'>
+        <var-decl name='__reserved6' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='896' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-191' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444' column='1'/>
+      <data-member access='public' layout-offset-in-bits='112'>
+        <var-decl name='__reserved7' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='898' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__8' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444' column='1' id='type-id-191'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='olws' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='451' column='1'/>
+      <data-member access='public' layout-offset-in-bits='120'>
+        <var-decl name='orp_ea_hptr' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='899' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2'>
-        <var-decl name='oa' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='452' column='1'/>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='__reserved8' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='901' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3'>
-        <var-decl name='orprws' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='453' column='1'/>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <var-decl name='orp_ea_tptr' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='902' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='6'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='454' column='1'/>
+      <data-member access='public' layout-offset-in-bits='176'>
+        <var-decl name='__reserved9' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='904' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__6' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='460' column='1' id='type-id-188'>
-      <data-member access='public'>
-        <var-decl name='dest_wq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='461' column='1'/>
+      <data-member access='public' layout-offset-in-bits='184'>
+        <var-decl name='pfdr_hptr' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='905' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='dest' type-id='type-id-192' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='470' column='1'/>
+      <data-member access='public' layout-offset-in-bits='208'>
+        <var-decl name='__reserved10' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='907' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__9' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='462' column='1' id='type-id-192'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='wq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='467' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='3'>
-        <var-decl name='channel' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='468' column='1'/>
+      <data-member access='public' layout-offset-in-bits='216'>
+        <var-decl name='pfdr_tptr' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='908' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__7' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='485' column='1' id='type-id-189'>
-      <data-member access='public'>
-        <var-decl name='opaque_td' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='486' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='__reserved11' type-id='type-id-184' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='910' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='td' type-id='type-id-184' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='487' column='1'/>
+      <data-member access='public' layout-offset-in-bits='280'>
+        <var-decl name='is' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='911' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='oac_init' type-id='type-id-185' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='488' column='1'/>
+      <data-member access='public' layout-offset-in-bits='281'>
+        <var-decl name='__reserved12' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='912' column='1'/>
       </data-member>
-    </union-decl>
-    <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='491' column='1' id='type-id-190'>
-      <data-member access='public'>
-        <var-decl name='opaque' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='493' column='1'/>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='ics_surp' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='913' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-193' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494' column='1'/>
+      <data-member access='public' layout-offset-in-bits='304'>
+        <var-decl name='byte_cnt' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='914' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-194' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505' column='1'/>
+      <data-member access='public' layout-offset-in-bits='336'>
+        <var-decl name='__reserved13' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='915' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__10' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494' column='1' id='type-id-193'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='499' column='1'/>
+      <data-member access='public' layout-offset-in-bits='344'>
+        <var-decl name='frm_cnt' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='916' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hi' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='500' column='1'/>
+      <data-member access='public' layout-offset-in-bits='368'>
+        <var-decl name='__reserved14' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='917' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__11' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505' column='1' id='type-id-194'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='context_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='515' column='1'/>
+      <data-member access='public' layout-offset-in-bits='400'>
+        <var-decl name='ra1_sfdr' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='918' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='context_hi' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='516' column='1'/>
+      <data-member access='public' layout-offset-in-bits='416'>
+        <var-decl name='ra2_sfdr' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='919' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='stashing' type-id='type-id-183' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='517' column='1'/>
+      <data-member access='public' layout-offset-in-bits='432'>
+        <var-decl name='__reserved15' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='920' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_cgr_wr_parm' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='614' column='1' id='type-id-195'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-196' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='615' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='od1_sfdr' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='921' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__9' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='615' column='1' id='type-id-196'>
-      <data-member access='public'>
-        <var-decl name='word' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='616' column='1'/>
+      <data-member access='public' layout-offset-in-bits='464'>
+        <var-decl name='od2_sfdr' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='922' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-197' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617' column='1'/>
+      <data-member access='public' layout-offset-in-bits='480'>
+        <var-decl name='od3_sfdr' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='923' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__12' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617' column='1' id='type-id-197'>
+    </class-decl>
+    <class-decl name='qm_mcr_querywq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='997' column='1' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='Pn' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='625' column='1'/>
+        <var-decl name='' type-id='type-id-186' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='998' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='6'>
-        <var-decl name='Sn' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='626' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='12'>
-        <var-decl name='SA' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='627' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='19'>
-        <var-decl name='Mn' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='628' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved' type-id='type-id-187' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1010' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='MA' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='629' column='1'/>
+      <data-member access='public' layout-offset-in-bits='240'>
+        <var-decl name='wq_len' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1011' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_cgr_cs_thres' size-in-bits='16' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='641' column='1' id='type-id-198'>
+    <class-decl name='qm_mr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='166' column='1' id='type-id-188'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-199' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='642' column='1'/>
+        <var-decl name='ring' type-id='type-id-189' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='167' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__12' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='642' column='1' id='type-id-199'>
-      <data-member access='public'>
-        <var-decl name='hword' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='643' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='cursor' type-id='type-id-189' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='167' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-200' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='pi' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__14' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644' column='1' id='type-id-200'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='Tn' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='650' column='1'/>
+      <data-member access='public' layout-offset-in-bits='136'>
+        <var-decl name='ci' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='5'>
-        <var-decl name='TA' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='651' column='1'/>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='fill' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13'>
-        <var-decl name='__reserved' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='652' column='1'/>
+      <data-member access='public' layout-offset-in-bits='152'>
+        <var-decl name='ithresh' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='vbit' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='168' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__qm_mc_cgr' size-in-bits='200' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='662' column='1' id='type-id-201'>
+    <class-decl name='qm_mr_entry' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='326' column='1' id='type-id-190'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='wr_parm_g' type-id='type-id-195' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='663' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='wr_parm_y' type-id='type-id-195' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='664' column='1'/>
+        <var-decl name='' type-id='type-id-191' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='327' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='wr_parm_r' type-id='type-id-195' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='665' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='wr_en_g' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='666' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='104'>
-        <var-decl name='wr_en_y' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='667' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='wr_en_r' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='668' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='__reserved2' type-id='type-id-63' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='365' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='120'>
-        <var-decl name='cscn_en' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='669' column='1'/>
+    </class-decl>
+    <class-decl name='qm_portal' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='198' column='1' id='type-id-192'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='addr' type-id='type-id-126' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='' type-id='type-id-202' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='670' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='cstd_en' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='682' column='1'/>
+        <var-decl name='eqcr' type-id='type-id-134' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='200' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='168'>
-        <var-decl name='cs' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='683' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='dqrr' type-id='type-id-130' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='201' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='' type-id='type-id-203' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='684' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='mr' type-id='type-id-188' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='202' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mode' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='689' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='mc' type-id='type-id-148' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.h' line='203' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__10' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='670' column='1' id='type-id-202'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-204' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='cscn_targ' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='680' column='1'/>
-      </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__13' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671' column='1' id='type-id-204'>
+    <class-decl name='qm_portal_config' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='97' column='1' id='type-id-193'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cscn_targ_dcp_low' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='676' column='1'/>
+        <var-decl name='addr_virt' type-id='type-id-68' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='102' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='cscn_targ_upd_ctrl' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='677' column='1'/>
-      </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__11' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='684' column='1' id='type-id-203'>
-      <data-member access='public'>
-        <var-decl name='cs_thres' type-id='type-id-198' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='685' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='node' type-id='type-id-194' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='103' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='__cs_thres' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='687' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='list' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='105' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='qm_mcc_initfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='729' column='1' id='type-id-205'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='730' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='cpu' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='114' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='we_mask' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='731' column='1'/>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <var-decl name='irq' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='116' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='732' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='index' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='118' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='count' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='733' column='1'/>
+      <data-member access='public' layout-offset-in-bits='416'>
+        <var-decl name='is_shared' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='122' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='fqd' type-id='type-id-186' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='734' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='channel' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='126' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='264'>
-        <var-decl name='__reserved3' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='735' column='1'/>
+      <data-member access='public' layout-offset-in-bits='480'>
+        <var-decl name='pools' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='130' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcc_queryfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='737' column='1' id='type-id-206'>
+    <class-decl name='qman_cgr' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1253' column='1' id='type-id-195'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='738' column='1'/>
+        <var-decl name='cgrid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1255' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='739' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='cb' type-id='type-id-196' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1256' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='__reserved2' type-id='type-id-128' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='740' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='chan' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1258' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='node' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1259' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcc_queryfq_np' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='742' column='1' id='type-id-207'>
+    <class-decl name='qman_cgrs' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='21' column='1' id='type-id-197'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='743' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='744' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='__reserved2' type-id='type-id-128' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='745' column='1'/>
+        <var-decl name='q' type-id='type-id-121' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_priv.h' line='22' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcc_alterfq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='747' column='1' id='type-id-208'>
+    <class-decl name='qman_fq' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1213' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='748' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='749' column='1'/>
+        <var-decl name='cb' type-id='type-id-199' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1215' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='__reserved2' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='750' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='fqid_le' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1217' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='count' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='751' column='1'/>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1218' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='__reserved3' type-id='type-id-114' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='752' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='q_fd' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1220' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='context_b' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='753' column='1'/>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <var-decl name='ch_id' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1221' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='__reserved4' type-id='type-id-126' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='754' column='1'/>
+      <data-member access='public' layout-offset-in-bits='368'>
+        <var-decl name='cgr_groupid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1222' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mcc_initcgr' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='756' column='1' id='type-id-209'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='757' column='1'/>
+      <data-member access='public' layout-offset-in-bits='376'>
+        <var-decl name='is_static' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1223' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='we_mask' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='758' column='1'/>
+      <data-member access='public' layout-offset-in-bits='380'>
+        <var-decl name='qp_initialized' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1224' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='cgr' type-id='type-id-201' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='759' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='dpaa_intf' type-id='type-id-48' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1227' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='__reserved2' type-id='type-id-121' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='760' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='ev' type-id='type-id-200' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1229' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='cgid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='761' column='1'/>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='qp' type-id='type-id-201' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1231' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='248'>
-        <var-decl name='__reserved4' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='762' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='bp_array' type-id='type-id-202' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1232' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mcc_cgrtestwrite' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='764' column='1' id='type-id-210'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-121' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='765' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='flags' type-id='type-id-203' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1234' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='i_bcnt_hi' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='766' column='1'/>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='state' type-id='type-id-112' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1236' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='i_bcnt_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='767' column='1'/>
+      <data-member access='public' layout-offset-in-bits='800'>
+        <var-decl name='fqlock' type-id='type-id-204' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1237' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='__reserved2' type-id='type-id-117' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='768' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='node' type-id='type-id-205' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1239' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='cgid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='769' column='1'/>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='qman_fq_lookup_table' type-id='type-id-206' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1241' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='248'>
-        <var-decl name='__reserved3' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='770' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='key' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1242' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcc_querycgr' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='772' column='1' id='type-id-211'>
+    <class-decl name='qman_fq_cb' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1202' column='1' id='type-id-199'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='773' column='1'/>
+        <var-decl name='' type-id='type-id-207' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1203' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='cgid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='774' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='dqrr_prepare' type-id='type-id-208' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1208' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='248'>
-        <var-decl name='__reserved2' type-id='type-id-52' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='775' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='ern' type-id='type-id-209' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1209' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mcc_querycongestion' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='777' column='1' id='type-id-212'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved' type-id='type-id-56' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='778' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='fqs' type-id='type-id-209' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1210' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcc_querywq' size-in-bits='504' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='780' column='1' id='type-id-213'>
+    <class-decl name='qman_portal' size-in-bits='16384' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='63' column='1' id='type-id-210'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='781' column='1'/>
+        <var-decl name='p' type-id='type-id-192' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='64' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='' type-id='type-id-214' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='783' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='bits' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='__reserved2' type-id='type-id-132' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='795' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='irq_sources' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='68' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__13' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='783' column='1' id='type-id-214'>
-      <data-member access='public'>
-        <var-decl name='channel_wq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='784' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='use_eqcr_ci_stashing' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='69' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='channel' type-id='type-id-215' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='793' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1184'>
+        <var-decl name='slowpoll' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='70' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__15' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='785' column='1' id='type-id-215'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='790' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='vdqcr_owned' type-id='type-id-211' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='72' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3'>
-        <var-decl name='id' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='791' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='sdqcr' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='73' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mc_command' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='798' column='1' id='type-id-216'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__dont_write_directly__verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='799' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1312'>
+        <var-decl name='dqrr_disable_ref' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='74' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='' type-id='type-id-217' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='800' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='cb_dc_ern' type-id='type-id-212' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='78' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__4' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='800' column='1' id='type-id-217'>
-      <data-member access='public'>
-        <var-decl name='initfq' type-id='type-id-205' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='801' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='config' type-id='type-id-213' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='80' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='queryfq' type-id='type-id-206' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='802' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='retire_table' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='81' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='queryfq_np' type-id='type-id-207' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='803' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1600'>
+        <var-decl name='irqname' type-id='type-id-46' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='82' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='alterfq' type-id='type-id-208' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='804' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1728'>
+        <var-decl name='cgrs' type-id='type-id-214' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='84' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='initcgr' type-id='type-id-209' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='805' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1792'>
+        <var-decl name='cgr_cbs' type-id='type-id-16' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='86' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='cgrtestwrite' type-id='type-id-210' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='806' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1920'>
+        <var-decl name='cgr_lock' type-id='type-id-204' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='88' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querycgr' type-id='type-id-211' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='807' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8192'>
+        <var-decl name='shadow_dqrr' type-id='type-id-114' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='96' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querycongestion' type-id='type-id-212' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='808' column='1'/>
+    </class-decl>
+    <class-decl name='rb_node' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='32' column='1' id='type-id-205'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='prev' type-id='type-id-125' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='33' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querywq' type-id='type-id-213' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='809' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/dpaa_rbtree.h' line='33' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='qm_mcr_initfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='838' column='1' id='type-id-218'>
+    </class-decl>
+    <class-decl name='rte_atomic16_t' size-in-bits='16' is-struct='yes' naming-typedef-id='type-id-215' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='223' column='1' id='type-id-216'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-54' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='839' column='1'/>
+        <var-decl name='cnt' type-id='type-id-217' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='224' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_queryfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='841' column='1' id='type-id-219'>
+    <class-decl name='rte_event' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1006' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-58' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='842' column='1'/>
+        <var-decl name='' type-id='type-id-218' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1008' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fqd' type-id='type-id-186' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='843' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='__reserved2' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='844' column='1'/>
+        <var-decl name='' type-id='type-id-219' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1067' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_queryfq_np' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='846' column='1' id='type-id-220'>
+    <class-decl name='rte_mbuf' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='480' column='1' id='type-id-220'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='847' column='1'/>
+        <var-decl name='cacheline0' type-id='type-id-221' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='481' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='state' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='848' column='1'/>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='buf_addr' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='483' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved2' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='883' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='' type-id='type-id-222' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='491' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='fqd_link' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='884' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='rearm_data' type-id='type-id-223' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='497' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='odp_seq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='886' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='data_off' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='498' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='62'>
-        <var-decl name='__reserved3' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='887' column='1'/>
+      <data-member access='public' layout-offset-in-bits='144'>
+        <var-decl name='' type-id='type-id-224' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='510' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='orp_nesn' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='889' column='1'/>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='nb_segs' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='515' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='78'>
-        <var-decl name='__reserved4' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='890' column='1'/>
+      <data-member access='public' layout-offset-in-bits='176'>
+        <var-decl name='port' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='520' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='orp_ea_hseq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='892' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='ol_flags' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='522' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='95'>
-        <var-decl name='__reserved5' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='893' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='rx_descriptor_fields1' type-id='type-id-221' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='525' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='orp_ea_tseq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='895' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='' type-id='type-id-225' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='535' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='111'>
-        <var-decl name='__reserved6' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='896' column='1'/>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='pkt_len' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='561' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='__reserved7' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='898' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='data_len' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='562' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='120'>
-        <var-decl name='orp_ea_hptr' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='899' column='1'/>
+      <data-member access='public' layout-offset-in-bits='336'>
+        <var-decl name='vlan_tci' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='564' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='__reserved8' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='901' column='1'/>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <var-decl name='' type-id='type-id-226' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='567' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='orp_ea_tptr' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='902' column='1'/>
+      <data-member access='public' layout-offset-in-bits='416'>
+        <var-decl name='vlan_tci_outer' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='601' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='__reserved9' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='904' column='1'/>
+      <data-member access='public' layout-offset-in-bits='432'>
+        <var-decl name='buf_len' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='603' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='184'>
-        <var-decl name='pfdr_hptr' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='905' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='timestamp' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='610' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='208'>
-        <var-decl name='__reserved10' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='907' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='cacheline1' type-id='type-id-221' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='613' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='216'>
-        <var-decl name='pfdr_tptr' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='908' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='__reserved11' type-id='type-id-130' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='910' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='280'>
-        <var-decl name='is' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='911' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='281'>
-        <var-decl name='__reserved12' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='912' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ics_surp' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='913' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='byte_cnt' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='914' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='__reserved13' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='915' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='' type-id='type-id-227' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='616' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='344'>
-        <var-decl name='frm_cnt' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='916' column='1'/>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='pool' type-id='type-id-228' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='621' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='368'>
-        <var-decl name='__reserved14' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='917' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='next' type-id='type-id-229' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='622' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='400'>
-        <var-decl name='ra1_sfdr' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='918' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='' type-id='type-id-230' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='626' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='ra2_sfdr' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='919' column='1'/>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='priv_size' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='665' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='432'>
-        <var-decl name='__reserved15' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='920' column='1'/>
+      <data-member access='public' layout-offset-in-bits='784'>
+        <var-decl name='timesync' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='668' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='od1_sfdr' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='921' column='1'/>
+      <data-member access='public' layout-offset-in-bits='800'>
+        <var-decl name='seqn' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='671' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='464'>
-        <var-decl name='od2_sfdr' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='922' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='shinfo' type-id='type-id-231' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='676' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='od3_sfdr' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='923' column='1'/>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='dynfield1' type-id='type-id-232' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='678' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_alterfq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='927' column='1' id='type-id-221'>
+    <class-decl name='rte_mbuf_ext_shared_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='689' column='1' id='type-id-233'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='fqs' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='928' column='1'/>
+        <var-decl name='free_cb' type-id='type-id-234' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='690' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='__reserved1' type-id='type-id-134' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='929' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fcb_opaque' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='691' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mcr_initcgr' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='931' column='1' id='type-id-222'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-54' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='932' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='refcnt_atomic' type-id='type-id-215' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='692' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_cgrtestwrite' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='934' column='1' id='type-id-223'>
+    <class-decl name='rte_mbuf_sched' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='422' column='1' id='type-id-235'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='935' column='1'/>
+        <var-decl name='queue_id' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='423' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='cgr' type-id='type-id-201' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='936' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='traffic_class' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='424' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='216'>
-        <var-decl name='__reserved2' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='937' column='1'/>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='color' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='428' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='__reserved3' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='938' column='1'/>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='reserved' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='430' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='264'>
-        <var-decl name='i_bcnt_hi' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='939' column='1'/>
+    </class-decl>
+    <class-decl name='rte_mempool' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='216' column='1' id='type-id-236'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='222' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='272'>
-        <var-decl name='i_bcnt_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='940' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='' type-id='type-id-237' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='224' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='__reserved4' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='941' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='pool_config' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='228' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='328'>
-        <var-decl name='a_bcnt_hi' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='942' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='mz' type-id='type-id-238' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='229' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='a_bcnt_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='943' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='flags' type-id='type-id-4' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='230' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='368'>
-        <var-decl name='lgt' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='944' column='1'/>
+      <data-member access='public' layout-offset-in-bits='480'>
+        <var-decl name='socket_id' type-id='type-id-1' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='231' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='wr_prob_g' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='945' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='232' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='400'>
-        <var-decl name='wr_prob_y' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='946' column='1'/>
+      <data-member access='public' layout-offset-in-bits='544'>
+        <var-decl name='cache_size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='233' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='wr_prob_r' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='947' column='1'/>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='elt_size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='236' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='432'>
-        <var-decl name='__reserved5' type-id='type-id-58' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='948' column='1'/>
+      <data-member access='public' layout-offset-in-bits='608'>
+        <var-decl name='header_size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='237' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='qm_mcr_querycgr' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='950' column='1' id='type-id-224'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved1' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='951' column='1'/>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='trailer_size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='238' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='cgr' type-id='type-id-201' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='952' column='1'/>
+      <data-member access='public' layout-offset-in-bits='672'>
+        <var-decl name='private_data_size' type-id='type-id-4' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='240' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='216'>
-        <var-decl name='__reserved2' type-id='type-id-124' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='953' column='1'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='ops_index' type-id='type-id-239' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='248' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='' type-id='type-id-225' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='954' column='1'/>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='local_cache' type-id='type-id-240' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='250' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='304'>
-        <var-decl name='' type-id='type-id-226' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='968' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='populated_size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='252' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='368'>
-        <var-decl name='' type-id='type-id-227' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='982' column='1'/>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='elt_list' type-id='type-id-241' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='253' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='954' column='1' id='type-id-225'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-228' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='nb_mem_chunks' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='254' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='i_bcnt' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='966' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='mem_list' type-id='type-id-242' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='255' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__16' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955' column='1' id='type-id-228'>
+    </class-decl>
+    <class-decl name='rte_mempool_cache' size-in-bits='98816' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='83' column='1' id='type-id-243'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i_bcnt_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='961' column='1'/>
+        <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='i_bcnt_hi' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='962' column='1'/>
+        <var-decl name='flushthresh' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='85' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='__reserved3' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='963' column='1'/>
-      </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__16' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='968' column='1' id='type-id-226'>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-229' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='len' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='86' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='a_bcnt' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='980' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='objs' type-id='type-id-244' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='91' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__17' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969' column='1' id='type-id-229'>
+    </class-decl>
+    <class-decl name='rte_mempool_memhdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='185' column='1' id='type-id-245'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a_bcnt_lo' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='975' column='1'/>
+        <var-decl name='next' type-id='type-id-246' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='a_bcnt_hi' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='976' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='mp' type-id='type-id-228' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='187' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='__reserved4' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='977' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='addr' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='188' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__17' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='982' column='1' id='type-id-227'>
-      <data-member access='public'>
-        <var-decl name='cscn_targ_swp' type-id='type-id-49' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='983' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='' type-id='type-id-247' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='190' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='__reserved5' type-id='type-id-116' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='984' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='len' type-id='type-id-27' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='194' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__qm_mcr_querycongestion' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='988' column='1' id='type-id-161'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='state' type-id='type-id-113' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='989' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='free_cb' type-id='type-id-248' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='195' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='opaque' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='196' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_querycongestion' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='992' column='1' id='type-id-230'>
+    <class-decl name='rte_mempool_memhdr_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1' id='type-id-242'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved' type-id='type-id-122' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='993' column='1'/>
+        <var-decl name='stqh_first' type-id='type-id-249' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='state' type-id='type-id-161' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='995' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='stqh_last' type-id='type-id-250' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mcr_querywq' size-in-bits='496' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='997' column='1' id='type-id-231'>
+    <class-decl name='rte_mempool_objhdr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='136' column='1' id='type-id-251'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-232' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='998' column='1'/>
+        <var-decl name='next' type-id='type-id-252' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__reserved' type-id='type-id-119' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1010' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='mp' type-id='type-id-228' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='138' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='wq_len' type-id='type-id-113' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1011' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='' type-id='type-id-253' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__18' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='998' column='1' id='type-id-232'>
-      <data-member access='public'>
-        <var-decl name='channel_wq' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='999' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='channel' type-id='type-id-233' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1008' column='1'/>
-      </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__18' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1000' column='1' id='type-id-233'>
+    <class-decl name='rte_mempool_objhdr_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1' id='type-id-241'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__reserved' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1005' column='1'/>
+        <var-decl name='stqh_first' type-id='type-id-254' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3'>
-        <var-decl name='id' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1006' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='stqh_last' type-id='type-id-255' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qm_mc_result' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1014' column='1' id='type-id-234'>
+    <class-decl name='rte_memzone' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='49' column='1' id='type-id-256'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='verb' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1015' column='1'/>
+        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='52' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='result' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1016' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='' type-id='type-id-257' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='55' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='' type-id='type-id-235' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1017' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='' type-id='type-id-258' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='60' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__14' size-in-bits='496' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1017' column='1' id='type-id-235'>
-      <data-member access='public'>
-        <var-decl name='initfq' type-id='type-id-218' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1018' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='len' type-id='type-id-27' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='64' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='queryfq' type-id='type-id-219' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1019' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='hugepage_sz' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='queryfq_np' type-id='type-id-220' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1020' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='socket_id' type-id='type-id-239' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='68' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='alterfq' type-id='type-id-221' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1021' column='1'/>
+      <data-member access='public' layout-offset-in-bits='544'>
+        <var-decl name='flags' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='70' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='initcgr' type-id='type-id-222' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1022' column='1'/>
+    </class-decl>
+    <class-decl name='rte_spinlock_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-204' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='30' column='1' id='type-id-259'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='locked' type-id='type-id-260' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='31' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='cgrtestwrite' type-id='type-id-223' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1023' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__26' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1' id='type-id-246'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='stqe_next' type-id='type-id-249' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querycgr' type-id='type-id-224' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1024' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__25' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1' id='type-id-252'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='stqe_next' type-id='type-id-254' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querycongestion' type-id='type-id-230' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1025' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__14' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644' column='1' id='type-id-261'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='Tn' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='650' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='querywq' type-id='type-id-231' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1026' column='1'/>
+      <data-member access='public' layout-offset-in-bits='5'>
+        <var-decl name='TA' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='651' column='1'/>
       </data-member>
-    </union-decl>
-    <enum-decl name='qman_cb_dqrr_result' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1105' column='1' id='type-id-236'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='qman_cb_dqrr_consume' value='0'/>
-      <enumerator name='qman_cb_dqrr_park' value='1'/>
-      <enumerator name='qman_cb_dqrr_defer' value='2'/>
-      <enumerator name='qman_cb_dqrr_stop' value='3'/>
-      <enumerator name='qman_cb_dqrr_consume_stop' value='4'/>
-    </enum-decl>
-    <enum-decl name='qman_fq_state' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1167' column='1' id='type-id-237'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='qman_fq_state_oos' value='0'/>
-      <enumerator name='qman_fq_state_parked' value='1'/>
-      <enumerator name='qman_fq_state_sched' value='2'/>
-      <enumerator name='qman_fq_state_retired' value='3'/>
-    </enum-decl>
-    <class-decl name='qman_fq_cb' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1202' column='1' id='type-id-238'>
+      <data-member access='public' layout-offset-in-bits='13'>
+        <var-decl name='__reserved' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='652' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='__anonymous_struct__15' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='785' column='1' id='type-id-262'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-239' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1203' column='1'/>
+        <var-decl name='__reserved1' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='790' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='dqrr_prepare' type-id='type-id-240' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1208' column='1'/>
+      <data-member access='public' layout-offset-in-bits='3'>
+        <var-decl name='id' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='791' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ern' type-id='type-id-241' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1209' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__18' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1000' column='1' id='type-id-263'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__reserved' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1005' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fqs' type-id='type-id-241' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1210' column='1'/>
+      <data-member access='public' layout-offset-in-bits='3'>
+        <var-decl name='id' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1006' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1203' column='1' id='type-id-239'>
-      <data-member access='public'>
-        <var-decl name='dqrr_dpdk_cb' type-id='type-id-242' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1204' column='1'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='dqrr_dpdk_pull_cb' type-id='type-id-243' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1205' column='1'/>
+    <class-decl name='__anonymous_struct__13' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671' column='1' id='type-id-264'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='cscn_targ_dcp_low' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='676' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='dqrr' type-id='type-id-244' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1206' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='cscn_targ_upd_ctrl' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='677' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='qman_fq' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1213' column='1' id='type-id-245'>
+    </class-decl>
+    <class-decl name='__anonymous_struct__9' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='462' column='1' id='type-id-265'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cb' type-id='type-id-238' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1215' column='1'/>
+        <var-decl name='wq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='467' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fqid_le' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1217' column='1'/>
+      <data-member access='public' layout-offset-in-bits='3'>
+        <var-decl name='channel' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='468' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='fqid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1218' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__12' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617' column='1' id='type-id-266'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='Pn' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='625' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='q_fd' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1220' column='1'/>
+      <data-member access='public' layout-offset-in-bits='6'>
+        <var-decl name='Sn' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='626' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='ch_id' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1221' column='1'/>
+      <data-member access='public' layout-offset-in-bits='12'>
+        <var-decl name='SA' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='627' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='368'>
-        <var-decl name='cgr_groupid' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1222' column='1'/>
+      <data-member access='public' layout-offset-in-bits='19'>
+        <var-decl name='Mn' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='628' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='376'>
-        <var-decl name='is_static' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1223' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='MA' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='629' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='380'>
-        <var-decl name='qp_initialized' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1224' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__17' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969' column='1' id='type-id-267'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='a_bcnt_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='975' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='dpaa_intf' type-id='type-id-59' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1227' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='a_bcnt_hi' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='976' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='ev' type-id='type-id-246' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1229' column='1'/>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='__reserved4' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='977' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='qp' type-id='type-id-247' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1231' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__4' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182' column='1' id='type-id-268'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='cong_weight' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='187' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='bp_array' type-id='type-id-248' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1232' column='1'/>
+      <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='_format2' type-id='type-id-110' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='188' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='flags' type-id='type-id-249' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1234' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__11' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505' column='1' id='type-id-269'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='context_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='515' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='state' type-id='type-id-237' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1236' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='context_hi' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='516' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='fqlock' type-id='type-id-149' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1237' column='1'/>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='stashing' type-id='type-id-146' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='517' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='node' type-id='type-id-164' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1239' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__16' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955' column='1' id='type-id-270'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='i_bcnt_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='961' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='qman_fq_lookup_table' type-id='type-id-250' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1241' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='i_bcnt_hi' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='962' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='key' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1242' column='1'/>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='__reserved3' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='963' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='qman_cgr' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1253' column='1' id='type-id-251'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cgrid' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1255' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cb' type-id='type-id-252' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1256' column='1'/>
+        <var-decl name='length20' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='166' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='chan' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1258' column='1'/>
+      <data-member access='public' layout-offset-in-bits='20'>
+        <var-decl name='offset' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='167' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='node' type-id='type-id-23' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1259' column='1'/>
+      <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='format' type-id='type-id-110' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='168' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='device_node' size-in-bits='34808' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='66' column='1' id='type-id-253'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172' column='1' id='type-id-272'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-104' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='67' column='1'/>
+        <var-decl name='length29' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='177' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2040'>
-        <var-decl name='full_name' type-id='type-id-107' visibility='default' filepath='../../dpdk/drivers/common/dpaax/dpaa_of.h' line='68' column='1'/>
+      <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='_format1' type-id='type-id-110' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='178' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_atomic16_t' size-in-bits='16' is-struct='yes' naming-typedef-id='type-id-254' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='223' column='1' id='type-id-255'>
+    <class-decl name='__anonymous_struct__10' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cnt' type-id='type-id-256' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='224' column='1'/>
+        <var-decl name='lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='499' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='hi' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='500' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_spinlock_t' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-149' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='30' column='1' id='type-id-257'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141' column='1' id='type-id-274'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='locked' type-id='type-id-258' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='31' column='1'/>
+        <var-decl name='__notaddress' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='142' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='addr' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='144' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_memzone' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='49' column='1' id='type-id-259'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122' column='1' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='52' column='1'/>
+        <var-decl name='liodn_offset' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='132' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='' type-id='type-id-260' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='55' column='1'/>
+      <data-member access='public' layout-offset-in-bits='6'>
+        <var-decl name='dd' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='133' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='' type-id='type-id-261' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='60' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='bpid' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='134' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='len' type-id='type-id-34' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='64' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='135' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='hugepage_sz' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='66' column='1'/>
+      <data-member access='public' layout-offset-in-bits='20'>
+        <var-decl name='eliodn_offset' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='136' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='socket_id' type-id='type-id-262' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='68' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='addr_hi' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='137' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='flags' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='addr_lo' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='138' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__31' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='55' column='1' id='type-id-260'>
-      <data-member access='public'>
-        <var-decl name='phys_addr' type-id='type-id-263' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='56' column='1'/>
+    <class-decl name='__anonymous_struct__8' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444' column='1' id='type-id-276'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='olws' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='451' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='iova' type-id='type-id-264' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='57' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2'>
+        <var-decl name='oa' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='452' column='1'/>
       </data-member>
-    </union-decl>
-    <union-decl name='__anonymous_union__32' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='60' column='1' id='type-id-261'>
-      <data-member access='public'>
-        <var-decl name='addr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='61' column='1'/>
+      <data-member access='public' layout-offset-in-bits='3'>
+        <var-decl name='orprws' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='453' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='addr_64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='62' column='1'/>
+      <data-member access='public' layout-offset-in-bits='6'>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='454' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='rte_event' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1006' column='1' id='type-id-246'>
+    </class-decl>
+    <class-decl name='__anonymous_struct__6' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='338' column='1' id='type-id-277'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-265' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1008' column='1'/>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='339' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='portal' type-id='type-id-109' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='345' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='11'>
+        <var-decl name='__reserved1' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='346' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14'>
+        <var-decl name='colour' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='347' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved2' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='349' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='rc' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='350' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='__reserved3' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='' type-id='type-id-266' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1067' column='1'/>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='352' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='tag' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='353' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='fd' type-id='type-id-133' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1008' column='1' id='type-id-265'>
-      <data-member access='public'>
-        <var-decl name='event' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1009' column='1'/>
+    <class-decl name='__anonymous_struct__5' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='328' column='1' id='type-id-278'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='329' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='' type-id='type-id-267' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='dca' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='330' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='__anonymous_struct__19' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011' column='1' id='type-id-267'>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='seqnum' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='331' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='rc' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='332' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='orp' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='333' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='334' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='tag' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='335' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='fd' type-id='type-id-133' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='336' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='__anonymous_struct__7' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='356' column='1' id='type-id-279'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='verb' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='357' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='fqs' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='358' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='__reserved1' type-id='type-id-280' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='359' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fqid' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='360' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='contextB' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='361' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='__reserved2' type-id='type-id-281' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='362' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='__anonymous_struct__23' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1' id='type-id-282'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='hash' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='573' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='id' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='574' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='__anonymous_struct__19' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011' column='1' id='type-id-283'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='flow_id' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1012' column='1'/>
+        <var-decl name='flow_id' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1012' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20'>
-        <var-decl name='sub_event_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1019' column='1'/>
+        <var-decl name='sub_event_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1019' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='28'>
-        <var-decl name='event_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1023' column='1'/>
+        <var-decl name='event_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1023' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='op' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1027' column='1'/>
@@ -2336,1757 +2284,1970 @@ 
         <var-decl name='impl_opaque' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1057' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1067' column='1' id='type-id-266'>
-      <data-member access='public'>
-        <var-decl name='u64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1068' column='1'/>
+    <class-decl name='__anonymous_struct__20' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1' id='type-id-284'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='l2_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='538' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='event_ptr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1070' column='1'/>
+      <data-member access='public' layout-offset-in-bits='4'>
+        <var-decl name='l3_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='539' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='mbuf' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1072' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='l4_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='540' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='rte_mbuf_sched' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='422' column='1' id='type-id-269'>
+      <data-member access='public' layout-offset-in-bits='12'>
+        <var-decl name='tun_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='541' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='' type-id='type-id-285' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='543' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='inner_l4_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='557' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='__anonymous_struct__24' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='586' column='1' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='queue_id' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='423' column='1'/>
+        <var-decl name='reserved1' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='587' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='traffic_class' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='424' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='color' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='428' column='1'/>
+        <var-decl name='reserved2' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='588' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='reserved' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='430' column='1'/>
+        <var-decl name='txq' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='589' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_mbuf' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='480' column='1' id='type-id-270'>
+    <class-decl name='__anonymous_struct__27' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1' id='type-id-287'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cacheline0' type-id='type-id-271' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='481' column='1'/>
+        <var-decl name='l2_len' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='630' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buf_addr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='483' column='1'/>
+      <data-member access='public' layout-offset-in-bits='7'>
+        <var-decl name='l3_len' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='634' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='' type-id='type-id-272' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='491' column='1'/>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='l4_len' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='636' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rearm_data' type-id='type-id-273' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='497' column='1'/>
+      <data-member access='public' layout-offset-in-bits='24'>
+        <var-decl name='tso_segsz' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='638' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_off' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='498' column='1'/>
+      <data-member access='public' layout-offset-in-bits='40'>
+        <var-decl name='outer_l3_len' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='653' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='144'>
-        <var-decl name='' type-id='type-id-274' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='510' column='1'/>
+      <data-member access='public' layout-offset-in-bits='49'>
+        <var-decl name='outer_l2_len' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='655' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='nb_segs' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='515' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__21' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1' id='type-id-288'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='inner_l2_type' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='551' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <var-decl name='port' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='520' column='1'/>
+      <data-member access='public' layout-offset-in-bits='4'>
+        <var-decl name='inner_l3_type' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='553' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ol_flags' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='522' column='1'/>
+    </class-decl>
+    <class-decl name='__anonymous_struct__22' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='570' column='1' id='type-id-289'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='' type-id='type-id-290' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='rx_descriptor_fields1' type-id='type-id-271' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='525' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='hi' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='579' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='MARKER' type-id='type-id-291' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='414' column='1' id='type-id-221'/>
+    <typedef-decl name='MARKER64' type-id='type-id-292' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='420' column='1' id='type-id-223'/>
+    <typedef-decl name='__int16_t' type-id='type-id-115' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-293'/>
+    <typedef-decl name='__int32_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-294'/>
+    <typedef-decl name='int16_t' type-id='type-id-293' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-295'/>
+    <typedef-decl name='int32_t' type-id='type-id-294' filepath='/usr/include/bits/stdint-intn.h' line='26' column='1' id='type-id-239'/>
+    <typedef-decl name='phys_addr_t' type-id='type-id-20' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='325' column='1' id='type-id-296'/>
+    <typedef-decl name='qman_cb_cgr' type-id='type-id-297' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1250' column='1' id='type-id-196'/>
+    <typedef-decl name='qman_cb_dc_ern' type-id='type-id-298' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1153' column='1' id='type-id-212'/>
+    <typedef-decl name='qman_cb_dqrr' type-id='type-id-299' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1127' column='1' id='type-id-300'/>
+    <typedef-decl name='qman_cb_mr' type-id='type-id-301' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1149' column='1' id='type-id-209'/>
+    <typedef-decl name='qman_dpdk_cb_dqrr' type-id='type-id-302' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1131' column='1' id='type-id-303'/>
+    <typedef-decl name='qman_dpdk_cb_prepare' type-id='type-id-304' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1143' column='1' id='type-id-208'/>
+    <typedef-decl name='qman_dpdk_pull_cb_dqrr' type-id='type-id-305' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1138' column='1' id='type-id-306'/>
+    <typedef-decl name='rte_atomic16_t' type-id='type-id-216' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='225' column='1' id='type-id-215'/>
+    <typedef-decl name='rte_iova_t' type-id='type-id-20' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='335' column='1' id='type-id-307'/>
+    <typedef-decl name='rte_mbuf_extbuf_free_callback_t' type-id='type-id-308' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='684' column='1' id='type-id-234'/>
+    <typedef-decl name='rte_mempool_memchunk_free_cb_t' type-id='type-id-309' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='176' column='1' id='type-id-310'/>
+    <typedef-decl name='rte_spinlock_t' type-id='type-id-259' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='32' column='1' id='type-id-204'/>
+    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='256' id='type-id-122'>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-10' id='type-id-44'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='80' id='type-id-156'>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-10' id='type-id-311'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='128' id='type-id-281'>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-10' id='type-id-28'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='184' id='type-id-160'>
+      <subrange length='23' lower-bound='0' upper-bound='22' type-id='type-id-10' id='type-id-312'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='224' id='type-id-187'>
+      <subrange length='28' lower-bound='0' upper-bound='27' type-id='type-id-10' id='type-id-313'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='16' id='type-id-159'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-10' id='type-id-89'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='240' id='type-id-163'>
+      <subrange length='30' lower-bound='0' upper-bound='29' type-id='type-id-10' id='type-id-314'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='24' id='type-id-132'>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-10' id='type-id-315'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='320' id='type-id-157'>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-10' id='type-id-316'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='448' id='type-id-167'>
+      <subrange length='56' lower-bound='0' upper-bound='55' type-id='type-id-10' id='type-id-317'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='40' id='type-id-184'>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-10' id='type-id-318'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='480' id='type-id-171'>
+      <subrange length='60' lower-bound='0' upper-bound='59' type-id='type-id-10' id='type-id-319'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='488' id='type-id-173'>
+      <subrange length='61' lower-bound='0' upper-bound='60' type-id='type-id-10' id='type-id-320'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='48' id='type-id-280'>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-10' id='type-id-29'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='128' id='type-id-232'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-10' id='type-id-89'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='unknown' id='type-id-292'>
+      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-10' id='type-id-39'/>
+    </array-type-def>
+    <union-decl name='__anonymous_union__31' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='55' column='1' id='type-id-257'>
+      <data-member access='public'>
+        <var-decl name='phys_addr' type-id='type-id-296' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='56' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='' type-id='type-id-275' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='535' column='1'/>
+      <data-member access='public'>
+        <var-decl name='iova' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='57' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='pkt_len' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='561' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__11' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='684' column='1' id='type-id-120'>
+      <data-member access='public'>
+        <var-decl name='cs_thres' type-id='type-id-127' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='685' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='data_len' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='562' column='1'/>
+      <data-member access='public'>
+        <var-decl name='__cs_thres' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='687' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='336'>
-        <var-decl name='vlan_tci' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='564' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__4' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='800' column='1' id='type-id-152'>
+      <data-member access='public'>
+        <var-decl name='initfq' type-id='type-id-162' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='801' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='' type-id='type-id-276' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='567' column='1'/>
+      <data-member access='public'>
+        <var-decl name='queryfq' type-id='type-id-166' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='802' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='vlan_tci_outer' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='601' column='1'/>
+      <data-member access='public'>
+        <var-decl name='queryfq_np' type-id='type-id-168' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='803' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='432'>
-        <var-decl name='buf_len' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='603' column='1'/>
+      <data-member access='public'>
+        <var-decl name='alterfq' type-id='type-id-155' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='804' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='timestamp' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='610' column='1'/>
+      <data-member access='public'>
+        <var-decl name='initcgr' type-id='type-id-161' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='805' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='cacheline1' type-id='type-id-271' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='613' column='1'/>
+      <data-member access='public'>
+        <var-decl name='cgrtestwrite' type-id='type-id-158' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='806' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='' type-id='type-id-277' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='616' column='1'/>
+      <data-member access='public'>
+        <var-decl name='querycgr' type-id='type-id-164' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='807' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='pool' type-id='type-id-278' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='621' column='1'/>
+      <data-member access='public'>
+        <var-decl name='querycongestion' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='808' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='next' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='622' column='1'/>
+      <data-member access='public'>
+        <var-decl name='querywq' type-id='type-id-169' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='809' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='' type-id='type-id-279' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='626' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__14' size-in-bits='496' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1017' column='1' id='type-id-154'>
+      <data-member access='public'>
+        <var-decl name='initfq' type-id='type-id-176' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1018' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='priv_size' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='665' column='1'/>
+      <data-member access='public'>
+        <var-decl name='queryfq' type-id='type-id-182' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1019' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='784'>
-        <var-decl name='timesync' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='668' column='1'/>
+      <data-member access='public'>
+        <var-decl name='queryfq_np' type-id='type-id-183' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1020' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='seqn' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='671' column='1'/>
+      <data-member access='public'>
+        <var-decl name='alterfq' type-id='type-id-172' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1021' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='shinfo' type-id='type-id-280' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='676' column='1'/>
+      <data-member access='public'>
+        <var-decl name='initcgr' type-id='type-id-175' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1022' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='dynfield1' type-id='type-id-137' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='678' column='1'/>
+      <data-member access='public'>
+        <var-decl name='cgrtestwrite' type-id='type-id-174' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1023' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__22' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='491' column='1' id='type-id-272'>
       <data-member access='public'>
-        <var-decl name='buf_iova' type-id='type-id-264' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='492' column='1'/>
+        <var-decl name='querycgr' type-id='type-id-177' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1024' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='buf_physaddr' type-id='type-id-264' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='493' column='1'/>
+        <var-decl name='querycongestion' type-id='type-id-181' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1025' column='1'/>
+      </data-member>
+      <data-member access='public'>
+        <var-decl name='querywq' type-id='type-id-185' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1026' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__23' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='510' column='1' id='type-id-274'>
+    <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1203' column='1' id='type-id-207'>
       <data-member access='public'>
-        <var-decl name='refcnt_atomic' type-id='type-id-254' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='511' column='1'/>
+        <var-decl name='dqrr_dpdk_cb' type-id='type-id-303' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1204' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='refcnt' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='513' column='1'/>
+        <var-decl name='dqrr_dpdk_pull_cb' type-id='type-id-306' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1205' column='1'/>
+      </data-member>
+      <data-member access='public'>
+        <var-decl name='dqrr' type-id='type-id-300' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1206' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__24' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='535' column='1' id='type-id-275'>
+    <union-decl name='__anonymous_union__23' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='510' column='1' id='type-id-224'>
       <data-member access='public'>
-        <var-decl name='packet_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='536' column='1'/>
+        <var-decl name='refcnt_atomic' type-id='type-id-215' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='511' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-281' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1'/>
+        <var-decl name='refcnt' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='513' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__20' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1' id='type-id-281'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='l2_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='538' column='1'/>
+    <union-decl name='__anonymous_union__22' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='491' column='1' id='type-id-222'>
+      <data-member access='public'>
+        <var-decl name='buf_iova' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='492' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4'>
-        <var-decl name='l3_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='539' column='1'/>
+      <data-member access='public'>
+        <var-decl name='buf_physaddr' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='493' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='l4_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='540' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='190' column='1' id='type-id-247'>
+      <data-member access='public'>
+        <var-decl name='iova' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='191' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12'>
-        <var-decl name='tun_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='541' column='1'/>
+      <data-member access='public'>
+        <var-decl name='phys_addr' type-id='type-id-296' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='192' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='' type-id='type-id-282' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='543' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__33' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140' column='1' id='type-id-253'>
+      <data-member access='public'>
+        <var-decl name='iova' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='141' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='inner_l4_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='557' column='1'/>
+      <data-member access='public'>
+        <var-decl name='physaddr' type-id='type-id-296' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='142' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__25' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='543' column='1' id='type-id-282'>
+    </union-decl>
+    <union-decl name='__anonymous_union__10' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='670' column='1' id='type-id-119'>
       <data-member access='public'>
-        <var-decl name='inner_esp_next_proto' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='544' column='1'/>
+        <var-decl name='' type-id='type-id-264' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-283' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1'/>
+        <var-decl name='cscn_targ' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='680' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__21' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1' id='type-id-283'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='inner_l2_type' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='551' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='4'>
-        <var-decl name='inner_l3_type' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='553' column='1'/>
+    <union-decl name='__anonymous_union__16' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='968' column='1' id='type-id-179'>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-267' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='567' column='1' id='type-id-276'>
       <data-member access='public'>
-        <var-decl name='hash' type-id='type-id-284' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='597' column='1'/>
+        <var-decl name='a_bcnt' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='980' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='568' column='1' id='type-id-284'>
+    <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='954' column='1' id='type-id-178'>
       <data-member access='public'>
-        <var-decl name='rss' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='569' column='1'/>
+        <var-decl name='' type-id='type-id-270' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='fdir' type-id='type-id-285' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='583' column='1'/>
+        <var-decl name='i_bcnt' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='966' column='1'/>
       </data-member>
+    </union-decl>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121' column='1' id='type-id-137'>
       <data-member access='public'>
-        <var-decl name='sched' type-id='type-id-269' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='584' column='1'/>
+        <var-decl name='' type-id='type-id-275' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='txadapter' type-id='type-id-286' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='594' column='1'/>
+        <var-decl name='' type-id='type-id-274' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='usr' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='596' column='1'/>
+        <var-decl name='opaque_addr' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='146' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__22' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='570' column='1' id='type-id-285'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-287' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hi' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='579' column='1'/>
+    <union-decl name='__anonymous_union__3' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='327' column='1' id='type-id-191'>
+      <data-member access='public'>
+        <var-decl name='ern' type-id='type-id-278' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='337' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__28' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571' column='1' id='type-id-287'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-288' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1'/>
+        <var-decl name='dcern' type-id='type-id-277' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='355' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='lo' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='576' column='1'/>
+        <var-decl name='fq' type-id='type-id-279' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='363' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__23' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1' id='type-id-288'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='hash' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='573' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='id' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='574' column='1'/>
+    <union-decl name='__anonymous_union__28' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571' column='1' id='type-id-290'>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-282' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__24' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='586' column='1' id='type-id-286'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='reserved1' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='587' column='1'/>
+      <data-member access='public'>
+        <var-decl name='lo' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='576' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='reserved2' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='588' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__13' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='783' column='1' id='type-id-170'>
+      <data-member access='public'>
+        <var-decl name='channel_wq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='784' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='txq' type-id='type-id-6' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='589' column='1'/>
+      <data-member access='public'>
+        <var-decl name='channel' type-id='type-id-262' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='793' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='616' column='1' id='type-id-277'>
+    </union-decl>
+    <union-decl name='__anonymous_union__18' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='998' column='1' id='type-id-186'>
       <data-member access='public'>
-        <var-decl name='userdata' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='617' column='1'/>
+        <var-decl name='channel_wq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='999' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='udata64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='618' column='1'/>
+        <var-decl name='channel' type-id='type-id-263' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1008' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='626' column='1' id='type-id-279'>
+    <union-decl name='__anonymous_union__6' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='460' column='1' id='type-id-142'>
       <data-member access='public'>
-        <var-decl name='tx_offload' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='627' column='1'/>
+        <var-decl name='dest_wq' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='461' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-289' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1'/>
+        <var-decl name='dest' type-id='type-id-265' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='470' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__27' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1' id='type-id-289'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='l2_len' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='630' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='7'>
-        <var-decl name='l3_len' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='634' column='1'/>
+    <union-decl name='__anonymous_union__12' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='642' column='1' id='type-id-128'>
+      <data-member access='public'>
+        <var-decl name='hword' type-id='type-id-7' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='643' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='l4_len' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='636' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-261' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='tso_segsz' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='638' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__2' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192' column='1' id='type-id-139'>
+      <data-member access='public'>
+        <var-decl name='cmd' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='193' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='outer_l3_len' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='653' column='1'/>
+      <data-member access='public'>
+        <var-decl name='status' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='194' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='49'>
-        <var-decl name='outer_l2_len' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='655' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__17' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='982' column='1' id='type-id-180'>
+      <data-member access='public'>
+        <var-decl name='cscn_targ_swp' type-id='type-id-78' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='983' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='rte_mbuf_ext_shared_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='689' column='1' id='type-id-290'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='free_cb' type-id='type-id-291' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='690' column='1'/>
+      <data-member access='public'>
+        <var-decl name='__reserved5' type-id='type-id-281' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='984' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fcb_opaque' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='691' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154' column='1' id='type-id-138'>
+      <data-member access='public'>
+        <var-decl name='opaque' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='158' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='refcnt_atomic' type-id='type-id-254' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='692' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-271' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='rte_mempool_cache' size-in-bits='98816' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='83' column='1' id='type-id-292'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='84' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-272' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='flushthresh' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='85' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-268' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='len' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='86' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__9' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='615' column='1' id='type-id-129'>
+      <data-member access='public'>
+        <var-decl name='word' type-id='type-id-9' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='616' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='objs' type-id='type-id-139' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='91' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-266' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='rte_mempool_objhdr' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='136' column='1' id='type-id-293'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-294' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mp' type-id='type-id-278' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='138' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='' type-id='type-id-295' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__25' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1' id='type-id-294'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stqe_next' type-id='type-id-296' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='491' column='1' id='type-id-144'>
+      <data-member access='public'>
+        <var-decl name='opaque' type-id='type-id-84' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='493' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__33' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140' column='1' id='type-id-295'>
       <data-member access='public'>
-        <var-decl name='iova' type-id='type-id-264' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='141' column='1'/>
+        <var-decl name='' type-id='type-id-273' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='physaddr' type-id='type-id-263' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='142' column='1'/>
+        <var-decl name='' type-id='type-id-269' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='rte_mempool_objhdr_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1' id='type-id-297'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stqh_first' type-id='type-id-296' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='stqh_last' type-id='type-id-298' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='152' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='rte_mempool_memhdr_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1' id='type-id-299'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stqh_first' type-id='type-id-300' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1'/>
+    <union-decl name='__anonymous_union__5' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='442' column='1' id='type-id-141'>
+      <data-member access='public'>
+        <var-decl name='orpc' type-id='type-id-53' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='443' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='stqh_last' type-id='type-id-301' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='171' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-276' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='rte_mempool_memhdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='185' column='1' id='type-id-302'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-303' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__7' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='485' column='1' id='type-id-143'>
+      <data-member access='public'>
+        <var-decl name='opaque_td' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='486' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mp' type-id='type-id-278' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='187' column='1'/>
+      <data-member access='public'>
+        <var-decl name='td' type-id='type-id-147' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='487' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='addr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='188' column='1'/>
+      <data-member access='public'>
+        <var-decl name='oac_init' type-id='type-id-145' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='488' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='' type-id='type-id-304' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='190' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__24' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='535' column='1' id='type-id-225'>
+      <data-member access='public'>
+        <var-decl name='packet_type' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='536' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='len' type-id='type-id-34' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='194' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-284' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='free_cb' type-id='type-id-305' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='195' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='568' column='1' id='type-id-321'>
+      <data-member access='public'>
+        <var-decl name='rss' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='569' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='opaque' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='196' column='1'/>
+      <data-member access='public'>
+        <var-decl name='fdir' type-id='type-id-289' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='583' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__26' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1' id='type-id-303'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stqe_next' type-id='type-id-300' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186' column='1'/>
+      <data-member access='public'>
+        <var-decl name='sched' type-id='type-id-235' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='584' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='190' column='1' id='type-id-304'>
       <data-member access='public'>
-        <var-decl name='iova' type-id='type-id-264' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='191' column='1'/>
+        <var-decl name='txadapter' type-id='type-id-286' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='594' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='phys_addr' type-id='type-id-263' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='192' column='1'/>
+        <var-decl name='usr' type-id='type-id-8' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='596' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='rte_mempool' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='216' column='1' id='type-id-306'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-106' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='222' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='' type-id='type-id-307' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='224' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='pool_config' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='228' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='mz' type-id='type-id-308' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='229' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='flags' type-id='type-id-2' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='230' column='1'/>
+    <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1008' column='1' id='type-id-218'>
+      <data-member access='public'>
+        <var-decl name='event' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1009' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='socket_id' type-id='type-id-1' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='231' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-283' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='232' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='626' column='1' id='type-id-230'>
+      <data-member access='public'>
+        <var-decl name='tx_offload' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='627' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='cache_size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='233' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-287' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='elt_size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='236' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1067' column='1' id='type-id-219'>
+      <data-member access='public'>
+        <var-decl name='u64' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1068' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='header_size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='237' column='1'/>
+      <data-member access='public'>
+        <var-decl name='event_ptr' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1070' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='trailer_size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='238' column='1'/>
+      <data-member access='public'>
+        <var-decl name='mbuf' type-id='type-id-229' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1072' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='private_data_size' type-id='type-id-2' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='240' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__25' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='543' column='1' id='type-id-285'>
+      <data-member access='public'>
+        <var-decl name='inner_esp_next_proto' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='544' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='ops_index' type-id='type-id-262' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='248' column='1'/>
+      <data-member access='public'>
+        <var-decl name='' type-id='type-id-288' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='local_cache' type-id='type-id-309' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='250' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='567' column='1' id='type-id-226'>
+      <data-member access='public'>
+        <var-decl name='hash' type-id='type-id-321' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='597' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='populated_size' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='252' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__32' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='60' column='1' id='type-id-258'>
+      <data-member access='public'>
+        <var-decl name='addr' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='61' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='elt_list' type-id='type-id-297' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='253' column='1'/>
+      <data-member access='public'>
+        <var-decl name='addr_64' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='62' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='nb_mem_chunks' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='254' column='1'/>
+    </union-decl>
+    <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='224' column='1' id='type-id-237'>
+      <data-member access='public'>
+        <var-decl name='pool_data' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='225' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='mem_list' type-id='type-id-299' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='255' column='1'/>
+      <data-member access='public'>
+        <var-decl name='pool_id' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='226' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='224' column='1' id='type-id-307'>
+    </union-decl>
+    <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='616' column='1' id='type-id-227'>
       <data-member access='public'>
-        <var-decl name='pool_data' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='225' column='1'/>
+        <var-decl name='userdata' type-id='type-id-48' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='617' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='pool_id' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='226' column='1'/>
+        <var-decl name='udata64' type-id='type-id-20' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='618' column='1'/>
       </data-member>
     </union-decl>
-    <qualified-type-def type-id='type-id-109' const='yes' id='type-id-310'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
-    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-313'/>
-    <qualified-type-def type-id='type-id-178' const='yes' id='type-id-314'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-155'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-146'/>
-    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-316'/>
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-321'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-151'/>
-    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-326'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-148'/>
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-144'/>
-    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-327'/>
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-247'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-250'/>
-    <qualified-type-def type-id='type-id-1' volatile='yes' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-343' volatile='yes' id='type-id-256'/>
-    <qualified-type-def type-id='type-id-19' volatile='yes' id='type-id-249'/>
-    <class-decl name='dpaa_bp_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-317'/>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='98304' id='type-id-244'>
+      <subrange length='1536' lower-bound='0' upper-bound='1535' type-id='type-id-10' id='type-id-322'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='unknown' id='type-id-291'>
+      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-10' id='type-id-39'/>
+    </array-type-def>
+    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
+    <qualified-type-def type-id='type-id-133' const='yes' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
+    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-189'/>
+    <qualified-type-def type-id='type-id-193' const='yes' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-213'/>
+    <qualified-type-def type-id='type-id-256' const='yes' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-238'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-135'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-211'/>
+    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-125'/>
+    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-254'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-206'/>
+    <qualified-type-def type-id='type-id-1' volatile='yes' id='type-id-260'/>
+    <qualified-type-def type-id='type-id-295' volatile='yes' id='type-id-217'/>
+    <qualified-type-def type-id='type-id-23' volatile='yes' id='type-id-203'/>
+    <class-decl name='dpaa_bp_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-330'/>
     <function-decl name='qman_set_fq_lookup_table' mangled-name='qman_set_fq_lookup_table' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_set_fq_lookup_table@@DPDK_20.0'>
-      <parameter type-id='type-id-250' name='fq_table' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='172' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-206' name='fq_table' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='172' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_irqsource_add' mangled-name='qman_irqsource_add' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1050' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_irqsource_add@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1050' column='1'/>
+      <parameter type-id='type-id-9' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1050' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_fq_portal_irqsource_add' mangled-name='qman_fq_portal_irqsource_add' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1067' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_fq_portal_irqsource_add@@DPDK_20.0'>
-      <parameter type-id='type-id-247' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1067' column='1'/>
-      <parameter type-id='type-id-5' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1067' column='1'/>
+      <parameter type-id='type-id-201' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1067' column='1'/>
+      <parameter type-id='type-id-9' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1067' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_irqsource_remove' mangled-name='qman_irqsource_remove' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_irqsource_remove@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1082' column='1'/>
+      <parameter type-id='type-id-9' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1082' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_fq_portal_irqsource_remove' mangled-name='qman_fq_portal_irqsource_remove' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_fq_portal_irqsource_remove@@DPDK_20.0'>
-      <parameter type-id='type-id-247' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1108' column='1'/>
-      <parameter type-id='type-id-5' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1108' column='1'/>
+      <parameter type-id='type-id-201' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1108' column='1'/>
+      <parameter type-id='type-id-9' name='bits' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1108' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_portal_poll_rx' mangled-name='qman_portal_poll_rx' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_portal_poll_rx@@DPDK_20.0'>
-      <parameter type-id='type-id-2' name='poll_limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1144' column='1'/>
-      <parameter type-id='type-id-250' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1145' column='1'/>
-      <parameter type-id='type-id-247' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1146' column='1'/>
-      <return type-id='type-id-2'/>
+      <parameter type-id='type-id-4' name='poll_limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1144' column='1'/>
+      <parameter type-id='type-id-206' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1145' column='1'/>
+      <parameter type-id='type-id-201' name='p' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1146' column='1'/>
+      <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='qman_clear_irq' mangled-name='qman_clear_irq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_clear_irq@@DPDK_20.0'>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_portal_dequeue' mangled-name='qman_portal_dequeue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_portal_dequeue@@DPDK_20.0'>
-      <parameter type-id='type-id-329' name='ev' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1215' column='1'/>
-      <parameter type-id='type-id-2' name='poll_limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1215' column='1'/>
-      <parameter type-id='type-id-250' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1216' column='1'/>
-      <return type-id='type-id-5'/>
+      <parameter type-id='type-id-340' name='ev' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1215' column='1'/>
+      <parameter type-id='type-id-4' name='poll_limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1215' column='1'/>
+      <parameter type-id='type-id-206' name='bufs' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1216' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='qman_dequeue' mangled-name='qman_dequeue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_dequeue@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1282' column='1'/>
-      <return type-id='type-id-153'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1282' column='1'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='qman_dqrr_consume' mangled-name='qman_dqrr_consume' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_dqrr_consume@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1318' column='1'/>
-      <parameter type-id='type-id-153' name='dq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1319' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1318' column='1'/>
+      <parameter type-id='type-id-131' name='dq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1319' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_poll_dqrr' mangled-name='qman_poll_dqrr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_poll_dqrr@@DPDK_20.0'>
-      <parameter type-id='type-id-2' name='limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1'/>
+      <parameter type-id='type-id-4' name='limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_static_dequeue_add' mangled-name='qman_static_dequeue_add' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_static_dequeue_add@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='pools' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1375' column='1'/>
-      <parameter type-id='type-id-247' name='qp' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1375' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-9' name='pools' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1375' column='1'/>
+      <parameter type-id='type-id-201' name='qp' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1375' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_dca_index' mangled-name='qman_dca_index' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_dca_index@@DPDK_20.0'>
-      <parameter type-id='type-id-51' name='index' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1406' column='1'/>
+      <parameter type-id='type-id-53' name='index' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1406' column='1'/>
       <parameter type-id='type-id-1' name='park_request' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1406' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_create_fq' mangled-name='qman_create_fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_create_fq@@DPDK_20.0'>
-      <parameter type-id='type-id-5' name='fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
+      <parameter type-id='type-id-9' name='fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1435' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_fq_fqid' mangled-name='qman_fq_fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_fq_fqid@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1546' column='1'/>
-      <return type-id='type-id-5'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1546' column='1'/>
+      <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='qman_fq_state' mangled-name='qman_fq_state' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_fq_state@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1'/>
-      <parameter type-id='type-id-328' name='state' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1'/>
+      <parameter type-id='type-id-339' name='state' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1'/>
       <parameter type-id='type-id-103' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1551' column='1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_init_fq' mangled-name='qman_init_fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_init_fq@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
-      <parameter type-id='type-id-324' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
+      <parameter type-id='type-id-335' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1559' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_retire_fq' mangled-name='qman_retire_fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_retire_fq@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1697' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1697' column='1'/>
       <parameter type-id='type-id-103' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1697' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_oos_fq' mangled-name='qman_oos_fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_oos_fq@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1787' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1787' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_query_fq_np' mangled-name='qman_query_fq_np' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_query_fq_np@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1918' column='1'/>
-      <parameter type-id='type-id-325' name='np' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1918' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1918' column='1'/>
+      <parameter type-id='type-id-336' name='np' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1918' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_query_fq_frm_cnt' mangled-name='qman_query_fq_frm_cnt' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1960' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_query_fq_frm_cnt@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1960' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1960' column='1'/>
       <parameter type-id='type-id-103' name='frm_cnt' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1960' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_set_vdq' mangled-name='qman_set_vdq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_set_vdq@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
-      <parameter type-id='type-id-4' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
-      <parameter type-id='type-id-7' name='vdqcr_flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
+      <parameter type-id='type-id-7' name='num' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
+      <parameter type-id='type-id-8' name='vdqcr_flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_volatile_dequeue' mangled-name='qman_volatile_dequeue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_volatile_dequeue@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
-      <parameter type-id='type-id-5' name='vdqcr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2140' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
+      <parameter type-id='type-id-9' name='vdqcr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2140' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_enqueue' mangled-name='qman_enqueue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_enqueue@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
-      <parameter type-id='type-id-313' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
+      <parameter type-id='type-id-326' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2246' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_enqueue_multi' mangled-name='qman_enqueue_multi' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_enqueue_multi@@DPDK_20.0'>
-      <parameter type-id='type-id-144' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2261' column='1'/>
-      <parameter type-id='type-id-313' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2262' column='1'/>
+      <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2261' column='1'/>
+      <parameter type-id='type-id-326' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2262' column='1'/>
       <parameter type-id='type-id-103' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2262' column='1'/>
       <parameter type-id='type-id-1' name='frames_to_send' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2263' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_enqueue_multi_fq' mangled-name='qman_enqueue_multi_fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_enqueue_multi_fq@@DPDK_20.0'>
-      <parameter type-id='type-id-327' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2332' column='1'/>
-      <parameter type-id='type-id-313' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2332' column='1'/>
+      <parameter type-id='type-id-338' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2332' column='1'/>
+      <parameter type-id='type-id-326' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2332' column='1'/>
       <parameter type-id='type-id-103' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2333' column='1'/>
       <parameter type-id='type-id-1' name='frames_to_send' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2333' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_modify_cgr' mangled-name='qman_modify_cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_modify_cgr@@DPDK_20.0'>
-      <parameter type-id='type-id-326' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2433' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2433' column='1'/>
-      <parameter type-id='type-id-323' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2434' column='1'/>
+      <parameter type-id='type-id-337' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2433' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2433' column='1'/>
+      <parameter type-id='type-id-334' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2434' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_create_cgr' mangled-name='qman_create_cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_create_cgr@@DPDK_20.0'>
-      <parameter type-id='type-id-326' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2473' column='1'/>
-      <parameter type-id='type-id-5' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2473' column='1'/>
-      <parameter type-id='type-id-323' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2474' column='1'/>
+      <parameter type-id='type-id-337' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2473' column='1'/>
+      <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2473' column='1'/>
+      <parameter type-id='type-id-334' name='opts' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2474' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_delete_cgr' mangled-name='qman_delete_cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_delete_cgr@@DPDK_20.0'>
-      <parameter type-id='type-id-326' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2587' column='1'/>
+      <parameter type-id='type-id-337' name='cgr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2587' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <typedef-decl name='qman_cb_dqrr' type-id='type-id-319' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1127' column='1' id='type-id-244'/>
-    <typedef-decl name='qman_dpdk_cb_dqrr' type-id='type-id-321' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1131' column='1' id='type-id-242'/>
-    <typedef-decl name='qman_dpdk_pull_cb_dqrr' type-id='type-id-334' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1138' column='1' id='type-id-243'/>
-    <typedef-decl name='qman_dpdk_cb_prepare' type-id='type-id-332' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1143' column='1' id='type-id-240'/>
-    <typedef-decl name='qman_cb_mr' type-id='type-id-340' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1149' column='1' id='type-id-241'/>
-    <typedef-decl name='qman_cb_dc_ern' type-id='type-id-336' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1153' column='1' id='type-id-145'/>
-    <typedef-decl name='qman_cb_cgr' type-id='type-id-338' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1250' column='1' id='type-id-252'/>
-    <typedef-decl name='rte_atomic16_t' type-id='type-id-255' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='225' column='1' id='type-id-254'/>
-    <typedef-decl name='rte_spinlock_t' type-id='type-id-257' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='32' column='1' id='type-id-149'/>
-    <typedef-decl name='phys_addr_t' type-id='type-id-11' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='325' column='1' id='type-id-263'/>
-    <typedef-decl name='rte_iova_t' type-id='type-id-11' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='335' column='1' id='type-id-264'/>
-    <typedef-decl name='MARKER' type-id='type-id-141' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='414' column='1' id='type-id-271'/>
-    <typedef-decl name='MARKER64' type-id='type-id-138' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='420' column='1' id='type-id-273'/>
-    <typedef-decl name='rte_mbuf_extbuf_free_callback_t' type-id='type-id-342' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='684' column='1' id='type-id-291'/>
-    <typedef-decl name='rte_mempool_memchunk_free_cb_t' type-id='type-id-344' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='176' column='1' id='type-id-330'/>
-    <typedef-decl name='int16_t' type-id='type-id-345' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-343'/>
-    <typedef-decl name='int32_t' type-id='type-id-346' filepath='/usr/include/bits/stdint-intn.h' line='26' column='1' id='type-id-262'/>
-    <typedef-decl name='__int16_t' type-id='type-id-111' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-345'/>
-    <typedef-decl name='__int32_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-346'/>
     <function-type size-in-bits='64' id='type-id-331'>
-      <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-250'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-201'/>
+      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-324'/>
+      <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-335'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-155'/>
-      <return type-id='type-id-33'/>
+    <function-type size-in-bits='64' id='type-id-332'>
+      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-201'/>
+      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-324'/>
+      <parameter type-id='type-id-206'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-341'>
+      <parameter type-id='type-id-131'/>
+      <parameter type-id='type-id-206'/>
+      <return type-id='type-id-36'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-337'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-326'/>
+    <function-type size-in-bits='64' id='type-id-342'>
+      <parameter type-id='type-id-338'/>
+      <parameter type-id='type-id-333'/>
+      <parameter type-id='type-id-206'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-339'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-144'/>
-      <parameter type-id='type-id-155'/>
-      <return type-id='type-id-33'/>
+    <function-type size-in-bits='64' id='type-id-343'>
+      <parameter type-id='type-id-201'/>
+      <parameter type-id='type-id-189'/>
+      <return type-id='type-id-36'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-344'>
-      <parameter type-id='type-id-300'/>
-      <parameter type-id='type-id-59'/>
-      <return type-id='type-id-33'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-341'>
-      <parameter type-id='type-id-59'/>
-      <parameter type-id='type-id-59'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-201'/>
+      <parameter type-id='type-id-337'/>
+      <parameter type-id='type-id-1'/>
+      <return type-id='type-id-36'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-318'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-144'/>
-      <parameter type-id='type-id-311'/>
-      <return type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-345'>
+      <parameter type-id='type-id-201'/>
+      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-189'/>
+      <return type-id='type-id-36'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-320'>
-      <parameter type-id='type-id-59'/>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-144'/>
-      <parameter type-id='type-id-311'/>
-      <parameter type-id='type-id-250'/>
-      <return type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-309'>
+      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-48'/>
+      <return type-id='type-id-36'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-333'>
-      <parameter type-id='type-id-327'/>
-      <parameter type-id='type-id-322'/>
-      <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-33'/>
+    <function-type size-in-bits='64' id='type-id-346'>
+      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-48'/>
+      <return type-id='type-id-36'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-347'/>
-    <var-decl name='qm_channel_pool1' type-id='type-id-4' mangled-name='qm_channel_pool1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='18' column='1' elf-symbol-id='qm_channel_pool1@@DPDK_20.0'/>
-    <var-decl name='qm_channel_caam' type-id='type-id-4' mangled-name='qm_channel_caam' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='19' column='1' elf-symbol-id='qm_channel_caam@@DPDK_20.0'/>
+    <var-decl name='qm_channel_pool1' type-id='type-id-7' mangled-name='qm_channel_pool1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='18' column='1' elf-symbol-id='qm_channel_pool1@@DPDK_20.0'/>
+    <var-decl name='qm_channel_caam' type-id='type-id-7' mangled-name='qm_channel_caam' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='19' column='1' elf-symbol-id='qm_channel_caam@@DPDK_20.0'/>
     <function-decl name='qman_thread_fd' mangled-name='qman_thread_fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_thread_fd@@DPDK_20.0'>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qman_thread_irq' mangled-name='qman_thread_irq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_thread_irq@@DPDK_20.0'>
-      <return type-id='type-id-33'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='qman_fq_portal_thread_irq' mangled-name='qman_fq_portal_thread_irq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_fq_portal_thread_irq@@DPDK_20.0'>
-      <parameter type-id='type-id-247' name='qp' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='124' column='1'/>
-      <return type-id='type-id-33'/>
+      <parameter type-id='type-id-201' name='qp' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='124' column='1'/>
+      <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='fsl_qman_fq_portal_create' mangled-name='fsl_qman_fq_portal_create' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fsl_qman_fq_portal_create@@DPDK_20.0'>
       <parameter type-id='type-id-347' name='fd' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='129' column='1'/>
-      <return type-id='type-id-247'/>
+      <return type-id='type-id-201'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
     <array-type-def dimensions='1' type-id='type-id-348' size-in-bits='8192' id='type-id-349'>
-      <subrange length='64' type-id='type-id-10' id='type-id-350'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-10' id='type-id-350'/>
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-351' size-in-bits='8192' id='type-id-352'>
-      <subrange length='64' type-id='type-id-10' id='type-id-350'/>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-10' id='type-id-350'/>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-10' id='type-id-44'/>
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-353'/>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='8192' id='type-id-354'>
-      <subrange length='1024' type-id='type-id-10' id='type-id-355'/>
+      <subrange length='1024' lower-bound='0' upper-bound='1023' type-id='type-id-10' id='type-id-355'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='512' id='type-id-356'>
-      <subrange length='64' type-id='type-id-10' id='type-id-350'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-357'>
-      <subrange length='512' type-id='type-id-10' id='type-id-358'/>
-    </array-type-def>
-    <type-decl name='long int' size-in-bits='64' id='type-id-359'/>
-    <array-type-def dimensions='1' type-id='type-id-360' size-in-bits='196608' id='type-id-361'>
-      <subrange length='512' type-id='type-id-10' id='type-id-358'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-362' size-in-bits='3456' id='type-id-363'>
-      <subrange length='24' type-id='type-id-10' id='type-id-364'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-365' size-in-bits='2304' id='type-id-366'>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
+      <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-10' id='type-id-350'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-367' size-in-bits='1024' id='type-id-368'>
-      <subrange length='32' type-id='type-id-10' id='type-id-53'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-369' size-in-bits='65536' id='type-id-370'>
-      <subrange length='1024' type-id='type-id-10' id='type-id-355'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-371'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='1024' id='type-id-372'>
-      <subrange length='64' type-id='type-id-10' id='type-id-350'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='128' id='type-id-373'>
-      <subrange length='4' type-id='type-id-10' id='type-id-50'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8192' id='type-id-374'>
-      <subrange length='128' type-id='type-id-10' id='type-id-375'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='256' id='type-id-376'>
-      <subrange length='4' type-id='type-id-10' id='type-id-50'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='4096' id='type-id-377'>
-      <subrange length='64' type-id='type-id-10' id='type-id-350'/>
+    <enum-decl name='rte_bus_scan_mode' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='216' column='1' id='type-id-357'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_BUS_SCAN_UNDEFINED' value='0'/>
+      <enumerator name='RTE_BUS_SCAN_WHITELIST' value='1'/>
+      <enumerator name='RTE_BUS_SCAN_BLACKLIST' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_dev_policy' filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='72' column='1' id='type-id-358'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_DEV_WHITELISTED' value='0'/>
+      <enumerator name='RTE_DEV_BLACKLISTED' value='1'/>
+    </enum-decl>
+    <enum-decl name='rte_devtype' filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='31' column='1' id='type-id-359'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_DEVTYPE_WHITELISTED_PCI' value='0'/>
+      <enumerator name='RTE_DEVTYPE_BLACKLISTED_PCI' value='1'/>
+      <enumerator name='RTE_DEVTYPE_VIRTUAL' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_dpaa_type' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='50' column='1' id='type-id-360'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='FSL_DPAA_ETH' value='1'/>
+      <enumerator name='FSL_DPAA_CRYPTO' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_dev_state' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1467' column='1' id='type-id-361'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_ETH_DEV_UNUSED' value='0'/>
+      <enumerator name='RTE_ETH_DEV_ATTACHED' value='1'/>
+      <enumerator name='RTE_ETH_DEV_REMOVED' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_fc_mode' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='930' column='1' id='type-id-362'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_FC_NONE' value='0'/>
+      <enumerator name='RTE_FC_RX_PAUSE' value='1'/>
+      <enumerator name='RTE_FC_TX_PAUSE' value='2'/>
+      <enumerator name='RTE_FC_FULL' value='3'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_nb_pools' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='704' column='1' id='type-id-363'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='ETH_8_POOLS' value='8'/>
+      <enumerator name='ETH_16_POOLS' value='16'/>
+      <enumerator name='ETH_32_POOLS' value='32'/>
+      <enumerator name='ETH_64_POOLS' value='64'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_nb_tcs' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='695' column='1' id='type-id-364'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='ETH_4_TCS' value='4'/>
+      <enumerator name='ETH_8_TCS' value='8'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_payload_type' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='555' column='1' id='type-id-365'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_ETH_PAYLOAD_UNKNOWN' value='0'/>
+      <enumerator name='RTE_ETH_RAW_PAYLOAD' value='1'/>
+      <enumerator name='RTE_ETH_L2_PAYLOAD' value='2'/>
+      <enumerator name='RTE_ETH_L3_PAYLOAD' value='3'/>
+      <enumerator name='RTE_ETH_L4_PAYLOAD' value='4'/>
+      <enumerator name='RTE_ETH_PAYLOAD_MAX' value='8'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_rx_mq_mode' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='344' column='1' id='type-id-366'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='ETH_MQ_RX_NONE' value='0'/>
+      <enumerator name='ETH_MQ_RX_RSS' value='1'/>
+      <enumerator name='ETH_MQ_RX_DCB' value='2'/>
+      <enumerator name='ETH_MQ_RX_DCB_RSS' value='3'/>
+      <enumerator name='ETH_MQ_RX_VMDQ_ONLY' value='4'/>
+      <enumerator name='ETH_MQ_RX_VMDQ_RSS' value='5'/>
+      <enumerator name='ETH_MQ_RX_VMDQ_DCB' value='6'/>
+      <enumerator name='ETH_MQ_RX_VMDQ_DCB_RSS' value='7'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_tunnel_type' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='965' column='1' id='type-id-367'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_TUNNEL_TYPE_NONE' value='0'/>
+      <enumerator name='RTE_TUNNEL_TYPE_VXLAN' value='1'/>
+      <enumerator name='RTE_TUNNEL_TYPE_GENEVE' value='2'/>
+      <enumerator name='RTE_TUNNEL_TYPE_TEREDO' value='3'/>
+      <enumerator name='RTE_TUNNEL_TYPE_NVGRE' value='4'/>
+      <enumerator name='RTE_TUNNEL_TYPE_IP_IN_GRE' value='5'/>
+      <enumerator name='RTE_L2_TUNNEL_TYPE_E_TAG' value='6'/>
+      <enumerator name='RTE_TUNNEL_TYPE_VXLAN_GPE' value='7'/>
+      <enumerator name='RTE_TUNNEL_TYPE_MAX' value='8'/>
+    </enum-decl>
+    <enum-decl name='rte_eth_tx_mq_mode' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='377' column='1' id='type-id-368'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='ETH_MQ_TX_NONE' value='0'/>
+      <enumerator name='ETH_MQ_TX_DCB' value='1'/>
+      <enumerator name='ETH_MQ_TX_VMDQ_DCB' value='2'/>
+      <enumerator name='ETH_MQ_TX_VMDQ_ONLY' value='3'/>
+    </enum-decl>
+    <enum-decl name='rte_fdir_mode' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='603' column='1' id='type-id-369'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_FDIR_MODE_NONE' value='0'/>
+      <enumerator name='RTE_FDIR_MODE_SIGNATURE' value='1'/>
+      <enumerator name='RTE_FDIR_MODE_PERFECT' value='2'/>
+      <enumerator name='RTE_FDIR_MODE_PERFECT_MAC_VLAN' value='3'/>
+      <enumerator name='RTE_FDIR_MODE_PERFECT_TUNNEL' value='4'/>
+    </enum-decl>
+    <enum-decl name='rte_fdir_pballoc_type' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='984' column='1' id='type-id-370'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_FDIR_PBALLOC_64K' value='0'/>
+      <enumerator name='RTE_FDIR_PBALLOC_128K' value='1'/>
+      <enumerator name='RTE_FDIR_PBALLOC_256K' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_fdir_status_mode' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='993' column='1' id='type-id-371'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_FDIR_NO_REPORT_STATUS' value='0'/>
+      <enumerator name='RTE_FDIR_REPORT_STATUS' value='1'/>
+      <enumerator name='RTE_FDIR_REPORT_STATUS_ALWAYS' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_filter_op' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='46' column='1' id='type-id-372'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_ETH_FILTER_NOP' value='0'/>
+      <enumerator name='RTE_ETH_FILTER_ADD' value='1'/>
+      <enumerator name='RTE_ETH_FILTER_UPDATE' value='2'/>
+      <enumerator name='RTE_ETH_FILTER_DELETE' value='3'/>
+      <enumerator name='RTE_ETH_FILTER_FLUSH' value='4'/>
+      <enumerator name='RTE_ETH_FILTER_GET' value='5'/>
+      <enumerator name='RTE_ETH_FILTER_SET' value='6'/>
+      <enumerator name='RTE_ETH_FILTER_INFO' value='7'/>
+      <enumerator name='RTE_ETH_FILTER_STATS' value='8'/>
+      <enumerator name='RTE_ETH_FILTER_OP_MAX' value='9'/>
+    </enum-decl>
+    <enum-decl name='rte_filter_type' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='28' column='1' id='type-id-373'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_ETH_FILTER_NONE' value='0'/>
+      <enumerator name='RTE_ETH_FILTER_MACVLAN' value='1'/>
+      <enumerator name='RTE_ETH_FILTER_ETHERTYPE' value='2'/>
+      <enumerator name='RTE_ETH_FILTER_FLEXIBLE' value='3'/>
+      <enumerator name='RTE_ETH_FILTER_SYN' value='4'/>
+      <enumerator name='RTE_ETH_FILTER_NTUPLE' value='5'/>
+      <enumerator name='RTE_ETH_FILTER_TUNNEL' value='6'/>
+      <enumerator name='RTE_ETH_FILTER_FDIR' value='7'/>
+      <enumerator name='RTE_ETH_FILTER_HASH' value='8'/>
+      <enumerator name='RTE_ETH_FILTER_L2_TUNNEL' value='9'/>
+      <enumerator name='RTE_ETH_FILTER_GENERIC' value='10'/>
+      <enumerator name='RTE_ETH_FILTER_MAX' value='11'/>
+    </enum-decl>
+    <enum-decl name='rte_intr_handle_type' filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h' line='27' column='1' id='type-id-374'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_INTR_HANDLE_UNKNOWN' value='0'/>
+      <enumerator name='RTE_INTR_HANDLE_UIO' value='1'/>
+      <enumerator name='RTE_INTR_HANDLE_UIO_INTX' value='2'/>
+      <enumerator name='RTE_INTR_HANDLE_VFIO_LEGACY' value='3'/>
+      <enumerator name='RTE_INTR_HANDLE_VFIO_MSI' value='4'/>
+      <enumerator name='RTE_INTR_HANDLE_VFIO_MSIX' value='5'/>
+      <enumerator name='RTE_INTR_HANDLE_ALARM' value='6'/>
+      <enumerator name='RTE_INTR_HANDLE_EXT' value='7'/>
+      <enumerator name='RTE_INTR_HANDLE_VDEV' value='8'/>
+      <enumerator name='RTE_INTR_HANDLE_DEV_EVENT' value='9'/>
+      <enumerator name='RTE_INTR_HANDLE_VFIO_REQ' value='10'/>
+      <enumerator name='RTE_INTR_HANDLE_MAX' value='11'/>
+    </enum-decl>
+    <enum-decl name='rte_iova_mode' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='39' column='1' id='type-id-375'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_IOVA_DC' value='0'/>
+      <enumerator name='RTE_IOVA_PA' value='1'/>
+      <enumerator name='RTE_IOVA_VA' value='2'/>
+    </enum-decl>
+    <enum-decl name='rte_kernel_driver' filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='60' column='1' id='type-id-376'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='RTE_KDRV_UNKNOWN' value='0'/>
+      <enumerator name='RTE_KDRV_IGB_UIO' value='1'/>
+      <enumerator name='RTE_KDRV_VFIO' value='2'/>
+      <enumerator name='RTE_KDRV_UIO_GENERIC' value='3'/>
+      <enumerator name='RTE_KDRV_NIC_UIO' value='4'/>
+      <enumerator name='RTE_KDRV_NONE' value='5'/>
+    </enum-decl>
+    <enum-decl name='rte_vlan_type' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='416' column='1' id='type-id-377'>
+      <underlying-type type-id='type-id-12'/>
+      <enumerator name='ETH_VLAN_TYPE_UNKNOWN' value='0'/>
+      <enumerator name='ETH_VLAN_TYPE_INNER' value='1'/>
+      <enumerator name='ETH_VLAN_TYPE_OUTER' value='2'/>
+      <enumerator name='ETH_VLAN_TYPE_MAX' value='3'/>
+    </enum-decl>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-378'>
+      <subrange length='512' lower-bound='0' upper-bound='511' type-id='type-id-10' id='type-id-379'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='8192' id='type-id-378'>
-      <subrange length='1024' type-id='type-id-10' id='type-id-355'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-380'/>
+    <array-type-def dimensions='1' type-id='type-id-381' size-in-bits='196608' id='type-id-382'>
+      <subrange length='512' lower-bound='0' upper-bound='511' type-id='type-id-10' id='type-id-379'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='128' id='type-id-379'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
+    <array-type-def dimensions='1' type-id='type-id-383' size-in-bits='3456' id='type-id-384'>
+      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-10' id='type-id-385'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='64' id='type-id-380'>
-      <subrange length='8' type-id='type-id-10' id='type-id-44'/>
+    <array-type-def dimensions='1' type-id='type-id-386' size-in-bits='2304' id='type-id-387'>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-10' id='type-id-44'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-59' size-in-bits='1024' id='type-id-381'>
-      <subrange length='16' type-id='type-id-10' id='type-id-13'/>
+    <array-type-def dimensions='1' type-id='type-id-388' size-in-bits='1024' id='type-id-389'>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-10' id='type-id-91'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-59' size-in-bits='256' id='type-id-382'>
-      <subrange length='4' type-id='type-id-10' id='type-id-50'/>
+    <array-type-def dimensions='1' type-id='type-id-390' size-in-bits='65536' id='type-id-391'>
+      <subrange length='1024' lower-bound='0' upper-bound='1023' type-id='type-id-10' id='type-id-355'/>
     </array-type-def>
-    <class-decl name='rte_dpaa_device_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='44' column='1' id='type-id-383'>
+    <class-decl name='dpaa_device_id' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='63' column='1' id='type-id-392'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tqh_first' type-id='type-id-384' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='44' column='1'/>
+        <var-decl name='fman_id' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='64' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tqh_last' type-id='type-id-385' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='44' column='1'/>
+      <data-member access='public' layout-offset-in-bits='8'>
+        <var-decl name='mac_id' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='dev_id' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='66' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_dpaa_driver_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='45' column='1' id='type-id-386'>
+    <class-decl name='dpaa_portal_dqrr' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='187' column='1' id='type-id-393'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tqh_first' type-id='type-id-387' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='45' column='1'/>
+        <var-decl name='mbuf' type-id='type-id-394' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='188' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tqh_last' type-id='type-id-388' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='45' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='dqrr_held' type-id='type-id-20' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='189' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='dqrr_size' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='190' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='rte_dpaa_type' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='50' column='1' id='type-id-389'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='FSL_DPAA_ETH' value='1'/>
-      <enumerator name='FSL_DPAA_CRYPTO' value='2'/>
-    </enum-decl>
-    <class-decl name='rte_dpaa_bus' size-in-bits='1344' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='55' column='1' id='type-id-390'>
+    <class-decl name='eth_dev_ops' size-in-bits='6016' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='609' column='1' id='type-id-395'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bus' type-id='type-id-391' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='56' column='1'/>
+        <var-decl name='dev_configure' type-id='type-id-396' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='610' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='device_list' type-id='type-id-383' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='driver_list' type-id='type-id-386' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='58' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='dev_start' type-id='type-id-397' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='611' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='device_count' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='59' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='dev_stop' type-id='type-id-398' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='612' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='detected' type-id='type-id-1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='60' column='1'/>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='dev_set_link_up' type-id='type-id-399' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='613' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='dpaa_device_id' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='63' column='1' id='type-id-392'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='fman_id' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='64' column='1'/>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='dev_set_link_down' type-id='type-id-400' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='614' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='mac_id' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='65' column='1'/>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='dev_close' type-id='type-id-401' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='615' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='dev_id' type-id='type-id-6' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='66' column='1'/>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='dev_reset' type-id='type-id-402' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='616' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='rte_dpaa_device' size-in-bits='214592' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='69' column='1' id='type-id-393'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-394' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='link_update' type-id='type-id-403' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='617' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='device' type-id='type-id-395' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='71' column='1'/>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='is_removed' type-id='type-id-404' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='618' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='' type-id='type-id-396' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1'/>
+        <var-decl name='promiscuous_enable' type-id='type-id-405' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='621' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='driver' type-id='type-id-387' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='76' column='1'/>
+        <var-decl name='promiscuous_disable' type-id='type-id-406' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='622' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='id' type-id='type-id-392' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='77' column='1'/>
+        <var-decl name='allmulticast_enable' type-id='type-id-407' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='623' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='intr_handle' type-id='type-id-397' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='78' column='1'/>
+        <var-decl name='allmulticast_disable' type-id='type-id-408' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='624' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='214016'>
-        <var-decl name='device_type' type-id='type-id-389' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='79' column='1'/>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='mac_addr_remove' type-id='type-id-409' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='625' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='214048'>
-        <var-decl name='name' type-id='type-id-356' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='80' column='1'/>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='mac_addr_add' type-id='type-id-410' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='626' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__14' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1' id='type-id-394'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tqe_next' type-id='type-id-384' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='mac_addr_set' type-id='type-id-411' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='627' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tqe_prev' type-id='type-id-385' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='set_mc_addr_list' type-id='type-id-412' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='628' column='1'/>
       </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1' id='type-id-396'>
-      <data-member access='public'>
-        <var-decl name='eth_dev' type-id='type-id-398' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='73' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='mtu_set' type-id='type-id-413' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='629' column='1'/>
       </data-member>
-      <data-member access='public'>
-        <var-decl name='crypto_dev' type-id='type-id-399' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='74' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='stats_get' type-id='type-id-414' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='631' column='1'/>
       </data-member>
-    </union-decl>
-    <class-decl name='rte_dpaa_driver' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='87' column='1' id='type-id-400'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-401' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='stats_reset' type-id='type-id-415' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='632' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='driver' type-id='type-id-402' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='89' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='xstats_get' type-id='type-id-416' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='633' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='dpaa_bus' type-id='type-id-403' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='90' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='xstats_reset' type-id='type-id-417' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='634' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='drv_type' type-id='type-id-389' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='91' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='xstats_get_names' type-id='type-id-418' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='635' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='probe' type-id='type-id-404' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='92' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='queue_stats_mapping_set' type-id='type-id-419' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='637' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='remove' type-id='type-id-405' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='93' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='dev_infos_get' type-id='type-id-420' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='640' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__9' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1' id='type-id-401'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tqe_next' type-id='type-id-387' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1600'>
+        <var-decl name='rxq_info_get' type-id='type-id-421' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='641' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tqe_prev' type-id='type-id-388' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1664'>
+        <var-decl name='txq_info_get' type-id='type-id-422' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='642' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='dpaa_portal_dqrr' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='187' column='1' id='type-id-406'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mbuf' type-id='type-id-381' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='188' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1728'>
+        <var-decl name='rx_burst_mode_get' type-id='type-id-423' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='643' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='dqrr_held' type-id='type-id-11' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='189' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1792'>
+        <var-decl name='tx_burst_mode_get' type-id='type-id-423' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='644' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='dqrr_size' type-id='type-id-14' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='190' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1856'>
+        <var-decl name='fw_version_get' type-id='type-id-424' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='645' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='223' column='1' id='type-id-407'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cnt' type-id='type-id-256' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h' line='224' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1920'>
+        <var-decl name='dev_supported_ptypes_get' type-id='type-id-425' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='646' column='1'/>
       </data-member>
-    </class-decl>
-    <class-decl name='__anonymous_struct__8' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='30' column='1' id='type-id-408'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='locked' type-id='type-id-258' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h' line='31' column='1'/>
+      <data-member access='public' layout-offset-in-bits='1984'>
+        <var-decl name='dev_ptypes_set' type-id='type-id-426' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='648' column='1'/>
       </data-member>
-    </class-decl>
-    <enum-decl name='rte_iova_mode' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='39' column='1' id='type-id-409'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='RTE_IOVA_DC' value='0'/>
-      <enumerator name='RTE_IOVA_PA' value='1'/>
-      <enumerator name='RTE_IOVA_VA' value='2'/>
-    </enum-decl>
-    <enum-decl name='rte_bus_scan_mode' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='216' column='1' id='type-id-410'>
-      <underlying-type type-id='type-id-17'/>
-      <enumerator name='RTE_BUS_SCAN_UNDEFINED' value='0'/>
-      <enumerator name='RTE_BUS_SCAN_WHITELIST' value='1'/>
-      <enumerator name='RTE_BUS_SCAN_BLACKLIST' value='2'/>
-    </enum-decl>
-    <class-decl name='rte_bus_conf' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='225' column='1' id='type-id-411'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='scan_mode' type-id='type-id-410' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='226' column='1'/>
+      <data-member access='public' layout-offset-in-bits='2048'>
+        <var-decl name='vlan_filter_set' type-id='type-id-427' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='651' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2112'>
+        <var-decl name='vlan_tpid_set' type-id='type-id-428' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='652' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2176'>
+        <var-decl name='vlan_strip_queue_set' type-id='type-id-429' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='653' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2240'>
+        <var-decl name='vlan_offload_set' type-id='type-id-430' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='654' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2304'>
+        <var-decl name='vlan_pvid_set' type-id='type-id-431' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='655' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2368'>
+        <var-decl name='rx_queue_start' type-id='type-id-432' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='657' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='rx_queue_stop' type-id='type-id-433' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='658' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2496'>
+        <var-decl name='tx_queue_start' type-id='type-id-432' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='659' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2560'>
+        <var-decl name='tx_queue_stop' type-id='type-id-433' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='660' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2624'>
+        <var-decl name='rx_queue_setup' type-id='type-id-434' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='661' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2688'>
+        <var-decl name='rx_queue_release' type-id='type-id-435' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='662' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2752'>
+        <var-decl name='rx_queue_count' type-id='type-id-436' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='663' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2816'>
+        <var-decl name='rx_descriptor_done' type-id='type-id-437' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='665' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2880'>
+        <var-decl name='rx_descriptor_status' type-id='type-id-438' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='666' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2944'>
+        <var-decl name='tx_descriptor_status' type-id='type-id-439' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='668' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3008'>
+        <var-decl name='rx_queue_intr_enable' type-id='type-id-440' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='670' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3072'>
+        <var-decl name='rx_queue_intr_disable' type-id='type-id-441' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='671' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3136'>
+        <var-decl name='tx_queue_setup' type-id='type-id-442' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='672' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3200'>
+        <var-decl name='tx_queue_release' type-id='type-id-435' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='673' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3264'>
+        <var-decl name='tx_done_cleanup' type-id='type-id-443' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='674' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3328'>
+        <var-decl name='dev_led_on' type-id='type-id-444' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='676' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3392'>
+        <var-decl name='dev_led_off' type-id='type-id-445' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='677' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3456'>
+        <var-decl name='flow_ctrl_get' type-id='type-id-446' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='679' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3520'>
+        <var-decl name='flow_ctrl_set' type-id='type-id-447' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='680' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3584'>
+        <var-decl name='priority_flow_ctrl_set' type-id='type-id-448' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='681' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3648'>
+        <var-decl name='uc_hash_table_set' type-id='type-id-449' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='683' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3712'>
+        <var-decl name='uc_all_hash_table_set' type-id='type-id-450' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='684' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3776'>
+        <var-decl name='mirror_rule_set' type-id='type-id-451' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='686' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3840'>
+        <var-decl name='mirror_rule_reset' type-id='type-id-452' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='687' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3904'>
+        <var-decl name='udp_tunnel_port_add' type-id='type-id-453' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='689' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3968'>
+        <var-decl name='udp_tunnel_port_del' type-id='type-id-454' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='690' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4032'>
+        <var-decl name='l2_tunnel_eth_type_conf' type-id='type-id-455' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='691' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4096'>
+        <var-decl name='l2_tunnel_offload_set' type-id='type-id-456' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='693' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4160'>
+        <var-decl name='set_queue_rate_limit' type-id='type-id-457' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='696' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4224'>
+        <var-decl name='rss_hash_update' type-id='type-id-458' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='698' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4288'>
+        <var-decl name='rss_hash_conf_get' type-id='type-id-459' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='699' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4352'>
+        <var-decl name='reta_update' type-id='type-id-460' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='700' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4416'>
+        <var-decl name='reta_query' type-id='type-id-461' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='701' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4480'>
+        <var-decl name='get_reg' type-id='type-id-462' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='703' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4544'>
+        <var-decl name='get_eeprom_length' type-id='type-id-463' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='704' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4608'>
+        <var-decl name='get_eeprom' type-id='type-id-464' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='705' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4672'>
+        <var-decl name='set_eeprom' type-id='type-id-465' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='706' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4736'>
+        <var-decl name='get_module_info' type-id='type-id-466' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='708' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4800'>
+        <var-decl name='get_module_eeprom' type-id='type-id-467' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='710' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4864'>
+        <var-decl name='filter_ctrl' type-id='type-id-468' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='713' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4928'>
+        <var-decl name='get_dcb_info' type-id='type-id-469' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='715' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='4992'>
+        <var-decl name='timesync_enable' type-id='type-id-470' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='717' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5056'>
+        <var-decl name='timesync_disable' type-id='type-id-471' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='719' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5120'>
+        <var-decl name='timesync_read_rx_timestamp' type-id='type-id-472' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='721' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5184'>
+        <var-decl name='timesync_read_tx_timestamp' type-id='type-id-473' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='723' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5248'>
+        <var-decl name='timesync_adjust_time' type-id='type-id-474' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='725' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5312'>
+        <var-decl name='timesync_read_time' type-id='type-id-475' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='726' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5376'>
+        <var-decl name='timesync_write_time' type-id='type-id-476' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='727' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5440'>
+        <var-decl name='read_clock' type-id='type-id-477' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='729' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5504'>
+        <var-decl name='xstats_get_by_id' type-id='type-id-478' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='731' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5568'>
+        <var-decl name='xstats_get_names_by_id' type-id='type-id-479' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='733' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5632'>
+        <var-decl name='tm_ops_get' type-id='type-id-480' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='736' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5696'>
+        <var-decl name='mtr_ops_get' type-id='type-id-481' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='739' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5760'>
+        <var-decl name='pool_ops_supported' type-id='type-id-482' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='742' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5824'>
+        <var-decl name='hairpin_cap_get' type-id='type-id-483' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='745' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5888'>
+        <var-decl name='rx_hairpin_queue_setup' type-id='type-id-484' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='747' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='5952'>
+        <var-decl name='tx_hairpin_queue_setup' type-id='type-id-485' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='749' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='rte_bus' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='246' column='1' id='type-id-391'>
+    <class-decl name='rte_bus' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='246' column='1' id='type-id-486'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-412' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247' column='1'/>
+        <var-decl name='next' type-id='type-id-487' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='name' type-id='type-id-413' visibility='default' filepath='../../dpdk/lib/librte_eal/common