diff --git a/crates/fayalite/src/vendor/lattice.rs b/crates/fayalite/src/vendor/lattice.rs index 79f69a6..ec989e6 100644 --- a/crates/fayalite/src/vendor/lattice.rs +++ b/crates/fayalite/src/vendor/lattice.rs @@ -16,23 +16,6 @@ pub mod orangecrab; pub mod primitives; pub mod yosys_nextpnr; -/* must be removed later */ -#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] -pub struct XdcIOStandardAnnotation { - pub value: Interned, -} - -#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] -pub struct XdcLocationAnnotation { - pub location: Interned, -} - -#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] -pub struct XdcCreateClockAnnotation { - /// clock period in nanoseconds - pub period: NotNan, -} - /* fixme make_annotation_enum! { #[non_exhaustive] pub enum LatticeAnnotation { diff --git a/crates/fayalite/src/vendor/lattice/orangecrab.rs b/crates/fayalite/src/vendor/lattice/orangecrab.rs index 0a6515a..37829c9 100644 --- a/crates/fayalite/src/vendor/lattice/orangecrab.rs +++ b/crates/fayalite/src/vendor/lattice/orangecrab.rs @@ -11,7 +11,7 @@ use crate::{ }, prelude::*, vendor::lattice::{ - Device, XdcCreateClockAnnotation, XdcIOStandardAnnotation, XdcLocationAnnotation, + Device, primitives, }, }; diff --git a/crates/fayalite/src/vendor/lattice/yosys_nextpnr.rs b/crates/fayalite/src/vendor/lattice/yosys_nextpnr.rs index 90e4795..a6dd2b4 100644 --- a/crates/fayalite/src/vendor/lattice/yosys_nextpnr.rs +++ b/crates/fayalite/src/vendor/lattice/yosys_nextpnr.rs @@ -24,7 +24,7 @@ use crate::{ source_location::SourceLocation, util::{HashSet, job_server::AcquiredJob}, vendor::lattice::{ - Device, XdcCreateClockAnnotation, XdcIOStandardAnnotation, XdcLocationAnnotation, + Device, /* fixme LatticeAnnotation,*/ LatticeArgs, }, };