X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fprotocol.h;h=da47afb0c56f92eaf0e10874ef534a7005114289;hb=599f9e1deb6b6a4a75e00e29d86935845164eeed;hp=b4441d070658d65f23187a6556492bb2703be536;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git
diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index b4441d07..da47afb0 100644
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -15,15 +15,9 @@
* 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 .
*/
-/** @file
- * Manson HCS-3xxx Series power supply driver
- * @internal
- */
-
#ifndef LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
#define LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
@@ -31,7 +25,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "manson-hcs-3xxx"
@@ -58,25 +52,19 @@ enum {
/** Information on a single model. */
struct hcs_model {
int model_id; /**< Model info */
- char *name; /**< Model name */
- char *id; /**< Model ID, like delivered by interface */
+ const char *name; /**< Model name */
+ const char *id; /**< Model ID, like delivered by interface */
double voltage[3]; /**< Min, max, step */
double current[3]; /**< Min, max, step */
};
-/** Private, per-device-instance driver context. */
struct dev_context {
- struct hcs_model *model; /**< Model informaion. */
+ const struct hcs_model *model; /**< Model information. */
- uint64_t limit_samples;
- uint64_t limit_msec;
- uint64_t num_samples;
- int64_t starttime;
+ struct sr_sw_limits limits;
int64_t req_sent_at;
gboolean reply_pending;
- void *cb_data;
-
float current; /**< Last current value [A] read from device. */
float current_max; /**< Output current set. */
float current_max_device;/**< Device-provided maximum output current. */
@@ -92,7 +80,7 @@ struct dev_context {
};
SR_PRIV int hcs_parse_volt_curr_mode(struct sr_dev_inst *sdi, char **tokens);
-SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char* buf, int buflen);
+SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char *buf, int buflen);
SR_PRIV int hcs_send_cmd(struct sr_serial_dev_inst *serial, const char *cmd, ...);
SR_PRIV int hcs_receive_data(int fd, int revents, void *cb_data);