]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Replaced all occurences of Ecore with Arc and tidied up some names for better conform...
authortojo <devnull@localhost>
Sat, 28 Nov 2009 22:21:30 +0000 (23:21 +0100)
committertojo <devnull@localhost>
Sat, 28 Nov 2009 22:21:30 +0000 (23:21 +0100)
38 files changed:
arch/ppc/mpc55xx/drivers/Can.c
arch/ppc/mpc55xx/drivers/Eep.c
arch/ppc/mpc55xx/drivers/Fls.c
boards/mpc5516it/config/CanIf_Cfg.c
boards/mpc5516it/config/CanIf_Cfg.h
boards/mpc5516it/config/Can_Cfg.h
boards/mpc5516it/config/Can_Lcfg.c
boards/mpc5516it/config/Com_PbCfg.c
boards/mpc5516it/config/Spi_Cfg.h
boards/mpc551xsim/config/CanIf_Cfg.h
boards/mpc551xsim/config/Can_Cfg.h
boards/mpc551xsim/config/Can_Lcfg.c
boards/mpc5567qrtech/config/CanIf_Cfg.c
boards/mpc5567qrtech/config/CanIf_Cfg.h
boards/mpc5567qrtech/config/Can_Cfg.h
boards/mpc5567qrtech/config/Can_Lcfg.c
boards/mpc5567qrtech/config/Com_PbCfg.c
boards/mpc5567qrtech/config/Spi_Cfg.h
communication/CanIf/CanIf.c
communication/Com/Com.c
communication/Com/Com_Arc_Types.h [moved from communication/Com/Com_EcoreTypes.h with 59% similarity]
communication/Com/Com_Com.c
communication/Com/Com_Sched.c
communication/Com/Com_misc.c
communication/PduR/PduR.c
communication/PduR/PduR_Types.h
examples/pwm_node2/config/CanIf_Cfg.c
examples/pwm_node2/config/Com_PbCfg.c
examples/switch_node/config/CanIf_Cfg.c
examples/switch_node/config/Com_PbCfg.c
include/Can.h
include/CanIf.h
include/CanIf_Cbk.h
include/Com.h
include/Com_Types.h
include/Mcu.h
include/Os.h
peripherals/Fls_SST25xx.c

index 1c421e8ac4f43073ce59b656cdf74db88042b170..aeddc2eb446d0f0aab5909cf01be00d83dcca360 100644 (file)
 \r
 /* CONFIGURATION NOTES\r
  * ------------------------------------------------------------------\r
- * - CanHandleType must be CAN_ECORE_HANDLE_TYPE_BASIC\r
- *   i.e. CanHandleType=CAN_ECORE_HANDLE_TYPE_FULL NOT supported\r
+ * - CanHandleType must be CAN_ARC_HANDLE_TYPE_BASIC\r
+ *   i.e. CanHandleType=CAN_ARC_HANDLE_TYPE_FULL NOT supported\r
  *   i.e CanIdValue is NOT supported\r
- * - All CanXXXProcessing must be CAN_ECORE_PROCESS_TYPE_INTERRUPT\r
- *   ie CAN_ECORE_PROCESS_TYPE_POLLED not supported\r
- * - To select the Mailboxes to use in the CAN controller use CanEcoreMbMask\r
+ * - All CanXXXProcessing must be CAN_ARC_PROCESS_TYPE_INTERRUPT\r
+ *   ie CAN_ARC_PROCESS_TYPE_POLLED not supported\r
+ * - To select the Mailboxes to use in the CAN controller use Can_Arc_MbMask\r
  * - HOH's for Tx are global and Rx are for each controller\r
  * - CanControllerTimeQuanta is NOT used. The other CanControllerXXX selects\r
  *   the proper time-quanta\r
- * - CanEcoreMbMask for Tx HOH must NOT overlap CanEcoreMbMask for Rx.\r
+ * - Can_Arc_MbMask for Tx HOH must NOT overlap Can_Arc_MbMask for Rx.\r
  * - ONLY global mask is supported( NOT 14,15 and individual )\r
  * - Numbering the CanObjectId for Tx:\r
  *     To do this correctly there are a number of things that are good to know\r
  *     1. HTH's have unique numbers.\r
  *     2. One HTH/HRH is maped to one HOH\r
- *     3. The extension CanEcoreMbMask binds FULL CAN boxes together.\r
+ *     3. The extension Can_Arc_MbMask binds FULL CAN boxes together.\r
  *\r
  *     Example:\r
  *\r
@@ -64,7 +64,7 @@
  *      1    F   0  1\r
  *      ..\r
  *      16   B   0  16  |\r
- *                  17  |    The use of CanEcoreMbMask=0x000f0000 binds these to HTH 16\r
+ *                  17  |    The use of Can_Arc_MbMask=0x000f0000 binds these to HTH 16\r
  *                  18  |    ( bits 16 to 19 set here )\r
  *                  19  |\r
  *           ...\r
@@ -202,12 +202,12 @@ typedef struct FLEXCAN_tag flexcan_t;
 #endif\r
 \r
 // Mapping between HRH and Controller//HOH\r
-typedef struct Can_EcoreObjectHOHMapStruct\r
+typedef struct Can_Arc_ObjectHOHMapStruct\r
 {\r
   uint32 HxHRef;    // Reference to HRH or HTH\r
   CanControllerIdType CanControllerRef;    // Reference to controller\r
   const Can_HardwareObjectType* CanHOHRef;       // Reference to HOH.\r
-} Can_EcoreObjectHOHMapType;\r
+} Can_Arc_ObjectHOHMapType;\r
 \r
 /* Type for holding global information used by the driver */\r
 typedef struct {\r
@@ -226,7 +226,7 @@ typedef struct {
 \r
   // This is a map that maps the HTH:s with the controller and Hoh. It is built\r
   // during Can_Init and is used to make things faster during a transmit.\r
-  Can_EcoreObjectHOHMapType CanHTHMap[NUM_OF_HTHS];\r
+  Can_Arc_ObjectHOHMapType CanHTHMap[NUM_OF_HTHS];\r
 } Can_GlobalType;\r
 \r
 // Global config\r
@@ -241,14 +241,14 @@ typedef struct {
   CanIf_ControllerModeType state;\r
   uint32               lock_cnt;\r
   // Interrupt masks that is for all Mb's in this controller\r
-  uint32               CanEcoreRxMbMask;\r
-  uint32               CanEcoreTxMbMask;\r
+  uint32               Can_Arc_RxMbMask;\r
+  uint32               Can_Arc_TxMbMask;\r
 \r
   // Used at IFLG in controller at startup\r
   uint32               iflagStart;\r
 \r
   // Statistics\r
-  Can_EcoreStatisticsType stats;\r
+  Can_Arc_StatisticsType stats;\r
 \r
   // Data stored for Txconfirmation callbacks to CanIf\r
   PduIdType swPduHandles[MAX_NUM_OF_MAILBOXES];\r
@@ -299,10 +299,10 @@ Can_UnitType CanUnit[CAN_CONTROLLER_CNT] =
  * @param hth The transmit handle\r
  * @returns Ptr to the Hoh\r
  */\r
-static const Can_HardwareObjectType * Can_FindHoh( Can_EcoreHTHType hth , uint32* controller)\r
+static const Can_HardwareObjectType * Can_FindHoh( Can_Arc_HTHType hth , uint32* controller)\r
 {\r
   const Can_HardwareObjectType *hohObj;\r
-  const Can_EcoreObjectHOHMapType *map;\r
+  const Can_Arc_ObjectHOHMapType *map;\r
   const Can_ControllerConfigType *canHwConfig;\r
 \r
   map = &Can_Global.CanHTHMap[hth];\r
@@ -375,7 +375,7 @@ void Can_F_BusOff( void  ) {        Can_BusOff(CAN_CTRL_F); }
 \r
 static void Can_Err( int unit ) {\r
   flexcan_t *canHw = GET_CONTROLLER(unit);\r
-  Can_EcoreErrorType err;\r
+  Can_Arc_ErrorType err;\r
   ESRType esr;\r
   err.R = 0;\r
 \r
@@ -390,9 +390,9 @@ static void Can_Err( int unit ) {
   err.B.RXWRN = esr.B.RXWRN;\r
   err.B.TXWRN = esr.B.TXWRN;\r
 \r
-  if (GET_CALLBACKS()->EcoreError != NULL)\r
+  if (GET_CALLBACKS()->Arc_Error != NULL)\r
   {\r
-    GET_CALLBACKS()->EcoreError(unit, err );\r
+    GET_CALLBACKS()->Arc_Error(unit, err );\r
   }\r
   // Clear ERRINT\r
   canHw->ESR.B.ERRINT = 1;\r
@@ -405,7 +405,7 @@ static void Can_AbortTx( flexcan_t *canHw, Can_UnitType *canUnit ) {
   uint8 mbNr;\r
 \r
        // Find our Tx boxes.\r
-  mbMask = canUnit->CanEcoreTxMbMask;\r
+  mbMask = canUnit->Can_Arc_TxMbMask;\r
 \r
   // Loop over the Mb's set to abort\r
   for (; mbMask; mbMask&=~(1<<mbNr)) {\r
@@ -430,8 +430,8 @@ static void Can_AbortTx( flexcan_t *canHw, Can_UnitType *canUnit ) {
   }\r
 \r
   // Ack tx interrupts\r
-  canHw->IFRL.R = canUnit->CanEcoreTxMbMask;\r
-  canUnit->iflagStart = canUnit->CanEcoreTxMbMask;\r
+  canHw->IFRL.R = canUnit->Can_Arc_TxMbMask;\r
+  canUnit->iflagStart = canUnit->Can_Arc_TxMbMask;\r
 }\r
 \r
 //-------------------------------------------------------------------\r
@@ -444,7 +444,7 @@ static void Can_AbortTx( flexcan_t *canHw, Can_UnitType *canUnit ) {
 static void Can_BusOff( int unit ) {\r
   flexcan_t *canHw = GET_CONTROLLER(unit);\r
   Can_UnitType *canUnit = GET_PRIVATE_DATA(unit);\r
-  Can_EcoreErrorType err;\r
+  Can_Arc_ErrorType err;\r
   err.R = 0;\r
 \r
   if ( canHw->ESR.B.TWRNINT )\r
@@ -463,9 +463,9 @@ static void Can_BusOff( int unit ) {
 \r
   if (err.R != 0)\r
   {\r
-    if (GET_CALLBACKS()->EcoreError != NULL)\r
+    if (GET_CALLBACKS()->Arc_Error != NULL)\r
     {\r
-      GET_CALLBACKS()->EcoreError( unit, err );\r
+      GET_CALLBACKS()->Arc_Error( unit, err );\r
     }\r
   }\r
 \r
@@ -545,12 +545,12 @@ static void Can_Isr(int unit) {
       //\r
 \r
       // Rx\r
-      hohObj= canHwConfig->CanEcoreHoh;\r
+      hohObj= canHwConfig->Can_Arc_Hoh;\r
       --hohObj;\r
       do {\r
         ++hohObj;\r
 \r
-        mbMask = hohObj->CanEcoreMbMask & iFlagLow;\r
+        mbMask = hohObj->Can_Arc_MbMask & iFlagLow;\r
 \r
         if (hohObj->CanObjectType == CAN_OBJECT_TYPE_RECEIVE)\r
         {\r
@@ -584,17 +584,17 @@ static void Can_Isr(int unit) {
             canHw->IFRL.R = (1<<mbNr);\r
           }\r
         }\r
-      } while ( !hohObj->CanEcoreEOL);\r
+      } while ( !hohObj->Can_Arc_EOL);\r
 \r
       // Tx\r
-      hohObj= canHwConfig->CanEcoreHoh;\r
+      hohObj= canHwConfig->Can_Arc_Hoh;\r
       --hohObj;\r
       do {\r
         ++hohObj;\r
 \r
         if (hohObj->CanObjectType == CAN_OBJECT_TYPE_TRANSMIT)\r
         {\r
-          mbMask = hohObj->CanEcoreMbMask & iFlagLow;\r
+          mbMask = hohObj->Can_Arc_MbMask & iFlagLow;\r
 \r
           // Loop over the Mb's for this Hoh\r
           for (; mbMask; mbMask&=~(1<<mbNr)) {\r
@@ -611,7 +611,7 @@ static void Can_Isr(int unit) {
             canHw->IFRL.R = (1<<mbNr);\r
           }\r
         }\r
-      } while ( !hohObj->CanEcoreEOL);\r
+      } while ( !hohObj->Can_Arc_EOL);\r
 #if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
     } // FIFO code\r
 #endif\r
@@ -621,7 +621,7 @@ static void Can_Isr(int unit) {
     // - Interupt on a masked box\r
   }\r
 \r
-  if (canHwConfig->CanEcoreFifo) {\r
+  if (canHwConfig->Can_Arc_Fifo) {\r
        /* Note\r
         * NOT tested at all\r
         */\r
@@ -681,7 +681,7 @@ void Can_Init( const Can_ConfigType *config ) {
   Can_Global.initRun = CAN_READY;\r
 \r
 \r
-  for (int configId=0; configId < CAN_ECORE_CTRL_CONFIG_CNT; configId++) {\r
+  for (int configId=0; configId < CAN_ARC_CTRL_CONFIG_CNT; configId++) {\r
     canHwConfig = GET_CONTROLLER_CONFIG(configId);\r
     ctlrId = canHwConfig->CanControllerId;\r
 \r
@@ -695,13 +695,13 @@ void Can_Init( const Can_ConfigType *config ) {
     canUnit->lock_cnt = 0;\r
 \r
     // Clear stats\r
-    memset(&canUnit->stats, 0, sizeof(Can_EcoreStatisticsType));\r
+    memset(&canUnit->stats, 0, sizeof(Can_Arc_StatisticsType));\r
 \r
     Can_InitController(ctlrId, canHwConfig);\r
 \r
     // Loop through all Hoh:s and map them into the HTHMap\r
     const Can_HardwareObjectType* hoh;\r
-    hoh = canHwConfig->CanEcoreHoh;\r
+    hoh = canHwConfig->Can_Arc_Hoh;\r
     hoh--;\r
     do\r
     {\r
@@ -713,7 +713,7 @@ void Can_Init( const Can_ConfigType *config ) {
         Can_Global.CanHTHMap[hoh->CanObjectId].CanHOHRef = hoh;\r
         Can_Global.CanHTHMap[hoh->CanObjectId].HxHRef = hoh->CanObjectId;\r
       }\r
-    } while (!hoh->CanEcoreEOL);\r
+    } while (!hoh->Can_Arc_EOL);\r
 \r
     // Note!\r
     // Could install handlers depending on HW objects to trap more errors\r
@@ -762,7 +762,7 @@ void Can_DeInit()
   const Can_ControllerConfigType *canHwConfig;\r
   uint32 ctlrId;\r
 \r
-  for (int configId=0; configId < CAN_ECORE_CTRL_CONFIG_CNT; configId++) {\r
+  for (int configId=0; configId < CAN_ARC_CTRL_CONFIG_CNT; configId++) {\r
     canHwConfig = GET_CONTROLLER_CONFIG(configId);\r
     ctlrId = canHwConfig->CanControllerId;\r
 \r
@@ -774,7 +774,7 @@ void Can_DeInit()
     canUnit->lock_cnt = 0;\r
 \r
     // Clear stats\r
-    memset(&canUnit->stats, 0, sizeof(Can_EcoreStatisticsType));\r
+    memset(&canUnit->stats, 0, sizeof(Can_Arc_StatisticsType));\r
   }\r
 \r
   Can_Global.config = NULL;\r
@@ -823,7 +823,7 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
 #if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
   // Note!\r
   // FIFO implemenation not tested\r
-  if( config->CanEcoreFifo ) {\r
+  if( config->Can_Arc_Fifo ) {\r
     canHw->MCR.B.FEN = 1;      // Enable FIFO\r
     canHw->MCR.B.IDAM = 0;     // We want extended id's to match with\r
   }\r
@@ -834,7 +834,7 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
   canHw->MCR.B.MAXMB = MAX_NUM_OF_MAILBOXES - 1;\r
 \r
   /* Disable selfreception */\r
-  canHw->MCR.B.SRXDIS = !config->CanEcoreLoopback;\r
+  canHw->MCR.B.SRXDIS = !config->Can_Arc_Loopback;\r
 \r
   // Clock calucation\r
   // -------------------------------------------------------------------\r
@@ -866,13 +866,13 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
   canHw->CR.B.PSEG1 = config->CanControllerSeg1;\r
   canHw->CR.B.PSEG2 = config->CanControllerSeg2;\r
   canHw->CR.B.SMP =    1;      // 3 samples better than 1 ??\r
-  canHw->CR.B.LPB =    config->CanEcoreLoopback;\r
+  canHw->CR.B.LPB =    config->Can_Arc_Loopback;\r
   canHw->CR.B.BOFFREC = 1;  // Disable bus off recovery\r
 \r
 #if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
   // Check if we use individual masks. If so accept anything(=0) for now\r
   if( canHw->MCR.B.BCC ) {\r
-    i = (config->CanEcoreFifo ? 8 : 0 );\r
+    i = (config->Can_Arc_Fifo ? 8 : 0 );\r
     for(;i<63;i++) {\r
       canHw->RXIMR[i].R = 0;\r
     }\r
@@ -880,7 +880,7 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
 #else\r
 #endif\r
   // Set the id's\r
-  if( config->CanEcoreFifo ) {\r
+  if( config->Can_Arc_Fifo ) {\r
     // Clear ID's in FIFO also, MUST set extended bit here\r
     uint32_t *fifoId = (uint32_t*)(((uint8_t *)canHw)+0xe0);\r
     for(int k=0;k<8;k++) {\r
@@ -889,7 +889,7 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
   }\r
 \r
   // Mark all slots as inactive( depending on fifo )\r
-  i = (config->CanEcoreFifo ? 8 : 0 );\r
+  i = (config->Can_Arc_Fifo ? 8 : 0 );\r
   for(; i < 63; i++) {\r
     //canHw->BUF[i].CS.B.CODE = 0;\r
     canHw->BUF[i].CS.R = 0;\r
@@ -903,12 +903,12 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
     Can_FilterMaskType mask = 0xffffffff;\r
 \r
     // Rx\r
-    hohObj = canHwConfig->CanEcoreHoh;\r
+    hohObj = canHwConfig->Can_Arc_Hoh;\r
     --hohObj;\r
     do {\r
       ++hohObj;\r
 \r
-      mbMask = hohObj->CanEcoreMbMask;\r
+      mbMask = hohObj->Can_Arc_MbMask;\r
       mbNr = 0;\r
 \r
       if (hohObj->CanObjectType == CAN_OBJECT_TYPE_RECEIVE)\r
@@ -929,16 +929,16 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
         }\r
 \r
         // Add to global mask\r
-        canUnit->CanEcoreRxMbMask |= hohObj->CanEcoreMbMask;\r
+        canUnit->Can_Arc_RxMbMask |= hohObj->Can_Arc_MbMask;\r
         if( hohObj->CanFilterMaskRef != NULL  ) {\r
           mask &= *hohObj->CanFilterMaskRef;\r
         }\r
       }\r
       else\r
       {\r
-        canUnit->CanEcoreTxMbMask |= hohObj->CanEcoreMbMask;\r
+        canUnit->Can_Arc_TxMbMask |= hohObj->Can_Arc_MbMask;\r
       }\r
-    } while( !hohObj->CanEcoreEOL );\r
+    } while( !hohObj->Can_Arc_EOL );\r
 \r
 \r
     // Set global mask\r
@@ -948,7 +948,7 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
     canHw->RX15MASK.R = 0;\r
   }\r
 \r
-  canUnit->iflagStart = canUnit->CanEcoreTxMbMask;\r
+  canUnit->iflagStart = canUnit->Can_Arc_TxMbMask;\r
 \r
   canUnit->state = CANIF_CS_STOPPED;\r
   Can_EnableControllerInterrupts(cId);\r
@@ -1065,18 +1065,18 @@ void Can_EnableControllerInterrupts( uint8 controller ) {
   canHw->IMRH.R = 0;\r
   canHw->IMRL.R = 0;\r
 \r
-  if( canHwConfig->CanRxProcessing == CAN_ECORE_PROCESS_TYPE_INTERRUPT ) {\r
+  if( canHwConfig->CanRxProcessing == CAN_ARC_PROCESS_TYPE_INTERRUPT ) {\r
     /* Turn on the interrupt mailboxes */\r
-    canHw->IMRL.R = canUnit->CanEcoreRxMbMask;\r
+    canHw->IMRL.R = canUnit->Can_Arc_RxMbMask;\r
   }\r
 \r
-  if( canHwConfig->CanTxProcessing == CAN_ECORE_PROCESS_TYPE_INTERRUPT ) {\r
+  if( canHwConfig->CanTxProcessing == CAN_ARC_PROCESS_TYPE_INTERRUPT ) {\r
     /* Turn on the interrupt mailboxes */\r
-    canHw->IMRL.R |= canUnit->CanEcoreTxMbMask;\r
+    canHw->IMRL.R |= canUnit->Can_Arc_TxMbMask;\r
   }\r
 \r
   // BusOff here represents all errors and warnings\r
-  if( canHwConfig->CanBusOffProcessing == CAN_ECORE_PROCESS_TYPE_INTERRUPT ) {\r
+  if( canHwConfig->CanBusOffProcessing == CAN_ARC_PROCESS_TYPE_INTERRUPT ) {\r
     canHw->MCR.B.WRNEN = 1;    /* Turn On warning int */\r
 \r
     canHw->CR.B.ERRMSK = 1;    /* Enable error interrupt */\r
@@ -1088,7 +1088,7 @@ void Can_EnableControllerInterrupts( uint8 controller ) {
   return;\r
 }\r
 \r
-Can_ReturnType Can_Write( Can_EcoreHTHType hth, Can_PduType *pduInfo ) {\r
+Can_ReturnType Can_Write( Can_Arc_HTHType hth, Can_PduType *pduInfo ) {\r
   uint16_t timer;\r
   uint32_t iflag;\r
   Can_ReturnType rv = CAN_OK;\r
@@ -1111,7 +1111,7 @@ Can_ReturnType Can_Write( Can_EcoreHTHType hth, Can_PduType *pduInfo ) {
 \r
   canHw = GET_CONTROLLER(controller);\r
   oldMsr = McuE_EnterCriticalSection();\r
-  iflag = canHw->IFRL.R & canUnit->CanEcoreTxMbMask;\r
+  iflag = canHw->IFRL.R & canUnit->Can_Arc_TxMbMask;\r
 \r
   // check for any free box\r
   // Normally we would just use the iflag to get the free box\r
@@ -1194,7 +1194,7 @@ void Can_MainFunction_Wakeup( void ) {
  * @param stats Pointer to data to copy statistics to\r
  */\r
 \r
-void Can_EcoreGetStatistics( uint8 controller, Can_EcoreStatisticsType *stats)\r
+void Can_Arc_GetStatistics( uint8 controller, Can_Arc_StatisticsType *stats)\r
 {\r
   Can_UnitType *canUnit = GET_PRIVATE_DATA(controller);\r
   *stats = canUnit->stats;\r
@@ -1222,7 +1222,7 @@ Can_ReturnType Can_SetControllerMode( uint8 Controller, Can_StateTransitionType
        return E_OK;\r
 }\r
 \r
-Can_ReturnType Can_Write( Can_EcoreHTHType hth, Can_PduType *pduInfo )\r
+Can_ReturnType Can_Write( Can_Arc_HTHType hth, Can_PduType *pduInfo )\r
 {\r
        // Write to mailbox on controller here.\r
        DEBUG(DEBUG_MEDIUM, "Can_Write(stub): Received data ");\r
@@ -1262,7 +1262,7 @@ void Can_MainFunction_Read( void ){}
 void Can_MainFunction_BusOff( void ){}\r
 void Can_MainFunction_Wakeup( void ){}\r
 \r
-void Can_EcoreGetStatistics( uint8 controller, Can_EcoreStatisticsType * stat){}\r
+void Can_Arc_GetStatistics( uint8 controller, Can_Arc_StatisticsType * stat){}\r
 \r
 #endif\r
 \r
index 4ff2ca4e6cefde6e5e416e872d41886180917584..db1f2ad62f860adcaf17c95a0aec91a07080cc1d 100644 (file)
@@ -121,7 +121,7 @@ typedef enum {
   EEP_ERASE,
   EEP_READ,
   EEP_WRITE,
-} Eep_EcoreJobType;
+} Eep_Arc_JobType;
 
 /* Spi job state */
 typedef enum {
@@ -136,7 +136,7 @@ typedef struct {
        Eep_AddressType eepAddr;
        uint32 left;
        Job_StateType state;
-       Eep_EcoreJobType mainState;
+       Eep_Arc_JobType mainState;
        Spi_SequenceType currSeq;
        uint32 chunkSize;
 } Eep_JobInfoType;
@@ -155,7 +155,7 @@ typedef struct {
   // Status of driver
   MemIf_StatusType    status;
   MemIf_JobResultType jobResultType;
-  Eep_EcoreJobType    jobType;
+  Eep_Arc_JobType    jobType;
 
   // Saved information from API calls.
   MemIf_AddressType   e2Addr;
index 13a6463e2af1175383882309bf8ca2bc0298fe61..5e2537dd897b54f6fadfd817566c12f04bff62df 100644 (file)
@@ -313,13 +313,13 @@ typedef enum {
   FLS_JOB_ERASE,
   FLS_JOB_READ,
   FLS_JOB_WRITE,
-} Fls_EcoreJobType;
+} Fls_Arc_JobType;
 
 #if 0
 typedef struct {
   MemIf_StatusType    status;
   MemIf_JobResultType jobResultType;
-  Fls_EcoreJobType     jobType;
+  Fls_Arc_JobType      jobType;
   MemIf_AddressType   sourceAddr;
   uint8 *targetAddr;
   MemIf_LengthType length;
@@ -351,7 +351,7 @@ typedef struct {
 
   MemIf_StatusType    status;
   MemIf_JobResultType jobResultType;
-  Fls_EcoreJobType     jobType;
+  Fls_Arc_JobType      jobType;
   MemIf_AddressType   sourceAddr;
   uint8 *targetAddr;
   MemIf_LengthType length;
index ee00d6733806af39738d97a9f330b6a3d6d744d1..eb3ec25117f344ecbb18bff1eba3ece2b50f8498 100644 (file)
@@ -65,16 +65,16 @@ const CanIf_DispatchConfigType CanIfDispatchConfig =
 const CanIf_HthConfigType CanIfHthConfigData[] =\r
 {\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_0,\r
     .CanIfHthIdSymRef = CAN_HTH_A_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_1,\r
     .CanIfHthIdSymRef = CAN_HTH_C_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -82,18 +82,18 @@ const CanIf_HthConfigType CanIfHthConfigData[] =
 const CanIf_HrhConfigType CanIfHrhConfigData[] =\r
 {\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_0,\r
     .CanIfHrhIdSymRef = CAN_HRH_A_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_1,\r
     .CanIfHrhIdSymRef = CAN_HRH_C_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 //-------------------------------------------------------------------\r
@@ -197,7 +197,7 @@ const CanIf_InitHohConfigType CanIfHohConfigData[] =
     .CanConfigSet = &CanConfigSetData,\r
     .CanIfHrhConfig = CanIfHrhConfigData,\r
     .CanIfHthConfig = CanIfHthConfigData,\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
index 96988dabbd95f5e5a9187950ff201169bf8bdafd..1307e6a9f2b5fdc8770725a2091e1cec0722242a 100644 (file)
@@ -92,7 +92,7 @@ typedef struct {
        void (*RxIndication)(void *); //(const Can_PduType *);\r
        void (*ControllerBusOff)(uint8);\r
        void (*ControllerWakeup)(uint8);\r
-       void (*EcoreError)(uint8,uint32);\r
+       void (*Arc_Error)(uint8,uint32);\r
 } CanIf_CallbackType;\r
 \r
 \r
@@ -123,7 +123,7 @@ typedef struct {
 typedef struct {\r
        //      Defines the HRH type i.e, whether its a BasicCan or FullCan. If BasicCan is\r
        //      configured, software filtering is enabled.\r
-  Can_EcoreHohType CanIfHrhType;\r
+  Can_Arc_HohType CanIfHrhType;\r
 \r
        //      Selects the hardware receive objects by using the HRH range/list from\r
        //      CAN Driver configuration to define, for which HRH a software filtering has\r
@@ -139,14 +139,14 @@ typedef struct {
        //      configuration. The HRH id is unique in a given CAN Driver. The HRH Ids\r
        //      are defined in the CAN Driver Module and hence it is derived from CAN\r
        //      Driver Configuration.\r
-       Can_EcoreHRHType CanIfHrhIdSymRef ;\r
+       Can_Arc_HRHType CanIfHrhIdSymRef ;\r
 \r
        //      Defines the parameters required for configuraing multiple\r
        //      CANID ranges for a given same HRH.\r
        const CanIf_HrhRangeConfigType *CanIfHrhRangeConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HrhConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -156,7 +156,7 @@ typedef struct {
 \r
 typedef struct {\r
   //  Defines the HTH type i.e, whether its a BasicCan or FullCan.\r
-  Can_EcoreHohType CanIfHthType;\r
+  Can_Arc_HohType CanIfHthType;\r
 \r
   // Reference to controller Id to which the HTH belongs to. A controller\r
   // can contain one or more HTHs\r
@@ -166,10 +166,10 @@ typedef struct {
   //  configuration. The HTH id is unique in a given CAN Driver. The HTH Ids\r
   //  are defined in the CAN Driver Module and hence it is derived from CAN\r
   //  Driver Configuration.\r
-  Can_EcoreHTHType CanIfHthIdSymRef ;\r
+  Can_Arc_HTHType CanIfHthIdSymRef ;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HthConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -189,7 +189,7 @@ typedef struct {
   const CanIf_HthConfigType *CanIfHthConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_InitHohConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -317,7 +317,7 @@ typedef struct {
 \r
        // Acceptance filters, 1 - care, 0 - don't care.\r
        // Is enabled by the CanIfSoftwareFilterMask in CanIf_HrhConfigType\r
-       // Ecore exension\r
+       // ArcCore exension\r
        uint32 CanIfCanRxPduCanIdMask;\r
 \r
 } CanIf_RxPduConfigType;\r
@@ -383,8 +383,8 @@ typedef struct {
        //  Multiplicity: 0..1\r
        void (*CanIfWakeupValidNotification)();\r
 \r
-       // Ecore ext.\r
-       void (*CanIfErrorNotificaton)(uint8,Can_EcoreErrorType);\r
+       // ArcCore ext.\r
+       void (*CanIfErrorNotificaton)(uint8,Can_Arc_ErrorType);\r
 \r
 } CanIf_DispatchConfigType;\r
 \r
index 93391d6b05d0851610fd53946cdb7dfadb6d1b90..dc1da51a8fe898cc6897dfc7e440083eadd295e0 100644 (file)
@@ -24,7 +24,7 @@
 #define CAN_CFG_H_\r
 \r
 // Number of controller configs\r
-#define CAN_ECORE_CTRL_CONFIG_CNT   2\r
+#define CAN_ARC_CTRL_CONFIG_CNT   2\r
 \r
 #define CAN_DEV_ERROR_DETECT          STD_ON\r
 #define CAN_VERSION_INFO_API          STD_ON\r
@@ -73,9 +73,9 @@ typedef enum {
 } Can_ObjectTypeType;\r
 \r
 typedef enum {\r
-  CAN_ECORE_HANDLE_TYPE_BASIC,\r
-  CAN_ECORE_HANDLE_TYPE_FULL\r
-} Can_EcoreHohType;\r
+  CAN_ARC_HANDLE_TYPE_BASIC,\r
+  CAN_ARC_HANDLE_TYPE_FULL\r
+} Can_Arc_HohType;\r
 \r
 // HTH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -83,7 +83,7 @@ typedef enum {
   CAN_HTH_A_1 = 0,\r
   CAN_HTH_C_1,\r
   NUM_OF_HTHS\r
-} Can_EcoreHTHType;\r
+} Can_Arc_HTHType;\r
 \r
 // HRH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -91,7 +91,7 @@ typedef enum {
   CAN_HRH_A_1 = 0,\r
   CAN_HRH_C_1,\r
   NUM_OF_HRHS\r
-} Can_EcoreHRHType;\r
+} Can_Arc_HRHType;\r
 \r
 // Non-standard type\r
 typedef struct {\r
@@ -100,7 +100,7 @@ typedef struct {
   void (*ControllerBusOff)(uint8);\r
   void (*TxConfirmation)(PduIdType);\r
   void (*ControllerWakeup)(uint8);\r
-  void (*EcoreError)(uint8,Can_EcoreErrorType);\r
+  void (*Arc_Error)(uint8,Can_Arc_ErrorType);\r
 } Can_CallbackType;\r
 \r
 /*\r
@@ -151,7 +151,7 @@ typedef uint32 Can_FilterMaskType;
 //Objects.\r
 typedef struct Can_HardwareObjectStruct {\r
   // Specifies the type (Full-CAN or Basic-CAN) of a hardware object.\r
-  Can_EcoreHohType CanHandleType;\r
+  Can_Arc_HohType CanHandleType;\r
 \r
   // Specifies whether the IdValue is of type - standard identifier - extended\r
   // identifier - mixed mode ImplementationType: Can_IdType\r
@@ -176,10 +176,10 @@ typedef struct Can_HardwareObjectStruct {
 \r
   // A "1" in this mask tells the driver that that HW Message Box should be\r
   // occupied by this Hoh. A "1" in bit 31(ppc) occupies Mb 0 in HW.\r
-  uint32 CanEcoreMbMask;\r
+  uint32 Can_Arc_MbMask;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanEcoreEOL;\r
+  boolean Can_Arc_EOL;\r
 \r
 } Can_HardwareObjectType;\r
 \r
@@ -188,16 +188,16 @@ typedef struct Can_HardwareObjectStruct {
  * CanController container\r
  */\r
 typedef enum {\r
-  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-  CAN_ECORE_PROCESS_TYPE_POLLING,\r
-} Can_EcoreProcessType;\r
+  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+  CAN_ARC_PROCESS_TYPE_POLLING,\r
+} Can_Arc_ProcessType;\r
 \r
 typedef struct {\r
 \r
   //  Enables / disables API Can_MainFunction_BusOff() for handling busoff\r
   //  events in polling mode.\r
   // INTERRUPT or POLLING\r
-  Can_EcoreProcessType CanBusOffProcessing;\r
+  Can_Arc_ProcessType CanBusOffProcessing;\r
 \r
   // Defines if a CAN controller is used in the configuration.\r
   boolean CanControllerActivation;\r
@@ -226,15 +226,15 @@ typedef struct {
 \r
   //  Enables / disables API Can_MainFunction_Read() for handling PDU\r
   //  reception events in polling mode.\r
-  Can_EcoreProcessType CanRxProcessing;\r
+  Can_Arc_ProcessType CanRxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Write() for handling PDU\r
   //  transmission events in polling mode.\r
-  Can_EcoreProcessType CanTxProcessing;\r
+  Can_Arc_ProcessType CanTxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Wakeup() for handling wakeup\r
   //  events in polling mode.\r
-  Can_EcoreProcessType CanWakeupProcessing;\r
+  Can_Arc_ProcessType CanWakeupProcessing;\r
 \r
   //  Reference to the CPU clock configuration, which is set in the MCU driver\r
   //  configuration\r
@@ -246,16 +246,16 @@ typedef struct {
   uint32 CanWakeupSourceRef;\r
 \r
   //\r
-  // Ecore stuff\r
+  // ArcCore stuff\r
   //\r
 \r
   // List of Hoh id's that belong to this controller\r
-  const Can_HardwareObjectType  *CanEcoreHoh;\r
+  const Can_HardwareObjectType  *Can_Arc_Hoh;\r
 \r
-  boolean CanEcoreLoopback;\r
+  boolean Can_Arc_Loopback;\r
 \r
   // Set this to use the fifo\r
-  boolean CanEcoreFifo;\r
+  boolean Can_Arc_Fifo;\r
 \r
 } Can_ControllerConfigType;\r
 \r
index 10d935188e6b774832f854fc084db4abfc4771a2..242c82608e9caf183e16f564188d77b403e46ec0 100644 (file)
@@ -52,24 +52,24 @@ Can_FilterMaskType Can_FilterMaskConfigData = 0;
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask = 0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask = 0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -77,24 +77,24 @@ const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_C[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -110,15 +110,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_A,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_A[0],\r
-    .CanEcoreLoopback = 0,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_A[0],\r
+    .Can_Arc_Loopback = 0,\r
+    .Can_Arc_Fifo = 0,\r
 \r
   },{\r
     .CanControllerActivation = TRUE,\r
@@ -127,15 +127,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_C,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_C[0],\r
-    .CanEcoreLoopback = 1,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_C[0],\r
+    .Can_Arc_Loopback = 1,\r
+    .Can_Arc_Fifo = 0,\r
   }\r
 };\r
 \r
@@ -148,7 +148,7 @@ const Can_CallbackType CanCallbackConfigData = {
     CanIf_ControllerBusOff,\r
     CanIf_TxConfirmation,\r
     NULL, //CanIf_ControllerWakeup,\r
-    CanIf_EcoreError,\r
+    CanIf_Arc_Error,\r
 };\r
 \r
 /* Configset configuration information\r
index 3b50632fe875f7230929eb008c19bff9835da45c..33eae746cd37be07a5f5ce691f5d2ad04046bcff 100644 (file)
@@ -50,7 +50,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -80,7 +80,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -110,7 +110,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -140,7 +140,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -174,7 +174,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -204,7 +204,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -234,7 +234,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -264,7 +264,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -296,7 +296,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -326,7 +326,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -356,7 +356,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -386,7 +386,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -418,7 +418,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -448,7 +448,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -478,7 +478,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -508,7 +508,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -520,7 +520,7 @@ ComSignal_type PCAN_ComSignal[] = {
                }\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -530,7 +530,7 @@ ComIPduGroup_type PCAN_ComIPduGroup[] = {
                .ComIPduGroupHandleId = 0\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -633,7 +633,7 @@ ComIPdu_type PCAN_ComIPdu[] = {
        },\r
 \r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -687,7 +687,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 16,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -717,7 +717,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 16,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -749,8 +749,8 @@ ComSignal_type HardwareTest_ComSignal[] = {
                //.ComTimeoutNotification = NULL,\r
                //.ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 42,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
-               .ComEcoreIsSignalGroup = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
+               .Com_Arc_IsSignalGroup = 1,\r
                .ComGroupSignal = {\r
                        &HardwareTest_ComGroupSignal[0],\r
                        &HardwareTest_ComGroupSignal[1],\r
@@ -766,7 +766,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                }*/\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -782,7 +782,7 @@ ComIPduGroup_type HardwareTest_ComIPduGroup[] = {
                .ComIPduGroupHandleId = 2\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -848,7 +848,7 @@ ComIPdu_type HardwareTest_ComIPdu[] = {
                },\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
index fdd85d1b4e2fae51336de9203cf1039addfc4f1e..e46a25ee6193847cf123d8ed19605f1a8a4faa08 100644 (file)
@@ -182,9 +182,9 @@ typedef enum
 
 typedef enum
 {
-  SPI_ECORE_TRANSFER_START_LSB,
-  SPI_ECORE_TRANSFER_START_MSB,
-} Spi_EcoreTransferStartType;
+  SPI_ARC_TRANSFER_START_LSB,
+  SPI_ARC_TRANSFER_START_MSB,
+} Spi_Arc_TransferStartType;
 
 
 typedef enum {
@@ -217,7 +217,7 @@ typedef struct
   Spi_NumberOfDataType SpiIbNBuffers;
 
   // This parameter defines the first starting bit for transmission.
-  Spi_EcoreTransferStartType SpiTransferStart;
+  Spi_Arc_TransferStartType SpiTransferStart;
 
   //
   _Bool SpiDmaNoIncreaseSrc;
@@ -289,7 +289,7 @@ typedef struct
   // Timing between PCS and first edge of SCK. Unit ns.
   uint32 SpiTimeCs2Clk;
 
-  // Ecore extension...
+  // ArcCore extension...
   // The controller ID(0..3)
   //uint32 SpiControllerId;
 
index 95d238c1900d8317055f89dc609bc98a42058b28..74c7da3b01908959c197d5be74265f9793cb5bf6 100644 (file)
@@ -92,7 +92,7 @@ typedef struct {
        void (*RxIndication)(void *); //(const Can_PduType *);\r
        void (*ControllerBusOff)(uint8);\r
        void (*ControllerWakeup)(uint8);\r
-       void (*EcoreError)(uint8,uint32);\r
+       void (*Arc_Error)(uint8,uint32);\r
 } CanIf_CallbackType;\r
 \r
 \r
@@ -123,7 +123,7 @@ typedef struct {
 typedef struct {\r
        //      Defines the HRH type i.e, whether its a BasicCan or FullCan. If BasicCan is\r
        //      configured, software filtering is enabled.\r
-  Can_EcoreHohType CanIfHrhType;\r
+  Can_Arc_HohType CanIfHrhType;\r
 \r
        //      Selects the hardware receive objects by using the HRH range/list from\r
        //      CAN Driver configuration to define, for which HRH a software filtering has\r
@@ -139,14 +139,14 @@ typedef struct {
        //      configuration. The HRH id is unique in a given CAN Driver. The HRH Ids\r
        //      are defined in the CAN Driver Module and hence it is derived from CAN\r
        //      Driver Configuration.\r
-       Can_EcoreHRHType CanIfHrhIdSymRef ;\r
+       Can_Arc_HRHType CanIfHrhIdSymRef ;\r
 \r
        //      Defines the parameters required for configuraing multiple\r
        //      CANID ranges for a given same HRH.\r
        const CanIf_HrhRangeConfigType *CanIfHrhRangeConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HrhConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -156,7 +156,7 @@ typedef struct {
 \r
 typedef struct {\r
   //  Defines the HTH type i.e, whether its a BasicCan or FullCan.\r
-  Can_EcoreHohType CanIfHthType;\r
+  Can_Arc_HohType CanIfHthType;\r
 \r
   // Reference to controller Id to which the HTH belongs to. A controller\r
   // can contain one or more HTHs\r
@@ -166,10 +166,10 @@ typedef struct {
   //  configuration. The HTH id is unique in a given CAN Driver. The HTH Ids\r
   //  are defined in the CAN Driver Module and hence it is derived from CAN\r
   //  Driver Configuration.\r
-  Can_EcoreHTHType CanIfHthIdSymRef ;\r
+  Can_Arc_HTHType CanIfHthIdSymRef ;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HthConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -189,7 +189,7 @@ typedef struct {
   const CanIf_HthConfigType *CanIfHthConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_InitHohConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -317,7 +317,7 @@ typedef struct {
 \r
        // Acceptance filters, 1 - care, 0 - don't care.\r
        // Is enabled by the CanIfSoftwareFilterMask in CanIf_HrhConfigType\r
-       // Ecore exension\r
+       // ArcCore exension\r
        uint32 CanIfCanRxPduCanIdMask;\r
 \r
 } CanIf_RxPduConfigType;\r
@@ -383,8 +383,8 @@ typedef struct {
        //  Multiplicity: 0..1\r
        void (*CanIfWakeupValidNotification)();\r
 \r
-       // Ecore ext.\r
-       void (*CanIfErrorNotificaton)(uint8,Can_EcoreErrorType);\r
+       // ArcCore ext.\r
+       void (*CanIfErrorNotificaton)(uint8,Can_Arc_ErrorType);\r
 \r
 } CanIf_DispatchConfigType;\r
 \r
index 93391d6b05d0851610fd53946cdb7dfadb6d1b90..dc1da51a8fe898cc6897dfc7e440083eadd295e0 100644 (file)
@@ -24,7 +24,7 @@
 #define CAN_CFG_H_\r
 \r
 // Number of controller configs\r
-#define CAN_ECORE_CTRL_CONFIG_CNT   2\r
+#define CAN_ARC_CTRL_CONFIG_CNT   2\r
 \r
 #define CAN_DEV_ERROR_DETECT          STD_ON\r
 #define CAN_VERSION_INFO_API          STD_ON\r
@@ -73,9 +73,9 @@ typedef enum {
 } Can_ObjectTypeType;\r
 \r
 typedef enum {\r
-  CAN_ECORE_HANDLE_TYPE_BASIC,\r
-  CAN_ECORE_HANDLE_TYPE_FULL\r
-} Can_EcoreHohType;\r
+  CAN_ARC_HANDLE_TYPE_BASIC,\r
+  CAN_ARC_HANDLE_TYPE_FULL\r
+} Can_Arc_HohType;\r
 \r
 // HTH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -83,7 +83,7 @@ typedef enum {
   CAN_HTH_A_1 = 0,\r
   CAN_HTH_C_1,\r
   NUM_OF_HTHS\r
-} Can_EcoreHTHType;\r
+} Can_Arc_HTHType;\r
 \r
 // HRH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -91,7 +91,7 @@ typedef enum {
   CAN_HRH_A_1 = 0,\r
   CAN_HRH_C_1,\r
   NUM_OF_HRHS\r
-} Can_EcoreHRHType;\r
+} Can_Arc_HRHType;\r
 \r
 // Non-standard type\r
 typedef struct {\r
@@ -100,7 +100,7 @@ typedef struct {
   void (*ControllerBusOff)(uint8);\r
   void (*TxConfirmation)(PduIdType);\r
   void (*ControllerWakeup)(uint8);\r
-  void (*EcoreError)(uint8,Can_EcoreErrorType);\r
+  void (*Arc_Error)(uint8,Can_Arc_ErrorType);\r
 } Can_CallbackType;\r
 \r
 /*\r
@@ -151,7 +151,7 @@ typedef uint32 Can_FilterMaskType;
 //Objects.\r
 typedef struct Can_HardwareObjectStruct {\r
   // Specifies the type (Full-CAN or Basic-CAN) of a hardware object.\r
-  Can_EcoreHohType CanHandleType;\r
+  Can_Arc_HohType CanHandleType;\r
 \r
   // Specifies whether the IdValue is of type - standard identifier - extended\r
   // identifier - mixed mode ImplementationType: Can_IdType\r
@@ -176,10 +176,10 @@ typedef struct Can_HardwareObjectStruct {
 \r
   // A "1" in this mask tells the driver that that HW Message Box should be\r
   // occupied by this Hoh. A "1" in bit 31(ppc) occupies Mb 0 in HW.\r
-  uint32 CanEcoreMbMask;\r
+  uint32 Can_Arc_MbMask;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanEcoreEOL;\r
+  boolean Can_Arc_EOL;\r
 \r
 } Can_HardwareObjectType;\r
 \r
@@ -188,16 +188,16 @@ typedef struct Can_HardwareObjectStruct {
  * CanController container\r
  */\r
 typedef enum {\r
-  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-  CAN_ECORE_PROCESS_TYPE_POLLING,\r
-} Can_EcoreProcessType;\r
+  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+  CAN_ARC_PROCESS_TYPE_POLLING,\r
+} Can_Arc_ProcessType;\r
 \r
 typedef struct {\r
 \r
   //  Enables / disables API Can_MainFunction_BusOff() for handling busoff\r
   //  events in polling mode.\r
   // INTERRUPT or POLLING\r
-  Can_EcoreProcessType CanBusOffProcessing;\r
+  Can_Arc_ProcessType CanBusOffProcessing;\r
 \r
   // Defines if a CAN controller is used in the configuration.\r
   boolean CanControllerActivation;\r
@@ -226,15 +226,15 @@ typedef struct {
 \r
   //  Enables / disables API Can_MainFunction_Read() for handling PDU\r
   //  reception events in polling mode.\r
-  Can_EcoreProcessType CanRxProcessing;\r
+  Can_Arc_ProcessType CanRxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Write() for handling PDU\r
   //  transmission events in polling mode.\r
-  Can_EcoreProcessType CanTxProcessing;\r
+  Can_Arc_ProcessType CanTxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Wakeup() for handling wakeup\r
   //  events in polling mode.\r
-  Can_EcoreProcessType CanWakeupProcessing;\r
+  Can_Arc_ProcessType CanWakeupProcessing;\r
 \r
   //  Reference to the CPU clock configuration, which is set in the MCU driver\r
   //  configuration\r
@@ -246,16 +246,16 @@ typedef struct {
   uint32 CanWakeupSourceRef;\r
 \r
   //\r
-  // Ecore stuff\r
+  // ArcCore stuff\r
   //\r
 \r
   // List of Hoh id's that belong to this controller\r
-  const Can_HardwareObjectType  *CanEcoreHoh;\r
+  const Can_HardwareObjectType  *Can_Arc_Hoh;\r
 \r
-  boolean CanEcoreLoopback;\r
+  boolean Can_Arc_Loopback;\r
 \r
   // Set this to use the fifo\r
-  boolean CanEcoreFifo;\r
+  boolean Can_Arc_Fifo;\r
 \r
 } Can_ControllerConfigType;\r
 \r
index 10d935188e6b774832f854fc084db4abfc4771a2..242c82608e9caf183e16f564188d77b403e46ec0 100644 (file)
@@ -52,24 +52,24 @@ Can_FilterMaskType Can_FilterMaskConfigData = 0;
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask = 0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask = 0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -77,24 +77,24 @@ const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_C[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -110,15 +110,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_A,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_A[0],\r
-    .CanEcoreLoopback = 0,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_A[0],\r
+    .Can_Arc_Loopback = 0,\r
+    .Can_Arc_Fifo = 0,\r
 \r
   },{\r
     .CanControllerActivation = TRUE,\r
@@ -127,15 +127,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_C,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_C[0],\r
-    .CanEcoreLoopback = 1,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_C[0],\r
+    .Can_Arc_Loopback = 1,\r
+    .Can_Arc_Fifo = 0,\r
   }\r
 };\r
 \r
@@ -148,7 +148,7 @@ const Can_CallbackType CanCallbackConfigData = {
     CanIf_ControllerBusOff,\r
     CanIf_TxConfirmation,\r
     NULL, //CanIf_ControllerWakeup,\r
-    CanIf_EcoreError,\r
+    CanIf_Arc_Error,\r
 };\r
 \r
 /* Configset configuration information\r
index d9409913b5b42694b988ab8a674982fff1916985..1fb08ef3339991f5b03365ae2db42f40d3218199 100644 (file)
@@ -65,16 +65,16 @@ const CanIf_DispatchConfigType CanIfDispatchConfig =
 const CanIf_HthConfigType CanIfHthConfigData[] =\r
 {\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_0,\r
     .CanIfHthIdSymRef = CAN_HTH_A_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_1,\r
     .CanIfHthIdSymRef = CAN_HTH_C_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -82,18 +82,18 @@ const CanIf_HthConfigType CanIfHthConfigData[] =
 const CanIf_HrhConfigType CanIfHrhConfigData[] =\r
 {\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_0,\r
     .CanIfHrhIdSymRef = CAN_HRH_A_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_1,\r
     .CanIfHrhIdSymRef = CAN_HRH_C_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 //-------------------------------------------------------------------\r
@@ -197,7 +197,7 @@ const CanIf_InitHohConfigType CanIfHohConfigData[] =
     .CanConfigSet = &CanConfigSetData,\r
     .CanIfHrhConfig = CanIfHrhConfigData,\r
     .CanIfHthConfig = CanIfHthConfigData,\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
index 95d238c1900d8317055f89dc609bc98a42058b28..74c7da3b01908959c197d5be74265f9793cb5bf6 100644 (file)
@@ -92,7 +92,7 @@ typedef struct {
        void (*RxIndication)(void *); //(const Can_PduType *);\r
        void (*ControllerBusOff)(uint8);\r
        void (*ControllerWakeup)(uint8);\r
-       void (*EcoreError)(uint8,uint32);\r
+       void (*Arc_Error)(uint8,uint32);\r
 } CanIf_CallbackType;\r
 \r
 \r
@@ -123,7 +123,7 @@ typedef struct {
 typedef struct {\r
        //      Defines the HRH type i.e, whether its a BasicCan or FullCan. If BasicCan is\r
        //      configured, software filtering is enabled.\r
-  Can_EcoreHohType CanIfHrhType;\r
+  Can_Arc_HohType CanIfHrhType;\r
 \r
        //      Selects the hardware receive objects by using the HRH range/list from\r
        //      CAN Driver configuration to define, for which HRH a software filtering has\r
@@ -139,14 +139,14 @@ typedef struct {
        //      configuration. The HRH id is unique in a given CAN Driver. The HRH Ids\r
        //      are defined in the CAN Driver Module and hence it is derived from CAN\r
        //      Driver Configuration.\r
-       Can_EcoreHRHType CanIfHrhIdSymRef ;\r
+       Can_Arc_HRHType CanIfHrhIdSymRef ;\r
 \r
        //      Defines the parameters required for configuraing multiple\r
        //      CANID ranges for a given same HRH.\r
        const CanIf_HrhRangeConfigType *CanIfHrhRangeConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HrhConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -156,7 +156,7 @@ typedef struct {
 \r
 typedef struct {\r
   //  Defines the HTH type i.e, whether its a BasicCan or FullCan.\r
-  Can_EcoreHohType CanIfHthType;\r
+  Can_Arc_HohType CanIfHthType;\r
 \r
   // Reference to controller Id to which the HTH belongs to. A controller\r
   // can contain one or more HTHs\r
@@ -166,10 +166,10 @@ typedef struct {
   //  configuration. The HTH id is unique in a given CAN Driver. The HTH Ids\r
   //  are defined in the CAN Driver Module and hence it is derived from CAN\r
   //  Driver Configuration.\r
-  Can_EcoreHTHType CanIfHthIdSymRef ;\r
+  Can_Arc_HTHType CanIfHthIdSymRef ;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_HthConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -189,7 +189,7 @@ typedef struct {
   const CanIf_HthConfigType *CanIfHthConfig;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanIfEcoreEOL;\r
+  boolean CanIf_Arc_EOL;\r
 } CanIf_InitHohConfigType;\r
 \r
 //-------------------------------------------------------------------\r
@@ -317,7 +317,7 @@ typedef struct {
 \r
        // Acceptance filters, 1 - care, 0 - don't care.\r
        // Is enabled by the CanIfSoftwareFilterMask in CanIf_HrhConfigType\r
-       // Ecore exension\r
+       // ArcCore exension\r
        uint32 CanIfCanRxPduCanIdMask;\r
 \r
 } CanIf_RxPduConfigType;\r
@@ -383,8 +383,8 @@ typedef struct {
        //  Multiplicity: 0..1\r
        void (*CanIfWakeupValidNotification)();\r
 \r
-       // Ecore ext.\r
-       void (*CanIfErrorNotificaton)(uint8,Can_EcoreErrorType);\r
+       // ArcCore ext.\r
+       void (*CanIfErrorNotificaton)(uint8,Can_Arc_ErrorType);\r
 \r
 } CanIf_DispatchConfigType;\r
 \r
index 2586f0ecdf673123c0d9ce904b3beb703963c92c..a8bcc8a90a33c3367a6c28baefdf4a449c045121 100644 (file)
@@ -24,7 +24,7 @@
 #define CAN_CFG_H_\r
 \r
 // Number of controller configs\r
-#define CAN_ECORE_CTRL_CONFIG_CNT   2\r
+#define CAN_ARC_CTRL_CONFIG_CNT   2\r
 \r
 #define CAN_DEV_ERROR_DETECT          STD_ON\r
 #define CAN_VERSION_INFO_API          STD_ON\r
@@ -72,9 +72,9 @@ typedef enum {
 } Can_ObjectTypeType;\r
 \r
 typedef enum {\r
-  CAN_ECORE_HANDLE_TYPE_BASIC,\r
-  CAN_ECORE_HANDLE_TYPE_FULL\r
-} Can_EcoreHohType;\r
+  CAN_ARC_HANDLE_TYPE_BASIC,\r
+  CAN_ARC_HANDLE_TYPE_FULL\r
+} Can_Arc_HohType;\r
 \r
 // HTH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -82,7 +82,7 @@ typedef enum {
   CAN_HTH_A_1 = 0,\r
   CAN_HTH_C_1,\r
   NUM_OF_HTHS\r
-} Can_EcoreHTHType;\r
+} Can_Arc_HTHType;\r
 \r
 // HRH definitions\r
 // Due to effiency: Start with index 0 and don't use any holes in the enumeration\r
@@ -90,7 +90,7 @@ typedef enum {
   CAN_HRH_A_1 = 0,\r
   CAN_HRH_C_1,\r
   NUM_OF_HRHS\r
-} Can_EcoreHRHType;\r
+} Can_Arc_HRHType;\r
 \r
 // Non-standard type\r
 typedef struct {\r
@@ -99,7 +99,7 @@ typedef struct {
   void (*ControllerBusOff)(uint8);\r
   void (*TxConfirmation)(PduIdType);\r
   void (*ControllerWakeup)(uint8);\r
-  void (*EcoreError)(uint8,Can_EcoreErrorType);\r
+  void (*Arc_Error)(uint8,Can_Arc_ErrorType);\r
 } Can_CallbackType;\r
 \r
 /*\r
@@ -150,7 +150,7 @@ typedef uint32 Can_FilterMaskType;
 //Objects.\r
 typedef struct Can_HardwareObjectStruct {\r
   // Specifies the type (Full-CAN or Basic-CAN) of a hardware object.\r
-  Can_EcoreHohType CanHandleType;\r
+  Can_Arc_HohType CanHandleType;\r
 \r
   // Specifies whether the IdValue is of type - standard identifier - extended\r
   // identifier - mixed mode ImplementationType: Can_IdType\r
@@ -175,10 +175,10 @@ typedef struct Can_HardwareObjectStruct {
 \r
   // A "1" in this mask tells the driver that that HW Message Box should be\r
   // occupied by this Hoh. A "1" in bit 31(ppc) occupies Mb 0 in HW.\r
-  uint32 CanEcoreMbMask;\r
+  uint32 Can_Arc_MbMask;\r
 \r
   // End Of List. Set to TRUE is this is the last object in the list.\r
-  boolean CanEcoreEOL;\r
+  boolean Can_Arc_EOL;\r
 \r
 } Can_HardwareObjectType;\r
 \r
@@ -187,16 +187,16 @@ typedef struct Can_HardwareObjectStruct {
  * CanController container\r
  */\r
 typedef enum {\r
-  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-  CAN_ECORE_PROCESS_TYPE_POLLING,\r
-} Can_EcoreProcessType;\r
+  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+  CAN_ARC_PROCESS_TYPE_POLLING,\r
+} Can_Arc_ProcessType;\r
 \r
 typedef struct {\r
 \r
   //  Enables / disables API Can_MainFunction_BusOff() for handling busoff\r
   //  events in polling mode.\r
   // INTERRUPT or POLLING\r
-  Can_EcoreProcessType CanBusOffProcessing;\r
+  Can_Arc_ProcessType CanBusOffProcessing;\r
 \r
   // Defines if a CAN controller is used in the configuration.\r
   boolean CanControllerActivation;\r
@@ -225,15 +225,15 @@ typedef struct {
 \r
   //  Enables / disables API Can_MainFunction_Read() for handling PDU\r
   //  reception events in polling mode.\r
-  Can_EcoreProcessType CanRxProcessing;\r
+  Can_Arc_ProcessType CanRxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Write() for handling PDU\r
   //  transmission events in polling mode.\r
-  Can_EcoreProcessType CanTxProcessing;\r
+  Can_Arc_ProcessType CanTxProcessing;\r
 \r
   //  Enables / disables API Can_MainFunction_Wakeup() for handling wakeup\r
   //  events in polling mode.\r
-  Can_EcoreProcessType CanWakeupProcessing;\r
+  Can_Arc_ProcessType CanWakeupProcessing;\r
 \r
   //  Reference to the CPU clock configuration, which is set in the MCU driver\r
   //  configuration\r
@@ -245,16 +245,16 @@ typedef struct {
   uint32 CanWakeupSourceRef;\r
 \r
   //\r
-  // Ecore stuff\r
+  // ArcCore stuff\r
   //\r
 \r
   // List of Hoh id's that belong to this controller\r
-  const Can_HardwareObjectType  *CanEcoreHoh;\r
+  const Can_HardwareObjectType  *Can_Arc_Hoh;\r
 \r
-  boolean CanEcoreLoopback;\r
+  boolean Can_Arc_Loopback;\r
 \r
   // Set this to use the fifo\r
-  boolean CanEcoreFifo;\r
+  boolean Can_Arc_Fifo;\r
 \r
 } Can_ControllerConfigType;\r
 \r
index 10d935188e6b774832f854fc084db4abfc4771a2..242c82608e9caf183e16f564188d77b403e46ec0 100644 (file)
@@ -52,24 +52,24 @@ Can_FilterMaskType Can_FilterMaskConfigData = 0;
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask = 0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask = 0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_EXTENDED,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_A_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -77,24 +77,24 @@ const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_A[] =
 const Can_HardwareObjectType CanHardwareObjectConfig_CTRL_C[] =\r
 {\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_RECEIVE,\r
     .CanObjectId =      CAN_HRH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0x00ff0000,\r
-    .CanEcoreEOL = 0,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0x00ff0000,\r
+    .Can_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanHandleType =    CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanHandleType =    CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIdType =        CAN_ID_TYPE_STANDARD,\r
     .CanObjectType =    CAN_OBJECT_TYPE_TRANSMIT,\r
     .CanObjectId =      CAN_HTH_C_1,\r
     .CanFilterMaskRef = &Can_FilterMaskConfigData,\r
-    // Ecore\r
-    .CanEcoreMbMask =   0xff000000,\r
-    .CanEcoreEOL = 1,\r
+    // ArcCore\r
+    .Can_Arc_MbMask =   0xff000000,\r
+    .Can_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -110,15 +110,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_A,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_A[0],\r
-    .CanEcoreLoopback = 0,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_A[0],\r
+    .Can_Arc_Loopback = 0,\r
+    .Can_Arc_Fifo = 0,\r
 \r
   },{\r
     .CanControllerActivation = TRUE,\r
@@ -127,15 +127,15 @@ const Can_ControllerConfigType CanControllerConfigData[] =
     .CanControllerPropSeg = 4,\r
     .CanControllerSeg1 =    4,\r
     .CanControllerSeg2 =    4,\r
-    .CanBusOffProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanRxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanTxProcessing =      CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
-    .CanWakeupProcessing =  CAN_ECORE_PROCESS_TYPE_INTERRUPT,\r
+    .CanBusOffProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanRxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanTxProcessing =      CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
+    .CanWakeupProcessing =  CAN_ARC_PROCESS_TYPE_INTERRUPT,\r
     .CanCpuClockRef = PERIPHERAL_CLOCK_FLEXCAN_C,\r
-    // Ecore\r
-    .CanEcoreHoh = &CanHardwareObjectConfig_CTRL_C[0],\r
-    .CanEcoreLoopback = 1,\r
-    .CanEcoreFifo = 0,\r
+    // ArcCore\r
+    .Can_Arc_Hoh = &CanHardwareObjectConfig_CTRL_C[0],\r
+    .Can_Arc_Loopback = 1,\r
+    .Can_Arc_Fifo = 0,\r
   }\r
 };\r
 \r
@@ -148,7 +148,7 @@ const Can_CallbackType CanCallbackConfigData = {
     CanIf_ControllerBusOff,\r
     CanIf_TxConfirmation,\r
     NULL, //CanIf_ControllerWakeup,\r
-    CanIf_EcoreError,\r
+    CanIf_Arc_Error,\r
 };\r
 \r
 /* Configset configuration information\r
index 3b50632fe875f7230929eb008c19bff9835da45c..33eae746cd37be07a5f5ce691f5d2ad04046bcff 100644 (file)
@@ -50,7 +50,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -80,7 +80,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -110,7 +110,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -140,7 +140,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -174,7 +174,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -204,7 +204,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -234,7 +234,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -264,7 +264,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -296,7 +296,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -326,7 +326,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -356,7 +356,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -386,7 +386,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -418,7 +418,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -448,7 +448,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -478,7 +478,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -508,7 +508,7 @@ ComSignal_type PCAN_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 0,\r
-               .ComSignalEcoreUseUpdateBit = 0,\r
+               .ComSignalArcUseUpdateBit = 0,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -520,7 +520,7 @@ ComSignal_type PCAN_ComSignal[] = {
                }\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -530,7 +530,7 @@ ComIPduGroup_type PCAN_ComIPduGroup[] = {
                .ComIPduGroupHandleId = 0\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -633,7 +633,7 @@ ComIPdu_type PCAN_ComIPdu[] = {
        },\r
 \r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -687,7 +687,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 16,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -717,7 +717,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                .ComTimeoutNotification = NULL,\r
                .ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 16,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
                .ComFilter = {\r
                        .ComFilterAlgorithm = ALWAYS,\r
                        .ComFilterMask = 0,\r
@@ -749,8 +749,8 @@ ComSignal_type HardwareTest_ComSignal[] = {
                //.ComTimeoutNotification = NULL,\r
                //.ComTransferProperty = TRIGGERED,\r
                .ComUpdateBitPosition = 42,\r
-               .ComSignalEcoreUseUpdateBit = 1,\r
-               .ComEcoreIsSignalGroup = 1,\r
+               .ComSignalArcUseUpdateBit = 1,\r
+               .Com_Arc_IsSignalGroup = 1,\r
                .ComGroupSignal = {\r
                        &HardwareTest_ComGroupSignal[0],\r
                        &HardwareTest_ComGroupSignal[1],\r
@@ -766,7 +766,7 @@ ComSignal_type HardwareTest_ComSignal[] = {
                }*/\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -782,7 +782,7 @@ ComIPduGroup_type HardwareTest_ComIPduGroup[] = {
                .ComIPduGroupHandleId = 2\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -848,7 +848,7 @@ ComIPdu_type HardwareTest_ComIPdu[] = {
                },\r
        },\r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
index a66b74a0529576f3e9022ad42b38742cbfa2f29f..b9923c9d38b3ff71b612656d4874e8b70ea7f7a8 100644 (file)
@@ -181,9 +181,9 @@ typedef enum
 
 typedef enum
 {
-  SPI_ECORE_TRANSFER_START_LSB,
-  SPI_ECORE_TRANSFER_START_MSB,
-} Spi_EcoreTransferStartType;
+  SPI_ARC_TRANSFER_START_LSB,
+  SPI_ARC_TRANSFER_START_MSB,
+} Spi_Arc_TransferStartType;
 
 
 typedef enum {
@@ -216,7 +216,7 @@ typedef struct
   Spi_NumberOfDataType SpiIbNBuffers;
 
   // This parameter defines the first starting bit for transmission.
-  Spi_EcoreTransferStartType SpiTransferStart;
+  Spi_Arc_TransferStartType SpiTransferStart;
 
   //
   _Bool SpiDmaNoIncreaseSrc;
@@ -288,7 +288,7 @@ typedef struct
   // Timing between PCS and first edge of SCK. Unit ns.
   uint32 SpiTimeCs2Clk;
 
-  // Ecore extension...
+  // ArcCore extension...
   // The controller ID(0..3)
   //uint32 SpiControllerId;
 
index 481fddee703af06131a49429968da3b888f76a12..b4fb6b5f46c1b33000d7977ddccd6300d03e1cb8 100644 (file)
@@ -84,7 +84,7 @@ typedef struct
   CanIf_ChannelPrivateType channelData[CANIF_CHANNEL_CNT];
 } CanIf_GlobalType;
 
-static CanIf_Arc_ChannelIdType CanIf_Arc_FindHrhChannel( Can_EcoreHRHType hrh )
+static CanIf_Arc_ChannelIdType CanIf_Arc_FindHrhChannel( Can_Arc_HRHType hrh )
 {
   const CanIf_HrhConfigType *hrhConfig;
 
@@ -96,7 +96,7 @@ static CanIf_Arc_ChannelIdType CanIf_Arc_FindHrhChannel( Can_EcoreHRHType hrh )
     hrhConfig++;
     if (hrhConfig->CanIfHrhIdSymRef == hrh)
       return hrhConfig->CanIfCanControllerHrhIdRef;
-  } while(!hrhConfig->CanIfEcoreEOL);
+  } while(!hrhConfig->CanIf_Arc_EOL);
 
   DET_REPORTERROR(MODULE_ID_CANIF, 0, CANIF_RXINDICATION_ID, CANIF_E_PARAM_HRH);
 
@@ -552,15 +552,15 @@ void CanIf_SetDynamicTxId(PduIdType CanTxPduId, Can_IdType CanId)
   }
 
   // Check that this is a dymanic PDU
-  if (txEntry->CanIfCanTxPduType != ECORE_PDU_TYPE_DYNAMIC)
+  if (txEntry->CanIfCanTxPduType != ARC_PDU_TYPE_DYNAMIC)
   {
     VALIDATE_NO_RV(FALSE, CANIF_SETDYNAMICTX_ID, CANIF_E_INVALID_TXPDUID);
     return;
   }
 
   // Check that this is an extended or standard id
-  if (((CanId & 0x80000000) && (txEntry->CanIfTxPduIdCanIdType == ECORE_CAN_ID_TYPE_29)) ||
-      (((CanId & 0x80000000) == 0) && (txEntry->CanIfTxPduIdCanIdType == ECORE_CAN_ID_TYPE_11)))
+  if (((CanId & 0x80000000) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_29)) ||
+      (((CanId & 0x80000000) == 0) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_11)))
   {
     // Update the CanID
     //txEntry->CanIfCanTxPduIdCanId = CanId;  // TODO How do we fix this from a const pointer
@@ -702,7 +702,7 @@ void CanIf_RxIndication(uint8 Hrh, Can_IdType CanId, uint8 CanDlc,
     if (entry->CanIfCanRxPduHrhRef->CanIfHrhIdSymRef == Hrh)
     {
       // Software filtering
-      if (entry->CanIfCanRxPduHrhRef->CanIfHrhType == CAN_ECORE_HANDLE_TYPE_BASIC)
+      if (entry->CanIfCanRxPduHrhRef->CanIfHrhType == CAN_ARC_HANDLE_TYPE_BASIC)
       {
         if (entry->CanIfCanRxPduHrhRef->CanIfSoftwareFilterHrh)
         {
@@ -822,13 +822,13 @@ void CanIf_SetWakeupEvent(uint8 Controller)
   // Not supported
 }
 
-void CanIf_EcoreError(uint8 Controller, Can_EcoreErrorType Error)
+void CanIf_Arc_Error(uint8 Controller, Can_Arc_ErrorType Error)
 {
   // We call this a CanIf channel. Hopefully makes it easier to follow.
   CanIf_Arc_ChannelIdType channel = Controller;
 
-  VALIDATE_NO_RV( CanIf_Global.initRun, CANIF_ECOREERROR_ID, CANIF_E_UNINIT );
-  VALIDATE_NO_RV( channel < CANIF_CHANNEL_CNT, CANIF_ECOREERROR_ID, CANIF_E_PARAM_CONTROLLER );
+  VALIDATE_NO_RV( CanIf_Global.initRun, CANIF_ARCERROR_ID, CANIF_E_UNINIT );
+  VALIDATE_NO_RV( channel < CANIF_CHANNEL_CNT, CANIF_ARCERROR_ID, CANIF_E_PARAM_CONTROLLER );
 
   if (CanIf_ConfigPtr->DispatchConfig->CanIfErrorNotificaton != NULL)
   {
index 42ad9f86495261045e7961c43421438510f93cca..fac200af0fb7a43367e52d5550d5ea65aa40c760 100644 (file)
 \r
 const Com_ConfigType * ComConfig;\r
 \r
-ComEcoreIPdu_type ComEcoreIPdu[COM_MAX_NR_IPDU];\r
-ComEcoreSignal_type ComEcoreSignal[COM_MAX_NR_SIGNAL];\r
-ComEcoreGroupSignal_type ComEcoreGroupSignal[COM_MAX_NR_GROUPSIGNAL];\r
-\r
-ComEcoreConfig_type ComEcoreConfig = {\r
-       .ComIPdu = ComEcoreIPdu,\r
-       .ComSignal = ComEcoreSignal,\r
-       .ComGroupSignal = ComEcoreGroupSignal\r
+Com_Arc_IPdu_type Com_Arc_IPdu[COM_MAX_NR_IPDU];\r
+Com_Arc_Signal_type Com_Arc_Signal[COM_MAX_NR_SIGNAL];\r
+Com_Arc_GroupSignal_type Com_Arc_GroupSignal[COM_MAX_NR_GROUPSIGNAL];\r
+\r
+Com_Arc_Config_type Com_Arc_Config = {\r
+       .ComIPdu = Com_Arc_IPdu,\r
+       .ComSignal = Com_Arc_Signal,\r
+       .ComGroupSignal = Com_Arc_GroupSignal\r
 };\r
 \r
 \r
@@ -54,18 +54,18 @@ void Com_Init(const Com_ConfigType *config ) {
        uint32 earliestDeadline;\r
        uint32 firstTimeout;\r
 \r
-       ComEcoreConfig.OutgoingPdu.SduDataPtr = malloc(8);\r
+       Com_Arc_Config.OutgoingPdu.SduDataPtr = malloc(8);\r
 \r
        // Initialize each IPdu\r
        //ComIPdu_type *IPdu;\r
-       //ComEcoreIPdu_type *EcoreIPdu;\r
+       //Com_Arc_IPdu_type *Arc_IPdu;\r
        const ComSignal_type *Signal;\r
        const ComGroupSignal_type *GroupSignal;\r
-       for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
-               ComEcoreConfig.ComNIPdu++;\r
+       for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
+               Com_Arc_Config.ComNIPdu++;\r
 \r
                ComGetIPdu(i);\r
-               ComGetEcoreIPdu(i);\r
+               ComGetArcIPdu(i);\r
 \r
                if (i >= COM_MAX_NR_IPDU) {\r
                        DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_TOO_MANY_IPDU);\r
@@ -76,8 +76,8 @@ void Com_Init(const Com_ConfigType *config ) {
                // If this is a TX and cyclic IPdu, configure the first deadline.\r
                if (IPdu->ComIPduDirection == SEND &&\r
                                (IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == PERIODIC || IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == MIXED)) {\r
-                       //IPdu->ComEcoreTxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimeOffsetFactor;\r
-                       EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimeOffsetFactor;\r
+                       //IPdu->Com_Arc_TxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimeOffsetFactor;\r
+                       Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimeOffsetFactor;\r
                }\r
 \r
 \r
@@ -86,23 +86,23 @@ void Com_Init(const Com_ConfigType *config ) {
                firstTimeout = -1;\r
 \r
                // Reserve memory for all defined signals.\r
-               EcoreIPdu->ComIPduDataPtr = malloc(IPdu->ComIPduSize);\r
-               if (EcoreIPdu->ComIPduDataPtr == NULL) {\r
+               Arc_IPdu->ComIPduDataPtr = malloc(IPdu->ComIPduSize);\r
+               if (Arc_IPdu->ComIPduDataPtr == NULL) {\r
                        failure = 1;\r
                }\r
 \r
                // Initialize the memory with the default value.\r
                if (IPdu->ComIPduDirection == SEND) {\r
-                       memset(EcoreIPdu->ComIPduDataPtr, IPdu->ComTxIPdu.ComTxIPduUnusedAreasDefault, IPdu->ComIPduSize);\r
+                       memset(Arc_IPdu->ComIPduDataPtr, IPdu->ComTxIPdu.ComTxIPduUnusedAreasDefault, IPdu->ComIPduSize);\r
                }\r
 \r
                // For each signal in this PDU.\r
                for (int j = 0; IPdu->ComIPduSignalRef[j] != NULL; j++) {\r
                        Signal = IPdu->ComIPduSignalRef[j];\r
-                       ComGetEcoreSignal(Signal->ComHandleId);\r
+                       ComGetArcSignal(Signal->ComHandleId);\r
 \r
                        // If this signal already has been configured this is most likely an error.\r
-                       if (EcoreSignal->ComIPduDataPtr != NULL) {\r
+                       if (Arc_Signal->ComIPduDataPtr != NULL) {\r
                                DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_SIGNAL_CONFIGURATION);\r
                                failure = 1;\r
                        }\r
@@ -110,10 +110,10 @@ void Com_Init(const Com_ConfigType *config ) {
                        // Configure signal deadline monitoring if used.\r
                        if (Signal->ComTimeoutFactor > 0) {\r
 \r
-                               if (Signal->ComSignalEcoreUseUpdateBit) {\r
+                               if (Signal->ComSignalArcUseUpdateBit) {\r
                                        // This signal uses an update bit, and hence has its own deadline monitoring.\r
-                                       EcoreSignal->ComEcoreDeadlineCounter = Signal->ComFirstTimeoutFactor; // Configure the deadline counter\r
-                                       EcoreSignal->ComTimeoutFactor = Signal->ComTimeoutFactor;\r
+                                       Arc_Signal->Com_Arc_DeadlineCounter = Signal->ComFirstTimeoutFactor; // Configure the deadline counter\r
+                                       Arc_Signal->ComTimeoutFactor = Signal->ComTimeoutFactor;\r
 \r
                                } else {\r
                                        // This signal does not use an update bit, and should therefore use per I-PDU deadline monitoring.\r
@@ -128,39 +128,39 @@ void Com_Init(const Com_ConfigType *config ) {
                        }\r
 \r
                        // Increment helper counters\r
-                   EcoreIPdu->NComIPduSignalRef = j + 1;\r
+                   Arc_IPdu->NComIPduSignalRef = j + 1;\r
 \r
-                       //IPdu->ComEcoreNIPduSignalGroupRef = j + 1;\r
+                       //IPdu->Com_Arc_NIPduSignalGroupRef = j + 1;\r
 \r
-                       EcoreSignal->ComIPduDataPtr = EcoreIPdu->ComIPduDataPtr;\r
-                       EcoreSignal->ComIPduHandleId = i;\r
+                       Arc_Signal->ComIPduDataPtr = Arc_IPdu->ComIPduDataPtr;\r
+                       Arc_Signal->ComIPduHandleId = i;\r
 \r
                        // Clear update bits\r
-                       if (Signal->ComSignalEcoreUseUpdateBit) {\r
-                               clearBit(EcoreIPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
+                       if (Signal->ComSignalArcUseUpdateBit) {\r
+                               clearBit(Arc_IPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
                        }\r
 \r
                        // If this signal is a signal group\r
-                       if (Signal->ComEcoreIsSignalGroup) {\r
-                               EcoreSignal->ComEcoreShadowBuffer = malloc(IPdu->ComIPduSize);\r
+                       if (Signal->Com_Arc_IsSignalGroup) {\r
+                               Arc_Signal->Com_Arc_ShadowBuffer = malloc(IPdu->ComIPduSize);\r
 \r
-                               if (EcoreSignal->ComEcoreShadowBuffer == NULL) {\r
+                               if (Arc_Signal->Com_Arc_ShadowBuffer == NULL) {\r
                                        failure = 1;\r
                                }\r
 \r
                                // For each group signal of this signal group.\r
                                for(int h = 0; Signal->ComGroupSignal[h] != NULL; h++) {\r
                                        GroupSignal = Signal->ComGroupSignal[h];\r
-                                       ComGetEcoreGroupSignal(GroupSignal->ComHandleId);\r
+                                       ComGetArcGroupSignal(GroupSignal->ComHandleId);\r
                                        // Set pointer to shadow buffer\r
-                                       EcoreGroupSignal->ComEcoreShadowBuffer = EcoreSignal->ComEcoreShadowBuffer;\r
+                                       Arc_GroupSignal->Com_Arc_ShadowBuffer = Arc_Signal->Com_Arc_ShadowBuffer;\r
                                        // Initialize group signal data.\r
-                                       Com_CopyData(EcoreIPdu->ComIPduDataPtr, &GroupSignal->ComSignalInitValue, GroupSignal->ComBitSize, GroupSignal->ComBitPosition, 0);\r
+                                       Com_CopyData(Arc_IPdu->ComIPduDataPtr, &GroupSignal->ComSignalInitValue, GroupSignal->ComBitSize, GroupSignal->ComBitPosition, 0);\r
                                }\r
 \r
                        } else {\r
                                // Initialize signal data.\r
-                               Com_CopyData(EcoreIPdu->ComIPduDataPtr, &Signal->ComSignalInitValue, Signal->ComBitSize, Signal->ComBitPosition, 0);\r
+                               Com_CopyData(Arc_IPdu->ComIPduDataPtr, &Signal->ComSignalInitValue, Signal->ComBitSize, Signal->ComBitPosition, 0);\r
                        }\r
 \r
                        // Check filter configuration\r
@@ -199,11 +199,11 @@ void Com_Init(const Com_ConfigType *config ) {
                // Configure per I-PDU based deadline monitoring.\r
                for (int j = 0; IPdu->ComIPduSignalRef[j] != NULL; j++) {\r
                        Signal = IPdu->ComIPduSignalRef[j];\r
-                       ComGetEcoreSignal(Signal->ComHandleId);\r
+                       ComGetArcSignal(Signal->ComHandleId);\r
 \r
-                       if (Signal->ComTimeoutFactor > 0 && !Signal->ComSignalEcoreUseUpdateBit) {\r
-                               EcoreSignal->ComTimeoutFactor = earliestDeadline;\r
-                               EcoreSignal->ComEcoreDeadlineCounter = firstTimeout;\r
+                       if (Signal->ComTimeoutFactor > 0 && !Signal->ComSignalArcUseUpdateBit) {\r
+                               Arc_Signal->ComTimeoutFactor = earliestDeadline;\r
+                               Arc_Signal->Com_Arc_DeadlineCounter = firstTimeout;\r
                        }\r
                }\r
        }\r
@@ -212,7 +212,7 @@ void Com_Init(const Com_ConfigType *config ) {
        // An error occurred.\r
        if (failure) {\r
                // Free allocated memory\r
-               for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
+               for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
                        // Release memory for all defined signals.\r
                        //free(ComConfig->ComIPdu[i].ComIPduDataPtr);\r
                }\r
@@ -229,17 +229,17 @@ void Com_DeInit( void ) {
 }\r
 \r
 void Com_IpduGroupStart(Com_PduGroupIdType IpduGroupId,boolean Initialize) {\r
-       for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
+       for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
                if (ComConfig->ComIPdu[i].ComIPduGroupRef == IpduGroupId) {\r
-                       ComEcoreConfig.ComIPdu[i].ComEcoreIpduStarted = 1;\r
+                       Com_Arc_Config.ComIPdu[i].Com_Arc_IpduStarted = 1;\r
                }\r
        }\r
 }\r
 \r
 void Com_IpduGroupStop(Com_PduGroupIdType IpduGroupId) {\r
-       for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
+       for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
                if (ComConfig->ComIPdu[i].ComIPduGroupRef == IpduGroupId) {\r
-                       ComEcoreConfig.ComIPdu[i].ComEcoreIpduStarted = 0;\r
+                       Com_Arc_Config.ComIPdu[i].Com_Arc_IpduStarted = 0;\r
                }\r
        }\r
 }\r
similarity index 59%
rename from communication/Com/Com_EcoreTypes.h
rename to communication/Com/Com_Arc_Types.h
index aefc8f1b0f4efad5757365092e5221b00e09cbd1..1e87a1fec906fcbbd5cd5f454b69aa9649a653af 100644 (file)
 
 
 typedef struct {\r
-       uint32 ComFilterEcoreN;\r
-       uint32 ComFilterEcoreNewValue;\r
-       uint32 ComFilterEcoreOldValue;\r
-} ComEcoreFilter_type;\r
+       uint32 ComFilterArcN;\r
+       uint32 ComFilterArcNewValue;\r
+       uint32 ComFilterArcOldValue;\r
+} Com_Arc_Filter_type;\r
 \r
 typedef struct {\r
 \r
-       ComEcoreFilter_type ComFilter;\r
+       Com_Arc_Filter_type ComFilter;\r
 \r
-       uint32 ComEcoreDeadlineCounter;\r
+       uint32 Com_Arc_DeadlineCounter;\r
        uint32 ComTimeoutFactor;\r
        void *ComIPduDataPtr;\r
 \r
        uint8 ComIPduHandleId;\r
        uint8 ComSignalUpdated;\r
-       //uint8 ComEcoreEOL;\r
-       //uint8 ComEcoreIsSignalGroup;\r
+       //uint8 Com_Arc_EOL;\r
+       //uint8 Com_Arc_IsSignalGroup;\r
 \r
        /* For signal groups */\r
-       void *ComEcoreShadowBuffer;\r
+       void *Com_Arc_ShadowBuffer;\r
 \r
-} ComEcoreSignal_type;\r
+} Com_Arc_Signal_type;\r
 \r
 \r
 typedef struct {\r
-       void *ComEcoreShadowBuffer;\r
+       void *Com_Arc_ShadowBuffer;\r
        //uint8 ComIPduHandleId;\r
 \r
        uint8 ComSignalUpdated;\r
-       uint8 ComEcoreEOL;\r
-} ComEcoreGroupSignal_type;\r
+       uint8 Com_Arc_EOL;\r
+} Com_Arc_GroupSignal_type;\r
 \r
 \r
 /*\r
 typedef struct {\r
-       void *ComEcoreShadowBuffer;\r
-       void *ComEcoreIPduDataPtr;\r
-       uint8 ComEcoreEOL;\r
-} ComEcoreSignalGroup_type;\r
+       void *Com_Arc_ShadowBuffer;\r
+       void *Com_Arc_IPduDataPtr;\r
+       uint8 Com_Arc_EOL;\r
+} Com_Arc_SignalGroup_type;\r
 */\r
 \r
 typedef struct {\r
@@ -67,27 +67,27 @@ typedef struct {
        uint32 ComTxModeRepetitionPeriodTimer;\r
        uint32 ComTxIPduMinimumDelayTimer;\r
        uint32 ComTxModeTimePeriodTimer;\r
-} ComEcoreTxIPduTimer_type;\r
+} Com_Arc_TxIPduTimer_type;\r
 \r
 typedef struct {\r
 \r
-       ComEcoreTxIPduTimer_type ComEcoreTxIPduTimers;\r
+       Com_Arc_TxIPduTimer_type Com_Arc_TxIPduTimers;\r
        void *ComIPduDataPtr;\r
 \r
-       uint8 ComEcoreNIPduSignalGroupRef;\r
+       uint8 Com_Arc_NIPduSignalGroupRef;\r
 \r
        uint8 NComIPduSignalRef;\r
 \r
-       uint8 ComEcoreIpduStarted;\r
+       uint8 Com_Arc_IpduStarted;\r
 \r
-} ComEcoreIPdu_type;\r
+} Com_Arc_IPdu_type;\r
 \r
 typedef struct {\r
        uint16 ComNIPdu;\r
-       ComEcoreIPdu_type *ComIPdu; // Only used in PduIdCheck()\r
-       //ComEcoreIPduGroup_type *ComIPduGroup;\r
-       ComEcoreSignal_type *ComSignal;\r
-       //ComEcoreSignalGroup_type *ComSignalGroup;\r
-       ComEcoreGroupSignal_type *ComGroupSignal;\r
+       Com_Arc_IPdu_type *ComIPdu; // Only used in PduIdCheck()\r
+       //Com_Arc_IPduGroup_type *ComIPduGroup;\r
+       Com_Arc_Signal_type *ComSignal;\r
+       //Com_Arc_SignalGroup_type *ComSignalGroup;\r
+       Com_Arc_GroupSignal_type *ComGroupSignal;\r
        PduInfoType OutgoingPdu;\r
-} ComEcoreConfig_type;\r
+} Com_Arc_Config_type;\r
index 3366f8b7e0d0112363a79af57bde57f273482f7a..0ad3770aa5c834b563c540487b2a6f4bd79cd464 100644 (file)
@@ -33,9 +33,9 @@ uint8 Com_SendSignal(Com_SignalIdType SignalId, const void *SignalDataPtr) {
        COM_VALIDATE_SIGNAL(SignalId, 0x0a, E_NOT_OK);\r
        // Store pointer to signal for easier coding.\r
        ComGetSignal(SignalId);\r
-       ComGetEcoreSignal(SignalId);\r
-       ComGetIPdu(EcoreSignal->ComIPduHandleId);\r
-       ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
+       ComGetArcSignal(SignalId);\r
+       ComGetIPdu(Arc_Signal->ComIPduHandleId);\r
+       ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
 \r
        //DEBUG(DEBUG_LOW, "Com_SendSignal: id %d, nBytes %d, BitPosition %d, intVal %d\n", SignalId, nBytes, signal->ComBitPosition, (uint32)*(uint8 *)SignalDataPtr);\r
 \r
@@ -69,18 +69,18 @@ uint8 Com_SendSignal(Com_SignalIdType SignalId, const void *SignalDataPtr) {
 \r
        }\r
 \r
-       Com_CopyData(EcoreIPdu->ComIPduDataPtr, dataPtr, Signal->ComBitSize, Signal->ComBitPosition, 0);\r
+       Com_CopyData(Arc_IPdu->ComIPduDataPtr, dataPtr, Signal->ComBitSize, Signal->ComBitPosition, 0);\r
 \r
        // If the signal has an update bit. Set it!\r
-       if (Signal->ComSignalEcoreUseUpdateBit) {\r
-               setBit(EcoreIPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
+       if (Signal->ComSignalArcUseUpdateBit) {\r
+               setBit(Arc_IPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
        }\r
 \r
        /*\r
         * If signal has triggered transmit property, trigger a transmission!\r
         */\r
        if (Signal->ComTransferProperty == TRIGGERED) {\r
-               EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeNumberOfRepetitions + 1;\r
+               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeNumberOfRepetitions + 1;\r
        }\r
        return E_OK;\r
 }\r
@@ -130,9 +130,9 @@ Std_ReturnType Com_TriggerTransmit(PduIdType ComTxPduId, uint8 *SduPtr) {
         * COM395: This function must override the IPdu callouts used in Com_TriggerIPduTransmit();\r
         */\r
        ComGetIPdu(ComTxPduId);\r
-       ComGetEcoreIPdu(ComTxPduId);\r
+       ComGetArcIPdu(ComTxPduId);\r
 \r
-       memcpy(SduPtr, EcoreIPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
+       memcpy(SduPtr, Arc_IPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
        return E_OK;\r
 }\r
 \r
@@ -142,10 +142,10 @@ void Com_TriggerIPduSend(PduIdType ComTxPduId) {
 \r
        //DEBUG(DEBUG_MEDIUM, "Com_TriggerIPduSend sending IPdu %d... ", ComTxPduId);\r
        ComGetIPdu(ComTxPduId);\r
-       ComGetEcoreIPdu(ComTxPduId);\r
+       ComGetArcIPdu(ComTxPduId);\r
 \r
        // Is the IPdu ready for transmission?\r
-       if (EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
+       if (Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
                //DEBUG(DEBUG_MEDIUM, "success!\n", ComTxPduId);\r
 \r
                /*\r
@@ -153,14 +153,14 @@ void Com_TriggerIPduSend(PduIdType ComTxPduId) {
                        .SduDataPtr = malloc(IPdu->ComIPduSize),\r
                        .SduLength = ComConfig->ComIPdu[ComTxPduId].ComIPduSize\r
                };\r
-               memcpy((void *)PduInfoPackage.SduDataPtr, EcoreIPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
+               memcpy((void *)PduInfoPackage.SduDataPtr, Arc_IPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
                */\r
 \r
-               ComEcoreConfig.OutgoingPdu.SduLength = ComConfig->ComIPdu[ComTxPduId].ComIPduSize;\r
-               memcpy((void *)ComEcoreConfig.OutgoingPdu.SduDataPtr, EcoreIPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
+               Com_Arc_Config.OutgoingPdu.SduLength = ComConfig->ComIPdu[ComTxPduId].ComIPduSize;\r
+               memcpy((void *)Com_Arc_Config.OutgoingPdu.SduDataPtr, Arc_IPdu->ComIPduDataPtr, IPdu->ComIPduSize);\r
                // Check callout status\r
                if (IPdu->ComIPduCallout != NULL) {\r
-                       if (!IPdu->ComIPduCallout(ComTxPduId, EcoreIPdu->ComIPduDataPtr)) {\r
+                       if (!IPdu->ComIPduCallout(ComTxPduId, Arc_IPdu->ComIPduDataPtr)) {\r
                                // TODO Report error to DET.\r
                                // Det_ReportError();\r
                                return;\r
@@ -168,11 +168,11 @@ void Com_TriggerIPduSend(PduIdType ComTxPduId) {
                }\r
 \r
                // Send IPdu!\r
-               if (PduR_ComTransmit(ComTxPduId, &ComEcoreConfig.OutgoingPdu) == E_OK) {\r
+               if (PduR_ComTransmit(ComTxPduId, &Com_Arc_Config.OutgoingPdu) == E_OK) {\r
                        // Clear all update bits for the contained signals\r
-                       for (int i = 0; i < EcoreIPdu->NComIPduSignalRef; i++) {\r
-                               if (IPdu->ComIPduSignalRef[i]->ComSignalEcoreUseUpdateBit) {\r
-                                       clearBit(EcoreIPdu->ComIPduDataPtr, IPdu->ComIPduSignalRef[i]->ComUpdateBitPosition);\r
+                       for (int i = 0; i < Arc_IPdu->NComIPduSignalRef; i++) {\r
+                               if (IPdu->ComIPduSignalRef[i]->ComSignalArcUseUpdateBit) {\r
+                                       clearBit(Arc_IPdu->ComIPduDataPtr, IPdu->ComIPduSignalRef[i]->ComUpdateBitPosition);\r
                                }\r
                        }\r
                }\r
@@ -181,7 +181,7 @@ void Com_TriggerIPduSend(PduIdType ComTxPduId) {
                //free(PduInfoPackage.SduDataPtr);\r
 \r
                // Reset miminum delay timer.\r
-               EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer = IPdu->ComTxIPdu.ComTxIPduMinimumDelayFactor;\r
+               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer = IPdu->ComTxIPdu.ComTxIPduMinimumDelayFactor;\r
 \r
        } else {\r
                //DEBUG(DEBUG_MEDIUM, "failed (MDT)!\n", ComTxPduId);\r
@@ -192,10 +192,10 @@ Std_ReturnType Com_RxIndication(PduIdType ComRxPduId, const uint8* SduPtr) {
        PduIdCheck(ComRxPduId, 0x14, E_NOT_OK);\r
 \r
        ComGetIPdu(ComRxPduId);\r
-       ComGetEcoreIPdu(ComRxPduId);\r
+       ComGetArcIPdu(ComRxPduId);\r
 \r
        // If Ipdu is stopped\r
-       if (!EcoreIPdu->ComEcoreIpduStarted) {\r
+       if (!Arc_IPdu->Com_Arc_IpduStarted) {\r
                return E_OK;\r
        }\r
 \r
@@ -209,29 +209,29 @@ Std_ReturnType Com_RxIndication(PduIdType ComRxPduId, const uint8* SduPtr) {
        }\r
 \r
        // Copy IPDU data\r
-       memcpy(EcoreIPdu->ComIPduDataPtr, SduPtr, IPdu->ComIPduSize);\r
+       memcpy(Arc_IPdu->ComIPduDataPtr, SduPtr, IPdu->ComIPduSize);\r
 \r
        // For each signal.\r
        const ComSignal_type *signal;\r
        for (int i = 0; IPdu->ComIPduSignalRef[i] != NULL; i++) {\r
                signal = IPdu->ComIPduSignalRef[i];\r
-               ComGetEcoreSignal(signal->ComHandleId);\r
+               ComGetArcSignal(signal->ComHandleId);\r
 \r
                // If this signal uses an update bit, then it is only considered if this bit is set.\r
-               if (!signal->ComSignalEcoreUseUpdateBit ||\r
-                       (signal->ComSignalEcoreUseUpdateBit && testBit(EcoreIPdu->ComIPduDataPtr, signal->ComUpdateBitPosition))) {\r
+               if (!signal->ComSignalArcUseUpdateBit ||\r
+                       (signal->ComSignalArcUseUpdateBit && testBit(Arc_IPdu->ComIPduDataPtr, signal->ComUpdateBitPosition))) {\r
 \r
                        if (signal->ComTimeoutFactor > 0) { // If reception deadline monitoring is used.\r
                                // Reset the deadline monitoring timer.\r
-                               EcoreSignal->ComEcoreDeadlineCounter = signal->ComTimeoutFactor;\r
+                               Arc_Signal->Com_Arc_DeadlineCounter = signal->ComTimeoutFactor;\r
                        }\r
 \r
                        /*\r
                        // Zero new filter value.\r
-                       IPdu->ComIPduSignalRef[i]->ComFilter.ComFilterEcoreNewValue = 0;\r
+                       IPdu->ComIPduSignalRef[i]->ComFilter.ComFilterArcNewValue = 0;\r
 \r
                        //Fix this!!!\r
-                       Com_CopyFromSignal(IPdu->ComIPduSignalRef[i], &IPdu->ComIPduSignalRef[i]->ComFilter.ComFilterEcoreNewValue);\r
+                       Com_CopyFromSignal(IPdu->ComIPduSignalRef[i], &IPdu->ComIPduSignalRef[i]->ComFilter.ComFilterArcNewValue);\r
                        */\r
                        // Perform filtering\r
                        //if (Com_Filter(IPdu->ComIPduSignalRef[i])) {\r
@@ -245,7 +245,7 @@ Std_ReturnType Com_RxIndication(PduIdType ComRxPduId, const uint8* SduPtr) {
 \r
                                } else {\r
                                        // Signal processing mode is DEFERRED, mark the signal as updated.\r
-                                       EcoreSignal->ComSignalUpdated = 1;\r
+                                       Arc_Signal->ComSignalUpdated = 1;\r
                                }\r
                        //}\r
                } else {\r
@@ -264,28 +264,28 @@ void Com_TxConfirmation(PduIdType ComTxPduId) {
 Std_ReturnType Com_SendSignalGroup(Com_SignalGroupIdType SignalGroupId) {\r
 //#warning Com_SendSignalGroup should be performed atomically. Should we disable interrupts here?\r
        ComGetSignal(SignalGroupId);\r
-       ComGetEcoreSignal(SignalGroupId);\r
-       ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
-       ComGetIPdu(EcoreSignal->ComIPduHandleId);\r
+       ComGetArcSignal(SignalGroupId);\r
+       ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
+       ComGetIPdu(Arc_Signal->ComIPduHandleId);\r
 \r
 \r
        // Copy shadow buffer to Ipdu data space\r
        const ComGroupSignal_type *groupSignal;\r
        for (int i = 0; Signal->ComGroupSignal[i] != NULL; i++) {\r
                groupSignal = Signal->ComGroupSignal[i];\r
-               Com_CopyData(EcoreIPdu->ComIPduDataPtr, EcoreSignal->ComEcoreShadowBuffer,  groupSignal->ComBitSize, groupSignal->ComBitPosition, groupSignal->ComBitPosition);\r
+               Com_CopyData(Arc_IPdu->ComIPduDataPtr, Arc_Signal->Com_Arc_ShadowBuffer,  groupSignal->ComBitSize, groupSignal->ComBitPosition, groupSignal->ComBitPosition);\r
        }\r
 \r
        // If the signal has an update bit. Set it!\r
-       if (Signal->ComSignalEcoreUseUpdateBit) {\r
-               setBit(EcoreIPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
+       if (Signal->ComSignalArcUseUpdateBit) {\r
+               setBit(Arc_IPdu->ComIPduDataPtr, Signal->ComUpdateBitPosition);\r
        }\r
 \r
        /*\r
         * If signal has triggered transmit property, trigger a transmission!\r
         */\r
        if (Signal->ComTransferProperty == TRIGGERED) {\r
-               EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeNumberOfRepetitions + 1;\r
+               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeNumberOfRepetitions + 1;\r
        }\r
 \r
        return E_OK;\r
@@ -295,14 +295,14 @@ Std_ReturnType Com_SendSignalGroup(Com_SignalGroupIdType SignalGroupId) {
 Std_ReturnType Com_ReceiveSignalGroup(Com_SignalGroupIdType SignalGroupId) {\r
 //#warning Com_ReceiveSignalGroup should be performed atomically. Should we disable interrupts here?\r
        ComGetSignal(SignalGroupId);\r
-       ComGetEcoreSignal(SignalGroupId);\r
-       ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
+       ComGetArcSignal(SignalGroupId);\r
+       ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
 \r
        // Copy Ipdu data buffer to shadow buffer.\r
        const ComGroupSignal_type *groupSignal;\r
        for (int i = 0; Signal->ComGroupSignal[i] != NULL; i++) {\r
                groupSignal = Signal->ComGroupSignal[i];\r
-               Com_CopyData(EcoreSignal->ComEcoreShadowBuffer, EcoreIPdu->ComIPduDataPtr, groupSignal->ComBitSize, groupSignal->ComBitPosition, groupSignal->ComBitPosition);\r
+               Com_CopyData(Arc_Signal->Com_Arc_ShadowBuffer, Arc_IPdu->ComIPduDataPtr, groupSignal->ComBitSize, groupSignal->ComBitPosition, groupSignal->ComBitPosition);\r
        }\r
 \r
 \r
@@ -311,12 +311,12 @@ Std_ReturnType Com_ReceiveSignalGroup(Com_SignalGroupIdType SignalGroupId) {
 \r
 void Com_UpdateShadowSignal(Com_SignalIdType SignalId, const void *SignalDataPtr) {\r
        ComGetGroupSignal(SignalId);\r
-       ComGetEcoreGroupSignal(SignalId);\r
-       Com_CopyData(EcoreGroupSignal->ComEcoreShadowBuffer, SignalDataPtr, GroupSignal->ComBitSize, GroupSignal->ComBitPosition, 0);\r
+       ComGetArcGroupSignal(SignalId);\r
+       Com_CopyData(Arc_GroupSignal->Com_Arc_ShadowBuffer, SignalDataPtr, GroupSignal->ComBitSize, GroupSignal->ComBitPosition, 0);\r
 }\r
 \r
 void Com_ReceiveShadowSignal(Com_SignalIdType SignalId, void *SignalDataPtr) {\r
        ComGetGroupSignal(SignalId);\r
-       ComGetEcoreGroupSignal(SignalId);\r
-       Com_CopyData(SignalDataPtr, EcoreGroupSignal->ComEcoreShadowBuffer, GroupSignal->ComBitSize, 0, GroupSignal->ComBitPosition);\r
+       ComGetArcGroupSignal(SignalId);\r
+       Com_CopyData(SignalDataPtr, Arc_GroupSignal->Com_Arc_ShadowBuffer, GroupSignal->ComBitSize, 0, GroupSignal->ComBitPosition);\r
 }\r
index c5dc3bf653af7297fcaed3c664e00bbd2bc18a9c..6ab1207ec964b84f8e64e374936bb9c67595f791 100644 (file)
 void Com_MainFunctionRx() {\r
        //DEBUG(DEBUG_MEDIUM, "Com_MainFunctionRx() excecuting\n");\r
        const ComSignal_type *signal;\r
-       for (int i = 0; !ComConfig->ComSignal[i].ComEcoreEOL; i++) {\r
+       for (int i = 0; !ComConfig->ComSignal[i].Com_Arc_EOL; i++) {\r
                signal = &ComConfig->ComSignal[i];\r
-               ComGetEcoreSignal(signal->ComHandleId);\r
-               ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
+               ComGetArcSignal(signal->ComHandleId);\r
+               ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
 \r
                // Monitor signal reception deadline\r
-               if (EcoreIPdu->ComEcoreIpduStarted && EcoreSignal->ComTimeoutFactor > 0) {\r
+               if (Arc_IPdu->Com_Arc_IpduStarted && Arc_Signal->ComTimeoutFactor > 0) {\r
 \r
                        // Decrease deadline monitoring timer.\r
-                       timerDec(EcoreSignal->ComEcoreDeadlineCounter);\r
+                       timerDec(Arc_Signal->Com_Arc_DeadlineCounter);\r
 \r
                        // Check if a timeout has occurred.\r
-                       if (EcoreSignal->ComEcoreDeadlineCounter == 0) {\r
+                       if (Arc_Signal->Com_Arc_DeadlineCounter == 0) {\r
                                if (signal->ComRxDataTimeoutAction == COM_TIMEOUT_DATA_ACTION_REPLACE) {\r
                                        // Replace signal data.\r
                                        uint32 signalInitData;\r
                                        memset(&signalInitData, signal->ComSignalInitValue, sizeof(uint32));\r
 \r
-                                       Com_CopyData(EcoreIPdu->ComIPduDataPtr, &signalInitData, signal->ComBitSize, signal->ComBitPosition, 0);\r
+                                       Com_CopyData(Arc_IPdu->ComIPduDataPtr, &signalInitData, signal->ComBitSize, signal->ComBitPosition, 0);\r
 \r
                                }\r
 \r
@@ -61,13 +61,13 @@ void Com_MainFunctionRx() {
                                }\r
 \r
                                // Restart timer\r
-                               EcoreSignal->ComEcoreDeadlineCounter = EcoreSignal->ComTimeoutFactor;\r
+                               Arc_Signal->Com_Arc_DeadlineCounter = Arc_Signal->ComTimeoutFactor;\r
                        }\r
                }\r
 \r
-               if (EcoreSignal->ComSignalUpdated) {\r
+               if (Arc_Signal->ComSignalUpdated) {\r
                        ComConfig->ComSignal[i].ComNotification();\r
-                       EcoreSignal->ComSignalUpdated = 0;\r
+                       Arc_Signal->ComSignalUpdated = 0;\r
                }\r
        }\r
 }\r
@@ -77,65 +77,65 @@ void Com_MainFunctionTx() {
        //DEBUG(DEBUG_MEDIUM, "Com_MainFunctionTx() excecuting\n");\r
        // Decrease timers.\r
        const ComIPdu_type *IPdu;\r
-       for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
+       for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
                IPdu = &ComConfig->ComIPdu[i];\r
-               ComGetEcoreIPdu(i);\r
+               ComGetArcIPdu(i);\r
 \r
                // Is this a IPdu that should be transmitted?\r
-               if (IPdu->ComIPduDirection == SEND && EcoreIPdu->ComEcoreIpduStarted) {\r
+               if (IPdu->ComIPduDirection == SEND && Arc_IPdu->Com_Arc_IpduStarted) {\r
                        // Decrease minimum delay timer\r
-                       timerDec(EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer);\r
+                       timerDec(Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer);\r
 \r
                        // If IPDU has periodic or mixed transmission mode.\r
                        if (IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == PERIODIC\r
                                || IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == MIXED) {\r
 \r
-                               timerDec(EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeTimePeriodTimer);\r
+                               timerDec(Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeTimePeriodTimer);\r
 \r
                                // Is it time for a direct transmission?\r
                                if (IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == MIXED\r
-                                       && EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft > 0) {\r
+                                       && Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft > 0) {\r
 \r
-                                       timerDec(EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer);\r
+                                       timerDec(Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer);\r
 \r
                                        // Is it time for a transmission?\r
-                                       if (EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer == 0\r
-                                               && EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
+                                       if (Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer == 0\r
+                                               && Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
 \r
                                                Com_TriggerIPduSend(IPdu->ComIPduRxHandleId);\r
 \r
                                                // Reset periodic timer\r
-                                               EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeRepetitionPeriodFactor;\r
+                                               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeRepetitionPeriodFactor;\r
 \r
                                                // Register this nth-transmission.\r
-                                               EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft--;\r
+                                               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft--;\r
                                        }\r
                                }\r
 \r
                                // Is it time for a cyclic transmission?\r
-                               if (EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeTimePeriodTimer == 0 && EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
+                               if (Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeTimePeriodTimer == 0 && Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
 \r
                                        Com_TriggerIPduSend(IPdu->ComIPduRxHandleId); // Send IPDU!\r
 \r
                                        // Reset periodic timer.\r
-                                       EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimePeriodFactor;\r
+                                       Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeTimePeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeTimePeriodFactor;\r
                                }\r
 \r
                        // If IPDU has direct transmission mode.\r
                        } else if (IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeMode == DIRECT) {\r
                                // Do we need to transmit anything?\r
-                               if (EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft > 0) {\r
-                                       timerDec(EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer);\r
+                               if (Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft > 0) {\r
+                                       timerDec(Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer);\r
 \r
                                        // Is it time for a transmission?\r
-                                       if (EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer == 0 && EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
+                                       if (Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer == 0 && Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduMinimumDelayTimer == 0) {\r
                                                Com_TriggerIPduSend(IPdu->ComIPduRxHandleId);\r
 \r
                                                // Reset periodic timer\r
-                                               EcoreIPdu->ComEcoreTxIPduTimers.ComTxModeRepetitionPeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeRepetitionPeriodFactor;\r
+                                               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxModeRepetitionPeriodTimer = IPdu->ComTxIPdu.ComTxModeTrue.ComTxModeRepetitionPeriodFactor;\r
 \r
                                                // Register this nth-transmission.\r
-                                               EcoreIPdu->ComEcoreTxIPduTimers.ComTxIPduNumberOfRepetitionsLeft--;\r
+                                               Arc_IPdu->Com_Arc_TxIPduTimers.ComTxIPduNumberOfRepetitionsLeft--;\r
                                        }\r
                                }\r
 \r
@@ -148,7 +148,7 @@ void Com_MainFunctionTx() {
 \r
        // Send scheduled packages.\r
        // Cyclic\r
-       for (int i = 0; !ComConfig->ComIPdu[i].ComEcoreEOL; i++) {\r
+       for (int i = 0; !ComConfig->ComIPdu[i].Com_Arc_EOL; i++) {\r
                if (ComConfig->ComIPdu[i].ComIPduDirection == SEND) {\r
 \r
                }\r
index de68bbc7830c24619c63f550bcffcb65cccc5f5e..ab7f19ce7f847dbfc476f398994d337e9fbb693f 100644 (file)
@@ -34,9 +34,9 @@ void Com_CopyFromSignal(const ComSignal_type *signal, void *Destination) {
        uint8 destByte;\r
 \r
        // Pointer to a byte of the source and dest respectively.\r
-       ComGetEcoreSignal(signal->ComHandleId);\r
-       ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
-       uint8 *source = (uint8 *)EcoreIPdu->ComIPduDataPtr;\r
+       ComGetArcSignal(signal->ComHandleId);\r
+       ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
+       uint8 *source = (uint8 *)Arc_IPdu->ComIPduDataPtr;\r
        uint8 *dest = (uint8 *)Destination;\r
 \r
        uint8 signBit = 0;\r
@@ -90,9 +90,9 @@ void Com_CopyFromSignal(const ComSignal_type *signal, void *Destination) {
 \r
 \r
 void Com_CopyToSignal(ComSignal_type *signal, const void *Source) {\r
-       ComGetEcoreSignal(signal->ComHandleId);\r
-       ComGetEcoreIPdu(EcoreSignal->ComIPduHandleId);\r
-       Com_CopyData(EcoreIPdu->ComIPduDataPtr, Source, signal->ComBitSize, signal->ComBitPosition, 0);\r
+       ComGetArcSignal(signal->ComHandleId);\r
+       ComGetArcIPdu(Arc_Signal->ComIPduHandleId);\r
+       Com_CopyData(Arc_IPdu->ComIPduDataPtr, Source, signal->ComBitSize, signal->ComBitPosition, 0);\r
 }\r
 \r
 uint8 Com_CopyData(void *Destination, const void *Source, uint8 numBits, uint8 destOffset, uint8 sourceOffset) {\r
@@ -126,7 +126,7 @@ uint8 Com_CopyData(void *Destination, const void *Source, uint8 numBits, uint8 d
 \r
 \r
 uint8 Com_Filter(ComSignal_type *signal) {\r
-       ComGetEcoreSignal(signal->ComHandleId);\r
+       ComGetArcSignal(signal->ComHandleId);\r
        const ComFilter_type * filter = &signal->ComFilter;\r
        uint8 success = 0;\r
        if (filter->ComFilterAlgorithm == ALWAYS) {\r
@@ -143,20 +143,20 @@ uint8 Com_Filter(ComSignal_type *signal) {
                        success = filter->ComFilterPeriodFactor;\r
 \r
                } else {\r
-                       if (filter->ComFilterEcoreN == 0) {\r
+                       if (filter->ComFilterArcN == 0) {\r
                                success = 1;\r
                        } else {\r
                                success = 0;\r
                        }\r
-                       EcoreSignal->ComFilter.ComFilterEcoreN++;\r
-                       if (filter->ComFilterEcoreN >= filter->ComFilterPeriodFactor) {\r
-                               EcoreSignal->ComFilter.ComFilterEcoreN = 0;\r
+                       Arc_Signal->ComFilter.ComFilterArcN++;\r
+                       if (filter->ComFilterArcN >= filter->ComFilterPeriodFactor) {\r
+                               Arc_Signal->ComFilter.ComFilterArcN = 0;\r
                        }\r
                }\r
 \r
        } else if (filter->ComFilterAlgorithm == NEW_IS_OUTSIDE) {\r
-               if ((filter->ComFilterMin > filter->ComFilterEcoreNewValue)\r
-                               || (filter->ComFilterEcoreNewValue > filter->ComFilterMax)) {\r
+               if ((filter->ComFilterMin > filter->ComFilterArcNewValue)\r
+                               || (filter->ComFilterArcNewValue > filter->ComFilterMax)) {\r
                        success = 1;\r
                } else {\r
                        success = 0;\r
@@ -164,8 +164,8 @@ uint8 Com_Filter(ComSignal_type *signal) {
 \r
 \r
        } else if (filter->ComFilterAlgorithm == NEW_IS_WITHIN) {\r
-               if (filter->ComFilterMin <= filter->ComFilterEcoreNewValue\r
-                && filter->ComFilterEcoreNewValue <= filter->ComFilterMax) {\r
+               if (filter->ComFilterMin <= filter->ComFilterArcNewValue\r
+                && filter->ComFilterArcNewValue <= filter->ComFilterMax) {\r
                        success = 1;\r
                } else {\r
                        success = 0;\r
@@ -173,22 +173,22 @@ uint8 Com_Filter(ComSignal_type *signal) {
 \r
 \r
        } else if (filter->ComFilterAlgorithm == MASKED_NEW_DIFFERS_MASKED_OLD) {\r
-               if ((filter->ComFilterEcoreNewValue & filter->ComFilterMask)\r
-                               != (filter->ComFilterEcoreNewValue & filter->ComFilterMask)) {\r
+               if ((filter->ComFilterArcNewValue & filter->ComFilterMask)\r
+                               != (filter->ComFilterArcNewValue & filter->ComFilterMask)) {\r
                        success = 1;\r
                } else {\r
                        success = 0;\r
                }\r
 \r
        } else if (filter->ComFilterAlgorithm == MASKED_NEW_DIFFERS_X) {\r
-               if ((filter->ComFilterEcoreNewValue & filter->ComFilterMask) != filter->ComFilterX) {\r
+               if ((filter->ComFilterArcNewValue & filter->ComFilterMask) != filter->ComFilterX) {\r
                        success = 1;\r
                } else {\r
                        success = 0;\r
                }\r
 \r
        } else if (filter->ComFilterAlgorithm == MASKED_NEW_EQUALS_X) {\r
-               if ((filter->ComFilterEcoreNewValue & filter->ComFilterMask) == filter->ComFilterX) {\r
+               if ((filter->ComFilterArcNewValue & filter->ComFilterMask) == filter->ComFilterX) {\r
                        success = 1;\r
                } else {\r
                        success = 0;\r
@@ -196,7 +196,7 @@ uint8 Com_Filter(ComSignal_type *signal) {
        }\r
 \r
        if (success) {\r
-               EcoreSignal->ComFilter.ComFilterEcoreOldValue = filter->ComFilterEcoreNewValue;\r
+               Arc_Signal->ComFilter.ComFilterArcOldValue = filter->ComFilterArcNewValue;\r
                return 1;\r
        } else return 0;\r
 }\r
index 4cf093234bd180f11500cc59bd0c001752428e81..0780504e134b0e41809a92d00dfa4717511f2c4c 100644 (file)
@@ -82,7 +82,7 @@ void PduR_Init (const PduR_PBConfigType* ConfigPtr) {
        int bufferNr = 0;\r
        int i = 0;\r
        PduRRoutingPath_type *path;\r
-       for (i = 0; !PduRConfig->PduRRoutingTable->PduRRoutingPath[i].PduREcoreEOL && !failed; i++) {\r
+       for (i = 0; !PduRConfig->PduRRoutingTable->PduRRoutingPath[i].PduR_Arc_EOL && !failed; i++) {\r
                PduRConfig->PduRRoutingTable->NRoutingPaths++;\r
                path = &PduRConfig->PduRRoutingTable->PduRRoutingPath[i];\r
 \r
index 639919c65e200fdb6198ded73666bde2b799f8a8..a47eb049ccc90c5dd947e04e8e591406a420e2a4 100644 (file)
@@ -79,7 +79,7 @@ typedef struct {
 \r
 typedef struct {\r
        /*\r
-        * Not part of autosar standard. Added by Ecore.
+        * Not part of autosar standard. Added by ArcCore.
         */\r
        int BufferId;\r
        PduR_DataProvisionType BufferType;\r
@@ -156,7 +156,7 @@ typedef struct {
 \r
 \r
 typedef struct {\r
-       uint8 PduREcoreDummy; // Needed in order to compile without errors.\r
+       uint8 PduR_Arc_Dummy; // Needed in order to compile without errors.\r
        PduRDefaultValueElement_type *PduRDefaultValueElement;\r
 } PduRDefaultValue_type;\r
 \r
@@ -165,7 +165,7 @@ typedef struct {
         * Not part of standard
         */\r
        PduR_FctPtrType *FctPtrs;\r
-       uint8 PduREcoreEOL;\r
+       uint8 PduR_Arc_EOL;\r
        uint8 PduR_GatewayMode;\r
 \r
        /*\r
index 7bb8a06d0877f3e87b630d40c2b74dc660e6f21a..a2bb009e1e570f19aa5a471a1bd6e93774f9961f 100644 (file)
@@ -65,16 +65,16 @@ const CanIf_DispatchConfigType CanIfDispatchConfig =
 const CanIf_HthConfigType CanIfHthConfigData[] =\r
 {\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_0,\r
     .CanIfHthIdSymRef = CAN_HTH_A_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_1,\r
     .CanIfHthIdSymRef = CAN_HTH_C_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
@@ -82,18 +82,18 @@ const CanIf_HthConfigType CanIfHthConfigData[] =
 const CanIf_HrhConfigType CanIfHrhConfigData[] =\r
 {\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_0,\r
     .CanIfHrhIdSymRef = CAN_HRH_A_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_1,\r
     .CanIfHrhIdSymRef = CAN_HRH_C_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 //-------------------------------------------------------------------\r
@@ -138,7 +138,7 @@ const CanIf_InitHohConfigType CanIfHohConfigData[] =
     .CanConfigSet = &CanConfigSetData,\r
     .CanIfHrhConfig = CanIfHrhConfigData,\r
     .CanIfHthConfig = CanIfHthConfigData,\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
index b255d85a6670ebfe63538ddd7c703e49fc342596..037e24e3182a041fbd873a1dcb714271887c9556 100644 (file)
@@ -37,7 +37,7 @@
  */\r
 ComGroupSignal_type ComGroupSignal[] = {\r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
@@ -60,11 +60,11 @@ ComSignal_type ComSignal[] = {
                .ComBitSize = 16,\r
                .ComSignalEndianess = BIG_ENDIAN,\r
                .ComSignalType = UINT16,
-               .ComEcoreIsSignalGroup = 0,\r
+               .Com_Arc_IsSignalGroup = 0,\r
 \r
        },\r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
@@ -78,7 +78,7 @@ ComIPduGroup_type ComIPduGroup[] = {
        },\r
 \r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -105,7 +105,7 @@ ComIPdu_type ComIPdu[] = {
        },\r
 \r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
index fb3ac4fcd8165fdc17338bd88997d17b05777938..1c7b46250272aeef4957eb92d3fe9c268a742fc9 100644 (file)
@@ -62,10 +62,10 @@ const CanIf_DispatchConfigType CanIfDispatchConfig =
 const CanIf_HthConfigType CanIfHthConfigData[] =\r
 {\r
   {\r
-    .CanIfHthType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfCanControllerIdRef = CANIF_CHANNEL_0,\r
     .CanIfHthIdSymRef = CAN_HTH_A_1, // Ref to the HTH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
 };\r
 \r
@@ -73,11 +73,11 @@ const CanIf_HthConfigType CanIfHthConfigData[] =
 const CanIf_HrhConfigType CanIfHrhConfigData[] =\r
 {\r
   {\r
-    .CanIfHrhType = CAN_ECORE_HANDLE_TYPE_BASIC,\r
+    .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,   // Disable software filtering\r
     .CanIfCanControllerHrhIdRef = CANIF_CHANNEL_0,\r
     .CanIfHrhIdSymRef = CAN_HRH_A_1, // Ref to the HRH\r
-    .CanIfEcoreEOL = 0,\r
+    .CanIf_Arc_EOL = 0,\r
   },\r
 };\r
 //-------------------------------------------------------------------\r
@@ -117,7 +117,7 @@ const CanIf_InitHohConfigType CanIfHohConfigData[] =
     .CanConfigSet = &CanConfigSetData,\r
     .CanIfHrhConfig = CanIfHrhConfigData,\r
     .CanIfHthConfig = CanIfHthConfigData,\r
-    .CanIfEcoreEOL = 1,\r
+    .CanIf_Arc_EOL = 1,\r
   },\r
 };\r
 \r
index aff0bca5a1de027ae4aedbc67a85a1d953bbab25..5925d948b8e2c2d045272e0e7a6ed9b6916e095e 100644 (file)
@@ -37,7 +37,7 @@
  */\r
 ComGroupSignal_type ComGroupSignal[] = {\r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
@@ -60,11 +60,11 @@ ComSignal_type ComSignal[] = {
                .ComBitSize = 16,\r
                .ComSignalEndianess = BIG_ENDIAN,\r
                .ComSignalType = UINT16,
-               .ComEcoreIsSignalGroup = 0,\r
+               .Com_Arc_IsSignalGroup = 0,\r
 \r
        },\r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
@@ -78,7 +78,7 @@ ComIPduGroup_type ComIPduGroup[] = {
        },\r
 \r
        {\r
-               .ComEcoreEOL  = 1\r
+               .Com_Arc_EOL  = 1\r
        }\r
 };\r
 \r
@@ -116,7 +116,7 @@ ComIPdu_type ComIPdu[] = {
                },\r
        },\r
        {\r
-               .ComEcoreEOL = 1\r
+               .Com_Arc_EOL = 1\r
        }\r
 };\r
 \r
index 62e374a1985227f1d1966c22ef70c3bdd1d9a0fa..3fd1f2f9ee0261174277c74b3eb390aa39d2db56 100644 (file)
@@ -58,7 +58,7 @@ typedef struct {
        uint32 boffCnt;\r
        uint32 fifoOverflow;\r
        uint32 fifoWarning;\r
-} Can_EcoreStatisticsType;\r
+} Can_Arc_StatisticsType;\r
 \r
 \r
 // uint16: if only Standard IDs are used\r
@@ -111,7 +111,7 @@ typedef union {
          volatile uint32_t TXWRN:1;\r
          volatile uint32_t RXWRN:1;\r
      } B;\r
- } Can_EcoreErrorType;\r
+ } Can_Arc_ErrorType;\r
 \r
 // Each controller has 32 hth's, so the division of 32 will give the\r
 // controller.\r
@@ -133,7 +133,7 @@ void Can_EnableControllerInterrupts( uint8 controller );
 // Hth - for Flexcan, the hardware message box number... .We don't care\r
 \r
 \r
-Can_ReturnType Can_Write( Can_EcoreHTHType hth, Can_PduType *pduInfo );\r
+Can_ReturnType Can_Write( Can_Arc_HTHType hth, Can_PduType *pduInfo );\r
 \r
 void Can_Cbk_CheckWakeup( uint8 controller );\r
 void Can_MainFunction_Write( void );\r
@@ -141,6 +141,6 @@ void Can_MainFunction_Read( void );
 void Can_MainFunction_BusOff( void );\r
 void Can_MainFunction_Wakeup( void );\r
 \r
-void Can_EcoreGetStatistics( uint8 controller, Can_EcoreStatisticsType * stat);\r
+void Can_Arc_GetStatistics( uint8 controller, Can_Arc_StatisticsType * stat);\r
 \r
 #endif /*CAN_H_*/\r
index 900ad52902ab2030520e233c9899f4b8fa68bc50..958d7750ca6f6c629b2f1d50050dc30fb7e8af37 100644 (file)
@@ -66,7 +66,7 @@
 #define CANIF_CONTROLLER_BUSOFF_ID    0x16
 
 #define CANIF_SETWAKEUPEVENT_ID       0x40
-#define CANIF_ECOREERROR_ID           0x41
+#define CANIF_ARCERROR_ID           0x41
 
 void CanIf_Init(const CanIf_ConfigType *ConfigPtr);
 
index 3adb72da46efc7b044c9602f940c48d64d7fd119..db4886fe17198de515f875018806fa5ed2e25d95 100644 (file)
@@ -33,7 +33,7 @@ void CanIf_CancelTxConfirmation( const Can_PduType *PduInfoPtr );
 void CanIf_ControllerBusOff( uint8 Controller );\r
 void CanIf_SetWakeupEvent( uint8 Controller );\r
 \r
-/* Ecore extensions */\r
-void CanIf_EcoreError( uint8 Controller, Can_EcoreErrorType Error );\r
+/* ArcCore extensions */\r
+void CanIf_Arc_Error( uint8 Controller, Can_Arc_ErrorType Error );\r
 \r
 #endif /*CANIF_CBK_H_*/\r
index 1005a5f099f57be4fb5ad7c5a107d7e338403a1f..d6e7eadf1f596acf5dd15609158a30451beadfd7 100644 (file)
@@ -25,7 +25,7 @@
 \r
 #include "Std_Types.h"\r
 #include "ComStack_Types.h"\r
-#include "Com_EcoreTypes.h"\r
+#include "Com_Arc_Types.h"\r
 \r
 \r
 #ifdef COM_DEV_ERROR_DETECT\r
@@ -44,7 +44,7 @@
 \r
 const Com_ConfigType * ComConfig;\r
 \r
-ComEcoreConfig_type ComEcoreConfig;\r
+Com_Arc_Config_type Com_Arc_Config;\r
 \r
 \r
 \r
@@ -56,13 +56,13 @@ ComEcoreConfig_type ComEcoreConfig;
 \r
 // Define macro for parameter check.\r
 #define PduIdCheck(PduId,ApiId,...) \\r
-       if (PduId >= ComEcoreConfig.ComNIPdu) { \\r
+       if (PduId >= Com_Arc_Config.ComNIPdu) { \\r
                DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_INVALID_PDU_ID); \\r
                return __VA_ARGS__; \\r
        } \\r
 \r
 #define COM_VALIDATE_SIGNAL(SignalId, ApiId, ...) \\r
-       if (ComConfig->ComSignal[SignalId].ComEcoreIsSignalGroup) { \\r
+       if (ComConfig->ComSignal[SignalId].Com_Arc_IsSignalGroup) { \\r
                DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_ERROR_SIGNAL_IS_SIGNALGROUP); \\r
                return __VA_ARGS__; \\r
        } \\r
@@ -85,20 +85,20 @@ ComEcoreConfig_type ComEcoreConfig;
 #define ComGetSignal(SignalId) \\r
        const ComSignal_type * Signal = &ComConfig->ComSignal[SignalId]\\r
 \r
-#define ComGetEcoreSignal(SignalId) \\r
-       ComEcoreSignal_type * EcoreSignal = &ComEcoreConfig.ComSignal[SignalId]\\r
+#define ComGetArcSignal(SignalId) \\r
+       Com_Arc_Signal_type * Arc_Signal = &Com_Arc_Config.ComSignal[SignalId]\\r
 \r
 #define ComGetIPdu(IPduId) \\r
        const ComIPdu_type *IPdu = &ComConfig->ComIPdu[IPduId]\\r
 \r
-#define ComGetEcoreIPdu(IPduId) \\r
-       ComEcoreIPdu_type *EcoreIPdu = &ComEcoreConfig.ComIPdu[IPduId]\\r
+#define ComGetArcIPdu(IPduId) \\r
+       Com_Arc_IPdu_type *Arc_IPdu = &Com_Arc_Config.ComIPdu[IPduId]\\r
 \r
 #define ComGetGroupSignal(GroupSignalId) \\r
        const ComGroupSignal_type *GroupSignal = &ComConfig->ComGroupSignal[GroupSignalId]\\r
 \r
-#define ComGetEcoreGroupSignal(GroupSignalId) \\r
-       ComEcoreGroupSignal_type *EcoreGroupSignal = &ComEcoreConfig.ComGroupSignal[GroupSignalId]\\r
+#define ComGetArcGroupSignal(GroupSignalId) \\r
+       Com_Arc_GroupSignal_type *Arc_GroupSignal = &Com_Arc_Config.ComGroupSignal[GroupSignalId]\\r
 \r
 //-------------------------------------------------------------------\r
 // From OSEK_VDX spec...\r
index 598a1c748f2c3cc671688be8ee832307b9ba7891..062623c1a10fadb1d4966c9aa3803d0097d8d213 100644 (file)
@@ -122,9 +122,9 @@ typedef struct {
        uint32 ComFilterX;\r
 \r
 \r
-       uint32 ComFilterEcoreN;\r
-       uint32 ComFilterEcoreNewValue;\r
-       uint32 ComFilterEcoreOldValue;\r
+       uint32 ComFilterArcN;\r
+       uint32 ComFilterArcNewValue;\r
+       uint32 ComFilterArcOldValue;\r
 \r
 } ComFilter_type;\r
 \r
@@ -224,7 +224,7 @@ typedef struct {
         *\r
         * Comment: This is initialized by Com_Init() and should not be configured.\r
         */\r
-       //void *ComEcoreShadowBuffer;\r
+       //void *Com_Arc_ShadowBuffer;\r
 \r
 \r
        /* IPDU id of the IPDU that this signal belongs to.\r
@@ -235,7 +235,7 @@ typedef struct {
        //const uint8 ComIPduHandleId;\r
        //const uint8 ComSignalUpdated;\r
 \r
-       const uint8 ComEcoreEOL;\r
+       const uint8 Com_Arc_EOL;\r
 } ComGroupSignal_type;\r
 \r
 typedef struct {\r
@@ -368,7 +368,7 @@ typedef struct {
         *   - Receive\r
         *   - Not required.\r
         */\r
-       //const uint32 ComEcoreDeadlineCounter;\r
+       //const uint32 Com_Arc_DeadlineCounter;\r
        const uint32 ComTimeoutFactor;\r
 \r
        /* Timeout notification function\r
@@ -388,11 +388,11 @@ typedef struct {
         *   - Send and receive.\r
         *   - Not required.\r
         *\r
-        * Comment: Range 0 to 63. If update bit is used for this signal, then the corresponding parameter ComSignalEcoreUseUpdateBit\r
+        * Comment: Range 0 to 63. If update bit is used for this signal, then the corresponding parameter ComSignalArcUseUpdateBit\r
         *          needs to be set to one.
         */\r
        const uint8 ComUpdateBitPosition;\r
-       const uint8 ComSignalEcoreUseUpdateBit;\r
+       const uint8 ComSignalArcUseUpdateBit;\r
 \r
        /* Filter for this signal\r
         *\r
@@ -404,10 +404,10 @@ typedef struct {
 \r
 \r
        /**** SIGNAL GROUP DATA ****/\r
-       const uint8 ComEcoreIsSignalGroup;\r
+       const uint8 Com_Arc_IsSignalGroup;\r
        const ComGroupSignal_type *ComGroupSignal[COM_MAX_NR_SIGNALS_PER_SIGNAL_GROUP];\r
-       //void *ComEcoreShadowBuffer;\r
-       //void *ComEcoreIPduDataPtr;\r
+       //void *Com_Arc_ShadowBuffer;\r
+       //void *Com_Arc_IPduDataPtr;\r
 \r
 \r
        /* Pointer to the data storage of this signals IPDU.\r
@@ -425,7 +425,7 @@ typedef struct {
        //const uint8 ComSignalUpdated;\r
 \r
 \r
-       const uint8 ComEcoreEOL;\r
+       const uint8 Com_Arc_EOL;\r
 } ComSignal_type;\r
 \r
 \r
@@ -524,7 +524,7 @@ typedef struct ComIPduGroup_type {
        // reference to the group that this group possibly belongs to.\r
        //struct ComIPduGroup_type *ComIPduGroupRef;\r
 \r
-       const uint8 ComEcoreEOL;\r
+       const uint8 Com_Arc_EOL;\r
 } ComIPduGroup_type;\r
 \r
 \r
@@ -607,7 +607,7 @@ typedef struct {
         *\r
         * Comment: These are internal variables and should not be configured.
         */\r
-       //ComTxIPduTimer_type ComEcoreTxIPduTimers;\r
+       //ComTxIPduTimer_type Com_Arc_TxIPduTimers;\r
 \r
        /* Pointer to data storage of this IPDU.\r
         *\r
@@ -626,7 +626,7 @@ typedef struct {
         *\r
         * Comment: It probably makes little sense not to define at least one signal for each IPDU.\r
         */\r
-       //const uint8 ComEcoreNIPduSignalGroupRef;\r
+       //const uint8 Com_Arc_NIPduSignalGroupRef;\r
        const ComSignal_type *ComIPduSignalGroupRef[COM_MAX_NR_SIGNALS_PER_IPDU];\r
 \r
 \r
@@ -644,10 +644,10 @@ typedef struct {
        /*\r
         * The following two variables are used to control the per I-PDU based Rx/Tx-deadline monitoring.\r
         */\r
-       //const uint32 ComEcoreDeadlineCounter;\r
-       //const uint32 ComEcoreTimeoutFactor;\r
+       //const uint32 Com_Arc_DeadlineCounter;\r
+       //const uint32 Com_Arc_TimeoutFactor;\r
 \r
-       const uint8 ComEcoreEOL;\r
+       const uint8 Com_Arc_EOL;\r
 \r
 } ComIPdu_type;\r
 \r
@@ -667,7 +667,7 @@ typedef struct {
        // IPDU definitions. At least one\r
        const ComIPdu_type *ComIPdu;\r
 \r
-       //uint16 ComEcoreNIPdu;\r
+       //uint16 Com_Arc_NIPdu;\r
 \r
        // IPDU group definitions\r
        const ComIPduGroup_type *ComIPduGroup;\r
index e8d3bd25546be9e129664b6bed1680d0babbe8fd..4a328651201fba77ab8abda19beb5bda4eb3aa2b 100644 (file)
@@ -107,7 +107,7 @@ void Mcu_SetMode( const Mcu_ModeType McuMode );
 \r
 typedef uint32_t imask_t;\r
 \r
-/* ecore extensions */\r
+/* ArcCore extensions */\r
 void IntCtrl_InstallVector(void (*func)(), IrqType vector, uint8_t priority, Cpu_t cpu );\r
 void IntCtrl_GenerateSoftInt( IrqType vector );\r
 uint8_t IntCtrl_GetCurrentPriority( Cpu_t cpu);\r
index 62e49f50c15ab884ff70561e6c2fd4815411e92d..c7dbe5ac76066dbc98efd45ffff453a3ceaa46c8 100644 (file)
  * -------------------------------- Arctic Core ------------------------------*/
 
 
-
-
-
-
-
-
-/*\r
- * (C) Copyright 2008 ecore, www.ecore.se\r
- */
 \r
 #ifndef OS_H_\r
 #define OS_H_\r
@@ -443,7 +434,7 @@ StatusType SendMessage( MessageType message_id, ApplicationDataRef dataRef );
 StatusType ReceiveMessage( MessageType message_id, ApplicationDataRef dataRef );\r
 \r
 /*\r
- * ecore extensions\r
+ * ArcCore extensions\r
  */\r
 TickType GetOsTick();\r
 void OsTick(void);\r
index 330d24daa128f2f48150a8ee38f99a8b71c3a272..ac1308076227f672f7f7c577ae8989d7187a85fe 100644 (file)
@@ -261,7 +261,7 @@ typedef enum {
   FLS_SST25XX_ERASE,\r
   FLS_SST25XX_READ,\r
   FLS_SST25XX_WRITE,\r
-} Fls_SST25xx_EcoreJobType;\r
+} Fls_SST25xx_Arc_JobType;\r
 \r
 /* Spi job state */\r
 typedef enum {\r
@@ -276,7 +276,7 @@ typedef struct {
        Fls_AddressType flsAddr;\r
        uint32 left;\r
        Job_StateType state;\r
-       Fls_SST25xx_EcoreJobType mainState;\r
+       Fls_SST25xx_Arc_JobType mainState;\r
        Spi_SequenceType currSeq;\r
        uint32 chunkSize;\r
 } Fls_SST25xx_JobInfoType;\r
@@ -290,7 +290,7 @@ typedef struct {
   // Status of driver\r
   MemIf_StatusType status;\r
   MemIf_JobResultType jobResultType;\r
-  Fls_SST25xx_EcoreJobType jobType;\r
+  Fls_SST25xx_Arc_JobType jobType;\r
 \r
   // Saved information from API calls.\r
   Fls_AddressType flsAddr;\r