X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fcenter-3xx%2Fprotocol.h;h=6bd2c27c20c1c4f4dc26ca5a0388ba14c0c173ae;hb=e53f32d2b8163838c404c4fade01fb02648e7505;hp=c920f32a3352e1e61edf1c4ded7be4318df07345;hpb=489c338884ee592635a9166907832ac39e8195a7;p=libsigrok.git
diff --git a/src/hardware/center-3xx/protocol.h b/src/hardware/center-3xx/protocol.h
index c920f32a..6bd2c27c 100644
--- a/src/hardware/center-3xx/protocol.h
+++ b/src/hardware/center-3xx/protocol.h
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef LIBSIGROK_HARDWARE_CENTER_3XX_PROTOCOL_H
@@ -26,7 +25,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "center-3xx"
@@ -37,9 +36,9 @@ enum {
};
struct center_dev_info {
- char *vendor;
- char *device;
- char *conn;
+ const char *vendor;
+ const char *device;
+ const char *conn;
int num_channels;
uint32_t max_sample_points;
uint8_t packet_size;
@@ -52,21 +51,8 @@ extern SR_PRIV const struct center_dev_info center_devs[];
#define SERIAL_BUFSIZE 256
-/** Private, per-device-instance driver context. */
struct dev_context {
- /** The current sampling limit (in number of samples). */
- uint64_t limit_samples;
-
- /** The current sampling limit (in ms). */
- uint64_t limit_msec;
-
- /** Opaque pointer passed in by the frontend. */
- void *cb_data;
-
- /** The current number of already received samples. */
- uint64_t num_samples;
-
- int64_t starttime;
+ struct sr_sw_limits sw_limits;
uint8_t buf[SERIAL_BUFSIZE];
int bufoffset;