Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
6e5f95d1
Commit
6e5f95d1
authored
Oct 29, 2016
by
yoogx
Browse files
* Fixes for XtratuM 4.2.1 XML Schema
parent
6ded79e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/backends/ocarina-backends-xtratum_conf-hardware_description.adb
View file @
6e5f95d1
...
...
@@ -166,42 +166,42 @@ package body Ocarina.Backends.Xtratum_Conf.Hardware_Description is
Append_Node_To_List
(
Hw_Desc_Node
,
XTN
.
Subitems
(
Current_XML_Node
));
Processor_Node
:=
Make_XML_Node
(
"ProcessorTable"
);
-- First, create the <MemoryLayout> section of the hardware
-- description of the system.
Append_Node_To_List
(
Processor_Node
,
XTN
.
Subitems
(
Hw_Desc_Node
)
);
Memory_Node
:=
Make_XML_Node
(
"MemoryLayout"
);
Current_XML_Node
:=
Processor
_Node
;
Append_Node_To_List
(
Memory_Node
,
XTN
.
Subitems
(
Hw_Desc
_Node
))
;
-- First, create the <ProcessorTable> section of the hardware
-- description of the system.
Current_XML_Node
:=
Memory_Node
;
if
not
AINU
.
Is_Empty
(
Subcomponents
(
E
))
then
S
:=
First_Node
(
Subcomponents
(
E
));
while
Present
(
S
)
loop
-- Visit the component instance corresponding to the
-- subcomponent S.
if
AINU
.
Is_
Process
or
(
Corresponding_Instance
(
S
))
then
if
AINU
.
Is_
Mem
or
y
(
Corresponding_Instance
(
S
))
then
Visit
(
Corresponding_Instance
(
S
));
end
if
;
S
:=
Next_Node
(
S
);
end
loop
;
end
if
;
-- Then, create the <
MemoryLayout
> section of the hardware
-- Then, create the <
ProcessorTable
> section of the hardware
-- description of the system.
Mem
or
y
_Node
:=
Make_XML_Node
(
"
MemoryLayout
"
);
Process
or_Node
:=
Make_XML_Node
(
"
ProcessorTable
"
);
Append_Node_To_List
(
Mem
or
y
_Node
,
XTN
.
Subitems
(
Hw_Desc_Node
));
Append_Node_To_List
(
Process
or_Node
,
XTN
.
Subitems
(
Hw_Desc_Node
));
Current_XML_Node
:=
Mem
or
y
_Node
;
Current_XML_Node
:=
Process
or_Node
;
if
not
AINU
.
Is_Empty
(
Subcomponents
(
E
))
then
S
:=
First_Node
(
Subcomponents
(
E
));
while
Present
(
S
)
loop
-- Visit the component instance corresponding to the
-- subcomponent S.
if
AINU
.
Is_
Mem
or
y
(
Corresponding_Instance
(
S
))
then
if
AINU
.
Is_
Process
or
(
Corresponding_Instance
(
S
))
then
Visit
(
Corresponding_Instance
(
S
));
end
if
;
S
:=
Next_Node
(
S
);
...
...
@@ -291,7 +291,7 @@ package body Ocarina.Backends.Xtratum_Conf.Hardware_Description is
P
:=
Make_Defining_Identifier
(
Name_Find
);
Set_Str_To_Name_Buffer
(
Unsigned_Long_Long
'
Image
(
Frequency
.
S
)
&
Frequency
.
F
'
Img
);
(
Unsigned_Long_Long
'
Image
(
Frequency
.
S
)
&
"MHz"
);
Q
:=
Make_Defining_Identifier
(
Remove_Char
(
Name_Find
,
' '
));
Append_Node_To_List
...
...
src/backends/ocarina-backends-xtratum_conf-partition_table.adb
View file @
6e5f95d1
...
...
@@ -210,7 +210,7 @@ package body Ocarina.Backends.Xtratum_Conf.Partition_Table is
Set_Str_To_Name_Buffer
(
"flags"
);
P
:=
Make_Defining_Identifier
(
Name_Find
);
Set_Str_To_Name_Buffer
(
"system
boot
fp"
);
Set_Str_To_Name_Buffer
(
"system fp"
);
Q
:=
Make_Defining_Identifier
(
Name_Find
);
Append_Node_To_List
(
Make_Assignement
(
P
,
Q
),
...
...
@@ -309,11 +309,12 @@ package body Ocarina.Backends.Xtratum_Conf.Partition_Table is
Append_Node_To_List
(
Make_Assignement
(
P
,
Q
),
XTN
.
Items
(
Temporal_Req_Node
));
Append_Node_To_List
(
Temporal_Req_Node
,
XTN
.
Subitems
(
Partition_Node
));
end
if
;
end
;
Append_Node_To_List
(
Temporal_Req_Node
,
XTN
.
Subitems
(
Partition_Node
));
-- Now, handle the ports of the partition.
if
Has_Ports
(
E
)
then
...
...
src/backends/ocarina-backends-xtratum_conf-xm_hypervisor.adb
View file @
6e5f95d1
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2011-201
5
ESA & ISAE. --
-- Copyright (C) 2011-201
6
ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- --
...
...
@@ -174,8 +174,6 @@ package body Ocarina.Backends.Xtratum_Conf.Xm_Hypervisor is
S
:
Node_Id
;
Xm_Hypervisor_Node
:
Node_Id
;
Memory_Area_Node
:
Node_Id
;
Area_Node
:
Node_Id
;
-- Associated_Memory : Node_Id;
P
:
Node_Id
;
Q
:
Node_Id
;
begin
...
...
@@ -202,41 +200,22 @@ package body Ocarina.Backends.Xtratum_Conf.Xm_Hypervisor is
(
Make_Assignement
(
P
,
Q
),
XTN
.
Items
(
Xm_Hypervisor_Node
));
-- Create the PhysicalMemoryArea
s
node associated
-- to the
H
MHypervisor node.
Memory_Area_Node
:=
Make_XML_Node
(
"PhysicalMemoryArea
s
"
);
-- Create the PhysicalMemoryArea node associated
-- to the
X
MHypervisor node.
Memory_Area_Node
:=
Make_XML_Node
(
"PhysicalMemoryArea"
);
Append_Node_To_List
(
Memory_Area_Node
,
XTN
.
Subitems
(
Xm_Hypervisor_Node
));
-- Create the PhysicalMemoryArea node associated
-- to the PhysicalMemoryAreas node.
Area_Node
:=
Make_XML_Node
(
"Area"
);
Set_Str_To_Name_Buffer
(
"start"
);
P
:=
Make_Defining_Identifier
(
Name_Find
);
Set_Str_To_Name_Buffer
(
"0x40000000"
);
Q
:=
Make_Defining_Identifier
(
Name_Find
);
-- Q := Make_Literal
-- (XV.New_Numeric_Value
--- (Get_Integer_Property
-- (Associated_Memory, "base_address"), 0, 10));
Append_Node_To_List
(
Make_Assignement
(
P
,
Q
),
XTN
.
Items
(
Area_Node
));
Set_Str_To_Name_Buffer
(
"size"
);
P
:=
Make_Defining_Identifier
(
Name_Find
);
Set_Str_To_Name_Buffer
(
"512KB"
);
Q
:=
Make_Defining_Identifier
(
Name_Find
);
-- Q := Make_Literal
-- (XV.New_Numeric_Value
-- (Get_Integer_Property
-- (Associated_Memory, "byte_count"), 0, 10));
Append_Node_To_List
(
Make_Assignement
(
P
,
Q
),
XTN
.
Items
(
Area_Node
));
Append_Node_To_List
(
Area_Node
,
XTN
.
Subitems
(
Memory_Area_Node
));
Append_Node_To_List
(
Make_Assignement
(
P
,
Q
),
XTN
.
Items
(
Memory_Area_Node
));
Append_Node_To_List
(
Xm_Hypervisor_Node
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment