Skip to content

Commit

Permalink
Work Flash Sector Data
Browse files Browse the repository at this point in the history 
- Rename struct vars.
- Add new constants to allow processing Block Region Attributes.
- Rework DeploymentBlock to add support for ProgramAligment field.
- Rework WriteMemory to process program alignment attribute on flash map.
- Rework test app to test new feature.
- Bump version to 1.27.0-preview.
  • Loading branch information
@josesimoes
josesimoes committed Dec 16, 2020
1 parent d8c9cee commit 85235a8
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 160 deletions.
139 changes: 34 additions & 105 deletions USB Test App WPF/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,17 +388,25 @@ private async void DeployTestButton_Click(object sender, RoutedEventArgs e)
var p4Size = 752;

assemblies.Add(new byte[p1Size]);
assemblies[0][0] = 0x5;
assemblies[0][1] = 0x5;
assemblies[0][0] = 0xDE;
assemblies[0][1] = 0xAD;
assemblies[0][2] = 0xBE;
assemblies[0][3] = 0xEF;
assemblies.Add(new byte[p2Size]);
assemblies[1][0] = 0x6;
assemblies[1][1] = 0x6;
assemblies[1][0] = 0xDE;
assemblies[1][1] = 0xAD;
assemblies[1][2] = 0xBE;
assemblies[1][3] = 0xEF;
assemblies.Add(new byte[p3Size]);
assemblies[2][0] = 0x7;
assemblies[2][1] = 0x7;
assemblies[2][0] = 0xDE;
assemblies[2][1] = 0xAD;
assemblies[2][2] = 0xBE;
assemblies[2][3] = 0xEF;
assemblies.Add(new byte[p4Size]);
assemblies[3][0] = 0x8;
assemblies[3][1] = 0x8;
assemblies[3][0] = 0xDE;
assemblies[3][1] = 0xAD;
assemblies[3][0] = 0xBE;
assemblies[3][1] = 0xEF;

var totalSize = p1Size + p2Size + p3Size + p4Size;

Expand All @@ -424,105 +432,26 @@ private async void DeployTestButton_Click(object sender, RoutedEventArgs e)
///////////////////////////////////////////////////////////////
// process replicated from VS deploy provider
///////////////////////////////////////////////////////////////
// device needs to be in 'initialized state' for a successful and correct deployment
// meaning that is not running nor stopped
bool deviceIsInInitializeState = false;
// erase the target deployment area to ensure a clean deployment and execution start
if (await device.EraseAsync(EraseOptions.Deployment, CancellationToken.None))
{
//MessageCentre.InternalErrorMessage("Erase deployment area successful.");
// initial check
if (device.DebugEngine.IsDeviceInInitializeState())
{
//MessageCentre.InternalErrorMessage("Device status verified as being in initialized state. Requesting to resume execution.");
// set flag
deviceIsInInitializeState = true;
// device is still in initialization state, try resume execution
device.DebugEngine.ResumeExecution();
}
// handle the workflow required to try resuming the execution on the device
// only required if device is not already there
// retry 5 times with a 500ms interval between retries
while (retryCount++ < _numberOfRetries && deviceIsInInitializeState)
{
if (!device.DebugEngine.IsDeviceInInitializeState())
{
//MessageCentre.InternalErrorMessage("Device has completed initialization.");
// done here
deviceIsInInitializeState = false;
break;
}
//MessageCentre.InternalErrorMessage($"Waiting for device to report initialization completed ({retryCount}/{_numberOfRetries}).");
// provide feedback to user on the 1st pass
if (retryCount == 0)
{
//await outputPaneWriter.WriteLineAsync(ResourceStrings.WaitingDeviceInitialization);
}
if (device.DebugEngine.ConnectionSource == ConnectionSource.nanoBooter)
{
//MessageCentre.InternalErrorMessage("Device reported running nanoBooter. Requesting to load nanoCLR.");
// request nanoBooter to load CLR
device.DebugEngine.ExecuteMemory(0);
}
else if (device.DebugEngine.ConnectionSource == ConnectionSource.nanoCLR)
{
//MessageCentre.InternalErrorMessage("Device reported running nanoCLR. Requesting to reboot nanoCLR.");
await Task.Run(delegate
{
// already running nanoCLR try rebooting the CLR
device.DebugEngine.RebootDevice(RebootOptions.ClrOnly);
});
}
// wait before next pass
// use a back-off strategy of increasing the wait time to accommodate slower or less responsive targets (such as networked ones)
await Task.Delay(TimeSpan.FromMilliseconds(_timeoutMiliseconds * (retryCount + 1)));
await Task.Yield();
}
}
// check if device is still in initialized state
if (!deviceIsInInitializeState)
{
///////////////////////////////////////////////////////////////
var largePackets = totalSize / (debugEngine.WireProtocolPacketSize - 8);
var largePackets = totalSize / (debugEngine.WireProtocolPacketSize - 8);
var packetSize = debugEngine.WireProtocolPacketSize == 1024 ? "1k" : $"({ debugEngine.WireProtocolPacketSize / 1024}bytes";
var packetSize = debugEngine.WireProtocolPacketSize == 1024 ? "1k" : $"({ debugEngine.WireProtocolPacketSize / 1024}bytes";
Debug.WriteLine($">>> Sending : {totalSize} bytes.<<<<");
Debug.WriteLine($">>> This is {packetSize} packets plus something bytes.<<<<");
Debug.WriteLine($">>> Sending : {totalSize} bytes.<<<<");
Debug.WriteLine($">>> This is {packetSize} packets plus something bytes.<<<<");
var result = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.DeploymentExecute(assemblies, true);
var result = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.DeploymentExecute(assemblies, true);
Debug.WriteLine($">>> Deployment result: {result} <<<<");
Debug.WriteLine($">>> Deployment result: {result} <<<<");
if (result)
{
//(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.RebootDevice(RebootOptions.ClrOnly);
if (result)
{
//(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.RebootDevice(RebootOptions.ClrOnly);
//Task.Delay(1000).Wait();
//Task.Delay(1000).Wait();
(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].GetDeviceInfo(true);
}
}
else
{
Debug.WriteLine($">>> Failed to initialize device. <<<<");
(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].GetDeviceInfo(true);
}
}));
Expand Down Expand Up @@ -1043,10 +972,10 @@ private async void ReadTestButton_Click(object sender, RoutedEventArgs e)
var flashStartAddress = memoryMap.First(m => (m.m_flags & Commands.Monitor_MemoryMap.c_FLASH) == Commands.Monitor_MemoryMap.c_FLASH).m_address;

// bootloader
if (flashSectorMap.Exists(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP))
if (flashSectorMap.Exists(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP))
{
var startAddress = flashSectorMap.First(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP).m_StartAddress;
var length = (uint)flashSectorMap.Where(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP).Sum(obj => obj.m_NumBlocks * obj.m_BytesPerBlock);
var startAddress = flashSectorMap.First(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP).StartAddress;
var length = (uint)flashSectorMap.Where(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP).Sum(obj => obj.NumBlocks * obj.BytesPerBlock);

var bootloaderOperation = device.DebugEngine.ReadMemory(startAddress, length);
if(bootloaderOperation.Success)
Expand All @@ -1064,10 +993,10 @@ private async void ReadTestButton_Click(object sender, RoutedEventArgs e)
//var configSector = flashSectorMap.Where(s => ((s.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CONFIG) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CONFIG)).Select(s => s.ToDeploymentSector()).ToList();

// CLR
if (flashSectorMap.Exists(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE))
if (flashSectorMap.Exists(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE))
{
var startAddress = flashSectorMap.First(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE).m_StartAddress;
var length = (uint)flashSectorMap.Where(item => (item.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE).Sum(obj => obj.m_NumBlocks * obj.m_BytesPerBlock);
var startAddress = flashSectorMap.First(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE).StartAddress;
var length = (uint)flashSectorMap.Where(item => (item.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_CODE).Sum(obj => obj.NumBlocks * obj.BytesPerBlock);

var clrOperation = device.DebugEngine.ReadMemory(startAddress, length);
if (clrOperation.Success)
Expand Down
18 changes: 16 additions & 2 deletions nanoFramework.Tools.DebugLibrary.Shared/Extensions/FlashSectorDataExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,23 @@ public static DeploymentSector ToDeploymentSector(this FlashSectorData value)

List<DeploymentBlock> blocks = new List<DeploymentBlock>();

for (int i = 0; i < value.m_NumBlocks; i++)
for (int i = 0; i < value.NumBlocks; i++)
{
blocks.Add(new DeploymentBlock((int)value.m_StartAddress + (i * (int)value.m_BytesPerBlock), (int)value.m_BytesPerBlock));
int programmingAlignment = 0;

// check alignment requirements
if ((value.Flags
& BlockRegionAttributes_MASK
& BlockRegionAttribute_ProgramWidthIs64bits) == BlockRegionAttribute_ProgramWidthIs64bits)
{
// programming width is 64bits => 8 bytes
programmingAlignment = 8;
}

blocks.Add(new DeploymentBlock(
(int)value.StartAddress + (i * (int)value.BytesPerBlock),
(int)value.BytesPerBlock,
programmingAlignment));
}

return new DeploymentSector(blocks);
Expand Down
2 changes: 1 addition & 1 deletion nanoFramework.Tools.DebugLibrary.Shared/Extensions/MonitorFlashSectorMapExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class MonitorFlashSectorMapExtensions
{
public static string UsageAsString(this Commands.Monitor_FlashSectorMap.FlashSectorData value)
{
switch (value.m_flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK)
switch (value.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK)
{
case Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_BOOTSTRAP:
return "nanoBooter";
Expand Down
Loading

0 comments on commit 85235a8

Please sign in to comment.