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
+21 -17
View File
@@ -64,9 +64,10 @@ namespace device
I2C::I2C(const char *name,
const char *devname,
int bus,
uint16_t address) :
uint16_t address,
uint32_t frequency) :
// base class
VDev(name, devname),
CDev(name, devname),
// public
// protected
_retries(0),
@@ -75,7 +76,7 @@ I2C::I2C(const char *name,
_address(address),
_fd(-1)
{
//warnx("I2C::I2C name = %s devname = %s", name, devname);
DEVICE_DEBUG("I2C::I2C name = %s devname = %s", name, devname);
// fill in _device_id fields for a I2C device
_device_id.devid_s.bus_type = DeviceBusType_I2C;
_device_id.devid_s.bus = bus;
@@ -103,10 +104,10 @@ I2C::init()
// way to set it from user space.
// do base class init, which will create device node, etc
ret = VDev::init();
ret = CDev::init();
if (ret != PX4_OK) {
DEVICE_DEBUG("VDev::init failed");
DEVICE_DEBUG("CDev::init failed");
return ret;
}
@@ -146,12 +147,12 @@ I2C::transfer(const uint8_t *send, unsigned send_len, uint8_t *recv, unsigned re
unsigned retry_count = 0;
if (_fd < 0) {
warnx("I2C device not opened");
PX4_ERR("I2C device not opened");
return 1;
}
do {
// DEVICE_DEBUG("transfer out %p/%u in %p/%u", send, send_len, recv, recv_len);
DEVICE_DEBUG("transfer out %p/%u in %p/%u", send, send_len, recv, recv_len);
msgs = 0;
if (send_len > 0) {
@@ -178,15 +179,18 @@ I2C::transfer(const uint8_t *send, unsigned send_len, uint8_t *recv, unsigned re
packets.nmsgs = msgs;
if (simulate) {
//warnx("I2C SIM: transfer_4 on %s", get_devname());
DEVICE_DEBUG("I2C SIM: transfer_4 on %s", get_devname());
ret = PX4_OK;
} else {
ret = ::ioctl(_fd, I2C_RDWR, (unsigned long)&packets);
if (ret < 0) {
warnx("I2C transfer failed");
return 1;
if (ret == -1) {
DEVICE_DEBUG("I2C transfer failed");
ret = PX4_ERROR;
} else {
ret = PX4_OK;
}
}
@@ -221,7 +225,7 @@ I2C::transfer(struct i2c_msg *msgv, unsigned msgs)
packets.nmsgs = msgs;
if (simulate) {
warnx("I2C SIM: transfer_2 on %s", get_devname());
DEVICE_DEBUG("I2C SIM: transfer_2 on %s", get_devname());
ret = PX4_OK;
} else {
@@ -229,7 +233,7 @@ I2C::transfer(struct i2c_msg *msgv, unsigned msgs)
}
if (ret < 0) {
warnx("I2C transfer failed");
DEVICE_DEBUG("I2C transfer failed");
return 1;
}
@@ -251,13 +255,13 @@ int I2C::ioctl(device::file_t *filp, int cmd, unsigned long arg)
#ifdef __PX4_LINUX
case I2C_RDWR:
warnx("Use I2C::transfer, not ioctl");
DEVICE_DEBUG("Use I2C::transfer, not ioctl");
return 0;
#endif
default:
/* give it to the superclass */
return VDev::ioctl(filp, cmd, arg);
return CDev::ioctl(filp, cmd, arg);
}
}
@@ -265,7 +269,7 @@ ssize_t I2C::read(file_t *filp, char *buffer, size_t buflen)
{
if (simulate) {
// FIXME no idea what this should be
warnx("2C SIM I2C::read");
DEVICE_DEBUG("2C SIM I2C::read");
return 0;
}
@@ -279,7 +283,7 @@ ssize_t I2C::read(file_t *filp, char *buffer, size_t buflen)
ssize_t I2C::write(file_t *filp, const char *buffer, size_t buflen)
{
if (simulate) {
warnx("2C SIM I2C::write");
DEVICE_DEBUG("2C SIM I2C::write");
return buflen;
}