8a82411fe2c0cd71529685398d3f26f431518974

diff --cc examples/simuc/Makefile
Simple merge

diff --cc examples/simuc/src/main.cpp
index 040fbf3a25ab76f4c86bc7bfd2875a9d381615d6,575165b6223acce97d498b904bf3b6d45895b092..f7fde5789e248908fae70fcb6a23f7ea29871ccb
--- 1/examples/simuc/src/main.cpp
--- 2/examples/simuc/src/main.cpp
+++ b/examples/simuc/src/main.cpp
@@@ -204,23 -199,13 +204,29 @@@ int main (int argc, char **argv) 
      if (errno == 1) {
          return 1;
      }
++<<<<<<< HEAD
 +    printf("----------------------------------------------------------------------\n");
 +    printf("available commands:\n");
 +    printf(" b (break), c (continue), s (stack), r (reset), p (power), q (quit)\n");
 +    printf("----------------------------------------------------------------------\n");
++=======
+     printf("--------------------------------------------------------------------\n");
+     printf("available commands: i (interrupt), c (continue), s (stack), r (reset), q (quit)\n");
+     printf("--------------------------------------------------------------------\n");
++>>>>>>> master-sx
      printf("init done - press key to start\n");
 -    getchar();
 -    printf("--------------------------------------------------------------------\n");
 -    start();
 +    char c = getchar();
 +    getchar(); // remove line feed from stdin
 +    printf("----------------------------------------------------------------------\n");
 +    
 +    switch (c) {
 +        case 'b': start(CommandBreak, NULL); break;
 +        case 's': start(CommandStack, NULL); break;
 +        case 'r': start(CommandReset, NULL); break;
 +        case 'p': start(CommandPower, NULL); break;
 +        case 'q': return 0;
 +        default: start(ReadyForNewCommand, NULL); break;
 +    }
      
      // int cnt = 0;
      char *line = NULL;
@@@ -238,7 -223,7 +244,11 @@@
          // }
          
          if (getline(&line, &size, stdin) > 0) {
++<<<<<<< HEAD
 +            const char *commands[] = { "quit", "break", "continue", "stack", "reset", "power" };
++=======
+             const char *commands[] = { "quit", "interrupt", "continue", "stack", "reset" };
++>>>>>>> master-sx
              try {
                  int foundIndex = -1;
                  int foundCnt = 0;
@@@ -310,4 -295,4 +320,4 @@@
  
      usleep(10000);
      return 0;
--}
++}

diff --cc examples/simuc/src/simavr/simavr.cpp
Simple merge

diff --cc examples/simuc/src/simavr/simavr.h
index ff391bc49bb94d25c3f64341a41e0bf10d361b6a,0184f5b6a8d0bc9e2f5c34f49dbc34bb6a99527e..141084a7c02a09d760a447d5a1f6f2dff34167eb
--- 1/examples/simuc/src/simavr/simavr.h
--- 2/examples/simuc/src/simavr/simavr.h
+++ b/examples/simuc/src/simavr/simavr.h
@@@ -93,10 -91,10 +93,10 @@@ public
        struct SimAvrEvent waitForEvent ();
        const char *eventText (EnumSimAvrEvent event);
  
--public:    
++public:
        void load (struct StartParameters *params);
        void shutdown ();
 -      void start ();
 +      void start (EnumSimAvrCommand cmd, void *param);
        void stop ();
        void addEvent (int event);
        void setUartDumpEnabled (bool enabled);
@@@ -137,4 -134,4 +137,4 @@@ private
  
  
  
--#endif // SIMAVR_H
++#endif // SIMAVR_H