diff --git a/Aaru.Server.New/Components/Pages/Report/View.razor b/Aaru.Server.New/Components/Pages/Report/View.razor index d22b86ca..dc8ab751 100644 --- a/Aaru.Server.New/Components/Pages/Report/View.razor +++ b/Aaru.Server.New/Components/Pages/Report/View.razor @@ -451,6 +451,59 @@ } +@if(Cid != null) +{ + + + + Card Identification Register + + + + @((MarkupString)Cid) + + +} +@if(Csd != null) +{ + + + + Card Specific Data Register + + + + @((MarkupString)Csd) + + +} +@if(ExtendedCsd != null) +{ + + + + Extended Device Specific Data Register + + + + @((MarkupString)ExtendedCsd) + + +} +@if(Ocr != null) +{ + + + + Operation Conditions Register + + + + @((MarkupString)Ocr) + + +} + @if(ReadCapabilitiesDictionary is not null && ReadCapabilitiesList is not null) { diff --git a/Aaru.Server.New/Components/Pages/Report/View.razor.cs b/Aaru.Server.New/Components/Pages/Report/View.razor.cs index 9ecf1799..a239c1b7 100644 --- a/Aaru.Server.New/Components/Pages/Report/View.razor.cs +++ b/Aaru.Server.New/Components/Pages/Report/View.razor.cs @@ -43,6 +43,10 @@ public partial class View public List? Security { get; set; } public Dictionary? ReadCapabilitiesDictionary { get; set; } public List? ReadCapabilitiesList { get; set; } + public string? Ocr { get; set; } + public string? ExtendedCsd { get; set; } + public string? Csd { get; set; } + public string? Cid { get; set; } /// protected override async Task OnInitializedAsync() @@ -66,6 +70,7 @@ public partial class View .Include(static deviceReportV2 => deviceReportV2.PCMCIA) .Include(static deviceReportV2 => deviceReportV2.ATAPI) .Include(static deviceReportV2 => deviceReportV2.ATA) + .Include(static deviceReportV2 => deviceReportV2.MultiMediaCard) .FirstOrDefaultAsync(d => d.Id == Id); if(report is null) @@ -298,6 +303,26 @@ public partial class View if(readCapabilitiesList.Count > 0) ReadCapabilitiesList = readCapabilitiesList; } + if(report.MultiMediaCard != null) + { + lblDeviceType = "MultiMediaCard"; + + if(report.MultiMediaCard.CID != null) + Cid = Decoders.MMC.Decoders.PrettifyCID(report.MultiMediaCard.CID).Replace("\n", "
"); + + if(report.MultiMediaCard.CSD != null) + Csd = Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.CSD).Replace("\n", "
"); + + if(report.MultiMediaCard.ExtendedCSD != null) + { + ExtendedCsd = Decoders.MMC.Decoders.PrettifyExtendedCSD(report.MultiMediaCard.ExtendedCSD) + .Replace("\n", "
"); + } + + if(report.MultiMediaCard.OCR != null) + Ocr = Decoders.MMC.Decoders.PrettifyCSD(report.MultiMediaCard.OCR).Replace("\n", "
"); + } + _initialized = true; StateHasChanged();