From 345edc823540089925b8ae60af34404d608fdfb4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 18 九月 2025 14:58:20 +0800
Subject: [PATCH] 首轮测试代码提交
---
src/scene.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/scene.cpp b/src/scene.cpp
index 13a930b..e8618b9 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -14,6 +14,7 @@
#include "protocol_internal.h"
#include "moduleexport.h"
#include "crc.h"
+#include "../drv/memory.h"
s32 Scene::str_delim(const s8* str, u16 logic_channel[])
{
@@ -91,7 +92,7 @@
mixer->mType = ModuleType::PROC_MIXER;
mixer->mTag = 0;
mixer->mPhyModule = 0;
- mixer->mParamaddr = (s32)get_module_param_ptr(p->parameters,p->fixed);
+ mixer->mParamaddr = (s32)get_module_param_ptr(mixer->mType, p->parameters, p->fixed);
size += sizeof(struct Module);
@@ -125,7 +126,7 @@
m->mType = p->proc_type;
m->mTag = p->tag;
m->mPhyModule = p->physic_type;
- m->mParamaddr = (s32)get_module_param_ptr(p->parameters,p->fixed);
+ m->mParamaddr = (s32)get_module_param_ptr(m->mType, p->parameters, p->fixed);
size += sizeof(struct Module);
m->mRxNum = ninports;
@@ -137,7 +138,8 @@
PhyPort* phy_id = (PhyPort*)(bin + size);
for(j = 0 ; j< ninports ;j ++, phy_id++) {
phy_id->mIntType = 0;
- phy_id->mPhyID = hw_adapter->get_physical_channel(1, j);
+ phy_id->mPhyID = hw_adapter->get_physical_channel(1, rxBufID[j]-1);
+// printf("PhyID:%d\n", phy_id->mPhyID);
}
size += ninports*sizeof(PhyPort);
}
@@ -145,7 +147,7 @@
PhyPort* phy_id = (PhyPort*)(bin + size);
for(j = 0 ; j< noutports ;j ++, phy_id++) {
phy_id->mIntType = 0;
- phy_id->mPhyID = hw_adapter->get_physical_channel(0, j);
+ phy_id->mPhyID = hw_adapter->get_physical_channel(0, txBufID[j]-1);
}
size += noutports*sizeof(PhyPort);
}
--
Gitblit v1.9.3