change log for rtems (2010-04-28)

rtems-vc at rtems.org rtems-vc at rtems.org
Wed Apr 28 18:11:35 UTC 2010


 *joel*:
2010-04-28	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.

M   1.63  c/src/lib/libbsp/powerpc/ss555/ChangeLog
M    1.3  c/src/lib/libbsp/powerpc/ss555/irq/irq.h
M    1.5  c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
M    1.4  c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c

diff -u rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog:1.62 rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog:1.63
--- rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog:1.62	Sat Mar 27 15:44:18 2010
+++ rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog	Wed Apr 28 12:17:47 2010
@@ -1,3 +1,7 @@
+2010-04-28	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.
+
 2010-03-27	Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>
 
 	* startup/start.S: remove bootcard calling warning

diff -u rtems/c/src/lib/libbsp/powerpc/ss555/irq/irq.h:1.2 rtems/c/src/lib/libbsp/powerpc/ss555/irq/irq.h:1.3
--- rtems/c/src/lib/libbsp/powerpc/ss555/irq/irq.h:1.2	Wed Apr 21 05:43:03 2004
+++ rtems/c/src/lib/libbsp/powerpc/ss555/irq/irq.h	Wed Apr 28 12:17:47 2010
@@ -36,6 +36,18 @@
 #endif
 
 /*
+ *  These are no longer prototyped anywhere else. This appears to be
+ *  remnants of the IRQ code upgrade.
+ *
+ *  --joel 28 April 2010
+ */
+int CPU_install_rtems_irq_handler(const rtems_irq_connect_data* irq);
+int CPU_get_current_rtems_irq_handler(rtems_irq_connect_data* irq);
+int CPU_remove_rtems_irq_handler(const rtems_irq_connect_data* irq);
+int CPU_rtems_irq_mngt_set(rtems_irq_global_settings* config);
+int CPU_rtems_irq_mngt_get(rtems_irq_global_settings** config);
+
+/*
  * The SS555 has no external interrupt controller chip, so use the standard
  * routines from the CPU-dependent code.
  */

diff -u rtems/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c:1.4 rtems/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c:1.5
--- rtems/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c:1.4	Wed Oct 20 03:23:27 2004
+++ rtems/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c	Wed Apr 28 12:17:48 2010
@@ -26,6 +26,8 @@
 SPR_RW(L2U_GRA);
 SPR_RW(BBCMCR);
 
+extern char int_ram_top[];		/* top of internal ram */
+
 /*
  *  Initialize SS555
  */
@@ -94,8 +96,6 @@
    * extend the internal RAM.  If booting from external RAM, leave it at
    * zero but set it up appropriately.
    */
-  extern char int_ram_top[];		/* top of internal ram */
-
   usiu.memc[0]._or =
       USIU_MEMC_OR_512K			/* bank size */
     | USIU_MEMC_OR_SCY(0)		/* wait states in first beat of burst */

diff -u rtems/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c:1.3 rtems/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c:1.4
--- rtems/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c:1.3	Sat Mar 27 16:09:29 2010
+++ rtems/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c	Wed Apr 28 12:17:48 2010
@@ -6,24 +6,11 @@
 
 #include <bsp.h>
 
-void tm27On(void)
-{
-}
-
-void tm27Off(void)
-{
-}
-
-int tm27IsOn(void)
-{
-  return 1;
-}
-
 rtems_irq_connect_data tm27IrqData = {
   CPU_USIU_EXT_IRQ_7,
   (rtems_irq_hdl)0,
-  (rtems_irq_enable)tm27On,
-  (rtems_irq_disable)tm27Off,
-  (rtems_irq_is_enabled)tm27IsOn
+  NULL,
+  NULL,
+  NULL
 };
 


 *joel*:
2010-04-28	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* mpc5xx/clock/clock.c, mpc5xx/console-generic/console-generic.c,
	mpc5xx/irq/irq_init.c, mpc5xx/timer/timer.c: Remove warnings.

M  1.351  c/src/lib/libcpu/powerpc/ChangeLog
M    1.8  c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c
M   1.10  c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c
M    1.5  c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c
M    1.9  c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c

diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.350 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.351
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.350	Sun Apr 25 11:10:34 2010
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog	Wed Apr 28 12:17:59 2010
@@ -1,3 +1,8 @@
+2010-04-28	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* mpc5xx/clock/clock.c, mpc5xx/console-generic/console-generic.c,
+	mpc5xx/irq/irq_init.c, mpc5xx/timer/timer.c: Remove warnings.
+
 2010-04-25	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* ppc403/clock/clock.c, ppc403/console/console405.c,

diff -u rtems/c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c:1.7 rtems/c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c:1.8
--- rtems/c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c:1.7	Sun Nov 29 23:07:53 2009
+++ rtems/c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c	Wed Apr 28 12:17:59 2010
@@ -52,6 +52,7 @@
 volatile uint32_t Clock_driver_ticks;
 extern int BSP_connect_clock_handler(rtems_isr_entry);
 extern int BSP_disconnect_clock_handler();
+extern uint32_t bsp_clicks_per_usec;
 
 void Clock_exit( void );
 
@@ -79,7 +80,6 @@
 {
   unsigned desiredLevel;
   uint32_t pit_value;
-  extern uint32_t bsp_clicks_per_usec;
 
   /* calculate and set modulus */
   pit_value = (rtems_configuration_get_microseconds_per_tick() *

diff -u rtems/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c:1.9 rtems/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c:1.10
--- rtems/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c:1.9	Thu Dec 17 02:42:16 2009
+++ rtems/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c	Wed Apr 28 12:17:59 2010
@@ -49,7 +49,7 @@
 #include <rtems/bspIo.h>   /* for printk */
 #include <mpc5xx.h>
 #include <mpc5xx/console.h>
-#include <libcpu/irq.h>
+#include <bsp/irq.h>
 
 
 /*
@@ -85,6 +85,8 @@
 };
 
 
+extern uint32_t bsp_clock_speed;
+
 /*
  * Termios callback functions
  */
@@ -187,33 +189,10 @@
     return RTEMS_INVALID_NUMBER;
 
   /* Baud rate */
-  switch (t->c_cflag & CBAUD) {
-    default:      baud = -1;      break;
-    case B50:     baud = 50;      break;
-    case B75:     baud = 75;      break;
-    case B110:    baud = 110;     break;
-    case B134:    baud = 134;     break;
-    case B150:    baud = 150;     break;
-    case B200:    baud = 200;     break;
-    case B300:    baud = 300;     break;
-    case B600:    baud = 600;     break;
-    case B1200:   baud = 1200;    break;
-    case B1800:   baud = 1800;    break;
-    case B2400:   baud = 2400;    break;
-    case B4800:   baud = 4800;    break;
-    case B9600:   baud = 9600;    break;
-    case B19200:  baud = 19200;   break;
-    case B38400:  baud = 38400;   break;
-    case B57600:  baud = 57600;   break;
-    case B115200: baud = 115200;  break;
-    case B230400: baud = 230400;  break;
-    case B460800: baud = 460800;  break;
-  }
+  baud = rtems_termios_baud_to_number( t->c_cflag & CBAUD );
   if (baud > 0) {
-    extern uint32_t bsp_clock_speed;
     sccr0 &= ~QSMCM_SCI_BAUD(-1);
-    sccr0 |=
-      QSMCM_SCI_BAUD((bsp_clock_speed + (16 * baud)) / (32 * baud));
+    sccr0 |= QSMCM_SCI_BAUD((bsp_clock_speed + (16 * baud)) / (32 * baud));
   }
 
   /* Number of data bits -- not available with MPC5xx SCI */

diff -u rtems/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c:1.4 rtems/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c:1.5
--- rtems/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c:1.4	Wed Apr  7 01:45:59 2010
+++ rtems/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c	Wed Apr 28 12:17:59 2010
@@ -23,40 +23,55 @@
 #include <mpc5xx.h>
 #include <libcpu/vectors.h>
 #include <libcpu/raw_exception.h>
-#include <libcpu/irq.h>
-
+#include <bsp/irq.h>
 
 extern rtems_exception_handler_t dispatch_irq_handler;
 
 volatile unsigned int ppc_cached_irq_mask;
 
 /*
- * default on/off function
+ * default methods
  */
-static void nop_func(){}
+static void nop_hdl(rtems_irq_hdl_param ignored)
+{
+}
 
-/*
- * default isOn function
- */
-static int not_connected(void) {return 0;}
+static void nop_irq_enable(const struct __rtems_irq_connect_data__*ignored)
+{
+}
 
-/*
- * default possible isOn function
- */
-static int connected(void) {return 1;}
+static void nop_raw_enable(
+  const struct __rtems_raw_except_connect_data__*ignored
+)
+{
+}
+
+static int irq_is_connected(const struct __rtems_irq_connect_data__*ignored)
+{
+  return 0;
+}
+
+static int raw_is_connected(const struct __rtems_raw_except_connect_data__*ignored)
+{
+  return 0;
+}
 
-static rtems_irq_connect_data     	rtemsIrq[CPU_IRQ_COUNT];
-static rtems_irq_global_settings     	initial_config;
-static rtems_irq_connect_data     	defaultIrq = {
-  /* vector,	 hdl		,handle		, on		, off		, isOn */
-  0, 		 nop_func	,NULL		, nop_func	, nop_func	, not_connected
+static rtems_irq_connect_data     rtemsIrq[CPU_IRQ_COUNT];
+static rtems_irq_global_settings  initial_config;
+static rtems_irq_connect_data     defaultIrq = {
+  0,                /* vector */
+  nop_hdl,          /* hdl */
+  NULL,             /* handle */
+  nop_irq_enable,   /* on */
+  nop_irq_enable,   /* off */
+  irq_is_connected  /* isOn */
 };
 
 static rtems_irq_prio irqPrioTable[CPU_IRQ_COUNT]={
   /*
    * actual priorities for interrupt :
-   *	0   means that only current interrupt is masked
-   *	255 means all other interrupts are masked
+   *   0   means that only current interrupt is masked
+   *   255 means all other interrupts are masked
    */
   /*
    * USIU interrupts.
@@ -118,11 +133,11 @@
     /*
      * Init initial Interrupt management config
      */
-    initial_config.irqNb 	= CPU_IRQ_COUNT;
+    initial_config.irqNb        = CPU_IRQ_COUNT;
     initial_config.defaultEntry = defaultIrq;
-    initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase	= CPU_ASM_IRQ_VECTOR_BASE;
-    initial_config.irqPrioTbl	= irqPrioTable;
+    initial_config.irqHdlTbl    = rtemsIrq;
+    initial_config.irqBase      = CPU_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqPrioTbl   = irqPrioTable;
 
     if (!CPU_rtems_irq_mngt_set(&initial_config)) {
       /*
@@ -135,17 +150,17 @@
    * We must connect the raw irq handler for the two
    * expected interrupt sources : decrementer and external interrupts.
    */
-    vectorDesc.exceptIndex 	=	ASM_DEC_VECTOR;
-    vectorDesc.hdl.vector	=	ASM_DEC_VECTOR;
-    vectorDesc.hdl.raw_hdl	=	dispatch_irq_handler;
-    vectorDesc.on		=	nop_func;
-    vectorDesc.off		=	nop_func;
-    vectorDesc.isOn		=	connected;
+    vectorDesc.exceptIndex = ASM_DEC_VECTOR;
+    vectorDesc.hdl.vector  = ASM_DEC_VECTOR;
+    vectorDesc.hdl.raw_hdl = dispatch_irq_handler;
+    vectorDesc.on          = nop_raw_enable;
+    vectorDesc.off         = nop_raw_enable;
+    vectorDesc.isOn        = raw_is_connected;
     if (!mpc5xx_set_exception (&vectorDesc)) {
       BSP_panic("Unable to initialize RTEMS decrementer raw exception\n");
     }
-    vectorDesc.exceptIndex	=	ASM_EXT_VECTOR;
-    vectorDesc.hdl.vector	=	ASM_EXT_VECTOR;
+    vectorDesc.exceptIndex = ASM_EXT_VECTOR;
+    vectorDesc.hdl.vector  = ASM_EXT_VECTOR;
     if (!mpc5xx_set_exception (&vectorDesc)) {
       BSP_panic("Unable to initialize RTEMS external raw exception\n");
     }

diff -u rtems/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c:1.8 rtems/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c:1.9
--- rtems/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c:1.8	Sun Nov 29 23:07:54 2009
+++ rtems/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c	Wed Apr 28 12:17:59 2010
@@ -54,6 +54,9 @@
 static volatile uint32_t Timer_starting;
 static bool benchmark_timer_find_average_overhead;
 
+extern uint32_t bsp_timer_least_valid;
+extern uint32_t bsp_timer_average_overhead;
+
 /*
  *  This is so small that this code will be reproduced where needed.
  */
@@ -83,8 +86,6 @@
 {
   uint32_t clicks;
   uint32_t total;
-  extern uint32_t bsp_timer_least_valid;
-  extern uint32_t bsp_timer_average_overhead;
 
   clicks = get_itimer();
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100428/6e16f0cb/attachment-0001.html>


More information about the vc mailing list