#include <rte_log.h>
#include <rte_spinlock.h>
#include "../dlb2_main.h"
+
+/* TEMPORARY inclusion of both headers for merge */
+#include "dlb2_resource_new.h"
#include "dlb2_resource.h"
+
#include "../../dlb2_log.h"
#include "../../dlb2_user.h"
uint64_t pp_dma_base;
pp_dma_base = (uintptr_t)hw->func_kva + DLB2_PP_BASE(is_ldb);
- addr = (pp_dma_base + (PAGE_SIZE * port_id));
+ addr = (pp_dma_base + (rte_mem_page_size() * port_id));
return (void *)(uintptr_t)addr;
}