X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fbeaglelogic_native.c;h=f94ffcc035ba508ab1d2a630e9b68ab5f94741e5;hb=70cfec9a1419741b5972f10f7bc7aea7c15b700b;hp=92caa4dd1ce34e823b0cd38e6176b38fa6c823d6;hpb=a31010b3e4222c4d1c404c1f3d0a7c2d09e0cfd5;p=libsigrok.git diff --git a/src/hardware/beaglelogic/beaglelogic_native.c b/src/hardware/beaglelogic/beaglelogic_native.c index 92caa4dd..f94ffcc0 100644 --- a/src/hardware/beaglelogic/beaglelogic_native.c +++ b/src/hardware/beaglelogic/beaglelogic_native.c @@ -23,7 +23,8 @@ static int beaglelogic_open_nonblock(struct dev_context *devc) { devc->fd = open(BEAGLELOGIC_DEV_NODE, O_RDONLY | O_NONBLOCK); - return (devc->fd == -1 ? SR_ERR : SR_OK); + + return ((devc->fd == -1) ? SR_ERR : SR_OK); } static int beaglelogic_close(struct dev_context *devc) @@ -45,8 +46,10 @@ static int beaglelogic_set_buffersize(struct dev_context *devc) static int beaglelogic_get_samplerate(struct dev_context *devc) { uint32_t arg, err; + err = ioctl(devc->fd, IOCTL_BL_GET_SAMPLE_RATE, &arg); devc->cur_samplerate = arg; + return err; } @@ -120,7 +123,8 @@ static int beaglelogic_mmap(struct dev_context *devc) beaglelogic_get_buffersize(devc); devc->sample_buf = mmap(NULL, devc->buffersize, PROT_READ, MAP_SHARED, devc->fd, 0); - return (devc->sample_buf == MAP_FAILED ? -1 : SR_OK); + + return ((devc->sample_buf == MAP_FAILED) ? -1 : SR_OK); } static int beaglelogic_munmap(struct dev_context *devc)