Revision 47e89ebf core/src/aos_main.cpp

View differences:

core/src/aos_main.cpp
131 131
 */
132 132
static AosIOChannel _stdiochannel;
133 133

  
134
#if (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) || defined(__DOXYGEN__)
134
#if (AMIROOS_CFG_SHELL_ENABLE == true) || defined(__DOXYGEN__)
135

  
135 136
/**
136 137
 * @brief   I/O shell channel for the programmer interface.
137 138
 */
138 139
static AosShellChannel _stdshellchannel;
139
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true)*/
140

  
141
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) */
140 142
#endif /* defined(MODULE_HAL_PROGIF) */
141 143

  
142 144
/*
......
953 955
#endif /* defined(AMIROOS_CFG_MAIN_INIT_HOOK_2) */
954 956

  
955 957
  // AMiRo-OS, additional interrupts and custom OS additions (if any)
956
#if (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true)
958
#if (AMIROOS_CFG_SHELL_ENABLE == true)
957 959
  aosSysInit(moduleShellPrompt);
958
#else /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
959
  aosSysInit();
960
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
960
#else /* (AMIROOS_CFG_SHELL_ENABLE == true) */
961
  aosSysInit(NULL);
962
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) */
961 963
#if defined(MODULE_INIT_INTERRUPTS)
962 964
  MODULE_INIT_INTERRUPTS();
963 965
#endif
......
1012 1014
  aosIOChannelInit(&_stdiochannel, (BaseAsynchronousChannel*)&MODULE_HAL_PROGIF);
1013 1015
  aosIOChannelOutputEnable(&_stdiochannel);
1014 1016
  aosIOStreamAddChannel(&aos.iostream, &_stdiochannel);
1015
#if (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true)
1017
#if (AMIROOS_CFG_SHELL_ENABLE == true)
1016 1018
  aosShellChannelInit(&_stdshellchannel, (BaseAsynchronousChannel*)&MODULE_HAL_PROGIF);
1017 1019
  aosShellChannelInputEnable(&_stdshellchannel);
1018 1020
  aosShellChannelOutputEnable(&_stdshellchannel);
1019 1021
  aosShellStreamAddChannel(&aos.shell.stream, &_stdshellchannel);
1020
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
1022
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) */
1021 1023
#endif /* defined(MODULE_HAL_PROGIF) */
1022 1024

  
1023 1025
#if defined(AMIROOS_CFG_MAIN_INIT_HOOK_5)

Also available in: Unified diff