Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

configs/stm32l4r9ai-disco/src/stm32_adc.c: Replace calls to ioctl() in the OS to file_ioctl()

Browse Source
This commit is contained in:
Gregory Nutt
2018-09-15 12:26:31 -06:00
parent a83b6d990b
commit 53b7b41f90
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/stm32l4r9ai-disco/src/stm32_adc.c
+7 -8
View File
@@ -166,28 +166,27 @@ static const uint32_t g_pinlist[ADC1_NCHANNELS] =
int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *vext) int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *vext)
{ {
ssize_t nbytes;
struct adc_msg_s sample[ADC1_NCHANNELS] = { 0 }; struct adc_msg_s sample[ADC1_NCHANNELS] = { 0 };
FAR struct file filestruct;
ssize_t nbytes;
int nsamples; int nsamples;
int ret; int ret;
int fd;
fd = nx_open("/dev/adc0", O_RDONLY); ret = file_open(&filestruct, "/dev/adc0", O_RDONLY);
if (fd < 0) if (ret < 0)
{ {
aerr("ERROR: Cannot open ADC converter\n"); aerr("ERROR: Cannot open ADC converter\n");
ret = fd;
goto out; goto out;
} }
ret = ioctl(fd, ANIOC_TRIGGER, 0); ret = file_ioctl(&filestruct, ANIOC_TRIGGER, 0);
if (ret < 0) if (ret < 0)
{ {
aerr("ERROR: Cannot trigger ADC conversion\n"); aerr("ERROR: Cannot trigger ADC conversion\n");
goto out_close; goto out_close;
} }
nbytes = nx_read(fd, sample, sizeof(sample)); nbytes = file_read(&filestruct, sample, sizeof(sample));
if (nbytes < 0) if (nbytes < 0)
{ {
if (nbytes != -EINTR) if (nbytes != -EINTR)
@@ -268,7 +267,7 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve
} }
out_close: out_close:
close(fd); file_close_detached(&filestruct);
out: out:
return ret; return ret;
} }