diff --git a/src/c64.rs b/src/c64.rs index 9006ce0..c43cc2f 100644 --- a/src/c64.rs +++ b/src/c64.rs @@ -144,7 +144,6 @@ bitflags! { /// ~~~ /// set_vic_bank(cia::VicBankSelect::RegionC000); /// ~~~ - #[derive(Clone, Copy)] pub struct VicBankSelect: u8 { /// Bank 3: 0xC000-0xFFFF const RegionC000 = 0; @@ -267,6 +266,6 @@ pub fn set_vic_bank(bank: VicBankSelect) { cia2().data_direction_port_a.write(dir_a | 0b11); cia2() .port_a - .write(port_a & VicBankSelect::VIC_0000.complement() | bank); + .write(port_a & VicBankSelect::Region0000.complement() | bank); } } diff --git a/src/cia.rs b/src/cia.rs index 731b941..870a0cc 100644 --- a/src/cia.rs +++ b/src/cia.rs @@ -62,7 +62,7 @@ pub struct MOSComplexInterfaceAdapter6526 { pub control_b: RW, // 0x0f } -const_assert!(size_of::() == 16); +const_assert!(size_of::>() == 16); /// Enum for joystick positions pub enum JoystickPosition { @@ -188,7 +188,6 @@ bitflags! { /// serial bus input (0=Low/Active, 1=High/Inactive) /// - CLOCK IN /// - DATA IN - #[derive(Clone, Copy)] pub struct SerialBusAccess: u8 { const TXD_OUT = 0b0000_0100; const ATN_OUT = 0b0000_1000; @@ -210,7 +209,6 @@ bitflags! { /// - 5 User Port Pin J IO /// - 6 CTS R /// - 7 DSR R - #[derive(Clone, Copy)] pub struct RS232Access: u8 { const RXD = 0b0000_0001; const RTS = 0b0000_0010; @@ -221,4 +219,4 @@ bitflags! { const CTS = 0b0100_0000; const DSR = 0b1000_0000; } -} \ No newline at end of file +}