Index: firmware/App/Drivers/CPLD.c =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rea562263f55f20589a8512da8c00be33a8f239b5 --- firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision ea562263f55f20589a8512da8c00be33a8f239b5) @@ -22,38 +22,18 @@ // ********** private definitions ********** -// GIO port A pin assignments for pins connected to CPLD -#define OFF_BUTTON_GIO_PORT_PIN 0U -#define STOP_BUTTON_GIO_PORT_PIN 1U - // GIO port B pin assignments for pins connected to CPLD #define OFF_REQUEST_GIO_PORT_PIN 0U #define WD_PET_GIO_PORT_PIN 1U #define WD_EXP_GIO_PORT_PIN 2U -// MIBSPI5 port pin assignments for pins connected to CPLD -#define GREEN_SPI5_PORT_MASK 0x00000200 // (CLK - re-purposed as output GPIO) -#define BLUE_SPI5_PORT_MASK 0x00000400 // (SIMO[0] - re-purposed as output GPIO) -#define RED_SPI5_PORT_MASK 0x00000800 // (SOMI[0] - re-purposed as output GPIO) - // CPLD pin I/O macros -#define GET_OFF() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, OFF_BUTTON_GIO_PORT_PIN ) ) -#define GET_STOP() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, STOP_BUTTON_GIO_PORT_PIN ) ) #define GET_WD_EXP() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTB, WD_EXP_GIO_PORT_PIN ) ) #define TGL_WD_PET() gioToggleBit( gioPORTB, WD_PET_GIO_PORT_PIN ) -#define TGL_OFF_REQ() gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN ) #define SET_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) -#define SET_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) -#define SET_GREEN() { mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK; } -#define SET_BLUE() { mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK; } -#define SET_RED() { mibspiREG5->PC3 |= RED_SPI5_PORT_MASK; } #define CLR_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_LOW ) -#define CLR_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_LOW ) -#define CLR_GREEN() { mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK; } -#define CLR_BLUE() { mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK; } -#define CLR_RED() { mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK; } #ifdef RM46_EVAL_BOARD_TARGET // for RM46 eval board, user button B uses the MIBSPI1_nCS[4] pin, so need to re-purpose that pin as GPIO to see the button @@ -98,14 +78,6 @@ { // initialize watchdog pet output low (inactive) CLR_WD_PET(); - - // initialize power off request output low (inactive) - CLR_OFF_REQ(); - - // initialize alarm lamp color LED outputs low (off) - CLR_GREEN(); - CLR_RED(); - CLR_BLUE(); } /************************************************************************* @@ -139,116 +111,3 @@ return level; } -/************************************************************************* - * @brief setCPLDLampGreen - * The setCPLDLampGreen function sets the alarm lamp green signal to CPLD \n - * to given level. - * @details - * Inputs : none - * Outputs : alarm lamp green signal set to given level. - * @param level : LOW or HIGH - * @return none - *************************************************************************/ -void setCPLDLampGreen( PIN_SIGNAL_STATE_T level ) -{ - if ( level == PIN_SIGNAL_HIGH ) - { - SET_GREEN(); - } - else - { - CLR_GREEN(); - } -} - -/************************************************************************* - * @brief setCPLDLampBlue - * The setCPLDLampBlue function sets the alarm lamp blue signal to CPLD \n - * to given level. - * @details - * Inputs : none - * Outputs : alarm lamp blue signal set to given level. - * @param level : LOW or HIGH - * @return none - *************************************************************************/ -void setCPLDLampBlue( PIN_SIGNAL_STATE_T level ) -{ - if ( level == PIN_SIGNAL_HIGH ) - { - SET_BLUE(); - } - else - { - CLR_BLUE(); - } -} - -/************************************************************************* - * @brief setCPLDLampRed - * The setCPLDLampRed function sets the alarm lamp red signal to CPLD \n - * to given level. - * @details - * Inputs : none - * Outputs : alarm lamp red signal set to given level. - * @param level : LOW or HIGH - * @return none - *************************************************************************/ -void setCPLDLampRed( PIN_SIGNAL_STATE_T level ) -{ - if ( level == PIN_SIGNAL_HIGH ) - { - SET_RED(); - } - else - { - CLR_RED(); - } -} - -/************************************************************************* - * @brief toggleCPLDOffRequest - * The toggleCPLDOffRequest function toggles the off request signal to CPLD. - * @details - * Inputs : none - * Outputs : off request signal toggled. - * @return none - *************************************************************************/ -void toggleCPLDOffRequest( void ) -{ - TGL_OFF_REQ(); -} - -/************************************************************************* - * @brief getCPLDOffButton - * The getCPLDOffButton function determines the current signal level\n - * on the off button pin from the CPLD. - * @details - * Inputs : Signal from CPLD on off button pin. - * Outputs : none - * @param none - * @return level : (LOW or HIGH) - *************************************************************************/ -PIN_SIGNAL_STATE_T getCPLDOffButton( void ) -{ - PIN_SIGNAL_STATE_T level = GET_OFF(); - - return level; -} - -/************************************************************************* - * @brief getCPLDStopButton - * The getCPLDStopButton function determines the current signal level\n - * on the stop button pin from the CPLD. - * @details - * Inputs : Signal from CPLD on off button pin. - * Outputs : none - * @param none - * @return level : (LOW or HIGH) - *************************************************************************/ -PIN_SIGNAL_STATE_T getCPLDStopButton( void ) -{ - PIN_SIGNAL_STATE_T level = GET_STOP(); - - return level; -} -