X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=bb72fd3ffefaac1dfbfa2b15ed6f320cd7abaa12;hb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;hp=e728317788d310adfb80848d76047b8f4a85e353;hpb=8a2efef2d5900cb3dd935af92a0e22528660c4be;p=libsigrok.git diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index e7283177..bb72fd3f 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -52,7 +52,7 @@ static uint64_t supported_samplerates[] = { MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0 }; -static struct samplerates samplerates = { +static struct sr_samplerates samplerates = { 100, MHZ(200), 0, supported_samplerates, }; @@ -224,7 +224,6 @@ static int mso_configure_rate(struct sr_device_instance *sdi, return ret; } - static inline uint16_t mso_calc_raw_from_mv(struct mso *mso) { return (uint16_t) (0x200 - @@ -589,7 +588,6 @@ static int hw_set_configuration(int device_index, int capability, void *value) default: return SR_OK; /* FIXME */ } - } #define MSO_TRIGGER_UNKNOWN '!' @@ -723,7 +721,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return ret; mso->session_id = session_device_id; - source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi); + sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi); packet.type = SR_DF_HEADER; packet.length = sizeof(struct sr_datafeed_header);