BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

appa-55ii: Minor cosmetics, whitespace fixes.

This commit is contained in:
Uwe Hermann 2013-12-27 00:22:19 +01:00
parent 27fd2eaacb
commit 76b4d4f422
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hardware/appa-55ii/api.c
View File

@ -271,8 +271,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{ {
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, return std_serial_dev_acquisition_stop(sdi, cb_data,
sdi->conn, LOG_PREFIX); std_serial_dev_close, sdi->conn, LOG_PREFIX);
} }
SR_PRIV struct sr_dev_driver appa_55ii_driver_info = { SR_PRIV struct sr_dev_driver appa_55ii_driver_info = {
@ -291,4 +291,5 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info = {
.dev_close = std_serial_dev_close, .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
}; };

22
hardware/appa-55ii/protocol.c
View File

@ -27,7 +27,7 @@ typedef enum {
LOG_DATA = 0x14, LOG_DATA = 0x14,
LOG_START = 0x18, LOG_START = 0x18,
LOG_END = 0x19, LOG_END = 0x19,
} PacketType; } packet_type_t;
static gboolean appa_55ii_checksum(const uint8_t *buf) static gboolean appa_55ii_checksum(const uint8_t *buf)
{ {
@ -75,7 +75,7 @@ static float appa_55ii_temp(const uint8_t *buf, int probe)
int16_t temp; int16_t temp;
uint8_t flags; uint8_t flags;
ptr = buf + 4 + 14 + 3 * probe; ptr = buf + 4 + 14 + 3 * probe;
temp = RL16(ptr); temp = RL16(ptr);
flags = ptr[2]; flags = ptr[2];
@ -89,13 +89,15 @@ static float appa_55ii_temp(const uint8_t *buf, int probe)
static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf) static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf)
{ {
struct dev_context *devc = sdi->priv; struct dev_context *devc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog; struct sr_datafeed_analog analog;
struct sr_probe *probe; struct sr_probe *probe;
float values[APPA_55II_NUM_PROBES], *val_ptr; float values[APPA_55II_NUM_PROBES], *val_ptr;
int i; int i;
devc = sdi->priv;
if (devc->data_source != DATA_SOURCE_LIVE) if (devc->data_source != DATA_SOURCE_LIVE)
return; return;
@ -135,7 +137,7 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog = { 0 }; struct sr_datafeed_analog analog;
struct sr_probe *probe; struct sr_probe *probe;
float values[APPA_55II_NUM_PROBES], *val_ptr; float values[APPA_55II_NUM_PROBES], *val_ptr;
const uint8_t *buf; const uint8_t *buf;
@ -149,7 +151,7 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi)
buf = devc->log_buf + offset; buf = devc->log_buf + offset;
val_ptr = values; val_ptr = values;
/* FIXME: timestamp should be sent in the packet */ /* FIXME: Timestamp should be sent in the packet. */
sr_dbg("Timestamp: %02d:%02d:%02d", buf[2], buf[3], buf[4]); sr_dbg("Timestamp: %02d:%02d:%02d", buf[2], buf[3], buf[4]);
memset(&analog, 0, sizeof(analog)); memset(&analog, 0, sizeof(analog));
@ -192,7 +194,7 @@ static void appa_55ii_log_data(struct sr_dev_inst *sdi, const uint8_t *buf)
if (devc->data_source != DATA_SOURCE_MEMORY) if (devc->data_source != DATA_SOURCE_MEMORY)
return; return;
ptr = buf + 4;; ptr = buf + 4;
size = buf[3]; size = buf[3];
while (size > 0) { while (size > 0) {
s = MIN(size, sizeof(devc->log_buf) - devc->log_buf_len); s = MIN(size, sizeof(devc->log_buf) - devc->log_buf_len);
@ -235,7 +237,7 @@ static const uint8_t *appa_55ii_parse_data(struct sr_dev_inst *sdi,
/* Skip broken packet. */ /* Skip broken packet. */
return buf + 4 + buf[3] + 1; return buf + 4 + buf[3] + 1;
switch ((PacketType) buf[2]) { switch ((packet_type_t)buf[2]) {
case LIVE_DATA: case LIVE_DATA:
appa_55ii_live_data(sdi, buf); appa_55ii_live_data(sdi, buf);
break; break;
@ -250,6 +252,9 @@ static const uint8_t *appa_55ii_parse_data(struct sr_dev_inst *sdi,
case LOG_END: case LOG_END:
appa_55ii_log_end(sdi); appa_55ii_log_end(sdi);
break; break;
default:
sr_warn("Invalid packet type: 0x%02x.", buf[2]);
break;
} }
return buf + 4 + buf[3] + 1; return buf + 4 + buf[3] + 1;
@ -305,7 +310,8 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data)
time = (g_get_monotonic_time() - devc->start_time) / 1000; time = (g_get_monotonic_time() - devc->start_time) / 1000;
if (time > (int64_t)devc->limit_msec) { if (time > (int64_t)devc->limit_msec) {
sr_info("Requested time limit reached."); sr_info("Requested time limit reached.");
sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data); sdi->driver->dev_acquisition_stop(sdi,
devc->session_cb_data);
return TRUE; return TRUE;
} }
} }