X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fprotocol.c;h=39d87c4433bb316564e0cdff84df818b76c2f808;hb=b8278e0943317cdf6594057ae9482c786c607f04;hp=a1d940fc5d25e577450000bf9c524afde2a3d22f;hpb=ab8df2b1a64d7891e4fbbcdef047e28343819dc9;p=libsigrok.git diff --git a/src/hardware/hantek-dso/protocol.c b/src/hardware/hantek-dso/protocol.c index a1d940fc..39d87c44 100644 --- a/src/hardware/hantek-dso/protocol.c +++ b/src/hardware/hantek-dso/protocol.c @@ -263,7 +263,7 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi) struct dev_context *devc; struct sr_usb_dev_inst *usb; int ret, tmp; - int base; + uint64_t base; uint8_t cmdstring[12]; int trig; @@ -373,7 +373,7 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi) memset(cmdstring, 0, sizeof(cmdstring)); cmdstring[0] = CMD_2250_SET_TRIGGERPOS_AND_BUFFER; - sr_dbg("Capture ratio: %d.", devc->capture_ratio); + sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio); trig = devc->capture_ratio; dso2250_set_triggerpos(trig, devc->framesize != FRAMESIZE_SMALL, cmdstring, 2); @@ -394,7 +394,7 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi) return SR_OK; } -int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi) +SR_PRIV int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_usb_dev_inst *usb; @@ -494,7 +494,7 @@ int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi) cmdstring[5] = (tmp >> 8) & 0xff; /* Horizontal trigger position */ - sr_dbg("Capture ratio: %d.", devc->capture_ratio); + sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio); tmp = 0x77fff + 0x8000 * devc->capture_ratio / 100; cmdstring[6] = tmp & 0xff; cmdstring[7] = (tmp >> 8) & 0xff; @@ -688,7 +688,7 @@ static int dso_set_relays(const struct sr_dev_inst *sdi) return SR_OK; } -int dso_set_voffsets(const struct sr_dev_inst *sdi) +SR_PRIV int dso_set_voffsets(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_usb_dev_inst *usb;