From 70be534fe0de5a5b442d6a7c3f3e1977a3cd6744 Mon Sep 17 00:00:00 2001 From: Thomas Clark Date: Tue, 21 Oct 2014 16:41:24 -0400 Subject: [PATCH] v16 Image Change-Id: I054ce8fdeb904ef00e88ce9e3133a381da396b42 --- .../FRC_FPGA_ChipObject/tInterruptManager.h | 3 ++- .../libFRC_NetworkCommunication.so.1.5.0 | Bin 499764 -> 499764 bytes .../libFRC_NetworkCommunicationLV.so.1.5.0 | Bin 4612 -> 4612 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h b/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h index b09ad988e0..cb6783df0f 100644 --- a/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h +++ b/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h @@ -32,7 +32,7 @@ public: void enable(tRioStatusCode *status); void disable(tRioStatusCode *status); bool isEnabled(tRioStatusCode *status); -public: +private: class tInterruptThread; friend class tInterruptThread; void handler(); @@ -58,3 +58,4 @@ public: #endif // __tInterruptManager_h__ + diff --git a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 index fded9d7bbf0a7c3ec6581d86d05876c4b9087b8e..45230dd7c347cfeac685b66fd7f2bb80ea0a4924 100755 GIT binary patch delta 115 zcmdmTKyJ$cxrP?T7N!>F7M2#)Eo`s5SWOs!VDdqG;qA=bZ1?Pxfc!i^&#=^@;>`TK zc(=@)R4CilP|sA)AkoxhI`b(uOGcCFwx`$>c#ISbO|4AKtV}F*6ee#pm)PETif!u! NMw9L4v)TW$005Q!C7A#K delta 115 zcmdmTKyJ$cxrP?T7N!>F7M2#)Eo`s5SdAHgVDdqG;qA=bZ1?Pxfc!i^&#=^@;>`TK zc(=@)R4CilP|sA)Akox#I`b(uOGe}Awx`$>cnlQ`&8>_LtxU{y6ee#pm)PETif!u! NM&s?~v)TW$005L&C5-?8 diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 index 707be3db2719053c57ab8de50995daa11885d5a0..670c16e50dc5eb8063b42b439a7e2f73faf56fc7 100755 GIT binary patch delta 54 zcmZosX;IlA%f)CiS&mBqNZNB*1IcPGIUXYgLsKggGb