Index: App/Services/FPGA.c
===================================================================
diff -u -r8ca991f9c04d8d301ada71eabc297f514b0d6cf8 -r447eb904c9deb9536c04c9cc0e009a0b26b55573
--- App/Services/FPGA.c	(.../FPGA.c)	(revision 8ca991f9c04d8d301ada71eabc297f514b0d6cf8)
+++ App/Services/FPGA.c	(.../FPGA.c)	(revision 447eb904c9deb9536c04c9cc0e009a0b26b55573)
@@ -564,7 +564,7 @@
     FPGA_STATE_T result = FPGA_STATE_WRITE_ALL_ACTUATORS;
 
     // check bulk write command success
-    if ( ( FALSE == fpgaWriteCommandResponseReceived ) || ( fpgaWriteResponseBuffer[0] != FPGA_WRITE_CMD_ACK )
+    if ( ( FALSE == fpgaWriteCommandResponseReceived ) || ( fpgaWriteResponseBuffer[0] != FPGA_WRITE_CMD_ACK ) )
     {
         // TODO - ???
     }
@@ -588,7 +588,6 @@
         // TODO - ???
     }
 
-
     return result;
 }
 
@@ -777,9 +776,7 @@
  *************************************************************************/
 U16 getFPGAStatus( void )
 {
-    U16 result = MAKE_WORD_OF_BYTES(fpgaHeader.fpgaStatusHigh,fpgaHeader.fpgaStatusLow);
-
-    return result;
+    return fpgaHeader.fpgaStatus;
 }
 
 /*************************************************************************
@@ -794,7 +791,6 @@
  *************************************************************************/
 void setFPGAControl( U16 ctrl )
 {
-    fpgaHeader.fpgaControlHigh = GET_MSB_OF_WORD( ctrl );
-    fpgaHeader.fpgaControlLow = GET_MSB_OF_WORD( ctrl );
+    fpgaHeader.fpgaControl = ctrl;
 }