From 8445c54f01777513912d4c6d36c28e92a0ff33a0 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 18 九月 2025 14:40:53 +0800
Subject: [PATCH] 首轮测试代码提交

---
 src/messageproc.cpp |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/src/messageproc.cpp b/src/messageproc.cpp
index ae301d5..f007cb3 100644
--- a/src/messageproc.cpp
+++ b/src/messageproc.cpp
@@ -47,7 +47,11 @@
 	int data_len;
 
 	ToB* tob = ToB::GetInstance();
+<<<<<<< HEAD
 	u16 LevelCnt = tob->GetLevels(Levels);	//918 levels
+=======
+	u16 LevelCnt = tob->GetLevels(Levels);	//864 levels
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 	u32 msgLen = LevelCnt * sizeof(*Levels);
 	int Packegs = (msgLen+MSG_DATA_LEN-1)/MSG_DATA_LEN;
 
@@ -98,7 +102,11 @@
 
 		data_num = (data_num - sizeof(struct ParamCtrl))/sizeof(s16);
 //		ptr->mid = var.pscene->get_module_id(ptr->mid, type, ptr->cmd) ;
+<<<<<<< HEAD
 //		printf("mID:%d pID:%d val[0]:%d val[1]:%d\n",ptr->mid, ptr->cmd, data[0], data[1]);
+=======
+
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 		tob->toCtrl(ptr->mid, ptr->cmd, data, data_num);
 	}
 
@@ -139,14 +147,23 @@
 				var.TopoStatus = PRESET_STA::PRESET_ERR;
 			}
 			else if(tob){
+<<<<<<< HEAD
 				int preset_size = sizeof(tag_parameters); // 45128 + sizeof(tag_fir) * MAX_OUTPUT_NUM;	 // size + FIR
 				u8* content = (u8*)sram_malloc(SRAM_DDR, mem_any, preset_size);
+=======
+				u8* content = (u8*)sram_malloc(SRAM_DDR, mem_any, 45128);//45*1024);
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 				s32 size ;
 
 				tob->toClear();
 
 				var.pscene->update_module();
 				size = var.pscene->convert_to_bin(content);
+<<<<<<< HEAD
+=======
+
+				tob->toClear();
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 				tob->toAnalysis(content, size);
 
 				sram_free(SRAM_DDR, content);
@@ -159,6 +176,22 @@
 
 	return 0;
 }
+
+/*void Message::param_init(ptag_device_config pDevCfg)
+{
+	pDevCfg->dual_dsp = 0;
+	pDevCfg->dsp_index = 0;
+	pDevCfg->local_rx_num = 16;
+	pDevCfg->local_tx_num = 16;
+	pDevCfg->dante_rx_num = 16;
+	pDevCfg->dante_tx_num = 16;
+	pDevCfg->external_clock = 1;
+	pDevCfg->scene_size = 1000;
+	pDevCfg->level_num = 10;
+	pDevCfg->modulelist = 9;
+	pDevCfg->hardware_type = 1;
+
+}*/
 
 s32 Message::HandshakeMessageProcess(MSG* pmsg)
 {
@@ -176,9 +209,15 @@
 		}
 
 //		param_init(device_config);
+<<<<<<< HEAD
 		hw_adapter_t* _adapter = new tg_hw_adapter_t(device_config->dual_dsp, device_config->dsp_index
 							,device_config->local_rx_num, device_config->local_tx_num
 							,device_config->dante_rx_num, device_config->dante_tx_num);
+=======
+		hw_adapter_t* _adapter = new tg_hw_adapter_t(device_config->dual_dsp,device_config->dsp_index
+							,device_config->local_rx_num,device_config->local_tx_num
+							,device_config->dante_rx_num,device_config->dante_tx_num);
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 		var.pscene = new(SRAM_DDR) tgScene(_adapter);
 
 		_adapter->config_board(&dspconfig);

--
Gitblit v1.9.3