Linux: Changed /vdev/... back to to /dev/

Some virtual devices were mapped to /vdev.
Putting them back to /dev.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-04-15 20:37:37 -07:00
parent d2f0572ce6
commit 89a1799e61
6 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -120,7 +120,7 @@ MS5611_I2C::MS5611_I2C(uint8_t bus, ms5611::prom_u &prom) :
#ifdef __PX4_NUTTX #ifdef __PX4_NUTTX
nullptr, bus, 0, 400000 nullptr, bus, 0, 400000
#else #else
"/vdev/MS5611_I2C", bus, 0 "/dev/MS5611_I2C", bus, 0
#endif #endif
), ),
_prom(prom) _prom(prom)
+1 -1
View File
@@ -100,7 +100,7 @@ MS5611_sim_interface(ms5611::prom_u &prom_buf, uint8_t busnum)
} }
MS5611_SIM::MS5611_SIM(uint8_t bus, ms5611::prom_u &prom) : MS5611_SIM::MS5611_SIM(uint8_t bus, ms5611::prom_u &prom) :
SIM("MS5611_SIM", "/vdev/MS5611_SIM", bus, 0), SIM("MS5611_SIM", "/dev/MS5611_SIM", bus, 0),
_prom(prom) _prom(prom)
{ {
} }
@@ -74,9 +74,9 @@
#endif #endif
static const int ERROR = -1; static const int ERROR = -1;
#define ACCELSIM_DEVICE_PATH_ACCEL "/vdev/sim_accel" #define ACCELSIM_DEVICE_PATH_ACCEL "/dev/sim_accel"
#define ACCELSIM_DEVICE_PATH_ACCEL_EXT "/vdev/sim_accel_ext" #define ACCELSIM_DEVICE_PATH_ACCEL_EXT "/dev/sim_accel_ext"
#define ACCELSIM_DEVICE_PATH_MAG "/vdev/sim_mag" #define ACCELSIM_DEVICE_PATH_MAG "/dev/sim_mag"
#define ADDR_WHO_AM_I 0x0F #define ADDR_WHO_AM_I 0x0F
+1 -1
View File
@@ -788,7 +788,7 @@ struct barosim_bus_option {
uint8_t busnum; uint8_t busnum;
BAROSIM *dev; BAROSIM *dev;
} bus_options[] = { } bus_options[] = {
{ BAROSIM_BUS_SIM_EXTERNAL, "/vdev/baro_sim", &BAROSIM_sim_interface, PX4_SIM_BUS_TEST, NULL }, { BAROSIM_BUS_SIM_EXTERNAL, "/dev/baro_sim", &BAROSIM_sim_interface, PX4_SIM_BUS_TEST, NULL },
}; };
#define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0])) #define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0]))
@@ -101,7 +101,7 @@ BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum)
} }
BARO_SIM::BARO_SIM(uint8_t bus, barosim::prom_u &prom) : BARO_SIM::BARO_SIM(uint8_t bus, barosim::prom_u &prom) :
SIM("BARO_SIM", "/vdev/BARO_SIM", bus, 0), SIM("BARO_SIM", "/dev/BARO_SIM", bus, 0),
_prom(prom) _prom(prom)
{ {
} }
@@ -675,6 +675,7 @@ GYROSIM::transfer(uint8_t *send, uint8_t *recv, unsigned len)
} }
else { else {
printf("Writing %u bytes to register %u\n", len-1, reg); printf("Writing %u bytes to register %u\n", len-1, reg);
if (recv)
memcpy(&recv[1], &_regdata[reg-MPUREG_PRODUCT_ID], len-1); memcpy(&recv[1], &_regdata[reg-MPUREG_PRODUCT_ID], len-1);
} }
return PX4_OK; return PX4_OK;