Add SR_HZ macro for consistency.

[libsigrok.git] / hardware / link-mso19 / link-mso19.c

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 6c509ff341379233a41bf2d5ee20649fa42e2571..18e28cff514fed93263b461a3456e34f7b6ccc69 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -47,13 +47,34 @@ static int capabilities[] = {
 };
 
 static uint64_t supported_samplerates[] = {
-       100, 200, 500, KHZ(1), KHZ(2), KHZ(5), KHZ(10), KHZ(20),
-       KHZ(50), KHZ(100), KHZ(200), KHZ(500), MHZ(1), MHZ(2), MHZ(5),
-       MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0
+       SR_HZ(100),
+       SR_HZ(200),
+       SR_HZ(500),
+       SR_KHZ(1),
+       SR_KHZ(2),
+       SR_KHZ(5),
+       SR_KHZ(10),
+       SR_KHZ(20),
+       SR_KHZ(50),
+       SR_KHZ(100),
+       SR_KHZ(200),
+       SR_KHZ(500),
+       SR_MHZ(1),
+       SR_MHZ(2),
+       SR_MHZ(5),
+       SR_MHZ(10),
+       SR_MHZ(20),
+       SR_MHZ(50),
+       SR_MHZ(100),
+       SR_MHZ(200),
+       0,
 };
 
-static struct samplerates samplerates = {
-       100, MHZ(200), 0, supported_samplerates,
+static struct sr_samplerates samplerates = {
+       SR_HZ(100),
+       SR_MHZ(200),
+       SR_HZ(0),
+       supported_samplerates,
 };
 
 static GSList *device_instances = NULL;
@@ -224,7 +245,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 -
@@ -284,7 +304,7 @@ static int mso_configure_trigger(struct sr_device_instance *sdi)
        ops[2] = mso_trans(3, dso_trigger & 0xff);
        ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff);
        ops[4] = mso_trans(11,
-                       mso->dso_trigger_width / HZ_TO_NS(mso->cur_rate));
+                       mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate));
        ops[5] = mso_trans(15, (2 | mso->slowmode));
 
        /* FIXME SPI/I2C Triggers */
@@ -348,7 +368,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
        return SR_OK;
 }
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        int devcnt = 0;
@@ -589,7 +609,6 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        default:
                return SR_OK; /* FIXME */
        }
-
 }
 
 #define MSO_TRIGGER_UNKNOWN    '!'
@@ -649,17 +668,17 @@ static int receive_data(int fd, int revents, void *user_data)
        packet.length = 1024;
        packet.unitsize = 1;
        packet.payload = logic_out;
-       session_bus(mso->session_id, &packet);
+       sr_session_bus(mso->session_id, &packet);
 
 
        packet.type = SR_DF_ANALOG;
        packet.length = 1024;
        packet.unitsize = sizeof(double);
        packet.payload = analog_out;
-       session_bus(mso->session_id, &packet);
+       sr_session_bus(mso->session_id, &packet);
 
        packet.type = SR_DF_END;
-       session_bus(mso->session_id, &packet);
+       sr_session_bus(mso->session_id, &packet);
 
        return TRUE;
 }
@@ -723,7 +742,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);
@@ -734,7 +753,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        header.num_analog_probes = 1;
        header.num_logic_probes = 8;
        header.protocol_id = SR_PROTO_RAW;
-       session_bus(session_device_id, &packet);
+       sr_session_bus(session_device_id, &packet);
 
        return ret;
 }
@@ -747,7 +766,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        device_index = device_index;
 
        packet.type = SR_DF_END;
-       session_bus(session_device_id, &packet);
+       sr_session_bus(session_device_id, &packet);
 }
 
 struct sr_device_plugin link_mso19_plugin_info = {