Make NuttX drivers cross platform (VDev -> CDev)

This commit is contained in:
Daniel Agar
2017-08-31 09:27:36 +02:00
committed by Lorenz Meier
parent 6562dd496b
commit 07619cf723
29 changed files with 216 additions and 306 deletions
+16 -16
View File
@@ -72,14 +72,14 @@ extern "C" {
return ret;
}
inline VDev *get_vdev(int fd)
inline CDev *get_vdev(int fd)
{
pthread_mutex_lock(&filemutex);
bool valid = (fd < PX4_MAX_FD && fd >= 0 && filemap[fd] != nullptr);
VDev *dev;
CDev *dev;
if (valid) {
dev = (VDev *)(filemap[fd]->vdev);
dev = (CDev *)(filemap[fd]->vdev);
} else {
dev = nullptr;
@@ -92,7 +92,7 @@ extern "C" {
int px4_open(const char *path, int flags, ...)
{
PX4_DEBUG("px4_open");
VDev *dev = VDev::getDev(path);
CDev *dev = CDev::getDev(path);
int ret = 0;
int i;
mode_t mode;
@@ -163,7 +163,7 @@ extern "C" {
{
int ret;
VDev *dev = get_vdev(fd);
CDev *dev = get_vdev(fd);
if (dev) {
pthread_mutex_lock(&filemutex);
@@ -193,7 +193,7 @@ extern "C" {
{
int ret;
VDev *dev = get_vdev(fd);
CDev *dev = get_vdev(fd);
if (dev) {
PX4_DEBUG("px4_read fd = %d", fd);
@@ -215,7 +215,7 @@ extern "C" {
{
int ret;
VDev *dev = get_vdev(fd);
CDev *dev = get_vdev(fd);
if (dev) {
PX4_DEBUG("px4_write fd = %d", fd);
@@ -238,7 +238,7 @@ extern "C" {
PX4_DEBUG("px4_ioctl fd = %d", fd);
int ret = 0;
VDev *dev = get_vdev(fd);
CDev *dev = get_vdev(fd);
if (dev) {
ret = dev->ioctl(filemap[fd], cmd, arg);
@@ -297,11 +297,11 @@ extern "C" {
fds[i].revents = 0;
fds[i].priv = nullptr;
VDev *dev = get_vdev(fds[i].fd);
CDev *dev = get_vdev(fds[i].fd);
// If fd is valid
if (dev) {
PX4_DEBUG("%s: px4_poll: VDev->poll(setup) %d", thread_name, fds[i].fd);
PX4_DEBUG("%s: px4_poll: CDev->poll(setup) %d", thread_name, fds[i].fd);
ret = dev->poll(filemap[fds[i].fd], &fds[i], true);
if (ret < 0) {
@@ -358,11 +358,11 @@ extern "C" {
// go through all fds and count how many have data
for (i = 0; i < nfds; ++i) {
VDev *dev = get_vdev(fds[i].fd);
CDev *dev = get_vdev(fds[i].fd);
// If fd is valid
if (dev) {
PX4_DEBUG("%s: px4_poll: VDev->poll(teardown) %d", thread_name, fds[i].fd);
PX4_DEBUG("%s: px4_poll: CDev->poll(teardown) %d", thread_name, fds[i].fd);
ret = dev->poll(filemap[fds[i].fd], &fds[i], false);
if (ret < 0) {
@@ -396,23 +396,23 @@ extern "C" {
return -1;
}
VDev *dev = VDev::getDev(pathname);
CDev *dev = CDev::getDev(pathname);
return (dev != nullptr) ? 0 : -1;
}
void px4_show_devices()
{
VDev::showDevices();
CDev::showDevices();
}
void px4_show_topics()
{
VDev::showTopics();
CDev::showTopics();
}
void px4_show_files()
{
VDev::showFiles();
CDev::showFiles();
}
void px4_enable_sim_lockstep()