VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Open device.

This commit is contained in:
John Greb 2014-11-06 23:03:49 +00:00
parent 15da973edb
commit 1f63911faf
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/v4l/v4linput.cpp
View File

@ -102,7 +102,7 @@ bool V4LInput::startInput(int device)
} }
OpenSource("/dev/swradio0"); OpenSource("/dev/swradio0");
if (m_dev == 0) { if (fd < 0) {
qCritical("could not open SDR"); qCritical("could not open SDR");
return false; return false;
} }

19
plugins/samplesource/v4l/v4lsource.cpp
View File

@ -55,7 +55,7 @@ static void xioctl(int fh, unsigned long int request, void *arg)
ret = v4l2_ioctl(fh, request, arg); ret = v4l2_ioctl(fh, request, arg);
} while (ret == -1 && ((errno == EINTR) || (errno == EAGAIN))); } while (ret == -1 && ((errno == EINTR) || (errno == EAGAIN)));
if (ret == -1) { if (ret == -1) {
qCritical("error %d\n", errno); qCritical("V4L2 ioctl error: %d", errno);
} }
} }
@ -70,26 +70,21 @@ V4LInput::OpenSource(const char *filename)
recebuf_len = 0; recebuf_len = 0;
// libv4l2 does not know SDR yet
// fd = v4l2_open(filename, O_RDWR | O_NONBLOCK, 0); // fd = v4l2_open(filename, O_RDWR | O_NONBLOCK, 0);
fd = open(filename, O_RDWR | O_NONBLOCK, 0); fd = open(filename, O_RDWR | O_NONBLOCK, 0);
if (fd < 0) { if (fd < 0) {
perror("Cannot open device"); qCritical("Cannot open /dev/swradio0 :%d", fd);
return;
} }
pixelformat = V4L2_PIX_FMT_SDR_U8; pixelformat = V4L2_PIX_FMT_SDR_U8;
//pixelformat = V4L2_PIX_FMT_SDR_U16LE; // RTLSDR has limited ioctls in 3.18, expect fail.
qCritical("Want Pixelformat : CU08");
CLEAR(fmt); CLEAR(fmt);
fmt.type = V4L2_BUF_TYPE_SDR_CAPTURE; fmt.type = V4L2_BUF_TYPE_SDR_CAPTURE;
fmt.fmt.sdr.pixelformat = pixelformat; fmt.fmt.sdr.pixelformat = pixelformat;
xioctl(fd, VIDIOC_S_FMT, &fmt); xioctl(fd, VIDIOC_S_FMT, &fmt);
if (fmt.fmt.sdr.pixelformat != pixelformat) { qCritical("Got Pixelformat : %4.4s", (char *)&fmt.fmt.sdr.pixelformat);
qCritical("Libv4l didn't accept FLOAT format. Cannot proceed. Pixelformat %4.4s\n",
(char *)&fmt.fmt.sdr.pixelformat);
}
printf("Selected stream format: %4.4s\n", (char *)&fmt.fmt.sdr.pixelformat);
CLEAR(req); CLEAR(req);
req.count = 8; req.count = 8;
@ -111,7 +106,7 @@ V4LInput::OpenSource(const char *filename)
fd, buf.m.offset); fd, buf.m.offset);
if (buffers[n_buffers].start == MAP_FAILED) { if (buffers[n_buffers].start == MAP_FAILED) {
perror("mmap"); qCritical("V4L2 buffer mmap failed");
} }
} }