X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=3c1116b3af47315ae6d029ce93fe29c256463e4f;hb=72cd99b876eb2185358bc108b488585c956f3dc7;hp=41cccc891015b3a1a1fd212d99beddbb9b42fabf;hpb=b99457f09c90ce7fbb0de1793088dd53a59a0d07;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 41cccc89..3c1116b3 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #define USB_INTERFACE		0
 #define USB_CONFIGURATION	1
 #define NUM_TRIGGER_STAGES	4
-#define TRIGGER_TYPES		"01"
+#define TRIGGER_TYPE 		"01"
 
 #define MAX_RENUM_DELAY_MS	3000
 #define NUM_SIMUL_TRANSFERS	32
@@ -95,7 +95,7 @@ struct dev_context {
 	int submitted_transfers;
 	int empty_transfer_count;
 
-	void *session_dev_id;
+	void *cb_data;
 
 	struct sr_usb_dev_inst *usb;