Reverts the 2017 Image for Beta 1 (#264)

* Revert "Updated the rpath to point to the correct location for the Java integration tests. (#262)"

This reverts commit c313dde03a.

* Revert "Update image 2017 v5 (#254)"

This reverts commit 8d1c51b7e9.
This commit is contained in:
Thad House
2016-10-12 19:52:49 -07:00
committed by Fred Silberberg
parent 27bf94fd06
commit f1c2b66569
169 changed files with 2410 additions and 1004 deletions

View File

@@ -1,14 +1,14 @@
// Copyright (c) National Instruments 2008. All Rights Reserved.
// Do Not Edit... this file is generated!
#ifndef __nFRC_2017_17_0_1_DIO_h__
#define __nFRC_2017_17_0_1_DIO_h__
#ifndef __nFRC_2016_16_1_0_DIO_h__
#define __nFRC_2016_16_1_0_DIO_h__
#include "tSystemInterface.h"
namespace nFPGA
{
namespace nFRC_2017_17_0_1
namespace nFRC_2016_16_1_0
{
class tDIO
@@ -30,13 +30,11 @@ public:
struct{
#ifdef __vxworks
unsigned Headers : 10;
unsigned SPIPort : 5;
unsigned Reserved : 1;
unsigned Reserved : 6;
unsigned MXP : 16;
#else
unsigned MXP : 16;
unsigned Reserved : 1;
unsigned SPIPort : 5;
unsigned Reserved : 6;
unsigned Headers : 10;
#endif
};
@@ -49,13 +47,11 @@ public:
struct{
#ifdef __vxworks
unsigned Headers : 10;
unsigned SPIPort : 5;
unsigned Reserved : 1;
unsigned Reserved : 6;
unsigned MXP : 16;
#else
unsigned MXP : 16;
unsigned Reserved : 1;
unsigned SPIPort : 5;
unsigned Reserved : 6;
unsigned Headers : 10;
#endif
};
@@ -68,13 +64,11 @@ public:
struct{
#ifdef __vxworks
unsigned Headers : 10;
unsigned SPIPort : 5;
unsigned Reserved : 1;
unsigned Reserved : 6;
unsigned MXP : 16;
#else
unsigned MXP : 16;
unsigned Reserved : 1;
unsigned SPIPort : 5;
unsigned Reserved : 6;
unsigned Headers : 10;
#endif
};
@@ -87,13 +81,11 @@ public:
struct{
#ifdef __vxworks
unsigned Headers : 10;
unsigned SPIPort : 5;
unsigned Reserved : 1;
unsigned Reserved : 6;
unsigned MXP : 16;
#else
unsigned MXP : 16;
unsigned Reserved : 1;
unsigned SPIPort : 5;
unsigned Reserved : 6;
unsigned Headers : 10;
#endif
};
@@ -110,12 +102,10 @@ public:
virtual void writeDO(tDO value, tRioStatusCode *status) = 0;
virtual void writeDO_Headers(unsigned short value, tRioStatusCode *status) = 0;
virtual void writeDO_SPIPort(unsigned char value, tRioStatusCode *status) = 0;
virtual void writeDO_Reserved(unsigned char value, tRioStatusCode *status) = 0;
virtual void writeDO_MXP(unsigned short value, tRioStatusCode *status) = 0;
virtual tDO readDO(tRioStatusCode *status) = 0;
virtual unsigned short readDO_Headers(tRioStatusCode *status) = 0;
virtual unsigned char readDO_SPIPort(tRioStatusCode *status) = 0;
virtual unsigned char readDO_Reserved(tRioStatusCode *status) = 0;
virtual unsigned short readDO_MXP(tRioStatusCode *status) = 0;
@@ -153,12 +143,10 @@ public:
virtual void writeOutputEnable(tOutputEnable value, tRioStatusCode *status) = 0;
virtual void writeOutputEnable_Headers(unsigned short value, tRioStatusCode *status) = 0;
virtual void writeOutputEnable_SPIPort(unsigned char value, tRioStatusCode *status) = 0;
virtual void writeOutputEnable_Reserved(unsigned char value, tRioStatusCode *status) = 0;
virtual void writeOutputEnable_MXP(unsigned short value, tRioStatusCode *status) = 0;
virtual tOutputEnable readOutputEnable(tRioStatusCode *status) = 0;
virtual unsigned short readOutputEnable_Headers(tRioStatusCode *status) = 0;
virtual unsigned char readOutputEnable_SPIPort(tRioStatusCode *status) = 0;
virtual unsigned char readOutputEnable_Reserved(tRioStatusCode *status) = 0;
virtual unsigned short readOutputEnable_MXP(tRioStatusCode *status) = 0;
@@ -178,12 +166,10 @@ public:
virtual void writePulse(tPulse value, tRioStatusCode *status) = 0;
virtual void writePulse_Headers(unsigned short value, tRioStatusCode *status) = 0;
virtual void writePulse_SPIPort(unsigned char value, tRioStatusCode *status) = 0;
virtual void writePulse_Reserved(unsigned char value, tRioStatusCode *status) = 0;
virtual void writePulse_MXP(unsigned short value, tRioStatusCode *status) = 0;
virtual tPulse readPulse(tRioStatusCode *status) = 0;
virtual unsigned short readPulse_Headers(tRioStatusCode *status) = 0;
virtual unsigned char readPulse_SPIPort(tRioStatusCode *status) = 0;
virtual unsigned char readPulse_Reserved(tRioStatusCode *status) = 0;
virtual unsigned short readPulse_MXP(tRioStatusCode *status) = 0;
@@ -194,7 +180,6 @@ public:
virtual tDI readDI(tRioStatusCode *status) = 0;
virtual unsigned short readDI_Headers(tRioStatusCode *status) = 0;
virtual unsigned char readDI_SPIPort(tRioStatusCode *status) = 0;
virtual unsigned char readDI_Reserved(tRioStatusCode *status) = 0;
virtual unsigned short readDI_MXP(tRioStatusCode *status) = 0;
@@ -260,4 +245,4 @@ private:
}
}
#endif // __nFRC_2017_17_0_1_DIO_h__
#endif // __nFRC_2016_16_1_0_DIO_h__