1 files changed, 69 insertions, 63 deletions

diff --git a/include/rv/automata.h b/include/rv/automata.h
index eb9e636809a0..4a4eb40cf09a 100644
--- a/include/rv/automata.h
+++ b/include/rv/automata.h
@@ -6,70 +6,76 @@
  * models in C generated by the dot2k tool.
  */
 
+#ifndef _RV_AUTOMATA_H
+#define _RV_AUTOMATA_H
+
+#ifndef MONITOR_NAME
+#error "MONITOR_NAME macro is not defined. Did you include $(MODEL_NAME).h generated by rvgen?"
+#endif
+
+#define RV_AUTOMATON_NAME CONCATENATE(automaton_, MONITOR_NAME)
+#define EVENT_MAX CONCATENATE(event_max_, MONITOR_NAME)
+#define STATE_MAX CONCATENATE(state_max_, MONITOR_NAME)
+#define events CONCATENATE(events_, MONITOR_NAME)
+#define states CONCATENATE(states_, MONITOR_NAME)
+
+/*
+ * model_get_state_name - return the (string) name of the given state
+ */
+static char *model_get_state_name(enum states state)
+{
+	if ((state < 0) || (state >= STATE_MAX))
+		return "INVALID";
+
+	return RV_AUTOMATON_NAME.state_names[state];
+}
+
+/*
+ * model_get_event_name - return the (string) name of the given event
+ */
+static char *model_get_event_name(enum events event)
+{
+	if ((event < 0) || (event >= EVENT_MAX))
+		return "INVALID";
+
+	return RV_AUTOMATON_NAME.event_names[event];
+}
+
 /*
- * DECLARE_AUTOMATA_HELPERS - define a set of helper functions for automata
+ * model_get_initial_state - return the automaton's initial state
+ */
+static inline enum states model_get_initial_state(void)
+{
+	return RV_AUTOMATON_NAME.initial_state;
+}
+
+/*
+ * model_get_next_state - process an automaton event occurrence
  *
- * Define a set of helper functions for automata. The 'name' argument is used
- * as suffix for the functions and data. These functions will handle automaton
- * with data type 'type'.
+ * Given the current state (curr_state) and the event (event), returns
+ * the next state, or INVALID_STATE in case of error.
+ */
+static inline enum states model_get_next_state(enum states curr_state,
+					enum events event)
+{
+	if ((curr_state < 0) || (curr_state >= STATE_MAX))
+		return INVALID_STATE;
+
+	if ((event < 0) || (event >= EVENT_MAX))
+		return INVALID_STATE;
+
+	return RV_AUTOMATON_NAME.function[curr_state][event];
+}
+
+/*
+ * model_is_final_state - check if the given state is a final state
  */
-#define DECLARE_AUTOMATA_HELPERS(name, type)					\
-										\
-/*										\
- * model_get_state_name_##name - return the (string) name of the given state	\
- */ 										\
-static char *model_get_state_name_##name(enum states_##name state)		\
-{										\
-	if ((state < 0) || (state >= state_max_##name))				\
-		return "INVALID";						\
-										\
-	return automaton_##name.state_names[state];				\
-}										\
-										\
-/*										\
- * model_get_event_name_##name - return the (string) name of the given event	\
- */										\
-static char *model_get_event_name_##name(enum events_##name event)		\
-{										\
-	if ((event < 0) || (event >= event_max_##name))				\
-		return "INVALID";						\
-										\
-	return automaton_##name.event_names[event];				\
-}										\
-										\
-/*										\
- * model_get_initial_state_##name - return the automaton's initial state		\
- */										\
-static inline type model_get_initial_state_##name(void)				\
-{										\
-	return automaton_##name.initial_state;					\
-}										\
-										\
-/*										\
- * model_get_next_state_##name - process an automaton event occurrence		\
- *										\
- * Given the current state (curr_state) and the event (event), returns		\
- * the next state, or INVALID_STATE in case of error.				\
- */										\
-static inline type model_get_next_state_##name(enum states_##name curr_state,	\
-					       enum events_##name event)	\
-{										\
-	if ((curr_state < 0) || (curr_state >= state_max_##name))		\
-		return INVALID_STATE;						\
-										\
-	if ((event < 0) || (event >= event_max_##name))				\
-		return INVALID_STATE;						\
-										\
-	return automaton_##name.function[curr_state][event];			\
-}										\
-										\
-/*										\
- * model_is_final_state_##name - check if the given state is a final state	\
- */										\
-static inline bool model_is_final_state_##name(enum states_##name state)	\
-{										\
-	if ((state < 0) || (state >= state_max_##name))				\
-		return 0;							\
-										\
-	return automaton_##name.final_states[state];				\
+static inline bool model_is_final_state(enum states state)
+{
+	if ((state < 0) || (state >= STATE_MAX))
+		return 0;
+
+	return RV_AUTOMATON_NAME.final_states[state];
 }
+
+#endif