yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 09:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use DevMgr::getNextDevicePath()

Browse Source 
Also, a fix for number of args passed for accelsim.

Updated to newest version of DriverFramework.

DF drvices show up now in list_devices

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-11-16 16:57:57 -08:00
parent 3f20d78dfe
commit 618626103f
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/commander/state_machine_helper.cpp
View File

@@ -496,25 +496,25 @@ transition_result_t hil_state_transition(hil_state_t new_state, orb_advert_t sta
// Handle DF devices
std::string dfdevname;
std::string df_dev_path, df_dev_instance_path;
unsigned int index = 0;
for(;;) {
if (DevMgr::getNextDeviceName(index, dfdevname) < 0) {
if (DevMgr::getNextDevicePath(index, df_dev_path, df_dev_instance_path) < 0) {
break;
}
DevHandle h;
DevMgr::getHandle(dfdevname.c_str(), h);
DevMgr::getHandle(df_dev_path.c_str(), h);
if (!h.isValid()) {
warn("failed opening device %s", dfdevname.c_str());
warn("failed opening device %s", df_dev_path.c_str());
continue;
}
int block_ret = h.ioctl(DEVIOCSPUBBLOCK, 1);
DevMgr::releaseHandle(h);
printf("Disabling %s: %s\n", dfdevname.c_str(), (block_ret == OK) ? "OK" : "ERROR");
printf("Disabling %s: %s\n", df_dev_path.c_str(), (block_ret == OK) ? "OK" : "ERROR");
}
ret = TRANSITION_CHANGED;