TheEmbeddedRust
/
usb-avr-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor(small): rename method and trait

This commit is contained in:
doryan 2025-03-20 21:45:48 +04:00
parent 03b047f9af
commit 9b34516ae0
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static_pins/src/lib.rs
View File

@ -2,13 +2,13 @@
pub use static_pins_macros::*; pub use static_pins_macros::*;
pub trait StaticPin { pub trait StaticPinOps {
type Port; type Port;
const PIN_NUM: u8; const PIN_NUM: u8;
fn into_input(); fn into_input();
fn into_output(); fn into_output();
fn into_pullup_input(); fn into_pull_up_input();
fn write(data: u8); fn write(data: u8);
fn read() -> u8; fn read() -> u8;
@ -17,13 +17,13 @@ pub trait StaticPin {
#[macro_export] #[macro_export]
macro_rules! impl_static_pins { macro_rules! impl_static_pins {
($($pin:expr), +) => { ($($pin:expr), +) => {
pub trait StaticPin { pub trait StaticPinOps {
type Port; type Port;
const PIN_NUM: u8; const PIN_NUM: u8;
fn into_input(); fn into_input();
fn into_output(); fn into_output();
fn into_pullup_input(); fn into_pull_up_input();
fn write(data: u8); fn write(data: u8);
fn read() -> u8; fn read() -> u8;

18
static_pins/static_pins_macros/src/lib.rs
View File

@ -29,13 +29,11 @@ pub fn impl_static_pin(pin: TokenStream) -> TokenStream {
_ => panic!("Register name is incorrect"), _ => panic!("Register name is incorrect"),
}; };
let target_field_port = let target_port = proc_macro2::TokenStream::from_str(&port.to_ascii_lowercase()).unwrap();
proc_macro2::TokenStream::from_str(&port.to_ascii_lowercase()).unwrap();
let target_pin = format_ident!("pin{}", port_register_name.to_ascii_lowercase()); let target_pin = format_ident!("pin{}", port_register_name.to_ascii_lowercase());
let target_data_direction = format_ident!("ddr{}", port_register_name.to_ascii_lowercase()); let target_data_direction = format_ident!("ddr{}", port_register_name.to_ascii_lowercase());
let trait_name = proc_macro2::TokenStream::from_str("StaticPin").unwrap(); let trait_name = proc_macro2::TokenStream::from_str("StaticPinOps").unwrap();
let impl_trait = quote! { let impl_trait = quote! {
impl #trait_name for #pin { impl #trait_name for #pin {
@ -46,7 +44,7 @@ pub fn impl_static_pin(pin: TokenStream) -> TokenStream {
fn write(data: u8) { fn write(data: u8) {
unsafe { unsafe {
(*Self::Port::ptr()) (*Self::Port::ptr())
.#target_field_port .#target_port
.write(|w| w.bits(data)); .write(|w| w.bits(data));
} }
} }
@ -68,7 +66,7 @@ pub fn impl_static_pin(pin: TokenStream) -> TokenStream {
.#target_data_direction .#target_data_direction
.modify(|_r, w| w.#writer_method().clear_bit()); .modify(|_r, w| w.#writer_method().clear_bit());
(*Self::Port::ptr()) (*Self::Port::ptr())
.#target_field_port .#target_port
.modify(|_r, w| w.#writer_method().clear_bit()); .modify(|_r, w| w.#writer_method().clear_bit());
} }
} }
@ -80,20 +78,20 @@ pub fn impl_static_pin(pin: TokenStream) -> TokenStream {
.#target_data_direction .#target_data_direction
.modify(|_r, w| w.#writer_method().set_bit()); .modify(|_r, w| w.#writer_method().set_bit());
(*Self::Port::ptr()) (*Self::Port::ptr())
.#target_field_port .#target_port
.modify(|_r, w| w.#writer_method().clear_bit()); .modify(|_r, w| w.#writer_method().clear_bit());
} }
} }
#[inline] #[inline]
fn into_pullup_input() { fn into_pull_up_input() {
unsafe { unsafe {
(*Self::Port::ptr()) (*Self::Port::ptr())
.#target_data_direction .#target_data_direction
.modify(|_r, w| w.#writer_method().clear_bit()); .modify(|_r, w| w.#writer_method().clear_bit());
(*Self::Port::ptr()) (*Self::Port::ptr())
.#target_field_port .#target_port
.modify(|_r, w| w.#writer_method().set_bit()); .modify(|r, w| w.#writer_method().set_bit());
} }
} }
} }