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 | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/scene.cpp b/src/scene.cpp
index 603de68..e8618b9 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -139,10 +139,7 @@
for(j = 0 ; j< ninports ;j ++, phy_id++) {
phy_id->mIntType = 0;
phy_id->mPhyID = hw_adapter->get_physical_channel(1, rxBufID[j]-1);
-<<<<<<< HEAD
// printf("PhyID:%d\n", phy_id->mPhyID);
-=======
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
size += ninports*sizeof(PhyPort);
}
--
Gitblit v1.9.3