initial commit

api/glue/device.c

@@ -364,6 +364,9 @@ eb_socket_t eb_device_socket(eb_device_t devicep) {
 eb_status_t eb_device_read(eb_device_t devicep, eb_address_t address, eb_format_t format, eb_data_t* data, eb_user_data_t user_data, eb_callback_t cb) {
   eb_status_t out;
   eb_cycle_t cycle;
+
+  /* hack for labview */
+  if (!cb) cb = eb_block;
   
   out = eb_cycle_open(devicep, user_data, cb, &cycle);
   if (out != EB_OK) return out;
@@ -377,6 +380,9 @@ eb_status_t eb_device_write(eb_device_t devicep, eb_address_t address, eb_format
   eb_status_t out;
   eb_cycle_t cycle;
   
+  /* hack for labview */
+  if (!cb) cb = eb_block;
+
   out = eb_cycle_open(devicep, user_data, cb, &cycle);
   if (out != EB_OK) return out;
   

api/labview/LabVIEW/LV2009/LVEtherboneInterface.aliases → api/labview/LV2012/LVEtherboneInterface.aliases

-[My Computer]
-My Computer = "140.181.72.236"
-
+[My Computer]
+My Computer = "127.0.1.1"
+

api/labview/LV2012/LVEtherboneInterface.lvlps

+[ProjectWindow_Data]
+ProjectExplorer.ClassicPosition[String] = "116,1582,705,2265"
+

api/labview/LabVIEW/LV2009/LVEtherboneInterface.lvproj → api/labview/LV2012/LVEtherboneInterface.lvproj

-<?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="9008000">
-	<Item Name="My Computer" Type="My Computer">
-		<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
-		<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
-		<Property Name="server.tcp.enabled" Type="Bool">false</Property>
-		<Property Name="server.tcp.port" Type="Int">0</Property>
-		<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
-		<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
-		<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
-		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
-		<Property Name="specify.custom.address" Type="Bool">false</Property>
-		<Item Name="lvEtherbone.lvlib" Type="Library" URL="../lvEtherbone/lvEtherbone.lvlib"/>
-		<Item Name="Dependencies" Type="Dependencies">
-			<Item Name="vi.lib" Type="Folder">
-				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
-				<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
-				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
-				<Item Name="Merge Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Merge Errors.vi"/>
-			</Item>
-		</Item>
-		<Item Name="Build Specifications" Type="Build"/>
-	</Item>
-</Project>
+<?xml version='1.0' encoding='UTF-8'?>
+<Project Type="Project" LVVersion="12008004">
+	<Item Name="My Computer" Type="My Computer">
+		<Property Name="NI.SortType" Type="Int">3</Property>
+		<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
+		<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
+		<Property Name="server.tcp.enabled" Type="Bool">false</Property>
+		<Property Name="server.tcp.port" Type="Int">0</Property>
+		<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
+		<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
+		<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
+		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
+		<Property Name="specify.custom.address" Type="Bool">false</Property>
+		<Item Name="lvEtherbone.lvlib" Type="Library" URL="../lvEtherbone/lvEtherbone.lvlib"/>
+		<Item Name="Dependencies" Type="Dependencies">
+			<Item Name="vi.lib" Type="Folder">
+				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
+			</Item>
+			<Item Name="libetherbone.so" Type="Document" URL="libetherbone.so">
+				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
+			</Item>
+		</Item>
+		<Item Name="Build Specifications" Type="Build"/>
+	</Item>
+</Project>