]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commitdiff
FlexRay driver code cleanup
authorMichal Horn <hornmich@fel.cvut.cz>
Fri, 20 Sep 2013 08:41:06 +0000 (10:41 +0200)
committerMichal Horn <hornmich@fel.cvut.cz>
Fri, 20 Sep 2013 08:41:06 +0000 (10:41 +0200)
rpp/src/drv/fr_tms570.c

index 91e951ace42cf2ea05bac0f22bac084a88c90c35..03bc104855804e58675a07b2ca09dbc8e8a5767d 100644 (file)
@@ -211,7 +211,6 @@ static void Fr_buffer_receive_data_header(uint32_t buf_num) {
 
     frayREG->OBCM_UN.OBCM_UL=(((read_buffer.rdss & 0x1) << 1) | (read_buffer.rhss & 0x1));
     frayREG->OBCR_UN.OBCR_UL=((1 << 8) | (read_buffer.obrs & 0x3F)); //req=0, view=1
-
 }
 
 /**
@@ -719,7 +718,6 @@ Std_ReturnType Fr_check_buffer_parameters(const Fr_TMS570LS_BufferConfigType* st
        boolean_t fifoRejNullFr, fifoRejStatFr;
        const Fr_TMS570LS_BufferConfigType* buffer_cfg_ptr = NULL;
 
-
        /* Check FIFO buffer parameters */
        if (fifoBufCnt != 0 && fifoBufCfgPtr != NULL) {
                fifoChannels = fifoBufCfgPtr[0].channel;
@@ -1058,23 +1056,10 @@ Std_ReturnType Fr_StartCommunication(uint8_t Fr_CtrlIdx) {
        if (Fr_DrvState != FR_ST_CTRL_INITIALIZED) {
                return E_NOT_OK;
        }
-       if (frayREG->CCSV_UN.CCSV_ST.pocs_B6 != FR_POCS_READY && frayREG->CCSV_UN.CCSV_ST.pocs_B6 != FR_POCS_HALT) {
+       if (frayREG->CCSV_UN.CCSV_ST.pocs_B6 != FR_POCS_READY) {
                return E_NOT_OK;
        }
 #endif
-       // Node halted, switch to ready
-       if (frayREG->CCSV_UN.CCSV_ST.pocs_B6 == FR_POCS_HALT) {
-               if (Fr_POC_go_to_config() == E_NOT_OK) {
-                       return E_NOT_OK;
-               }
-               if (Fr_POC_go_to_config() == E_NOT_OK) {
-                       return E_NOT_OK;
-               }
-               if (Fr_POC_go_to_ready_from_config() == E_NOT_OK) {
-                       return E_NOT_OK;
-               }
-       }
-
        // Node is configured as coldstart
        if (Fr_Config->nodeConfiguration->pKeySlotUsedForStartup == TRUE) {
         // Start up loop
@@ -1904,7 +1889,6 @@ Std_ReturnType Fr_SetAbsoluteTimer(uint8_t Fr_CtrlIdx, uint8_t Fr_AbsTimerIdx, u
        else {
                return E_NOT_OK;
        }
-
        return E_OK;
 }