X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fprotocol.h;h=fbbdaf3010c59377a3a2d3b6c3089af1a0480ce9;hb=7e463623382e1f574fde150b3fc88a65eaebb578;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..fbbdaf30 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; @@ -54,19 +53,7 @@ extern SR_PRIV const struct center_dev_info center_devs[]; /** 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;