Skip to content

lib: get correct file for the Beaglebone Seed #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lib: get correct file for the Beaglebone Seed #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,30 @@ fn pwm_file_wo(chip: &PwmChip, pin: u32, name: &str) -> Result<File> {
let f = OpenOptions::new().write(true).open(format!(
"/sys/class/pwm/pwmchip{}/pwm{}/{}",
chip.number, pin, name
))?;
Ok(f)
));
if !f.is_ok() {
let f = OpenOptions::new().write(true).open(format!(
"/sys/class/pwm/pwmchip{}/pwm-{}:{}/{}",
chip.number, chip.number, pin, name
))?;
return Ok(f);
}
Ok(f.unwrap())
}

/// Open the specified entry name as a readable file
fn pwm_file_ro(chip: &PwmChip, pin: u32, name: &str) -> Result<File> {
let f = File::open(format!(
"/sys/class/pwm/pwmchip{}/pwm{}/{}",
"/sys/class/pwm/pwmchip{}/pwm{}-{}:",
chip.number, pin, name
))?;
Ok(f)
));
if !f.is_ok() {
let f = File::open(format!(
"/sys/class/pwm/pwmchip{}/pwm{}-{}:/{}",
chip.number, chip.number, pin, name
))?;
return Ok(f);
}
Ok(f.unwrap())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will panic if not present and it looks like with this change the original path will not be attempted at all which doesn't seem appropriate. I may have to look at the kernel sources a bit more to determine the possible path naming for these sysfs entries if some platforms have them different as you seem to indicate.

}

/// Get the u32 value from the given entry
Expand Down