X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fprotocol.c;h=9948944d2681703ceedac4306d49740bbbbc6c30;hb=4439363aa02928098eab8dcd18b5ccb41737c882;hp=d49d0e6ab4d07c0d17cc640a7141e3d64db632ec;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git diff --git a/src/hardware/pipistrello-ols/protocol.c b/src/hardware/pipistrello-ols/protocol.c index d49d0e6a..9948944d 100644 --- a/src/hardware/pipistrello-ols/protocol.c +++ b/src/hardware/pipistrello-ols/protocol.c @@ -20,8 +20,6 @@ #include #include "protocol.h" -extern SR_PRIV struct sr_dev_driver p_ols_driver_info; - SR_PRIV int write_shortcommand(struct dev_context *devc, uint8_t command) { uint8_t buf[1]; @@ -130,7 +128,7 @@ SR_PRIV int p_ols_open(struct dev_context *devc) goto err_open_close_ftdic; } sr_dbg("FTDI chip read data chunk size set successfully."); - + return SR_OK; err_open_close_ftdic: @@ -227,7 +225,6 @@ SR_PRIV struct sr_dev_inst *p_ols_get_metadata(uint8_t *buf, int bytes_read, str sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->driver = &p_ols_driver_info; sdi->priv = devc; devname = g_string_new(""); @@ -446,7 +443,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data) sr_spew("Received byte 0x%.2x.", byte); if ((devc->flag_reg & FLAG_DEMUX) && (devc->flag_reg & FLAG_RLE)) { - /* RLE in demux mode must be processed differently + /* RLE in demux mode must be processed differently * since in this case the RLE encoder is operating on pairs of samples. */ if (devc->num_bytes == num_channels * 2) { @@ -502,7 +499,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data) * sample. */ devc->tmp_sample[i] = devc->sample[j++]; - } + } } /* Clear out the most significant bit of the sample */ devc->tmp_sample[devc->num_bytes - 1] &= 0x7f; @@ -520,7 +517,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data) * sample. */ devc->tmp_sample2[i] = devc->sample[j++]; - } + } } /* Clear out the most significant bit of the sample */ devc->tmp_sample2[devc->num_bytes - 1] &= 0x7f; @@ -600,7 +597,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data) * sample. */ devc->tmp_sample[i] = devc->sample[j++]; - } + } } memcpy(devc->sample, devc->tmp_sample, 4); sr_spew("Expanded sample: 0x%.8x.", sample);