Skip to content

P
proview
Commit ef20fe50 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Merge commit 'pwrutv_x470/master'

parents 81d2a9e0 182bb5ca
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 24 deletions
src/lib/co/src/co_platform.h
View file @ ef20fe50
...@@ -111,11 +111,14 @@ typedef enum { ...@@ -111,11 +111,14 @@ typedef enum {
co_eHW_VAX, co_eHW_VAX,
co_eHW_Alpha, co_eHW_Alpha,
co_eHW_PPC, co_eHW_PPC,
co_eHW_x86_64,
co_eHW_ co_eHW_
} co_eHW; } co_eHW;
#if defined(HW_X86) #if defined(HW_X86)
# define co_dHostHW co_eHW_x86 # define co_dHostHW co_eHW_x86
#elif defined(HW_X86_64)
# define co_dHostHW co_eHW_x86_64
#elif defined(HW_VAX) #elif defined(HW_VAX)
# define co_dHostHW co_eHW_VAX # define co_dHostHW co_eHW_VAX
#elif defined(HW_AXP) #elif defined(HW_AXP)
......
src/lib/dtt/src/dtt_appl_rttsys_p4.dtt
View file @ ef20fe50
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
32 0 0 113 32 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 32 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 119 120 110 120 120 120 120 120 120 120 120 120 120 118 0 0 0 0 32 32 0 0 119 120 110 120 120 120 120 120 120 120 120 120 120 118 0 0 0 0 32
32 0 0 113 79 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 79 113 0 0 0 32 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 115 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 115 113 0 0 0 32 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 0 113 0 0 0 32 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 0 113 0 0 0 32 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32 32 0 0 113 0 113 0 0 0 0 0 0 0 0 0 0 113 0 0 0 0 32
32 0 0 119 120 110 120 120 120 120 120 120 120 120 120 120 118 0 0 0 0 32 32 0 0 119 120 110 120 120 120 120 120 120 120 120 120 120 118 0 0 0 0 32
...@@ -184,7 +184,7 @@ Parameter SHOW_NODES_OS1 ...@@ -184,7 +184,7 @@ Parameter SHOW_NODES_OS1
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -199,7 +199,7 @@ Parameter SHOW_NODES_HW1 ...@@ -199,7 +199,7 @@ Parameter SHOW_NODES_HW1
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -304,7 +304,7 @@ Parameter SHOW_NODES_OS2 ...@@ -304,7 +304,7 @@ Parameter SHOW_NODES_OS2
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -319,7 +319,7 @@ Parameter SHOW_NODES_HW2 ...@@ -319,7 +319,7 @@ Parameter SHOW_NODES_HW2
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -424,7 +424,7 @@ Parameter SHOW_NODES_OS3 ...@@ -424,7 +424,7 @@ Parameter SHOW_NODES_OS3
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -439,7 +439,7 @@ Parameter SHOW_NODES_HW3 ...@@ -439,7 +439,7 @@ Parameter SHOW_NODES_HW3
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -544,7 +544,7 @@ Parameter SHOW_NODES_OS4 ...@@ -544,7 +544,7 @@ Parameter SHOW_NODES_OS4
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -559,7 +559,7 @@ Parameter SHOW_NODES_HW4 ...@@ -559,7 +559,7 @@ Parameter SHOW_NODES_HW4
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -664,7 +664,7 @@ Parameter SHOW_NODES_OS5 ...@@ -664,7 +664,7 @@ Parameter SHOW_NODES_OS5
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -679,7 +679,7 @@ Parameter SHOW_NODES_HW5 ...@@ -679,7 +679,7 @@ Parameter SHOW_NODES_HW5
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -784,7 +784,7 @@ Parameter SHOW_NODES_OS6 ...@@ -784,7 +784,7 @@ Parameter SHOW_NODES_OS6
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -799,7 +799,7 @@ Parameter SHOW_NODES_HW6 ...@@ -799,7 +799,7 @@ Parameter SHOW_NODES_HW6
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -904,7 +904,7 @@ Parameter SHOW_NODES_OS7 ...@@ -904,7 +904,7 @@ Parameter SHOW_NODES_OS7
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -919,7 +919,7 @@ Parameter SHOW_NODES_HW7 ...@@ -919,7 +919,7 @@ Parameter SHOW_NODES_HW7
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1024,7 +1024,7 @@ Parameter SHOW_NODES_OS8 ...@@ -1024,7 +1024,7 @@ Parameter SHOW_NODES_OS8
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1039,7 +1039,7 @@ Parameter SHOW_NODES_HW8 ...@@ -1039,7 +1039,7 @@ Parameter SHOW_NODES_HW8
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1144,7 +1144,7 @@ Parameter SHOW_NODES_OS9 ...@@ -1144,7 +1144,7 @@ Parameter SHOW_NODES_OS9
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1159,7 +1159,7 @@ Parameter SHOW_NODES_HW9 ...@@ -1159,7 +1159,7 @@ Parameter SHOW_NODES_HW9
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1264,7 +1264,7 @@ Parameter SHOW_NODES_OS10 ...@@ -1264,7 +1264,7 @@ Parameter SHOW_NODES_OS10
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 4 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
...@@ -1279,7 +1279,7 @@ Parameter SHOW_NODES_HW10 ...@@ -1279,7 +1279,7 @@ Parameter SHOW_NODES_HW10
Text/Dualpar "" Text/Dualpar ""
Privileges NO Privileges NO
Outputflags Outputflags
Characters 3 Characters 5
Decimals 0 Decimals 0
MaxLimit 0.000000 MaxLimit 0.000000
MinLimit 0.000000 MinLimit 0.000000
......
src/lib/dtt/src/dtt_rttsys.c
View file @ ef20fe50
...@@ -1069,6 +1069,7 @@ int RTTSYS_SHOW_NODES( menu_ctx ctx, ...@@ -1069,6 +1069,7 @@ int RTTSYS_SHOW_NODES( menu_ctx ctx,
/* Hw */ /* Hw */
switch ( np->hw) { switch ( np->hw) {
case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break; case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break;
case co_eHW_x86_64: strcpy( menu_ptr->value_ptr, "x86_64"); break;
case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break; case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break;
case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break; case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break;
case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break; case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break;
...@@ -1233,6 +1234,7 @@ int RTTSYS_SHOW_NODES( menu_ctx ctx, ...@@ -1233,6 +1234,7 @@ int RTTSYS_SHOW_NODES( menu_ctx ctx,
/* Hw */ /* Hw */
switch ( np->hw) { switch ( np->hw) {
case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break; case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break;
case co_eHW_x86_64: strcpy( menu_ptr->value_ptr, "x86_64"); break;
case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break; case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break;
case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break; case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break;
case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break; case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break;
...@@ -11765,6 +11767,7 @@ int RTTSYS_QCOM_NODES( menu_ctx ctx, ...@@ -11765,6 +11767,7 @@ int RTTSYS_QCOM_NODES( menu_ctx ctx,
/* Hw */ /* Hw */
switch ( np->hw) { switch ( np->hw) {
case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break; case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break;
case co_eHW_x86_64: strcpy( menu_ptr->value_ptr, "x86_64"); break;
case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break; case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break;
case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break; case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break;
case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break; case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break;
...@@ -11924,6 +11927,7 @@ int RTTSYS_QCOM_NODES( menu_ctx ctx, ...@@ -11924,6 +11927,7 @@ int RTTSYS_QCOM_NODES( menu_ctx ctx,
/* Hw */ /* Hw */
switch ( np->hw) { switch ( np->hw) {
case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break; case co_eHW_x86: strcpy( menu_ptr->value_ptr, "x86"); break;
case co_eHW_x86_64: strcpy( menu_ptr->value_ptr, "x86_64"); break;
case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break; case co_eHW_68k: strcpy( menu_ptr->value_ptr, "68k"); break;
case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break; case co_eHW_VAX: strcpy( menu_ptr->value_ptr, "VAX"); break;
case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break; case co_eHW_Alpha: strcpy( menu_ptr->value_ptr, "AXP"); break;
......
xtt/lib/xtt/src/xtt_xnav_tables.cpp
View file @ ef20fe50
...@@ -276,6 +276,7 @@ int XNav::show_nethandler() ...@@ -276,6 +276,7 @@ int XNav::show_nethandler()
// Os // Os
switch ( np->hw) { switch ( np->hw) {
case co_eHW_x86: strcpy( t.elem[t.elem_cnt].fix_str, "x86"); break; case co_eHW_x86: strcpy( t.elem[t.elem_cnt].fix_str, "x86"); break;
case co_eHW_x86_64: strcpy( t.elem[t.elem_cnt].fix_str, "x86_64"); break;
case co_eHW_68k: strcpy( t.elem[t.elem_cnt].fix_str, "68k"); break; case co_eHW_68k: strcpy( t.elem[t.elem_cnt].fix_str, "68k"); break;
case co_eHW_VAX: strcpy( t.elem[t.elem_cnt].fix_str, "VAX"); break; case co_eHW_VAX: strcpy( t.elem[t.elem_cnt].fix_str, "VAX"); break;
case co_eHW_Alpha: strcpy( t.elem[t.elem_cnt].fix_str, "AXP"); break; case co_eHW_Alpha: strcpy( t.elem[t.elem_cnt].fix_str, "AXP"); break;
...@@ -289,6 +290,7 @@ int XNav::show_nethandler() ...@@ -289,6 +290,7 @@ int XNav::show_nethandler()
case co_eOS_ELN: strcat( t.elem[t.elem_cnt].fix_str, "_ELN"); break; case co_eOS_ELN: strcat( t.elem[t.elem_cnt].fix_str, "_ELN"); break;
default: ; default: ;
} }
t.elem[t.elem_cnt].fix_str[11] = 0;
t.elem[t.elem_cnt++].type_id = xnav_eType_FixStr; t.elem[t.elem_cnt++].type_id = xnav_eType_FixStr;
if (np == gdbroot->my_node) if (np == gdbroot->my_node)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7