Revision b6b45e4c os/core/src/aos_main.cpp

View differences:

os/core/src/aos_main.cpp
20 20
#include <ch.h>
21 21
#include <amiroos.h>
22 22

  
23
/*
24
 * hook to add further includes
25
 */
26
#if defined(AMIROOS_CFG_MAIN_EXTRA_INCLUDE)
27
AMIROOS_CFG_MAIN_EXTRA_INCLUDE
28
#endif
29

  
23 30
/**
24 31
 * @brief   Event mask to identify I/O events.
25 32
 */
......
54 61
#endif
55 62
#endif
56 63

  
64
/*
65
 * hook to add further static variables
66
 */
67
#if defined(AMIROOS_CFG_MAIN_EXTRA_STATIC_VARIABLES)
68
AMIROOS_CFG_MAIN_EXTRA_STATIC_VARIABLES
69
#endif
70

  
57 71
/**
58 72
 * @brief   Prints an error message about an unexpected event.
59 73
 *
......
75 89
  eventmask_t eventmask = 0;
76 90
  eventflags_t eventflags = 0;
77 91
  aos_shutdown_t shutdown = AOS_SHUTDOWN_NONE;
78
#if defined(AMIROOS_CFG_MAIN_EXTRA_VARIABLES)
79
  AMIROOS_CFG_MAIN_EXTRA_VARIABLES
92
#if defined(AMIROOS_CFG_MAIN_EXTRA_THREAD_VARIABLES)
93
  AMIROOS_CFG_MAIN_EXTRA_THREAD_VARIABLES
80 94
#endif
81 95

  
82 96
  /*
......
86 100
   */
87 101

  
88 102
#if defined(AMIROOS_CFG_MAIN_INIT_HOOK_0)
103
#if defined(AMIROOS_CFG_MAIN_INIT_HOOK_0_ARGS)
104
  AMIROOS_CFG_MAIN_INIT_HOOK_0(AMIROOS_CFG_MAIN_INIT_HOOK_0_ARGS);
105
#else
89 106
  AMIROOS_CFG_MAIN_INIT_HOOK_0();
90 107
#endif
108
#endif
91 109

  
92 110
  /* hardware, kernel, and operating system initialization */
93 111
  // ChibiOS/HAL and custom hal additions (if any)

Also available in: Unified diff