commit 3c8783529b999aac9846a84eb9e72f3259b7f7cb
author Lawrence Tang <lawrence.tang@arm.com> Fri Jul 08 14:04:50 2022 +0100
committer Lawrence Tang <lawrence.tang@arm.com> Fri Jul 08 14:04:50 2022 +0100
tree 56ea1a9e43d02b6c0b86d5efe56201fb141fb2b8
parent f0f95574276269bfe4b60cab00ed81a61fa4299b

Add JSON specification of main structures.

cper-parse.c

diff --git a/cper-parse.c b/cper-parse.c
index 4af39d8..39faff6 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -94,7 +94,7 @@
 
     //Error severity (with interpreted string version).
     json_object* error_severity = json_object_new_object();
-    json_object_object_add(error_severity, "code", json_object_new_int(header->ErrorSeverity));
+    json_object_object_add(error_severity, "code", json_object_new_uint64(header->ErrorSeverity));
     json_object_object_add(error_severity, "name", json_object_new_string(severity_to_string(header->ErrorSeverity)));
     json_object_object_add(header_ir, "severity", error_severity);
 
@@ -103,7 +103,7 @@
     json_object_object_add(header_ir, "validationBits", validation_bits);
 
     //Total length of the record (including headers) in bytes.
-    json_object_object_add(header_ir, "recordLength", json_object_new_int(header->RecordLength));
+    json_object_object_add(header_ir, "recordLength", json_object_new_uint64(header->RecordLength));
 
     //If a timestamp exists according to validation bits, then add it.
     if (header->ValidationBits & 0b10)
@@ -190,7 +190,7 @@
     json_object_object_add(header_ir, "flags", flags);
 
     //Persistence information. Outside the scope of specification, so just a uint32 here.
-    json_object_object_add(header_ir, "persistenceInformation", json_object_new_uint64(header->PersistenceInfo));
+    json_object_object_add(header_ir, "persistenceInfo", json_object_new_uint64(header->PersistenceInfo));
     return header_ir;
 }
 
@@ -200,16 +200,16 @@
     json_object* section_descriptor_ir = json_object_new_object();
 
     //The offset of the section from the base of the record header, length.
-    json_object_object_add(section_descriptor_ir, "sectionOffset", json_object_new_int(section_descriptor->SectionOffset));
-    json_object_object_add(section_descriptor_ir, "sectionLength", json_object_new_int(section_descriptor->SectionLength));
+    json_object_object_add(section_descriptor_ir, "sectionOffset", json_object_new_uint64(section_descriptor->SectionOffset));
+    json_object_object_add(section_descriptor_ir, "sectionLength", json_object_new_uint64(section_descriptor->SectionLength));
 
     //Revision.
     json_object_object_add(section_descriptor_ir, "revision", revision_to_ir(section_descriptor->Revision));
 
     //Validation bits.
     json_object* validation_bits = json_object_new_object();
-    json_object_object_add(validation_bits, "fruID", json_object_new_boolean(section_descriptor->SecValidMask & 0b1));
-    json_object_object_add(validation_bits, "fruString", json_object_new_boolean((section_descriptor->SecValidMask & 0b10) >> 1));
+    json_object_object_add(validation_bits, "fruIDValid", json_object_new_boolean(section_descriptor->SecValidMask & 0b1));
+    json_object_object_add(validation_bits, "fruStringValid", json_object_new_boolean((section_descriptor->SecValidMask & 0b10) >> 1));
     json_object_object_add(section_descriptor_ir, "validationBits", validation_bits);
 
     //Flag bits.
@@ -280,7 +280,7 @@
 
     //Section severity.
     json_object* section_severity = json_object_new_object();
-    json_object_object_add(section_severity, "code", json_object_new_int(section_descriptor->Severity));
+    json_object_object_add(section_severity, "code", json_object_new_uint64(section_descriptor->Severity));
     json_object_object_add(section_severity, "name", json_object_new_string(severity_to_string(section_descriptor->Severity)));
     json_object_object_add(section_descriptor_ir, "severity", section_severity);