1 files changed, 2 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/c/src/lib/libbsp/sparc/leon3/include/leon.h
index 32d228e045..42c47d69b6 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/leon.h
@@ -44,30 +44,6 @@ extern "C" {
   ( (_trap) >= 0x11 && \
     (_trap) <= 0x1F )
 
-typedef struct {
-  volatile unsigned int value;
-  volatile unsigned int reload;
-  volatile unsigned int conf;
-  volatile unsigned int notused;
-} LEON3_Timer_SubType;
-
-typedef struct {
-  volatile unsigned int scaler_value;   /* common timer registers */
-  volatile unsigned int scaler_reload;
-  volatile unsigned int status;
-  volatile unsigned int notused;
-  LEON3_Timer_SubType timer[8];
-} LEON3_Timer_Regs_Map;
-
-typedef struct {
-  volatile unsigned int iodata;
-  volatile unsigned int ioout;
-  volatile unsigned int iodir;
-  volatile unsigned int irqmask;
-  volatile unsigned int irqpol;
-  volatile unsigned int irqedge;
-} LEON3_IOPORT_Regs_Map;
-
 /* /\* */
 /*  *  This is used to manipulate the on-chip registers. */
 /*  * */
@@ -137,8 +113,8 @@ typedef struct {
 #define LEON_REG_UART_CTRL_FL     0x00000040 /* Flow control enable */
 #define LEON_REG_UART_CTRL_LB     0x00000080 /* Loop Back enable */
 
-extern volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs;  /* LEON3 Interrupt Controller */
-extern volatile LEON3_Timer_Regs_Map *LEON3_Timer_Regs; /* LEON3 GP Timer */
+extern volatile struct irqmp_regs *LEON3_IrqCtrl_Regs;  /* LEON3 Interrupt Controller */
+extern volatile struct gptimer_regs *LEON3_Timer_Regs; /* LEON3 GP Timer */
 
 /* LEON3 CPU Index of boot CPU */
 extern int LEON3_Cpu_Index;