|
|
@@ -263,10 +263,10 @@ int equ_init_file_config(void)
|
|
|
// 比对资源表文件
|
|
|
if ((ec->rsc_version != rsc_contrast.version) || (ec->rsc_signature != rsc_contrast.signature) || (ec->rsc_length != rsc_contrast.length) || (ec->rsc_crc != rsc_contrast.crc))
|
|
|
{
|
|
|
- rt_printf("equ_version = 0x%x, rsc_version = 0x%x\r\n", ec->rsc_version, rsc_contrast.version);
|
|
|
- rt_printf("equ_signature = 0x%x, rsc_signature = 0x%x\r\n", ec->rsc_signature, rsc_contrast.signature);
|
|
|
- rt_printf("equ_length = 0x%x, rsc_length = 0x%x\r\n", ec->rsc_length, rsc_contrast.length);
|
|
|
- rt_printf("equ_crc = 0x%x, rsc_crc = 0x%x\r\n", ec->rsc_crc, rsc_contrast.crc);
|
|
|
+ dp_err_nt_rt("equ_version = 0x%x, rsc_version = 0x%x\r\n", ec->rsc_version, rsc_contrast.version);
|
|
|
+ dp_err_nt_rt("equ_signature = 0x%x, rsc_signature = 0x%x\r\n", ec->rsc_signature, rsc_contrast.signature);
|
|
|
+ dp_err_nt_rt("equ_length = 0x%x, rsc_length = 0x%x\r\n", ec->rsc_length, rsc_contrast.length);
|
|
|
+ dp_err_nt_rt("equ_crc = 0x%x, rsc_crc = 0x%x\r\n", ec->rsc_crc, rsc_contrast.crc);
|
|
|
|
|
|
rt_free(buf);
|
|
|
return -6;
|
|
|
@@ -317,7 +317,7 @@ int equ_init_file_config(void)
|
|
|
g_sw_ac_num[SWITCH_NUM_MAX]++; // 总配置数
|
|
|
}
|
|
|
|
|
|
- rt_printf("线路开关数量:程序=%d,配置=%d.\r\n", SWITCH_NUM_MAX, g_sw_num);
|
|
|
+ dp_info_nt_rt("线路开关数量:程序 = %d, 配置 = %d.\r\n", SWITCH_NUM_MAX, g_sw_num);
|
|
|
if (g_sw_num > SWITCH_NUM_MAX)
|
|
|
{
|
|
|
return -7;
|
|
|
@@ -428,7 +428,7 @@ int equ_config_check(void)
|
|
|
|
|
|
b_err = true;
|
|
|
name = equ_info_brd_type(g_board_info[i].type);
|
|
|
- rt_printf("通道配置错误:slot=%d, 当前类型=%s, 应该配成%s\r\n", i, (name == NULL) ? "无" : name, equ_info_brd_type(bank_cfg[i]));
|
|
|
+ dp_err_nt_rt("通道配置错误:slot=%d, 当前类型=%s, 应该配成%s\r\n", i, (name == NULL) ? "无" : name, equ_info_brd_type(bank_cfg[i]));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -455,7 +455,7 @@ int equ_init(void)
|
|
|
// 得到装置地址和硬件版本
|
|
|
g_slot_addr = gpio_get_addr();
|
|
|
g_hw_version = gpio_get_version();
|
|
|
- rt_printf("g_hw_version=0x%02x, g_slot_addr=0x%02x.\r\n", g_hw_version, g_slot_addr);
|
|
|
+ dp_info_nt_rt("g_hw_version = 0x%02x, g_slot_addr = 0x%02x.\r\n", g_hw_version, g_slot_addr);
|
|
|
|
|
|
// 装置板卡资源
|
|
|
ret = equ_init_file_brd_res();
|
|
|
@@ -492,12 +492,14 @@ int equ_init(void)
|
|
|
g_board_info[i].do_num = _equ_get_do_num(i);
|
|
|
g_board_info[i].ac_num = _equ_get_ac_num(i);
|
|
|
|
|
|
+#if (0) /* 打印数据测试 */
|
|
|
if (0 != g_board_info[i].di_num)
|
|
|
dp_info_nt("g_board_info[%d].di_num = %d ", i, g_board_info[i].di_num);
|
|
|
if (0 != g_board_info[i].do_num)
|
|
|
dp_info_nt("g_board_info[%d].do_num = %d ", i, g_board_info[i].do_num);
|
|
|
if (0 != g_board_info[i].ac_num)
|
|
|
dp_info_nt("g_board_info[%d].ac_num = %d ", i, g_board_info[i].ac_num);
|
|
|
+#endif
|
|
|
|
|
|
if ((g_board_info[i].type < BOARD_TYPE_GROUP_RS) && (g_board_info[i].di_num || g_board_info[i].do_num || g_board_info[i].ac_num))
|
|
|
{
|