Revision 5b1b6715

View differences:

devices/DiWheelDrive/main.cpp
949 949 
              break;
950 950 
          }
951 951 
        }
952 
        // handle bootloader version 1.0.x
952 
        // handle bootloader version 1.0.x and 1.1.x
953 953 
        else if ((*((uint32_t*)(BL_CALLBACK_TABLE_ADDR)) == (('A'<<24) | ('-'<<16) | ('B'<<8) | ('L'<<0))) &&
954 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0) {
954 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && (((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0 || ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 1)) {
955 955 
          switch (shutdown_now) {
956 956 
            case SHUTDOWN_TRANSPORTATION:
957 957 
              blCallbackPtrAddr += 6 * 4;
devices/LightRing/main.cpp
640 640 
              break;
641 641 
          }
642 642 
        }
643 
        // handle bootloader version 1.0.x
643 
        // handle bootloader version 1.0.x and 1.1.x
644 644 
        else if ((*((uint32_t*)(BL_CALLBACK_TABLE_ADDR)) == (('A'<<24) | ('-'<<16) | ('B'<<8) | ('L'<<0))) &&
645 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0) {
645 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && (((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0 || ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 1)) {
646 646 
          switch (shutdown_now) {
647 647 
            case SHUTDOWN_TRANSPORTATION:
648 648 
              blCallbackPtrAddr += 6 * 4;
devices/PowerManagement/main.cpp
1182 1182 
              break;
1183 1183 
          }
1184 1184 
        }
1185 
        // handle bootloader version 1.0.x
1185 
        // handle bootloader version 1.0.x and 1.1.x
1186 1186 
        else if ((*((uint32_t*)(BL_CALLBACK_TABLE_ADDR)) == (('A'<<24) | ('-'<<16) | ('B'<<8) | ('L'<<0))) &&
1187 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0) {
1187 
                 ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->major == 1 && (((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 0 || ((blVersion_t*)(BL_CALLBACK_TABLE_ADDR + (1*4)))->minor == 1)) {
1188 1188 
          switch (shutdown_now) {
1189 1189 
            case SHUTDOWN_TRANSPORTATION:
1190 1190 
              blCallbackPtrAddr += 6 * 4;

Also available in: Unified diff