From 345edc823540089925b8ae60af34404d608fdfb4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 18 九月 2025 14:58:20 +0800
Subject: [PATCH] 首轮测试代码提交
---
src/tob.cpp | 58 ----------------------------------------------------------
1 files changed, 0 insertions(+), 58 deletions(-)
diff --git a/src/tob.cpp b/src/tob.cpp
index 6a5e14d..8d34e61 100644
--- a/src/tob.cpp
+++ b/src/tob.cpp
@@ -48,11 +48,7 @@
ToB::~ToB()
{
toClear();
-<<<<<<< HEAD
// tob = NULL;
-=======
- tob = NULL;
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
delete paramset;
}
@@ -203,11 +199,7 @@
return ErrStatus::SUCCESS;
}
-<<<<<<< HEAD
#define DEBUG 0
-=======
-
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
#if 1//DEBUG
const s8* type_string[ModuleType::PROC_COUNT] = {
"none"
@@ -278,14 +270,9 @@
if (pmod->mDsp != dsp_index) continue;
-<<<<<<< HEAD
#if DEBUG
//if (PROC_FIR == pmod->mType)
printf("Module ID %d type %d %s rxnum %d txnum %d tag %d. \n",pmod->mID ,pmod->mType, type_string[pmod->mType], pmod->mRxNum,pmod->mTxNum,pmod->mTag);
-=======
-#ifdef DEBUG
- printf("Module ID %d type %d %s rxnum %d txnum %d tag %d. \n",pmod->mID ,pmod->mType, type_string[pmod->mType], pmod->mRxNum,pmod->mTxNum,pmod->mTag);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
#endif
IModule* m = CreateBaseModule(pmod->mType, pmod->mTag, mRxNum, mTxNum);
@@ -294,14 +281,6 @@
continue;
}
-<<<<<<< HEAD
-=======
-// int ddr = sram_free_space(SRAM_DDR,mem_any);
-// int ccm = sram_free_space(SRAM_L2,mem_any);
-// int l1 = sram_free_space(SRAM_L1,mem_heap);
-// printf("ddr %d ccm %d l1 %d.\n",ddr, ccm ,l1);
-
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
m->SetModuleInfo(pmod->mID ,pmod->mType, pmod->mTag);
mList.push_back(m);
@@ -312,11 +291,7 @@
// printf("Module id:%d, Tx buffer id:", pmod->mID);
for (size_t i = 0; i < mTxNum && !bOutput; i++){
-<<<<<<< HEAD
// printf("bid %d, ", mTxbufID[i]);
-=======
- printf("bid %d, ", mTxbufID[i]);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
if (mTxbufID[i] > 0) {
Frame* pcm = frames->GetFrame(mTxbufID[i]-1);
m->SetOutputChannelDataPtr(i, pcm);
@@ -326,11 +301,7 @@
nPhyInput[mPhyID[i].mIntType] = mPhyID[i].mPhyID;
m->SetInputChannelDataPtr(i, pcm);
SetRxChannelPtr(static_cast<IntDataType>(mPhyID[i].mIntType), mPhyID[i].mPhyID-1, pcm->Data());
-<<<<<<< HEAD
// printf("phy_id %d\n", mPhyID[i].mPhyID);
-=======
- printf("phy_id %d\n", mPhyID[i].mPhyID);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
}
else {
@@ -339,11 +310,7 @@
}
// printf(";Rx buffer id:");
for (size_t i = 0; i < mRxNum && !bInput; i++) {
-<<<<<<< HEAD
// printf("mID %d,bid %d\n", pmod->mID, mRxbufID[i]);
-=======
-// printf("bid %d", mRxbufID[i]);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
if (mRxbufID[i] > 0) {
Frame* pcm = frames->GetFrame(mRxbufID[i]-1 );
m->SetInputChannelDataPtr(i, pcm);
@@ -355,12 +322,8 @@
//pcm = frames->AllocFrame(); // It is not necessary to be compatible with the AXE1208 series here, because the TOP architecture is different.
m->SetOutputChannelDataPtr(i, pcm);
SetTxChannelPtr(static_cast<IntDataType>(mPhyID[i].mIntType), mPhyID[i].mPhyID-1, pcm->Data());
-<<<<<<< HEAD
// printf("mID %d,bid %d\n", pmod->mID, mPhyID[i].mPhyID-1);
// printf("phy_type %d, _id %d\n", mPhyID[i].mIntType, mPhyID[i].mPhyID);
-=======
-// printf("phy_id %d", mPhyID[i].mPhyID);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
}
else {
@@ -370,7 +333,6 @@
// printf("\n");
m->Init();
-<<<<<<< HEAD
// 从 paramset 中获取对应的参数控制函数指针
ParamCtrl_fn paramEntry = paramset->GetParamEntry( m->GetModuleType());
@@ -379,17 +341,6 @@
}
// 调用参数控制函数
u32 result = paramEntry(m, (uvoid*)pmod->mParamaddr, len);
-=======
-// paramset->GetParamEntry(m->GetModuleType())(m, (uvoid*)pmod->mParamaddr, len);
- // 获取模块类型
- u32 moduleType = m->GetModuleType();
- // 从 paramset 中获取对应的参数控制函数指针
- ParamCtrl_fn paramEntry = paramset->GetParamEntry(moduleType);
- // 获取模块参数地址
- void* paramAddr = (uvoid*)pmod->mParamaddr;
- // 调用参数控制函数
- u32 result = paramEntry(m, paramAddr, len);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
} while (size < nbytes);
@@ -448,11 +399,7 @@
{
if(processed) {
for (auto iter = mList.begin(); iter < mList.end(); iter++) {
-<<<<<<< HEAD
// if(((*iter)->GetModuleType() >= 6) && ((*iter)->GetModuleType() <= 6)) {
-=======
-// if(((*iter)->GetModuleType() >= 9) && ((*iter)->GetModuleType() <= 9)) {
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
// printf("%d ", (*iter)->GetModuleID());
(*iter)->Proc();
// }
@@ -507,13 +454,8 @@
IModule* m = mList[mModuleIndex[mID]-1];
if( m != NULL) {
-<<<<<<< HEAD
// m->Ctrl(pID, val, num);
paramset->GetCtrlEntry(m->GetModuleType())(m, pID, (s16*)val, num);
-=======
- //m->Ctrl(pID, val, num);
- paramset->GetCtrlEntry(m->GetModuleType())(m, pID, (s16*)val);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
// printf("mID:%d pID:%d val[0]:%d val[1]:%d\n",mID, pID, val[0], val[1]);
return ErrStatus::SUCCESS;
--
Gitblit v1.9.3