X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fprotocol.h;h=c2bd2ccb902ba5cb91f79bcbd8254b32b9dd78ba;hb=7ade12b470366a03f7bf84e4989c9d3593dc333b;hp=84171c355cd56e02921badf2f4db733f74b06b70;hpb=acc885c7553d12ce18d45fc603ebf7d0c188db09;p=libsigrok.git diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h index 84171c35..c2bd2ccb 100644 --- a/src/hardware/pipistrello-ols/protocol.h +++ b/src/hardware/pipistrello-ols/protocol.h @@ -20,22 +20,21 @@ #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 #include #include #include -#include "libsigrok.h" +#include #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_VENDOR_NAME "Saanlima" +#define USB_IPRODUCT "Pipistrello LX45" +#define FTDI_BUF_SIZE (16 * 1024) #define NUM_CHANNELS 32 #define NUM_TRIGGER_STAGES 4 @@ -118,8 +117,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);