refactor(app): 去掉 App/protocol 层,104 迁入 App/iec60870/104_port

IEC 60870 是标准族(含 104/101),原 App/protocol/ 把它拆成
iec60870/(vendor 核心)+ iec104/(我方适配)两棵同级树,多一层且
看不出「104 只维护一个」。现按标准族收口:

  App/protocol/iec60870        -> App/iec60870
  App/protocol/iec104          -> App/iec60870/104_port
  App/protocol/{README.md,.gitkeep}  删除
  App/protocol/iec104/iec104_asdu.h  删除(零 include / 零注册的孤儿)

vendor 子树(104/ common/ examples/)逐字节未改:91 个 R100 重命名、
git diff --cached -M 后 0 insertions / 0 deletions,另按字节直比 89/89
一致;UPSTREAM.sha256 差异集仍等于既有 17 项受控差异,非篡改。
适配层只改注释里的路径字样,无逻辑行。

门禁配套:
- coding-standard 的 exclude 不能写祖先 App/iec60870/——rename_ref 机械
  改出的祖先形态会把 2,191 行适配层一起豁免掉。改为三条精确前缀
  common/ 104/ examples/,适配层 11/11 回到受检;vendor 直调脚本仍报
  88 处违规而钩子 Skipped,证明确实由 exclude 生效而非空跑。
- check_registration 的 KNOWN_GAPS 键与理由文本同步到新路径。

验证:Keil 0 errors 0 warnings(Code=367464 RO-data=48492
RW-data=2288 ZI-data=173544),构建日志与 .d 依赖证明 5 个适配 .o
真被编入;模拟器 0 警告并跑通 iec104-tcp 13/13 真实 TCP 回环;
pre-commit 25 Passed / 0 Failed;doc-links 30 处问题全在
IEC60870-Slave/ 供应商快照,我方文档零新增。

顺带删掉仓根误入库且零引用的 _all_hook.txt 与 _scope.txt。
This commit is contained in:
2026-11-18 14:15:10 +08:00
parent 263b00277e
commit c0cef2fca0
167 changed files with 29172 additions and 7007 deletions
+17 -17
View File
@@ -176,7 +176,7 @@
"lines_covered": 410,
"lines_valid": 413
},
"App/protocol/iec104/iec104_asdu.c": {
"App/iec60870/104_port/iec104_asdu.c": {
"func_rate": 1.0,
"funcs_covered": 10,
"funcs_valid": 10,
@@ -184,7 +184,7 @@
"lines_covered": 96,
"lines_valid": 103
},
"App/protocol/iec104/iec104_comm.c": {
"App/iec60870/104_port/iec104_comm.c": {
"func_rate": 1.0,
"funcs_covered": 7,
"funcs_valid": 7,
@@ -192,7 +192,7 @@
"lines_covered": 49,
"lines_valid": 50
},
"App/protocol/iec104/iec104_link.c": {
"App/iec60870/104_port/iec104_link.c": {
"func_rate": 1.0,
"funcs_covered": 23,
"funcs_valid": 23,
@@ -200,7 +200,7 @@
"lines_covered": 367,
"lines_valid": 405
},
"App/protocol/iec104/iec104_pts.c": {
"App/iec60870/104_port/iec104_pts.c": {
"func_rate": 0.9524,
"funcs_covered": 20,
"funcs_valid": 21,
@@ -536,10 +536,10 @@
"App/algo/run_par.c": 148,
"App/algo/sample_ring.c": 41,
"App/cfg/cfg_file.c": 754,
"App/protocol/iec104/iec104_asdu.c": 103,
"App/protocol/iec104/iec104_comm.c": 50,
"App/protocol/iec104/iec104_link.c": 405,
"App/protocol/iec104/iec104_pts.c": 255
"App/iec60870/104_port/iec104_asdu.c": 103,
"App/iec60870/104_port/iec104_comm.c": 50,
"App/iec60870/104_port/iec104_link.c": 405,
"App/iec60870/104_port/iec104_pts.c": 255
},
"lines_total": 2499,
"ok": true
@@ -737,7 +737,7 @@
"soe": {
"files": {
"App/log/soe_rec.c": 87,
"App/protocol/iec104/iec104_asdu.c": 103
"App/iec60870/104_port/iec104_asdu.c": 103
},
"lines_total": 190,
"ok": true
@@ -863,10 +863,10 @@
"App/log/soe_rec.c",
"App/log/soe_store.c",
"App/log/sys_log_mcu.c",
"App/protocol/iec104/iec104_asdu.c",
"App/protocol/iec104/iec104_comm.c",
"App/protocol/iec104/iec104_link.c",
"App/protocol/iec104/iec104_pts.c",
"App/iec60870/104_port/iec104_asdu.c",
"App/iec60870/104_port/iec104_comm.c",
"App/iec60870/104_port/iec104_link.c",
"App/iec60870/104_port/iec104_pts.c",
"App/sync/time_sntp.c",
"App/sync/time_sync.c",
"App/task/iec104_serv.c",
@@ -1094,7 +1094,7 @@
},
{
"code_lines": 62,
"path": "App/protocol/iec104/iec104_asdu.h"
"path": "App/iec60870/104_port/iec104_asdu.h"
},
{
"code_lines": 55,
@@ -1102,7 +1102,7 @@
},
{
"code_lines": 55,
"path": "App/protocol/iec104/iec104_link.h"
"path": "App/iec60870/104_port/iec104_link.h"
},
{
"code_lines": 55,
@@ -1230,7 +1230,7 @@
},
{
"code_lines": 31,
"path": "App/protocol/iec104/iec104_pts.h"
"path": "App/iec60870/104_port/iec104_pts.h"
},
{
"code_lines": 31,
@@ -1310,7 +1310,7 @@
},
{
"code_lines": 23,
"path": "App/protocol/iec104/iec104_comm.h"
"path": "App/iec60870/104_port/iec104_comm.h"
},
{
"code_lines": 22,