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

Jump to bottom

Rename ReplyCommand in WireProtocol C implementation #236

Merged
merged 3 commits into from
Mar 24, 2017
Merged

Rename ReplyCommand in WireProtocol C implementation #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4722d34
Rename ReplyCommand in WireProtocol C implementation
josesimoes Mar 24, 2017
42d0a68
Missed last commit
josesimoes Mar 24, 2017
b892718
Missed last commit
josesimoes Mar 24, 2017
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
2 changes: 1 addition & 1 deletion src/CLR/Include/WireProtocol_Message.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ bool WP_Message_Process(WP_Message* message);

//////////////////////////////////////////
// helper functions
void ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size);
void WP_ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size);

#endif // _WIREPROTOCOL_MESSAGE_H_
2 changes: 1 addition & 1 deletion src/CLR/WireProtocol/WireProtocol_Message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static uint8_t* marker;
//////////////////////////////////////////
// helper functions

void ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size)
void WP_ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size)
{
WP_Message msgReply;
uint32_t flags = 0;
Expand Down
4 changes: 2 additions & 2 deletions targets/CMSIS-OS/ChibiOS/nanoBooter/WireProtocol_App_Interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ bool WP_App_ProcessPayload(WP_Message* message)
// execute command handler and save the result
bool commandHandlerExecuteResult = ((bool* (*)(WP_Message*))cmd->handler)(message);

ReplyToCommand(message, commandHandlerExecuteResult, false, NULL, 0);
WP_ReplyToCommand(message, commandHandlerExecuteResult, false, NULL, 0);
return true;
}

cmd++;
}

ReplyToCommand(message, false, false, NULL, 0);
WP_ReplyToCommand(message, false, false, NULL, 0);

return true;
}
Expand Down
20 changes: 10 additions & 10 deletions targets/CMSIS-OS/ChibiOS/nanoBooter/WireProtocol_MonitorCommands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ bool Monitor_Ping(WP_Message* message)
Monitor_Ping_Reply cmdReply;
cmdReply.m_source = Monitor_Ping_c_Ping_Source_NanoBooter;

ReplyToCommand(message, true, false, &cmdReply, sizeof(cmdReply));
WP_ReplyToCommand(message, true, false, &cmdReply, sizeof(cmdReply));
}

return true;
Expand All @@ -77,7 +77,7 @@ bool Monitor_OemInfo(WP_Message* message)

bool fOK = NanoBooter_GetReleaseInfo(&cmdReply.m_releaseInfo) == true;

ReplyToCommand(message, fOK, false, &cmdReply, sizeof(cmdReply));
WP_ReplyToCommand(message, fOK, false, &cmdReply, sizeof(cmdReply));
}

return true;
Expand All @@ -103,7 +103,7 @@ bool Monitor_WriteMemory(WP_Message* message)
// assume at RAM, directly use the original address
ret = AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write);

ReplyToCommand(message, ret, false, NULL, 0);
WP_ReplyToCommand(message, ret, false, NULL, 0);

return ret;
}
Expand All @@ -112,7 +112,7 @@ bool Monitor_Reboot(WP_Message* message)
{
Monitor_Reboot_Command* cmd = (Monitor_Reboot_Command*)message->m_payload;

ReplyToCommand(message, true, false, NULL, 0);
WP_ReplyToCommand(message, true, false, NULL, 0);

if(cmd != NULL)
{
Expand Down Expand Up @@ -141,7 +141,7 @@ bool Monitor_EraseMemory(WP_Message* message)

ret = AccessMemory(cmd->address, cmd->length, NULL, AccessMemory_Erase);

ReplyToCommand(message, ret, false, NULL, 0);
WP_ReplyToCommand(message, ret, false, NULL, 0);

return ret;
}
Expand All @@ -155,7 +155,7 @@ bool Monitor_CheckMemory(WP_Message* message)

ret = AccessMemory(cmd->address, cmd->length, (uint8_t*)&cmdReply.crc, AccessMemory_Check);

ReplyToCommand(message, ret, false, &cmdReply, sizeof(cmdReply));
WP_ReplyToCommand(message, ret, false, &cmdReply, sizeof(cmdReply));

return ret;
}
Expand All @@ -179,7 +179,7 @@ bool Monitor_MemoryMap(WP_Message* message)
map[1].m_length = HalSystemConfig.FLASH1.Size;
map[1].m_flags = Monitor_MemoryMap_c_FLASH;

ReplyToCommand(message, true, false, map, sizeof(map));
WP_ReplyToCommand(message, true, false, map, sizeof(map));

return true;
}
Expand All @@ -203,7 +203,7 @@ bool Monitor_FlashSectorMap(WP_Message* message)

// if(device == NULL)
// {
ReplyToCommand(message, true, false, NULL, 0);
WP_ReplyToCommand(message, true, false, NULL, 0);
return false;
// }

Expand All @@ -213,7 +213,7 @@ bool Monitor_FlashSectorMap(WP_Message* message)

// if(pData == NULL)
// {
// ReplyToCommand(message, true, false, NULL, 0);
// WP_ReplyToCommand(message, true, false, NULL, 0);
// return false;
// }
// }
Expand Down Expand Up @@ -246,7 +246,7 @@ bool Monitor_FlashSectorMap(WP_Message* message)
// while(device = BlockStorageList_GetNextDevice( *device ));
// }

// ReplyToCommand(message, true, false, (void*)pData, rangeCount * sizeof (struct Flash_Sector) );
// WP_ReplyToCommand(message, true, false, (void*)pData, rangeCount * sizeof (struct Flash_Sector) );

// private_free(pData);

Expand Down
4 changes: 2 additions & 2 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/WireProtocol_App_Interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ bool WP_App_ProcessPayload(WP_Message* message)
// execute command handler and save the result
bool commandHandlerExecuteResult = ((bool* (*)(WP_Message*))cmd->handler)(message);

ReplyToCommand(message, commandHandlerExecuteResult, false, NULL, 0);
WP_ReplyToCommand(message, commandHandlerExecuteResult, false, NULL, 0);
return true;
}

cmd++;
}

ReplyToCommand(message, false, false, NULL, 0);
WP_ReplyToCommand(message, false, false, NULL, 0);

return true;
}
Expand Down
5 changes: 2 additions & 3 deletions targets/CMSIS-OS/ChibiOS/nanoCLR/WireProtocol_MonitorCommands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ bool Monitor_Ping(WP_Message* message)
Monitor_Ping_Reply cmdReply;
cmdReply.m_source = Monitor_Ping_c_Ping_Source_NanoCLR;

ReplyToCommand(message, true, false, &cmdReply, sizeof(cmdReply));
WP_ReplyToCommand(message, true, false, &cmdReply, sizeof(cmdReply));
}

return true;
Expand All @@ -47,9 +47,8 @@ bool Monitor_OemInfo(WP_Message* message)

bool fOK = NanoCLR_GetReleaseInfo(&cmdReply.m_releaseInfo) == true;

ReplyToCommand(message, fOK, false, &cmdReply, sizeof(cmdReply));
WP_ReplyToCommand(message, fOK, false, &cmdReply, sizeof(cmdReply));
}

return true;
}