From 46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan <jmccrohan@gmail.com>
Date: Sun, 3 Mar 2013 19:30:43 +0000
Subject: Imported Upstream version 2.1.8.20121218

---
 labview/phidget_labview.c | 24 ++++++------------------
 labview/phidget_labview.h | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'labview')

diff --git a/labview/phidget_labview.c b/labview/phidget_labview.c
index 380915b..64f6cae 100644
--- a/labview/phidget_labview.c
+++ b/labview/phidget_labview.c
@@ -140,23 +140,12 @@ LV_CFHANDLE_BODY(RFID, TagLost, lvUInt8Array, void *userPtr, unsigned char *val1
     DSDisposePtr(data);
 	return EPHIDGET_OK;
 }
-LV_CFHANDLE_BODY(RFID, RawData, lvInt32Array, void *userPtr, int *val1, int val2)
-    data->val1=(lvArrInt32DH)DSNewHandle(sizeof(int32)+val2*sizeof(int32));
-    (*(data->val1))->length = val2;
-	memcpy((*(data->val1))->data, val1, val2 * sizeof(int32));
-
-    ret = PostLVUserEvent(ev, data);
-
-	DSDisposeHandle(data->val1);
-    DSDisposePtr(data);
-	return EPHIDGET_OK;
-}
-LV_CFHANDLE_BODY(RFID, TagAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1, CPhidgetRFID_TagInfoHandle val2)
+LV_CFHANDLE_BODY(RFID, Tag2, lvRFIDTag2, void *userPtr, char *val1, CPhidgetRFID_Protocol val2)
     data->val1=(LStrHandle)DSNewHandle(sizeof(int32)+255*sizeof(char));
 	memset(LStrBuf(*data->val1),'\0',255);
 	snprintf((char*)LStrBuf(*data->val1),255,"%s",val1);
 	LStrLen(*data->val1)=strlen(val1);
-	data->val2 = *val2;
+	data->val2 = val2;
 
     ret = PostLVUserEvent(ev, data);
 
@@ -164,12 +153,12 @@ LV_CFHANDLE_BODY(RFID, TagAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1
     DSDisposePtr(data);
 	return EPHIDGET_OK;
 }
-LV_CFHANDLE_BODY(RFID, TagLostAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1, CPhidgetRFID_TagInfoHandle val2)
+LV_CFHANDLE_BODY(RFID, TagLost2, lvRFIDTag2, void *userPtr, char *val1, CPhidgetRFID_Protocol val2)
     data->val1=(LStrHandle)DSNewHandle(sizeof(int32)+255*sizeof(char));
 	memset(LStrBuf(*data->val1),'\0',255);
 	snprintf((char*)LStrBuf(*data->val1),255,"%s",val1);
 	LStrLen(*data->val1)=strlen(val1);
-	data->val2 = *val2;
+	data->val2 = val2;
 
     ret = PostLVUserEvent(ev, data);
 
@@ -397,9 +386,8 @@ LV_NULL_FUNC(PHSensor, PHChange)
 LV_NULL_FUNC(RFID, OutputChange)
 LV_NULL_FUNC(RFID, Tag)
 LV_NULL_FUNC(RFID, TagLost)
-LV_NULL_FUNC(RFID, RawData)
-LV_NULL_FUNC(RFID, TagAdvanced)
-LV_NULL_FUNC(RFID, TagLostAdvanced)
+LV_NULL_FUNC(RFID, Tag2)
+LV_NULL_FUNC(RFID, TagLost2)
 
 LV_NULL_FUNC(Servo, PositionChange)
 
diff --git a/labview/phidget_labview.h b/labview/phidget_labview.h
index fa96571..fff459d 100644
--- a/labview/phidget_labview.h
+++ b/labview/phidget_labview.h
@@ -255,13 +255,13 @@ typedef struct _lvIRLearn {
 } lvIRLearn;
 
 /**
- * Used for Labview events that return an rfid tag (advanced)
+ * Used for Labview events that return an rfid tag (v2)
  */
-typedef struct _lvRFIDTagAdvanced {
-	int32 nothing;			/**< Not Used */
+typedef struct _lvRFIDTag2 {
 	LStrHandle val1;			/**< Tag String */
-	CPhidgetRFID_TagInfo val2;	/**< tag properties */
-} lvRFIDTagAdvanced;
+	CPhidgetRFID_Protocol val2;	/**< tag protocol */
+	int32 nothing;			/**< Not Used */
+} lvRFIDTag2;
 
 /**
  * Used for Labview events that return spatial data
@@ -550,19 +550,19 @@ LV_CHDREVENT(RFID, TagLost)
  */
 LV_CHDREVENT(RFID, RawData)
 /**
- * Sets up a Labview event callback for the TagAdvanced event.
- * Event callback returns an \ref _lvRFIDTagAdvanced.
+ * Sets up a Labview event callback for the Tag2 event.
+ * Event callback returns an \ref _lvRFIDTag2.
  * @param phid An attached phidget handle.
  * @param lvEventRef Lavbiew user event ref
  */
-LV_CHDREVENT(RFID, TagAdvanced)
+LV_CHDREVENT(RFID, Tag2)
 /**
- * Sets up a Labview event callback for the TagLostAdvanced event.
- * Event callback returns an \ref _lvRFIDTagAdvanced.
+ * Sets up a Labview event callback for the TagLost2 event.
+ * Event callback returns an \ref _lvRFIDTag2.
  * @param phid An attached phidget handle.
  * @param lvEventRef Lavbiew user event ref
  */
-LV_CHDREVENT(RFID, TagLostAdvanced)
+LV_CHDREVENT(RFID, TagLost2)
 
 /**
  * Sets up a Labview event callback for the PositionChange event.
-- 
cgit v1.2.3