Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code style fixes for nanoframework/nf-interpreter PR#1789 #61

Closed
wants to merge 1 commit into from
Closed

Code style fixes for nanoframework/nf-interpreter PR#1789 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/CLR/WireProtocol/WireProtocol_MonitorCommands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,29 +137,29 @@ __nfweak int nanoBooter_GetTargetInfo(TargetInfo *targetInfo)
{
#if (TARGET_HAS_NANOBOOTER == TRUE)

BootClipboard *data = &g_BootClipboard;
BootClipboard *data = &g_BootClipboard;

targetInfo->BooterVersion.usMajor = data->BooterVersion.usMajor;
targetInfo->BooterVersion.usMinor = data->BooterVersion.usMinor;
targetInfo->BooterVersion.usBuild = data->BooterVersion.usBuild;
targetInfo->BooterVersion.usRevision = data->BooterVersion.usRevision;
targetInfo->BooterVersion.usMajor = data->BooterVersion.usMajor;
targetInfo->BooterVersion.usMinor = data->BooterVersion.usMinor;
targetInfo->BooterVersion.usBuild = data->BooterVersion.usBuild;
targetInfo->BooterVersion.usRevision = data->BooterVersion.usRevision;

targetInfo->ClrVersion.usMajor = data->CLRVersion.usMajor;
targetInfo->ClrVersion.usMinor = data->CLRVersion.usMinor;
targetInfo->ClrVersion.usBuild = data->CLRVersion.usBuild;
targetInfo->ClrVersion.usRevision = data->CLRVersion.usRevision;
targetInfo->ClrVersion.usMajor = data->CLRVersion.usMajor;
targetInfo->ClrVersion.usMinor = data->CLRVersion.usMinor;
targetInfo->ClrVersion.usBuild = data->CLRVersion.usBuild;
targetInfo->ClrVersion.usRevision = data->CLRVersion.usRevision;

#else

targetInfo->BooterVersion.usMajor = 0;
targetInfo->BooterVersion.usMinor = 0;
targetInfo->BooterVersion.usBuild = 0;
targetInfo->BooterVersion.usRevision = 0;
targetInfo->BooterVersion.usMajor = 0;
targetInfo->BooterVersion.usMinor = 0;
targetInfo->BooterVersion.usBuild = 0;
targetInfo->BooterVersion.usRevision = 0;

targetInfo->ClrVersion.usMajor = VERSION_MAJOR;
targetInfo->ClrVersion.usMinor = VERSION_MINOR;
targetInfo->ClrVersion.usBuild = VERSION_BUILD;
targetInfo->ClrVersion.usRevision = VERSION_REVISION;
targetInfo->ClrVersion.usMajor = VERSION_MAJOR;
targetInfo->ClrVersion.usMinor = VERSION_MINOR;
targetInfo->ClrVersion.usBuild = VERSION_BUILD;
targetInfo->ClrVersion.usRevision = VERSION_REVISION;

#endif

Expand Down
23 changes: 11 additions & 12 deletions src/HAL/Include/nanoHAL_ReleaseInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,17 @@ struct __nfpack NFReleaseInfo
unsigned char PlatformName[32];

static void Init(
NFReleaseInfo& releaseInfo,
unsigned short major=0,
unsigned short minor=0,
unsigned short build=0,
unsigned short revision=0,
const char *info=(const char *)NULL,
size_t infoLen=0,
const char *target=(const char *)NULL,
size_t targetLen=0,
const char *platform=(const char *)NULL,
size_t platformLen=0
);
NFReleaseInfo &releaseInfo,
unsigned short major = 0,
unsigned short minor = 0,
unsigned short build = 0,
unsigned short revision = 0,
const char *info = (const char *)NULL,
size_t infoLen = 0,
const char *target = (const char *)NULL,
size_t targetLen = 0,
const char *platform = (const char *)NULL,
size_t platformLen = 0);
};

struct __nfpack OEM_MODEL_SKU
Expand Down