Revision 3106e8cc core/src/aos_main.cpp

View differences:

core/src/aos_main.cpp
952 952
#endif /* defined(AMIROOS_CFG_MAIN_INIT_HOOK_2_ARGS) */
953 953
#endif /* defined(AMIROOS_CFG_MAIN_INIT_HOOK_2) */
954 954

  
955
  // AMiRo-OS and custom OS additions (if any)
955
  // AMiRo-OS, additional interrupts and custom OS additions (if any)
956 956
#if (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true)
957 957
  aosSysInit(moduleShellPrompt);
958 958
#else /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
959 959
  aosSysInit();
960 960
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
961
#if defined(MODULE_INIT_INTERRUPTS)
962
  MODULE_INIT_INTERRUPTS();
963
#endif
961 964
#if defined(MODULE_INIT_OS_EXTRA)
962 965
  MODULE_INIT_OS_EXTRA();
963 966
#endif /* defined(MODULE_INIT_OS_EXTRA) */
......
998 1001
#if defined(MODULE_INIT_PERIPHERY_COMM)
999 1002
  MODULE_INIT_PERIPHERY_COMM();
1000 1003
#endif /* defined(MODULE_INIT_PERIPHERY_COMM) */
1001
#if (SSSP_STAGE3_ENABLE == true )
1004
#if ((SSSP_STAGE3_ENABLE == true) && (HAL_USE_CAN == TRUE))
1002 1005
  // CAN
1003 1006
  if (MODULE_HAL_CAN.state == CAN_STOP) {
1004 1007
    canStart(&MODULE_HAL_CAN, &moduleHalCanConfig);
1005 1008
  }
1006
#endif /* (SSSP_STAGE3_ENABLE == true) */
1009
#endif /* (SSSP_STAGE3_ENABLE == true) && (HAL_USE_CAN == TRUE) */
1007 1010
  // user interface (if any)
1008 1011
#if defined(MODULE_HAL_PROGIF)
1009 1012
  aosIOChannelInit(&_stdiochannel, (BaseAsynchronousChannel*)&MODULE_HAL_PROGIF);

Also available in: Unified diff