Rework bool functions and args

src/CLR/Include/WireProtocol_App_Interface.h

@@ -10,11 +10,11 @@
 
 //////////////////////////////////////////
 extern uint8_t receptionBuffer[2048];
-extern void ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size);
+extern void ReplyToCommand(WP_Message* message, int fSuccess, int fCritical, void* ptr, int size);
 
 //////////////////////////////////////////
-bool WP_App_ProcessHeader(WP_Message* message);
-bool WP_App_ProcessPayload(WP_Message* message);
+int WP_App_ProcessHeader(WP_Message* message);
+int WP_App_ProcessPayload(WP_Message* message);
 
 #endif // _WIREPROTOCOL_APP_INTERFACE_H_
 

src/CLR/Include/WireProtocol_HAL_Interface.h

@@ -9,8 +9,8 @@
 #include "WireProtocol.h"
 
 //////////////////////////////////////////
-bool WP_ReceiveBytes(uint8_t* ptr, unsigned short* size);
-bool WP_TransmitMessage(WP_Message* message);
+int WP_ReceiveBytes(uint8_t* ptr, unsigned short* size);
+int WP_TransmitMessage(WP_Message* message);
 void WP_CheckAvailableIncomingData();
 
 #endif // _WIREPROTOCOL_HAL_INTERFACE_H_

src/CLR/Include/WireProtocol_Message.h

@@ -38,10 +38,10 @@ void WP_Message_PrepareRequest(WP_Message* message, uint32_t cmd, uint32_t flags
 void WP_Message_PrepareReply(WP_Message* message, const WP_Packet* req, uint32_t flags, uint32_t payloadSize,  uint8_t* payload);
 void WP_Message_SetPayload(WP_Message* message, uint8_t* payload);
 void WP_Message_Release(WP_Message* message);
-bool WP_Message_VerifyHeader(WP_Message* message);
-bool WP_Message_VerifyPayload(WP_Message* message);
+int  WP_Message_VerifyHeader(WP_Message* message);
+int  WP_Message_VerifyPayload(WP_Message* message);
 void WP_Message_ReplyBadPacket(uint32_t flags);
-bool WP_Message_Process(WP_Message* message);
+int  WP_Message_Process(WP_Message* message);
 
 #ifdef __cplusplus
 }
@@ -54,7 +54,7 @@ bool WP_Message_Process(WP_Message* message);
 extern "C" {
 #endif
 
-void WP_ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size);
+void WP_ReplyToCommand(WP_Message* message, int fSuccess, int fCritical, void* ptr, int size);
 void WP_SendProtocolMessage(WP_Message *message);
 void WP_PrepareAndSendProtocolMessage(uint32_t cmd, uint32_t payloadSize, uint8_t* payload, uint32_t flags);
 

src/CLR/Include/WireProtocol_MonitorCommands.h

@@ -148,14 +148,14 @@ typedef struct CLR_DBG_Commands_Monitor_MemoryMap
 extern "C" {
 #endif
 
-bool Monitor_Ping(WP_Message* message);
-bool Monitor_OemInfo(WP_Message* message);
-bool Monitor_WriteMemory(WP_Message* message);
-bool Monitor_Reboot(WP_Message* message);
-bool Monitor_EraseMemory(WP_Message* message);
-bool Monitor_CheckMemory(WP_Message* message);
-bool Monitor_MemoryMap(WP_Message* message);
-bool Monitor_FlashSectorMap(WP_Message* message);
+int Monitor_Ping(WP_Message* message);
+int Monitor_OemInfo(WP_Message* message);
+int Monitor_WriteMemory(WP_Message* message);
+int Monitor_Reboot(WP_Message* message);
+int Monitor_EraseMemory(WP_Message* message);
+int Monitor_CheckMemory(WP_Message* message);
+int Monitor_MemoryMap(WP_Message* message);
+int Monitor_FlashSectorMap(WP_Message* message);
 
 #ifdef __cplusplus
 }

src/CLR/Messaging/Messaging.cpp

@@ -479,7 +479,7 @@ bool CLR_Messaging::ProcessPayload( WP_Message* msg )
 }
 
 // wrapper function for CLR_Messaging::ProcessPayload(
-extern "C" bool CLR_Messaging_ProcessPayload(WP_Message* msg)
+extern "C" int CLR_Messaging_ProcessPayload(WP_Message* msg)
 {
     //CLR_Messaging* instance = (CLR_Messaging*)&g_scratchDebuggerMessaging[0];
 

src/CLR/WireProtocol/WireProtocol_App_Interface.c

@@ -15,14 +15,14 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 // provided as weak to be replaced by actual implementation in the client application
-__nfweak bool WP_App_ProcessHeader(WP_Message* message)
+__nfweak int WP_App_ProcessHeader(WP_Message* message)
 {
     // default to false
     return false;
 }
 
 // provided as weak to be replaced by actual implementation in the client application
-__nfweak bool WP_App_ProcessPayload(WP_Message* message)
+__nfweak int WP_App_ProcessPayload(WP_Message* message)
 {
     // default to false
     return false; 

src/CLR/WireProtocol/WireProtocol_HAL_Interface.c

@@ -16,14 +16,14 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 // provided as weak to be replaced by actual implementation by HAL interface
-__nfweak bool WP_ReceiveBytes(uint8_t* ptr, unsigned short* size)
+__nfweak int WP_ReceiveBytes(uint8_t* ptr, unsigned short* size)
 {
     // default to false
     return false;
 }
 
 // provided as weak to be replaced by actual implementation by HAL interface
-__nfweak bool WP_TransmitMessage(WP_Message* message)
+__nfweak int WP_TransmitMessage(WP_Message* message)
 {
     // default to false
     return false;

src/CLR/WireProtocol/WireProtocol_Message.c

@@ -18,7 +18,7 @@ extern void debug_printf( const char* format, ... );
 //////////////////////////////////////////
 // helper functions
 
-void WP_ReplyToCommand(WP_Message* message, bool fSuccess, bool fCritical, void* ptr, int size)
+void WP_ReplyToCommand(WP_Message* message, int fSuccess, int fCritical, void* ptr, int size)
 {
     WP_Message msgReply;
     uint32_t     flags = 0;
@@ -117,7 +117,7 @@ void WP_Message_Release(WP_Message* message)
     }
 }
 
-bool WP_Message_VerifyHeader(WP_Message* message)
+int WP_Message_VerifyHeader(WP_Message* message)
 {
     uint32_t crc = message->m_header.m_crcHeader;
     message->m_header.m_crcHeader = 0;
@@ -132,7 +132,7 @@ bool WP_Message_VerifyHeader(WP_Message* message)
     return true;
 }
 
-bool WP_Message_VerifyPayload(WP_Message* message)
+int WP_Message_VerifyPayload(WP_Message* message)
 {
     if(message->m_payload == NULL && message->m_header.m_size)
     {
@@ -157,7 +157,7 @@ void WP_Message_ReplyBadPacket(uint32_t flags)
     WP_TransmitMessage(&message);
 }
 
-bool WP_Message_Process(WP_Message* message)
+int WP_Message_Process(WP_Message* message)
 {
     uint8_t* buf = (uint8_t*)&message->m_header;
     int len;

src/CLR/WireProtocol/WireProtocol_MonitorCommands.c

@@ -9,56 +9,56 @@
 ////////////////////////////////////////////////////
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_Ping(WP_Message* message)
+__nfweak int Monitor_Ping(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_OemInfo(WP_Message* message)
+__nfweak int Monitor_OemInfo(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_WriteMemory(WP_Message* message)
+__nfweak int Monitor_WriteMemory(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_Reboot(WP_Message* message)
+__nfweak int Monitor_Reboot(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_EraseMemory(WP_Message* message)
+__nfweak int Monitor_EraseMemory(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_CheckMemory(WP_Message* message)
+__nfweak int Monitor_CheckMemory(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_MemoryMap(WP_Message* message)
+__nfweak int Monitor_MemoryMap(WP_Message* message)
 {
    // default to false
    return false;
 }
 
 // provided as weak to be replaced by actual implementation by application
-__nfweak bool Monitor_FlashSectorMap(WP_Message* message)
+__nfweak int Monitor_FlashSectorMap(WP_Message* message)
 {
    // default to false
    return false;

targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt

@@ -175,7 +175,7 @@ nf_set_linker_options(${NANOCLR_PROJECT_NAME}.elf TRUE)
 # the size of the CLR managed heap is defined here
 ###################################################
 set_property(TARGET ${NANOBOOTER_PROJECT_NAME}.elf APPEND_STRING PROPERTY LINK_FLAGS ",--defsym=__main_stack_size__=0x400,--defsym=__process_stack_size__=0x400,--defsym=__crt_heap_size__=0x400")
-set_property(TARGET ${NANOCLR_PROJECT_NAME}.elf APPEND_STRING PROPERTY LINK_FLAGS ",--defsym=__main_stack_size__=0x400,--defsym=__process_stack_size__=0x800,--defsym=__crt_heap_size__=0x1800")
+set_property(TARGET ${NANOCLR_PROJECT_NAME}.elf APPEND_STRING PROPERTY LINK_FLAGS ",--defsym=__main_stack_size__=0x800,--defsym=__process_stack_size__=0x800,--defsym=__crt_heap_size__=0x1800")
 
 # generate output files
 nf_generate_build_output_files(${NANOBOOTER_PROJECT_NAME}.elf)

targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoBooter/main.c

@@ -51,14 +51,14 @@ int main(void) {
   // The kernel is initialized but not started yet, this means that
   // main() is executing with absolute priority but interrupts are already enabled.
   osKernelInitialize();
-  osDelay(20);    // Let init stabilize
+  //osDelay(100);    // Let init stabilize
 
   // the following IF is not mandatory, it's just providing a way for a user to 'force'
   // the board to remain in nanoBooter and not launching nanoCLR
 
   // if the USER button (blue one) is pressed, skip the check for a valid CLR image and remain in booter
   // the user button in this board has a pull-up resistor so the check has to be inverted
-  if (palReadPad(GPIOA, GPIOA_BUTTON))
+  if (!palReadPad(GPIOA, GPIOA_BUTTON))
   {
     // check for valid CLR image 
     if(CheckValidCLRImage((uint32_t)&__nanoImage_end__))

targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoCLR/main.c

@@ -59,7 +59,7 @@ int main(void) {
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)
   extStart(&EXTD1, &extInterruptsConfiguration);
-  #endif
+  #endif 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();

targets/CMSIS-OS/ChibiOS/common/WireProtocol_HAL_Interface.c

@@ -29,7 +29,7 @@ binary_semaphore_t wpChannelSemaphore;
 
 #if (HAL_USE_SERIAL_USB == TRUE)
 
-bool WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
+int WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
 {
     // save for latter comparison
     uint16_t requestedSize = *size;
@@ -72,7 +72,7 @@ bool WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
 }
 #elif (HAL_USE_SERIAL == TRUE)
 
-bool WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
+int WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
 {
     // save for latter comparison
     uint16_t requestedSize = *size;
@@ -121,7 +121,7 @@ bool WP_ReceiveBytes(uint8_t* ptr, uint16_t* size)
 
 #if (HAL_USE_SERIAL_USB == TRUE)
 
-bool WP_TransmitMessage(WP_Message* message)
+int WP_TransmitMessage(WP_Message* message)
 {
     int writeResult;
     bool operationResult = false;
@@ -181,7 +181,7 @@ bool WP_TransmitMessage(WP_Message* message)
 }
 #elif (HAL_USE_SERIAL == TRUE)
 
-bool WP_TransmitMessage(WP_Message* message)
+int WP_TransmitMessage(WP_Message* message)
 {
     int writeResult;
     bool operationResult = false;

targets/CMSIS-OS/ChibiOS/common/WireProtocol_ReceiverThread.c

@@ -5,7 +5,6 @@
 
 #include <ch.h>
 #include <cmsis_os.h>
-
 #include "WireProtocol_HAL_Interface.h"
 
 extern WP_Message inboundMessage;

targets/CMSIS-OS/ChibiOS/nanoBooter/WireProtocol_App_Interface.c

@@ -50,7 +50,7 @@ static const CommandHandlerLookup c_Lookup_Reply[] =
     /*******************************************************************************************************************************************************************/
 };
 
-bool WP_App_ProcessHeader(WP_Message* message)
+int WP_App_ProcessHeader(WP_Message* message)
 {
     // check for reception buffer overflow 
     if(message->m_header.m_size > sizeof(receptionBuffer))
@@ -62,7 +62,7 @@ bool WP_App_ProcessHeader(WP_Message* message)
     return true;
 }
 
-bool WP_App_ProcessPayload(WP_Message* message)
+int WP_App_ProcessPayload(WP_Message* message)
 {
     // Prevent processing duplicate packets
     if(message->m_header.m_seq == lastPacketSequence)
@@ -100,7 +100,7 @@ bool WP_App_ProcessPayload(WP_Message* message)
         if(cmd->command == message->m_header.m_cmd)
         {
             // execute command handler and save the result
-            bool commandHandlerExecuteResult = ((bool* (*)(WP_Message*))cmd->handler)(message);
+            int commandHandlerExecuteResult = ((int* (*)(WP_Message*))cmd->handler)(message);
 
             WP_ReplyToCommand(message, commandHandlerExecuteResult, false, NULL, 0);
             return true;