FreeCalypso > hg > freecalypso-sw
diff nuc-fw/riviera/rvm/rvm_gen.h @ 119:dd56546ad9e0
starting to compile RVF
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Wed, 30 Oct 2013 23:19:21 +0000 |
| parents | 21de8d8e6ea7 |
| children |
line wrap: on
line diff
--- a/nuc-fw/riviera/rvm/rvm_gen.h Tue Oct 29 07:03:45 2013 +0000 +++ b/nuc-fw/riviera/rvm/rvm_gen.h Wed Oct 30 23:19:21 2013 +0000 @@ -23,12 +23,12 @@ #ifndef __RVM_GEN_H_ #define __RVM_GEN_H_ -#ifndef _WINDOWS +#if 0 //#ifndef _WINDOWS #include "config/rv.cfg" #endif -#include "rvf/rvf_api.h" /* for memory bank related definitions & GD*/ -#include "rvm/rvm_api.h" +#include "../rvf/rvf_api.h" /* for memory bank related definitions & GD*/ +#include "rvm_api.h" #ifdef __cplusplus @@ -87,12 +87,12 @@ /* Type1 SWE info */ typedef struct { - T_RVM_NAME swe_name; + T_RVM_NAME swe_name; T_RVM_USE_ID swe_use_id; - UINT32 version; - UINT8 nb_mem_bank; + UINT32 version; + UINT8 nb_mem_bank; T_RVM_BK_INFO mem_bank[RVM_MAX_NB_MEM_BK]; - UINT8 nb_linked_swe; + UINT8 nb_linked_swe; T_RVM_USE_ID linked_swe_id[RVM_MAX_NB_LINKED_SWE]; T_RV_RETURN_PATH return_path; T_RVM_RETURN (* set_info) (T_RVF_ADDR_ID addr_id, @@ -108,17 +108,17 @@ /* Type2 SWE info */ typedef struct { - T_RVM_NAME swe_name; + T_RVM_NAME swe_name; T_RVM_USE_ID swe_use_id; - UINT16 stack_size; - UINT8 priority; - UINT32 version; - UINT8 nb_mem_bank; + UINT16 stack_size; + UINT8 priority; + UINT32 version; + UINT8 nb_mem_bank; T_RVM_BK_INFO mem_bank[RVM_MAX_NB_MEM_BK]; - UINT8 nb_linked_swe; + UINT8 nb_linked_swe; T_RVM_USE_ID linked_swe_id[RVM_MAX_NB_LINKED_SWE]; T_RV_RETURN_PATH return_path; - T_RVF_GD_ID swe_group_directive; /* A-M-E-N-D-E-D! */ + T_RVF_GD_ID swe_group_directive; /* A-M-E-N-D-E-D! */ T_RVM_RETURN (* set_info) (T_RVF_ADDR_ID addr_id, T_RV_RETURN_PATH return_path[], T_RVF_MB_ID bk_id_table[], /* A-M-E-N-E-D-E-D! is table or list??*/ @@ -134,14 +134,14 @@ /* Type3 SWE info */ typedef struct { - T_RVM_NAME swe_name; + T_RVM_NAME swe_name; T_RVM_USE_ID swe_use_id; - UINT16 stack_size; - UINT8 priority; - UINT32 version; - UINT8 nb_mem_bank; + UINT16 stack_size; + UINT8 priority; + UINT32 version; + UINT8 nb_mem_bank; T_RVM_BK_INFO mem_bank[RVM_MAX_NB_MEM_BK]; - UINT8 nb_linked_swe; + UINT8 nb_linked_swe; T_RVM_USE_ID linked_swe_id[RVM_MAX_NB_LINKED_SWE]; T_RV_RETURN_PATH return_path; T_RVM_RETURN (* set_info) (T_RVF_ADDR_ID addr_id, @@ -159,14 +159,14 @@ /* Type4 SWE info */ typedef struct { - T_RVM_NAME swe_name; + T_RVM_NAME swe_name; T_RVM_USE_ID swe_use_id; - UINT16 stack_size; - UINT8 priority; - UINT32 version; - UINT8 nb_mem_bank; + UINT16 stack_size; + UINT8 priority; + UINT32 version; + UINT8 nb_mem_bank; T_RVM_BK_INFO mem_bank[RVM_MAX_NB_MEM_BK]; - UINT8 nb_linked_swe; + UINT8 nb_linked_swe; T_RVM_USE_ID linked_swe_id[RVM_MAX_NB_LINKED_SWE]; T_RV_RETURN_PATH return_path; T_RVM_RETURN (* set_info) (T_RVF_ADDR_ID addr_id, @@ -187,7 +187,7 @@ union { T_RVM_SWE_PASSIVE_INFO type1; - T_RVM_SWE_GROUP_MEMBER_INFO type2; + T_RVM_SWE_GROUP_MEMBER_INFO type2; T_RVM_SWE_SINGLE_INFO type3; T_RVM_SWE_SELF_MADE_INFO type4; } type_info; @@ -212,4 +212,3 @@ #endif /* __RVM_GEN_H_ */ -