Index: App/Drivers/CPLD.c
===================================================================
diff -u -r0e042876ff72edbbaad7e5c9cc743c5a4a8c14b3 -rad8ad611c910747eef92336a30b6520a83409532
--- App/Drivers/CPLD.c	(.../CPLD.c)	(revision 0e042876ff72edbbaad7e5c9cc743c5a4a8c14b3)
+++ App/Drivers/CPLD.c	(.../CPLD.c)	(revision ad8ad611c910747eef92336a30b6520a83409532)
@@ -15,7 +15,7 @@
  *************************************************************************/
 
 #include "gio.h"
-#include "lin.h"
+#include "mibspi.h"
 
 #include "Common.h"
 #include "AlarmLamp.h"
@@ -26,38 +26,37 @@
 // ********** private definitions **********
 
 // GIO port A pin assignments for pins connected to CPLD
-#define GREEN_GIO_PORT_PIN          6U
-#define RED_GIO_PORT_PIN            7U
+#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 OFF_BUTTON_GIO_PORT_PIN     2U
-#define STOP_BUTTON_GIO_PORT_PIN    3U
+#define WD_EXP_GIO_PORT_PIN         2U
 
 // LIN port pin assignments for pins connected to CPLD
-#define WD_EXP_LIN_PORT_MASK        2U    // (Rx - re-purposed as input GPIO)
-#define YELLOW_LIN_PORT_MASK        4U    // (Tx - re-purposed as output GPIO)
+#define GREEN_SPI5_PORT_MASK        0x00000200  // (CLK     - re-purposed as output GPIO)
+#define YELLOW_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(gioPORTB, OFF_BUTTON_GIO_PORT_PIN))
-#define GET_STOP()         (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTB, STOP_BUTTON_GIO_PORT_PIN))
-#define GET_WD_EXP()       (PIN_SIGNAL_STATE_T)(((linREG->PIO2 | WD_EXP_LIN_PORT_MASK) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH))
+#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()        gioSetBit( gioPORTA, GREEN_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
-#define SET_RED()          gioSetBit( gioPORTA, RED_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
-#define SET_YELLOW()       linREG->PIO3 |= YELLOW_LIN_PORT_MASK
+#define SET_GREEN()        mibspiREG5->PC4 |= GREEN_SPI5_PORT_MASK
+#define SET_YELLOW()       mibspiREG5->PC4 |= RED_SPI5_PORT_MASK
+#define SET_RED()          mibspiREG5->PC4 |= YELLOW_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()        gioSetBit( gioPORTA, GREEN_GIO_PORT_PIN, PIN_SIGNAL_LOW )
-#define CLR_RED()          gioSetBit( gioPORTA, RED_GIO_PORT_PIN, PIN_SIGNAL_LOW )
-#define CLR_YELLOW()       linREG->PIO3 &= ~YELLOW_LIN_PORT_MASK
+#define CLR_GREEN()        mibspiREG5->PC5 |= GREEN_SPI5_PORT_MASK
+#define CLR_YELLOW()       mibspiREG5->PC5 |= YELLOW_SPI5_PORT_MASK
+#define CLR_RED()          mibspiREG5->PC5 |= RED_SPI5_PORT_MASK
 
 /*************************************************************************
  * @brief initCPLD