mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
[Listxml, SoftwareList] Fix unused names, add device_ref, slotoption reading
This commit is contained in:
Matt Nadareski
@@ -58,7 +58,6 @@ namespace SabreTools.Library.DatFiles
|
|||||||
bool remUnicode)
|
bool remUnicode)
|
||||||
{
|
{
|
||||||
// All XML-derived DATs share a lot in common so it just calls one implementation
|
// All XML-derived DATs share a lot in common so it just calls one implementation
|
||||||
// TODO: Use the following implementation instead of passing to Logiqx
|
|
||||||
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
|
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -90,8 +89,8 @@ namespace SabreTools.Library.DatFiles
|
|||||||
case "mame":
|
case "mame":
|
||||||
Name = (String.IsNullOrWhiteSpace(Name) ? xtr.GetAttribute("build") : Name);
|
Name = (String.IsNullOrWhiteSpace(Name) ? xtr.GetAttribute("build") : Name);
|
||||||
Description = (String.IsNullOrWhiteSpace(Description) ? Name : Name);
|
Description = (String.IsNullOrWhiteSpace(Description) ? Name : Name);
|
||||||
// string debug = xtr.GetAttribute("debug"); // (yes|no) "no"
|
// string mame_debug = xtr.GetAttribute("debug"); // (yes|no) "no"
|
||||||
// string mameconfig = xtr.GetAttribute("mameconfig"); CDATA
|
// string mame_mameconfig = xtr.GetAttribute("mameconfig"); CDATA
|
||||||
xtr.Read();
|
xtr.Read();
|
||||||
break;
|
break;
|
||||||
// Handle M1 DATs since they're 99% the same as a SL DAT
|
// Handle M1 DATs since they're 99% the same as a SL DAT
|
||||||
@@ -298,7 +297,11 @@ namespace SabreTools.Library.DatFiles
|
|||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "device_ref":
|
case "device_ref":
|
||||||
machine.Devices.Add(reader.ReadElementContentAsString());
|
string device_ref_name = reader.GetAttribute("name");
|
||||||
|
if (!machine.Devices.Contains(device_ref_name))
|
||||||
|
{
|
||||||
|
machine.Devices.Add(device_ref_name);
|
||||||
|
}
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
@@ -322,170 +325,167 @@ namespace SabreTools.Library.DatFiles
|
|||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "chip":
|
case "chip":
|
||||||
// string name = reader.GetAttribute("name");
|
// string chip_name = reader.GetAttribute("name");
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string chip_tag = reader.GetAttribute("tag");
|
||||||
// string type = reader.GetAttribute("type"); // (cpu|audio)
|
// string chip_type = reader.GetAttribute("type"); // (cpu|audio)
|
||||||
// string clock = reader.GetAttribute("clock");
|
// string chip_clock = reader.GetAttribute("clock");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "display":
|
case "display":
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string display_tag = reader.GetAttribute("tag");
|
||||||
// string type = reader.GetAttribute("type"); // (raster|vector|lcd|svg|unknown)
|
// string display_type = reader.GetAttribute("type"); // (raster|vector|lcd|svg|unknown)
|
||||||
// string rotate = reader.GetAttribute("rotate"); // (0|90|180|270)
|
// string display_rotate = reader.GetAttribute("rotate"); // (0|90|180|270)
|
||||||
// bool? flipx = Utilities.GetYesNo(reader.GetAttribute("flipx"));
|
// bool? display_flipx = Utilities.GetYesNo(reader.GetAttribute("flipx"));
|
||||||
// string width = reader.GetAttribute("width");
|
// string display_width = reader.GetAttribute("width");
|
||||||
// string height = reader.GetAttribute("height");
|
// string display_height = reader.GetAttribute("height");
|
||||||
// string refresh = reader.GetAttribute("refresh");
|
// string display_refresh = reader.GetAttribute("refresh");
|
||||||
// string pixclock = reader.GetAttribute("pixclock");
|
// string display_pixclock = reader.GetAttribute("pixclock");
|
||||||
// string htotal = reader.GetAttribute("htotal");
|
// string display_htotal = reader.GetAttribute("htotal");
|
||||||
// string hbend = reader.GetAttribute("hbend");
|
// string display_hbend = reader.GetAttribute("hbend");
|
||||||
// string hbstart = reader.GetAttribute("hbstart");
|
// string display_hbstart = reader.GetAttribute("hbstart");
|
||||||
// string vtotal = reader.GetAttribute("vtotal");
|
// string display_vtotal = reader.GetAttribute("vtotal");
|
||||||
// string vbend = reader.GetAttribute("vbend");
|
// string display_vbend = reader.GetAttribute("vbend");
|
||||||
// string vbstart = reader.GetAttribute("vbstart");
|
// string display_vbstart = reader.GetAttribute("vbstart");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "sound":
|
case "sound":
|
||||||
// string channels = reader.GetAttribute("channels");
|
// string sound_channels = reader.GetAttribute("channels");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "condition":
|
case "condition":
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string condition_tag = reader.GetAttribute("tag");
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string condition_mask = reader.GetAttribute("mask");
|
||||||
// string relation = reader.GetAttribute("relation"); // (eq|ne|gt|le|lt|ge)
|
// string condition_relation = reader.GetAttribute("relation"); // (eq|ne|gt|le|lt|ge)
|
||||||
// string value = reader.GetAttribute("value");
|
// string condition_value = reader.GetAttribute("value");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "input":
|
case "input":
|
||||||
// bool? service = Utilities.GetYesNo(reader.GetAttribute("service"));
|
// bool? input_service = Utilities.GetYesNo(reader.GetAttribute("service"));
|
||||||
// bool? tilt = Utilities.GetYesNo(reader.GetAttribute("tilt"));
|
// bool? input_tilt = Utilities.GetYesNo(reader.GetAttribute("tilt"));
|
||||||
// string players = reader.GetAttribute("players");
|
// string input_players = reader.GetAttribute("players");
|
||||||
// string coins = reader.GetAttribute("coins");
|
// string input_coins = reader.GetAttribute("coins");
|
||||||
|
|
||||||
// // While the subtree contains <control> elements...
|
// // While the subtree contains <control> elements...
|
||||||
// string type = reader.GetAttribute("type");
|
// string control_type = reader.GetAttribute("type");
|
||||||
// string player = reader.GetAttribute("player");
|
// string control_player = reader.GetAttribute("player");
|
||||||
// string buttons = reader.GetAttribute("buttons");
|
// string control_buttons = reader.GetAttribute("buttons");
|
||||||
// string regbuttons = reader.GetAttribute("regbuttons");
|
// string control_regbuttons = reader.GetAttribute("regbuttons");
|
||||||
// string minimum = reader.GetAttribute("minimum");
|
// string control_minimum = reader.GetAttribute("minimum");
|
||||||
// string maximum = reader.GetAttribute("maximum");
|
// string control_maximum = reader.GetAttribute("maximum");
|
||||||
// string sensitivity = reader.GetAttribute("sensitivity");
|
// string control_sensitivity = reader.GetAttribute("sensitivity");
|
||||||
// string keydelta = reader.GetAttribute("keydelta");
|
// string control_keydelta = reader.GetAttribute("keydelta");
|
||||||
// bool? reverse = Utilities.GetYesNo(reader.GetAttribute("reverse"));
|
// bool? control_reverse = Utilities.GetYesNo(reader.GetAttribute("reverse"));
|
||||||
// string ways = reader.GetAttribute("ways");
|
// string control_ways = reader.GetAttribute("ways");
|
||||||
// string ways2 = reader.GetAttribute("ways2");
|
// string control_ways2 = reader.GetAttribute("ways2");
|
||||||
// string ways3 = reader.GetAttribute("ways3");
|
// string control_ways3 = reader.GetAttribute("ways3");
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "dipswitch":
|
case "dipswitch":
|
||||||
// string name = reader.GetAttribute("name");
|
// string dipswitch_name = reader.GetAttribute("name");
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string dipswitch_tag = reader.GetAttribute("tag");
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string dipswitch_mask = reader.GetAttribute("mask");
|
||||||
|
|
||||||
// // While the subtree contains <diplocation> elements...
|
// // While the subtree contains <diplocation> elements...
|
||||||
// string name = reader.GetAttribute("name");
|
// string diplocation_name = reader.GetAttribute("name");
|
||||||
// string number = reader.GetAttribute("number");
|
// string diplocation_number = reader.GetAttribute("number");
|
||||||
// bool? inverted = Utilities.GetYesNo(reader.GetAttribute("inverted"));
|
// bool? diplocation_inverted = Utilities.GetYesNo(reader.GetAttribute("inverted"));
|
||||||
|
|
||||||
// // While the subtree contains <dipvalue> elements...
|
// // While the subtree contains <dipvalue> elements...
|
||||||
// string name = reader.GetAttribute("name");
|
// string dipvalue_name = reader.GetAttribute("name");
|
||||||
// string value = reader.GetAttribute("value");
|
// string dipvalue_value = reader.GetAttribute("value");
|
||||||
// bool? default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
// bool? dipvalue_default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "configuration":
|
case "configuration":
|
||||||
// string name = reader.GetAttribute("name");
|
// string configuration_name = reader.GetAttribute("name");
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string configuration_tag = reader.GetAttribute("tag");
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string configuration_mask = reader.GetAttribute("mask");
|
||||||
|
|
||||||
// // While the subtree contains <conflocation> elements...
|
// // While the subtree contains <conflocation> elements...
|
||||||
// string name = reader.GetAttribute("name");
|
// string conflocation_name = reader.GetAttribute("name");
|
||||||
// string number = reader.GetAttribute("number");
|
// string conflocation_number = reader.GetAttribute("number");
|
||||||
// bool? inverted = Utilities.GetYesNo(reader.GetAttribute("inverted"));
|
// bool? conflocation_inverted = Utilities.GetYesNo(reader.GetAttribute("inverted"));
|
||||||
|
|
||||||
// // While the subtree contains <confsetting> elements...
|
// // While the subtree contains <confsetting> elements...
|
||||||
// string name = reader.GetAttribute("name");
|
// string confsetting_name = reader.GetAttribute("name");
|
||||||
// string value = reader.GetAttribute("value");
|
// string confsetting_value = reader.GetAttribute("value");
|
||||||
// bool? default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
// bool? confsetting_default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "port":
|
case "port":
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string port_tag = reader.GetAttribute("tag");
|
||||||
|
|
||||||
// // While the subtree contains <analog> elements...
|
// // While the subtree contains <analog> elements...
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string analog_mask = reader.GetAttribute("mask");
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "adjuster":
|
case "adjuster":
|
||||||
// string name = reader.GetAttribute("name");
|
// string adjuster_name = reader.GetAttribute("name");
|
||||||
// bool? default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
// bool? adjuster_default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
||||||
|
|
||||||
// // For the one possible <condition> element...
|
// // For the one possible <condition> element...
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string condition_tag = reader.GetAttribute("tag");
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string condition_mask = reader.GetAttribute("mask");
|
||||||
// string relation = reader.GetAttribute("relation"); // (eq|ne|gt|le|lt|ge)
|
// string condition_relation = reader.GetAttribute("relation"); // (eq|ne|gt|le|lt|ge)
|
||||||
// string value = reader.GetAttribute("value");
|
// string condition_value = reader.GetAttribute("value");
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "driver":
|
case "driver":
|
||||||
// string status = reader.GetAttribute("status"); // (good|imperfect|preliminary)
|
// string driver_status = reader.GetAttribute("status"); // (good|imperfect|preliminary)
|
||||||
// string emulation = reader.GetAttribute("emulation"); // (good|imperfect|preliminary)
|
// string driver_emulation = reader.GetAttribute("emulation"); // (good|imperfect|preliminary)
|
||||||
// string cocktail = reader.GetAttribute("cocktail"); // (good|imperfect|preliminary)
|
// string driver_cocktail = reader.GetAttribute("cocktail"); // (good|imperfect|preliminary)
|
||||||
// string savestate = reader.GetAttribute("savestate"); // (supported|unsupported)
|
// string driver_savestate = reader.GetAttribute("savestate"); // (supported|unsupported)
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "feature":
|
case "feature":
|
||||||
// string type = reader.GetAttribute("type"); // (protection|palette|graphics|sound|controls|keyboard|mouse|microphone|camera|disk|printer|lan|wan|timing)
|
// string feature_type = reader.GetAttribute("type"); // (protection|palette|graphics|sound|controls|keyboard|mouse|microphone|camera|disk|printer|lan|wan|timing)
|
||||||
// string status = reader.GetAttribute("status"); // (unemulated|imperfect)
|
// string feature_status = reader.GetAttribute("status"); // (unemulated|imperfect)
|
||||||
// string overall = reader.GetAttribute("overall"); // (unemulated|imperfect)
|
// string feature_overall = reader.GetAttribute("overall"); // (unemulated|imperfect)
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "device":
|
case "device":
|
||||||
// string type = reader.GetAttribute("type");
|
// string device_type = reader.GetAttribute("type");
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string device_tag = reader.GetAttribute("tag");
|
||||||
// string fixed_image = reader.GetAttribute("fixed_image");
|
// string device_fixed_image = reader.GetAttribute("fixed_image");
|
||||||
// string mandatory = reader.GetAttribute("mandatory");
|
// string device_mandatory = reader.GetAttribute("mandatory");
|
||||||
// string interface = reader.GetAttribute("interface");
|
// string device_interface = reader.GetAttribute("interface");
|
||||||
|
|
||||||
// // For the one possible <instance> element...
|
// // For the one possible <instance> element...
|
||||||
// string name = reader.GetAttribute("name");
|
// string instance_name = reader.GetAttribute("name");
|
||||||
// string briefname = reader.GetAttribute("briefname");
|
// string instance_briefname = reader.GetAttribute("briefname");
|
||||||
|
|
||||||
// // While the subtree contains <extension> elements...
|
// // While the subtree contains <extension> elements...
|
||||||
// string name = reader.GetAttribute("name");
|
// string extension_name = reader.GetAttribute("name");
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "slot":
|
case "slot":
|
||||||
// string name = reader.GetAttribute("name");
|
// string slot_name = reader.GetAttribute("name");
|
||||||
|
ReadSlot(reader.ReadSubtree(), machine);
|
||||||
|
|
||||||
// // While the subtree contains <slotoption> elements... (These get added as devices currently)
|
// Skip the slot now that we've processed it
|
||||||
// string name = reader.GetAttribute("name");
|
reader.Skip();
|
||||||
// string devname = reader.GetAttribute("devname");
|
|
||||||
// bool? default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
|
||||||
|
|
||||||
reader.Read();
|
|
||||||
break;
|
break;
|
||||||
case "softwarelist":
|
case "softwarelist":
|
||||||
// string name = reader.GetAttribute("name");
|
// string softwarelist_name = reader.GetAttribute("name");
|
||||||
// string status = reader.GetAttribute("status"); // (original|compatible)
|
// string softwarelist_status = reader.GetAttribute("status"); // (original|compatible)
|
||||||
// string filter = reader.GetAttribute("filter");
|
// string softwarelist_filter = reader.GetAttribute("filter");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "ramoption":
|
case "ramoption":
|
||||||
// string default = reader.GetAttribute("default");
|
// string ramoption_default = reader.GetAttribute("default");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
@@ -512,6 +512,50 @@ namespace SabreTools.Library.DatFiles
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Read slot information
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="reader">XmlReader representing a machine block</param>
|
||||||
|
/// <param name="machine">Machine information to pass to contained items</param>
|
||||||
|
private void ReadSlot(XmlReader reader, Machine machine)
|
||||||
|
{
|
||||||
|
// If we have an empty machine, skip it
|
||||||
|
if (reader == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, add what is possible
|
||||||
|
reader.MoveToContent();
|
||||||
|
|
||||||
|
while (!reader.EOF)
|
||||||
|
{
|
||||||
|
// We only want elements
|
||||||
|
if (reader.NodeType != XmlNodeType.Element)
|
||||||
|
{
|
||||||
|
reader.Read();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the roms from the machine
|
||||||
|
switch (reader.Name)
|
||||||
|
{
|
||||||
|
case "slotoption": // These get added as devices currently
|
||||||
|
// string slotoption_name = reader.GetAttribute("name");
|
||||||
|
string devname = reader.GetAttribute("devname");
|
||||||
|
if (!machine.Devices.Contains(devname))
|
||||||
|
{
|
||||||
|
machine.Devices.Add(devname);
|
||||||
|
}
|
||||||
|
// bool? slotoption_default = Utilities.GetYesNo(reader.GetAttribute("default"));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
reader.Read();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create and open an output file for writing direct from a dictionary
|
/// Create and open an output file for writing direct from a dictionary
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ namespace SabreTools.Library.DatFiles
|
|||||||
bool remUnicode)
|
bool remUnicode)
|
||||||
{
|
{
|
||||||
// All XML-derived DATs share a lot in common so it just calls one implementation
|
// All XML-derived DATs share a lot in common so it just calls one implementation
|
||||||
// TODO: Use the following implementation instead of passing to Logiqx
|
|
||||||
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
|
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -216,8 +215,8 @@ namespace SabreTools.Library.DatFiles
|
|||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
case "sharedfeat":
|
case "sharedfeat":
|
||||||
// string name = reader.GetAttribute("name");
|
// string sharedfeat_name = reader.GetAttribute("name");
|
||||||
// string value = reader.GetAttribute("value");
|
// string sharedfeat_value = reader.GetAttribute("value");
|
||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
break;
|
break;
|
||||||
@@ -325,8 +324,8 @@ namespace SabreTools.Library.DatFiles
|
|||||||
areasize = tempas;
|
areasize = tempas;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// string width = reader.GetAttribute("width"); // (8|16|32|64) "8"
|
// string dataarea_width = reader.GetAttribute("width"); // (8|16|32|64) "8"
|
||||||
// string endianness = reader.GetAttribute("endianness"); // endianness (big|little) "little"
|
// string dataarea_endianness = reader.GetAttribute("endianness"); // endianness (big|little) "little"
|
||||||
|
|
||||||
containsItems = ReadDataArea(reader.ReadSubtree(), machine, features, areaname, areasize,
|
containsItems = ReadDataArea(reader.ReadSubtree(), machine, features, areaname, areasize,
|
||||||
partname, partinterface, filename, sysid, srcid, keep, clean, remUnicode);
|
partname, partinterface, filename, sysid, srcid, keep, clean, remUnicode);
|
||||||
@@ -344,16 +343,16 @@ namespace SabreTools.Library.DatFiles
|
|||||||
reader.Skip();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
case "dipswitch":
|
case "dipswitch":
|
||||||
// string name = reader.GetAttribute("name");
|
// string dipswitch_name = reader.GetAttribute("name");
|
||||||
// string tag = reader.GetAttribute("tag");
|
// string dipswitch_tag = reader.GetAttribute("tag");
|
||||||
// string mask = reader.GetAttribute("mask");
|
// string dipswitch_mask = reader.GetAttribute("mask");
|
||||||
|
|
||||||
// For every <dipvalue> element...
|
// For every <dipvalue> element...
|
||||||
// string name = reader.GetAttribute("name");
|
// string dipvalue_name = reader.GetAttribute("name");
|
||||||
// string value = reader.GetAttribute("value");
|
// string dipvalue_value = reader.GetAttribute("value");
|
||||||
// bool? default = Utilities.GetYesNo(reader.GetAttribute("default")); // (yes|no) "no"
|
// bool? dipvalue_default = Utilities.GetYesNo(reader.GetAttribute("default")); // (yes|no) "no"
|
||||||
|
|
||||||
reader.Read();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
reader.Read();
|
reader.Read();
|
||||||
|
|||||||
Reference in New Issue
Block a user