drivers: Eliminate some unnecessary vendor/model #defines.

[libsigrok.git] / src / hardware / pipistrello-ols / protocol.h

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 84171c355cd56e02921badf2f4db733f74b06b70..5c8cbb3b642d97cd1850de987fab1a5e09dfd294 100644 (file)
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -20,22 +20,20 @@
 #ifndef LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 
-#define USB_VENDOR_ID                  0x0403
-#define USB_DEVICE_ID                  0x6010
-#define USB_VENDOR_NAME                "Saanlima"
-#define USB_IPRODUCT                   "Pipistrello LX45"
-
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "p-ols"
 
-#define FTDI_BUF_SIZE          (16 * 1024)
+#define USB_VENDOR_ID          0x0403
+#define USB_DEVICE_ID          0x6010
+#define USB_IPRODUCT           "Pipistrello LX45"
 
+#define FTDI_BUF_SIZE          (16 * 1024)
 
 #define NUM_CHANNELS           32
 #define NUM_TRIGGER_STAGES     4
@@ -76,19 +74,15 @@
 #define FLAG_FILTER                (1 << 1)
 #define FLAG_DEMUX                 (1 << 0)
 
-/* Private, per-device-instance driver context. */
 struct dev_context {
-       /** FTDI device context (used by libftdi). */
        struct ftdi_context *ftdic;
        uint8_t *ftdi_buf;
 
-       /* Fixed device settings */
        int max_channels;
        uint32_t max_samplebytes;
        uint32_t max_samplerate;
        uint32_t protocol_version;
 
-       /* Acquisition settings */
        uint64_t cur_samplerate;
        uint32_t cur_samplerate_divider;
        uint32_t max_samples;
@@ -102,7 +96,6 @@ struct dev_context {
        int num_stages;
        uint16_t flag_reg;
 
-       /* Operational states */
        unsigned int num_transfers;
        unsigned int num_samples;
        int num_bytes;
@@ -110,7 +103,6 @@ struct dev_context {
        unsigned int cnt_samples;
        int cnt_samples_rle;
 
-       /* Temporary variables */
        unsigned int rle_count;
        unsigned char sample[4];
        unsigned char tmp_sample[4];
@@ -118,8 +110,7 @@ struct dev_context {
        unsigned char *raw_sample_buf;
 };
 
-
-SR_PRIV extern const char *p_ols_channel_names[NUM_CHANNELS + 1];
+SR_PRIV extern const char *p_ols_channel_names[];
 SR_PRIV int write_shortcommand(struct dev_context *devc, uint8_t command);
 SR_PRIV int write_longcommand(struct dev_context *devc, uint8_t command, uint8_t *data);
 SR_PRIV int p_ols_open(struct dev_context *devc);