fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-13 07:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

make vdev file flags and priv consistent with nuttx

Browse Source
This commit is contained in:
Daniel Agar
2018-08-20 20:20:14 -04:00
committed by Beat Küng
parent f9a3235709
commit f1bf7172e7
3 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
+7 -7
View File
@@ -120,7 +120,7 @@ private:
int VCDevNode::open(cdev::file_t *handlep)
{
// Only allow one writer
if (_is_open_for_write && (handlep->flags & PX4_F_WRONLY)) {
if (_is_open_for_write && (handlep->f_oflags & PX4_F_WRONLY)) {
errno = EBUSY;
return -1;
}
@@ -131,9 +131,9 @@ int VCDevNode::open(cdev::file_t *handlep)
return ret;
}
handlep->priv = new PrivData;
handlep->f_priv = new PrivData;
if (_is_open_for_write && (handlep->flags & PX4_F_WRONLY)) {
if (_is_open_for_write && (handlep->f_oflags & PX4_F_WRONLY)) {
_is_open_for_write = true;
}
@@ -142,12 +142,12 @@ int VCDevNode::open(cdev::file_t *handlep)
int VCDevNode::close(cdev::file_t *handlep)
{
delete (PrivData *)handlep->priv;
handlep->priv = nullptr;
delete (PrivData *)handlep->f_priv;
handlep->f_priv = nullptr;
CDev::close(handlep);
// Enable a new writer of the device is re-opened for write
if ((handlep->flags & PX4_F_WRONLY) && _is_open_for_write) {
if ((handlep->f_oflags & PX4_F_WRONLY) && _is_open_for_write) {
_is_open_for_write = false;
}
@@ -169,7 +169,7 @@ ssize_t VCDevNode::write(cdev::file_t *handlep, const char *buffer, size_t bufle
ssize_t VCDevNode::read(cdev::file_t *handlep, char *buffer, size_t buflen)
{
PrivData *p = (PrivData *)handlep->priv;
PrivData *p = (PrivData *)handlep->f_priv;
ssize_t chars_read = 0;
PX4_INFO("read %zu write %zu", p->_read_offset, _write_offset);