<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-04-28)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
* irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog.diff?r1=text&tr1=1.62&r2=text&tr2=1.63&diff_format=h">M</a></td><td width='1%'>1.63</td><td width='100%'>c/src/lib/libbsp/powerpc/ss555/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ss555/irq/irq.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>c/src/lib/libbsp/powerpc/ss555/irq/irq.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>c/src/lib/libbsp/powerpc/ss555/startup/iss555.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.
+
</font> 2010-03-27 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* startup/start.S: remove bootcard calling warning
<font color='#006600'>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
</font><font color='#997700'>@@ -36,6 +36,18 @@
</font> #endif
/*
<font color='#000088'>+ * 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);
+
+/*
</font> * The SS555 has no external interrupt controller chip, so use the standard
* routines from the CPU-dependent code.
*/
<font color='#006600'>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
</font><font color='#997700'>@@ -26,6 +26,8 @@
</font> SPR_RW(L2U_GRA);
SPR_RW(BBCMCR);
<font color='#000088'>+extern char int_ram_top[]; /* top of internal ram */
+
</font> /*
* Initialize SS555
*/
<font color='#997700'>@@ -94,8 +96,6 @@
</font> * extend the internal RAM. If booting from external RAM, leave it at
* zero but set it up appropriately.
*/
<font color='#880000'>- extern char int_ram_top[]; /* top of internal ram */
-
</font> usiu.memc[0]._or =
USIU_MEMC_OR_512K /* bank size */
| USIU_MEMC_OR_SCY(0) /* wait states in first beat of burst */
<font color='#006600'>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
</font><font color='#997700'>@@ -6,24 +6,11 @@
</font>
#include <bsp.h>
<font color='#880000'>-void tm27On(void)
-{
-}
-
-void tm27Off(void)
-{
-}
-
-int tm27IsOn(void)
-{
- return 1;
-}
-
</font> rtems_irq_connect_data tm27IrqData = {
CPU_USIU_EXT_IRQ_7,
(rtems_irq_hdl)0,
<font color='#880000'>- (rtems_irq_enable)tm27On,
- (rtems_irq_disable)tm27Off,
- (rtems_irq_is_enabled)tm27IsOn
</font><font color='#000088'>+ NULL,
+ NULL,
+ NULL
</font> };
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
* mpc5xx/clock/clock.c, mpc5xx/console-generic/console-generic.c,
mpc5xx/irq/irq_init.c, mpc5xx/timer/timer.c: Remove warnings.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/ChangeLog.diff?r1=text&tr1=1.350&r2=text&tr2=1.351&diff_format=h">M</a></td><td width='1%'>1.351</td><td width='100%'>c/src/lib/libcpu/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>c/src/lib/libcpu/powerpc/mpc5xx/clock/clock.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * mpc5xx/clock/clock.c, mpc5xx/console-generic/console-generic.c,
+ mpc5xx/irq/irq_init.c, mpc5xx/timer/timer.c: Remove warnings.
+
</font> 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* ppc403/clock/clock.c, ppc403/console/console405.c,
<font color='#006600'>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
</font><font color='#997700'>@@ -52,6 +52,7 @@
</font> volatile uint32_t Clock_driver_ticks;
extern int BSP_connect_clock_handler(rtems_isr_entry);
extern int BSP_disconnect_clock_handler();
<font color='#000088'>+extern uint32_t bsp_clicks_per_usec;
</font>
void Clock_exit( void );
<font color='#997700'>@@ -79,7 +80,6 @@
</font> {
unsigned desiredLevel;
uint32_t pit_value;
<font color='#880000'>- extern uint32_t bsp_clicks_per_usec;
</font>
/* calculate and set modulus */
pit_value = (rtems_configuration_get_microseconds_per_tick() *
<font color='#006600'>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
</font><font color='#997700'>@@ -49,7 +49,7 @@
</font> #include <rtems/bspIo.h> /* for printk */
#include <mpc5xx.h>
#include <mpc5xx/console.h>
<font color='#880000'>-#include <libcpu/irq.h>
</font><font color='#000088'>+#include <bsp/irq.h>
</font>
/*
<font color='#997700'>@@ -85,6 +85,8 @@
</font> };
<font color='#000088'>+extern uint32_t bsp_clock_speed;
+
</font> /*
* Termios callback functions
*/
<font color='#997700'>@@ -187,33 +189,10 @@
</font> return RTEMS_INVALID_NUMBER;
/* Baud rate */
<font color='#880000'>- 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;
- }
</font><font color='#000088'>+ baud = rtems_termios_baud_to_number( t->c_cflag & CBAUD );
</font> if (baud > 0) {
<font color='#880000'>- extern uint32_t bsp_clock_speed;
</font> sccr0 &= ~QSMCM_SCI_BAUD(-1);
<font color='#880000'>- sccr0 |=
- QSMCM_SCI_BAUD((bsp_clock_speed + (16 * baud)) / (32 * baud));
</font><font color='#000088'>+ sccr0 |= QSMCM_SCI_BAUD((bsp_clock_speed + (16 * baud)) / (32 * baud));
</font> }
/* Number of data bits -- not available with MPC5xx SCI */
<font color='#006600'>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
</font><font color='#997700'>@@ -23,40 +23,55 @@
</font> #include <mpc5xx.h>
#include <libcpu/vectors.h>
#include <libcpu/raw_exception.h>
<font color='#880000'>-#include <libcpu/irq.h>
-
</font><font color='#000088'>+#include <bsp/irq.h>
</font>
extern rtems_exception_handler_t dispatch_irq_handler;
volatile unsigned int ppc_cached_irq_mask;
/*
<font color='#880000'>- * default on/off function
</font><font color='#000088'>+ * default methods
</font> */
<font color='#880000'>-static void nop_func(){}
</font><font color='#000088'>+static void nop_hdl(rtems_irq_hdl_param ignored)
+{
+}
</font>
<font color='#880000'>-/*
- * default isOn function
- */
-static int not_connected(void) {return 0;}
</font><font color='#000088'>+static void nop_irq_enable(const struct __rtems_irq_connect_data__*ignored)
+{
+}
</font>
<font color='#880000'>-/*
- * default possible isOn function
- */
-static int connected(void) {return 1;}
</font><font color='#000088'>+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;
+}
</font>
<font color='#880000'>-static rtems_irq_connect_data<span style="background-color: #FF0000"> </span> rtemsIrq[CPU_IRQ_COUNT];
-static rtems_irq_global_settings<span style="background-color: #FF0000"> </span> initial_config;
-static rtems_irq_connect_data<span style="background-color: #FF0000"> </span> defaultIrq = {
- /* vector, hdl ,handle , on , off , isOn */
- 0,<span style="background-color: #FF0000"> </span> nop_func ,NULL , nop_func , nop_func , not_connected
</font><font color='#000088'>+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 */
</font> };
static rtems_irq_prio irqPrioTable[CPU_IRQ_COUNT]={
/*
* actual priorities for interrupt :
<font color='#880000'>- * 0 means that only current interrupt is masked
- * 255 means all other interrupts are masked
</font><font color='#000088'>+ * 0 means that only current interrupt is masked
+ * 255 means all other interrupts are masked
</font> */
/*
* USIU interrupts.
<font color='#997700'>@@ -118,11 +133,11 @@
</font> /*
* Init initial Interrupt management config
*/
<font color='#880000'>- initial_config.irqNb<span style="background-color: #FF0000"> </span> = CPU_IRQ_COUNT;
</font><font color='#000088'>+ initial_config.irqNb = CPU_IRQ_COUNT;
</font> initial_config.defaultEntry = defaultIrq;
<font color='#880000'>- initial_config.irqHdlTbl = rtemsIrq;
- initial_config.irqBase = CPU_ASM_IRQ_VECTOR_BASE;
- initial_config.irqPrioTbl = irqPrioTable;
</font><font color='#000088'>+ initial_config.irqHdlTbl = rtemsIrq;
+ initial_config.irqBase = CPU_ASM_IRQ_VECTOR_BASE;
+ initial_config.irqPrioTbl = irqPrioTable;
</font>
if (!CPU_rtems_irq_mngt_set(&initial_config)) {
/*
<font color='#997700'>@@ -135,17 +150,17 @@
</font> * We must connect the raw irq handler for the two
* expected interrupt sources : decrementer and external interrupts.
*/
<font color='#880000'>- vectorDesc.exceptIndex<span style="background-color: #FF0000"> </span> = 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;
</font><font color='#000088'>+ 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;
</font> if (!mpc5xx_set_exception (&vectorDesc)) {
BSP_panic("Unable to initialize RTEMS decrementer raw exception\n");
}
<font color='#880000'>- vectorDesc.exceptIndex = ASM_EXT_VECTOR;
- vectorDesc.hdl.vector = ASM_EXT_VECTOR;
</font><font color='#000088'>+ vectorDesc.exceptIndex = ASM_EXT_VECTOR;
+ vectorDesc.hdl.vector = ASM_EXT_VECTOR;
</font> if (!mpc5xx_set_exception (&vectorDesc)) {
BSP_panic("Unable to initialize RTEMS external raw exception\n");
}
<font color='#006600'>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
</font><font color='#997700'>@@ -54,6 +54,9 @@
</font> static volatile uint32_t Timer_starting;
static bool benchmark_timer_find_average_overhead;
<font color='#000088'>+extern uint32_t bsp_timer_least_valid;
+extern uint32_t bsp_timer_average_overhead;
+
</font> /*
* This is so small that this code will be reproduced where needed.
*/
<font color='#997700'>@@ -83,8 +86,6 @@
</font> {
uint32_t clicks;
uint32_t total;
<font color='#880000'>- extern uint32_t bsp_timer_least_valid;
- extern uint32_t bsp_timer_average_overhead;
</font>
clicks = get_itimer();
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>