From 2376aeb614d69d7050209f858818bfa7d36be398 Mon Sep 17 00:00:00 2001 From: Jérôme Jutteau Date: Mon, 2 May 2011 23:32:51 +0200 Subject: digital/io: adapt FSM to new FSM system (AngFSM) --- digital/io/src/fsm_templates/template_cb.h | 10 ---- digital/io/src/fsm_templates/template_cb_decl.h | 6 --- digital/io/src/fsm_templates/template_cb_impl.c | 9 ---- digital/io/src/fsm_templates/template_fsm.c | 55 ---------------------- digital/io/src/fsm_templates/template_fsm.h | 52 -------------------- .../io/src/fsm_templates/template_hola_cb_skel.c | 11 ----- .../io/src/fsm_templates/template_init_cb_skel.c | 11 ----- .../io/src/fsm_templates/template_loader_cb_skel.c | 11 ----- .../io/src/fsm_templates/template_move_cb_skel.c | 11 ----- .../io/src/fsm_templates/template_top_cb_skel.c | 11 ----- 10 files changed, 187 deletions(-) delete mode 100644 digital/io/src/fsm_templates/template_cb.h delete mode 100644 digital/io/src/fsm_templates/template_cb_decl.h delete mode 100644 digital/io/src/fsm_templates/template_cb_impl.c delete mode 100644 digital/io/src/fsm_templates/template_fsm.c delete mode 100644 digital/io/src/fsm_templates/template_fsm.h delete mode 100644 digital/io/src/fsm_templates/template_hola_cb_skel.c delete mode 100644 digital/io/src/fsm_templates/template_init_cb_skel.c delete mode 100644 digital/io/src/fsm_templates/template_loader_cb_skel.c delete mode 100644 digital/io/src/fsm_templates/template_move_cb_skel.c delete mode 100644 digital/io/src/fsm_templates/template_top_cb_skel.c (limited to 'digital/io/src/fsm_templates') diff --git a/digital/io/src/fsm_templates/template_cb.h b/digital/io/src/fsm_templates/template_cb.h deleted file mode 100644 index 4f4deeec..00000000 --- a/digital/io/src/fsm_templates/template_cb.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef %(prefix)s_cb_h -#define %(prefix)s_cb_h -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * %(name)s callbacks declaration. - * -%(*comments)s */ - -%(states_template,template_cb_decl.h)s#endif /* %(prefix)s_cb_h */ diff --git a/digital/io/src/fsm_templates/template_cb_decl.h b/digital/io/src/fsm_templates/template_cb_decl.h deleted file mode 100644 index fd72d678..00000000 --- a/digital/io/src/fsm_templates/template_cb_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * %(state)s =%(event)s=> -%(*branches_to)s */ -fsm_branch_t -%(prefix)s__%(state)s__%(event)s (void); - diff --git a/digital/io/src/fsm_templates/template_cb_impl.c b/digital/io/src/fsm_templates/template_cb_impl.c deleted file mode 100644 index 91ff4fbb..00000000 --- a/digital/io/src/fsm_templates/template_cb_impl.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * %(state)s =%(event)s=> -%(*branches_to)s */ -fsm_branch_t -%(prefix)s__%(state)s__%(event)s (void) -{ -%(returns)s -} - diff --git a/digital/io/src/fsm_templates/template_fsm.c b/digital/io/src/fsm_templates/template_fsm.c deleted file mode 100644 index 03ce5abf..00000000 --- a/digital/io/src/fsm_templates/template_fsm.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * %(name)s - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -#define NULL ((void *)0L) - -/* %(name)s transition table. */ -static const fsm_transition_t PROGMEM -%(prefix)s_transition_table[%(PREFIX)s_STATE_NB][%(PREFIX)s_EVENT_NB] = { -%(transition_table)s}; - -/* %(name)s state timeout table. */ -static const uint16_t -%(prefix)s_state_timeout_table[%(PREFIX)s_STATE_NB] = { -%(states,%(@timeout|0xffff)s)s}; - -#ifdef HOST - -/* %(name)s state names. */ -static const char * -%(prefix)s_states_names[] = { -%(states_names)s}; - -/* %(name)s event names. */ -static const char * -%(prefix)s_events_names[] = { -%(events_names)s}; - -#endif /* HOST */ - -/* %(name)s context. */ -fsm_t %(prefix)s_fsm = { - &%(prefix)s_transition_table[0][0], - %(PREFIX)s_EVENT_NB, - { - %(initials)s}, - { - %(initials)s}, - %(initials_nb)s, - &%(prefix)s_state_timeout_table[0], - { 0 }, - %(PREFIX)s_EVENT_state_timeout, -#ifdef HOST - "%(name)s", - %(prefix)s_states_names, - %(prefix)s_events_names, -#endif -}; - diff --git a/digital/io/src/fsm_templates/template_fsm.h b/digital/io/src/fsm_templates/template_fsm.h deleted file mode 100644 index 9ac98895..00000000 --- a/digital/io/src/fsm_templates/template_fsm.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef %(prefix)s_fsm_h -#define %(prefix)s_fsm_h -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * %(name)s - * -%(*comments)s */ - -/* %(name)s states. */ -enum %(prefix)s_state_t -{ -%(states)s %(PREFIX)s_STATE_NB -}; - -/* %(name)s events. */ -enum %(prefix)s_event_t -{ -%(events)s %(PREFIX)s_EVENT_NB -}; - -/* This macro enables checks for branches used in the wrong state/event - * combination. */ -#ifdef HOST -# define _BRANCH(state, event, to) \ - ((%(PREFIX)s_STATE_ ## state) << 16 \ - | (%(PREFIX)s_EVENT_ ## event) << 8 \ - | (%(PREFIX)s_STATE_ ## to)) -#else -# define _BRANCH(state, event, to) \ - ((%(PREFIX)s_STATE_ ## to)) -#endif - -/* %(name)s branches. */ -enum %(prefix)s_branch_t -{ -%(branches)s}; - -#undef _BRANCH - -/* Value to return to follow the only branch. */ -#define %(prefix)s_next(state, event) \ - %(PREFIX)s_BRANCH__ ## state ## __ ## event ## __ - -/* Value to return to follow a given branch. */ -#define %(prefix)s_next_branch(state, event, branch) \ - %(PREFIX)s_BRANCH__ ## state ## __ ## event ## __ ## branch - -/* %(name)s context. */ -extern fsm_t %(prefix)s_fsm; - -#endif /* %(prefix)s_fsm_h */ diff --git a/digital/io/src/fsm_templates/template_hola_cb_skel.c b/digital/io/src/fsm_templates/template_hola_cb_skel.c deleted file mode 100644 index 980718da..00000000 --- a/digital/io/src/fsm_templates/template_hola_cb_skel.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * Skeleton for %(name)s hola callbacks implementation. - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -%(states_template,template_cb_impl.c,origin=hola)s diff --git a/digital/io/src/fsm_templates/template_init_cb_skel.c b/digital/io/src/fsm_templates/template_init_cb_skel.c deleted file mode 100644 index fea9270e..00000000 --- a/digital/io/src/fsm_templates/template_init_cb_skel.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * Skeleton for %(name)s init callbacks implementation. - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -%(states_template,template_cb_impl.c,origin=init)s diff --git a/digital/io/src/fsm_templates/template_loader_cb_skel.c b/digital/io/src/fsm_templates/template_loader_cb_skel.c deleted file mode 100644 index 06398952..00000000 --- a/digital/io/src/fsm_templates/template_loader_cb_skel.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * Skeleton for %(name)s loader callbacks implementation. - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -%(states_template,template_cb_impl.c,origin=loader)s diff --git a/digital/io/src/fsm_templates/template_move_cb_skel.c b/digital/io/src/fsm_templates/template_move_cb_skel.c deleted file mode 100644 index 533ffbfd..00000000 --- a/digital/io/src/fsm_templates/template_move_cb_skel.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * Skeleton for %(name)s move callbacks implementation. - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -%(states_template,template_cb_impl.c,origin=move)s diff --git a/digital/io/src/fsm_templates/template_top_cb_skel.c b/digital/io/src/fsm_templates/template_top_cb_skel.c deleted file mode 100644 index 8895dc64..00000000 --- a/digital/io/src/fsm_templates/template_top_cb_skel.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * THIS IS AN AUTOMATICALLY GENERATED FILE, DO NOT EDIT! - * - * Skeleton for %(name)s top callbacks implementation. - * -%(*comments)s */ -#include "common.h" -#include "fsm.h" -#include "%(prefix)s_cb.h" - -%(states_template,template_cb_impl.c,origin=top)s -- cgit v1.2.3