[rtems commit] bsps: Fix integer to/from pointer warnings

Sebastian Huber sebh at rtems.org
Thu Sep 28 11:22:13 UTC 2017


Module:    rtems
Branch:    master
Commit:    910adc3e838f72e66d5ffdc71140412cd8607b89
Changeset: http://git.rtems.org/rtems/commit/?id=910adc3e838f72e66d5ffdc71140412cd8607b89

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Sep 28 13:18:12 2017 +0200

bsps: Fix integer to/from pointer warnings

Update #3082.

---

 c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c      | 6 +++---
 c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h | 2 +-
 c/src/libchip/serial/ns16550.c                                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
index bb9b4d6..a6daad4 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
@@ -90,7 +90,7 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
 
     rtems_interrupt_disable(level);
 
-    if ( (int)rtems_hdl_tbl[irq->name].next_handler  == -1 ) {
+    if ( (intptr_t)rtems_hdl_tbl[irq->name].next_handler  == -1 ) {
       rtems_interrupt_enable(level);
       printk("IRQ vector %d already connected to an unshared handler\n",irq->name);
 	  free(vchain);
@@ -210,7 +210,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
       return 0;
     }
 
-    if( (int)rtems_hdl_tbl[irq->name].next_handler != -1 )
+    if( (intptr_t)rtems_hdl_tbl[irq->name].next_handler != -1 )
     {
        int found = 0;
 
@@ -345,7 +345,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 
 	for ( i = config->irqBase; i < config->irqBase + config->irqNb; i++ ) {
 		for( vchain = &rtems_hdl_tbl[i];
-		     ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
+		     ((intptr_t)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
 		     vchain = (rtems_irq_connect_data*)vchain->next_handler )
 		{
 			if (vchain->on)
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
index 1a2d195..65af48c 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
@@ -78,7 +78,7 @@ bsp_irq_dispatch_list_base(
 {
 	rtems_irq_connect_data* vchain;
 	for( vchain = &tbl[irq];
-			((int)vchain != -1 && vchain->hdl != sentinel);
+			((intptr_t)vchain != -1 && vchain->hdl != sentinel);
 			vchain = (rtems_irq_connect_data*)vchain->next_handler )
 	{
           vchain->hdl(vchain->handle);
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index c8d66de..e6c192a 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -708,7 +708,7 @@ NS16550_STATIC void ns16550_enable_interrupts(
 #if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
   void ns16550_isr(void *arg)
   {
-    int minor = (int) arg;
+    int minor = (intptr_t) arg;
 
     ns16550_process( minor);
   }
@@ -733,7 +733,7 @@ NS16550_STATIC void ns16550_initialize_interrupts( int minor)
         "NS16550",
         RTEMS_INTERRUPT_SHARED,
         ns16550_isr,
-        (void *) minor
+        (void *) (intptr_t) minor
       );
       if (sc != RTEMS_SUCCESSFUL) {
         /* FIXME */
@@ -783,7 +783,7 @@ NS16550_STATIC void ns16550_cleanup_interrupts(int minor)
     sc = rtems_interrupt_handler_remove(
       c->ulIntVector,
       ns16550_isr,
-      (void *) minor
+      (void *) (intptr_t) minor
     );
     if (sc != RTEMS_SUCCESSFUL) {
       /* FIXME */



More information about the vc mailing list