refactor: use dma device properties struct within device node
No functional change. This refactoring is needed for the next patch
which creates a helper utility to obtain various common fields from
memory region node and device region node of a partition manifest.
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: I38b65136297e09411938f68dce18c0265d710924
diff --git a/src/manifest_test.cc b/src/manifest_test.cc
index c6c919f..f2b5018 100644
--- a/src/manifest_test.cc
+++ b/src/manifest_test.cc
@@ -1789,9 +1789,9 @@
ASSERT_EQ(vm->partition.dev_regions[0].base_address, 0x24000000);
ASSERT_EQ(vm->partition.dev_regions[0].page_count, 16);
ASSERT_EQ(vm->partition.dev_regions[0].attributes, (16 | 3));
- ASSERT_EQ(vm->partition.dev_regions[0].smmu_id, 1);
- ASSERT_EQ(vm->partition.dev_regions[0].stream_ids[0], 0);
- ASSERT_EQ(vm->partition.dev_regions[0].stream_ids[1], 1);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.smmu_id, 1);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.stream_ids[0], 0);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.stream_ids[1], 1);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[0].id, 2);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[0].attributes, 3);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[1].id, 4);
@@ -1831,9 +1831,9 @@
ASSERT_EQ(vm->partition.dev_regions[0].base_address, 0x24000000);
ASSERT_EQ(vm->partition.dev_regions[0].page_count, 16);
ASSERT_EQ(vm->partition.dev_regions[0].attributes, (16 | 3));
- ASSERT_EQ(vm->partition.dev_regions[0].smmu_id, 1);
- ASSERT_EQ(vm->partition.dev_regions[0].stream_ids[0], 0);
- ASSERT_EQ(vm->partition.dev_regions[0].stream_ids[1], 1);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.smmu_id, 1);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.stream_ids[0], 0);
+ ASSERT_EQ(vm->partition.dev_regions[0].dma_prop.stream_ids[1], 1);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[0].id, 2);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[0].attributes, 3);
ASSERT_EQ(vm->partition.dev_regions[0].interrupts[0].mpidr_valid, true);