claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wire up value and loadflag for SL

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-21 14:20:17 -07:00
parent 0474bea6f4
commit b01217cffb
14 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.Library/DatItems/Archive.cs
View File

@@ -38,6 +38,8 @@
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

2
SabreTools.Library/DatItems/BiosSet.cs
View File

@@ -114,6 +114,8 @@ namespace SabreTools.Library.DatItems
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

2
SabreTools.Library/DatItems/Blank.cs
View File

@@ -38,6 +38,8 @@
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

51
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -115,6 +115,19 @@ namespace SabreTools.Library.DatItems
[JsonProperty("endianness")]
public string AreaEndianness { get; set; } // (big|little) "little"
/// <summary>
/// SoftwareList value associated with the item
/// </summary>
[JsonProperty("value")]
public string Value { get; set; }
/// <summary>
/// Loading flag
/// </summary>
/// TODO: Convert to Enum?
[JsonProperty("loadflag")]
public string LoadFlag { get; set; } // (load16_byte|load16_word|load16_word_swap|load32_byte|load32_word|load32_word_swap|load32_dword|load64_word|load64_word_swap|reload|fill|continue|reload_plain|ignore)
#endregion
#region Metadata information
@@ -155,6 +168,8 @@ namespace SabreTools.Library.DatItems
Field.AreaSize,
Field.AreaWidth,
Field.AreaEndianness,
Field.Value,
Field.LoadFlag,
// BiosSet
Field.BiosDescription,
@@ -295,6 +310,12 @@ namespace SabreTools.Library.DatItems
case Field.AreaEndianness:
fieldValue = AreaEndianness;
break;
case Field.Value:
fieldValue = Value;
break;
case Field.LoadFlag:
fieldValue = LoadFlag;
break;
case Field.NULL:
default:
@@ -370,6 +391,12 @@ namespace SabreTools.Library.DatItems
if (mappings.Keys.Contains(Field.AreaEndianness))
AreaEndianness = mappings[Field.AreaEndianness];
if (mappings.Keys.Contains(Field.Value))
Value = mappings[Field.Value];
if (mappings.Keys.Contains(Field.LoadFlag))
LoadFlag = mappings[Field.LoadFlag];
#endregion
}
@@ -632,6 +659,18 @@ namespace SabreTools.Library.DatItems
if (filter.AreaEndianness.MatchesNegativeSet(AreaEndianness) == true)
return false;
// Filter on softwarelist value
if (filter.Value.MatchesPositiveSet(Value) == false)
return false;
if (filter.Value.MatchesNegativeSet(Value) == true)
return false;
// Filter on load flag
if (filter.LoadFlag.MatchesPositiveSet(LoadFlag) == false)
return false;
if (filter.LoadFlag.MatchesNegativeSet(LoadFlag) == true)
return false;
#endregion
return true;
@@ -686,6 +725,12 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.AreaEndianness))
AreaEndianness = null;
if (fields.Contains(Field.Value))
Value = null;
if (fields.Contains(Field.LoadFlag))
LoadFlag = null;
#endregion
}
@@ -809,6 +854,12 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.AreaEndianness))
AreaEndianness = item.AreaEndianness;
if (fields.Contains(Field.Value))
Value = item.Value;
if (fields.Contains(Field.LoadFlag))
LoadFlag = item.LoadFlag;
#endregion
}

4
SabreTools.Library/DatItems/Disk.cs
View File

@@ -302,6 +302,8 @@ namespace SabreTools.Library.DatItems
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,
@@ -346,6 +348,8 @@ namespace SabreTools.Library.DatItems
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

2
SabreTools.Library/DatItems/Enums.cs
View File

@@ -121,6 +121,8 @@ namespace SabreTools.Library.DatItems
AreaSize,
AreaWidth,
AreaEndianness,
Value,
LoadFlag,
#endregion

2
SabreTools.Library/DatItems/Release.cs
View File

@@ -142,6 +142,8 @@ namespace SabreTools.Library.DatItems
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

2
SabreTools.Library/DatItems/Rom.cs
View File

@@ -384,6 +384,8 @@ namespace SabreTools.Library.DatItems
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,

2
SabreTools.Library/DatItems/Sample.cs
View File

@@ -38,6 +38,8 @@
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,