X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=28e26c1a1b8ed26e5daa2a7aefc14c30e356f5de;hb=50276118ca45dc3dbf91f2fc77fc1f611cf1e57d;hp=4bd7a7daa340186a1880bd124b44c06efd45631a;hpb=13fef1ed246930715b5a020b17fe79313cf5eed4;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 4bd7a7da..28e26c1a 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -79,7 +79,7 @@ * @return the corresponding signed integer */ #define RL16S(x) ((int16_t) \ - (((unsigned)((const uint8_t*)(x))[1] << 8) | \ + (((unsigned)((const uint8_t*)(x))[1] << 8) | \ (unsigned)((const uint8_t*)(x))[0])) /** @@ -517,9 +517,9 @@ SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc); /*--- hwdriver.c ------------------------------------------------------------*/ SR_PRIV const GVariantType *sr_variant_type_get(int datatype); -SR_PRIV int sr_variant_type_check(int key, GVariant *data); +SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *data); SR_PRIV void sr_hw_cleanup_all(void); -SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data); +SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data); SR_PRIV void sr_config_free(struct sr_config *src); SR_PRIV int sr_source_remove(int fd); SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd); @@ -679,6 +679,7 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb); SR_PRIV int usb_source_add(struct sr_session *session, struct sr_context *ctx, int timeout, sr_receive_data_callback cb, void *cb_data); SR_PRIV int usb_source_remove(struct sr_session *session, struct sr_context *ctx); +SR_PRIV int usb_get_port_path(libusb_device *dev, const char *path, int path_len); #endif /*--- hardware/common/scpi.c ------------------------------------------------*/