Skip to content

No option for spi driver #9

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

Merged
Skallwar merged 2 commits into from
May 21, 2021
Merged

No option for spi driver #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72d8320
spi: Remove option for spi_driver field
Skallwar May 20, 2021
a7d09d0
Merge branch 'feature/spi' into no_option_for_spi_driver
Skallwar May 21, 2021
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
26 changes: 14 additions & 12 deletions rust/kernel/spi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub struct DriverRegistration {
this_module: &'static crate::ThisModule,
registered: bool,
name: CStr<'static>,
spi_driver: Option<bindings::spi_driver>,
spi_driver: bindings::spi_driver,
}

pub struct ToUse {
Expand Down Expand Up @@ -97,7 +97,7 @@ impl DriverRegistration {
this_module,
name,
registered: false,
spi_driver: None,
spi_driver: bindings::spi_driver::default(),
}
}

Expand Down Expand Up @@ -150,20 +150,23 @@ impl DriverRegistration {
let mut spi_driver = bindings::spi_driver::default();
spi_driver.driver.name = self.name.as_ptr() as *const c_types::c_char;

spi_driver.probe = maybe_get_wrapper(T::TO_USE.probe, DriverRegistration::probe_wrapper::<T>);
spi_driver.remove = maybe_get_wrapper(T::TO_USE.remove, DriverRegistration::remove_wrapper::<T>);
spi_driver.shutdown = maybe_get_wrapper(T::TO_USE.shutdown, DriverRegistration::shutdown_wrapper::<T>);

let this = unsafe { self.get_unchecked_mut() };
if this.registered {
return Err(Error::EINVAL);
}

this.spi_driver = Some(spi_driver);
this.spi_driver.driver.name = this.name.as_ptr() as *const c_types::c_char;
this.spi_driver.probe =
maybe_get_wrapper(T::TO_USE.probe, DriverRegistration::probe_wrapper::<T>);
this.spi_driver.remove =
maybe_get_wrapper(T::TO_USE.remove, DriverRegistration::remove_wrapper::<T>);
this.spi_driver.shutdown = maybe_get_wrapper(
T::TO_USE.shutdown,
DriverRegistration::shutdown_wrapper::<T>,
);

let res = unsafe {
bindings::__spi_register_driver(this.this_module.0, this.spi_driver.as_mut().unwrap())
};
let res =
unsafe { bindings::__spi_register_driver(this.this_module.0, &mut this.spi_driver) };

match res {
0 => {
Expand All @@ -177,8 +180,7 @@ impl DriverRegistration {

impl Drop for DriverRegistration {
fn drop(&mut self) {
unsafe { bindings::driver_unregister(&mut self.spi_driver.as_mut().unwrap().driver) }
// FIXME: No unwrap? But it's safe?
unsafe { bindings::driver_unregister(&mut self.spi_driver.driver) }
}
}

Expand Down