X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.h;h=5b8f489c2857b9ca8c7b22c31ce1406985ed716a;hb=e7eb703fff0167897f7e094e2edbf7d5798857ea;hp=bb870019aece743dd262a2214a04c418acbf4a8b;hpb=0f8522bf74af8abfe8601e978b2e0d0e40b1a124;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index bb870019..5b8f489c 100644
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,13 +48,13 @@ struct fx2_profile {
 	int num_probes;
 };
 
-struct fx2_device {
+struct fx2_dev {
 	struct fx2_profile *profile;
 	/*
-	 * Since we can't keep track of a Saleae Logic device after upgrading the
-	 * firmware (it re-enumerates into a different device address after the
-	 * upgrade) this is like a global lock. No device will open until a proper
-	 * delay after the last device was upgraded.
+	 * Since we can't keep track of a Saleae Logic device after upgrading
+	 * the firmware (it re-enumerates into a different device address
+	 * after the upgrade) this is like a global lock. No device will open
+	 * until a proper delay after the last device was upgraded.
 	 */
 	GTimeVal fw_updated;
 	/* device/capture settings */
@@ -71,7 +71,7 @@ struct fx2_device {
 	 */
 	void *session_data;
 
-	struct sr_usb_device_instance *usb;
+	struct sr_usb_dev_inst *usb;
 };
 
 #endif