summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/common/tests/tests24
-rw-r--r--cesar/cp/Module6
-rw-r--r--cesar/cp/beacon/Module4
-rw-r--r--cesar/cp/beacon/beacon.h (renamed from cesar/cp2/beacon/beacon.h)18
-rw-r--r--cesar/cp/beacon/beacon_desc.h (renamed from cesar/cp2/beacon/beacon_desc.h)10
-rw-r--r--cesar/cp/beacon/defs.h (renamed from cesar/cp2/beacon/defs.h)10
-rw-r--r--cesar/cp/beacon/doc/Makefile (renamed from cesar/cp2/beacon/doc/Makefile)0
-rw-r--r--cesar/cp/beacon/doc/add-to-sched.sdl (renamed from cesar/cp2/beacon/doc/add-to-sched.sdl)0
-rw-r--r--cesar/cp/beacon/doc/beacon-spec.odt (renamed from cesar/cp2/beacon/doc/beacon-spec.odt)bin141976 -> 141976 bytes
-rw-r--r--cesar/cp/beacon/doc/beacon-study.odt (renamed from cesar/cp2/beacon/doc/beacon-study.odt)bin452327 -> 452327 bytes
-rw-r--r--cesar/cp/beacon/doc/beacons.xmi (renamed from cesar/cp2/beacon/doc/beacons.xmi)0
-rw-r--r--cesar/cp/beacon/doc/bentry_mgr.odt (renamed from cesar/cp2/beacon/doc/bentry_mgr.odt)bin181878 -> 181878 bytes
-rw-r--r--cesar/cp/beacon/doc/bentry_mgr.sdl (renamed from cesar/cp2/beacon/doc/bentry_mgr.sdl)0
-rw-r--r--cesar/cp/beacon/doc/discover-need-to-request.dot (renamed from cesar/cp2/beacon/doc/discover-need-to-request.dot)0
-rw-r--r--cesar/cp/beacon/doc/discover-process.sdl (renamed from cesar/cp2/beacon/doc/discover-process.sdl)0
-rw-r--r--cesar/cp/beacon/doc/processingbeacon.sdl (renamed from cesar/cp2/beacon/doc/processingbeacon.sdl)0
-rw-r--r--cesar/cp/beacon/doc/receivebeacon.sdl (renamed from cesar/cp2/beacon/doc/receivebeacon.sdl)0
-rw-r--r--cesar/cp/beacon/inc/beacon.h (renamed from cesar/cp2/beacon/inc/beacon.h)16
-rw-r--r--cesar/cp/beacon/inc/beacon_discover.h (renamed from cesar/cp2/beacon/inc/beacon_discover.h)14
-rw-r--r--cesar/cp/beacon/inc/beacon_work.h (renamed from cesar/cp2/beacon/inc/beacon_work.h)0
-rw-r--r--cesar/cp/beacon/inc/bentry.h (renamed from cesar/cp2/beacon/inc/bentry.h)16
-rw-r--r--cesar/cp/beacon/inc/bentry_msg.h (renamed from cesar/cp2/beacon/inc/bentry_msg.h)14
-rw-r--r--cesar/cp/beacon/inc/bentry_size.h (renamed from cesar/cp2/beacon/inc/bentry_size.h)10
-rw-r--r--cesar/cp/beacon/inc/common.h (renamed from cesar/cp2/beacon/inc/common.h)6
-rw-r--r--cesar/cp/beacon/ntb/Module (renamed from cesar/cp2/beacon/ntb/Module)0
-rw-r--r--cesar/cp/beacon/ntb/doc/ntb_clock_sync.odt (renamed from cesar/cp2/beacon/ntb/doc/ntb_clock_sync.odt)bin174674 -> 174674 bytes
-rw-r--r--cesar/cp/beacon/ntb/doc/ntb_clock_sync.xmi (renamed from cesar/cp2/beacon/ntb/doc/ntb_clock_sync.xmi)0
-rw-r--r--cesar/cp/beacon/ntb/inc/ntb_clock_utils.h (renamed from cesar/cp2/beacon/ntb/inc/ntb_clock_utils.h)0
-rw-r--r--cesar/cp/beacon/ntb/ntb_clock_sync.h (renamed from cesar/cp2/beacon/ntb/ntb_clock_sync.h)4
-rw-r--r--cesar/cp/beacon/ntb/src/ntb_clock_sync.c (renamed from cesar/cp2/beacon/ntb/src/ntb_clock_sync.c)4
-rw-r--r--cesar/cp/beacon/src/beacon.c (renamed from cesar/cp2/beacon/src/beacon.c)26
-rw-r--r--cesar/cp/beacon/src/beacon_discover.c (renamed from cesar/cp2/beacon/src/beacon_discover.c)8
-rw-r--r--cesar/cp/beacon/src/bentry.c (renamed from cesar/cp2/beacon/src/bentry.c)26
-rw-r--r--cesar/cp/beacon/src/bentry_msg.c (renamed from cesar/cp2/beacon/src/bentry_msg.c)18
-rw-r--r--cesar/cp/beacon/src/common.c (renamed from cesar/cp2/beacon/src/common.c)10
-rw-r--r--cesar/cp/beacon/test/Makefile (renamed from cesar/cp2/beacon/test/Makefile)24
-rw-r--r--cesar/cp/beacon/test/doc/Makefile (renamed from cesar/cp2/beacon/test/doc/Makefile)0
-rw-r--r--cesar/cp/beacon/test/doc/beacon-discover.txt (renamed from cesar/cp2/beacon/test/doc/beacon-discover.txt)0
-rw-r--r--cesar/cp/beacon/test/doc/beacon.txt (renamed from cesar/cp2/beacon/test/doc/beacon.txt)0
-rw-r--r--cesar/cp/beacon/test/doc/bentry.txt (renamed from cesar/cp2/beacon/test/doc/bentry.txt)0
-rw-r--r--cesar/cp/beacon/test/doc/default-schedules.txt (renamed from cesar/cp2/beacon/test/doc/default-schedules.txt)0
-rw-r--r--cesar/cp/beacon/test/doc/recv-beacon.txt (renamed from cesar/cp2/beacon/test/doc/recv-beacon.txt)2
-rw-r--r--cesar/cp/beacon/test/doc/send-beacon.txt (renamed from cesar/cp2/beacon/test/doc/send-beacon.txt)2
-rw-r--r--cesar/cp/beacon/test/ecos.ecc.sh (renamed from cesar/cp2/beacon/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/beacon/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/beacon/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/beacon/test/src/beacon.c (renamed from cesar/cp2/beacon/test/src/beacon.c)8
-rw-r--r--cesar/cp/beacon/test/src/bentry.c (renamed from cesar/cp2/beacon/test/src/bentry.c)18
-rw-r--r--cesar/cp/beacon/test/src/bw_stub.c (renamed from cesar/cp2/beacon/test/src/bw_stub.c)8
-rw-r--r--cesar/cp/beacon/test/src/ca_stub.c (renamed from cesar/cp2/beacon/test/src/ca_stub.c)0
-rw-r--r--cesar/cp/beacon/test/src/cco_send_central_beacon.c (renamed from cesar/cp2/beacon/test/src/cco_send_central_beacon.c)16
-rw-r--r--cesar/cp/beacon/test/src/cl_stub.c (renamed from cesar/cp2/beacon/test/src/cl_stub.c)0
-rw-r--r--cesar/cp/beacon/test/src/core_stub.c (renamed from cesar/cp2/beacon/test/src/core_stub.c)4
-rw-r--r--cesar/cp/beacon/test/src/default-sched.c (renamed from cesar/cp2/beacon/test/src/default-sched.c)14
-rw-r--r--cesar/cp/beacon/test/src/discover.c (renamed from cesar/cp2/beacon/test/src/discover.c)12
-rw-r--r--cesar/cp/beacon/test/src/fsm_stub.c (renamed from cesar/cp2/beacon/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/beacon/test/src/hal_timer_stub.c (renamed from cesar/cp2/beacon/test/src/hal_timer_stub.c)2
-rw-r--r--cesar/cp/beacon/test/src/interface_stub.c (renamed from cesar/cp2/beacon/test/src/interface_stub.c)2
-rw-r--r--cesar/cp/beacon/test/src/ntb_stub.c (renamed from cesar/cp2/beacon/test/src/ntb_stub.c)2
-rw-r--r--cesar/cp/beacon/test/src/region_stub.c (renamed from cesar/cp2/beacon/test/src/region_stub.c)10
-rw-r--r--cesar/cp/beacon/test/src/sta_receive_central_beacon.c (renamed from cesar/cp2/beacon/test/src/sta_receive_central_beacon.c)12
-rw-r--r--cesar/cp/cco/action/Module (renamed from cesar/cp2/cco/action/Module)0
-rw-r--r--cesar/cp/cco/action/cco_action.h (renamed from cesar/cp2/cco/action/cco_action.h)18
-rw-r--r--cesar/cp/cco/action/cco_conn/Module (renamed from cesar/cp2/cco/action/cco_conn/Module)0
-rw-r--r--cesar/cp/cco/action/cco_conn/cco_action.h (renamed from cesar/cp2/cco/action/cco_conn/cco_action.h)4
-rwxr-xr-xcesar/cp/cco/action/cco_conn/doc/CCo Con.odt (renamed from cesar/cp2/cco/action/cco_conn/doc/CCo Con.odt)bin304722 -> 304722 bytes
-rw-r--r--cesar/cp/cco/action/cco_conn/doc/cco_conn.xmi (renamed from cesar/cp2/cco/action/cco_conn/doc/cco_conn.xmi)0
-rw-r--r--cesar/cp/cco/action/cco_conn/inc/cco_action.h (renamed from cesar/cp2/cco/action/cco_conn/inc/cco_action.h)0
-rw-r--r--cesar/cp/cco/action/cco_conn/src/action.c (renamed from cesar/cp2/cco/action/cco_conn/src/action.c)30
-rw-r--r--cesar/cp/cco/action/cco_conn/test/Makefile (renamed from cesar/cp2/cco/action/cco_conn/test/Makefile)4
-rw-r--r--cesar/cp/cco/action/cco_conn/test/ecos.ecc.sh (renamed from cesar/cp2/cco/action/cco_conn/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/cco/action/cco_conn/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/cco/action/cco_conn/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/cco/action/cco_conn/test/src/cco_action_conn_test.c (renamed from cesar/cp2/cco/action/cco_conn/test/src/cco_action_conn_test.c)24
-rw-r--r--cesar/cp/cco/action/cco_conn/test/src/fsm_stub.c (renamed from cesar/cp2/cco/bw/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/cco/action/cco_conn/test/src/msg_stub.c (renamed from cesar/cp2/cco/action/cco_conn/test/src/msg_stub.c)24
-rw-r--r--cesar/cp/cco/action/doc/Makefile (renamed from cesar/cp2/cco/action/doc/Makefile)0
-rw-r--r--cesar/cp/cco/action/doc/assoc_procedure.sdl (renamed from cesar/cp2/cco/action/doc/assoc_procedure.sdl)0
-rw-r--r--cesar/cp/cco/action/doc/auth_procedure.sdl (renamed from cesar/cp2/cco/action/doc/auth_procedure.sdl)0
-rw-r--r--cesar/cp/cco/action/doc/cco_action.odt (renamed from cesar/cp2/cco/action/doc/cco_action.odt)bin203194 -> 203194 bytes
-rw-r--r--cesar/cp/cco/action/doc/cco_action.xmi (renamed from cesar/cp2/cco/action/doc/cco_action.xmi)0
-rw-r--r--cesar/cp/cco/action/doc/leave.sdl (renamed from cesar/cp2/cco/action/doc/leave.sdl)0
-rw-r--r--cesar/cp/cco/action/doc/snid.sdl (renamed from cesar/cp2/cco/action/doc/snid.sdl)0
-rw-r--r--cesar/cp/cco/action/doc/tei.sdl (renamed from cesar/cp2/cco/action/doc/tei.sdl)0
-rw-r--r--cesar/cp/cco/action/inc/cco_action.h (renamed from cesar/cp2/cco/action/inc/cco_action.h)12
-rw-r--r--cesar/cp/cco/action/src/cco_action.c (renamed from cesar/cp2/cco/action/src/cco_action.c)26
-rw-r--r--cesar/cp/cco/action/test/Makefile (renamed from cesar/cp2/cco/action/test/Makefile)8
-rw-r--r--cesar/cp/cco/action/test/doc/Makefile (renamed from cesar/cp2/cco/action/test/doc/Makefile)0
-rw-r--r--cesar/cp/cco/action/test/doc/cco_action.txt (renamed from cesar/cp2/cco/action/test/doc/cco_action.txt)0
-rw-r--r--cesar/cp/cco/action/test/ecos.ecc.sh (renamed from cesar/cp2/cco/action/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/cco/action/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/cco/action/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/cco/action/test/src/action-test.c (renamed from cesar/cp2/cco/action/test/src/action-test.c)14
-rw-r--r--cesar/cp/cco/action/test/src/action_gen_nek.c (renamed from cesar/cp2/cco/action/test/src/action_gen_nek.c)14
-rw-r--r--cesar/cp/cco/action/test/src/fsm_stub.c (renamed from cesar/cp2/cl_interf/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/cco/action/test/src/garbage.c (renamed from cesar/cp2/cco/action/test/src/garbage.c)12
-rw-r--r--cesar/cp/cco/action/test/src/secu_stub.c (renamed from cesar/cp2/cco/action/test/src/secu_stub.c)4
-rw-r--r--cesar/cp/cco/bw/Module (renamed from cesar/cp2/cco/bw/Module)0
-rw-r--r--cesar/cp/cco/bw/bw.h (renamed from cesar/cp2/cco/bw/bw.h)10
-rw-r--r--cesar/cp/cco/bw/bw_lib_alloc.h (renamed from cesar/cp2/cco/bw/bw_lib_alloc.h)12
-rw-r--r--cesar/cp/cco/bw/bw_prio_heap.h (renamed from cesar/cp2/cco/bw/bw_prio_heap.h)6
-rwxr-xr-xcesar/cp/cco/bw/doc/Bandwidth_Manager.odt (renamed from cesar/cp2/cco/bw/doc/Bandwidth_Manager.odt)bin538219 -> 538219 bytes
-rw-r--r--cesar/cp/cco/bw/doc/bw.xmi (renamed from cesar/cp2/cco/bw/doc/bw.xmi)0
-rw-r--r--cesar/cp/cco/bw/inc/bw.h (renamed from cesar/cp2/cco/bw/inc/bw.h)4
-rw-r--r--cesar/cp/cco/bw/inc/bw_prio_heap.h (renamed from cesar/cp2/cco/bw/inc/bw_prio_heap.h)8
-rw-r--r--cesar/cp/cco/bw/src/bw.c (renamed from cesar/cp2/cco/bw/src/bw.c)28
-rw-r--r--cesar/cp/cco/bw/src/bw_lib_alloc.c (renamed from cesar/cp2/cco/bw/src/bw_lib_alloc.c)8
-rw-r--r--cesar/cp/cco/bw/src/bw_prio_heap.c (renamed from cesar/cp2/cco/bw/src/bw_prio_heap.c)14
-rw-r--r--cesar/cp/cco/bw/test/Makefile (renamed from cesar/cp2/cco/bw/test/Makefile)8
-rw-r--r--cesar/cp/cco/bw/test/bandwidth manager - test plan.ods (renamed from cesar/cp2/cco/bw/test/bandwidth manager - test plan.ods)bin16461 -> 16461 bytes
-rw-r--r--cesar/cp/cco/bw/test/ecos.ecc.sh (renamed from cesar/cp2/cco/bw/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/cco/bw/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/cco/bw/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/cco/bw/test/src/bw_list_alloc_test.c (renamed from cesar/cp2/cco/bw/test/src/bw_list_alloc_test.c)6
-rw-r--r--cesar/cp/cco/bw/test/src/bw_prio_heap_test.c (renamed from cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c)18
-rw-r--r--cesar/cp/cco/bw/test/src/bw_test.c (renamed from cesar/cp2/cco/bw/test/src/bw_test.c)26
-rw-r--r--cesar/cp/cco/bw/test/src/cl_stub.c (renamed from cesar/cp2/cco/bw/test/src/cl_stub.c)0
-rw-r--r--cesar/cp/cco/bw/test/src/fsm_stub.c (renamed from cesar/cp2/cco/action/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/cco/bw/test/src/msg_stub.c (renamed from cesar/cp2/cco/bw/test/src/msg_stub.c)14
-rw-r--r--cesar/cp/cco/bw/test/src/pwl_stub.c (renamed from cesar/cp2/cco/bw/test/src/pwl_stub.c)8
-rwxr-xr-xcesar/cp/cco/region/doc/Region_Manager.odt (renamed from cesar/cp2/cco/region/doc/Region_Manager.odt)bin239806 -> 239806 bytes
-rw-r--r--cesar/cp/cco/region/doc/region.xmi (renamed from cesar/cp2/cco/region/doc/region.xmi)0
-rw-r--r--cesar/cp/cco/region/inc/region.h (renamed from cesar/cp2/cco/region/inc/region.h)4
-rw-r--r--cesar/cp/cco/region/region.h (renamed from cesar/cp2/cco/region/region.h)6
-rw-r--r--cesar/cp/cl_interf/Module (renamed from cesar/cp2/cl_interf/Module)0
-rw-r--r--cesar/cp/cl_interf/cl_interf.h (renamed from cesar/cp2/cl_interf/cl_interf.h)12
-rw-r--r--cesar/cp/cl_interf/doc/cl-interf.xmi (renamed from cesar/cp2/cl_interf/doc/cl-interf.xmi)0
-rw-r--r--cesar/cp/cl_interf/doc/cp_cl_interf.odt (renamed from cesar/cp2/cl_interf/doc/cp_cl_interf.odt)bin102411 -> 102411 bytes
-rw-r--r--cesar/cp/cl_interf/inc/cl_interf.h (renamed from cesar/cp2/cl_interf/inc/cl_interf.h)12
-rw-r--r--cesar/cp/cl_interf/inc/cl_interf_msg.h (renamed from cesar/cp2/cl_interf/inc/cl_interf_msg.h)8
-rw-r--r--cesar/cp/cl_interf/inc/context.h (renamed from cesar/cp2/cl_interf/inc/context.h)0
-rw-r--r--cesar/cp/cl_interf/src/cl_interf.c (renamed from cesar/cp2/cl_interf/src/cl_interf.c)20
-rw-r--r--cesar/cp/cl_interf/test/Makefile (renamed from cesar/cp2/cl_interf/test/Makefile)6
-rw-r--r--cesar/cp/cl_interf/test/doc/Makefile (renamed from cesar/cp2/cl_interf/test/doc/Makefile)0
-rw-r--r--cesar/cp/cl_interf/test/doc/cl-interf.txt (renamed from cesar/cp2/cl_interf/test/doc/cl-interf.txt)0
-rw-r--r--cesar/cp/cl_interf/test/ecos.ecc.sh (renamed from cesar/cp2/cl_interf/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/cl_interf/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/cl_interf/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/cl_interf/test/src/cl_stub.c (renamed from cesar/cp2/cl_interf/test/src/cl_stub.c)0
-rw-r--r--cesar/cp/cl_interf/test/src/fsm_stub.c (renamed from cesar/cp2/cco/action/cco_conn/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/cl_interf/test/src/test-cl-interf.c (renamed from cesar/cp2/cl_interf/test/src/test-cl-interf.c)22
-rw-r--r--cesar/cp/conn/Module (renamed from cesar/cp2/conn/Module)0
-rw-r--r--cesar/cp/conn/conn.h (renamed from cesar/cp2/conn/conn.h)8
-rw-r--r--cesar/cp/conn/conn_mgr.h (renamed from cesar/cp2/conn/conn_mgr.h)8
-rw-r--r--cesar/cp/conn/doc/conn.odt (renamed from cesar/cp2/conn/doc/conn.odt)bin280499 -> 280499 bytes
-rw-r--r--cesar/cp/conn/doc/conn.xmi (renamed from cesar/cp2/conn/doc/conn.xmi)0
-rw-r--r--cesar/cp/conn/inc/conn.h (renamed from cesar/cp2/conn/inc/conn.h)6
-rw-r--r--cesar/cp/conn/inc/link.h (renamed from cesar/cp2/conn/inc/link.h)6
-rw-r--r--cesar/cp/conn/link.h (renamed from cesar/cp2/conn/link.h)6
-rw-r--r--cesar/cp/conn/src/conn.c (renamed from cesar/cp2/conn/src/conn.c)18
-rw-r--r--cesar/cp/conn/src/conn_mgr.c (renamed from cesar/cp2/conn/src/conn_mgr.c)26
-rw-r--r--cesar/cp/conn/src/link.c (renamed from cesar/cp2/conn/src/link.c)14
-rw-r--r--cesar/cp/conn/test/Makefile (renamed from cesar/cp2/conn/test/Makefile)6
-rw-r--r--cesar/cp/conn/test/ecos.ecc.sh (renamed from cesar/cp2/conn/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/conn/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/conn/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/conn/test/src/conn_mgr_test.c (renamed from cesar/cp2/conn/test/src/conn_mgr_test.c)18
-rw-r--r--cesar/cp/conn/test/src/conn_test.c (renamed from cesar/cp2/conn/test/src/conn_test.c)18
-rw-r--r--cesar/cp/conn/test/src/fsm_stub.c29
-rw-r--r--cesar/cp/conn/test/src/msg_stub.c (renamed from cesar/cp2/conn/test/src/msg_stub.c)14
-rw-r--r--cesar/cp/conn/test/src/pwl_stub.c (renamed from cesar/cp2/conn/test/src/pwl_stub.c)8
-rw-r--r--cesar/cp/cp.h (renamed from cesar/cp2/cp.h)10
-rw-r--r--cesar/cp/defs.h (renamed from cesar/cp2/defs.h)10
-rw-r--r--cesar/cp/doc/Makefile (renamed from cesar/cp2/doc/Makefile)0
-rw-r--r--cesar/cp/doc/archi.txt (renamed from cesar/cp2/doc/archi.txt)0
-rw-r--r--cesar/cp/doc/cp.xmi (renamed from cesar/cp2/doc/cp.xmi)0
-rw-r--r--cesar/cp/doc/cp_archi.odt (renamed from cesar/cp2/doc/cp_archi.odt)bin285983 -> 285983 bytes
-rw-r--r--cesar/cp/doc/mme_rx_handle.svg (renamed from cesar/cp2/doc/mme_rx_handle.svg)2
-rw-r--r--cesar/cp/doc/overview.svg (renamed from cesar/cp2/doc/overview.svg)2
-rw-r--r--cesar/cp/fsm/Module (renamed from cesar/cp2/fsm/Module)8
-rw-r--r--cesar/cp/fsm/forward.h (renamed from cesar/cp2/fsm/forward.h)10
-rw-r--r--cesar/cp/fsm/fsm.h (renamed from cesar/cp2/fsm/fsm.h)12
-rw-r--r--cesar/cp/fsm/inc/context.h (renamed from cesar/cp2/fsm/inc/context.h)10
-rw-r--r--cesar/cp/fsm/inc/events.h (renamed from cesar/cp2/fsm/inc/events.h)18
-rw-r--r--cesar/cp/fsm/inc/tables.h (renamed from cesar/cp2/fsm/inc/tables.h)10
-rw-r--r--cesar/cp/fsm/src/events.c (renamed from cesar/cp2/fsm/src/events.c)6
-rw-r--r--cesar/cp/fsm/src/fsm.c (renamed from cesar/cp2/fsm/src/fsm.c)6
-rw-r--r--cesar/cp/fsm/src/fsm/cp.conf (renamed from cesar/cp2/fsm/src/fsm/cp.conf)0
-rw-r--r--cesar/cp/fsm/src/fsm/cp.fsm (renamed from cesar/cp2/fsm/src/fsm/cp.fsm)0
-rw-r--r--cesar/cp/fsm/src/fsm/template_defs.h (renamed from cesar/cp2/fsm/src/fsm/template_defs.h)0
-rw-r--r--cesar/cp/fsm/src/fsm/template_tables.h (renamed from cesar/cp2/fsm/src/fsm/template_tables.h)0
-rw-r--r--cesar/cp/fsm/src/tables.c (renamed from cesar/cp2/fsm/src/tables.c)6
-rw-r--r--cesar/cp/fsm/test/utest/Config (renamed from cesar/cp2/fsm/test/utest/Config)0
-rw-r--r--cesar/cp/fsm/test/utest/Makefile17
-rw-r--r--cesar/cp/fsm/test/utest/inc/scenario_defs.h (renamed from cesar/cp2/fsm/test/utest/inc/scenario_defs.h)6
-rw-r--r--cesar/cp/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm (renamed from cesar/cp2/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm)0
-rw-r--r--cesar/cp/fsm/test/utest/override/cp2/inc/context.h (renamed from cesar/cp2/fsm/test/utest/override/cp2/inc/context.h)12
-rw-r--r--cesar/cp/fsm/test/utest/src/actions.c (renamed from cesar/cp2/fsm/test/utest/src/actions.c)0
-rw-r--r--cesar/cp/fsm/test/utest/src/fsm_stub.c (renamed from cesar/cp2/fsm/test/utest/src/fsm_stub.c)4
-rw-r--r--cesar/cp/fsm/test/utest/src/test_fsm.c (renamed from cesar/cp2/fsm/test/utest/src/test_fsm.c)4
-rw-r--r--cesar/cp/inc/context.h (renamed from cesar/cp2/inc/context.h)52
-rw-r--r--cesar/cp/mme.h (renamed from cesar/cp2/mme.h)14
-rw-r--r--cesar/cp/msg/Module (renamed from cesar/cp2/msg/Module)0
-rw-r--r--cesar/cp/msg/inc/cc_assoc.h (renamed from cesar/cp2/msg/inc/cc_assoc.h)10
-rw-r--r--cesar/cp/msg/inc/cc_leave.h (renamed from cesar/cp2/msg/inc/cc_leave.h)10
-rw-r--r--cesar/cp/msg/inc/cc_set_tei_map.h (renamed from cesar/cp2/msg/inc/cc_set_tei_map.h)10
-rw-r--r--cesar/cp/msg/inc/cc_who_ru.h (renamed from cesar/cp2/msg/inc/cc_who_ru.h)10
-rw-r--r--cesar/cp/msg/inc/cm_get_key.h (renamed from cesar/cp2/msg/inc/cm_get_key.h)10
-rw-r--r--cesar/cp/msg/inc/cm_key.h (renamed from cesar/cp2/msg/inc/cm_key.h)10
-rw-r--r--cesar/cp/msg/inc/cm_mme_error.h (renamed from cesar/cp2/msg/inc/cm_mme_error.h)10
-rw-r--r--cesar/cp/msg/inc/cm_set_key.h (renamed from cesar/cp2/msg/inc/cm_set_key.h)10
-rw-r--r--cesar/cp/msg/inc/context.h (renamed from cesar/cp2/msg/inc/context.h)10
-rw-r--r--cesar/cp/msg/inc/msg.h (renamed from cesar/cp2/msg/inc/msg.h)12
-rw-r--r--cesar/cp/msg/inc/msg_cc.h (renamed from cesar/cp2/msg/inc/msg_cc.h)12
-rw-r--r--cesar/cp/msg/inc/msg_cm.h (renamed from cesar/cp2/msg/inc/msg_cm.h)10
-rw-r--r--cesar/cp/msg/inc/msg_drv.h (renamed from cesar/cp2/msg/inc/msg_drv.h)10
-rw-r--r--cesar/cp/msg/msg.h (renamed from cesar/cp2/msg/msg.h)16
-rw-r--r--cesar/cp/msg/src/mme.c (renamed from cesar/cp2/msg/src/mme.c)10
-rw-r--r--cesar/cp/msg/src/msg.c (renamed from cesar/cp2/msg/src/msg.c)20
-rw-r--r--cesar/cp/msg/src/msg_cc.c (renamed from cesar/cp2/msg/src/msg_cc.c)16
-rw-r--r--cesar/cp/msg/src/msg_cm.c (renamed from cesar/cp2/msg/src/msg_cm.c)16
-rw-r--r--cesar/cp/msg/test/Makefile (renamed from cesar/cp2/msg/test/Makefile)10
-rw-r--r--cesar/cp/msg/test/doc/Makefile (renamed from cesar/cp2/msg/test/doc/Makefile)0
-rw-r--r--cesar/cp/msg/test/doc/read-header.txt (renamed from cesar/cp2/msg/test/doc/read-header.txt)0
-rw-r--r--cesar/cp/msg/test/overide/cp2/inc/context.h (renamed from cesar/cp2/msg/test/overide/cp2/inc/context.h)14
-rw-r--r--cesar/cp/msg/test/overide/cp2/sta/core/core.h (renamed from cesar/cp2/msg/test/overide/cp2/sta/core/core.h)8
-rw-r--r--cesar/cp/msg/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/msg/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/msg/test/src/cc_set_tei_map_frag.c (renamed from cesar/cp2/msg/test/src/cc_set_tei_map_frag.c)6
-rw-r--r--cesar/cp/msg/test/src/cl_stub.c (renamed from cesar/cp2/msg/test/src/cl_stub.c)0
-rw-r--r--cesar/cp/msg/test/src/cp_cl_interface_stub.c (renamed from cesar/cp2/msg/test/src/cp_cl_interface_stub.c)6
-rw-r--r--cesar/cp/msg/test/src/fsm_stub.c29
-rw-r--r--cesar/cp/msg/test/src/interface_stub.c (renamed from cesar/cp2/msg/test/src/interface_stub.c)2
-rw-r--r--cesar/cp/msg/test/src/msg_cc.c (renamed from cesar/cp2/msg/test/src/msg_cc.c)16
-rw-r--r--cesar/cp/msg/test/src/msg_cm.c (renamed from cesar/cp2/msg/test/src/msg_cm.c)16
-rw-r--r--cesar/cp/msg/test/src/sta_mgr_stub.c (renamed from cesar/cp2/msg/test/src/sta_mgr_stub.c)4
-rw-r--r--cesar/cp/msg/test/src/test-msg-read-header.c (renamed from cesar/cp2/msg/test/src/test-msg-read-header.c)6
-rw-r--r--cesar/cp/pwl/Module (renamed from cesar/cp2/pwl/Module)0
-rw-r--r--cesar/cp/pwl/doc/pwl.xmi (renamed from cesar/cp2/pwl/doc/pwl.xmi)0
-rw-r--r--cesar/cp/pwl/doc/scilab/Makefile (renamed from cesar/cp2/pwl/doc/scilab/Makefile)0
-rw-r--r--cesar/cp/pwl/doc/scilab/convertc.sce (renamed from cesar/cp2/pwl/doc/scilab/convertc.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/estimate_acl_freq_decrease.sce (renamed from cesar/cp2/pwl/doc/scilab/estimate_acl_freq_decrease.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/estimate_acl_freq_increase.sce (renamed from cesar/cp2/pwl/doc/scilab/estimate_acl_freq_increase.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/estimate_acl_stable.sce (renamed from cesar/cp2/pwl/doc/scilab/estimate_acl_stable.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/src/estimateBP.sce (renamed from cesar/cp2/pwl/doc/scilab/src/estimateBP.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/src/zc_capture.sce (renamed from cesar/cp2/pwl/doc/scilab/src/zc_capture.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/src/zc_capture_decrease.sce (renamed from cesar/cp2/pwl/doc/scilab/src/zc_capture_decrease.sce)0
-rw-r--r--cesar/cp/pwl/doc/scilab/src/zc_capture_increase.sce (renamed from cesar/cp2/pwl/doc/scilab/src/zc_capture_increase.sce)0
-rw-r--r--cesar/cp/pwl/doc/spec.odt (renamed from cesar/cp2/pwl/doc/spec.odt)bin115628 -> 115628 bytes
-rw-r--r--cesar/cp/pwl/doc/study.odt (renamed from cesar/cp2/pwl/doc/study.odt)bin118536 -> 118536 bytes
-rw-r--r--cesar/cp/pwl/pwl.h (renamed from cesar/cp2/pwl/pwl.h)10
-rw-r--r--cesar/cp/pwl/src/pwl.c (renamed from cesar/cp2/pwl/src/pwl.c)10
-rw-r--r--cesar/cp/pwl/test/Makefile (renamed from cesar/cp2/pwl/test/Makefile)2
-rw-r--r--cesar/cp/pwl/test/doc/Makefile (renamed from cesar/cp2/pwl/test/doc/Makefile)0
-rw-r--r--cesar/cp/pwl/test/doc/pwl.txt (renamed from cesar/cp2/pwl/test/doc/pwl.txt)2
-rw-r--r--cesar/cp/pwl/test/ecos.ecc.sh (renamed from cesar/cp2/pwl/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/pwl/test/inc/result_decrease.h (renamed from cesar/cp2/pwl/test/inc/result_decrease.h)0
-rw-r--r--cesar/cp/pwl/test/inc/result_increase.h (renamed from cesar/cp2/pwl/test/inc/result_increase.h)0
-rw-r--r--cesar/cp/pwl/test/inc/result_stable.h (renamed from cesar/cp2/pwl/test/inc/result_stable.h)0
-rw-r--r--cesar/cp/pwl/test/inc/table.h (renamed from cesar/cp2/pwl/test/inc/table.h)0
-rw-r--r--cesar/cp/pwl/test/inc/table_decrease.h (renamed from cesar/cp2/pwl/test/inc/table_decrease.h)0
-rw-r--r--cesar/cp/pwl/test/inc/table_increase.h (renamed from cesar/cp2/pwl/test/inc/table_increase.h)0
-rw-r--r--cesar/cp/pwl/test/src/pwl.c (renamed from cesar/cp2/pwl/test/src/pwl.c)24
-rw-r--r--cesar/cp/secu/Module (renamed from cesar/cp2/secu/Module)0
-rw-r--r--cesar/cp/secu/aes.h (renamed from cesar/cp2/secu/aes.h)0
-rw-r--r--cesar/cp/secu/defs.h (renamed from cesar/cp2/secu/defs.h)10
-rw-r--r--cesar/cp/secu/inc/pbkdf1.h (renamed from cesar/cp2/secu/inc/pbkdf1.h)10
-rw-r--r--cesar/cp/secu/inc/sha256.h (renamed from cesar/cp2/secu/inc/sha256.h)0
-rw-r--r--cesar/cp/secu/pbkdf1.h (renamed from cesar/cp2/secu/pbkdf1.h)2
-rw-r--r--cesar/cp/secu/secu.h (renamed from cesar/cp2/secu/secu.h)4
-rw-r--r--cesar/cp/secu/sha256.h (renamed from cesar/cp2/secu/sha256.h)10
-rw-r--r--cesar/cp/secu/src/aes.c (renamed from cesar/cp2/secu/src/aes.c)2
-rw-r--r--cesar/cp/secu/src/pbkdf1.c (renamed from cesar/cp2/secu/src/pbkdf1.c)10
-rw-r--r--cesar/cp/secu/src/secu.c (renamed from cesar/cp2/secu/src/secu.c)14
-rw-r--r--cesar/cp/secu/src/sha256.c (renamed from cesar/cp2/secu/src/sha256.c)4
-rw-r--r--cesar/cp/secu/test/Makefile (renamed from cesar/cp2/secu/test/Makefile)0
-rw-r--r--cesar/cp/secu/test/host-Makefile (renamed from cesar/cp2/secu/test/host-Makefile)8
-rw-r--r--cesar/cp/secu/test/sparc-Makefile (renamed from cesar/cp2/secu/test/sparc-Makefile)4
-rw-r--r--cesar/cp/secu/test/sparc-ecos.ecc.sh (renamed from cesar/cp2/secu/test/sparc-ecos.ecc.sh)0
-rw-r--r--cesar/cp/secu/test/src/test-aes.c (renamed from cesar/cp2/secu/test/src/test-aes.c)2
-rw-r--r--cesar/cp/secu/test/src/test-nmk.c (renamed from cesar/cp2/secu/test/src/test-nmk.c)10
-rw-r--r--cesar/cp/secu/test/src/test-prun.c (renamed from cesar/cp2/secu/test/src/test-prun.c)4
-rw-r--r--cesar/cp/secu/test/src/test-sha2.c (renamed from cesar/cp2/secu/test/src/test-sha2.c)6
-rw-r--r--cesar/cp/secu/test/utest/Makefile (renamed from cesar/cp2/secu/test/utest/Makefile)2
-rw-r--r--cesar/cp/secu/test/utest/src/test_secu.c (renamed from cesar/cp2/secu/test/utest/src/test_secu.c)2
-rw-r--r--cesar/cp/spoc/Module (renamed from cesar/cp2/spoc/Module)0
-rw-r--r--cesar/cp/spoc/spoc.h (renamed from cesar/cp2/spoc/spoc.h)0
-rw-r--r--cesar/cp/spoc/src/spoc.c (renamed from cesar/cp2/spoc/src/spoc.c)2
-rw-r--r--cesar/cp/spoc/test/ApproxOrder1ParamMCoeff.sci (renamed from cesar/cp2/spoc/test/ApproxOrder1ParamMCoeff.sci)0
-rw-r--r--cesar/cp/spoc/test/ApproxOrder2ParamMCoeff.sci (renamed from cesar/cp2/spoc/test/ApproxOrder2ParamMCoeff.sci)0
-rw-r--r--cesar/cp/spoc/test/Makefile (renamed from cesar/cp2/spoc/test/Makefile)2
-rw-r--r--cesar/cp/spoc/test/coeff_generation.scilab (renamed from cesar/cp2/spoc/test/coeff_generation.scilab)0
-rw-r--r--cesar/cp/spoc/test/define_spoc_c.h (renamed from cesar/cp2/spoc/test/define_spoc_c.h)2
-rw-r--r--cesar/cp/spoc/test/get_Approx1.sci (renamed from cesar/cp2/spoc/test/get_Approx1.sci)0
-rw-r--r--cesar/cp/spoc/test/src/test_coeff_check.c (renamed from cesar/cp2/spoc/test/src/test_coeff_check.c)0
-rw-r--r--cesar/cp/src/cp.c (renamed from cesar/cp2/src/cp.c)6
-rw-r--r--cesar/cp/sta/action/Module (renamed from cesar/cp2/sta/action/Module)0
-rw-r--r--cesar/cp/sta/action/action.h (renamed from cesar/cp2/sta/action/action.h)26
-rw-r--r--cesar/cp/sta/action/assoc.h (renamed from cesar/cp2/sta/action/assoc.h)12
-rw-r--r--cesar/cp/sta/action/doc/Makefile (renamed from cesar/cp2/sta/action/doc/Makefile)0
-rw-r--r--cesar/cp/sta/action/doc/assoc.sdl (renamed from cesar/cp2/sta/action/doc/assoc.sdl)0
-rw-r--r--cesar/cp/sta/action/doc/cp_sta_action.odt (renamed from cesar/cp2/sta/action/doc/cp_sta_action.odt)bin238110 -> 238110 bytes
-rw-r--r--cesar/cp/sta/action/doc/drv.sdl (renamed from cesar/cp2/sta/action/doc/drv.sdl)0
-rw-r--r--cesar/cp/sta/action/doc/poweron.sdl (renamed from cesar/cp2/sta/action/doc/poweron.sdl)0
-rw-r--r--cesar/cp/sta/action/drv.h (renamed from cesar/cp2/sta/action/drv.h)10
-rw-r--r--cesar/cp/sta/action/inc/context.h (renamed from cesar/cp2/sta/action/inc/context.h)14
-rw-r--r--cesar/cp/sta/action/info.h (renamed from cesar/cp2/sta/action/info.h)10
-rw-r--r--cesar/cp/sta/action/key.h (renamed from cesar/cp2/sta/action/key.h)10
-rw-r--r--cesar/cp/sta/action/misc.h (renamed from cesar/cp2/sta/action/misc.h)10
-rw-r--r--cesar/cp/sta/action/poweron.h (renamed from cesar/cp2/sta/action/poweron.h)14
-rw-r--r--cesar/cp/sta/action/src/action.c (renamed from cesar/cp2/sta/action/src/action.c)4
-rw-r--r--cesar/cp/sta/action/src/assoc.c (renamed from cesar/cp2/sta/action/src/assoc.c)10
-rw-r--r--cesar/cp/sta/action/src/drv.c (renamed from cesar/cp2/sta/action/src/drv.c)8
-rw-r--r--cesar/cp/sta/action/src/info.c (renamed from cesar/cp2/sta/action/src/info.c)8
-rw-r--r--cesar/cp/sta/action/src/key.c (renamed from cesar/cp2/sta/action/src/key.c)6
-rw-r--r--cesar/cp/sta/action/src/misc.c (renamed from cesar/cp2/sta/action/src/misc.c)4
-rw-r--r--cesar/cp/sta/action/src/poweron.c (renamed from cesar/cp2/sta/action/src/poweron.c)12
-rw-r--r--cesar/cp/sta/action/test/utest/Makefile17
-rw-r--r--cesar/cp/sta/action/test/utest/inc/scenario_defs.h (renamed from cesar/cp2/sta/action/test/utest/inc/scenario_defs.h)8
-rw-r--r--cesar/cp/sta/action/test/utest/inc/test_sta_action.h (renamed from cesar/cp2/sta/action/test/utest/inc/test_sta_action.h)2
-rw-r--r--cesar/cp/sta/action/test/utest/override/cp2/inc/context.h (renamed from cesar/cp2/sta/action/test/utest/override/cp2/inc/context.h)16
-rw-r--r--cesar/cp/sta/action/test/utest/override/cp2/sta/core/core.h17
-rw-r--r--cesar/cp/sta/action/test/utest/src/assoc.c (renamed from cesar/cp2/sta/action/test/utest/src/assoc.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/dataplane_stub.c (renamed from cesar/cp2/sta/action/test/utest/src/dataplane_stub.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/drv.c (renamed from cesar/cp2/sta/action/test/utest/src/drv.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/fsm_stub.c (renamed from cesar/cp2/sta/action/test/utest/src/fsm_stub.c)2
-rw-r--r--cesar/cp/sta/action/test/utest/src/info.c (renamed from cesar/cp2/sta/action/test/utest/src/info.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/key.c (renamed from cesar/cp2/sta/action/test/utest/src/key.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/msg_stub.c (renamed from cesar/cp2/sta/action/test/utest/src/msg_stub.c)4
-rw-r--r--cesar/cp/sta/action/test/utest/src/poweron.c (renamed from cesar/cp2/sta/action/test/utest/src/poweron.c)0
-rw-r--r--cesar/cp/sta/action/test/utest/src/scenario_actions.c (renamed from cesar/cp2/sta/action/test/utest/src/scenario_actions.c)2
-rw-r--r--cesar/cp/sta/action/test/utest/src/test_sta_action.c (renamed from cesar/cp2/sta/action/test/utest/src/test_sta_action.c)0
-rw-r--r--cesar/cp/sta/core/Module (renamed from cesar/cp2/sta/core/Module)0
-rw-r--r--cesar/cp/sta/core/core.h (renamed from cesar/cp2/sta/core/core.h)14
-rw-r--r--cesar/cp/sta/core/defs.h (renamed from cesar/cp2/sta/core/defs.h)12
-rw-r--r--cesar/cp/sta/core/doc/sta_core.odt (renamed from cesar/cp2/sta/core/doc/sta_core.odt)bin111336 -> 111336 bytes
-rw-r--r--cesar/cp/sta/core/doc/sta_core.xmi (renamed from cesar/cp2/sta/core/doc/sta_core.xmi)0
-rw-r--r--cesar/cp/sta/core/inc/core.h (renamed from cesar/cp2/sta/core/inc/core.h)18
-rw-r--r--cesar/cp/sta/core/src/core.c (renamed from cesar/cp2/sta/core/src/core.c)24
-rw-r--r--cesar/cp/sta/core/test/Makefile (renamed from cesar/cp2/sta/core/test/Makefile)8
-rw-r--r--cesar/cp/sta/core/test/ecos.ecc.sh (renamed from cesar/cp2/sta/core/test/ecos.ecc.sh)0
-rw-r--r--cesar/cp/sta/core/test/override/cp2/inc/context.h (renamed from cesar/cp2/sta/core/test/override/cp2/inc/context.h)14
-rw-r--r--cesar/cp/sta/core/test/override/cp_fsm_defs.h (renamed from cesar/cp2/sta/core/test/override/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/sta/core/test/src/action_stub.c (renamed from cesar/cp2/sta/core/test/src/action_stub.c)2
-rw-r--r--cesar/cp/sta/core/test/src/beacon_stub.c (renamed from cesar/cp2/sta/core/test/src/beacon_stub.c)2
-rw-r--r--cesar/cp/sta/core/test/src/cco_action_stub.c (renamed from cesar/cp2/sta/core/test/src/cco_action_stub.c)4
-rw-r--r--cesar/cp/sta/core/test/src/core.c (renamed from cesar/cp2/sta/core/test/src/core.c)12
-rw-r--r--cesar/cp/sta/core/test/src/core_events.c (renamed from cesar/cp2/sta/core/test/src/core_events.c)8
-rw-r--r--cesar/cp/sta/core/test/src/core_thread.c (renamed from cesar/cp2/sta/core/test/src/core_thread.c)8
-rw-r--r--cesar/cp/sta/core/test/src/cp_cl_interf_stub.c (renamed from cesar/cp2/sta/core/test/src/cp_cl_interf_stub.c)2
-rw-r--r--cesar/cp/sta/core/test/src/fsm_stub.c (renamed from cesar/cp2/sta/core/test/src/fsm_stub.c)2
-rw-r--r--cesar/cp/sta/core/test/src/pwl_stub.c (renamed from cesar/cp2/sta/core/test/src/pwl_stub.c)4
-rw-r--r--cesar/cp/sta/core/test/src/sta_mgr_stub.c (renamed from cesar/cp2/sta/core/test/src/sta_mgr_stub.c)4
-rw-r--r--cesar/cp/sta/mgr/Module (renamed from cesar/cp2/sta/mgr/Module)0
-rw-r--r--cesar/cp/sta/mgr/doc/sta_manager.odt (renamed from cesar/cp2/sta/mgr/doc/sta_manager.odt)bin334839 -> 334839 bytes
-rw-r--r--cesar/cp/sta/mgr/doc/sta_mgr.xmi (renamed from cesar/cp2/sta/mgr/doc/sta_mgr.xmi)0
-rw-r--r--cesar/cp/sta/mgr/inc/net.h (renamed from cesar/cp2/sta/mgr/inc/net.h)10
-rw-r--r--cesar/cp/sta/mgr/inc/net_list.h (renamed from cesar/cp2/sta/mgr/inc/net_list.h)16
-rw-r--r--cesar/cp/sta/mgr/inc/sta.h (renamed from cesar/cp2/sta/mgr/inc/sta.h)12
-rw-r--r--cesar/cp/sta/mgr/inc/sta_mgr.h (renamed from cesar/cp2/sta/mgr/inc/sta_mgr.h)16
-rw-r--r--cesar/cp/sta/mgr/inc/sta_own_data.h (renamed from cesar/cp2/sta/mgr/inc/sta_own_data.h)14
-rw-r--r--cesar/cp/sta/mgr/net.h (renamed from cesar/cp2/sta/mgr/net.h)8
-rw-r--r--cesar/cp/sta/mgr/net_list.h (renamed from cesar/cp2/sta/mgr/net_list.h)14
-rw-r--r--cesar/cp/sta/mgr/src/net.c (renamed from cesar/cp2/sta/mgr/src/net.c)22
-rw-r--r--cesar/cp/sta/mgr/src/net_list.c (renamed from cesar/cp2/sta/mgr/src/net_list.c)10
-rw-r--r--cesar/cp/sta/mgr/src/sta.c (renamed from cesar/cp2/sta/mgr/src/sta.c)8
-rw-r--r--cesar/cp/sta/mgr/src/sta_mgr.c (renamed from cesar/cp2/sta/mgr/src/sta_mgr.c)26
-rw-r--r--cesar/cp/sta/mgr/src/sta_own_data.c (renamed from cesar/cp2/sta/mgr/src/sta_own_data.c)10
-rw-r--r--cesar/cp/sta/mgr/sta.h (renamed from cesar/cp2/sta/mgr/sta.h)14
-rw-r--r--cesar/cp/sta/mgr/sta_mgr.h (renamed from cesar/cp2/sta/mgr/sta_mgr.h)8
-rw-r--r--cesar/cp/sta/mgr/sta_own_data.h (renamed from cesar/cp2/sta/mgr/sta_own_data.h)16
-rw-r--r--cesar/cp/sta/mgr/test/Makefile (renamed from cesar/cp2/sta/mgr/test/Makefile)12
-rw-r--r--cesar/cp/sta/mgr/test/doc/Makefile (renamed from cesar/cp2/sta/mgr/test/doc/Makefile)0
-rw-r--r--cesar/cp/sta/mgr/test/doc/net.txt (renamed from cesar/cp2/sta/mgr/test/doc/net.txt)0
-rw-r--r--cesar/cp/sta/mgr/test/doc/net_list.txt (renamed from cesar/cp2/sta/mgr/test/doc/net_list.txt)4
-rw-r--r--cesar/cp/sta/mgr/test/doc/sta.txt (renamed from cesar/cp2/sta/mgr/test/doc/sta.txt)0
-rw-r--r--cesar/cp/sta/mgr/test/doc/sta_mgr.txt (renamed from cesar/cp2/sta/mgr/test/doc/sta_mgr.txt)0
-rw-r--r--cesar/cp/sta/mgr/test/doc/sta_own_data.txt (renamed from cesar/cp2/sta/mgr/test/doc/sta_own_data.txt)0
-rw-r--r--cesar/cp/sta/mgr/test/overide/cp2/inc/context.h (renamed from cesar/cp2/sta/mgr/test/overide/cp2/inc/context.h)14
-rw-r--r--cesar/cp/sta/mgr/test/overide/cp2/sta/core/core.h (renamed from cesar/cp2/sta/mgr/test/overide/cp2/sta/core/core.h)8
-rw-r--r--cesar/cp/sta/mgr/test/overide/cp_fsm_defs.h (renamed from cesar/cp2/sta/mgr/test/overide/cp_fsm_defs.h)0
-rw-r--r--cesar/cp/sta/mgr/test/src/cl_stub.c (renamed from cesar/cp2/sta/mgr/test/src/cl_stub.c)0
-rw-r--r--cesar/cp/sta/mgr/test/src/core_stub.c (renamed from cesar/cp2/sta/mgr/test/src/core_stub.c)2
-rw-r--r--cesar/cp/sta/mgr/test/src/fsm_stub.c29
-rw-r--r--cesar/cp/sta/mgr/test/src/net_list_test.c (renamed from cesar/cp2/sta/mgr/test/src/net_list_test.c)12
-rw-r--r--cesar/cp/sta/mgr/test/src/net_test.c (renamed from cesar/cp2/sta/mgr/test/src/net_test.c)8
-rw-r--r--cesar/cp/sta/mgr/test/src/sta-test.c (renamed from cesar/cp2/sta/mgr/test/src/sta-test.c)6
-rw-r--r--cesar/cp/sta/mgr/test/src/sta_mgr_test.c (renamed from cesar/cp2/sta/mgr/test/src/sta_mgr_test.c)18
-rw-r--r--cesar/cp/sta/mgr/test/src/station_test.c (renamed from cesar/cp2/sta/mgr/test/src/station_test.c)6
-rw-r--r--cesar/cp/test/doc/CP Functionnal test plan.odt (renamed from cesar/cp2/test/doc/CP Functionnal test plan.odt)bin1468924 -> 1468924 bytes
-rw-r--r--cesar/cp/test/doc/station_manager_function_call.odt (renamed from cesar/cp2/test/doc/station_manager_function_call.odt)bin103138 -> 103138 bytes
-rw-r--r--cesar/cp/test/mme/Config (renamed from cesar/cp2/test/mme/Config)0
-rw-r--r--cesar/cp/test/mme/Makefile (renamed from cesar/cp2/test/mme/Makefile)0
-rw-r--r--cesar/cp/test/mme/src/test_mme.c (renamed from cesar/cp2/test/mme/src/test_mme.c)2
-rw-r--r--cesar/cp/types.h (renamed from cesar/cp2/types.h)12
-rw-r--r--cesar/cp2/Module6
-rw-r--r--cesar/cp2/beacon/Module4
-rw-r--r--cesar/cp2/conn/test/src/fsm_stub.c29
-rw-r--r--cesar/cp2/fsm/test/utest/Makefile17
-rw-r--r--cesar/cp2/msg/test/src/fsm_stub.c29
-rw-r--r--cesar/cp2/sta/action/test/utest/Makefile17
-rw-r--r--cesar/cp2/sta/action/test/utest/override/cp2/sta/core/core.h17
-rw-r--r--cesar/cp2/sta/mgr/test/src/fsm_stub.c29
-rw-r--r--cesar/station/station.h2
-rw-r--r--cesar/test_general/station/cco0s0/Makefile.mk2
-rw-r--r--cesar/test_general/station/cco0s0/src/station.c2
389 files changed, 1298 insertions, 1298 deletions
diff --git a/cesar/common/tests/tests b/cesar/common/tests/tests
index bd2c3fe1f5..ac5a25c893 100644
--- a/cesar/common/tests/tests
+++ b/cesar/common/tests/tests
@@ -298,15 +298,15 @@ bridgedma-proto-proto: ./obj/synth/test-bridgedma-proto.elf
bridgedma-proto-tx: ./obj/synth/test-bridgedma-proto-tx.elf
bridgedma-proto-rx: ./obj/synth/test-bridgedma-proto-rx.elf
-cp2/fsm/test/utest:
+cp/fsm/test/utest:
make: make COV=y
cov test_fsm: ./obj/test_fsm
-cp2/sta/action/test/utest:
+cp/sta/action/test/utest:
make: make COV=y
cov test_sta_action: ./obj/test_sta_action
-cp2/sta/mgr/test:
+cp/sta/mgr/test:
make
net_list: ./obj/net_list_test
net: ./obj/net_test
@@ -314,26 +314,26 @@ station: ./obj/station_test
sta_mgr: obj/sta_mgr_test
sta_own: obj/sta_own
-cp2/cco/action/test:
+cp/cco/action/test:
make
action: ./obj/action.elf
garbage: ./obj/garbage.elf
-cp2/pwl/test:
+cp/pwl/test:
make
pwl: ./obj/pwl.elf
-cp2/conn/test:
+cp/conn/test:
make
conn_test: ./obj/conn_test.elf
-cp2/cco/bw/test:
+cp/cco/bw/test:
make
bw_lib_alloc: ./obj/schedules.elf
bw: ./obj/bw_test.elf
bw_prio_heap: ./obj/bw_prio_heap_test.elf
-cp2/beacon/test:
+cp/beacon/test:
make
beacon: ./obj/beacon.elf
cco_send_cb: ./obj/cco_send_cb.elf
@@ -342,25 +342,25 @@ bentry: ./obj/bentry.elf
default-shed: ./obj/default_sched.elf
sta_recv: ./obj/sta_recv_cb.elf
-cp2/msg/test:
+cp/msg/test:
make: make COV=y
read-header: ./obj/test-msg-read-header
cc-msg: ./obj/test-msg-cc
cm-msg: ./obj/test-msg-cm
frag: ./obj/test_frag
-cp2/secu/test:
+cp/secu/test:
make: make -f host-Makefile COV=y
sha256: ./obj/host/test-sha2
aes128: ./obj/host/test-aes
prun: ./obj/host/test-prun
nmk: ./obj/host/test-nmk
-cp2/cl_interf/test:
+cp/cl_interf/test:
make
cl_interf: ./obj/test-cl-interf.elf
-cp2/sta/core/test:
+cp/sta/core/test:
make
core: ./obj/core.elf
core_event: ./obj/core_events.elf
diff --git a/cesar/cp/Module b/cesar/cp/Module
new file mode 100644
index 0000000000..8c8ed74751
--- /dev/null
+++ b/cesar/cp/Module
@@ -0,0 +1,6 @@
+SOURCES:= cp.c
+MODULES:=cp/beacon cp/cco/action cp/cco/bw cp/cl_interf \
+cp/conn cp/fsm cp/msg cp/pwl cp/secu cp/sta/action cp/sta/core \
+cp/sta/mgr
+
+$(call src2obj,cp/src/cp.c,target): $(BASE)/cp/fsm/fsm.h
diff --git a/cesar/cp/beacon/Module b/cesar/cp/beacon/Module
new file mode 100644
index 0000000000..8f40d1b229
--- /dev/null
+++ b/cesar/cp/beacon/Module
@@ -0,0 +1,4 @@
+SOURCES:= beacon.c common.c bentry.c bentry_msg.c beacon_discover.c
+
+$(call src2obj,cp/beacon/src/beacon.c,target): $(BASE)/cp/fsm/fsm.h
+$(call src2obj,cp/beacon/src/beacon.c,host): $(BASE)/cp/fsm/fsm.h
diff --git a/cesar/cp2/beacon/beacon.h b/cesar/cp/beacon/beacon.h
index 1a01f56f9c..16e2d870b4 100644
--- a/cesar/cp2/beacon/beacon.h
+++ b/cesar/cp/beacon/beacon.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_beacon_h
-#define cp2_beacon_beacon_h
+#ifndef cp_beacon_beacon_h
+#define cp_beacon_beacon_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,17 +8,17 @@
*
* }}} */
/**
- * \file cp2/beacon/beacon.h
+ * \file cp/beacon/beacon.h
* \brief Beacon module public API.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* Beacon module. Use to generate and read a beacon.
*/
-#include "cp2/cp.h"
-#include "cp2/defs.h"
-#include "cp2/beacon/defs.h"
-#include "cp2/beacon/beacon_desc.h"
+#include "cp/cp.h"
+#include "cp/defs.h"
+#include "cp/beacon/defs.h"
+#include "cp/beacon/beacon_desc.h"
/**
* Function call back prototype.
@@ -143,4 +143,4 @@ cp_beacon_process_tracked_avln (cp_t *ctx, cp_beacon_desc_t *beacon);
void
cp_beacon_beacon_not_received (cp_t *ctx);
-#endif /* cp2_beacon_beacon_h */
+#endif /* cp_beacon_beacon_h */
diff --git a/cesar/cp2/beacon/beacon_desc.h b/cesar/cp/beacon/beacon_desc.h
index 98c768f8a0..40c5e50586 100644
--- a/cesar/cp2/beacon/beacon_desc.h
+++ b/cesar/cp/beacon/beacon_desc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_beacon_desc_h
-#define cp2_beacon_beacon_desc_h
+#ifndef cp_beacon_beacon_desc_h
+#define cp_beacon_beacon_desc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/beacon/beacon_desc.h
+ * \file cp/beacon/beacon_desc.h
* \brief Beacon object description.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
@@ -40,4 +40,4 @@ struct cp_beacon_desc_t
typedef struct cp_beacon_desc_t cp_beacon_desc_t;
-#endif /* cp2_beacon_beacon_desc_h */
+#endif /* cp_beacon_beacon_desc_h */
diff --git a/cesar/cp2/beacon/defs.h b/cesar/cp/beacon/defs.h
index a351d61b23..b0f66c4754 100644
--- a/cesar/cp2/beacon/defs.h
+++ b/cesar/cp/beacon/defs.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_defs_h
-#define cp2_beacon_defs_h
+#ifndef cp_beacon_defs_h
+#define cp_beacon_defs_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/beacon/defs.h
+ * \file cp/beacon/defs.h
* \brief Definition of all enums and types
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
@@ -102,4 +102,4 @@ enum cp_beacon_bentry_read_write_e
};
-#endif /* cp2_beacon_defs_h */
+#endif /* cp_beacon_defs_h */
diff --git a/cesar/cp2/beacon/doc/Makefile b/cesar/cp/beacon/doc/Makefile
index aa8dc6af31..aa8dc6af31 100644
--- a/cesar/cp2/beacon/doc/Makefile
+++ b/cesar/cp/beacon/doc/Makefile
diff --git a/cesar/cp2/beacon/doc/add-to-sched.sdl b/cesar/cp/beacon/doc/add-to-sched.sdl
index 7e487ceef5..7e487ceef5 100644
--- a/cesar/cp2/beacon/doc/add-to-sched.sdl
+++ b/cesar/cp/beacon/doc/add-to-sched.sdl
diff --git a/cesar/cp2/beacon/doc/beacon-spec.odt b/cesar/cp/beacon/doc/beacon-spec.odt
index 0605b7f14a..0605b7f14a 100644
--- a/cesar/cp2/beacon/doc/beacon-spec.odt
+++ b/cesar/cp/beacon/doc/beacon-spec.odt
Binary files differ
diff --git a/cesar/cp2/beacon/doc/beacon-study.odt b/cesar/cp/beacon/doc/beacon-study.odt
index 62047077cb..62047077cb 100644
--- a/cesar/cp2/beacon/doc/beacon-study.odt
+++ b/cesar/cp/beacon/doc/beacon-study.odt
Binary files differ
diff --git a/cesar/cp2/beacon/doc/beacons.xmi b/cesar/cp/beacon/doc/beacons.xmi
index be471344f3..be471344f3 100644
--- a/cesar/cp2/beacon/doc/beacons.xmi
+++ b/cesar/cp/beacon/doc/beacons.xmi
diff --git a/cesar/cp2/beacon/doc/bentry_mgr.odt b/cesar/cp/beacon/doc/bentry_mgr.odt
index 2409538221..2409538221 100644
--- a/cesar/cp2/beacon/doc/bentry_mgr.odt
+++ b/cesar/cp/beacon/doc/bentry_mgr.odt
Binary files differ
diff --git a/cesar/cp2/beacon/doc/bentry_mgr.sdl b/cesar/cp/beacon/doc/bentry_mgr.sdl
index 6730ace54a..6730ace54a 100644
--- a/cesar/cp2/beacon/doc/bentry_mgr.sdl
+++ b/cesar/cp/beacon/doc/bentry_mgr.sdl
diff --git a/cesar/cp2/beacon/doc/discover-need-to-request.dot b/cesar/cp/beacon/doc/discover-need-to-request.dot
index d9e15548ec..d9e15548ec 100644
--- a/cesar/cp2/beacon/doc/discover-need-to-request.dot
+++ b/cesar/cp/beacon/doc/discover-need-to-request.dot
diff --git a/cesar/cp2/beacon/doc/discover-process.sdl b/cesar/cp/beacon/doc/discover-process.sdl
index 9ee416e979..9ee416e979 100644
--- a/cesar/cp2/beacon/doc/discover-process.sdl
+++ b/cesar/cp/beacon/doc/discover-process.sdl
diff --git a/cesar/cp2/beacon/doc/processingbeacon.sdl b/cesar/cp/beacon/doc/processingbeacon.sdl
index f6130d018e..f6130d018e 100644
--- a/cesar/cp2/beacon/doc/processingbeacon.sdl
+++ b/cesar/cp/beacon/doc/processingbeacon.sdl
diff --git a/cesar/cp2/beacon/doc/receivebeacon.sdl b/cesar/cp/beacon/doc/receivebeacon.sdl
index c227c6a0a8..c227c6a0a8 100644
--- a/cesar/cp2/beacon/doc/receivebeacon.sdl
+++ b/cesar/cp/beacon/doc/receivebeacon.sdl
diff --git a/cesar/cp2/beacon/inc/beacon.h b/cesar/cp/beacon/inc/beacon.h
index 2c16994d8e..c74f951b0f 100644
--- a/cesar/cp2/beacon/inc/beacon.h
+++ b/cesar/cp/beacon/inc/beacon.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_inc_beacon_h
-#define cp2_beacon_inc_beacon_h
+#ifndef cp_beacon_inc_beacon_h
+#define cp_beacon_inc_beacon_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -10,7 +10,7 @@
/**
* \file inc/cp_beacon_private.h
* \brief Beacon private data.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
@@ -21,12 +21,12 @@
// Public ones.
#include "hal/timer/timer.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/sta/mgr/net.h"
// Private ones.
-#include "cp2/beacon/inc/bentry.h"
-#include "cp2/beacon/inc/common.h"
-#include "cp2/beacon/inc/beacon_work.h"
+#include "cp/beacon/inc/bentry.h"
+#include "cp/beacon/inc/common.h"
+#include "cp/beacon/inc/beacon_work.h"
/**
* Beacon module. Use to generate and read a beacon.
@@ -249,4 +249,4 @@ void
cp_beacon_sta_send_discover_beacon (cp_t *ctx, cp_beacon_desc_t *beacon,
cp_beacon_work_beacon_t beacon_vf);
-#endif /* cp2_beacon_inc_beacon_h */
+#endif /* cp_beacon_inc_beacon_h */
diff --git a/cesar/cp2/beacon/inc/beacon_discover.h b/cesar/cp/beacon/inc/beacon_discover.h
index 03d96446d2..dc99f49154 100644
--- a/cesar/cp2/beacon/inc/beacon_discover.h
+++ b/cesar/cp/beacon/inc/beacon_discover.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_inc_beacon_discover_h
-#define cp2_beacon_inc_beacon_discover_h
+#ifndef cp_beacon_inc_beacon_discover_h
+#define cp_beacon_inc_beacon_discover_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/beacon/inc/beacon_discover.h
+ * \file cp/beacon/inc/beacon_discover.h
* \brief Beacon discover process.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* Function to compute the interval between the one no request shall be done.
* In this max discover period, all the station including the CCo shall send a
@@ -21,8 +21,8 @@
* Period provided by the HP_AV specification which is equal to 10 seconds.
* 10s / 40e-3s = 250.
*/
-#include "cp2/types.h"
-#include "cp2/cp.h"
+#include "cp/types.h"
+#include "cp/cp.h"
struct cp_beacon_discover_t
{
@@ -86,4 +86,4 @@ cp_beacon_discover_compute_interval (cp_t *ctx);
bool
cp_beacon_discover_need_to_request (cp_t *ctx, cp_tei_t * tei);
-#endif /* cp2_beacon_inc_beacon_discover_h */
+#endif /* cp_beacon_inc_beacon_discover_h */
diff --git a/cesar/cp2/beacon/inc/beacon_work.h b/cesar/cp/beacon/inc/beacon_work.h
index 4055cf383a..4055cf383a 100644
--- a/cesar/cp2/beacon/inc/beacon_work.h
+++ b/cesar/cp/beacon/inc/beacon_work.h
diff --git a/cesar/cp2/beacon/inc/bentry.h b/cesar/cp/beacon/inc/bentry.h
index 6a5728e0ac..3fab96302b 100644
--- a/cesar/cp2/beacon/inc/bentry.h
+++ b/cesar/cp/beacon/inc/bentry.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_beacon_bentry_mgr_h
-#define cp2_beacon_beacon_bentry_mgr_h
+#ifndef cp_beacon_beacon_bentry_mgr_h
+#define cp_beacon_beacon_bentry_mgr_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,16 +8,16 @@
*
* }}} */
/**
- * \file cp2/beacon/inc/bentry.h
+ * \file cp/beacon/inc/bentry.h
* \brief Bentry processing.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "lib/set.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
-#include "cp2/beacon/beacon_desc.h"
-#include "cp2/beacon/inc/beacon_discover.h"
+#include "cp/beacon/beacon_desc.h"
+#include "cp/beacon/inc/beacon_discover.h"
/** Information for the countdown.
* Use to store data in the schedules. */
@@ -230,5 +230,5 @@ void
cp_beacon_bentry_mgr_schedule_data (cp_beacon_bentry_sched_data_t *data,
uint index);
-#endif /* cp2_beacon_beacon_bentry_mgr_h */
+#endif /* cp_beacon_beacon_bentry_mgr_h */
diff --git a/cesar/cp2/beacon/inc/bentry_msg.h b/cesar/cp/beacon/inc/bentry_msg.h
index 236e50ce98..7bd5e5fc06 100644
--- a/cesar/cp2/beacon/inc/bentry_msg.h
+++ b/cesar/cp/beacon/inc/bentry_msg.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_inc_bentry_msg_h
-#define cp2_beacon_inc_bentry_msg_h
+#ifndef cp_beacon_inc_bentry_msg_h
+#define cp_beacon_inc_bentry_msg_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/beacon/inc/bentry_msg.h
+ * \file cp/beacon/inc/bentry_msg.h
* \brief All the function to read or write a bentry in the beacon.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "lib/set.h"
@@ -18,8 +18,8 @@
#include "lib/bitstream.h"
#include "string.h"
-#include "cp2/beacon/defs.h"
-#include "cp2/beacon/inc/bentry.h"
+#include "cp/beacon/defs.h"
+#include "cp/beacon/inc/bentry.h"
/** Discover info bentry structure. */
struct cp_bentry_discover_info_struct_t
@@ -225,4 +225,4 @@ cp_beacon_bentry_mgr_snid_change (cp_beacon_bentry_t *bentry,
cp_snid_t *snid, uint *snidcd);
-#endif /* cp2_beacon_inc_bentry_msg_h */
+#endif /* cp_beacon_inc_bentry_msg_h */
diff --git a/cesar/cp2/beacon/inc/bentry_size.h b/cesar/cp/beacon/inc/bentry_size.h
index 96f4c6240f..778b1bb358 100644
--- a/cesar/cp2/beacon/inc/bentry_size.h
+++ b/cesar/cp/beacon/inc/bentry_size.h
@@ -1,5 +1,5 @@
-#ifndef cp2_beacon_inc_bentry_size_h
-#define cp2_beacon_inc_bentry_size_h
+#ifndef cp_beacon_inc_bentry_size_h
+#define cp_beacon_inc_bentry_size_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/beacon/inc/bentry_size.h
+ * \file cp/beacon/inc/bentry_size.h
* \brief Define the size in bytes off all beacon entries.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* Each beacon entries is define here, and all macros necessary to compute the
* length of any bentry payload.
@@ -82,4 +82,4 @@
/** Define the Macro to compute a region bentry. */
#define CP_BEACON_ENTRY_REGION(nr) (1 + CP_BEACON_ENTRY_REGION_SIZE * nr)
-#endif /* cp2_beacon_inc_bentry_size_h */
+#endif /* cp_beacon_inc_bentry_size_h */
diff --git a/cesar/cp2/beacon/inc/common.h b/cesar/cp/beacon/inc/common.h
index 8ecfd93ec6..868404badd 100644
--- a/cesar/cp2/beacon/inc/common.h
+++ b/cesar/cp/beacon/inc/common.h
@@ -8,13 +8,13 @@
*
* }}} */
/**
- * \file cp2/beacon/inc/common.h
+ * \file cp/beacon/inc/common.h
* \brief Common structure definition.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
-#include "cp2/beacon/beacon_desc.h"
+#include "cp/beacon/beacon_desc.h"
#include "mac/pbproc/pbproc.h"
struct cp_beacon_common_t
diff --git a/cesar/cp2/beacon/ntb/Module b/cesar/cp/beacon/ntb/Module
index 330e1813c7..330e1813c7 100644
--- a/cesar/cp2/beacon/ntb/Module
+++ b/cesar/cp/beacon/ntb/Module
diff --git a/cesar/cp2/beacon/ntb/doc/ntb_clock_sync.odt b/cesar/cp/beacon/ntb/doc/ntb_clock_sync.odt
index 3bad9fd779..3bad9fd779 100644
--- a/cesar/cp2/beacon/ntb/doc/ntb_clock_sync.odt
+++ b/cesar/cp/beacon/ntb/doc/ntb_clock_sync.odt
Binary files differ
diff --git a/cesar/cp2/beacon/ntb/doc/ntb_clock_sync.xmi b/cesar/cp/beacon/ntb/doc/ntb_clock_sync.xmi
index 36c3402893..36c3402893 100644
--- a/cesar/cp2/beacon/ntb/doc/ntb_clock_sync.xmi
+++ b/cesar/cp/beacon/ntb/doc/ntb_clock_sync.xmi
diff --git a/cesar/cp2/beacon/ntb/inc/ntb_clock_utils.h b/cesar/cp/beacon/ntb/inc/ntb_clock_utils.h
index be16f149ac..be16f149ac 100644
--- a/cesar/cp2/beacon/ntb/inc/ntb_clock_utils.h
+++ b/cesar/cp/beacon/ntb/inc/ntb_clock_utils.h
diff --git a/cesar/cp2/beacon/ntb/ntb_clock_sync.h b/cesar/cp/beacon/ntb/ntb_clock_sync.h
index 609c9e7428..3defe9ec36 100644
--- a/cesar/cp2/beacon/ntb/ntb_clock_sync.h
+++ b/cesar/cp/beacon/ntb/ntb_clock_sync.h
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file cp2/beacon/ntb/inc/ntb_clock_sync.h
+ * \file cp/beacon/ntb/inc/ntb_clock_sync.h
* \brief 25Mhz clock management and synchronization functions.
* \ingroup cp_beacon
*
@@ -18,7 +18,7 @@
* (and set or update the NTB offset in the MAC Config)
*
*/
-#include "cp2/cp.h"
+#include "cp/cp.h"
/* HAL-PHY functions dedicated to NTB clock management
* (access to dedicated PRATIC registers) */
diff --git a/cesar/cp2/beacon/ntb/src/ntb_clock_sync.c b/cesar/cp/beacon/ntb/src/ntb_clock_sync.c
index ede7bcd330..3b546453b0 100644
--- a/cesar/cp2/beacon/ntb/src/ntb_clock_sync.c
+++ b/cesar/cp/beacon/ntb/src/ntb_clock_sync.c
@@ -24,8 +24,8 @@
#include <string.h>
#include <math.h>
-#include "cp2/beacon/ntb/ntb_clock_sync.h"
-#include "cp2/beacon/ntb/inc/ntb_clock_utils.h"
+#include "cp/beacon/ntb/ntb_clock_sync.h"
+#include "cp/beacon/ntb/inc/ntb_clock_utils.h"
// Local constants
#ifdef MANUFACTURER_TEST
diff --git a/cesar/cp2/beacon/src/beacon.c b/cesar/cp/beacon/src/beacon.c
index 4800010341..8cf39f03bc 100644
--- a/cesar/cp2/beacon/src/beacon.c
+++ b/cesar/cp/beacon/src/beacon.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/src/beacon.c
+ * \file cp/beacon/src/beacon.c
* \brief Beacon Module.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* The beacon module is responsible for :
* - When the station acts as CCo:
@@ -21,21 +21,21 @@
#include "lib/read_word.h"
-#include "cp2/defs.h"
-#include "cp2/cp.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
-#include "cp2/beacon/ntb/ntb_clock_sync.h"
+#include "cp/defs.h"
+#include "cp/cp.h"
+#include "cp/fsm/fsm.h"
+#include "cp/beacon/beacon.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
+#include "cp/beacon/ntb/ntb_clock_sync.h"
#include "mac/common/timings.h"
#include "mac/common/ntb.h"
-#include "cp2/beacon/inc/beacon.h"
-#include "cp2/beacon/inc/beacon_work.h"
-#include "cp2/beacon/inc/bentry_msg.h"
-#include "cp2/beacon/inc/bentry_size.h"
-#include "cp2/inc/context.h"
+#include "cp/beacon/inc/beacon.h"
+#include "cp/beacon/inc/beacon_work.h"
+#include "cp/beacon/inc/bentry_msg.h"
+#include "cp/beacon/inc/bentry_size.h"
+#include "cp/inc/context.h"
/**
* Initialise the beacon module.
diff --git a/cesar/cp2/beacon/src/beacon_discover.c b/cesar/cp/beacon/src/beacon_discover.c
index 502b6d1ea3..3786532854 100644
--- a/cesar/cp2/beacon/src/beacon_discover.c
+++ b/cesar/cp/beacon/src/beacon_discover.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/src/beacon_discover.c
+ * \file cp/beacon/src/beacon_discover.c
* \brief Beacon discover process.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* Function to compute the interval between the one no request shall be done.
* In this max discover period, all the station including the CCo shall send a
@@ -22,8 +22,8 @@
#include "common/std.h"
#include "string.h"
-#include "cp2/beacon/inc/beacon_discover.h"
-#include "cp2/inc/context.h"
+#include "cp/beacon/inc/beacon_discover.h"
+#include "cp/inc/context.h"
/** Initialise
* \param ctx the module context.
diff --git a/cesar/cp2/beacon/src/bentry.c b/cesar/cp/beacon/src/bentry.c
index e4190660f3..ccc29d02b5 100644
--- a/cesar/cp2/beacon/src/bentry.c
+++ b/cesar/cp/beacon/src/bentry.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/src/bentry.c
+ * \file cp/beacon/src/bentry.c
* \brief Bentry manager.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
@@ -19,17 +19,17 @@
#include "lib/read_word.h"
#include "lib/set.h"
-#include "cp2/cp.h"
-#include "cp2/defs.h"
-#include "cp2/beacon/defs.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
-
-#include "cp2/inc/context.h"
-#include "cp2/beacon/inc/beacon.h"
-#include "cp2/beacon/inc/bentry.h"
-#include "cp2/beacon/inc/bentry_msg.h"
-#include "cp2/beacon/inc/bentry_size.h"
+#include "cp/cp.h"
+#include "cp/defs.h"
+#include "cp/beacon/defs.h"
+#include "cp/beacon/beacon.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
+
+#include "cp/inc/context.h"
+#include "cp/beacon/inc/beacon.h"
+#include "cp/beacon/inc/bentry.h"
+#include "cp/beacon/inc/bentry_msg.h"
+#include "cp/beacon/inc/bentry_size.h"
/**
* Initialise the bentry mgr.
diff --git a/cesar/cp2/beacon/src/bentry_msg.c b/cesar/cp/beacon/src/bentry_msg.c
index 72ea7f3f8c..d2bab26347 100644
--- a/cesar/cp2/beacon/src/bentry_msg.c
+++ b/cesar/cp/beacon/src/bentry_msg.c
@@ -6,22 +6,22 @@
*
* }}} */
/**
- * \file cp2/beacon/src/bentry_msg.c
+ * \file cp/beacon/src/bentry_msg.c
* \brief All the function to read or write a bentry in the beacon.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
#include "common/defs/ethernet.h"
-#include "cp2/types.h"
+#include "cp/types.h"
-#include "cp2/cp.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
+#include "cp/cp.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
-#include "cp2/inc/context.h"
-#include "cp2/beacon/inc/bentry_msg.h"
-#include "cp2/beacon/inc/bentry_size.h"
+#include "cp/inc/context.h"
+#include "cp/beacon/inc/bentry_msg.h"
+#include "cp/beacon/inc/bentry_size.h"
/**
* Initialise the discover info structure.
diff --git a/cesar/cp2/beacon/src/common.c b/cesar/cp/beacon/src/common.c
index 8d9a9c0bd5..30a7b8d9df 100644
--- a/cesar/cp2/beacon/src/common.c
+++ b/cesar/cp/beacon/src/common.c
@@ -6,18 +6,18 @@
*
* }}} */
/**
- * \file cp2/beacon/src/common.c
+ * \file cp/beacon/src/common.c
* \brief Common beacon data functions.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
#include "string.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/beacon/inc/common.h"
+#include "cp/inc/context.h"
+#include "cp/beacon/inc/common.h"
/**
* Initialise the context.
diff --git a/cesar/cp2/beacon/test/Makefile b/cesar/cp/beacon/test/Makefile
index 5a17cecfa0..5eca0540aa 100644
--- a/cesar/cp2/beacon/test/Makefile
+++ b/cesar/cp/beacon/test/Makefile
@@ -1,6 +1,6 @@
BASE = ../../..
-INCLUDES = cp2/beacon/test/overide
+INCLUDES = cp/beacon/test/overide
ECOS = y
@@ -9,35 +9,35 @@ TARGET_PROGRAMS = beacon bentry cco_send_cb sta_recv_cb default_sched \
beacon_SOURCES = beacon.c hal_timer_stub.c cl_stub.c bw_stub.c region_stub.c \
ca_stub.c interface_stub.c ntb_stub.c core_stub.c fsm_stub.c
-beacon_MODULES = lib cp2/beacon cp2/sta/mgr mac/common cp2/cco/bw \
- cp2/pwl
+beacon_MODULES = lib cp/beacon cp/sta/mgr mac/common cp/cco/bw \
+ cp/pwl
bentry_SOURCES = bentry.c region_stub.c bw_stub.c cl_stub.c ntb_stub.c \
core_stub.c interface_stub.c fsm_stub.c
-bentry_MODULES = lib cp2/beacon cp2/sta/mgr mac/common cp2/cco/bw
+bentry_MODULES = lib cp/beacon cp/sta/mgr mac/common cp/cco/bw
cco_send_cb_SOURCES = cco_send_central_beacon.c bw_stub.c region_stub.c \
cl_stub.c hal_timer_stub.c ntb_stub.c core_stub.c \
fsm_stub.c
-cco_send_cb_MODULES = lib cp2/beacon cp2/sta/mgr mac/common cp2/cco/bw \
- cp2/pwl
+cco_send_cb_MODULES = lib cp/beacon cp/sta/mgr mac/common cp/cco/bw \
+ cp/pwl
sta_recv_cb_SOURCES = sta_receive_central_beacon.c bw_stub.c region_stub.c \
cl_stub.c hal_timer_stub.c ntb_stub.c core_stub.c \
fsm_stub.c
-sta_recv_cb_MODULES = lib cp2/beacon cp2/sta/mgr mac/common cp2/cco/bw \
- cp2/pwl
+sta_recv_cb_MODULES = lib cp/beacon cp/sta/mgr mac/common cp/cco/bw \
+ cp/pwl
default_sched_SOURCES= default-sched.c bw_stub.c region_stub.c \
cl_stub.c hal_timer_stub.c ntb_stub.c core_stub.c \
fsm_stub.c
-default_sched_MODULES = lib cp2/beacon cp2/sta/mgr mac/common cp2/cco/bw \
- cp2/pwl
+default_sched_MODULES = lib cp/beacon cp/sta/mgr mac/common cp/cco/bw \
+ cp/pwl
discover-process_SOURCES= discover.c core_stub.c cl_stub.c fsm_stub.c
-discover-process_MODULES= lib cp2/beacon mac/common cp2/sta/mgr cp2/pwl
+discover-process_MODULES= lib cp/beacon mac/common cp/sta/mgr cp/pwl
-cp2_cco_bw_MODULE_SOURCES = bw_lib_alloc.c
+cp_cco_bw_MODULE_SOURCES = bw_lib_alloc.c
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/beacon/test/doc/Makefile b/cesar/cp/beacon/test/doc/Makefile
index 03f14d7cb9..03f14d7cb9 100644
--- a/cesar/cp2/beacon/test/doc/Makefile
+++ b/cesar/cp/beacon/test/doc/Makefile
diff --git a/cesar/cp2/beacon/test/doc/beacon-discover.txt b/cesar/cp/beacon/test/doc/beacon-discover.txt
index fef6fa13a3..fef6fa13a3 100644
--- a/cesar/cp2/beacon/test/doc/beacon-discover.txt
+++ b/cesar/cp/beacon/test/doc/beacon-discover.txt
diff --git a/cesar/cp2/beacon/test/doc/beacon.txt b/cesar/cp/beacon/test/doc/beacon.txt
index fc75e07877..fc75e07877 100644
--- a/cesar/cp2/beacon/test/doc/beacon.txt
+++ b/cesar/cp/beacon/test/doc/beacon.txt
diff --git a/cesar/cp2/beacon/test/doc/bentry.txt b/cesar/cp/beacon/test/doc/bentry.txt
index de3afda894..de3afda894 100644
--- a/cesar/cp2/beacon/test/doc/bentry.txt
+++ b/cesar/cp/beacon/test/doc/bentry.txt
diff --git a/cesar/cp2/beacon/test/doc/default-schedules.txt b/cesar/cp/beacon/test/doc/default-schedules.txt
index 4b76e6ef9f..4b76e6ef9f 100644
--- a/cesar/cp2/beacon/test/doc/default-schedules.txt
+++ b/cesar/cp/beacon/test/doc/default-schedules.txt
diff --git a/cesar/cp2/beacon/test/doc/recv-beacon.txt b/cesar/cp/beacon/test/doc/recv-beacon.txt
index da1ab3688b..fa54e55523 100644
--- a/cesar/cp2/beacon/test/doc/recv-beacon.txt
+++ b/cesar/cp/beacon/test/doc/recv-beacon.txt
@@ -23,7 +23,7 @@ Variant fields data:
* hoip = 0x0 i.e. no handover.
* rstbf = 0x0 i.e. no use.
* nm = 0x2 i.e. CSMA ONLY
-* cco_cap = CCO_LEVEL defined in the cp2/defs.h
+* cco_cap = CCO_LEVEL defined in the cp/defs.h
Beacon entries:
diff --git a/cesar/cp2/beacon/test/doc/send-beacon.txt b/cesar/cp/beacon/test/doc/send-beacon.txt
index 32d71daaaa..62d52a2342 100644
--- a/cesar/cp2/beacon/test/doc/send-beacon.txt
+++ b/cesar/cp/beacon/test/doc/send-beacon.txt
@@ -28,7 +28,7 @@ Variant fields data:
* hoip = 0x0 i.e. no handover.
* rstbf = 0x0 i.e. no use.
* nm = 0x2 i.e. CSMA ONLY
- * cco_cap = CCO_LEVEL defined in the cp2/defs.h
+ * cco_cap = CCO_LEVEL defined in the cp/defs.h
Beacon entries:
diff --git a/cesar/cp2/beacon/test/ecos.ecc.sh b/cesar/cp/beacon/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/beacon/test/ecos.ecc.sh
+++ b/cesar/cp/beacon/test/ecos.ecc.sh
diff --git a/cesar/cp2/beacon/test/overide/cp_fsm_defs.h b/cesar/cp/beacon/test/overide/cp_fsm_defs.h
index e8364b6da9..e8364b6da9 100644
--- a/cesar/cp2/beacon/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/beacon/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/beacon/test/src/beacon.c b/cesar/cp/beacon/test/src/beacon.c
index 4615feb378..f2ab029508 100644
--- a/cesar/cp2/beacon/test/src/beacon.c
+++ b/cesar/cp/beacon/test/src/beacon.c
@@ -8,7 +8,7 @@
/**
* \file src/beacon.c
* \brief Unit test for the beacon module.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* « long description »
*/
@@ -20,10 +20,10 @@
#include "mac/common/ntb.h"
#include "mac/common/store.h"
-#include "cp2/beacon/beacon.h"
+#include "cp/beacon/beacon.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
/** Common test for the init and uninit function.
*
diff --git a/cesar/cp2/beacon/test/src/bentry.c b/cesar/cp/beacon/test/src/bentry.c
index 134f8ace14..ac80df64b2 100644
--- a/cesar/cp2/beacon/test/src/bentry.c
+++ b/cesar/cp/beacon/test/src/bentry.c
@@ -8,7 +8,7 @@
/**
* \file src/bentry.c
* \brief Unit test for the beacon module.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
@@ -18,14 +18,14 @@
#include "lib/read_word.h"
#include "string.h"
-#include "cp2/cp.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
+#include "cp/cp.h"
+#include "cp/beacon/beacon.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
-#include "cp2/inc/context.h"
-#include "cp2/beacon/inc/bentry_size.h"
-#include "cp2/beacon/inc/bentry_msg.h"
-#include "cp2/beacon/inc/bentry.h"
+#include "cp/inc/context.h"
+#include "cp/beacon/inc/bentry_size.h"
+#include "cp/beacon/inc/bentry_msg.h"
+#include "cp/beacon/inc/bentry.h"
/** init
@@ -1325,7 +1325,7 @@ test_case_beacon_bentry_writes (test_t test)
}
/**
- * See doc trunk/cesar/cp2/beacon/test/doc/bentry.txt
+ * See doc trunk/cesar/cp/beacon/test/doc/bentry.txt
* or wiki : [wiki:UT-CPM1-BEACON-bentry]
* \param test the test object.
*/
diff --git a/cesar/cp2/beacon/test/src/bw_stub.c b/cesar/cp/beacon/test/src/bw_stub.c
index 9c5f23aa63..5ec6f482a7 100644
--- a/cesar/cp2/beacon/test/src/bw_stub.c
+++ b/cesar/cp/beacon/test/src/bw_stub.c
@@ -8,15 +8,15 @@
/**
* \file test/src/bw.c
* \brief BW stub
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
#include "lib/list.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "string.h"
diff --git a/cesar/cp2/beacon/test/src/ca_stub.c b/cesar/cp/beacon/test/src/ca_stub.c
index 9ec7775696..9ec7775696 100644
--- a/cesar/cp2/beacon/test/src/ca_stub.c
+++ b/cesar/cp/beacon/test/src/ca_stub.c
diff --git a/cesar/cp2/beacon/test/src/cco_send_central_beacon.c b/cesar/cp/beacon/test/src/cco_send_central_beacon.c
index dd3aecf3b4..0ae54481c1 100644
--- a/cesar/cp2/beacon/test/src/cco_send_central_beacon.c
+++ b/cesar/cp/beacon/test/src/cco_send_central_beacon.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/test/src/cco.c
+ * \file cp/beacon/test/src/cco.c
* \brief Test the generation of a central beacon.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*
* Send Beacon : Central beacon
@@ -38,7 +38,7 @@
* * hoip = 0x0 i.e. no handover.
* * rstbf = 0x0 i.e. no use.
* * nm = 0x2 i.e. CSMA ONLY
- * * cco_cap = CCO_LEVEL defined in the cp2/defs.h
+ * * cco_cap = CCO_LEVEL defined in the cp/defs.h
*
* Beacon entries:
*
@@ -105,12 +105,12 @@
#include "mac/common/ntb.h"
#include "mac/common/store.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/beacon/inc/bentry_size.h"
-#include "cp2/beacon/inc/bentry_msg.h"
+#include "cp/beacon/beacon.h"
+#include "cp/beacon/inc/bentry_size.h"
+#include "cp/beacon/inc/bentry_msg.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "mac/ca/ca.h"
diff --git a/cesar/cp2/beacon/test/src/cl_stub.c b/cesar/cp/beacon/test/src/cl_stub.c
index 1efcdc14e9..1efcdc14e9 100644
--- a/cesar/cp2/beacon/test/src/cl_stub.c
+++ b/cesar/cp/beacon/test/src/cl_stub.c
diff --git a/cesar/cp2/beacon/test/src/core_stub.c b/cesar/cp/beacon/test/src/core_stub.c
index 64653cb8e0..40acf3a90c 100644
--- a/cesar/cp2/beacon/test/src/core_stub.c
+++ b/cesar/cp/beacon/test/src/core_stub.c
@@ -13,8 +13,8 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/sta/core/core.h"
+#include "cp/cp.h"
+#include "cp/sta/core/core.h"
u32
cp_sta_core_date_ms (cp_t *cp)
diff --git a/cesar/cp2/beacon/test/src/default-sched.c b/cesar/cp/beacon/test/src/default-sched.c
index 9ab9edc63e..aed9050dc6 100644
--- a/cesar/cp2/beacon/test/src/default-sched.c
+++ b/cesar/cp/beacon/test/src/default-sched.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/test/src/default-sched.c
+ * \file cp/beacon/test/src/default-sched.c
* \brief Beacon Default schedules test.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* See the wiki page [wiki:UT-CPM1-BEACON-default-sched]
* or
@@ -25,12 +25,12 @@
#include "mac/common/ntb.h"
#include "mac/common/store.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/beacon/inc/bentry_size.h"
-#include "cp2/beacon/inc/bentry_msg.h"
+#include "cp/beacon/beacon.h"
+#include "cp/beacon/inc/bentry_size.h"
+#include "cp/beacon/inc/bentry_msg.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "mac/ca/ca.h"
diff --git a/cesar/cp2/beacon/test/src/discover.c b/cesar/cp/beacon/test/src/discover.c
index c1799f12d5..847a909a68 100644
--- a/cesar/cp2/beacon/test/src/discover.c
+++ b/cesar/cp/beacon/test/src/discover.c
@@ -6,23 +6,23 @@
*
* }}} */
/**
- * \file cp2/beacon/test/src/discover.c
+ * \file cp/beacon/test/src/discover.c
* \brief Test the discover algorithm to request a discover beacon.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* See http://pessac/cesar/trac/wiki/UT-CPM1-BEACON-discover-process
* or
* [wiki:UT-CPM1-BEACON-discover-process]
*/
#include "common/std.h"
-#include "cp2/types.h"
+#include "cp/types.h"
#include "lib/test.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/beacon/inc/beacon_discover.h"
+#include "cp/beacon/inc/beacon_discover.h"
static test_t test;
diff --git a/cesar/cp2/beacon/test/src/fsm_stub.c b/cesar/cp/beacon/test/src/fsm_stub.c
index f13dc00c3c..f0409b2c28 100644
--- a/cesar/cp2/beacon/test/src/fsm_stub.c
+++ b/cesar/cp/beacon/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
#include "lib/slab.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/beacon/test/src/hal_timer_stub.c b/cesar/cp/beacon/test/src/hal_timer_stub.c
index 8e02c36481..ffd9f2f5f7 100644
--- a/cesar/cp2/beacon/test/src/hal_timer_stub.c
+++ b/cesar/cp/beacon/test/src/hal_timer_stub.c
@@ -8,7 +8,7 @@
/**
* \file src/hal_timer_stub.c
* \brief HAL Timer stub for the test.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
diff --git a/cesar/cp2/beacon/test/src/interface_stub.c b/cesar/cp/beacon/test/src/interface_stub.c
index 93c17af082..0f2b631796 100644
--- a/cesar/cp2/beacon/test/src/interface_stub.c
+++ b/cesar/cp/beacon/test/src/interface_stub.c
@@ -8,7 +8,7 @@
/**
* \file src/interface_stub.c
* \brief interface function stub.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
diff --git a/cesar/cp2/beacon/test/src/ntb_stub.c b/cesar/cp/beacon/test/src/ntb_stub.c
index 21673c2344..e608f9c446 100644
--- a/cesar/cp2/beacon/test/src/ntb_stub.c
+++ b/cesar/cp/beacon/test/src/ntb_stub.c
@@ -14,7 +14,7 @@
*/
#include "common/std.h"
-#include "cp2/beacon/ntb/ntb_clock_sync.h"
+#include "cp/beacon/ntb/ntb_clock_sync.h"
void
cp_beacon_ntb_clk_sync( cp_t *cp_ctx, unsigned long beacon_bts, unsigned long beacon_sys_ltmr, unsigned long beacon_sta_ltmr )
diff --git a/cesar/cp2/beacon/test/src/region_stub.c b/cesar/cp/beacon/test/src/region_stub.c
index 766716320b..7f2159103e 100644
--- a/cesar/cp2/beacon/test/src/region_stub.c
+++ b/cesar/cp/beacon/test/src/region_stub.c
@@ -8,16 +8,16 @@
/**
* \file src/region_stub.c
* \brief Region manager stub
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
-#include "cp2/defs.h"
-#include "cp2/cp.h"
-#include "cp2/cco/region/region.h"
+#include "cp/defs.h"
+#include "cp/cp.h"
+#include "cp/cco/region/region.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include "string.h"
diff --git a/cesar/cp2/beacon/test/src/sta_receive_central_beacon.c b/cesar/cp/beacon/test/src/sta_receive_central_beacon.c
index 42c73d12ce..cfca3c44a6 100644
--- a/cesar/cp2/beacon/test/src/sta_receive_central_beacon.c
+++ b/cesar/cp/beacon/test/src/sta_receive_central_beacon.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/beacon/test/src/sta_receive_central_beacon.c
+ * \file cp/beacon/test/src/sta_receive_central_beacon.c
* \brief Test the reception of a beacon.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
* See description of the test in the doc/recv-beacon.txt
* or execute make in the doc directory to generate the html and odt file.
@@ -23,11 +23,11 @@
#include "mac/common/ntb.h"
#include "mac/common/store.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/beacon/inc/bentry_size.h"
+#include "cp/beacon/beacon.h"
+#include "cp/beacon/inc/bentry_size.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "mac/ca/ca.h"
diff --git a/cesar/cp2/cco/action/Module b/cesar/cp/cco/action/Module
index 9cde29712e..9cde29712e 100644
--- a/cesar/cp2/cco/action/Module
+++ b/cesar/cp/cco/action/Module
diff --git a/cesar/cp2/cco/action/cco_action.h b/cesar/cp/cco/action/cco_action.h
index ae73747df3..6931c6700e 100644
--- a/cesar/cp2/cco/action/cco_action.h
+++ b/cesar/cp/cco/action/cco_action.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cco_action_h
-#define cp2_cco_action_h
+#ifndef cp_cco_action_h
+#define cp_cco_action_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,16 +8,16 @@
*
* }}} */
/**
- * \file cp2/cco/cco_action.h
+ * \file cp/cco/cco_action.h
* \brief CCo Public functions.
- * \ingroup cp2_cco
+ * \ingroup cp_cco
*
*/
-#include "cp2/cp.h"
-#include "cp2/mme.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/cp.h"
+#include "cp/mme.h"
+#include "cp/beacon/beacon.h"
+#include "cp/sta/mgr/sta.h"
/** Forward declaration. */
typedef struct cp_cco_action_t cp_cco_action_t;
@@ -112,4 +112,4 @@ cp_cco_action_manage_sta_leave_req (cp_t *ctx, cp_mme_rx_t * leave_req)
}
-#endif /* cp2_cco_action_h */
+#endif /* cp_cco_action_h */
diff --git a/cesar/cp2/cco/action/cco_conn/Module b/cesar/cp/cco/action/cco_conn/Module
index cc9223a014..cc9223a014 100644
--- a/cesar/cp2/cco/action/cco_conn/Module
+++ b/cesar/cp/cco/action/cco_conn/Module
diff --git a/cesar/cp2/cco/action/cco_conn/cco_action.h b/cesar/cp/cco/action/cco_conn/cco_action.h
index 76e8383561..08a4ccf76b 100644
--- a/cesar/cp2/cco/action/cco_conn/cco_action.h
+++ b/cesar/cp/cco/action/cco_conn/cco_action.h
@@ -14,9 +14,9 @@
*
* « long description »
*/
-#include "cp2/mme.h"
+#include "cp/mme.h"
#include "lib/list.h"
-#include "cp2/conn/conn.h"
+#include "cp/conn/conn.h"
/**
* - Functions reacting to incoming MME related to global connection.
diff --git a/cesar/cp2/cco/action/cco_conn/doc/CCo Con.odt b/cesar/cp/cco/action/cco_conn/doc/CCo Con.odt
index aed8db1cab..aed8db1cab 100755
--- a/cesar/cp2/cco/action/cco_conn/doc/CCo Con.odt
+++ b/cesar/cp/cco/action/cco_conn/doc/CCo Con.odt
Binary files differ
diff --git a/cesar/cp2/cco/action/cco_conn/doc/cco_conn.xmi b/cesar/cp/cco/action/cco_conn/doc/cco_conn.xmi
index 2e98a9400e..2e98a9400e 100644
--- a/cesar/cp2/cco/action/cco_conn/doc/cco_conn.xmi
+++ b/cesar/cp/cco/action/cco_conn/doc/cco_conn.xmi
diff --git a/cesar/cp2/cco/action/cco_conn/inc/cco_action.h b/cesar/cp/cco/action/cco_conn/inc/cco_action.h
index 4e9e50473f..4e9e50473f 100644
--- a/cesar/cp2/cco/action/cco_conn/inc/cco_action.h
+++ b/cesar/cp/cco/action/cco_conn/inc/cco_action.h
diff --git a/cesar/cp2/cco/action/cco_conn/src/action.c b/cesar/cp/cco/action/cco_conn/src/action.c
index 22513eaaaa..93326ce549 100644
--- a/cesar/cp2/cco/action/cco_conn/src/action.c
+++ b/cesar/cp/cco/action/cco_conn/src/action.c
@@ -8,36 +8,36 @@
/**
* \file cco_action.c
* \brief Control the MMEs in relation with the CCo 1
- * \ingroup cp2_cco_action
+ * \ingroup cp_cco_action
*
*/
#include "common/std.h"
#include "lib/blk.h"
-#include "cp2/inc/context.h"
-#include "cp2/cp.h"
+#include "cp/inc/context.h"
+#include "cp/cp.h"
#include "string.h"
#include "lib/list.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn_mgr.h"
-#include "cp2/cco/action/cco_conn/cco_action.h"
+#include "cp/cco/action/cco_conn/cco_action.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
-#include "cp2/cco/bw/inc/bw_prio_heap.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
+#include "cp/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/inc/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
#include "cl/inc/cl_mactotei.h"
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_mgr.h"
void
cp_cco_action_mme_glink_send (cp_t *ctx)
diff --git a/cesar/cp2/cco/action/cco_conn/test/Makefile b/cesar/cp/cco/action/cco_conn/test/Makefile
index 5410d17823..4674ed897c 100644
--- a/cesar/cp2/cco/action/cco_conn/test/Makefile
+++ b/cesar/cp/cco/action/cco_conn/test/Makefile
@@ -1,12 +1,12 @@
BASE= ../../../../..
ECOS=y
-INCLUDES=cp2/conn/test/overide/
+INCLUDES=cp/conn/test/overide/
TARGET_PROGRAMS = cco_action_conn_test
cco_action_conn_test_SOURCES = cco_action_conn_test.c msg_stub.c fsm_stub.c
-cco_action_conn_test_MODULES = lib cp2/cco/bw cp2/cco/action/cco_conn cp2/conn cp2/sta/mgr mac/common cl
+cco_action_conn_test_MODULES = lib cp/cco/bw cp/cco/action/cco_conn cp/conn cp/sta/mgr mac/common cl
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/cco/action/cco_conn/test/ecos.ecc.sh b/cesar/cp/cco/action/cco_conn/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/cco/action/cco_conn/test/ecos.ecc.sh
+++ b/cesar/cp/cco/action/cco_conn/test/ecos.ecc.sh
diff --git a/cesar/cp2/cco/action/cco_conn/test/overide/cp_fsm_defs.h b/cesar/cp/cco/action/cco_conn/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/cco/action/cco_conn/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/cco/action/cco_conn/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/cco/action/cco_conn/test/src/cco_action_conn_test.c b/cesar/cp/cco/action/cco_conn/test/src/cco_action_conn_test.c
index 0ec4f636d8..b38b32dd12 100644
--- a/cesar/cp2/cco/action/cco_conn/test/src/cco_action_conn_test.c
+++ b/cesar/cp/cco/action/cco_conn/test/src/cco_action_conn_test.c
@@ -8,25 +8,25 @@
/**
* \file bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the becon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
-#include "cp2/cco/action/cco_conn/cco_action.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
+#include "cp/cco/action/cco_conn/cco_action.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/pwl/pwl.h"
#include "mac/common/timings.h"
#include "lib/blk.h"
diff --git a/cesar/cp2/cco/bw/test/src/fsm_stub.c b/cesar/cp/cco/action/cco_conn/test/src/fsm_stub.c
index a2f607bd1c..849f375270 100644
--- a/cesar/cp2/cco/bw/test/src/fsm_stub.c
+++ b/cesar/cp/cco/action/cco_conn/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/cco/action/cco_conn/test/src/msg_stub.c b/cesar/cp/cco/action/cco_conn/test/src/msg_stub.c
index 6ca040cdd6..bdd3aa078f 100644
--- a/cesar/cp2/cco/action/cco_conn/test/src/msg_stub.c
+++ b/cesar/cp/cco/action/cco_conn/test/src/msg_stub.c
@@ -8,25 +8,25 @@
/**
* \file bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the becon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
-#include "cp2/cco/action/cco_conn/cco_action.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
+#include "cp/cco/action/cco_conn/cco_action.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/pwl/pwl.h"
#include "mac/common/timings.h"
#include "lib/blk.h"
diff --git a/cesar/cp2/cco/action/doc/Makefile b/cesar/cp/cco/action/doc/Makefile
index e5f5e93bbd..e5f5e93bbd 100644
--- a/cesar/cp2/cco/action/doc/Makefile
+++ b/cesar/cp/cco/action/doc/Makefile
diff --git a/cesar/cp2/cco/action/doc/assoc_procedure.sdl b/cesar/cp/cco/action/doc/assoc_procedure.sdl
index 898ef270ed..898ef270ed 100644
--- a/cesar/cp2/cco/action/doc/assoc_procedure.sdl
+++ b/cesar/cp/cco/action/doc/assoc_procedure.sdl
diff --git a/cesar/cp2/cco/action/doc/auth_procedure.sdl b/cesar/cp/cco/action/doc/auth_procedure.sdl
index bc14ccab05..bc14ccab05 100644
--- a/cesar/cp2/cco/action/doc/auth_procedure.sdl
+++ b/cesar/cp/cco/action/doc/auth_procedure.sdl
diff --git a/cesar/cp2/cco/action/doc/cco_action.odt b/cesar/cp/cco/action/doc/cco_action.odt
index ed0a3590cb..ed0a3590cb 100644
--- a/cesar/cp2/cco/action/doc/cco_action.odt
+++ b/cesar/cp/cco/action/doc/cco_action.odt
Binary files differ
diff --git a/cesar/cp2/cco/action/doc/cco_action.xmi b/cesar/cp/cco/action/doc/cco_action.xmi
index ad3bbf1ee9..ad3bbf1ee9 100644
--- a/cesar/cp2/cco/action/doc/cco_action.xmi
+++ b/cesar/cp/cco/action/doc/cco_action.xmi
diff --git a/cesar/cp2/cco/action/doc/leave.sdl b/cesar/cp/cco/action/doc/leave.sdl
index 75a83c35c5..75a83c35c5 100644
--- a/cesar/cp2/cco/action/doc/leave.sdl
+++ b/cesar/cp/cco/action/doc/leave.sdl
diff --git a/cesar/cp2/cco/action/doc/snid.sdl b/cesar/cp/cco/action/doc/snid.sdl
index c8b1edce9a..c8b1edce9a 100644
--- a/cesar/cp2/cco/action/doc/snid.sdl
+++ b/cesar/cp/cco/action/doc/snid.sdl
diff --git a/cesar/cp2/cco/action/doc/tei.sdl b/cesar/cp/cco/action/doc/tei.sdl
index c372d320b0..c372d320b0 100644
--- a/cesar/cp2/cco/action/doc/tei.sdl
+++ b/cesar/cp/cco/action/doc/tei.sdl
diff --git a/cesar/cp2/cco/action/inc/cco_action.h b/cesar/cp/cco/action/inc/cco_action.h
index 531826ae1f..d30fa6e7ea 100644
--- a/cesar/cp2/cco/action/inc/cco_action.h
+++ b/cesar/cp/cco/action/inc/cco_action.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cco_inc_cco_action_h
-#define cp2_cco_inc_cco_action_h
+#ifndef cp_cco_inc_cco_action_h
+#define cp_cco_inc_cco_action_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,15 +8,15 @@
*
* }}} */
/**
- * \file cp2/cco/inc/cco_action.h
+ * \file cp/cco/inc/cco_action.h
* \brief CCo private functions.
- * \ingroup cp2_cco
+ * \ingroup cp_cco
*
*/
#include "lib/set.h"
#include "lib/rnd.h"
-#include "cp2/cco/action/cco_action.h"
+#include "cp/cco/action/cco_action.h"
#define CP_CCO_ACTION_TEI_FLAGS_ROW 8
#define CP_CCO_ACTION_TEI_FLAGS_ROW_SIZE_BITS 32 /* 32 bits. */
@@ -74,4 +74,4 @@ cp_cco_action_tei_release (cp_cco_action_t *ctx, u8 tei);
bool
cp_cco_action_tei_lease_less (set_node_t * left, set_node_t * right);
-#endif /* cp2_cco_inc_cco_action_h */
+#endif /* cp_cco_inc_cco_action_h */
diff --git a/cesar/cp2/cco/action/src/cco_action.c b/cesar/cp/cco/action/src/cco_action.c
index 0a4b5400bf..398fcd91ba 100644
--- a/cesar/cp2/cco/action/src/cco_action.c
+++ b/cesar/cp/cco/action/src/cco_action.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/cco/action/src/cco_action.c
+ * \file cp/cco/action/src/cco_action.c
* \brief CCo Action functions.
- * \ingroup cp2_cco
+ * \ingroup cp_cco
*
*/
#include <string.h>
@@ -26,20 +26,20 @@
#include "mac/common/ntb.h"
#include "mac/common/timings.h"
-#include "cp2/defs.h"
-#include "cp2/cp.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/msg/msg.h"
+#include "cp/defs.h"
+#include "cp/cp.h"
+#include "cp/fsm/fsm.h"
+#include "cp/msg/msg.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/sta.h"
-#include "cp2/beacon/beacon.h"
+#include "cp/beacon/beacon.h"
-#include "cp2/inc/context.h"
-#include "cp2/cco/action/inc/cco_action.h"
+#include "cp/inc/context.h"
+#include "cp/cco/action/inc/cco_action.h"
/**
* Search for an available TEI in the AVLN list.
diff --git a/cesar/cp2/cco/action/test/Makefile b/cesar/cp/cco/action/test/Makefile
index a09361ae48..ab02071d3a 100644
--- a/cesar/cp2/cco/action/test/Makefile
+++ b/cesar/cp/cco/action/test/Makefile
@@ -2,17 +2,17 @@ BASE = ../../../..
ECOS = y
-INCLUDES = cp2/cco/action/test/overide
+INCLUDES = cp/cco/action/test/overide
TARGET_PROGRAMS = action garbage action_gen_nek
action_SOURCES = action-test.c secu_stub.c
-action_MODULES = lib cp2/cco/action mac/common cp2/sta/mgr cl
+action_MODULES = lib cp/cco/action mac/common cp/sta/mgr cl
garbage_SOURCES = garbage.c fsm_stub.c secu_stub.c
-garbage_MODULES = lib cp2/cco/action mac/common cp2/sta/mgr cl
+garbage_MODULES = lib cp/cco/action mac/common cp/sta/mgr cl
action_gen_nek_SOURCES = action_gen_nek.c secu_stub.c fsm_stub.c
-action_gen_nek_MODULES = lib cp2/cco/action mac/common cp2/sta/mgr cl
+action_gen_nek_MODULES = lib cp/cco/action mac/common cp/sta/mgr cl
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/cco/action/test/doc/Makefile b/cesar/cp/cco/action/test/doc/Makefile
index fc8858cbcd..fc8858cbcd 100644
--- a/cesar/cp2/cco/action/test/doc/Makefile
+++ b/cesar/cp/cco/action/test/doc/Makefile
diff --git a/cesar/cp2/cco/action/test/doc/cco_action.txt b/cesar/cp/cco/action/test/doc/cco_action.txt
index c844e602df..c844e602df 100644
--- a/cesar/cp2/cco/action/test/doc/cco_action.txt
+++ b/cesar/cp/cco/action/test/doc/cco_action.txt
diff --git a/cesar/cp2/cco/action/test/ecos.ecc.sh b/cesar/cp/cco/action/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/cco/action/test/ecos.ecc.sh
+++ b/cesar/cp/cco/action/test/ecos.ecc.sh
diff --git a/cesar/cp2/cco/action/test/overide/cp_fsm_defs.h b/cesar/cp/cco/action/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/cco/action/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/cco/action/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/cco/action/test/src/action-test.c b/cesar/cp/cco/action/test/src/action-test.c
index 900953d5fb..30fafa88cb 100644
--- a/cesar/cp2/cco/action/test/src/action-test.c
+++ b/cesar/cp/cco/action/test/src/action-test.c
@@ -27,15 +27,15 @@
#include "mac/common/ntb.h"
-#include "cp2/cp.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/cp.h"
+#include "cp/fsm/fsm.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/cco/action/inc/cco_action.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/cco/action/inc/cco_action.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
test_t test;
diff --git a/cesar/cp2/cco/action/test/src/action_gen_nek.c b/cesar/cp/cco/action/test/src/action_gen_nek.c
index 51e647d70e..a642791b62 100644
--- a/cesar/cp2/cco/action/test/src/action_gen_nek.c
+++ b/cesar/cp/cco/action/test/src/action_gen_nek.c
@@ -27,15 +27,15 @@
#include "mac/common/ntb.h"
-#include "cp2/cp.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/cp.h"
+#include "cp/fsm/fsm.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/cco/action/inc/cco_action.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/cco/action/inc/cco_action.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include "stdio.h"
static cp_t cp;
diff --git a/cesar/cp2/cl_interf/test/src/fsm_stub.c b/cesar/cp/cco/action/test/src/fsm_stub.c
index a2f607bd1c..849f375270 100644
--- a/cesar/cp2/cl_interf/test/src/fsm_stub.c
+++ b/cesar/cp/cco/action/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/cco/action/test/src/garbage.c b/cesar/cp/cco/action/test/src/garbage.c
index 81470a5fd2..98407ff30f 100644
--- a/cesar/cp2/cco/action/test/src/garbage.c
+++ b/cesar/cp/cco/action/test/src/garbage.c
@@ -8,7 +8,7 @@
/**
* \file src/garbage.c
* \brief Test the garbage.
- * \ingroup cp2_cco
+ * \ingroup cp_cco
*
*/
#include "common/std.h"
@@ -16,13 +16,13 @@
#include "mac/common/ntb.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/cco/action/inc/cco_action.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/cco/action/inc/cco_action.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include "stdio.h"
diff --git a/cesar/cp2/cco/action/test/src/secu_stub.c b/cesar/cp/cco/action/test/src/secu_stub.c
index f295e26943..0a14cf3836 100644
--- a/cesar/cp2/cco/action/test/src/secu_stub.c
+++ b/cesar/cp/cco/action/test/src/secu_stub.c
@@ -8,12 +8,12 @@
/**
* \file src/secu_stub.c
* \brief The security functions.
- * \ingroup cp2/cco/action
+ * \ingroup cp/cco/action
*
*/
#include "common/std.h"
-#include "cp2/secu/secu.h"
+#include "cp/secu/secu.h"
/**
* Generate the AES key.
diff --git a/cesar/cp2/cco/bw/Module b/cesar/cp/cco/bw/Module
index be06c3a4fe..be06c3a4fe 100644
--- a/cesar/cp2/cco/bw/Module
+++ b/cesar/cp/cco/bw/Module
diff --git a/cesar/cp2/cco/bw/bw.h b/cesar/cp/cco/bw/bw.h
index 3d4c53127d..5d1e4580b5 100644
--- a/cesar/cp2/cco/bw/bw.h
+++ b/cesar/cp/cco/bw/bw.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cco_bw_h
-#define cp2_cco_bw_h
+#ifndef cp_cco_bw_h
+#define cp_cco_bw_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -14,11 +14,11 @@
*
* « long description »
*/
-#include "cp2/cp.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
+#include "cp/cp.h"
+#include "cp/cco/bw/bw_prio_heap.h"
#include "lib/list.h"
#include "lib/set.h"
-#include "cp2/conn/conn.h"
+#include "cp/conn/conn.h"
enum cp_cco_bw_persistence_t
{
diff --git a/cesar/cp2/cco/bw/bw_lib_alloc.h b/cesar/cp/cco/bw/bw_lib_alloc.h
index ca006cc636..28dc3270d4 100644
--- a/cesar/cp2/cco/bw/bw_lib_alloc.h
+++ b/cesar/cp/cco/bw/bw_lib_alloc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_ccp_cco_bw_bw_lib_alloc_h
-#define cp2_ccp_cco_bw_bw_lib_alloc_h
+#ifndef cp_ccp_cco_bw_bw_lib_alloc_h
+#define cp_ccp_cco_bw_bw_lib_alloc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/cco/bw/bw_lib_alloc.h
+ * \file cp/cco/bw/bw_lib_alloc.h
* \brief schedules allocation.
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
*/
-#include "cp2/cco/bw/bw.h"
+#include "cp/cco/bw/bw.h"
/** Initialise the SET.
* \param set the set to initialise.
@@ -79,4 +79,4 @@ cp_cco_bw_schedules_allocation_less (set_node_t * left,
void
cp_cco_bw_schedules_move (set_t *set_dest, set_t *set_src);
-#endif /* cp2_ccp_cco_bw_bw_lib_alloc_h */
+#endif /* cp_ccp_cco_bw_bw_lib_alloc_h */
diff --git a/cesar/cp2/cco/bw/bw_prio_heap.h b/cesar/cp/cco/bw/bw_prio_heap.h
index 7c099597db..e88ba70e3f 100644
--- a/cesar/cp2/cco/bw/bw_prio_heap.h
+++ b/cesar/cp/cco/bw/bw_prio_heap.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cco_bw_prio_heap_h
-#define cp2_cco_bw_prio_heap_h
+#ifndef cp_cco_bw_prio_heap_h
+#define cp_cco_bw_prio_heap_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -15,7 +15,7 @@
* « long description »
*/
#include "lib/list.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
/**
* connection storage regarding to its priority and time arrival.
diff --git a/cesar/cp2/cco/bw/doc/Bandwidth_Manager.odt b/cesar/cp/cco/bw/doc/Bandwidth_Manager.odt
index 73ffeb0f08..73ffeb0f08 100755
--- a/cesar/cp2/cco/bw/doc/Bandwidth_Manager.odt
+++ b/cesar/cp/cco/bw/doc/Bandwidth_Manager.odt
Binary files differ
diff --git a/cesar/cp2/cco/bw/doc/bw.xmi b/cesar/cp/cco/bw/doc/bw.xmi
index c0961b7598..c0961b7598 100644
--- a/cesar/cp2/cco/bw/doc/bw.xmi
+++ b/cesar/cp/cco/bw/doc/bw.xmi
diff --git a/cesar/cp2/cco/bw/inc/bw.h b/cesar/cp/cco/bw/inc/bw.h
index 4d453b181e..29b2c7f7f4 100644
--- a/cesar/cp2/cco/bw/inc/bw.h
+++ b/cesar/cp/cco/bw/inc/bw.h
@@ -15,8 +15,8 @@
* « long description »
*/
#include "lib/set.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/conn/link.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/conn/link.h"
#define FORWARD true
#define BACKWARD false
diff --git a/cesar/cp2/cco/bw/inc/bw_prio_heap.h b/cesar/cp/cco/bw/inc/bw_prio_heap.h
index c84ca9538f..f7e7d70473 100644
--- a/cesar/cp2/cco/bw/inc/bw_prio_heap.h
+++ b/cesar/cp/cco/bw/inc/bw_prio_heap.h
@@ -7,12 +7,12 @@
* <<<Licence>>>
*
* }}} */
-#include "cp2/cco/bw/bw_prio_heap.h"
-#include "cp2/cco/bw/bw.h"
+#include "cp/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
/**
- * \file cp2/cco/bw/inc/cp_cco_bw_prio_heap.h
+ * \file cp/cco/bw/inc/cp_cco_bw_prio_heap.h
* \brief « brief description »
- * \ingroup cp2/cco/bw/inc/cp_cco_bw_prio_heap.h
+ * \ingroup cp/cco/bw/inc/cp_cco_bw_prio_heap.h
*
* « long description »
*/
diff --git a/cesar/cp2/cco/bw/src/bw.c b/cesar/cp/cco/bw/src/bw.c
index f0ccda3252..aacc8ea1df 100644
--- a/cesar/cp2/cco/bw/src/bw.c
+++ b/cesar/cp/cco/bw/src/bw.c
@@ -8,33 +8,33 @@
/**
* \file bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the beacon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "mac/common/timings.h"
#include "lib/blk.h"
#include "lib/list.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/pwl/pwl.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
-#include "cp2/cco/bw/inc/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
+#include "cp/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/inc/bw_prio_heap.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_mgr.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/cesar/cp2/cco/bw/src/bw_lib_alloc.c b/cesar/cp/cco/bw/src/bw_lib_alloc.c
index 47f2af58d8..55ae5cb846 100644
--- a/cesar/cp2/cco/bw/src/bw_lib_alloc.c
+++ b/cesar/cp/cco/bw/src/bw_lib_alloc.c
@@ -6,17 +6,17 @@
*
* }}} */
/**
- * \file cp2/cco/action/src/bw_lib_alloc.c
+ * \file cp/cco/action/src/bw_lib_alloc.c
* \brief schedules list manager.
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
*/
#include "common/std.h"
#include "lib/set.h"
#include "lib/blk.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
/** Initialise the SET.
* \param set the set to initialise.
diff --git a/cesar/cp2/cco/bw/src/bw_prio_heap.c b/cesar/cp/cco/bw/src/bw_prio_heap.c
index 94a60f51aa..f01766554d 100644
--- a/cesar/cp2/cco/bw/src/bw_prio_heap.c
+++ b/cesar/cp/cco/bw/src/bw_prio_heap.c
@@ -8,7 +8,7 @@
/**
* \file bw_prio_heap.c
* \brief control the heap of the connection
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* « long description »
*/
@@ -16,15 +16,15 @@
#include "lib/blk.h"
#include "string.h"
-#include "cp2/cco/bw/inc/bw_prio_heap.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/inc/bw_prio_heap.h"
+#include "cp/cco/bw/bw_prio_heap.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
#include "lib/list.h"
-#include "cp2/inc/context.h"
-#include "cp2/cp.h"
+#include "cp/inc/context.h"
+#include "cp/cp.h"
cp_cco_bw_prio_conn_t*
cp_cco_bw_prio_heap_get_most_prior_conn (cp_t *ctx)
diff --git a/cesar/cp2/cco/bw/test/Makefile b/cesar/cp/cco/bw/test/Makefile
index 5cd23d015a..6fe8e91d4b 100644
--- a/cesar/cp2/cco/bw/test/Makefile
+++ b/cesar/cp/cco/bw/test/Makefile
@@ -1,17 +1,17 @@
BASE = ../../../..
ECOS=y
-INCLUDES = cp2/cco/bw/test/overide/
+INCLUDES = cp/cco/bw/test/overide/
TARGET_PROGRAMS = schedules bw_prio_heap_test bw_test
schedules_SOURCES = bw_list_alloc_test.c pwl_stub.c msg_stub.c fsm_stub.c cl_stub.c
-schedules_MODULES = lib cp2/cco/bw cp2/conn mac/common cp2/sta/mgr
+schedules_MODULES = lib cp/cco/bw cp/conn mac/common cp/sta/mgr
bw_prio_heap_test_SOURCES = bw_prio_heap_test.c pwl_stub.c msg_stub.c fsm_stub.c cl_stub.c
-bw_prio_heap_test_MODULES = lib cp2/cco/bw cp2/conn mac/common cp2/sta/mgr
+bw_prio_heap_test_MODULES = lib cp/cco/bw cp/conn mac/common cp/sta/mgr
bw_test_SOURCES = bw_test.c pwl_stub.c msg_stub.c fsm_stub.c cl_stub.c
-bw_test_MODULES = lib cp2/cco/bw cp2/conn mac/common cp2/sta/mgr
+bw_test_MODULES = lib cp/cco/bw cp/conn mac/common cp/sta/mgr
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/cco/bw/test/bandwidth manager - test plan.ods b/cesar/cp/cco/bw/test/bandwidth manager - test plan.ods
index 81a2588fa4..81a2588fa4 100644
--- a/cesar/cp2/cco/bw/test/bandwidth manager - test plan.ods
+++ b/cesar/cp/cco/bw/test/bandwidth manager - test plan.ods
Binary files differ
diff --git a/cesar/cp2/cco/bw/test/ecos.ecc.sh b/cesar/cp/cco/bw/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/cco/bw/test/ecos.ecc.sh
+++ b/cesar/cp/cco/bw/test/ecos.ecc.sh
diff --git a/cesar/cp2/cco/bw/test/overide/cp_fsm_defs.h b/cesar/cp/cco/bw/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/cco/bw/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/cco/bw/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/cco/bw/test/src/bw_list_alloc_test.c b/cesar/cp/cco/bw/test/src/bw_list_alloc_test.c
index aa80f52ccc..a7ca23e98b 100644
--- a/cesar/cp2/cco/bw/test/src/bw_list_alloc_test.c
+++ b/cesar/cp/cco/bw/test/src/bw_list_alloc_test.c
@@ -8,7 +8,7 @@
/**
* \file src/beacon_schedules.c
* \brief Test the beacon schedules list.
- * \ingroup cp2_beacon
+ * \ingroup cp_beacon
*
*/
#include "common/std.h"
@@ -17,9 +17,9 @@
#include "lib/test.h"
#include "lib/blk.h"
#include "cyg/kernel/kapi.h"
-#include "cp2/cco/bw/bw_lib_alloc.h"
+#include "cp/cco/bw/bw_lib_alloc.h"
-#include "cp2/conn/conn.h"
+#include "cp/conn/conn.h"
/**
* Add a node to the set.
* \param test the test object.
diff --git a/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c b/cesar/cp/cco/bw/test/src/bw_prio_heap_test.c
index e4104baaa5..2d08c45d6d 100644
--- a/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c
+++ b/cesar/cp/cco/bw/test/src/bw_prio_heap_test.c
@@ -9,7 +9,7 @@
/**
* \file bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the becon period
*/
@@ -21,15 +21,15 @@
#include "lib/bitstream.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
-#include "cp2/cco/bw/inc/bw_prio_heap.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
+#include "cp/cco/bw/inc/bw_prio_heap.h"
+#include "cp/cco/bw/bw_prio_heap.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/conn_mgr.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/conn_mgr.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "lib/list.h"
diff --git a/cesar/cp2/cco/bw/test/src/bw_test.c b/cesar/cp/cco/bw/test/src/bw_test.c
index 6b39852a45..0cd165a251 100644
--- a/cesar/cp2/cco/bw/test/src/bw_test.c
+++ b/cesar/cp/cco/bw/test/src/bw_test.c
@@ -8,14 +8,14 @@
/**
* \log bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the becon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "lib/blk.h"
#include "lib/test.h"
@@ -24,18 +24,18 @@
#include "lib/bitstream.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/pwl/pwl.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/inc/bw.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
-#include "cp2/cco/bw/inc/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/inc/bw.h"
+#include "cp/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/inc/bw_prio_heap.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
#include "lib/list.h"
diff --git a/cesar/cp2/cco/bw/test/src/cl_stub.c b/cesar/cp/cco/bw/test/src/cl_stub.c
index ec1f4bd9ec..ec1f4bd9ec 100644
--- a/cesar/cp2/cco/bw/test/src/cl_stub.c
+++ b/cesar/cp/cco/bw/test/src/cl_stub.c
diff --git a/cesar/cp2/cco/action/test/src/fsm_stub.c b/cesar/cp/cco/bw/test/src/fsm_stub.c
index a2f607bd1c..849f375270 100644
--- a/cesar/cp2/cco/action/test/src/fsm_stub.c
+++ b/cesar/cp/cco/bw/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/cco/bw/test/src/msg_stub.c b/cesar/cp/cco/bw/test/src/msg_stub.c
index 1d46d32868..49e864f94d 100644
--- a/cesar/cp2/cco/bw/test/src/msg_stub.c
+++ b/cesar/cp/cco/bw/test/src/msg_stub.c
@@ -8,17 +8,17 @@
/**
* \file link.c
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/conn/conn_mgr.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/link.h"
-#include "cp2/mme.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/conn/conn_mgr.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/link.h"
+#include "cp/mme.h"
void
cp_msg_cm_conn_new_req_send(cp_t *ctx,
diff --git a/cesar/cp2/cco/bw/test/src/pwl_stub.c b/cesar/cp/cco/bw/test/src/pwl_stub.c
index 57ce8c6931..4fa96e25ca 100644
--- a/cesar/cp2/cco/bw/test/src/pwl_stub.c
+++ b/cesar/cp/cco/bw/test/src/pwl_stub.c
@@ -8,7 +8,7 @@
/**
* \file link.c
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
@@ -16,9 +16,9 @@
#include "mac/common/timings.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/pwl/pwl.h"
void
cp_pwl_init (cp_t *ctx)
diff --git a/cesar/cp2/cco/region/doc/Region_Manager.odt b/cesar/cp/cco/region/doc/Region_Manager.odt
index 972ccbb264..972ccbb264 100755
--- a/cesar/cp2/cco/region/doc/Region_Manager.odt
+++ b/cesar/cp/cco/region/doc/Region_Manager.odt
Binary files differ
diff --git a/cesar/cp2/cco/region/doc/region.xmi b/cesar/cp/cco/region/doc/region.xmi
index 804569d38d..804569d38d 100644
--- a/cesar/cp2/cco/region/doc/region.xmi
+++ b/cesar/cp/cco/region/doc/region.xmi
diff --git a/cesar/cp2/cco/region/inc/region.h b/cesar/cp/cco/region/inc/region.h
index c88d2bae50..27e3cc7c1a 100644
--- a/cesar/cp2/cco/region/inc/region.h
+++ b/cesar/cp/cco/region/inc/region.h
@@ -10,11 +10,11 @@
/**
* \file inc/cp_cco_region_private.h
* \brief Region manager functions
- * \ingroup cp2_cco_region
+ * \ingroup cp_cco_region
*
* « long description »
*/
-#include "cp2/cco/region/region.h"
+#include "cp/cco/region/region.h"
/**
* Memorise the alloc we already ask for to the other nets and has been
diff --git a/cesar/cp2/cco/region/region.h b/cesar/cp/cco/region/region.h
index 5ca5adcb6f..c79c7f06a6 100644
--- a/cesar/cp2/cco/region/region.h
+++ b/cesar/cp/cco/region/region.h
@@ -16,8 +16,8 @@
*/
#include "lib/list.h"
-#include "cp2/cp.h"
-#include "cp2/mme.h"
+#include "cp/cp.h"
+#include "cp/mme.h"
/**
* Enum of the different states of the regions
@@ -52,7 +52,7 @@ struct cp_cco_region_inl_alloc_t
// TODO Removed this once the region manager is written
// Update the beacon unit test i.e.
- // trunk/cp2/beacon/test/src/region_stub.c
+ // trunk/cp/beacon/test/src/region_stub.c
struct cp_cco_region_inl_alloc_t *next;
};
typedef struct cp_cco_region_inl_alloc_t cp_cco_region_inl_alloc_t;
diff --git a/cesar/cp2/cl_interf/Module b/cesar/cp/cl_interf/Module
index 789759acdc..789759acdc 100644
--- a/cesar/cp2/cl_interf/Module
+++ b/cesar/cp/cl_interf/Module
diff --git a/cesar/cp2/cl_interf/cl_interf.h b/cesar/cp/cl_interf/cl_interf.h
index 7d90af7314..18e8251763 100644
--- a/cesar/cp2/cl_interf/cl_interf.h
+++ b/cesar/cp/cl_interf/cl_interf.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cl_interf_cl_interf_h
-#define cp2_cl_interf_cl_interf_h
+#ifndef cp_cl_interf_cl_interf_h
+#define cp_cl_interf_cl_interf_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/cl_interf/cl_interf.h
+ * \file cp/cl_interf/cl_interf.h
* \brief CP2 cl interface.
- * \ingroup cp2_cl_interf
+ * \ingroup cp_cl_interf
*/
-#include "cp2/mme.h"
+#include "cp/mme.h"
/** Forward declaration. */
typedef struct cp_cl_interf_t cp_cl_interf_t;
@@ -88,4 +88,4 @@ void
cp_cl_interf_garbage_collector (cp_t *ctx);
-#endif /* cp2_cl_interf_cl_interf_h */
+#endif /* cp_cl_interf_cl_interf_h */
diff --git a/cesar/cp2/cl_interf/doc/cl-interf.xmi b/cesar/cp/cl_interf/doc/cl-interf.xmi
index c91ba065ad..c91ba065ad 100644
--- a/cesar/cp2/cl_interf/doc/cl-interf.xmi
+++ b/cesar/cp/cl_interf/doc/cl-interf.xmi
diff --git a/cesar/cp2/cl_interf/doc/cp_cl_interf.odt b/cesar/cp/cl_interf/doc/cp_cl_interf.odt
index 7194a56641..7194a56641 100644
--- a/cesar/cp2/cl_interf/doc/cp_cl_interf.odt
+++ b/cesar/cp/cl_interf/doc/cp_cl_interf.odt
Binary files differ
diff --git a/cesar/cp2/cl_interf/inc/cl_interf.h b/cesar/cp/cl_interf/inc/cl_interf.h
index ea670ab6d8..0be8e944ea 100644
--- a/cesar/cp2/cl_interf/inc/cl_interf.h
+++ b/cesar/cp/cl_interf/inc/cl_interf.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cl_interf_inc_cl_interf_h
-#define cp2_cl_interf_inc_cl_interf_h
+#ifndef cp_cl_interf_inc_cl_interf_h
+#define cp_cl_interf_inc_cl_interf_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,11 +8,11 @@
*
* }}} */
/**
- * \file cp2/cl_interf/inc/cl_interf.h
+ * \file cp/cl_interf/inc/cl_interf.h
* \brief Private functions.
- * \ingroup cp2_cl_interf
+ * \ingroup cp_cl_interf
*/
-#include "cp2/cp.h"
+#include "cp/cp.h"
#include "mac/common/mfs.h"
/**
@@ -43,4 +43,4 @@ bool
cp_cl_interf_rx_mme_frag (cp_t *ctx, cp_tei_t tei, u8 *mme, uint length,
uint fmi);
-#endif /* cp2_cl_interf_inc_cl_interf_h */
+#endif /* cp_cl_interf_inc_cl_interf_h */
diff --git a/cesar/cp2/cl_interf/inc/cl_interf_msg.h b/cesar/cp/cl_interf/inc/cl_interf_msg.h
index e9a6bb5c21..0cfea78575 100644
--- a/cesar/cp2/cl_interf/inc/cl_interf_msg.h
+++ b/cesar/cp/cl_interf/inc/cl_interf_msg.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cl_interf_cl_interf_msg_h
-#define cp2_cl_interf_cl_interf_msg_h
+#ifndef cp_cl_interf_cl_interf_msg_h
+#define cp_cl_interf_cl_interf_msg_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file cp2/cl_interf/cl_interf_msg.h
+ * \file cp/cl_interf/cl_interf_msg.h
* \brief Message structure to store the data in the mailbox.
* \ingroup cp_cl_interf
*
@@ -44,4 +44,4 @@ struct cp_cl_interf_msg_t
};
typedef struct cp_cl_interf_msg_t cp_cl_interf_msg_t;
-#endif /* cp2_cl_interf_cl_interf_msg_h */
+#endif /* cp_cl_interf_cl_interf_msg_h */
diff --git a/cesar/cp2/cl_interf/inc/context.h b/cesar/cp/cl_interf/inc/context.h
index 3bf956e6d3..3bf956e6d3 100644
--- a/cesar/cp2/cl_interf/inc/context.h
+++ b/cesar/cp/cl_interf/inc/context.h
diff --git a/cesar/cp2/cl_interf/src/cl_interf.c b/cesar/cp/cl_interf/src/cl_interf.c
index b36737e5cd..b457092d82 100644
--- a/cesar/cp2/cl_interf/src/cl_interf.c
+++ b/cesar/cp/cl_interf/src/cl_interf.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/cl_interf/src/cl_interf.c
+ * \file cp/cl_interf/src/cl_interf.c
* \brief Cl Interface source.
- * \ingroup cp2_cl_interf
+ * \ingroup cp_cl_interf
*
*/
#include "common/std.h"
@@ -17,17 +17,17 @@
#include "lib/read_word.h"
#include "lib/blk.h"
-#include "cp2/cp.h"
-#include "cp2/defs.h"
+#include "cp/cp.h"
+#include "cp/defs.h"
#include "interface/interface.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/msg/msg.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/msg/msg.h"
-#include "cp2/inc/context.h"
-#include "cp2/cl_interf/inc/context.h"
-#include "cp2/cl_interf/inc/cl_interf.h"
-#include "cp2/cl_interf/inc/cl_interf_msg.h"
+#include "cp/inc/context.h"
+#include "cp/cl_interf/inc/context.h"
+#include "cp/cl_interf/inc/cl_interf.h"
+#include "cp/cl_interf/inc/cl_interf_msg.h"
/**
* Initialise the module.
diff --git a/cesar/cp2/cl_interf/test/Makefile b/cesar/cp/cl_interf/test/Makefile
index 7e201427f0..98019be202 100644
--- a/cesar/cp2/cl_interf/test/Makefile
+++ b/cesar/cp/cl_interf/test/Makefile
@@ -2,12 +2,12 @@ BASE = ../../..
ECOS = y
-INCLUDES = cp2/cl_interf/test/overide
+INCLUDES = cp/cl_interf/test/overide
TARGET_PROGRAMS = test-cl-interf
test-cl-interf_SOURCES = test-cl-interf.c cl_stub.c fsm_stub.c
-test-cl-interf_MODULES = lib cp2/cl_interf cp2/sta/mgr mac/common \
- cp2/secu
+test-cl-interf_MODULES = lib cp/cl_interf cp/sta/mgr mac/common \
+ cp/secu
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/cl_interf/test/doc/Makefile b/cesar/cp/cl_interf/test/doc/Makefile
index 27949031b7..27949031b7 100644
--- a/cesar/cp2/cl_interf/test/doc/Makefile
+++ b/cesar/cp/cl_interf/test/doc/Makefile
diff --git a/cesar/cp2/cl_interf/test/doc/cl-interf.txt b/cesar/cp/cl_interf/test/doc/cl-interf.txt
index fd7607fba9..fd7607fba9 100644
--- a/cesar/cp2/cl_interf/test/doc/cl-interf.txt
+++ b/cesar/cp/cl_interf/test/doc/cl-interf.txt
diff --git a/cesar/cp2/cl_interf/test/ecos.ecc.sh b/cesar/cp/cl_interf/test/ecos.ecc.sh
index 2443d0e40f..2443d0e40f 100644
--- a/cesar/cp2/cl_interf/test/ecos.ecc.sh
+++ b/cesar/cp/cl_interf/test/ecos.ecc.sh
diff --git a/cesar/cp2/cl_interf/test/overide/cp_fsm_defs.h b/cesar/cp/cl_interf/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/cl_interf/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/cl_interf/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/cl_interf/test/src/cl_stub.c b/cesar/cp/cl_interf/test/src/cl_stub.c
index 1efcdc14e9..1efcdc14e9 100644
--- a/cesar/cp2/cl_interf/test/src/cl_stub.c
+++ b/cesar/cp/cl_interf/test/src/cl_stub.c
diff --git a/cesar/cp2/cco/action/cco_conn/test/src/fsm_stub.c b/cesar/cp/cl_interf/test/src/fsm_stub.c
index a2f607bd1c..849f375270 100644
--- a/cesar/cp2/cco/action/cco_conn/test/src/fsm_stub.c
+++ b/cesar/cp/cl_interf/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/cl_interf/test/src/test-cl-interf.c b/cesar/cp/cl_interf/test/src/test-cl-interf.c
index 1a64f24cf0..5460c03e79 100644
--- a/cesar/cp2/cl_interf/test/src/test-cl-interf.c
+++ b/cesar/cp/cl_interf/test/src/test-cl-interf.c
@@ -6,11 +6,11 @@
*
* }}} */
/**
- * \file cp2/cl_interf/test/src/test-cl-interf.c
+ * \file cp/cl_interf/test/src/test-cl-interf.c
* \brief Test the CL interface.
- * \ingroup cp2_cl_interf
+ * \ingroup cp_cl_interf
*
- * See [source:trunk/cesar/cp2/cl_interf/test/doc/cl-intef.txt]
+ * See [source:trunk/cesar/cp/cl_interf/test/doc/cl-intef.txt]
* or
* [wiki:UT-CPM1-CL-INTERF]
*/
@@ -24,16 +24,16 @@
#include "mac/common/store.h"
-#include "cp2/cp.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/msg/msg.h"
-#include "cp2/inc/context.h"
-#include "cp2/cl_interf/inc/context.h"
-#include "cp2/cl_interf/inc/cl_interf.h"
-#include "cp2/cl_interf/inc/cl_interf_msg.h"
+#include "cp/inc/context.h"
+#include "cp/cl_interf/inc/context.h"
+#include "cp/cl_interf/inc/cl_interf.h"
+#include "cp/cl_interf/inc/cl_interf_msg.h"
-#include "cp2/msg/msg.h"
+#include "cp/msg/msg.h"
static test_t test;
static bool test_send_mme_without_mfs = false;
diff --git a/cesar/cp2/conn/Module b/cesar/cp/conn/Module
index 82fe1608a6..82fe1608a6 100644
--- a/cesar/cp2/conn/Module
+++ b/cesar/cp/conn/Module
diff --git a/cesar/cp2/conn/conn.h b/cesar/cp/conn/conn.h
index a10607ef27..dff734604d 100644
--- a/cesar/cp2/conn/conn.h
+++ b/cesar/cp/conn/conn.h
@@ -1,5 +1,5 @@
-#ifndef cp2_conn_conn_h
-#define cp2_conn_conn_h
+#ifndef cp_conn_conn_h
+#define cp_conn_conn_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -14,8 +14,8 @@
*
* « long description »
*/
-#include "cp2/cp.h"
-#include "cp2/conn/link.h"
+#include "cp/cp.h"
+#include "cp/conn/link.h"
/*
* Different type of a connection
diff --git a/cesar/cp2/conn/conn_mgr.h b/cesar/cp/conn/conn_mgr.h
index c4d93a72fc..1f9da3bbd7 100644
--- a/cesar/cp2/conn/conn_mgr.h
+++ b/cesar/cp/conn/conn_mgr.h
@@ -1,5 +1,5 @@
-#ifndef cp2_conn_conn_mgr_h
-#define cp2_conn_conn_mgr_h
+#ifndef cp_conn_conn_mgr_h
+#define cp_conn_conn_mgr_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -14,8 +14,8 @@
*
* « long description »
*/
-#include "cp2/mme.h"
-#include "cp2/conn/conn.h"
+#include "cp/mme.h"
+#include "cp/conn/conn.h"
/**
* connection list manager. add, delete, return, modify and check the
* validity of the connections.
diff --git a/cesar/cp2/conn/doc/conn.odt b/cesar/cp/conn/doc/conn.odt
index 174b9ee906..174b9ee906 100644
--- a/cesar/cp2/conn/doc/conn.odt
+++ b/cesar/cp/conn/doc/conn.odt
Binary files differ
diff --git a/cesar/cp2/conn/doc/conn.xmi b/cesar/cp/conn/doc/conn.xmi
index ab2d613c15..ab2d613c15 100644
--- a/cesar/cp2/conn/doc/conn.xmi
+++ b/cesar/cp/conn/doc/conn.xmi
diff --git a/cesar/cp2/conn/inc/conn.h b/cesar/cp/conn/inc/conn.h
index 44f1262a7d..000baeec64 100644
--- a/cesar/cp2/conn/inc/conn.h
+++ b/cesar/cp/conn/inc/conn.h
@@ -1,5 +1,5 @@
-#ifndef cp2_conn_inc_conn_h
-#define cp2_conn_inc_conn_h
+#ifndef cp_conn_inc_conn_h
+#define cp_conn_inc_conn_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -14,7 +14,7 @@
*
* « long description »
*/
-#include "cp2/cp.h"
+#include "cp/cp.h"
/**
diff --git a/cesar/cp2/conn/inc/link.h b/cesar/cp/conn/inc/link.h
index 657086fa1a..1392e923c5 100644
--- a/cesar/cp2/conn/inc/link.h
+++ b/cesar/cp/conn/inc/link.h
@@ -1,5 +1,5 @@
-#ifndef cp2_conn_inc_link_h
-#define cp2_conn_inc_link_h
+#ifndef cp_conn_inc_link_h
+#define cp_conn_inc_link_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -10,7 +10,7 @@
/**
* \file link.h
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
diff --git a/cesar/cp2/conn/link.h b/cesar/cp/conn/link.h
index 794eb57a17..33738509d8 100644
--- a/cesar/cp2/conn/link.h
+++ b/cesar/cp/conn/link.h
@@ -1,5 +1,5 @@
-#ifndef cp2_conn_link_h
-#define cp2_conn_link_h
+#ifndef cp_conn_link_h
+#define cp_conn_link_h
/* Cesar project {{{
*
@@ -11,7 +11,7 @@
/**
* \file link.h
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
diff --git a/cesar/cp2/conn/src/conn.c b/cesar/cp/conn/src/conn.c
index dc1275b97b..9084be1b15 100644
--- a/cesar/cp2/conn/src/conn.c
+++ b/cesar/cp/conn/src/conn.c
@@ -8,21 +8,21 @@
/**
* \file conn.c
* \brief conn
- * \ingroup cp2_conn
+ * \ingroup cp_conn
*
* Control the schedule of the becon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/bw/bw_prio_heap.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/bw/bw_prio_heap.h"
#include "lib/blk.h"
#include <stdio.h>
diff --git a/cesar/cp2/conn/src/conn_mgr.c b/cesar/cp/conn/src/conn_mgr.c
index fe7e7025c5..89d06bc667 100644
--- a/cesar/cp2/conn/src/conn_mgr.c
+++ b/cesar/cp/conn/src/conn_mgr.c
@@ -8,24 +8,24 @@
/**
* \file conn_mgr.c
* \brief conn mgr
- * \ingroup cp2_conn
+ * \ingroup cp_conn
*
*/
#include "common/std.h"
#include "cl/inc/cl_mactotei.h"
#include "lib/blk.h"
-#include "cp2/types.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
-
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/types.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
+
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_mgr.h"
void
cp_conn_mgr_init(cp_t *ctx)
diff --git a/cesar/cp2/conn/src/link.c b/cesar/cp/conn/src/link.c
index 97bccd1aab..8c0c383b93 100644
--- a/cesar/cp2/conn/src/link.c
+++ b/cesar/cp/conn/src/link.c
@@ -8,22 +8,22 @@
/**
* \file link.c
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
#include "lib/blk.h"
#include "lib/slab.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
#include <stdio.h>
diff --git a/cesar/cp2/conn/test/Makefile b/cesar/cp/conn/test/Makefile
index 5404fc213f..f155086095 100644
--- a/cesar/cp2/conn/test/Makefile
+++ b/cesar/cp/conn/test/Makefile
@@ -1,14 +1,14 @@
BASE = ../../..
ECOS=y
-INCLUDES = cp2/conn/test/overide/
+INCLUDES = cp/conn/test/overide/
TARGET_PROGRAMS = conn_test conn_mgr_test
conn_test_SOURCES = conn_test.c msg_stub.c pwl_stub.c fsm_stub.c
-conn_test_MODULES = lib cp2/conn cp2/sta/mgr cl cp2/cco/bw mac/common
+conn_test_MODULES = lib cp/conn cp/sta/mgr cl cp/cco/bw mac/common
conn_mgr_test_SOURCES = conn_mgr_test.c msg_stub.c pwl_stub.c fsm_stub.c
-conn_mgr_test_MODULES = lib cp2/conn cp2/sta/mgr cl cp2/cco/bw mac/common
+conn_mgr_test_MODULES = lib cp/conn cp/sta/mgr cl cp/cco/bw mac/common
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/conn/test/ecos.ecc.sh b/cesar/cp/conn/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/conn/test/ecos.ecc.sh
+++ b/cesar/cp/conn/test/ecos.ecc.sh
diff --git a/cesar/cp2/conn/test/overide/cp_fsm_defs.h b/cesar/cp/conn/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/conn/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/conn/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/conn/test/src/conn_mgr_test.c b/cesar/cp/conn/test/src/conn_mgr_test.c
index 41abd06685..6cf0c28929 100644
--- a/cesar/cp2/conn/test/src/conn_mgr_test.c
+++ b/cesar/cp/conn/test/src/conn_mgr_test.c
@@ -11,15 +11,15 @@
*
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/mme.h"
-
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/mme.h"
+
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
#include "lib/test.h"
diff --git a/cesar/cp2/conn/test/src/conn_test.c b/cesar/cp/conn/test/src/conn_test.c
index 6bc6ea2e3e..6faefc2cfc 100644
--- a/cesar/cp2/conn/test/src/conn_test.c
+++ b/cesar/cp/conn/test/src/conn_test.c
@@ -8,21 +8,21 @@
/**
* \file bw.c
* \brief bandwidth manager module
- * \ingroup cp2_cco_bw
+ * \ingroup cp_cco_bw
*
* Control the schedule of the becon period
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/conn/link.h"
-#include "cp2/conn/inc/link.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/inc/conn.h"
-#include "cp2/conn/conn_mgr.h"
+#include "cp/conn/link.h"
+#include "cp/conn/inc/link.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn.h"
+#include "cp/conn/conn_mgr.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/pwl/pwl.h"
#include "mac/common/timings.h"
#include "lib/blk.h"
diff --git a/cesar/cp/conn/test/src/fsm_stub.c b/cesar/cp/conn/test/src/fsm_stub.c
new file mode 100644
index 0000000000..849f375270
--- /dev/null
+++ b/cesar/cp/conn/test/src/fsm_stub.c
@@ -0,0 +1,29 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file src/fsm_stub.c
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+#include "common/std.h"
+#include "cp/fsm/fsm.h"
+
+static cp_fsm_event_t fsm_event;
+
+cp_fsm_event_t *
+cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
+{
+ return &fsm_event;
+}
+
+void
+cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
+{
+}
diff --git a/cesar/cp2/conn/test/src/msg_stub.c b/cesar/cp/conn/test/src/msg_stub.c
index 3f2a92e4d7..2c27653864 100644
--- a/cesar/cp2/conn/test/src/msg_stub.c
+++ b/cesar/cp/conn/test/src/msg_stub.c
@@ -8,17 +8,17 @@
/**
* \file link.c
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/conn/conn_mgr.h"
-#include "cp2/conn/conn.h"
-#include "cp2/conn/link.h"
-#include "cp2/mme.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/conn/conn_mgr.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/link.h"
+#include "cp/mme.h"
/*************************/
/*** CONN NEW ***/
/*************************/
diff --git a/cesar/cp2/conn/test/src/pwl_stub.c b/cesar/cp/conn/test/src/pwl_stub.c
index eec62e6dca..968fd802b1 100644
--- a/cesar/cp2/conn/test/src/pwl_stub.c
+++ b/cesar/cp/conn/test/src/pwl_stub.c
@@ -8,7 +8,7 @@
/**
* \file link.c
* \brief link management
- * \ingroup cp2/conn
+ * \ingroup cp/conn
*
* « long description »
*/
@@ -16,9 +16,9 @@
#include "mac/common/timings.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/pwl/pwl.h"
/**
* Initialise the pwl module.
diff --git a/cesar/cp2/cp.h b/cesar/cp/cp.h
index 78300a1c3f..ecf5de8e6c 100644
--- a/cesar/cp2/cp.h
+++ b/cesar/cp/cp.h
@@ -1,5 +1,5 @@
-#ifndef cp2_cp_h
-#define cp2_cp_h
+#ifndef cp_cp_h
+#define cp_cp_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/cp.h
+ * \file cp/cp.h
* \brief Control plane public API's.
- * \ingroup cp2
+ * \ingroup cp
*
*/
-#include "cp2/types.h"
+#include "cp/types.h"
#include "mac/common/config.h"
#include "interface/forward.h"
diff --git a/cesar/cp2/defs.h b/cesar/cp/defs.h
index cbfe359eb1..b3ca202bf7 100644
--- a/cesar/cp2/defs.h
+++ b/cesar/cp/defs.h
@@ -1,5 +1,5 @@
-#ifndef cp2_defs_h
-#define cp2_defs_h
+#ifndef cp_defs_h
+#define cp_defs_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/defs.h
+ * \file cp/defs.h
* \brief Definition for the Control Plane.
- * \ingroup cp2
+ * \ingroup cp
*/
#define CP_BENTRY_COUNTDOWN_DEFAULT 5
@@ -90,4 +90,4 @@
/** minimal size of a CSMA allocation */
#define CP_CCO_BW_MIN_CSMA_ALLOC_ATU 5
-#endif /* cp2_defs_h */
+#endif /* cp_defs_h */
diff --git a/cesar/cp2/doc/Makefile b/cesar/cp/doc/Makefile
index d2f0e2946c..d2f0e2946c 100644
--- a/cesar/cp2/doc/Makefile
+++ b/cesar/cp/doc/Makefile
diff --git a/cesar/cp2/doc/archi.txt b/cesar/cp/doc/archi.txt
index 7c57298294..7c57298294 100644
--- a/cesar/cp2/doc/archi.txt
+++ b/cesar/cp/doc/archi.txt
diff --git a/cesar/cp2/doc/cp.xmi b/cesar/cp/doc/cp.xmi
index e347901734..e347901734 100644
--- a/cesar/cp2/doc/cp.xmi
+++ b/cesar/cp/doc/cp.xmi
diff --git a/cesar/cp2/doc/cp_archi.odt b/cesar/cp/doc/cp_archi.odt
index 2914314cea..2914314cea 100644
--- a/cesar/cp2/doc/cp_archi.odt
+++ b/cesar/cp/doc/cp_archi.odt
Binary files differ
diff --git a/cesar/cp2/doc/mme_rx_handle.svg b/cesar/cp/doc/mme_rx_handle.svg
index 67819a47a0..6e09f15537 100644
--- a/cesar/cp2/doc/mme_rx_handle.svg
+++ b/cesar/cp/doc/mme_rx_handle.svg
@@ -14,7 +14,7 @@
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44.1"
- sodipodi:docbase="/home/schodet/work/cesar3/cp2/doc"
+ sodipodi:docbase="/home/schodet/work/cesar3/cp/doc"
sodipodi:docname="mme_rx_handle.svg">
<defs
id="defs4">
diff --git a/cesar/cp2/doc/overview.svg b/cesar/cp/doc/overview.svg
index 5d06c5456f..782b7d77ed 100644
--- a/cesar/cp2/doc/overview.svg
+++ b/cesar/cp/doc/overview.svg
@@ -14,7 +14,7 @@
sodipodi:version="0.32"
inkscape:version="0.44.1"
version="1.0"
- sodipodi:docbase="/home/schodet/work/cesar3/cp2/doc"
+ sodipodi:docbase="/home/schodet/work/cesar3/cp/doc"
sodipodi:docname="overview.svg">
<defs
id="defs2764">
diff --git a/cesar/cp2/fsm/Module b/cesar/cp/fsm/Module
index 1c218458a8..7fb9413c88 100644
--- a/cesar/cp2/fsm/Module
+++ b/cesar/cp/fsm/Module
@@ -4,9 +4,9 @@ cp_fsm_defs_h = $(OBJ_DIR)/inc/cp_fsm_defs.h
cp_fsm_tables_h = $(OBJ_DIR)/inc/cp_fsm_tables.h
CLEAN_FILES += $(cp_fsm_defs_h) $(cp_fsm_tables_h)
-$(call src2obj,cp2/fsm/src/tables.c,host): $(cp_fsm_tables_h)
-$(call src2obj,cp2/fsm/src/tables.c,target): $(cp_fsm_tables_h)
-$(BASE)/cp2/fsm/fsm.h: $(cp_fsm_defs_h)
+$(call src2obj,cp/fsm/src/tables.c,host): $(cp_fsm_tables_h)
+$(call src2obj,cp/fsm/src/tables.c,target): $(cp_fsm_tables_h)
+$(BASE)/cp/fsm/fsm.h: $(cp_fsm_defs_h)
vpath %.fsm $(BASE)
vpath %.conf $(BASE)
@@ -14,7 +14,7 @@ vpath %_defs.h $(BASE)
vpath %_tables.h $(BASE)
cp_fsm_deps = $(call src2src,cp.fsm cp.conf template_defs.h \
- template_tables.h,cp2/fsm/src/fsm)
+ template_tables.h,cp/fsm/src/fsm)
dfagen = $(TOOLS_DIR)/dfagen/dfagen.py
diff --git a/cesar/cp2/fsm/forward.h b/cesar/cp/fsm/forward.h
index 79f52ff813..b4ed654122 100644
--- a/cesar/cp2/fsm/forward.h
+++ b/cesar/cp/fsm/forward.h
@@ -1,5 +1,5 @@
-#ifndef cp2_fsm_forward_h
-#define cp2_fsm_forward_h
+#ifndef cp_fsm_forward_h
+#define cp_fsm_forward_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/fsm/forward.h
+ * \file cp/fsm/forward.h
* \brief Control plane FSM forward declarations.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
/* Forward declaration. */
typedef struct cp_fsm_event_t cp_fsm_event_t;
-#endif /* cp2_fsm_forward_h */
+#endif /* cp_fsm_forward_h */
diff --git a/cesar/cp2/fsm/fsm.h b/cesar/cp/fsm/fsm.h
index d29a6287d3..ffb92cad63 100644
--- a/cesar/cp2/fsm/fsm.h
+++ b/cesar/cp/fsm/fsm.h
@@ -1,5 +1,5 @@
-#ifndef cp2_fsm_fsm_h
-#define cp2_fsm_fsm_h
+#ifndef cp_fsm_fsm_h
+#define cp_fsm_fsm_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,11 +8,11 @@
*
* }}} */
/**
- * \file cp2/fsm/fsm.h
+ * \file cp/fsm/fsm.h
* \brief Control plane finite state machine.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
-#include "cp2/cp.h"
+#include "cp/cp.h"
#include "forward.h"
#include "inc/events.h"
@@ -75,4 +75,4 @@ cp_fsm_branch_ (cp_t *ctx, cp_fsm_branch_t branch);
END_DECLS
-#endif /* cp2_fsm_fsm_h */
+#endif /* cp_fsm_fsm_h */
diff --git a/cesar/cp2/fsm/inc/context.h b/cesar/cp/fsm/inc/context.h
index 073b95a27d..eb44884039 100644
--- a/cesar/cp2/fsm/inc/context.h
+++ b/cesar/cp/fsm/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef cp2_fsm_inc_context_h
-#define cp2_fsm_inc_context_h
+#ifndef cp_fsm_inc_context_h
+#define cp_fsm_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/fsm/inc/context.h
+ * \file cp/fsm/inc/context.h
* \brief FSM private context.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
#include "lib/slab.h"
@@ -40,4 +40,4 @@ struct cp_fsm_t
};
typedef struct cp_fsm_t cp_fsm_t;
-#endif /* cp2_fsm_inc_context_h */
+#endif /* cp_fsm_inc_context_h */
diff --git a/cesar/cp2/fsm/inc/events.h b/cesar/cp/fsm/inc/events.h
index a78276c830..776638ea82 100644
--- a/cesar/cp2/fsm/inc/events.h
+++ b/cesar/cp/fsm/inc/events.h
@@ -1,5 +1,5 @@
-#ifndef cp2_fsm_inc_events_h
-#define cp2_fsm_inc_events_h
+#ifndef cp_fsm_inc_events_h
+#define cp_fsm_inc_events_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,13 +8,13 @@
*
* }}} */
/**
- * \file cp2/fsm/inc/events.h
+ * \file cp/fsm/inc/events.h
* \brief FSM events.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
-#include "cp2/mme.h"
-#include "cp2/beacon/beacon_desc.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/mme.h"
+#include "cp/beacon/beacon_desc.h"
+#include "cp/sta/mgr/net.h"
/* This is a auto-generated file, check your Makefile if it is not found. */
#include "cp_fsm_defs.h"
@@ -38,7 +38,7 @@ struct cp_fsm_event_t
/** Handle transition callback. */
cp_fsm_event_handler_t handler;
};
-/* Forward declaration in cp2/fsm/forward.h. */
+/* Forward declaration in cp/fsm/forward.h. */
BEGIN_DECLS
@@ -96,4 +96,4 @@ cp_fsm_event_init (cp_t *ctx);
END_DECLS
-#endif /* cp2_fsm_inc_events_h */
+#endif /* cp_fsm_inc_events_h */
diff --git a/cesar/cp2/fsm/inc/tables.h b/cesar/cp/fsm/inc/tables.h
index eea3cdfa60..ef0a19fc83 100644
--- a/cesar/cp2/fsm/inc/tables.h
+++ b/cesar/cp/fsm/inc/tables.h
@@ -1,5 +1,5 @@
-#ifndef cp2_fsm_inc_tables_h
-#define cp2_fsm_inc_tables_h
+#ifndef cp_fsm_inc_tables_h
+#define cp_fsm_inc_tables_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/fsm/inc/tables.h
+ * \file cp/fsm/inc/tables.h
* \brief FSM tables declaration.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
/** Control Plane FSM transition table. */
@@ -33,4 +33,4 @@ cp_fsm_leave_table[CP_FSM_STATE_NB];
extern const cp_fsm_state_t
cp_fsm_initials_table[CP_FSM_INITIAL_NB];
-#endif /* cp2_fsm_inc_tables_h */
+#endif /* cp_fsm_inc_tables_h */
diff --git a/cesar/cp2/fsm/src/events.c b/cesar/cp/fsm/src/events.c
index 6be3afdad3..ec58eced61 100644
--- a/cesar/cp2/fsm/src/events.c
+++ b/cesar/cp/fsm/src/events.c
@@ -6,13 +6,13 @@
*
* }}} */
/**
- * \file cp2/fsm/src/events.c
+ * \file cp/fsm/src/events.c
* \brief FSM events.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
#include "common/std.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include "fsm.h"
#include "inc/tables.h"
diff --git a/cesar/cp2/fsm/src/fsm.c b/cesar/cp/fsm/src/fsm.c
index 4c673e2bf4..c05243f3c6 100644
--- a/cesar/cp2/fsm/src/fsm.c
+++ b/cesar/cp/fsm/src/fsm.c
@@ -6,13 +6,13 @@
*
* }}} */
/**
- * \file cp2/fsm/src/fsm.c
+ * \file cp/fsm/src/fsm.c
* \brief FSM engine.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
#include "common/std.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include "fsm.h"
#include "inc/tables.h"
diff --git a/cesar/cp2/fsm/src/fsm/cp.conf b/cesar/cp/fsm/src/fsm/cp.conf
index 2c50e8d998..2c50e8d998 100644
--- a/cesar/cp2/fsm/src/fsm/cp.conf
+++ b/cesar/cp/fsm/src/fsm/cp.conf
diff --git a/cesar/cp2/fsm/src/fsm/cp.fsm b/cesar/cp/fsm/src/fsm/cp.fsm
index 9dcdd0ca47..9dcdd0ca47 100644
--- a/cesar/cp2/fsm/src/fsm/cp.fsm
+++ b/cesar/cp/fsm/src/fsm/cp.fsm
diff --git a/cesar/cp2/fsm/src/fsm/template_defs.h b/cesar/cp/fsm/src/fsm/template_defs.h
index d61762c492..d61762c492 100644
--- a/cesar/cp2/fsm/src/fsm/template_defs.h
+++ b/cesar/cp/fsm/src/fsm/template_defs.h
diff --git a/cesar/cp2/fsm/src/fsm/template_tables.h b/cesar/cp/fsm/src/fsm/template_tables.h
index c6fbefb1ac..c6fbefb1ac 100644
--- a/cesar/cp2/fsm/src/fsm/template_tables.h
+++ b/cesar/cp/fsm/src/fsm/template_tables.h
diff --git a/cesar/cp2/fsm/src/tables.c b/cesar/cp/fsm/src/tables.c
index 9d71e31e96..8ed8677720 100644
--- a/cesar/cp2/fsm/src/tables.c
+++ b/cesar/cp/fsm/src/tables.c
@@ -6,16 +6,16 @@
*
* }}} */
/**
- * \file cp2/fsm/src/tables.c
+ * \file cp/fsm/src/tables.c
* \brief FSM tables.
- * \ingroup cp2_fsm
+ * \ingroup cp_fsm
*/
#include "common/std.h"
#include "fsm.h"
#include "inc/tables.h"
-#include "cp2/sta/action/action.h"
+#include "cp/sta/action/action.h"
/* Include generated tables. */
#include "cp_fsm_tables.h"
diff --git a/cesar/cp2/fsm/test/utest/Config b/cesar/cp/fsm/test/utest/Config
index 1221024089..1221024089 100644
--- a/cesar/cp2/fsm/test/utest/Config
+++ b/cesar/cp/fsm/test/utest/Config
diff --git a/cesar/cp/fsm/test/utest/Makefile b/cesar/cp/fsm/test/utest/Makefile
new file mode 100644
index 0000000000..62d24791bf
--- /dev/null
+++ b/cesar/cp/fsm/test/utest/Makefile
@@ -0,0 +1,17 @@
+BASE = ../../../..
+
+INCLUDES = cp/fsm/test/utest cp/fsm/test/utest/override
+
+HOST_PROGRAMS = test_fsm
+test_fsm_SOURCES = test_fsm.c fsm_stub.c actions.c
+test_fsm_MODULES = lib lib/scenario cp/fsm
+cp_fsm_MODULE_SOURCES = fsm.c events.c
+
+include $(BASE)/common/make/top.mk
+
+$(call src2obj,src/test_fsm.c,host): $(BASE)/cp/fsm/fsm.h
+$(call src2obj,src/test_fsm.c,target): $(BASE)/cp/fsm/fsm.h
+
+# Override fsm.
+vpath %.fsm
+vpath %.fsm override
diff --git a/cesar/cp2/fsm/test/utest/inc/scenario_defs.h b/cesar/cp/fsm/test/utest/inc/scenario_defs.h
index e68661bb37..0638902f6d 100644
--- a/cesar/cp2/fsm/test/utest/inc/scenario_defs.h
+++ b/cesar/cp/fsm/test/utest/inc/scenario_defs.h
@@ -13,9 +13,9 @@
* \ingroup test
*/
-#include "cp2/types.h"
-#include "cp2/mme.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/types.h"
+#include "cp/mme.h"
+#include "cp/fsm/fsm.h"
/* Scenario globals. */
#define SCENARIO_DEFS_GLOBALS \
diff --git a/cesar/cp2/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm b/cesar/cp/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm
index a2da64a5a5..a2da64a5a5 100644
--- a/cesar/cp2/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm
+++ b/cesar/cp/fsm/test/utest/override/cp2/fsm/src/fsm/cp.fsm
diff --git a/cesar/cp2/fsm/test/utest/override/cp2/inc/context.h b/cesar/cp/fsm/test/utest/override/cp2/inc/context.h
index bdc48598dd..8eacbcbaa1 100644
--- a/cesar/cp2/fsm/test/utest/override/cp2/inc/context.h
+++ b/cesar/cp/fsm/test/utest/override/cp2/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef override_cp2_inc_context_h
-#define override_cp2_inc_context_h
+#ifndef override_cp_inc_context_h
+#define override_cp_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,13 +8,13 @@
*
* }}} */
/**
- * \file override/cp2/inc/context.h
+ * \file override/cp/inc/context.h
* \brief Control plane context override.
* \ingroup test
*/
-#include "cp2/fsm/fsm.h"
-#include "cp2/fsm/inc/context.h"
+#include "cp/fsm/fsm.h"
+#include "cp/fsm/inc/context.h"
struct cp_t
{
@@ -22,4 +22,4 @@ struct cp_t
cp_fsm_t fsm;
};
-#endif /* override_cp2_inc_context_h */
+#endif /* override_cp_inc_context_h */
diff --git a/cesar/cp2/fsm/test/utest/src/actions.c b/cesar/cp/fsm/test/utest/src/actions.c
index 3c74de91a1..3c74de91a1 100644
--- a/cesar/cp2/fsm/test/utest/src/actions.c
+++ b/cesar/cp/fsm/test/utest/src/actions.c
diff --git a/cesar/cp2/fsm/test/utest/src/fsm_stub.c b/cesar/cp/fsm/test/utest/src/fsm_stub.c
index 212e914e6f..07c5581ec5 100644
--- a/cesar/cp2/fsm/test/utest/src/fsm_stub.c
+++ b/cesar/cp/fsm/test/utest/src/fsm_stub.c
@@ -14,8 +14,8 @@
#include "lib/scenario/scenario.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/fsm/inc/tables.h"
+#include "cp/fsm/fsm.h"
+#include "cp/fsm/inc/tables.h"
void
cp_fsm__STATE1__event1 (cp_t *ctx);
diff --git a/cesar/cp2/fsm/test/utest/src/test_fsm.c b/cesar/cp/fsm/test/utest/src/test_fsm.c
index 92c2e8e94c..23bcbed791 100644
--- a/cesar/cp2/fsm/test/utest/src/test_fsm.c
+++ b/cesar/cp/fsm/test/utest/src/test_fsm.c
@@ -16,9 +16,9 @@
#include "lib/test.h"
#include "lib/scenario/scenario.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
void
test_fsm_basic_test_case (test_t t)
diff --git a/cesar/cp2/inc/context.h b/cesar/cp/inc/context.h
index dc95e2babb..110b63b677 100644
--- a/cesar/cp2/inc/context.h
+++ b/cesar/cp/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef cp2_inc_cp_h
-#define cp2_inc_cp_h
+#ifndef cp_inc_cp_h
+#define cp_inc_cp_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/inc/cp_private.h
+ * \file cp/inc/cp_private.h
* \brief Control plane context.
- * \ingroup cp2
+ * \ingroup cp
*
*/
#include "lib/rnd.h"
@@ -23,29 +23,29 @@
#include "hal/timer/timer.h"
/* Public interfaces. */
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/action/action.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/pwl/pwl.h"
-#include "cp2/beacon/beacon.h"
-#include "cp2/cco/bw/bw.h"
-#include "cp2/cco/region/region.h"
-#include "cp2/conn/conn_mgr.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/fsm/forward.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/action/action.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/pwl/pwl.h"
+#include "cp/beacon/beacon.h"
+#include "cp/cco/bw/bw.h"
+#include "cp/cco/region/region.h"
+#include "cp/conn/conn_mgr.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/fsm/forward.h"
+#include "cp/fsm/fsm.h"
/* Private interfaces. */
-#include "cp2/sta/mgr/inc/sta_mgr.h"
-#include "cp2/sta/core/inc/core.h"
-#include "cp2/sta/action/inc/context.h"
-#include "cp2/cco/action/inc/cco_action.h"
-#include "cp2/beacon/inc/beacon.h"
-#include "cp2/cco/region/inc/region.h"
-#include "cp2/cl_interf/inc/context.h"
-#include "cp2/msg/inc/context.h"
-#include "cp2/fsm/inc/context.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
+#include "cp/sta/core/inc/core.h"
+#include "cp/sta/action/inc/context.h"
+#include "cp/cco/action/inc/cco_action.h"
+#include "cp/beacon/inc/beacon.h"
+#include "cp/cco/region/inc/region.h"
+#include "cp/cl_interf/inc/context.h"
+#include "cp/msg/inc/context.h"
+#include "cp/fsm/inc/context.h"
struct cp_t
@@ -114,4 +114,4 @@ struct cp_t
lib_rnd_t rnd;
};
-#endif /* cp2_inc_cp_h */
+#endif /* cp_inc_cp_h */
diff --git a/cesar/cp2/mme.h b/cesar/cp/mme.h
index 0c23a5fc78..8a1fa9ef9e 100644
--- a/cesar/cp2/mme.h
+++ b/cesar/cp/mme.h
@@ -1,5 +1,5 @@
-#ifndef cp2_mme_h
-#define cp2_mme_h
+#ifndef cp_mme_h
+#define cp_mme_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,15 +8,15 @@
*
* }}} */
/**
- * \file cp2/mme.h
+ * \file cp/mme.h
* \brief Definition of the MME types.
- * \ingroup cp2
+ * \ingroup cp
*/
#include "lib/bitstream.h"
#include "lib/blk.h"
-#include "cp2/types.h"
-#include "cp2/secu/secu.h"
+#include "cp/types.h"
+#include "cp/secu/secu.h"
/* MMTYPE base values for DRV MME messages. */
#define DRV_STA_SET_MAC_ADDR 0xA000
@@ -323,4 +323,4 @@ cp_mme_peer_cmp (cp_mme_peer_t *p1, cp_mme_peer_t *p2)
return p1->mac == p2->mac && p1->tei == p2->tei;
}
-#endif /* cp2_mme_h */
+#endif /* cp_mme_h */
diff --git a/cesar/cp2/msg/Module b/cesar/cp/msg/Module
index ea8a9bae40..ea8a9bae40 100644
--- a/cesar/cp2/msg/Module
+++ b/cesar/cp/msg/Module
diff --git a/cesar/cp2/msg/inc/cc_assoc.h b/cesar/cp/msg/inc/cc_assoc.h
index d28d5ee614..f1f3708378 100644
--- a/cesar/cp2/msg/inc/cc_assoc.h
+++ b/cesar/cp/msg/inc/cc_assoc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cc_assoc_h
-#define cp2_msg_inc_cc_assoc_h
+#ifndef cp_msg_inc_cc_assoc_h
+#define cp_msg_inc_cc_assoc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cc_assoc.h
+ * \file cp/msg/inc/cc_assoc.h
* \brief CC_ASSOC messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CC_ASSOC.REQ request type. */
@@ -61,4 +61,4 @@ struct cp_msg_cc_assoc_cnf_t
};
typedef struct cp_msg_cc_assoc_cnf_t cp_msg_cc_assoc_cnf_t;
-#endif /* cp2_msg_inc_cc_assoc_h */
+#endif /* cp_msg_inc_cc_assoc_h */
diff --git a/cesar/cp2/msg/inc/cc_leave.h b/cesar/cp/msg/inc/cc_leave.h
index 004e32dd6b..3250f4b305 100644
--- a/cesar/cp2/msg/inc/cc_leave.h
+++ b/cesar/cp/msg/inc/cc_leave.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cc_leave_h
-#define cp2_msg_inc_cc_leave_h
+#ifndef cp_msg_inc_cc_leave_h
+#define cp_msg_inc_cc_leave_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cc_leave.h
+ * \file cp/msg/inc/cc_leave.h
* \brief CC_LEAVE messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CC_LEAVE.REQ reason for the disassociation. */
@@ -30,4 +30,4 @@ enum cp_msg_cc_leave_ind_reason_t
CP_MSG_CC_LEAVE_IND_REASON_NB
};
-#endif /* cp2_msg_inc_cc_leave_h */
+#endif /* cp_msg_inc_cc_leave_h */
diff --git a/cesar/cp2/msg/inc/cc_set_tei_map.h b/cesar/cp/msg/inc/cc_set_tei_map.h
index f1885c2343..44ed35e716 100644
--- a/cesar/cp2/msg/inc/cc_set_tei_map.h
+++ b/cesar/cp/msg/inc/cc_set_tei_map.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cc_set_tei_map_h
-#define cp2_msg_inc_cc_set_tei_map_h
+#ifndef cp_msg_inc_cc_set_tei_map_h
+#define cp_msg_inc_cc_set_tei_map_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cc_set_tei_map.h
+ * \file cp/msg/inc/cc_set_tei_map.h
* \brief CC_SET_TEI_MAP messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CC_SET_TEI_MAP.IND mode. */
@@ -48,4 +48,4 @@ struct cp_msg_cc_set_tei_map_change_buffer_t
typedef struct cp_msg_cc_set_tei_map_change_buffer_t
cp_msg_cc_set_tei_map_change_buffer_t;
-#endif /* cp2_msg_inc_cc_set_tei_map_h */
+#endif /* cp_msg_inc_cc_set_tei_map_h */
diff --git a/cesar/cp2/msg/inc/cc_who_ru.h b/cesar/cp/msg/inc/cc_who_ru.h
index 8cf13baf81..14fd168620 100644
--- a/cesar/cp2/msg/inc/cc_who_ru.h
+++ b/cesar/cp/msg/inc/cc_who_ru.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cc_who_ru_h
-#define cp2_msg_inc_cc_who_ru_h
+#ifndef cp_msg_inc_cc_who_ru_h
+#define cp_msg_inc_cc_who_ru_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cc_who_ru.h
+ * \file cp/msg/inc/cc_who_ru.h
* \brief CC_WHO_RU messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** Data associated with a CC_WHO_RU.CNF message. */
@@ -25,4 +25,4 @@ struct cp_msg_cc_who_ru_cnf_t
};
typedef struct cp_msg_cc_who_ru_cnf_t cp_msg_cc_who_ru_cnf_t;
-#endif /* cp2_msg_inc_cc_who_ru_h */
+#endif /* cp_msg_inc_cc_who_ru_h */
diff --git a/cesar/cp2/msg/inc/cm_get_key.h b/cesar/cp/msg/inc/cm_get_key.h
index a1f74adbcc..ae5fe29152 100644
--- a/cesar/cp2/msg/inc/cm_get_key.h
+++ b/cesar/cp/msg/inc/cm_get_key.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cm_get_key_h
-#define cp2_msg_inc_cm_get_key_h
+#ifndef cp_msg_inc_cm_get_key_h
+#define cp_msg_inc_cm_get_key_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cm_get_key.h
+ * \file cp/msg/inc/cm_get_key.h
* \brief CM_GET_KEY messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CM_GET_KEY.CNF result. */
@@ -56,4 +56,4 @@ struct cp_msg_cm_get_key_cnf_t
};
typedef struct cp_msg_cm_get_key_cnf_t cp_msg_cm_get_key_cnf_t;
-#endif /* cp2_msg_inc_cm_get_key_h */
+#endif /* cp_msg_inc_cm_get_key_h */
diff --git a/cesar/cp2/msg/inc/cm_key.h b/cesar/cp/msg/inc/cm_key.h
index d11e13e167..dcc25f6b45 100644
--- a/cesar/cp2/msg/inc/cm_key.h
+++ b/cesar/cp/msg/inc/cm_key.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cm_key_h
-#define cp2_msg_inc_cm_key_h
+#ifndef cp_msg_inc_cm_key_h
+#define cp_msg_inc_cm_key_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cm_key.h
+ * \file cp/msg/inc/cm_key.h
* \brief CM_SET_KEY and CM_GET_KEY messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** Key type, used in CM_SET_KEY and CM_GET_KEY. */
@@ -25,4 +25,4 @@ enum cp_msg_key_type_t
CP_MSG_KEY_NB
};
-#endif /* cp2_msg_inc_cm_key_h */
+#endif /* cp_msg_inc_cm_key_h */
diff --git a/cesar/cp2/msg/inc/cm_mme_error.h b/cesar/cp/msg/inc/cm_mme_error.h
index cae087fafc..61e2b5b8b3 100644
--- a/cesar/cp2/msg/inc/cm_mme_error.h
+++ b/cesar/cp/msg/inc/cm_mme_error.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cm_mme_error_h
-#define cp2_msg_inc_cm_mme_error_h
+#ifndef cp_msg_inc_cm_mme_error_h
+#define cp_msg_inc_cm_mme_error_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cm_mme_error.h
+ * \file cp/msg/inc/cm_mme_error.h
* \brief CM_MME_ERROR messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CM_MME_ERROR.IND reason. */
@@ -36,4 +36,4 @@ struct cp_msg_cm_mme_error_ind_t
};
typedef struct cp_msg_cm_mme_error_ind_t cp_msg_cm_mme_error_ind_t;
-#endif /* cp2_msg_inc_cm_mme_error_h */
+#endif /* cp_msg_inc_cm_mme_error_h */
diff --git a/cesar/cp2/msg/inc/cm_set_key.h b/cesar/cp/msg/inc/cm_set_key.h
index 60ce168c75..3d4ebc1b22 100644
--- a/cesar/cp2/msg/inc/cm_set_key.h
+++ b/cesar/cp/msg/inc/cm_set_key.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_cm_set_key_h
-#define cp2_msg_inc_cm_set_key_h
+#ifndef cp_msg_inc_cm_set_key_h
+#define cp_msg_inc_cm_set_key_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/cm_set_key.h
+ * \file cp/msg/inc/cm_set_key.h
* \brief CM_SET_KEY messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** CM_SET_KEY.CNF result. */
@@ -47,4 +47,4 @@ struct cp_msg_cm_set_key_cnf_t
};
typedef struct cp_msg_cm_set_key_cnf_t cp_msg_cm_set_key_cnf_t;
-#endif /* cp2_msg_inc_cm_set_key_h */
+#endif /* cp_msg_inc_cm_set_key_h */
diff --git a/cesar/cp2/msg/inc/context.h b/cesar/cp/msg/inc/context.h
index 2e77e61552..d69afb1e5f 100644
--- a/cesar/cp2/msg/inc/context.h
+++ b/cesar/cp/msg/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_context_h
-#define cp2_msg_inc_context_h
+#ifndef cp_msg_inc_context_h
+#define cp_msg_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/msg.h
+ * \file cp/msg/inc/msg.h
* \brief MSG context.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
*/
#include "lib/slab.h"
@@ -25,4 +25,4 @@ struct cp_msg_t
};
typedef struct cp_msg_t cp_msg_t;
-#endif /* cp2_msg_inc_context_h */
+#endif /* cp_msg_inc_context_h */
diff --git a/cesar/cp2/msg/inc/msg.h b/cesar/cp/msg/inc/msg.h
index d2a7877d8a..766e2244f8 100644
--- a/cesar/cp2/msg/inc/msg.h
+++ b/cesar/cp/msg/inc/msg.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_msg_h
-#define cp2_msg_inc_msg_h
+#ifndef cp_msg_inc_msg_h
+#define cp_msg_inc_msg_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,11 +8,11 @@
*
* }}} */
/**
- * \file cp2/msg/inc/msg.h
+ * \file cp/msg/inc/msg.h
* \brief Private function headers.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
-#include "cp2/mme.h"
+#include "cp/mme.h"
#define CP_MSG_ENCRYPTED_DATA_HEADER_SIZE 24
#define CP_MSG_ENCRYPTED_DATA_FOOTER_SIZE 9
@@ -52,4 +52,4 @@ cp_msg_mme_rx_destructor (cp_mme_rx_t *mme);
void
cp_msg_mme_tx_destructor (cp_mme_tx_t *mme);
-#endif /* cp2_msg_inc_msg_h */
+#endif /* cp_msg_inc_msg_h */
diff --git a/cesar/cp2/msg/inc/msg_cc.h b/cesar/cp/msg/inc/msg_cc.h
index a367c8095d..44a72ca197 100644
--- a/cesar/cp2/msg/inc/msg_cc.h
+++ b/cesar/cp/msg/inc/msg_cc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_msg_cc_h
-#define cp2_msg_inc_msg_cc_h
+#ifndef cp_msg_inc_msg_cc_h
+#define cp_msg_inc_msg_cc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,16 +8,16 @@
*
* }}} */
/**
- * \file cp2/msg/inc/msg_cc.h
+ * \file cp/msg/inc/msg_cc.h
* \brief CC family MME.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
#include "cc_who_ru.h"
#include "cc_assoc.h"
#include "cc_leave.h"
#include "cc_set_tei_map.h"
-#include "cp2/mme.h"
+#include "cp/mme.h"
BEGIN_DECLS
@@ -361,4 +361,4 @@ cp_msg_cc_relay_receive (cp_t *ctx, cp_mme_rx_t *msg, uint *length);
END_DECLS
-#endif /* cp2_msg_inc_msg_cc_h */
+#endif /* cp_msg_inc_msg_cc_h */
diff --git a/cesar/cp2/msg/inc/msg_cm.h b/cesar/cp/msg/inc/msg_cm.h
index 7e76eac688..052521a814 100644
--- a/cesar/cp2/msg/inc/msg_cm.h
+++ b/cesar/cp/msg/inc/msg_cm.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_msg_cm_h
-#define cp2_msg_inc_msg_cm_h
+#ifndef cp_msg_inc_msg_cm_h
+#define cp_msg_inc_msg_cm_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/msg_cm.h
+ * \file cp/msg/inc/msg_cm.h
* \brief CM family MME.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
#include "cm_key.h"
#include "cm_set_key.h"
@@ -200,4 +200,4 @@ cp_msg_cm_mme_error_ind_receive (cp_t *ctx, cp_mme_rx_t *mme,
END_DECLS
-#endif /* cp2_msg_inc_msg_cm_h */
+#endif /* cp_msg_inc_msg_cm_h */
diff --git a/cesar/cp2/msg/inc/msg_drv.h b/cesar/cp/msg/inc/msg_drv.h
index 228d77d0ef..470ad59df3 100644
--- a/cesar/cp2/msg/inc/msg_drv.h
+++ b/cesar/cp/msg/inc/msg_drv.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_inc_msg_drv_h
-#define cp2_msg_inc_msg_drv_h
+#ifndef cp_msg_inc_msg_drv_h
+#define cp_msg_inc_msg_drv_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/inc/msg_drv.h
+ * \file cp/msg/inc/msg_drv.h
* \brief DRV family MME.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
/** Result of a DRV family request. */
@@ -174,4 +174,4 @@ cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
END_DECLS
-#endif /* cp2_msg_inc_msg_drv_h */
+#endif /* cp_msg_inc_msg_drv_h */
diff --git a/cesar/cp2/msg/msg.h b/cesar/cp/msg/msg.h
index 4331a0e399..712117c753 100644
--- a/cesar/cp2/msg/msg.h
+++ b/cesar/cp/msg/msg.h
@@ -1,5 +1,5 @@
-#ifndef cp2_msg_msg_h
-#define cp2_msg_msg_h
+#ifndef cp_msg_msg_h
+#define cp_msg_msg_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/msg/msg.h
+ * \file cp/msg/msg.h
* \brief MME creation and decoding.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
* The msg module handles:
*
@@ -20,9 +20,9 @@
* - encrypted payload encapsulation,
* - relaying encapsulation.
*/
-#include "cp2/cp.h"
-#include "cp2/mme.h"
-#include "cp2/defs.h"
+#include "cp/cp.h"
+#include "cp/mme.h"
+#include "cp/defs.h"
#include "inc/msg_cc.h"
#include "inc/msg_cm.h"
@@ -185,4 +185,4 @@ cp_msg_mme_rx_change_buffer (cp_t *ctx, cp_mme_rx_t *msg);
END_DECLS
-#endif /* cp2_msg_msg_h */
+#endif /* cp_msg_msg_h */
diff --git a/cesar/cp2/msg/src/mme.c b/cesar/cp/msg/src/mme.c
index 4a8898aef0..6014b97606 100644
--- a/cesar/cp2/msg/src/mme.c
+++ b/cesar/cp/msg/src/mme.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/msg/src/mme.c
+ * \file cp/msg/src/mme.c
* \brief Function to init and destroy the MME messages.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
*/
#include "common/std.h"
@@ -17,10 +17,10 @@
#include "lib/slab.h"
#include "interface/interface.h"
-#include "cp2/cl_interf/cl_interf.h"
+#include "cp/cl_interf/cl_interf.h"
-#include "cp2/msg/inc/msg.h"
-#include "cp2/inc/context.h"
+#include "cp/msg/inc/msg.h"
+#include "cp/inc/context.h"
/**
* Function to init the mme rx t messages.
diff --git a/cesar/cp2/msg/src/msg.c b/cesar/cp/msg/src/msg.c
index a557ae32ba..186977908e 100644
--- a/cesar/cp2/msg/src/msg.c
+++ b/cesar/cp/msg/src/msg.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/msg/src/msg.c
+ * \file cp/msg/src/msg.c
* \brief MSG functions.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
*/
#include "common/std.h"
@@ -20,15 +20,15 @@
#include "common/defs/homeplugAV.h"
#include "common/defs/ethernet.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/secu/aes.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/secu/aes.h"
-#include "cp2/msg/inc/msg.h"
-#include "cp2/inc/context.h"
+#include "cp/msg/inc/msg.h"
+#include "cp/inc/context.h"
#include <stdio.h>
diff --git a/cesar/cp2/msg/src/msg_cc.c b/cesar/cp/msg/src/msg_cc.c
index 207b344486..28d61ba6db 100644
--- a/cesar/cp2/msg/src/msg_cc.c
+++ b/cesar/cp/msg/src/msg_cc.c
@@ -6,22 +6,22 @@
*
* }}} */
/**
- * \file cp2/msg/src/msg_cc.c
+ * \file cp/msg/src/msg_cc.c
* \brief CC family MME.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
#include "common/std.h"
#include "common/defs/homeplugAV.h"
#include "lib/slab.h"
-#include "cp2/cp.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/msg/msg.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/sta_mgr.h"
-#include "cp2/msg/inc/msg_cc.h"
+#include "cp/msg/inc/msg_cc.h"
/**
* Send a CC_WHO_RU.REQ.
diff --git a/cesar/cp2/msg/src/msg_cm.c b/cesar/cp/msg/src/msg_cm.c
index d446a152a0..02e56b4378 100644
--- a/cesar/cp2/msg/src/msg_cm.c
+++ b/cesar/cp/msg/src/msg_cm.c
@@ -6,23 +6,23 @@
*
* }}} */
/**
- * \file cp2/msg/src/msg_cm.c
+ * \file cp/msg/src/msg_cm.c
* \brief CM family MME.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*/
#include "common/std.h"
#include "common/defs/homeplugAV.h"
#include "lib/read_word.h"
-#include "cp2/cp.h"
-#include "cp2/mme.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/mme.h"
+#include "cp/msg/msg.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/sta_mgr.h"
-#include "cp2/msg/inc/msg_cm.h"
+#include "cp/msg/inc/msg_cm.h"
/**
* Send a CM_UNASSOCIATED_STA.IND.
diff --git a/cesar/cp2/msg/test/Makefile b/cesar/cp/msg/test/Makefile
index 291d35f811..2c6ffea002 100644
--- a/cesar/cp2/msg/test/Makefile
+++ b/cesar/cp/msg/test/Makefile
@@ -1,20 +1,20 @@
BASE = ../../..
-INCLUDES = cp2/msg/test/overide/
+INCLUDES = cp/msg/test/overide/
HOST_PROGRAMS = test-msg-read-header test-msg-cc test-msg-cm test_frag
test-msg-read-header_SOURCES = test-msg-read-header.c interface_stub.c \
cp_cl_interface_stub.c cl_stub.c fsm_stub.c
-test-msg-read-header_MODULES = lib cp2/msg cp2/secu cp2/sta/mgr
+test-msg-read-header_MODULES = lib cp/msg cp/secu cp/sta/mgr
test-msg-cc_SOURCES = msg_cc.c interface_stub.c cl_stub.c fsm_stub.c
-test-msg-cc_MODULES = lib cp2/msg cp2/sta/mgr cp2/secu
+test-msg-cc_MODULES = lib cp/msg cp/sta/mgr cp/secu
test-msg-cm_SOURCES = msg_cm.c interface_stub.c cl_stub.c fsm_stub.c
-test-msg-cm_MODULES = lib cp2/msg cp2/sta/mgr cp2/secu
+test-msg-cm_MODULES = lib cp/msg cp/sta/mgr cp/secu
test_frag_SOURCES = cc_set_tei_map_frag.c interface_stub.c cl_stub.c fsm_stub.c
-test_frag_MODULES = lib cp2/msg cp2/sta/mgr cp2/secu
+test_frag_MODULES = lib cp/msg cp/sta/mgr cp/secu
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/msg/test/doc/Makefile b/cesar/cp/msg/test/doc/Makefile
index 50006394a5..50006394a5 100644
--- a/cesar/cp2/msg/test/doc/Makefile
+++ b/cesar/cp/msg/test/doc/Makefile
diff --git a/cesar/cp2/msg/test/doc/read-header.txt b/cesar/cp/msg/test/doc/read-header.txt
index 482609d42b..482609d42b 100644
--- a/cesar/cp2/msg/test/doc/read-header.txt
+++ b/cesar/cp/msg/test/doc/read-header.txt
diff --git a/cesar/cp2/msg/test/overide/cp2/inc/context.h b/cesar/cp/msg/test/overide/cp2/inc/context.h
index 526c7efd34..e4b1b9195e 100644
--- a/cesar/cp2/msg/test/overide/cp2/inc/context.h
+++ b/cesar/cp/msg/test/overide/cp2/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef overide_cp2_inc_context_h
-#define overide_cp2_inc_context_h
+#ifndef overide_cp_inc_context_h
+#define overide_cp_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file overide/cp2/inc/context.h
+ * \file overide/cp/inc/context.h
* \brief « brief description »
* \ingroup « module »
*
@@ -16,11 +16,11 @@
*/
#include "lib/rnd.h"
-#include "cp2/msg/inc/context.h"
+#include "cp/msg/inc/context.h"
#include "cl/cl.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/inc/sta_mgr.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
#include "mac/common/config.h"
@@ -45,4 +45,4 @@ struct cp_t
mac_config_t *mac_config;
};
-#endif /* overide_cp2_inc_context_h */
+#endif /* overide_cp_inc_context_h */
diff --git a/cesar/cp2/msg/test/overide/cp2/sta/core/core.h b/cesar/cp/msg/test/overide/cp2/sta/core/core.h
index e1448e37e8..89f6aae70c 100644
--- a/cesar/cp2/msg/test/overide/cp2/sta/core/core.h
+++ b/cesar/cp/msg/test/overide/cp2/sta/core/core.h
@@ -1,5 +1,5 @@
-#ifndef overide_cp2_sta_core_core_h
-#define overide_cp2_sta_core_core_h
+#ifndef overide_cp_sta_core_core_h
+#define overide_cp_sta_core_core_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,11 +8,11 @@
*
* }}} */
/**
- * \file overide/cp2/sta/core/core.h
+ * \file overide/cp/sta/core/core.h
* \brief « brief description »
* \ingroup « module »
*
* « long description »
*/
-#endif /* overide_cp2_sta_core_core_h */
+#endif /* overide_cp_sta_core_core_h */
diff --git a/cesar/cp2/msg/test/overide/cp_fsm_defs.h b/cesar/cp/msg/test/overide/cp_fsm_defs.h
index c29fa69e19..c29fa69e19 100644
--- a/cesar/cp2/msg/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/msg/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/msg/test/src/cc_set_tei_map_frag.c b/cesar/cp/msg/test/src/cc_set_tei_map_frag.c
index 06444463a9..db467adf86 100644
--- a/cesar/cp2/msg/test/src/cc_set_tei_map_frag.c
+++ b/cesar/cp/msg/test/src/cc_set_tei_map_frag.c
@@ -19,9 +19,9 @@
#include "lib/blk.h"
#include <stdio.h>
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/msg/msg.h"
struct mme_header_t
{
diff --git a/cesar/cp2/msg/test/src/cl_stub.c b/cesar/cp/msg/test/src/cl_stub.c
index e9ff2f1556..e9ff2f1556 100644
--- a/cesar/cp2/msg/test/src/cl_stub.c
+++ b/cesar/cp/msg/test/src/cl_stub.c
diff --git a/cesar/cp2/msg/test/src/cp_cl_interface_stub.c b/cesar/cp/msg/test/src/cp_cl_interface_stub.c
index bbb364f7fb..69f5b65b8d 100644
--- a/cesar/cp2/msg/test/src/cp_cl_interface_stub.c
+++ b/cesar/cp/msg/test/src/cp_cl_interface_stub.c
@@ -8,14 +8,14 @@
/**
* \file src/cp_cl_interface_stub.c
* \brief CL interface stub functions.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
static u8 buffer[2048] __attribute__((aligned(2048)));
diff --git a/cesar/cp/msg/test/src/fsm_stub.c b/cesar/cp/msg/test/src/fsm_stub.c
new file mode 100644
index 0000000000..849f375270
--- /dev/null
+++ b/cesar/cp/msg/test/src/fsm_stub.c
@@ -0,0 +1,29 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file src/fsm_stub.c
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+#include "common/std.h"
+#include "cp/fsm/fsm.h"
+
+static cp_fsm_event_t fsm_event;
+
+cp_fsm_event_t *
+cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
+{
+ return &fsm_event;
+}
+
+void
+cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
+{
+}
diff --git a/cesar/cp2/msg/test/src/interface_stub.c b/cesar/cp/msg/test/src/interface_stub.c
index 904b3f1ecb..68d5683537 100644
--- a/cesar/cp2/msg/test/src/interface_stub.c
+++ b/cesar/cp/msg/test/src/interface_stub.c
@@ -14,7 +14,7 @@
*/
#include "common/std.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
/**
* Inform the Data plane when the MME as been processed by the CP.
diff --git a/cesar/cp2/msg/test/src/msg_cc.c b/cesar/cp/msg/test/src/msg_cc.c
index 370dfde18e..6a85ffd5f0 100644
--- a/cesar/cp2/msg/test/src/msg_cc.c
+++ b/cesar/cp/msg/test/src/msg_cc.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/msg/test/src/msg_cc.c
+ * \file cp/msg/test/src/msg_cc.c
* \brief Test the MSG_CC Family functions.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
*/
#include "common/std.h"
@@ -20,13 +20,13 @@
#include "lib/swap.h"
#include "lib/bitstream.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_own_data.h"
-#include "cp2/inc/context.h"
-#include "cp2/msg/inc/msg.h"
+#include "cp/inc/context.h"
+#include "cp/msg/inc/msg.h"
#include "stdio.h"
diff --git a/cesar/cp2/msg/test/src/msg_cm.c b/cesar/cp/msg/test/src/msg_cm.c
index 221c54b929..00d4fcc2a9 100644
--- a/cesar/cp2/msg/test/src/msg_cm.c
+++ b/cesar/cp/msg/test/src/msg_cm.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/msg/test/src/msg_cm.c
+ * \file cp/msg/test/src/msg_cm.c
* \brief Test the MSG_CM Family functions.
- * \ingroup cp2_msg
+ * \ingroup cp_msg
*
*/
#include "common/std.h"
@@ -20,13 +20,13 @@
#include "lib/swap.h"
#include "lib/bitstream.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_own_data.h"
-#include "cp2/inc/context.h"
-#include "cp2/msg/inc/msg.h"
+#include "cp/inc/context.h"
+#include "cp/msg/inc/msg.h"
struct mme_header_t
{
diff --git a/cesar/cp2/msg/test/src/sta_mgr_stub.c b/cesar/cp/msg/test/src/sta_mgr_stub.c
index e587393d9b..565e827c92 100644
--- a/cesar/cp2/msg/test/src/sta_mgr_stub.c
+++ b/cesar/cp/msg/test/src/sta_mgr_stub.c
@@ -14,8 +14,8 @@
*/
#include "common/std.h"
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/sta/mgr/inc/sta_own_data.h"
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/inc/sta_own_data.h"
static cp_sta_own_data_private_t own;
diff --git a/cesar/cp2/msg/test/src/test-msg-read-header.c b/cesar/cp/msg/test/src/test-msg-read-header.c
index 484a148f46..c396113545 100644
--- a/cesar/cp2/msg/test/src/test-msg-read-header.c
+++ b/cesar/cp/msg/test/src/test-msg-read-header.c
@@ -19,10 +19,10 @@
#include "lib/test.h"
#include "lib/swap.h"
-#include "cp2/cp.h"
-#include "cp2/msg/msg.h"
+#include "cp/cp.h"
+#include "cp/msg/msg.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/**
* Test the msg_read header function with a MME containing a VLAN Tag.
diff --git a/cesar/cp2/pwl/Module b/cesar/cp/pwl/Module
index ba76fba637..ba76fba637 100644
--- a/cesar/cp2/pwl/Module
+++ b/cesar/cp/pwl/Module
diff --git a/cesar/cp2/pwl/doc/pwl.xmi b/cesar/cp/pwl/doc/pwl.xmi
index 390ce7fa71..390ce7fa71 100644
--- a/cesar/cp2/pwl/doc/pwl.xmi
+++ b/cesar/cp/pwl/doc/pwl.xmi
diff --git a/cesar/cp2/pwl/doc/scilab/Makefile b/cesar/cp/pwl/doc/scilab/Makefile
index 7c4e211550..7c4e211550 100644
--- a/cesar/cp2/pwl/doc/scilab/Makefile
+++ b/cesar/cp/pwl/doc/scilab/Makefile
diff --git a/cesar/cp2/pwl/doc/scilab/convertc.sce b/cesar/cp/pwl/doc/scilab/convertc.sce
index 3d60d70ed9..3d60d70ed9 100644
--- a/cesar/cp2/pwl/doc/scilab/convertc.sce
+++ b/cesar/cp/pwl/doc/scilab/convertc.sce
diff --git a/cesar/cp2/pwl/doc/scilab/estimate_acl_freq_decrease.sce b/cesar/cp/pwl/doc/scilab/estimate_acl_freq_decrease.sce
index fd0b0d0ed5..fd0b0d0ed5 100644
--- a/cesar/cp2/pwl/doc/scilab/estimate_acl_freq_decrease.sce
+++ b/cesar/cp/pwl/doc/scilab/estimate_acl_freq_decrease.sce
diff --git a/cesar/cp2/pwl/doc/scilab/estimate_acl_freq_increase.sce b/cesar/cp/pwl/doc/scilab/estimate_acl_freq_increase.sce
index 4539a5a90b..4539a5a90b 100644
--- a/cesar/cp2/pwl/doc/scilab/estimate_acl_freq_increase.sce
+++ b/cesar/cp/pwl/doc/scilab/estimate_acl_freq_increase.sce
diff --git a/cesar/cp2/pwl/doc/scilab/estimate_acl_stable.sce b/cesar/cp/pwl/doc/scilab/estimate_acl_stable.sce
index f8996ff594..f8996ff594 100644
--- a/cesar/cp2/pwl/doc/scilab/estimate_acl_stable.sce
+++ b/cesar/cp/pwl/doc/scilab/estimate_acl_stable.sce
diff --git a/cesar/cp2/pwl/doc/scilab/src/estimateBP.sce b/cesar/cp/pwl/doc/scilab/src/estimateBP.sce
index 3a87e42c6b..3a87e42c6b 100644
--- a/cesar/cp2/pwl/doc/scilab/src/estimateBP.sce
+++ b/cesar/cp/pwl/doc/scilab/src/estimateBP.sce
diff --git a/cesar/cp2/pwl/doc/scilab/src/zc_capture.sce b/cesar/cp/pwl/doc/scilab/src/zc_capture.sce
index ba46a463ec..ba46a463ec 100644
--- a/cesar/cp2/pwl/doc/scilab/src/zc_capture.sce
+++ b/cesar/cp/pwl/doc/scilab/src/zc_capture.sce
diff --git a/cesar/cp2/pwl/doc/scilab/src/zc_capture_decrease.sce b/cesar/cp/pwl/doc/scilab/src/zc_capture_decrease.sce
index 2009ebeb72..2009ebeb72 100644
--- a/cesar/cp2/pwl/doc/scilab/src/zc_capture_decrease.sce
+++ b/cesar/cp/pwl/doc/scilab/src/zc_capture_decrease.sce
diff --git a/cesar/cp2/pwl/doc/scilab/src/zc_capture_increase.sce b/cesar/cp/pwl/doc/scilab/src/zc_capture_increase.sce
index 2afdd497cd..2afdd497cd 100644
--- a/cesar/cp2/pwl/doc/scilab/src/zc_capture_increase.sce
+++ b/cesar/cp/pwl/doc/scilab/src/zc_capture_increase.sce
diff --git a/cesar/cp2/pwl/doc/spec.odt b/cesar/cp/pwl/doc/spec.odt
index 24b6b82028..24b6b82028 100644
--- a/cesar/cp2/pwl/doc/spec.odt
+++ b/cesar/cp/pwl/doc/spec.odt
Binary files differ
diff --git a/cesar/cp2/pwl/doc/study.odt b/cesar/cp/pwl/doc/study.odt
index 52c04a05d1..52c04a05d1 100644
--- a/cesar/cp2/pwl/doc/study.odt
+++ b/cesar/cp/pwl/doc/study.odt
Binary files differ
diff --git a/cesar/cp2/pwl/pwl.h b/cesar/cp/pwl/pwl.h
index 477c0df54f..753c2708fa 100644
--- a/cesar/cp2/pwl/pwl.h
+++ b/cesar/cp/pwl/pwl.h
@@ -1,5 +1,5 @@
-#ifndef cp2_pwl_h
-#define cp2_pwl_h
+#ifndef cp_pwl_h
+#define cp_pwl_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/pwl/pwl.h
+ * \file cp/pwl/pwl.h
* \brief The powerline state.
- * \ingroup cp2_pwl
+ * \ingroup cp_pwl
*
*/
@@ -133,4 +133,4 @@ cp_pwl_estimate_beacon_period (cp_t *ctx);
void
cp_pwl_uninit (cp_t *ctx);
-#endif /* cp2_pwl_h */
+#endif /* cp_pwl_h */
diff --git a/cesar/cp2/pwl/src/pwl.c b/cesar/cp/pwl/src/pwl.c
index 7669030cac..c4c11fc526 100644
--- a/cesar/cp2/pwl/src/pwl.c
+++ b/cesar/cp/pwl/src/pwl.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/pwl/src/pwl.c
+ * \file cp/pwl/src/pwl.c
* \brief Power Line module.
- * \ingroup cp2_pwl
+ * \ingroup cp_pwl
*
* The Power line module is responsible to keep the station synchronized with
* the AC Line Power Line.
@@ -19,10 +19,10 @@
/* Timings, for the macro MAC_MS_TO_TCK*/
#include "mac/common/timings.h"
-#include "cp2/cp.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/cp.h"
+#include "cp/pwl/pwl.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/**
* Initialise the pwl module.
diff --git a/cesar/cp2/pwl/test/Makefile b/cesar/cp/pwl/test/Makefile
index b67166e9e0..9c84fbec6f 100644
--- a/cesar/cp2/pwl/test/Makefile
+++ b/cesar/cp/pwl/test/Makefile
@@ -5,6 +5,6 @@ ECOS = y
TARGET_PROGRAMS = pwl
pwl_SOURCES = pwl.c
-pwl_MODULES = lib cp2/pwl
+pwl_MODULES = lib cp/pwl
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/pwl/test/doc/Makefile b/cesar/cp/pwl/test/doc/Makefile
index d3db9f86c8..d3db9f86c8 100644
--- a/cesar/cp2/pwl/test/doc/Makefile
+++ b/cesar/cp/pwl/test/doc/Makefile
diff --git a/cesar/cp2/pwl/test/doc/pwl.txt b/cesar/cp/pwl/test/doc/pwl.txt
index c0d025db3e..7982f71045 100644
--- a/cesar/cp2/pwl/test/doc/pwl.txt
+++ b/cesar/cp/pwl/test/doc/pwl.txt
@@ -55,7 +55,7 @@ Estimate beacon period
----------------------
This test shall provide the same result as the scilab simulation.
-see cp2/pwl/doc/scilab
+see cp/pwl/doc/scilab
The scilab script is written to produce table to use with the unit test to verify the test.
For that, use the makefile in the scilab directory, it will produce in the res directory three files for each script:
diff --git a/cesar/cp2/pwl/test/ecos.ecc.sh b/cesar/cp/pwl/test/ecos.ecc.sh
index 8253d98c9a..8253d98c9a 100644
--- a/cesar/cp2/pwl/test/ecos.ecc.sh
+++ b/cesar/cp/pwl/test/ecos.ecc.sh
diff --git a/cesar/cp2/pwl/test/inc/result_decrease.h b/cesar/cp/pwl/test/inc/result_decrease.h
index 0512787887..0512787887 100644
--- a/cesar/cp2/pwl/test/inc/result_decrease.h
+++ b/cesar/cp/pwl/test/inc/result_decrease.h
diff --git a/cesar/cp2/pwl/test/inc/result_increase.h b/cesar/cp/pwl/test/inc/result_increase.h
index b8f4322c03..b8f4322c03 100644
--- a/cesar/cp2/pwl/test/inc/result_increase.h
+++ b/cesar/cp/pwl/test/inc/result_increase.h
diff --git a/cesar/cp2/pwl/test/inc/result_stable.h b/cesar/cp/pwl/test/inc/result_stable.h
index 147e4af46b..147e4af46b 100644
--- a/cesar/cp2/pwl/test/inc/result_stable.h
+++ b/cesar/cp/pwl/test/inc/result_stable.h
diff --git a/cesar/cp2/pwl/test/inc/table.h b/cesar/cp/pwl/test/inc/table.h
index 355ddc2f0a..355ddc2f0a 100644
--- a/cesar/cp2/pwl/test/inc/table.h
+++ b/cesar/cp/pwl/test/inc/table.h
diff --git a/cesar/cp2/pwl/test/inc/table_decrease.h b/cesar/cp/pwl/test/inc/table_decrease.h
index 4c1502802d..4c1502802d 100644
--- a/cesar/cp2/pwl/test/inc/table_decrease.h
+++ b/cesar/cp/pwl/test/inc/table_decrease.h
diff --git a/cesar/cp2/pwl/test/inc/table_increase.h b/cesar/cp/pwl/test/inc/table_increase.h
index 9ce6c22670..9ce6c22670 100644
--- a/cesar/cp2/pwl/test/inc/table_increase.h
+++ b/cesar/cp/pwl/test/inc/table_increase.h
diff --git a/cesar/cp2/pwl/test/src/pwl.c b/cesar/cp/pwl/test/src/pwl.c
index 09c09e6eff..930f7f882f 100644
--- a/cesar/cp2/pwl/test/src/pwl.c
+++ b/cesar/cp/pwl/test/src/pwl.c
@@ -8,7 +8,7 @@
/**
* \file src/pwl.c
* \brief Test the PWL Module.
- * \ingroup cp2_pwl
+ * \ingroup cp_pwl
*
*/
#include "common/std.h"
@@ -16,18 +16,18 @@
#include "mac/common/timings.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
#include <stdio.h>
-#include "cp2/pwl/test/inc/table.h"
-#include "cp2/pwl/test/inc/table_increase.h"
-#include "cp2/pwl/test/inc/table_decrease.h"
-#include "cp2/pwl/test/inc/result_stable.h"
-#include "cp2/pwl/test/inc/result_increase.h"
-#include "cp2/pwl/test/inc/result_decrease.h"
+#include "cp/pwl/test/inc/table.h"
+#include "cp/pwl/test/inc/table_increase.h"
+#include "cp/pwl/test/inc/table_decrease.h"
+#include "cp/pwl/test/inc/result_stable.h"
+#include "cp/pwl/test/inc/result_increase.h"
+#include "cp/pwl/test/inc/result_decrease.h"
enum test_pwl_phy_t
@@ -168,7 +168,7 @@ test_case_pwl_frequency_detection (test_t test)
* \param test the test object.
*
* This test shall provide the same result as the scilab simulation.
- * see cp2/pwl/doc/scilab
+ * see cp/pwl/doc/scilab
*/
void
test_case_pwl_estimate_beacon_period_ac_stable (test_t test)
@@ -202,7 +202,7 @@ test_case_pwl_estimate_beacon_period_ac_stable (test_t test)
* \param test the test object.
*
* This test shall provide the same result as the scilab simulation.
- * see cp2/pwl/doc/scilab
+ * see cp/pwl/doc/scilab
*/
void
test_case_pwl_estimate_beacon_period_ac_increase (test_t test)
@@ -239,7 +239,7 @@ test_case_pwl_estimate_beacon_period_ac_increase (test_t test)
* \param test the test object.
*
* This test shall provide the same result as the scilab simulation.
- * see cp2/pwl/doc/scilab
+ * see cp/pwl/doc/scilab
*/
void
test_case_pwl_estimate_beacon_period_ac_decrease (test_t test)
diff --git a/cesar/cp2/secu/Module b/cesar/cp/secu/Module
index c049dc3ec5..c049dc3ec5 100644
--- a/cesar/cp2/secu/Module
+++ b/cesar/cp/secu/Module
diff --git a/cesar/cp2/secu/aes.h b/cesar/cp/secu/aes.h
index ac47285ef6..ac47285ef6 100644
--- a/cesar/cp2/secu/aes.h
+++ b/cesar/cp/secu/aes.h
diff --git a/cesar/cp2/secu/defs.h b/cesar/cp/secu/defs.h
index 2f1fe7ec7e..b0bd9feb8e 100644
--- a/cesar/cp2/secu/defs.h
+++ b/cesar/cp/secu/defs.h
@@ -1,5 +1,5 @@
-#ifndef cp2_secu_defs_h
-#define cp2_secu_defs_h
+#ifndef cp_secu_defs_h
+#define cp_secu_defs_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/secu/defs.h
+ * \file cp/secu/defs.h
* \brief Length definitions for the security module.
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
*/
@@ -35,4 +35,4 @@
/** AES Size. */
#define CP_SECU_AES_SIZE 16
-#endif /* cp2_secu_defs_h */
+#endif /* cp_secu_defs_h */
diff --git a/cesar/cp2/secu/inc/pbkdf1.h b/cesar/cp/secu/inc/pbkdf1.h
index 5d5a7ef8bc..bc5a4012b1 100644
--- a/cesar/cp2/secu/inc/pbkdf1.h
+++ b/cesar/cp/secu/inc/pbkdf1.h
@@ -1,5 +1,5 @@
-#ifndef cp2_secu_inc_pbkdf1_h
-#define cp2_secu_inc_pbkdf1_h
+#ifndef cp_secu_inc_pbkdf1_h
+#define cp_secu_inc_pbkdf1_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/secu/inc/pbkdf1.h
+ * \file cp/secu/inc/pbkdf1.h
* \brief PBKDF1 function.
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
*/
@@ -28,4 +28,4 @@ secu_pbkdf1 (u8 input[], uint input_len, u8 salt[],
uint salt_len, uint it_count, u8 output_key[]);
-#endif /* cp2_secu_inc_pbkdf1_h */
+#endif /* cp_secu_inc_pbkdf1_h */
diff --git a/cesar/cp2/secu/inc/sha256.h b/cesar/cp/secu/inc/sha256.h
index cf883a2eb2..cf883a2eb2 100644
--- a/cesar/cp2/secu/inc/sha256.h
+++ b/cesar/cp/secu/inc/sha256.h
diff --git a/cesar/cp2/secu/pbkdf1.h b/cesar/cp/secu/pbkdf1.h
index 2e260d85b3..a8de0a5106 100644
--- a/cesar/cp2/secu/pbkdf1.h
+++ b/cesar/cp/secu/pbkdf1.h
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file cp2/secu/pbkdf1.h
+ * \file cp/secu/pbkdf1.h
* \brief Fonction PBKDF1.
* \ingroup cp_secu
*/
diff --git a/cesar/cp2/secu/secu.h b/cesar/cp/secu/secu.h
index 8247fb880f..bf5eea3b4d 100644
--- a/cesar/cp2/secu/secu.h
+++ b/cesar/cp/secu/secu.h
@@ -15,8 +15,8 @@
* « long description »
*/
-#include "cp2/secu/pbkdf1.h"
-#include "cp2/secu/aes.h"
+#include "cp/secu/pbkdf1.h"
+#include "cp/secu/aes.h"
/** Data associated with a protocol run. */
struct cp_secu_protocol_run_t
diff --git a/cesar/cp2/secu/sha256.h b/cesar/cp/secu/sha256.h
index f59b5a5003..679cec1b8d 100644
--- a/cesar/cp2/secu/sha256.h
+++ b/cesar/cp/secu/sha256.h
@@ -1,5 +1,5 @@
-#ifndef cp2_secu_sha256_h
-#define cp2_secu_sha256_h
+#ifndef cp_secu_sha256_h
+#define cp_secu_sha256_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/secu/sha256.h
+ * \file cp/secu/sha256.h
* \brief SHA 256.
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
* see http://en.wikipedia.org/wiki/SHA256#SHA-2
*/
@@ -24,4 +24,4 @@
void
cp_secu_sha256 (u8 *data, uint length, u8 *output);
-#endif /* cp2_secu_sha256_h */
+#endif /* cp_secu_sha256_h */
diff --git a/cesar/cp2/secu/src/aes.c b/cesar/cp/secu/src/aes.c
index 22928c5da3..c4a1fe283b 100644
--- a/cesar/cp2/secu/src/aes.c
+++ b/cesar/cp/secu/src/aes.c
@@ -15,7 +15,7 @@
*/
#include "common/std.h"
-#include "cp2/secu/aes.h"
+#include "cp/secu/aes.h"
#include <stdio.h>
diff --git a/cesar/cp2/secu/src/pbkdf1.c b/cesar/cp/secu/src/pbkdf1.c
index 7b616e6a30..542ed5c9e8 100644
--- a/cesar/cp2/secu/src/pbkdf1.c
+++ b/cesar/cp/secu/src/pbkdf1.c
@@ -6,20 +6,20 @@
*
* }}} */
/**
- * \file cp2/secu/secu_pbkdf1.c
+ * \file cp/secu/secu_pbkdf1.c
* \brief The pbkdf1 function
* \ingroup cp_secu
*/
#include <string.h>
#include "common/std.h"
-#include "cp2/secu/defs.h"
+#include "cp/secu/defs.h"
-#include "cp2/secu/sha256.h"
-#include "cp2/secu/pbkdf1.h"
+#include "cp/secu/sha256.h"
+#include "cp/secu/pbkdf1.h"
-#include "cp2/secu/inc/pbkdf1.h"
+#include "cp/secu/inc/pbkdf1.h"
void
secu_pbkdf1 (u8 input[], uint input_len, u8 salt[],
diff --git a/cesar/cp2/secu/src/secu.c b/cesar/cp/secu/src/secu.c
index 90d556d109..eece5764ed 100644
--- a/cesar/cp2/secu/src/secu.c
+++ b/cesar/cp/secu/src/secu.c
@@ -6,20 +6,20 @@
*
* }}} */
/**
- * \file cp2/secu/src/secu.c
+ * \file cp/secu/src/secu.c
* \brief Security functions.
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
*/
#include "common/std.h"
#include "string.h"
-#include "cp2/defs.h"
-#include "cp2/secu/defs.h"
-#include "cp2/secu/secu.h"
-#include "cp2/secu/pbkdf1.h"
+#include "cp/defs.h"
+#include "cp/secu/defs.h"
+#include "cp/secu/secu.h"
+#include "cp/secu/pbkdf1.h"
-#include "cp2/secu/inc/pbkdf1.h"
+#include "cp/secu/inc/pbkdf1.h"
/**
* Start a new protocol run and initialise the protocol run structure.
diff --git a/cesar/cp2/secu/src/sha256.c b/cesar/cp/secu/src/sha256.c
index 43647ae6de..de011f6ac5 100644
--- a/cesar/cp2/secu/src/sha256.c
+++ b/cesar/cp/secu/src/sha256.c
@@ -20,9 +20,9 @@
#include "common/std.h"
#include <string.h>
#include "lib/swap.h"
-#include "cp2/secu/defs.h"
+#include "cp/secu/defs.h"
-#include "cp2/secu/inc/sha256.h"
+#include "cp/secu/inc/sha256.h"
#define GET_UINT32(n,b,i) \
{ \
diff --git a/cesar/cp2/secu/test/Makefile b/cesar/cp/secu/test/Makefile
index 4cf466fc3f..4cf466fc3f 100644
--- a/cesar/cp2/secu/test/Makefile
+++ b/cesar/cp/secu/test/Makefile
diff --git a/cesar/cp2/secu/test/host-Makefile b/cesar/cp/secu/test/host-Makefile
index fe0ffde9cf..4ac8c3750a 100644
--- a/cesar/cp2/secu/test/host-Makefile
+++ b/cesar/cp/secu/test/host-Makefile
@@ -3,16 +3,16 @@ BASE = ../../..
HOST_PROGRAMS = test-sha2 test-aes test-prun test-nmk
test-sha2_SOURCES = test-sha2.c
-test-sha2_MODULES = lib cp2/secu
+test-sha2_MODULES = lib cp/secu
test-aes_SOURCES = test-aes.c
-test-aes_MODULES = lib cp2/secu
+test-aes_MODULES = lib cp/secu
test-prun_SOURCES = test-prun.c
-test-prun_MODULES = lib cp2/secu
+test-prun_MODULES = lib cp/secu
test-nmk_SOURCES = test-nmk.c
-test-nmk_MODULES = lib cp2/secu
+test-nmk_MODULES = lib cp/secu
VARIANT = host
diff --git a/cesar/cp2/secu/test/sparc-Makefile b/cesar/cp/secu/test/sparc-Makefile
index 9a4c45ebcf..da046afbac 100644
--- a/cesar/cp2/secu/test/sparc-Makefile
+++ b/cesar/cp/secu/test/sparc-Makefile
@@ -6,10 +6,10 @@ ECOS = y
TARGET_PROGRAMS = test-sha2 test-aes
test-sha2_SOURCES = test-sha2.c
-test-sha2_MODULES = lib cp2/secu
+test-sha2_MODULES = lib cp/secu
test-aes_SOURCES = test-aes.c
-test-aes_MODULES = lib cp2/secu
+test-aes_MODULES = lib cp/secu
VARIANT = sparc
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/secu/test/sparc-ecos.ecc.sh b/cesar/cp/secu/test/sparc-ecos.ecc.sh
index db2208c6cc..db2208c6cc 100644
--- a/cesar/cp2/secu/test/sparc-ecos.ecc.sh
+++ b/cesar/cp/secu/test/sparc-ecos.ecc.sh
diff --git a/cesar/cp2/secu/test/src/test-aes.c b/cesar/cp/secu/test/src/test-aes.c
index 5f841ee8bb..674d22c84c 100644
--- a/cesar/cp2/secu/test/src/test-aes.c
+++ b/cesar/cp/secu/test/src/test-aes.c
@@ -17,7 +17,7 @@
#include "lib/bitstream.h"
#include "string.h"
-#include "cp2/secu/aes.h"
+#include "cp/secu/aes.h"
void
test_case_aes (test_t test)
diff --git a/cesar/cp2/secu/test/src/test-nmk.c b/cesar/cp/secu/test/src/test-nmk.c
index 730094a373..99830a8956 100644
--- a/cesar/cp2/secu/test/src/test-nmk.c
+++ b/cesar/cp/secu/test/src/test-nmk.c
@@ -8,7 +8,7 @@
/**
* \file src/test-nmk.c
* \brief Test the generation of the NMK
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
* Test the generation of the NMK with the data provided in section 13.5 table
* 13-342.
@@ -20,11 +20,11 @@
#include "stdio.h"
#include "lib/test.h"
-#include "cp2/secu/secu.h"
-#include "cp2/secu/aes.h"
-#include "cp2/secu/sha256.h"
+#include "cp/secu/secu.h"
+#include "cp/secu/aes.h"
+#include "cp/secu/sha256.h"
-#include "cp2/secu/inc/pbkdf1.h"
+#include "cp/secu/inc/pbkdf1.h"
void
test_case_nmk_generation (test_t test)
diff --git a/cesar/cp2/secu/test/src/test-prun.c b/cesar/cp/secu/test/src/test-prun.c
index abfdc92196..bf53fe81c9 100644
--- a/cesar/cp2/secu/test/src/test-prun.c
+++ b/cesar/cp/secu/test/src/test-prun.c
@@ -8,13 +8,13 @@
/**
* \file src/test-prun.c
* \brief Test the protocol run
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
*/
#include "common/std.h"
#include "lib/test.h"
-#include "cp2/secu/secu.h"
+#include "cp/secu/secu.h"
void
test_case_secu_prun_init (test_t test)
diff --git a/cesar/cp2/secu/test/src/test-sha2.c b/cesar/cp/secu/test/src/test-sha2.c
index f7dd34a058..48d5b128cb 100644
--- a/cesar/cp2/secu/test/src/test-sha2.c
+++ b/cesar/cp/secu/test/src/test-sha2.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/secu/test/src/test-sha2.c
+ * \file cp/secu/test/src/test-sha2.c
* \brief Test SHA 256.
- * \ingroup cp2_secu
+ * \ingroup cp_secu
*
*/
#include "common/std.h"
@@ -17,7 +17,7 @@
#include "lib/bitstream.h"
#include "string.h"
-#include "cp2/secu/sha256.h"
+#include "cp/secu/sha256.h"
void
test_case_sha2 (test_t test)
diff --git a/cesar/cp2/secu/test/utest/Makefile b/cesar/cp/secu/test/utest/Makefile
index b686bfb34d..8bd798503e 100644
--- a/cesar/cp2/secu/test/utest/Makefile
+++ b/cesar/cp/secu/test/utest/Makefile
@@ -2,6 +2,6 @@ BASE = ../../../..
HOST_PROGRAMS = test_secu
test_secu_SOURCES = test_secu.c
-test_secu_MODULES = lib cp2/secu
+test_secu_MODULES = lib cp/secu
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/secu/test/utest/src/test_secu.c b/cesar/cp/secu/test/utest/src/test_secu.c
index 71eaeb8a86..3c51941aca 100644
--- a/cesar/cp2/secu/test/utest/src/test_secu.c
+++ b/cesar/cp/secu/test/utest/src/test_secu.c
@@ -15,7 +15,7 @@
#include "lib/test.h"
/* For the moment, only test headers compilation. */
-#include "cp2/secu/secu.h"
+#include "cp/secu/secu.h"
int
main (int argc, char **argv)
diff --git a/cesar/cp2/spoc/Module b/cesar/cp/spoc/Module
index 3eadb9ee3f..3eadb9ee3f 100644
--- a/cesar/cp2/spoc/Module
+++ b/cesar/cp/spoc/Module
diff --git a/cesar/cp2/spoc/spoc.h b/cesar/cp/spoc/spoc.h
index 36cfca523e..36cfca523e 100644
--- a/cesar/cp2/spoc/spoc.h
+++ b/cesar/cp/spoc/spoc.h
diff --git a/cesar/cp2/spoc/src/spoc.c b/cesar/cp/spoc/src/spoc.c
index cf8e6dea05..ef258570a0 100644
--- a/cesar/cp2/spoc/src/spoc.c
+++ b/cesar/cp/spoc/src/spoc.c
@@ -14,7 +14,7 @@
*/
#include "common/std.h"
#include "hal/phy/defs.h"
-#include "cp2/spoc/spoc.h"
+#include "cp/spoc/spoc.h"
#include "math.h"
#define SPOC_PMIN PHY_CARRIER_OFFSET
diff --git a/cesar/cp2/spoc/test/ApproxOrder1ParamMCoeff.sci b/cesar/cp/spoc/test/ApproxOrder1ParamMCoeff.sci
index b76f650c69..b76f650c69 100644
--- a/cesar/cp2/spoc/test/ApproxOrder1ParamMCoeff.sci
+++ b/cesar/cp/spoc/test/ApproxOrder1ParamMCoeff.sci
diff --git a/cesar/cp2/spoc/test/ApproxOrder2ParamMCoeff.sci b/cesar/cp/spoc/test/ApproxOrder2ParamMCoeff.sci
index fca72b620f..fca72b620f 100644
--- a/cesar/cp2/spoc/test/ApproxOrder2ParamMCoeff.sci
+++ b/cesar/cp/spoc/test/ApproxOrder2ParamMCoeff.sci
diff --git a/cesar/cp2/spoc/test/Makefile b/cesar/cp/spoc/test/Makefile
index 9c871376b4..439b2e2572 100644
--- a/cesar/cp2/spoc/test/Makefile
+++ b/cesar/cp/spoc/test/Makefile
@@ -1,6 +1,6 @@
BASE = ../../..
-INCLUDES = cp2/spoc/test
+INCLUDES = cp/spoc/test
EXTRA_HOST_CFLAGS=-O3
EXTRA_HOST_LDFLAGS=-lm
diff --git a/cesar/cp2/spoc/test/coeff_generation.scilab b/cesar/cp/spoc/test/coeff_generation.scilab
index f26946f208..f26946f208 100644
--- a/cesar/cp2/spoc/test/coeff_generation.scilab
+++ b/cesar/cp/spoc/test/coeff_generation.scilab
diff --git a/cesar/cp2/spoc/test/define_spoc_c.h b/cesar/cp/spoc/test/define_spoc_c.h
index ef6cd298e3..325e6aa214 100644
--- a/cesar/cp2/spoc/test/define_spoc_c.h
+++ b/cesar/cp/spoc/test/define_spoc_c.h
@@ -16,5 +16,5 @@
*/
#define SPOC_COMPARE_SCILAB
-#include "cp2/spoc/src/spoc.c"
+#include "cp/spoc/src/spoc.c"
#endif /* define_spoc_c_h */
diff --git a/cesar/cp2/spoc/test/get_Approx1.sci b/cesar/cp/spoc/test/get_Approx1.sci
index 4ec86afc2f..4ec86afc2f 100644
--- a/cesar/cp2/spoc/test/get_Approx1.sci
+++ b/cesar/cp/spoc/test/get_Approx1.sci
diff --git a/cesar/cp2/spoc/test/src/test_coeff_check.c b/cesar/cp/spoc/test/src/test_coeff_check.c
index 5a50d41d0b..5a50d41d0b 100644
--- a/cesar/cp2/spoc/test/src/test_coeff_check.c
+++ b/cesar/cp/spoc/test/src/test_coeff_check.c
diff --git a/cesar/cp2/src/cp.c b/cesar/cp/src/cp.c
index a0398472de..aa611f3c2e 100644
--- a/cesar/cp2/src/cp.c
+++ b/cesar/cp/src/cp.c
@@ -6,16 +6,16 @@
*
* }}} */
/**
- * \file cp2/src/cp.c
+ * \file cp/src/cp.c
* \brief CP functions.
* \ingroup cp
*
*/
#include "common/std.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/** Static data. */
static cp_t cp_global;
diff --git a/cesar/cp2/sta/action/Module b/cesar/cp/sta/action/Module
index ef18c08d0d..ef18c08d0d 100644
--- a/cesar/cp2/sta/action/Module
+++ b/cesar/cp/sta/action/Module
diff --git a/cesar/cp2/sta/action/action.h b/cesar/cp/sta/action/action.h
index 48f1249458..2eaa9ca674 100644
--- a/cesar/cp2/sta/action/action.h
+++ b/cesar/cp/sta/action/action.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_action_h
-#define cp2_sta_action_action_h
+#ifndef cp_sta_action_action_h
+#define cp_sta_action_action_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/action.h
+ * \file cp/sta/action/action.h
* \brief STA action.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* This module implements actions defined in the FSM and actions corresponding
* to MME reception.
@@ -20,15 +20,15 @@
*
* This part includes top level functions.
*/
-#include "cp2/types.h"
-#include "cp2/mme.h"
+#include "cp/types.h"
+#include "cp/mme.h"
-#include "cp2/sta/action/assoc.h"
-#include "cp2/sta/action/poweron.h"
-#include "cp2/sta/action/info.h"
-#include "cp2/sta/action/key.h"
-#include "cp2/sta/action/misc.h"
-#include "cp2/sta/action/drv.h"
+#include "cp/sta/action/assoc.h"
+#include "cp/sta/action/poweron.h"
+#include "cp/sta/action/info.h"
+#include "cp/sta/action/key.h"
+#include "cp/sta/action/misc.h"
+#include "cp/sta/action/drv.h"
BEGIN_DECLS
@@ -50,4 +50,4 @@ cp_sta_action_garbage (cp_t *ctx);
END_DECLS
-#endif /* cp2_sta_action_action_h */
+#endif /* cp_sta_action_action_h */
diff --git a/cesar/cp2/sta/action/assoc.h b/cesar/cp/sta/action/assoc.h
index 70524c2989..e608ca6660 100644
--- a/cesar/cp2/sta/action/assoc.h
+++ b/cesar/cp/sta/action/assoc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_assoc_h
-#define cp2_sta_action_assoc_h
+#ifndef cp_sta_action_assoc_h
+#define cp_sta_action_assoc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/assoc.h
+ * \file cp/sta/action/assoc.h
* \brief STA action, association related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Association/disassociation
* ==========================
@@ -109,7 +109,7 @@
* event means that the station has left the AVLN or that the association
* request failed.
*/
-#include "cp2/sta/mgr/net.h"
+#include "cp/sta/mgr/net.h"
BEGIN_DECLS
@@ -311,4 +311,4 @@ cp_sta_action_assoc__leave_wait__timeout (cp_t *ctx);
END_DECLS
-#endif /* cp2_sta_action_assoc_h */
+#endif /* cp_sta_action_assoc_h */
diff --git a/cesar/cp2/sta/action/doc/Makefile b/cesar/cp/sta/action/doc/Makefile
index 8628fca568..8628fca568 100644
--- a/cesar/cp2/sta/action/doc/Makefile
+++ b/cesar/cp/sta/action/doc/Makefile
diff --git a/cesar/cp2/sta/action/doc/assoc.sdl b/cesar/cp/sta/action/doc/assoc.sdl
index 044d23c3e0..044d23c3e0 100644
--- a/cesar/cp2/sta/action/doc/assoc.sdl
+++ b/cesar/cp/sta/action/doc/assoc.sdl
diff --git a/cesar/cp2/sta/action/doc/cp_sta_action.odt b/cesar/cp/sta/action/doc/cp_sta_action.odt
index 0ef32be88e..0ef32be88e 100644
--- a/cesar/cp2/sta/action/doc/cp_sta_action.odt
+++ b/cesar/cp/sta/action/doc/cp_sta_action.odt
Binary files differ
diff --git a/cesar/cp2/sta/action/doc/drv.sdl b/cesar/cp/sta/action/doc/drv.sdl
index d790a4e434..d790a4e434 100644
--- a/cesar/cp2/sta/action/doc/drv.sdl
+++ b/cesar/cp/sta/action/doc/drv.sdl
diff --git a/cesar/cp2/sta/action/doc/poweron.sdl b/cesar/cp/sta/action/doc/poweron.sdl
index a10fd08286..a10fd08286 100644
--- a/cesar/cp2/sta/action/doc/poweron.sdl
+++ b/cesar/cp/sta/action/doc/poweron.sdl
diff --git a/cesar/cp2/sta/action/drv.h b/cesar/cp/sta/action/drv.h
index 0c044fd400..81e525fc2b 100644
--- a/cesar/cp2/sta/action/drv.h
+++ b/cesar/cp/sta/action/drv.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_drv_h
-#define cp2_sta_action_drv_h
+#ifndef cp_sta_action_drv_h
+#define cp_sta_action_drv_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/drv.h
+ * \file cp/sta/action/drv.h
* \brief STA action, driver related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Driver interface
* ================
@@ -185,4 +185,4 @@ cp_sta_action_drv__stopping__left (cp_t *ctx);
END_DECLS
-#endif /* cp2_sta_action_drv_h */
+#endif /* cp_sta_action_drv_h */
diff --git a/cesar/cp2/sta/action/inc/context.h b/cesar/cp/sta/action/inc/context.h
index 8833ab78be..7d58acda84 100644
--- a/cesar/cp2/sta/action/inc/context.h
+++ b/cesar/cp/sta/action/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_inc_context_h
-#define cp2_sta_action_inc_context_h
+#ifndef cp_sta_action_inc_context_h
+#define cp_sta_action_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/sta/action/inc/context.h
+ * \file cp/sta/action/inc/context.h
* \brief STA action context.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
-#include "cp2/secu/secu.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/secu/secu.h"
+#include "cp/sta/mgr/net.h"
/** STA action/assoc sub-context. */
struct cp_sta_action_assoc_t
@@ -47,4 +47,4 @@ struct cp_sta_action_t
};
typedef struct cp_sta_action_t cp_sta_action_t;
-#endif /* cp2_sta_action_inc_context_h */
+#endif /* cp_sta_action_inc_context_h */
diff --git a/cesar/cp2/sta/action/info.h b/cesar/cp/sta/action/info.h
index 9b32fd63d4..74cbd62f95 100644
--- a/cesar/cp2/sta/action/info.h
+++ b/cesar/cp/sta/action/info.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_info_h
-#define cp2_sta_action_info_h
+#ifndef cp_sta_action_info_h
+#define cp_sta_action_info_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/info.h
+ * \file cp/sta/action/info.h
* \brief STA action, information gathering definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Information gathering
* =====================
@@ -50,4 +50,4 @@ cp_sta_action_process_cm_unassociated_sta_ind (cp_t *ctx, cp_mme_rx_t *mme);
END_DECLS
-#endif /* cp2_sta_action_info_h */
+#endif /* cp_sta_action_info_h */
diff --git a/cesar/cp2/sta/action/key.h b/cesar/cp/sta/action/key.h
index 45d3e81afc..4b06d023f4 100644
--- a/cesar/cp2/sta/action/key.h
+++ b/cesar/cp/sta/action/key.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_key_h
-#define cp2_sta_action_key_h
+#ifndef cp_sta_action_key_h
+#define cp_sta_action_key_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/key.h
+ * \file cp/sta/action/key.h
* \brief STA action, key exchange messages.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Key exchanges
* =============
@@ -98,4 +98,4 @@ cp_sta_action_process_cm_get_key_cnf (cp_t *ctx, cp_mme_rx_t *mme);
END_DECLS
-#endif /* cp2_sta_action_key_h */
+#endif /* cp_sta_action_key_h */
diff --git a/cesar/cp2/sta/action/misc.h b/cesar/cp/sta/action/misc.h
index 15430e592c..749e42f6de 100644
--- a/cesar/cp2/sta/action/misc.h
+++ b/cesar/cp/sta/action/misc.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_misc_h
-#define cp2_sta_action_misc_h
+#ifndef cp_sta_action_misc_h
+#define cp_sta_action_misc_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/misc.h
+ * \file cp/sta/action/misc.h
* \brief STA action, miscellaneous definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Miscellaneous
* =============
@@ -80,4 +80,4 @@ cp_sta_action_process_cm_mme_error_ind (cp_t *ctx, cp_mme_rx_t *mme);
END_DECLS
-#endif /* cp2_sta_action_misc_h */
+#endif /* cp_sta_action_misc_h */
diff --git a/cesar/cp2/sta/action/poweron.h b/cesar/cp/sta/action/poweron.h
index 7566636cec..a985cd9587 100644
--- a/cesar/cp2/sta/action/poweron.h
+++ b/cesar/cp/sta/action/poweron.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_action_poweron_h
-#define cp2_sta_action_poweron_h
+#ifndef cp_sta_action_poweron_h
+#define cp_sta_action_poweron_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/poweron.h
+ * \file cp/sta/action/poweron.h
* \brief STA action, power on procedure related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*
* Power-on procedure
* ==================
@@ -27,8 +27,8 @@
*
* Related: 7.1.
*/
-#include "cp2/sta/mgr/net.h"
-#include "cp2/beacon/beacon_desc.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/beacon/beacon_desc.h"
BEGIN_DECLS
@@ -191,4 +191,4 @@ cp_sta_action_poweron__cco__all_sta_leaved (cp_t *ctx);
END_DECLS
-#endif /* cp2_sta_action_poweron_h */
+#endif /* cp_sta_action_poweron_h */
diff --git a/cesar/cp2/sta/action/src/action.c b/cesar/cp/sta/action/src/action.c
index f987320ae7..6c180e21a5 100644
--- a/cesar/cp2/sta/action/src/action.c
+++ b/cesar/cp/sta/action/src/action.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/action.c
+ * \file cp/sta/action/src/action.c
* \brief STA action.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
diff --git a/cesar/cp2/sta/action/src/assoc.c b/cesar/cp/sta/action/src/assoc.c
index 264c79cb03..87bed27aee 100644
--- a/cesar/cp2/sta/action/src/assoc.c
+++ b/cesar/cp/sta/action/src/assoc.c
@@ -6,17 +6,17 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/assoc.c
+ * \file cp/sta/action/src/assoc.c
* \brief STA action, association related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
#include "action.h"
-#include "cp2/inc/context.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/msg/msg.h"
+#include "cp/inc/context.h"
+#include "cp/fsm/fsm.h"
+#include "cp/msg/msg.h"
#include "lib/rnd.h"
void
diff --git a/cesar/cp2/sta/action/src/drv.c b/cesar/cp/sta/action/src/drv.c
index a16174b9e9..4b04f80282 100644
--- a/cesar/cp2/sta/action/src/drv.c
+++ b/cesar/cp/sta/action/src/drv.c
@@ -6,16 +6,16 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/drv.c
+ * \file cp/sta/action/src/drv.c
* \brief STA action, driver related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
#include "action.h"
-#include "cp2/msg/msg.h"
-#include "cp2/inc/context.h"
+#include "cp/msg/msg.h"
+#include "cp/inc/context.h"
void
cp_sta_action_drv__stopped__drv_sta_set_mac_addr_req (cp_t *ctx,
diff --git a/cesar/cp2/sta/action/src/info.c b/cesar/cp/sta/action/src/info.c
index 5483af0014..21702a69ad 100644
--- a/cesar/cp2/sta/action/src/info.c
+++ b/cesar/cp/sta/action/src/info.c
@@ -6,16 +6,16 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/info.c
+ * \file cp/sta/action/src/info.c
* \brief STA action, information gathering definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
#include "action.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta_mgr.h"
#include "lib/slab.h"
void
diff --git a/cesar/cp2/sta/action/src/key.c b/cesar/cp/sta/action/src/key.c
index 3369551aad..b2fa0a843f 100644
--- a/cesar/cp2/sta/action/src/key.c
+++ b/cesar/cp/sta/action/src/key.c
@@ -6,15 +6,15 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/key.c
+ * \file cp/sta/action/src/key.c
* \brief STA action, key exchange messages.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
#include "action.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
void
cp_sta_action_process_cm_set_key_req (cp_t *ctx, cp_mme_rx_t *mme)
diff --git a/cesar/cp2/sta/action/src/misc.c b/cesar/cp/sta/action/src/misc.c
index d3dadcd022..d273cd05a5 100644
--- a/cesar/cp2/sta/action/src/misc.c
+++ b/cesar/cp/sta/action/src/misc.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/misc.c
+ * \file cp/sta/action/src/misc.c
* \brief STA action, miscellaneous definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
diff --git a/cesar/cp2/sta/action/src/poweron.c b/cesar/cp/sta/action/src/poweron.c
index 05d502776d..1c28d6a710 100644
--- a/cesar/cp2/sta/action/src/poweron.c
+++ b/cesar/cp/sta/action/src/poweron.c
@@ -6,21 +6,21 @@
*
* }}} */
/**
- * \file cp2/sta/action/src/poweron.c
+ * \file cp/sta/action/src/poweron.c
* \brief STA action, power on procedure related definitions.
- * \ingroup cp2_sta_action
+ * \ingroup cp_sta_action
*/
#include "common/std.h"
#include "action.h"
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/fsm/fsm.h"
#include "lib/slab.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/* Order of MAC address comparison is reversed to determine who will become
* CCo! As a direct consequence, some manufacturer will always become CCo. */
diff --git a/cesar/cp/sta/action/test/utest/Makefile b/cesar/cp/sta/action/test/utest/Makefile
new file mode 100644
index 0000000000..a4a90eb5e0
--- /dev/null
+++ b/cesar/cp/sta/action/test/utest/Makefile
@@ -0,0 +1,17 @@
+BASE = ../../../../..
+
+INCLUDES = cp/sta/action/test/utest cp/sta/action/test/utest/override
+
+HOST_PROGRAMS = test_sta_action
+test_sta_action_SOURCES = test_sta_action.c assoc.c drv.c info.c key.c \
+ poweron.c \
+ msg_stub.c dataplane_stub.c fsm_stub.c \
+ scenario_actions.c
+test_sta_action_MODULES = lib lib/scenario cp/sta/action cp/sta/mgr \
+ cp/fsm cp/secu
+cp_fsm_MODULE_SOURCES = tables.c
+
+include $(BASE)/common/make/top.mk
+
+$(call src2obj,src/assoc.c,host): $(BASE)/cp/fsm/fsm.h
+$(call src2obj,src/fsm_stub.c,host): $(BASE)/cp/fsm/fsm.h
diff --git a/cesar/cp2/sta/action/test/utest/inc/scenario_defs.h b/cesar/cp/sta/action/test/utest/inc/scenario_defs.h
index baf75beac5..8583f06e9f 100644
--- a/cesar/cp2/sta/action/test/utest/inc/scenario_defs.h
+++ b/cesar/cp/sta/action/test/utest/inc/scenario_defs.h
@@ -13,10 +13,10 @@
* \ingroup test
*/
-#include "cp2/msg/msg.h"
-#include "cp2/sta/mgr/sta.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/msg/msg.h"
+#include "cp/sta/mgr/sta.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/fsm/fsm.h"
/* Scenario globals. */
#define SCENARIO_DEFS_GLOBALS \
diff --git a/cesar/cp2/sta/action/test/utest/inc/test_sta_action.h b/cesar/cp/sta/action/test/utest/inc/test_sta_action.h
index 514d1329e5..ec427e880e 100644
--- a/cesar/cp2/sta/action/test/utest/inc/test_sta_action.h
+++ b/cesar/cp/sta/action/test/utest/inc/test_sta_action.h
@@ -12,7 +12,7 @@
* \brief Test sta/action.
* \ingroup test
*/
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/** Contexts used in tests. */
struct test_sta_action_t
diff --git a/cesar/cp2/sta/action/test/utest/override/cp2/inc/context.h b/cesar/cp/sta/action/test/utest/override/cp2/inc/context.h
index ce288a9c8f..e52e8f0fa5 100644
--- a/cesar/cp2/sta/action/test/utest/override/cp2/inc/context.h
+++ b/cesar/cp/sta/action/test/utest/override/cp2/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef override_cp2_inc_context_h
-#define override_cp2_inc_context_h
+#ifndef override_cp_inc_context_h
+#define override_cp_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,14 +8,14 @@
*
* }}} */
/**
- * \file override/cp2/inc/context.h
+ * \file override/cp/inc/context.h
* \brief Control plane context override.
* \ingroup test
*/
-#include "cp2/types.h"
-#include "cp2/sta/action/inc/context.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/inc/sta_mgr.h"
+#include "cp/types.h"
+#include "cp/sta/action/inc/context.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
#include "cl/cl.h"
#include "mac/common/config.h"
#include "lib/rnd.h"
@@ -29,4 +29,4 @@ struct cp_t
mac_config_t *mac_config;
};
-#endif /* override_cp2_inc_context_h */
+#endif /* override_cp_inc_context_h */
diff --git a/cesar/cp/sta/action/test/utest/override/cp2/sta/core/core.h b/cesar/cp/sta/action/test/utest/override/cp2/sta/core/core.h
new file mode 100644
index 0000000000..2fbf6732a1
--- /dev/null
+++ b/cesar/cp/sta/action/test/utest/override/cp2/sta/core/core.h
@@ -0,0 +1,17 @@
+#ifndef override_cp_sta_core_core_h
+#define override_cp_sta_core_core_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file override/cp/sta/core/core.h
+ * \brief STA core override.
+ * \ingroup test
+ */
+
+
+#endif /* override_cp_sta_core_core_h */
diff --git a/cesar/cp2/sta/action/test/utest/src/assoc.c b/cesar/cp/sta/action/test/utest/src/assoc.c
index 80af57088e..80af57088e 100644
--- a/cesar/cp2/sta/action/test/utest/src/assoc.c
+++ b/cesar/cp/sta/action/test/utest/src/assoc.c
diff --git a/cesar/cp2/sta/action/test/utest/src/dataplane_stub.c b/cesar/cp/sta/action/test/utest/src/dataplane_stub.c
index 2b5b3be62a..2b5b3be62a 100644
--- a/cesar/cp2/sta/action/test/utest/src/dataplane_stub.c
+++ b/cesar/cp/sta/action/test/utest/src/dataplane_stub.c
diff --git a/cesar/cp2/sta/action/test/utest/src/drv.c b/cesar/cp/sta/action/test/utest/src/drv.c
index d87b39d221..d87b39d221 100644
--- a/cesar/cp2/sta/action/test/utest/src/drv.c
+++ b/cesar/cp/sta/action/test/utest/src/drv.c
diff --git a/cesar/cp2/sta/action/test/utest/src/fsm_stub.c b/cesar/cp/sta/action/test/utest/src/fsm_stub.c
index eb5458d64f..c73350d7c5 100644
--- a/cesar/cp2/sta/action/test/utest/src/fsm_stub.c
+++ b/cesar/cp/sta/action/test/utest/src/fsm_stub.c
@@ -11,7 +11,7 @@
* \ingroup test
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
#include "lib/scenario/scenario.h"
diff --git a/cesar/cp2/sta/action/test/utest/src/info.c b/cesar/cp/sta/action/test/utest/src/info.c
index 658920baf0..658920baf0 100644
--- a/cesar/cp2/sta/action/test/utest/src/info.c
+++ b/cesar/cp/sta/action/test/utest/src/info.c
diff --git a/cesar/cp2/sta/action/test/utest/src/key.c b/cesar/cp/sta/action/test/utest/src/key.c
index 340cf7b300..340cf7b300 100644
--- a/cesar/cp2/sta/action/test/utest/src/key.c
+++ b/cesar/cp/sta/action/test/utest/src/key.c
diff --git a/cesar/cp2/sta/action/test/utest/src/msg_stub.c b/cesar/cp/sta/action/test/utest/src/msg_stub.c
index 97afce5b19..cb1f3facb7 100644
--- a/cesar/cp2/sta/action/test/utest/src/msg_stub.c
+++ b/cesar/cp/sta/action/test/utest/src/msg_stub.c
@@ -14,8 +14,8 @@
#include "lib/scenario/scenario.h"
-#include "cp2/inc/context.h"
-#include "cp2/msg/msg.h"
+#include "cp/inc/context.h"
+#include "cp/msg/msg.h"
#include "hal/phy/defs.h"
#include <string.h>
diff --git a/cesar/cp2/sta/action/test/utest/src/poweron.c b/cesar/cp/sta/action/test/utest/src/poweron.c
index 6010d6b02d..6010d6b02d 100644
--- a/cesar/cp2/sta/action/test/utest/src/poweron.c
+++ b/cesar/cp/sta/action/test/utest/src/poweron.c
diff --git a/cesar/cp2/sta/action/test/utest/src/scenario_actions.c b/cesar/cp/sta/action/test/utest/src/scenario_actions.c
index a539f1532f..525c0e0e7f 100644
--- a/cesar/cp2/sta/action/test/utest/src/scenario_actions.c
+++ b/cesar/cp/sta/action/test/utest/src/scenario_actions.c
@@ -12,7 +12,7 @@
*/
#include "common/std.h"
-#include "cp2/sta/action/action.h"
+#include "cp/sta/action/action.h"
#include "lib/scenario/scenario.h"
diff --git a/cesar/cp2/sta/action/test/utest/src/test_sta_action.c b/cesar/cp/sta/action/test/utest/src/test_sta_action.c
index a8029bb2f0..a8029bb2f0 100644
--- a/cesar/cp2/sta/action/test/utest/src/test_sta_action.c
+++ b/cesar/cp/sta/action/test/utest/src/test_sta_action.c
diff --git a/cesar/cp2/sta/core/Module b/cesar/cp/sta/core/Module
index 2230bcc543..2230bcc543 100644
--- a/cesar/cp2/sta/core/Module
+++ b/cesar/cp/sta/core/Module
diff --git a/cesar/cp2/sta/core/core.h b/cesar/cp/sta/core/core.h
index e5e6e69d7e..9988a2fb15 100644
--- a/cesar/cp2/sta/core/core.h
+++ b/cesar/cp/sta/core/core.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_core_core_h
-#define cp2_sta_core_core_h
+#ifndef cp_sta_core_core_h
+#define cp_sta_core_core_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/core/core.h
+ * \file cp/sta/core/core.h
* \brief STA core.
- * \ingroup cp2_sta
+ * \ingroup cp_sta
*
* station core module implements following elements and functionalities
* *CP thread
@@ -38,9 +38,9 @@
* timer callback function for each sort of timer
* API function to put a FSM event in the FSM event FIFO.
*/
-#include "cp2/types.h"
+#include "cp/types.h"
-#include "cp2/sta/core/defs.h"
+#include "cp/sta/core/defs.h"
BEGIN_DECLS
@@ -150,4 +150,4 @@ cp_sta_core_get_date_ms (cp_t *ctx);
END_DECLS
-#endif /* cp2_sta_core_core_h */
+#endif /* cp_sta_core_core_h */
diff --git a/cesar/cp2/sta/core/defs.h b/cesar/cp/sta/core/defs.h
index 08c43afdbf..4a3c3937e6 100644
--- a/cesar/cp2/sta/core/defs.h
+++ b/cesar/cp/sta/core/defs.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_core_defs_h
-#define cp2_sta_core_defs_h
+#ifndef cp_sta_core_defs_h
+#define cp_sta_core_defs_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,13 +8,13 @@
*
* }}} */
/**
- * \file cp2/sta/core/defs.h
+ * \file cp/sta/core/defs.h
* \brief Sta core defs.
- * \ingroup cp2/sta/core
+ * \ingroup cp/sta/core
*
*/
#include <cyg/kernel/kapi.h>
-#include "cp2/fsm/forward.h"
+#include "cp/fsm/forward.h"
/** Forward declaration. */
typedef struct cp_sta_core_t cp_sta_core_t;
@@ -55,4 +55,4 @@ struct cp_sta_core_timed_event_def_t
};
typedef struct cp_sta_core_timed_event_def_t cp_sta_core_timed_event_def_t;
-#endif /* cp2_sta_core_defs_h */
+#endif /* cp_sta_core_defs_h */
diff --git a/cesar/cp2/sta/core/doc/sta_core.odt b/cesar/cp/sta/core/doc/sta_core.odt
index 4f24aff8f0..4f24aff8f0 100644
--- a/cesar/cp2/sta/core/doc/sta_core.odt
+++ b/cesar/cp/sta/core/doc/sta_core.odt
Binary files differ
diff --git a/cesar/cp2/sta/core/doc/sta_core.xmi b/cesar/cp/sta/core/doc/sta_core.xmi
index 763cab4568..763cab4568 100644
--- a/cesar/cp2/sta/core/doc/sta_core.xmi
+++ b/cesar/cp/sta/core/doc/sta_core.xmi
diff --git a/cesar/cp2/sta/core/inc/core.h b/cesar/cp/sta/core/inc/core.h
index 4bf3788a55..233061fbc3 100644
--- a/cesar/cp2/sta/core/inc/core.h
+++ b/cesar/cp/sta/core/inc/core.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_core_inc_core_h
-#define cp2_sta_core_inc_core_h
+#ifndef cp_sta_core_inc_core_h
+#define cp_sta_core_inc_core_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/core/inc/core.h
+ * \file cp/sta/core/inc/core.h
* \brief STA core.
- * \ingroup cp2_sta
+ * \ingroup cp_sta
*
* station core module implements following elements and functionalities
* *CP thread
@@ -41,12 +41,12 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/core/defs.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/core/defs.h"
-#include "cp2/fsm/forward.h"
+#include "cp/fsm/forward.h"
-#include "cp2/types.h"
+#include "cp/types.h"
/** cp sta core thread name string. */
#define CP_STA_CORE_THREAD_NAME "STA_CORE"
@@ -348,4 +348,4 @@ cp_sta_core_cp_thread(cyg_addrword_t data);
END_DECLS
-#endif /* cp2_sta_core_inc_core_h */
+#endif /* cp_sta_core_inc_core_h */
diff --git a/cesar/cp2/sta/core/src/core.c b/cesar/cp/sta/core/src/core.c
index 72b19fb44a..f9510510b8 100644
--- a/cesar/cp2/sta/core/src/core.c
+++ b/cesar/cp/sta/core/src/core.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/core/src/core.c
+ * \file cp/sta/core/src/core.c
* \brief STA core.
- * \ingroup cp2_sta
+ * \ingroup cp_sta
*
* station core module implements following elements and functionalities
* *CP thread
@@ -37,21 +37,21 @@
* API function to put a FSM event in the FSM event FIFO.
*/
#include "common/std.h"
-#include "cp2/types.h"
+#include "cp/types.h"
-#include "cp2/inc/context.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/inc/context.h"
+#include "cp/fsm/fsm.h"
#include "cp_fsm_defs.h"
-#include "cp2/sta/core/defs.h"
+#include "cp/sta/core/defs.h"
-#include "cp2/cl_interf/cl_interf.h"
-#include "cp2/sta/action/action.h"
-#include "cp2/cco/action/cco_action.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/cl_interf/cl_interf.h"
+#include "cp/sta/action/action.h"
+#include "cp/cco/action/cco_action.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/pwl/pwl.h"
-#include "cp2/sta/core/inc/core.h"
+#include "cp/sta/core/inc/core.h"
/** array of cp sta core events/actions. */
static const cp_sta_core_event_action_t cp_sta_core_event_action[] =
diff --git a/cesar/cp2/sta/core/test/Makefile b/cesar/cp/sta/core/test/Makefile
index 1e3e38f9e6..e8eeec55f8 100644
--- a/cesar/cp2/sta/core/test/Makefile
+++ b/cesar/cp/sta/core/test/Makefile
@@ -3,19 +3,19 @@ BASE = ../../../..
DEFS = -DSTA_CORE_UNIT_TEST=1
ECOS = y
-INCLUDES = cp2/sta/core/test/override
+INCLUDES = cp/sta/core/test/override
TARGET_PROGRAMS = core_events core core_thread
core_events_SOURCES = core_events.c fsm_stub.c cp_cl_interf_stub.c action_stub.c \
cco_action_stub.c sta_mgr_stub.c pwl_stub.c beacon_stub.c
-core_events_MODULES = lib cp2/sta/core
+core_events_MODULES = lib cp/sta/core
core_SOURCES = core.c cp_cl_interf_stub.c action_stub.c \
cco_action_stub.c sta_mgr_stub.c pwl_stub.c beacon_stub.c
-core_MODULES = lib cp2/sta/core
+core_MODULES = lib cp/sta/core
core_thread_SOURCES = core_thread.c
-core_thread_MODULES = lib cp2/sta/core
+core_thread_MODULES = lib cp/sta/core
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/sta/core/test/ecos.ecc.sh b/cesar/cp/sta/core/test/ecos.ecc.sh
index 2443d0e40f..2443d0e40f 100644
--- a/cesar/cp2/sta/core/test/ecos.ecc.sh
+++ b/cesar/cp/sta/core/test/ecos.ecc.sh
diff --git a/cesar/cp2/sta/core/test/override/cp2/inc/context.h b/cesar/cp/sta/core/test/override/cp2/inc/context.h
index 6aee74ab18..bee6fa2e00 100644
--- a/cesar/cp2/sta/core/test/override/cp2/inc/context.h
+++ b/cesar/cp/sta/core/test/override/cp2/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef override_cp2_cp_h
-#define override_cp2_cp_h
+#ifndef override_cp_cp_h
+#define override_cp_cp_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,20 +8,20 @@
*
* }}} */
/**
- * \file override/cp2/cp.h
+ * \file override/cp/cp.h
* \brief « brief description »
* \ingroup « module »
*
* « long description »
*/
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/core/inc/core.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/core/inc/core.h"
-#include "cp2/sta/core/defs.h"
+#include "cp/sta/core/defs.h"
struct cp_t
{
cp_sta_core_t sta_core;
};
-#endif /* override_cp2_cp_h */
+#endif /* override_cp_cp_h */
diff --git a/cesar/cp2/sta/core/test/override/cp_fsm_defs.h b/cesar/cp/sta/core/test/override/cp_fsm_defs.h
index e8364b6da9..e8364b6da9 100644
--- a/cesar/cp2/sta/core/test/override/cp_fsm_defs.h
+++ b/cesar/cp/sta/core/test/override/cp_fsm_defs.h
diff --git a/cesar/cp2/sta/core/test/src/action_stub.c b/cesar/cp/sta/core/test/src/action_stub.c
index 98e3eaecd9..066c0815bf 100644
--- a/cesar/cp2/sta/core/test/src/action_stub.c
+++ b/cesar/cp/sta/core/test/src/action_stub.c
@@ -14,7 +14,7 @@
*/
#include "common/std.h"
-#include "cp2/sta/action/action.h"
+#include "cp/sta/action/action.h"
void
cp_sta_action_garbage (cp_t *ctx)
diff --git a/cesar/cp2/sta/core/test/src/beacon_stub.c b/cesar/cp/sta/core/test/src/beacon_stub.c
index 490079ad9b..d91490f6c4 100644
--- a/cesar/cp2/sta/core/test/src/beacon_stub.c
+++ b/cesar/cp/sta/core/test/src/beacon_stub.c
@@ -14,7 +14,7 @@
*/
#include "common/std.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
void
cp_beacon_get_and_process_beacon(cp_t *ctx)
diff --git a/cesar/cp2/sta/core/test/src/cco_action_stub.c b/cesar/cp/sta/core/test/src/cco_action_stub.c
index 9edc112ace..cc9c9d988c 100644
--- a/cesar/cp2/sta/core/test/src/cco_action_stub.c
+++ b/cesar/cp/sta/core/test/src/cco_action_stub.c
@@ -14,8 +14,8 @@
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/cco/action/cco_action.h"
+#include "cp/cp.h"
+#include "cp/cco/action/cco_action.h"
/**
* perform garbage actions of CCo's responsibility.
diff --git a/cesar/cp2/sta/core/test/src/core.c b/cesar/cp/sta/core/test/src/core.c
index ca6cb605d8..b80be01f74 100644
--- a/cesar/cp2/sta/core/test/src/core.c
+++ b/cesar/cp/sta/core/test/src/core.c
@@ -20,12 +20,12 @@
#include "lib/test.h"
#include "lib/blk.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/core/inc/core.h"
-#include "cp2/fsm/forward.h"
-#include "cp2/fsm/inc/events.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/core/inc/core.h"
+#include "cp/fsm/forward.h"
+#include "cp/fsm/inc/events.h"
static cp_t ctx;
diff --git a/cesar/cp2/sta/core/test/src/core_events.c b/cesar/cp/sta/core/test/src/core_events.c
index bf8d418853..52654daa70 100644
--- a/cesar/cp2/sta/core/test/src/core_events.c
+++ b/cesar/cp/sta/core/test/src/core_events.c
@@ -20,10 +20,10 @@
#include "lib/test.h"
#include "lib/blk.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/core/inc/core.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/core/inc/core.h"
void
test_case_sta_core_init (test_t test)
diff --git a/cesar/cp2/sta/core/test/src/core_thread.c b/cesar/cp/sta/core/test/src/core_thread.c
index e86a3286cc..f53a24236e 100644
--- a/cesar/cp2/sta/core/test/src/core_thread.c
+++ b/cesar/cp/sta/core/test/src/core_thread.c
@@ -20,10 +20,10 @@
#include "lib/test.h"
#include "lib/blk.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/core/core.h"
-#include "cp2/sta/core/inc/core.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
+#include "cp/sta/core/core.h"
+#include "cp/sta/core/inc/core.h"
#include <stdio.h>
diff --git a/cesar/cp2/sta/core/test/src/cp_cl_interf_stub.c b/cesar/cp/sta/core/test/src/cp_cl_interf_stub.c
index ebd70f518a..648e0ad562 100644
--- a/cesar/cp2/sta/core/test/src/cp_cl_interf_stub.c
+++ b/cesar/cp/sta/core/test/src/cp_cl_interf_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
/**
* Process the MME received.
diff --git a/cesar/cp2/sta/core/test/src/fsm_stub.c b/cesar/cp/sta/core/test/src/fsm_stub.c
index b0bf917865..f09c0a954b 100644
--- a/cesar/cp2/sta/core/test/src/fsm_stub.c
+++ b/cesar/cp/sta/core/test/src/fsm_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/fsm/fsm.h"
+#include "cp/fsm/fsm.h"
#include "lib/slab.h"
static cp_fsm_event_t fsm_event;
diff --git a/cesar/cp2/sta/core/test/src/pwl_stub.c b/cesar/cp/sta/core/test/src/pwl_stub.c
index b9857a777d..00cc105b33 100644
--- a/cesar/cp2/sta/core/test/src/pwl_stub.c
+++ b/cesar/cp/sta/core/test/src/pwl_stub.c
@@ -14,8 +14,8 @@
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/pwl/pwl.h"
+#include "cp/cp.h"
+#include "cp/pwl/pwl.h"
void
cp_pwl_acl_frequency_detection (cp_t *ctx)
diff --git a/cesar/cp2/sta/core/test/src/sta_mgr_stub.c b/cesar/cp/sta/core/test/src/sta_mgr_stub.c
index 43bd84497d..e0c4408420 100644
--- a/cesar/cp2/sta/core/test/src/sta_mgr_stub.c
+++ b/cesar/cp/sta/core/test/src/sta_mgr_stub.c
@@ -14,8 +14,8 @@
*/
#include "common/std.h"
-#include "cp2/cp.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/cp.h"
+#include "cp/sta/mgr/sta_mgr.h"
/**
* Call all the sub garbage functions.
diff --git a/cesar/cp2/sta/mgr/Module b/cesar/cp/sta/mgr/Module
index 2a089a7fad..2a089a7fad 100644
--- a/cesar/cp2/sta/mgr/Module
+++ b/cesar/cp/sta/mgr/Module
diff --git a/cesar/cp2/sta/mgr/doc/sta_manager.odt b/cesar/cp/sta/mgr/doc/sta_manager.odt
index 204a5033c2..204a5033c2 100644
--- a/cesar/cp2/sta/mgr/doc/sta_manager.odt
+++ b/cesar/cp/sta/mgr/doc/sta_manager.odt
Binary files differ
diff --git a/cesar/cp2/sta/mgr/doc/sta_mgr.xmi b/cesar/cp/sta/mgr/doc/sta_mgr.xmi
index 446d866268..446d866268 100644
--- a/cesar/cp2/sta/mgr/doc/sta_mgr.xmi
+++ b/cesar/cp/sta/mgr/doc/sta_mgr.xmi
diff --git a/cesar/cp2/sta/mgr/inc/net.h b/cesar/cp/sta/mgr/inc/net.h
index 33252d5445..6fcd5148a7 100644
--- a/cesar/cp2/sta/mgr/inc/net.h
+++ b/cesar/cp/sta/mgr/inc/net.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_inc_net
-#define cp2_sta_mgr_inc_net
+#ifndef cp_sta_mgr_inc_net
+#define cp_sta_mgr_inc_net
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,9 +8,9 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/inc/net.h
+ * \file cp/sta/mgr/inc/net.h
* \brief Private Network data.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
* Get all the data about an AVLN.
*
@@ -124,4 +124,4 @@ void
cp_net_garbage_station_list (cp_t *ctx, cp_net_t *net, u32 date_ms,
enum cp_sta_state_t status);
-#endif /* cp2_sta_mgr_inc_net */
+#endif /* cp_sta_mgr_inc_net */
diff --git a/cesar/cp2/sta/mgr/inc/net_list.h b/cesar/cp/sta/mgr/inc/net_list.h
index b379bdd79a..307e2d3c27 100644
--- a/cesar/cp2/sta/mgr/inc/net_list.h
+++ b/cesar/cp/sta/mgr/inc/net_list.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_inc_net_list_h
-#define cp2_sta_mgr_inc_net_list_h
+#ifndef cp_sta_mgr_inc_net_list_h
+#define cp_sta_mgr_inc_net_list_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,18 +8,18 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/inc/net_list_h
+ * \file cp/sta/mgr/inc/net_list_h
* \brief Private interface of the net list.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
* « long description »
*/
-#include "cp2/sta/mgr/net_list.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/sta/mgr/net_list.h"
+#include "cp/sta/mgr/net.h"
/* Private interfaces. */
-#include "cp2/sta/mgr/inc/net.h"
+#include "cp/sta/mgr/inc/net.h"
/** Number of AVLNs. */
#define CP_NET_LIST_NB_AVLN 8
@@ -32,4 +32,4 @@ struct cp_net_list_t
cp_net_t networks [8];
};
-#endif /* cp2_sta_mgr_inc_net_list_h */
+#endif /* cp_sta_mgr_inc_net_list_h */
diff --git a/cesar/cp2/sta/mgr/inc/sta.h b/cesar/cp/sta/mgr/inc/sta.h
index f4a083ecbd..d42f4d49c3 100644
--- a/cesar/cp2/sta/mgr/inc/sta.h
+++ b/cesar/cp/sta/mgr/inc/sta.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_inc_sta_h
-#define cp2_sta_mgr_inc_sta_h
+#ifndef cp_sta_mgr_inc_sta_h
+#define cp_sta_mgr_inc_sta_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,14 +8,14 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/inc/sta.h
+ * \file cp/sta/mgr/inc/sta.h
* \brief Stations data.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
* « long description »
*/
-#include "cp2/sta/mgr/sta.h"
+#include "cp/sta/mgr/sta.h"
/**
* Control plane station.
@@ -74,4 +74,4 @@ void
cp_sta_uninit (cp_sta_t *sta);
-#endif /* cp2_sta_mgr_inc_sta_h */
+#endif /* cp_sta_mgr_inc_sta_h */
diff --git a/cesar/cp2/sta/mgr/inc/sta_mgr.h b/cesar/cp/sta/mgr/inc/sta_mgr.h
index de4f4c92f1..1fc3788fde 100644
--- a/cesar/cp2/sta/mgr/inc/sta_mgr.h
+++ b/cesar/cp/sta/mgr/inc/sta_mgr.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_inc_context_h
-#define cp2_sta_mgr_inc_context_h
+#ifndef cp_sta_mgr_inc_context_h
+#define cp_sta_mgr_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,16 +8,16 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/inc/context.h
+ * \file cp/sta/mgr/inc/context.h
* \brief Station manager context.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
-#include "cp2/sta/mgr/net_list.h"
+#include "cp/sta/mgr/net_list.h"
/* Private interfaces. */
-#include "cp2/sta/mgr/inc/net_list.h"
-#include "cp2/sta/mgr/inc/sta_own_data.h"
+#include "cp/sta/mgr/inc/net_list.h"
+#include "cp/sta/mgr/inc/sta_own_data.h"
struct cp_sta_mgr_t
{
@@ -29,4 +29,4 @@ struct cp_sta_mgr_t
};
-#endif /* cp2_sta_mgr_inc_context_h */
+#endif /* cp_sta_mgr_inc_context_h */
diff --git a/cesar/cp2/sta/mgr/inc/sta_own_data.h b/cesar/cp/sta/mgr/inc/sta_own_data.h
index c5964ffc6e..fe80cc491d 100644
--- a/cesar/cp2/sta/mgr/inc/sta_own_data.h
+++ b/cesar/cp/sta/mgr/inc/sta_own_data.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_data_inc_sta_own_data_h
-#define cp2_sta_data_inc_sta_own_data_h
+#ifndef cp_sta_data_inc_sta_own_data_h
+#define cp_sta_data_inc_sta_own_data_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,15 +8,15 @@
*
* }}} */
/**
- * \file cp2/sta/data/inc/sta_own_data.h
+ * \file cp/sta/data/inc/sta_own_data.h
* \brief Station own data.
- * \ingroup cp2_sta_data
+ * \ingroup cp_sta_data
*
*/
-#include "cp2/defs.h"
+#include "cp/defs.h"
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_own_data.h"
/**
* Station own data.
@@ -79,4 +79,4 @@ void
cp_sta_own_data_set_hfid (const char *hfid, const char *data);
-#endif /* cp2_sta_data_inc_sta_own_data_h */
+#endif /* cp_sta_data_inc_sta_own_data_h */
diff --git a/cesar/cp2/sta/mgr/net.h b/cesar/cp/sta/mgr/net.h
index 08bb50b999..ff4709d31f 100644
--- a/cesar/cp2/sta/mgr/net.h
+++ b/cesar/cp/sta/mgr/net.h
@@ -8,15 +8,15 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/net.h
+ * \file cp/sta/mgr/net.h
* \brief Network data.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
* Get all the data about an AVLN.
*/
-#include "cp2/cp.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/cp.h"
+#include "cp/sta/mgr/sta.h"
enum cp_net_network_mode_t
{
diff --git a/cesar/cp2/sta/mgr/net_list.h b/cesar/cp/sta/mgr/net_list.h
index 5a50cef912..93d83a150a 100644
--- a/cesar/cp2/sta/mgr/net_list.h
+++ b/cesar/cp/sta/mgr/net_list.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_net_list_h
-#define cp2_sta_mgr_net_list_h
+#ifndef cp_sta_mgr_net_list_h
+#define cp_sta_mgr_net_list_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,14 +8,14 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/net_list_h
+ * \file cp/sta/mgr/net_list_h
* \brief Public interface for the net list.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
-#include "cp2/types.h"
+#include "cp/types.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/sta/mgr/net.h"
/** Forward declaration. */
typedef struct cp_net_list_t cp_net_list_t;
@@ -155,4 +155,4 @@ cp_net_list_get_num_discovered_stas (cp_t *ctx, cp_net_list_t *network);
u8
cp_net_list_get_num_discovered_net (cp_t *ctx, cp_net_list_t *network);
-#endif /* cp2_sta_mgr_net_list_h */
+#endif /* cp_sta_mgr_net_list_h */
diff --git a/cesar/cp2/sta/mgr/src/net.c b/cesar/cp/sta/mgr/src/net.c
index c92ddcbb40..6865d26a85 100644
--- a/cesar/cp2/sta/mgr/src/net.c
+++ b/cesar/cp/sta/mgr/src/net.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/src/net.c
+ * \file cp/sta/mgr/src/net.c
* \brief Network APIs.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
@@ -20,16 +20,16 @@
#include "mac/common/ntb.h"
#include "mac/common/timings.h"
-#include "cp2/defs.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/sta.h"
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/defs.h"
+#include "cp/fsm/fsm.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/sta.h"
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_mgr.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/mgr/inc/net.h"
-#include "cp2/sta/mgr/inc/sta.h"
+#include "cp/inc/context.h"
+#include "cp/sta/mgr/inc/net.h"
+#include "cp/sta/mgr/inc/sta.h"
/**
* Station Associated lesser.
diff --git a/cesar/cp2/sta/mgr/src/net_list.c b/cesar/cp/sta/mgr/src/net_list.c
index 6552e541b8..33ffa8bce3 100644
--- a/cesar/cp2/sta/mgr/src/net_list.c
+++ b/cesar/cp/sta/mgr/src/net_list.c
@@ -6,18 +6,18 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/src/net_list.c
+ * \file cp/sta/mgr/src/net_list.c
* \brief Network list manager.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
#include "mac/common/timings.h"
-#include "cp2/defs.h"
-#include "cp2/sta/mgr/net_list.h"
+#include "cp/defs.h"
+#include "cp/sta/mgr/net_list.h"
-#include "cp2/sta/mgr/inc/net_list.h"
+#include "cp/sta/mgr/inc/net_list.h"
/**
* Initialise the lists.
diff --git a/cesar/cp2/sta/mgr/src/sta.c b/cesar/cp/sta/mgr/src/sta.c
index 043b920839..109650d93e 100644
--- a/cesar/cp2/sta/mgr/src/sta.c
+++ b/cesar/cp/sta/mgr/src/sta.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/src/sta.c
+ * \file cp/sta/mgr/src/sta.c
* \brief Station API implementation.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
@@ -16,9 +16,9 @@
#include "lib/blk.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/sta/mgr/sta.h"
-#include "cp2/sta/mgr/inc/sta.h"
+#include "cp/sta/mgr/inc/sta.h"
/**
* Return a station object initialised.
diff --git a/cesar/cp2/sta/mgr/src/sta_mgr.c b/cesar/cp/sta/mgr/src/sta_mgr.c
index c001a39cc9..98dbbf8986 100644
--- a/cesar/cp2/sta/mgr/src/sta_mgr.c
+++ b/cesar/cp/sta/mgr/src/sta_mgr.c
@@ -6,26 +6,26 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/src/sta_mgr.c
+ * \file cp/sta/mgr/src/sta_mgr.c
* \brief Station manager source.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
-#include "cp2/defs.h"
-#include "cp2/cp.h"
-#include "cp2/fsm/fsm.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/net_list.h"
-#include "cp2/sta/mgr/sta_own_data.h"
-#include "cp2/sta/core/core.h"
+#include "cp/defs.h"
+#include "cp/cp.h"
+#include "cp/fsm/fsm.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/net_list.h"
+#include "cp/sta/mgr/sta_own_data.h"
+#include "cp/sta/core/core.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/mgr/inc/sta_mgr.h"
-#include "cp2/sta/mgr/inc/net_list.h"
-#include "cp2/sta/mgr/inc/sta_own_data.h"
+#include "cp/inc/context.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
+#include "cp/sta/mgr/inc/net_list.h"
+#include "cp/sta/mgr/inc/sta_own_data.h"
/**
* Initialise the sta manager.
diff --git a/cesar/cp2/sta/mgr/src/sta_own_data.c b/cesar/cp/sta/mgr/src/sta_own_data.c
index 4f9d845505..e4b1f54861 100644
--- a/cesar/cp2/sta/mgr/src/sta_own_data.c
+++ b/cesar/cp/sta/mgr/src/sta_own_data.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file cp2/sta/data/src/sta_own_data.c
+ * \file cp/sta/data/src/sta_own_data.c
* \brief Station data source.
- * \ingroup cp2_sta_data
+ * \ingroup cp_sta_data
*
*/
#include "common/std.h"
@@ -18,11 +18,11 @@
#include "lib/bitstream.h"
/* Public interfaces. */
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_own_data.h"
/* Private interfaces. */
-#include "cp2/inc/context.h"
-#include "cp2/sta/mgr/inc/sta_own_data.h"
+#include "cp/inc/context.h"
+#include "cp/sta/mgr/inc/sta_own_data.h"
/**
* Initialise the station own data to default values.
diff --git a/cesar/cp2/sta/mgr/sta.h b/cesar/cp/sta/mgr/sta.h
index 49b4afbf7e..cf15b12ff6 100644
--- a/cesar/cp2/sta/mgr/sta.h
+++ b/cesar/cp/sta/mgr/sta.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_mgr_sta_h
-#define cp2_sta_mgr_sta_h
+#ifndef cp_sta_mgr_sta_h
+#define cp_sta_mgr_sta_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,14 +8,14 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/sta.h
+ * \file cp/sta/mgr/sta.h
* \brief Stations data.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "lib/set.h"
-#include "cp2/types.h"
-#include "cp2/mme.h"
+#include "cp/types.h"
+#include "cp/mme.h"
/** Enum. */
enum cp_sta_state_t
@@ -212,4 +212,4 @@ cp_sta_get_pco_glid (cp_sta_t *ctx);
void
cp_sta_set_pco_glid (cp_sta_t *ctx, u8 glid);
-#endif /* cp2_sta_mgr_sta_h */
+#endif /* cp_sta_mgr_sta_h */
diff --git a/cesar/cp2/sta/mgr/sta_mgr.h b/cesar/cp/sta/mgr/sta_mgr.h
index 6a3af39bc4..74e108e4e2 100644
--- a/cesar/cp2/sta/mgr/sta_mgr.h
+++ b/cesar/cp/sta/mgr/sta_mgr.h
@@ -8,14 +8,14 @@
*
* }}} */
/**
- * \file cp2/sta/mgr/sta_mgr.h
+ * \file cp/sta/mgr/sta_mgr.h
* \brief Station Manager.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
* Station and AVLN manager.
*/
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/sta_own_data.h"
/* Forward declaration. */
typedef struct cp_sta_mgr_t cp_sta_mgr_t;
diff --git a/cesar/cp2/sta/mgr/sta_own_data.h b/cesar/cp/sta/mgr/sta_own_data.h
index 5bd467c128..2a1fdad365 100644
--- a/cesar/cp2/sta/mgr/sta_own_data.h
+++ b/cesar/cp/sta/mgr/sta_own_data.h
@@ -1,5 +1,5 @@
-#ifndef cp2_sta_data_sta_own_data_h
-#define cp2_sta_data_sta_own_data_h
+#ifndef cp_sta_data_sta_own_data_h
+#define cp_sta_data_sta_own_data_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,16 +8,16 @@
*
* }}} */
/**
- * \file cp2/sta/data/sta_own_data.h
+ * \file cp/sta/data/sta_own_data.h
* \brief Station own data.
- * \ingroup cp2_sta_data
+ * \ingroup cp_sta_data
*
*/
-#include "cp2/defs.h"
-#include "cp2/cp.h"
+#include "cp/defs.h"
+#include "cp/cp.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/sta/mgr/sta.h"
#include <string.h>
@@ -298,4 +298,4 @@ cp_sta_own_data_get_pco_status (cp_t *ctx);
void
cp_sta_own_data_set_pco_status (cp_t *ctx, bool pco);
-#endif /* cp2_sta_data_sta_own_data_h */
+#endif /* cp_sta_data_sta_own_data_h */
diff --git a/cesar/cp2/sta/mgr/test/Makefile b/cesar/cp/sta/mgr/test/Makefile
index 1928f7a782..07651e2b9e 100644
--- a/cesar/cp2/sta/mgr/test/Makefile
+++ b/cesar/cp/sta/mgr/test/Makefile
@@ -1,22 +1,22 @@
BASE = ../../../..
-INCLUDES = cp2/sta/mgr/test/overide
+INCLUDES = cp/sta/mgr/test/overide
HOST_PROGRAMS = station_test net_test net_list_test sta_mgr_test sta_own
station_test_SOURCES = station_test.c core_stub.c cl_stub.c fsm_stub.c
-station_test_MODULES = lib cp2/sta/mgr
+station_test_MODULES = lib cp/sta/mgr
net_test_SOURCES = net_test.c cl_stub.c core_stub.c fsm_stub.c
-net_test_MODULES = lib cp2/sta/mgr mac/common
+net_test_MODULES = lib cp/sta/mgr mac/common
net_list_test_SOURCES= net_list_test.c cl_stub.c core_stub.c fsm_stub.c
-net_list_test_MODULES= lib cp2/sta/mgr mac/common
+net_list_test_MODULES= lib cp/sta/mgr mac/common
sta_mgr_test_SOURCES= sta_mgr_test.c cl_stub.c core_stub.c fsm_stub.c
-sta_mgr_test_MODULES= lib cp2/sta/mgr mac/common
+sta_mgr_test_MODULES= lib cp/sta/mgr mac/common
sta_own_SOURCES= sta-test.c core_stub.c cl_stub.c fsm_stub.c
-sta_own_MODULES= lib cp2/sta/mgr mac/common
+sta_own_MODULES= lib cp/sta/mgr mac/common
include $(BASE)/common/make/top.mk
diff --git a/cesar/cp2/sta/mgr/test/doc/Makefile b/cesar/cp/sta/mgr/test/doc/Makefile
index 25c6b6b03d..25c6b6b03d 100644
--- a/cesar/cp2/sta/mgr/test/doc/Makefile
+++ b/cesar/cp/sta/mgr/test/doc/Makefile
diff --git a/cesar/cp2/sta/mgr/test/doc/net.txt b/cesar/cp/sta/mgr/test/doc/net.txt
index 3424c2ba52..3424c2ba52 100644
--- a/cesar/cp2/sta/mgr/test/doc/net.txt
+++ b/cesar/cp/sta/mgr/test/doc/net.txt
diff --git a/cesar/cp2/sta/mgr/test/doc/net_list.txt b/cesar/cp/sta/mgr/test/doc/net_list.txt
index 7d067bc662..758b4754b5 100644
--- a/cesar/cp2/sta/mgr/test/doc/net_list.txt
+++ b/cesar/cp/sta/mgr/test/doc/net_list.txt
@@ -10,7 +10,7 @@ Shall initialise all the networks list (index greater than 1, the index 0 corres
- nid = 0
- cco = null
- pco = null
- - expiration_ntb = CP_NET_EXPIRATION_DELAY (see defs file in cp2)
+ - expiration_ntb = CP_NET_EXPIRATION_DELAY (see defs file in cp)
- associated_stas shall be empty.
- unssociated_stas shall be empty.
@@ -59,7 +59,7 @@ The AVLN returned by the add function shall be in the following state:
- station_avln = false
- cco = null
- pco = null
- - expiration_ntb = CP_NET_EXPIRATION_DELAY (see cp2/defs.h)
+ - expiration_ntb = CP_NET_EXPIRATION_DELAY (see cp/defs.h)
- associated_stas = empty (use set_empty function).
- unassociated_stas = empty (use set_empty function).
diff --git a/cesar/cp2/sta/mgr/test/doc/sta.txt b/cesar/cp/sta/mgr/test/doc/sta.txt
index e711621277..e711621277 100644
--- a/cesar/cp2/sta/mgr/test/doc/sta.txt
+++ b/cesar/cp/sta/mgr/test/doc/sta.txt
diff --git a/cesar/cp2/sta/mgr/test/doc/sta_mgr.txt b/cesar/cp/sta/mgr/test/doc/sta_mgr.txt
index 6fcf407725..6fcf407725 100644
--- a/cesar/cp2/sta/mgr/test/doc/sta_mgr.txt
+++ b/cesar/cp/sta/mgr/test/doc/sta_mgr.txt
diff --git a/cesar/cp2/sta/mgr/test/doc/sta_own_data.txt b/cesar/cp/sta/mgr/test/doc/sta_own_data.txt
index ab302bcdd0..ab302bcdd0 100644
--- a/cesar/cp2/sta/mgr/test/doc/sta_own_data.txt
+++ b/cesar/cp/sta/mgr/test/doc/sta_own_data.txt
diff --git a/cesar/cp2/sta/mgr/test/overide/cp2/inc/context.h b/cesar/cp/sta/mgr/test/overide/cp2/inc/context.h
index 1a8cb1cdaa..8d813b42f4 100644
--- a/cesar/cp2/sta/mgr/test/overide/cp2/inc/context.h
+++ b/cesar/cp/sta/mgr/test/overide/cp2/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef cp2_inc_cp_h
-#define cp2_inc_cp_h
+#ifndef cp_inc_cp_h
+#define cp_inc_cp_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,20 +8,20 @@
*
* }}} */
/**
- * \file cp2/inc/cp_private.h
+ * \file cp/inc/cp_private.h
* \brief Control plane context.
- * \ingroup cp2
+ * \ingroup cp
*
*/
#include "lib/rnd.h"
/* Public interfaces. */
-#include "cp2/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/sta_mgr.h"
#include "cl/cl.h"
#include "mac/common/config.h"
/* Private interfaces. */
-#include "cp2/sta/mgr/inc/sta_mgr.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
struct cp_t
{
@@ -35,4 +35,4 @@ struct cp_t
mac_config_t *mac_config;
};
-#endif /* cp2_inc_cp_h */
+#endif /* cp_inc_cp_h */
diff --git a/cesar/cp2/sta/mgr/test/overide/cp2/sta/core/core.h b/cesar/cp/sta/mgr/test/overide/cp2/sta/core/core.h
index d92fd6ba43..f3e69ad422 100644
--- a/cesar/cp2/sta/mgr/test/overide/cp2/sta/core/core.h
+++ b/cesar/cp/sta/mgr/test/overide/cp2/sta/core/core.h
@@ -1,5 +1,5 @@
-#ifndef overide_cp2_sta_core_core_h
-#define overide_cp2_sta_core_core_h
+#ifndef overide_cp_sta_core_core_h
+#define overide_cp_sta_core_core_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file overide/cp2/sta/core/core.h
+ * \file overide/cp/sta/core/core.h
* \brief « brief description »
* \ingroup « module »
*
@@ -19,4 +19,4 @@ u32
cp_sta_core_date_ms (cp_t *cp);
-#endif /* overide_cp2_sta_core_core_h */
+#endif /* overide_cp_sta_core_core_h */
diff --git a/cesar/cp2/sta/mgr/test/overide/cp_fsm_defs.h b/cesar/cp/sta/mgr/test/overide/cp_fsm_defs.h
index f64f9c368f..f64f9c368f 100644
--- a/cesar/cp2/sta/mgr/test/overide/cp_fsm_defs.h
+++ b/cesar/cp/sta/mgr/test/overide/cp_fsm_defs.h
diff --git a/cesar/cp2/sta/mgr/test/src/cl_stub.c b/cesar/cp/sta/mgr/test/src/cl_stub.c
index e9ff2f1556..e9ff2f1556 100644
--- a/cesar/cp2/sta/mgr/test/src/cl_stub.c
+++ b/cesar/cp/sta/mgr/test/src/cl_stub.c
diff --git a/cesar/cp2/sta/mgr/test/src/core_stub.c b/cesar/cp/sta/mgr/test/src/core_stub.c
index a4c3280609..127367a5c5 100644
--- a/cesar/cp2/sta/mgr/test/src/core_stub.c
+++ b/cesar/cp/sta/mgr/test/src/core_stub.c
@@ -13,7 +13,7 @@
* « long description »
*/
#include "common/std.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
u32
cp_sta_core_date_ms (cp_t *cp)
diff --git a/cesar/cp/sta/mgr/test/src/fsm_stub.c b/cesar/cp/sta/mgr/test/src/fsm_stub.c
new file mode 100644
index 0000000000..849f375270
--- /dev/null
+++ b/cesar/cp/sta/mgr/test/src/fsm_stub.c
@@ -0,0 +1,29 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file src/fsm_stub.c
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+#include "common/std.h"
+#include "cp/fsm/fsm.h"
+
+static cp_fsm_event_t fsm_event;
+
+cp_fsm_event_t *
+cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
+{
+ return &fsm_event;
+}
+
+void
+cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
+{
+}
diff --git a/cesar/cp2/sta/mgr/test/src/net_list_test.c b/cesar/cp/sta/mgr/test/src/net_list_test.c
index a025e5170d..e913477eed 100644
--- a/cesar/cp2/sta/mgr/test/src/net_list_test.c
+++ b/cesar/cp/sta/mgr/test/src/net_list_test.c
@@ -18,11 +18,11 @@
#include "lib/test.h"
#include "mac/common/timings.h"
-#include "cp2/defs.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/mgr/net_list.h"
+#include "cp/defs.h"
+#include "cp/inc/context.h"
+#include "cp/sta/mgr/net_list.h"
-#include "cp2/sta/mgr/inc/net_list.h"
+#include "cp/sta/mgr/inc/net_list.h"
/** Initialise
* \param test the test object.
@@ -34,7 +34,7 @@
* - nid = 0
* - cco = null
* - pco = null
- * - expiration_ntb = CP_NET_EXPIRATION_DELAY (see defs file in cp2)
+ * - expiration_ntb = CP_NET_EXPIRATION_DELAY (see defs file in cp)
* - associated_stas shall be empty.
* - unssociated_stas shall be empty.
*
@@ -215,7 +215,7 @@ test_case_network_uninit (test_t test)
* - station_avln = false
* - cco = null
* - pco = null
- * - expiration_ntb = CP_NET_EXPIRATION_DELAY (see cp2/defs.h)
+ * - expiration_ntb = CP_NET_EXPIRATION_DELAY (see cp/defs.h)
* - associated_stas = empty (use set_empty function).
* - unassociated_stas = empty (use set_empty function).
*/
diff --git a/cesar/cp2/sta/mgr/test/src/net_test.c b/cesar/cp/sta/mgr/test/src/net_test.c
index 30af17b816..e4f5304c4a 100644
--- a/cesar/cp2/sta/mgr/test/src/net_test.c
+++ b/cesar/cp/sta/mgr/test/src/net_test.c
@@ -8,7 +8,7 @@
/**
* \file src/net_test.c
* \brief Test the net APIs
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
@@ -21,10 +21,10 @@
#include "mac/common/ntb.h"
#include "mac/common/timings.h"
-#include "cp2/sta/mgr/net.h"
-#include "cp2/sta/mgr/inc/net.h"
+#include "cp/sta/mgr/net.h"
+#include "cp/sta/mgr/inc/net.h"
-#include "cp2/inc/context.h"
+#include "cp/inc/context.h"
/**
* Add an unassociated station to the net.
diff --git a/cesar/cp2/sta/mgr/test/src/sta-test.c b/cesar/cp/sta/mgr/test/src/sta-test.c
index ab22b07903..b8055a79e7 100644
--- a/cesar/cp2/sta/mgr/test/src/sta-test.c
+++ b/cesar/cp/sta/mgr/test/src/sta-test.c
@@ -16,10 +16,10 @@
#include "lib/test.h"
#include "lib/bitstream.h"
-#include "cp2/sta/mgr/sta_own_data.h"
+#include "cp/sta/mgr/sta_own_data.h"
-#include "cp2/inc/context.h"
-#include "cp2/sta/mgr/inc/sta_own_data.h"
+#include "cp/inc/context.h"
+#include "cp/sta/mgr/inc/sta_own_data.h"
/**
* Test the init of the module.
diff --git a/cesar/cp2/sta/mgr/test/src/sta_mgr_test.c b/cesar/cp/sta/mgr/test/src/sta_mgr_test.c
index 84de91a257..379588b9ba 100644
--- a/cesar/cp2/sta/mgr/test/src/sta_mgr_test.c
+++ b/cesar/cp/sta/mgr/test/src/sta_mgr_test.c
@@ -8,7 +8,7 @@
/**
* \file src/sta_mgr_test.c
* \brief station manager test.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
#include "common/std.h"
@@ -16,16 +16,16 @@
#include "lib/test.h"
#include "mac/common/timings.h"
-#include "cp2/cp.h"
-#include "cp2/inc/context.h"
+#include "cp/cp.h"
+#include "cp/inc/context.h"
-#include "cp2/sta/mgr/sta_mgr.h"
-#include "cp2/sta/mgr/net_list.h"
-#include "cp2/sta/mgr/net.h"
+#include "cp/sta/mgr/sta_mgr.h"
+#include "cp/sta/mgr/net_list.h"
+#include "cp/sta/mgr/net.h"
-#include "cp2/sta/mgr/inc/sta_mgr.h"
-#include "cp2/sta/mgr/inc/net_list.h"
-#include "cp2/sta/mgr/inc/net.h"
+#include "cp/sta/mgr/inc/sta_mgr.h"
+#include "cp/sta/mgr/inc/net_list.h"
+#include "cp/sta/mgr/inc/net.h"
/** Initialise
* \param test the test object.
diff --git a/cesar/cp2/sta/mgr/test/src/station_test.c b/cesar/cp/sta/mgr/test/src/station_test.c
index e5235ef21d..c6021dd118 100644
--- a/cesar/cp2/sta/mgr/test/src/station_test.c
+++ b/cesar/cp/sta/mgr/test/src/station_test.c
@@ -8,7 +8,7 @@
/**
* \file src/station_test.c
* \brief Test the station.
- * \ingroup cp2_sta_mgr
+ * \ingroup cp_sta_mgr
*
*/
@@ -19,9 +19,9 @@
#include "lib/bitstream.h"
#include "lib/slab.h"
-#include "cp2/sta/mgr/sta.h"
+#include "cp/sta/mgr/sta.h"
-#include "cp2/sta/mgr/inc/sta.h"
+#include "cp/sta/mgr/inc/sta.h"
/**
* Initialise a station.
diff --git a/cesar/cp2/test/doc/CP Functionnal test plan.odt b/cesar/cp/test/doc/CP Functionnal test plan.odt
index 06e190bd1a..06e190bd1a 100644
--- a/cesar/cp2/test/doc/CP Functionnal test plan.odt
+++ b/cesar/cp/test/doc/CP Functionnal test plan.odt
Binary files differ
diff --git a/cesar/cp2/test/doc/station_manager_function_call.odt b/cesar/cp/test/doc/station_manager_function_call.odt
index 243089f167..243089f167 100644
--- a/cesar/cp2/test/doc/station_manager_function_call.odt
+++ b/cesar/cp/test/doc/station_manager_function_call.odt
Binary files differ
diff --git a/cesar/cp2/test/mme/Config b/cesar/cp/test/mme/Config
index 4bad3cc185..4bad3cc185 100644
--- a/cesar/cp2/test/mme/Config
+++ b/cesar/cp/test/mme/Config
diff --git a/cesar/cp2/test/mme/Makefile b/cesar/cp/test/mme/Makefile
index 8876e7cfd3..8876e7cfd3 100644
--- a/cesar/cp2/test/mme/Makefile
+++ b/cesar/cp/test/mme/Makefile
diff --git a/cesar/cp2/test/mme/src/test_mme.c b/cesar/cp/test/mme/src/test_mme.c
index f649ffec9e..a327d5e8cb 100644
--- a/cesar/cp2/test/mme/src/test_mme.c
+++ b/cesar/cp/test/mme/src/test_mme.c
@@ -12,7 +12,7 @@
*/
#include "common/std.h"
-#include "cp2/mme.h"
+#include "cp/mme.h"
#include "lib/test.h"
diff --git a/cesar/cp2/types.h b/cesar/cp/types.h
index fa273b88df..f1fe167dd6 100644
--- a/cesar/cp2/types.h
+++ b/cesar/cp/types.h
@@ -1,5 +1,5 @@
-#ifndef cp2_types_h
-#define cp2_types_h
+#ifndef cp_types_h
+#define cp_types_h
/* Cesar project {{{
*
* Copyright (C) 2008 Spidcom
@@ -8,12 +8,12 @@
*
* }}} */
/**
- * \file cp2/types.h
+ * \file cp/types.h
* \brief Types definition for the CP.
- * \ingroup cp2
+ * \ingroup cp
*
*/
-#include "cp2/defs.h"
+#include "cp/defs.h"
/** Forward declaration. */
typedef struct cp_t cp_t;
@@ -43,4 +43,4 @@ enum cp_security_level_t
};
typedef enum cp_security_level_t cp_security_level_t;
-#endif /* cp2_types_h */
+#endif /* cp_types_h */
diff --git a/cesar/cp2/Module b/cesar/cp2/Module
deleted file mode 100644
index 6d1848d25f..0000000000
--- a/cesar/cp2/Module
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES:= cp.c
-MODULES:=cp2/beacon cp2/cco/action cp2/cco/bw cp2/cl_interf \
-cp2/conn cp2/fsm cp2/msg cp2/pwl cp2/secu cp2/sta/action cp2/sta/core \
-cp2/sta/mgr
-
-$(call src2obj,cp2/src/cp.c,target): $(BASE)/cp2/fsm/fsm.h
diff --git a/cesar/cp2/beacon/Module b/cesar/cp2/beacon/Module
deleted file mode 100644
index 4a793bd75d..0000000000
--- a/cesar/cp2/beacon/Module
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES:= beacon.c common.c bentry.c bentry_msg.c beacon_discover.c
-
-$(call src2obj,cp2/beacon/src/beacon.c,target): $(BASE)/cp2/fsm/fsm.h
-$(call src2obj,cp2/beacon/src/beacon.c,host): $(BASE)/cp2/fsm/fsm.h
diff --git a/cesar/cp2/conn/test/src/fsm_stub.c b/cesar/cp2/conn/test/src/fsm_stub.c
deleted file mode 100644
index a2f607bd1c..0000000000
--- a/cesar/cp2/conn/test/src/fsm_stub.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file src/fsm_stub.c
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#include "common/std.h"
-#include "cp2/fsm/fsm.h"
-
-static cp_fsm_event_t fsm_event;
-
-cp_fsm_event_t *
-cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
-{
- return &fsm_event;
-}
-
-void
-cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
-{
-}
diff --git a/cesar/cp2/fsm/test/utest/Makefile b/cesar/cp2/fsm/test/utest/Makefile
deleted file mode 100644
index 2cc09d7db8..0000000000
--- a/cesar/cp2/fsm/test/utest/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-BASE = ../../../..
-
-INCLUDES = cp2/fsm/test/utest cp2/fsm/test/utest/override
-
-HOST_PROGRAMS = test_fsm
-test_fsm_SOURCES = test_fsm.c fsm_stub.c actions.c
-test_fsm_MODULES = lib lib/scenario cp2/fsm
-cp2_fsm_MODULE_SOURCES = fsm.c events.c
-
-include $(BASE)/common/make/top.mk
-
-$(call src2obj,src/test_fsm.c,host): $(BASE)/cp2/fsm/fsm.h
-$(call src2obj,src/test_fsm.c,target): $(BASE)/cp2/fsm/fsm.h
-
-# Override fsm.
-vpath %.fsm
-vpath %.fsm override
diff --git a/cesar/cp2/msg/test/src/fsm_stub.c b/cesar/cp2/msg/test/src/fsm_stub.c
deleted file mode 100644
index a2f607bd1c..0000000000
--- a/cesar/cp2/msg/test/src/fsm_stub.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file src/fsm_stub.c
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#include "common/std.h"
-#include "cp2/fsm/fsm.h"
-
-static cp_fsm_event_t fsm_event;
-
-cp_fsm_event_t *
-cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
-{
- return &fsm_event;
-}
-
-void
-cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
-{
-}
diff --git a/cesar/cp2/sta/action/test/utest/Makefile b/cesar/cp2/sta/action/test/utest/Makefile
deleted file mode 100644
index 707f959678..0000000000
--- a/cesar/cp2/sta/action/test/utest/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-BASE = ../../../../..
-
-INCLUDES = cp2/sta/action/test/utest cp2/sta/action/test/utest/override
-
-HOST_PROGRAMS = test_sta_action
-test_sta_action_SOURCES = test_sta_action.c assoc.c drv.c info.c key.c \
- poweron.c \
- msg_stub.c dataplane_stub.c fsm_stub.c \
- scenario_actions.c
-test_sta_action_MODULES = lib lib/scenario cp2/sta/action cp2/sta/mgr \
- cp2/fsm cp2/secu
-cp2_fsm_MODULE_SOURCES = tables.c
-
-include $(BASE)/common/make/top.mk
-
-$(call src2obj,src/assoc.c,host): $(BASE)/cp2/fsm/fsm.h
-$(call src2obj,src/fsm_stub.c,host): $(BASE)/cp2/fsm/fsm.h
diff --git a/cesar/cp2/sta/action/test/utest/override/cp2/sta/core/core.h b/cesar/cp2/sta/action/test/utest/override/cp2/sta/core/core.h
deleted file mode 100644
index 4d6efd0656..0000000000
--- a/cesar/cp2/sta/action/test/utest/override/cp2/sta/core/core.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef override_cp2_sta_core_core_h
-#define override_cp2_sta_core_core_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file override/cp2/sta/core/core.h
- * \brief STA core override.
- * \ingroup test
- */
-
-
-#endif /* override_cp2_sta_core_core_h */
diff --git a/cesar/cp2/sta/mgr/test/src/fsm_stub.c b/cesar/cp2/sta/mgr/test/src/fsm_stub.c
deleted file mode 100644
index a2f607bd1c..0000000000
--- a/cesar/cp2/sta/mgr/test/src/fsm_stub.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file src/fsm_stub.c
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#include "common/std.h"
-#include "cp2/fsm/fsm.h"
-
-static cp_fsm_event_t fsm_event;
-
-cp_fsm_event_t *
-cp_fsm_event_bare_new (cp_t *ctx, cp_fsm_event_type_t type)
-{
- return &fsm_event;
-}
-
-void
-cp_fsm_post (cp_t *ctx, cp_fsm_event_t *event)
-{
-}
diff --git a/cesar/station/station.h b/cesar/station/station.h
index ba66863216..5f35f2b85b 100644
--- a/cesar/station/station.h
+++ b/cesar/station/station.h
@@ -19,7 +19,7 @@
#include "cl/cl.h"
#include "hle/hle.h"
#include "interface/interface.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
struct cesar_t
{
diff --git a/cesar/test_general/station/cco0s0/Makefile.mk b/cesar/test_general/station/cco0s0/Makefile.mk
index b5941056aa..54aee0d46f 100644
--- a/cesar/test_general/station/cco0s0/Makefile.mk
+++ b/cesar/test_general/station/cco0s0/Makefile.mk
@@ -5,7 +5,7 @@ INCLUDES = test_general/station/override/
TARGET_PROGRAMS= cco0s0
cco0s0_SOURCES = station.c
-cco0s0_MODULES = lib mac/common mac cl hle interface cp2 hal station \
+cco0s0_MODULES = lib mac/common mac cl hle interface cp hal station \
$(SPARC_MODULES) \
$(MAXIMUS_MODULES)
mac_common_MODULES_SOURCES = tonemask.c
diff --git a/cesar/test_general/station/cco0s0/src/station.c b/cesar/test_general/station/cco0s0/src/station.c
index 75962e33b0..21b1478120 100644
--- a/cesar/test_general/station/cco0s0/src/station.c
+++ b/cesar/test_general/station/cco0s0/src/station.c
@@ -15,7 +15,7 @@
#include "common/std.h"
#include "station/station.h"
-#include "cp2/cp.h"
+#include "cp/cp.h"
#include "hle/hle.h"
#include "cl/cl.h"
#include "mac/sar/sar.h"