Make generic_timer available on Armv7-A

Fixes #140

Author: jonathanpallant

aarch32-cpu/src/lib.rs

@@ -22,18 +22,23 @@ pub mod asm;
 pub mod asm;
 
 pub mod cache;
+
+#[cfg(any(test, doc, arm_architecture = "v8-r", arm_architecture = "v7-a"))]
+pub mod generic_timer;
+
 pub mod interrupt;
+
+#[cfg(any(test, doc, arm_architecture = "v7-a"))]
 pub mod mmu;
+
 pub mod register;
+
 #[cfg(target_arch = "arm")]
 pub mod stacks;
 
 #[cfg(any(test, doc, arm_architecture = "v7-r"))]
 pub mod pmsav7;
 
-#[cfg(any(test, doc, arm_architecture = "v8-r"))]
-pub mod generic_timer;
-
 #[cfg(any(test, doc, arm_architecture = "v8-r"))]
 pub mod pmsav8;
 

aarch32-cpu/src/register/armv8r/mod.rs

@@ -1,20 +1,5 @@
 //! Access registers for Armv8-R only
 
-pub mod cntfrq;
-pub mod cnthctl;
-pub mod cnthp_ctl;
-pub mod cnthp_cval;
-pub mod cnthp_tval;
-pub mod cntkctl;
-pub mod cntp_ctl;
-pub mod cntp_cval;
-pub mod cntp_tval;
-pub mod cntpct;
-pub mod cntv_ctl;
-pub mod cntv_cval;
-pub mod cntv_tval;
-pub mod cntvct;
-pub mod cntvoff;
 pub mod hacr;
 pub mod hactlr;
 pub mod hactlr2;
@@ -110,21 +95,6 @@ pub mod prlar9;
 pub mod prselr;
 pub mod vbar;
 
-pub use cntfrq::Cntfrq;
-pub use cnthctl::Cnthctl;
-pub use cnthp_ctl::CnthpCtl;
-pub use cnthp_cval::CnthpCval;
-pub use cnthp_tval::CnthpTval;
-pub use cntkctl::Cntkctl;
-pub use cntp_ctl::CntpCtl;
-pub use cntp_cval::CntpCval;
-pub use cntp_tval::CntpTval;
-pub use cntpct::CntPct;
-pub use cntv_ctl::CntvCtl;
-pub use cntv_cval::CntvCval;
-pub use cntv_tval::CntvTval;
-pub use cntvct::CntVct;
-pub use cntvoff::CntVoff;
 pub use hacr::Hacr;
 pub use hactlr::Hactlr;
 pub use hactlr2::Hactlr2;