[PATCH 086/111] GRTM: fix build warnings

Daniel Hellstrom daniel at gaisler.com
Thu Feb 26 16:39:28 UTC 2015


---
 c/src/lib/libbsp/sparc/shared/include/grtm.h |    3 +++
 c/src/lib/libbsp/sparc/shared/tmtc/grtm.c    |   10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/shared/include/grtm.h b/c/src/lib/libbsp/sparc/shared/include/grtm.h
index 1bf7681..d61330a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grtm.h
+++ b/c/src/lib/libbsp/sparc/shared/include/grtm.h
@@ -235,6 +235,9 @@ struct grtm_ioc_stats {
 /* Register GRTM driver at driver manager */
 void grtm_register_drv(void);
 
+/* Register GRTM RMAP driver at driver manager */
+void grtm_rmap_register_drv (void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
index 49025bc..1d9fb00 100644
--- a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
+++ b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
@@ -649,7 +649,8 @@ static void grtm_hw_get_implementation(struct grtm_priv *pDev, struct grtm_ioc_h
 	hwcfg->fifo_size= (cfg & GRTM_DMA_CFG_FIFOSZ) >> GRTM_DMA_CFG_FIFOSZ_BIT;
 }
 
-#warning Extra: Implement proper default calculation from hardware configuration
+
+/* TODO: Implement proper default calculation from hardware configuration */
 static void grtm_hw_get_default_modes(struct grtm_ioc_config *cfg, struct grtm_ioc_hw *hwcfg)
 {
 	cfg->mode = GRTM_MODE_TM;
@@ -1094,7 +1095,7 @@ static int grtm_schedule_ready(struct grtm_priv *pDev, int ints_off)
 			/* Do translation */
 			drvmgr_translate(pDev->dev, CPUMEM_TO_DMA, (void *)curr_frm->payload, (void **)&curr_bd->bd->address);
 			if ( curr_frm->flags & GRTM_FLAGS_TRANSLATE_AND_REMEMBER ) {
-				if ( curr_frm->payload != curr_bd->bd->address ) {
+				if ( curr_frm->payload != (unsigned int *)curr_bd->bd->address ) {
 					/* Translation needed */
 					curr_frm->flags &= ~GRTM_FLAGS_TRANSLATE_AND_REMEMBER;
 					curr_frm->flags |= GRTM_FLAGS_TRANSLATE;
@@ -1313,7 +1314,7 @@ static rtems_device_driver grtm_ioctl(rtems_device_major_number major, rtems_dev
 		}
 		/* We disable interrupt in order to get a snapshot of the registers */
 		IRQ_GLOBAL_DISABLE(oldLevel);
-#warning IMPLEMENT HWREGS
+/* TODO: implement hwregs */
 		IRQ_GLOBAL_ENABLE(oldLevel);
 		break;
 
@@ -1564,9 +1565,10 @@ static void grtm_interrupt(void *arg)
 		}
 
 	}
-
+#if 0
 procceed_processing_interrupts:
 	;
+#endif
 }
 
 static rtems_device_driver grtm_initialize(
-- 
1.7.0.4




More information about the devel mailing list