<!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-25)</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-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libmisc/stringto/stringto_template.h: Remove warning.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2268&r2=text&tr2=1.2269&diff_format=h">M</a></td><td width='1%'>1.2269</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/stringto/stringto_template.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>cpukit/libmisc/stringto/stringto_template.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2268 rtems/cpukit/ChangeLog:1.2269
--- rtems/cpukit/ChangeLog:1.2268 Sun Apr 25 14:51:11 2010
+++ rtems/cpukit/ChangeLog Sun Apr 25 19:50:15 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * libmisc/stringto/stringto_template.h: Remove warning.
+
</font> 2010-04-25 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/pthread.c: Make default pthread_attr_t match the
<font color='#006600'>diff -u rtems/cpukit/libmisc/stringto/stringto_template.h:1.6 rtems/cpukit/libmisc/stringto/stringto_template.h:1.7
--- rtems/cpukit/libmisc/stringto/stringto_template.h:1.6 Sun Mar 28 10:20:04 2010
+++ rtems/cpukit/libmisc/stringto/stringto_template.h Sun Apr 25 19:50:15 2010
</font><font color='#997700'>@@ -127,7 +127,11 @@
</font> return RTEMS_INVALID_NUMBER;
#endif
<font color='#880000'>- *n = (STRING_TO_TYPE) result;
</font><font color='#000088'>+ #if defined(STRING_TO_POINTER)
+ *n = (STRING_TO_TYPE) (uintptr_t)result;
+ #else
+ *n = (STRING_TO_TYPE) result;
+ #endif
</font> return RTEMS_SUCCESSFUL;
}
</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-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
libchip/serial/ns16550.c, libchip/serial/serial.h,
libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
or intptr_t instead of uint32_t or int32_t.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/ChangeLog.diff?r1=text&tr1=1.509&r2=text&tr2=1.510&diff_format=h">M</a></td><td width='1%'>1.510</td><td width='100%'>c/src/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/mc68681.c.diff?r1=text&tr1=1.38&r2=text&tr2=1.39&diff_format=h">M</a></td><td width='1%'>1.39</td><td width='100%'>c/src/libchip/serial/mc68681.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/mc68681_reg.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>c/src/libchip/serial/mc68681_reg.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/ns16550.c.diff?r1=text&tr1=1.45&r2=text&tr2=1.46&diff_format=h">M</a></td><td width='1%'>1.46</td><td width='100%'>c/src/libchip/serial/ns16550.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/serial.h.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&diff_format=h">M</a></td><td width='1%'>1.19</td><td width='100%'>c/src/libchip/serial/serial.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/z85c30.c.diff?r1=text&tr1=1.30&r2=text&tr2=1.31&diff_format=h">M</a></td><td width='1%'>1.31</td><td width='100%'>c/src/libchip/serial/z85c30.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/libchip/serial/z85c30_reg.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/libchip/serial/z85c30_reg.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.509 rtems/c/src/ChangeLog:1.510
--- rtems/c/src/ChangeLog:1.509 Sun Apr 25 16:18:05 2010
+++ rtems/c/src/ChangeLog Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -1,5 +1,12 @@
</font> 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
<font color='#000088'>+ * libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
+ libchip/serial/ns16550.c, libchip/serial/serial.h,
+ libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
+ or intptr_t instead of uint32_t or int32_t.
+
+2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
</font> * libchip/rtc/ds1375-rtc.h, libchip/rtc/ds1375.c,
libchip/rtc/icm7170.c, libchip/rtc/icm7170_reg.c,
libchip/rtc/m48t08_reg.c, libchip/rtc/rtc.h: Use uintptr_t instead of
<font color='#006600'>diff -u rtems/c/src/libchip/serial/mc68681.c:1.38 rtems/c/src/libchip/serial/mc68681.c:1.39
--- rtems/c/src/libchip/serial/mc68681.c:1.38 Fri Apr 9 17:44:05 2010
+++ rtems/c/src/libchip/serial/mc68681.c Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -592,7 +592,8 @@
</font>
baud_requested = rtems_termios_baud_to_index( baud_requested );
<font color='#880000'>- baud_tbl = (mc68681_baud_table_t *) Console_Port_Tbl[minor].ulClock;
</font><font color='#000088'>+ baud_tbl = (mc68681_baud_table_t *)
+ ((uintptr_t)Console_Port_Tbl[minor].ulClock);
</font> if (!baud_tbl)
rtems_fatal_error_occurred(RTEMS_INVALID_ADDRESS);
<font color='#006600'>diff -u rtems/c/src/libchip/serial/mc68681_reg.c:1.6 rtems/c/src/libchip/serial/mc68681_reg.c:1.7
--- rtems/c/src/libchip/serial/mc68681_reg.c:1.6 Tue Apr 20 05:43:39 2004
+++ rtems/c/src/libchip/serial/mc68681_reg.c Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -31,7 +31,7 @@
</font> */
uint8_t _MC68681_NAME(mc68681_get_register)(
<font color='#880000'>- uint32_t ulCtrlPort,
</font><font color='#000088'>+ uintptr_t ulCtrlPort,
</font> uint8_t ucRegNum
)
{
<font color='#997700'>@@ -47,7 +47,7 @@
</font> */
void _MC68681_NAME(mc68681_set_register)(
<font color='#880000'>- uint32_t ulCtrlPort,
</font><font color='#000088'>+ uintptr_t ulCtrlPort,
</font> uint8_t ucRegNum,
uint8_t ucData
)
<font color='#006600'>diff -u rtems/c/src/libchip/serial/ns16550.c:1.45 rtems/c/src/libchip/serial/ns16550.c:1.46
--- rtems/c/src/libchip/serial/ns16550.c:1.45 Fri Apr 9 17:44:05 2010
+++ rtems/c/src/libchip/serial/ns16550.c Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -95,7 +95,7 @@
</font>
NS16550_STATIC void ns16550_init(int minor)
{
<font color='#880000'>- uint32_t pNS16550;
</font><font color='#000088'>+ uintptr_t pNS16550;
</font> uint8_t ucTrash;
uint8_t ucDataByte;
uint32_t ulBaudDivisor;
<font color='#997700'>@@ -129,7 +129,7 @@
</font>
ulBaudDivisor = NS16550_Baud(
(uint32_t) Console_Port_Tbl[minor].ulClock,
<font color='#880000'>- (uint32_t) Console_Port_Tbl[minor].pDeviceParams
</font><font color='#000088'>+ (uint32_t) ((uintptr_t)Console_Port_Tbl[minor].pDeviceParams)
</font> );
ucDataByte = SP_LINE_DLAB;
(*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
<font color='#997700'>@@ -183,7 +183,7 @@
</font> }
/* Set initial baud */
<font color='#880000'>- rtems_termios_set_initial_baud( tty, (int32_t) c->pDeviceParams);
</font><font color='#000088'>+ rtems_termios_set_initial_baud( tty, (intptr_t) c->pDeviceParams);
</font>
if (c->pDeviceFns->deviceOutputUsesInterrupts) {
ns16550_enable_interrupts( minor, NS16550_ENABLE_ALL_INTR_EXCEPT_TX);
<font color='#997700'>@@ -217,10 +217,10 @@
</font> /**
* @brief Polled write for NS16550.
*/
<font color='#880000'>-NS16550_STATIC void ns16550_write_polled( int minor, char out)
</font><font color='#000088'>+NS16550_STATIC void ns16550_write_polled(int minor, char out)
</font> {
console_tbl *c = &Console_Port_Tbl [minor];
<font color='#880000'>- uint32_t port = c->ulCtrlPort1;
</font><font color='#000088'>+ uintptr_t port = c->ulCtrlPort1;
</font> getRegister_f get = c->getRegister;
setRegister_f set = c->setRegister;
uint32_t status = 0;
<font color='#006600'>diff -u rtems/c/src/libchip/serial/serial.h:1.18 rtems/c/src/libchip/serial/serial.h:1.19
--- rtems/c/src/libchip/serial/serial.h:1.18 Fri Apr 9 21:19:02 2010
+++ rtems/c/src/libchip/serial/serial.h Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -28,11 +28,10 @@
</font> * Types for get and set register routines
*/
<font color='#880000'>-typedef uint8_t (*getRegister_f)(uint32_t port, uint8_t register);
-typedef void (*setRegister_f)(
- uint32_t port, uint8_t reg, uint8_t value);
-typedef uint8_t (*getData_f)(uint32_t port);
-typedef void (*setData_f)(uint32_t port, uint8_t value);
</font><font color='#000088'>+typedef uint8_t (*getRegister_f)(uintptr_t port, uint8_t reg);
+typedef void (*setRegister_f)(uintptr_t port, uint8_t reg, uint8_t value);
+typedef uint8_t (*getData_f)(uintptr_t port);
+typedef void (*setData_f)(uintptr_t port, uint8_t value);
</font>
typedef struct _console_fns {
bool (*deviceProbe)(int minor);
<font color='#006600'>diff -u rtems/c/src/libchip/serial/z85c30.c:1.30 rtems/c/src/libchip/serial/z85c30.c:1.31
--- rtems/c/src/libchip/serial/z85c30.c:1.30 Fri Apr 9 17:44:05 2010
+++ rtems/c/src/libchip/serial/z85c30.c Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -92,8 +92,8 @@
</font> int minor
)
{
<font color='#880000'>- uint32_t ulCtrlPort;
- uint32_t ulBaudDivisor;
</font><font color='#000088'>+ uintptr_t ulCtrlPort;
+ uintptr_t ulBaudDivisor;
</font> setRegister_f setReg;
ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
<font color='#997700'>@@ -138,7 +138,7 @@
</font>
ulBaudDivisor = Z85C30_Baud(
(uint32_t) Console_Port_Tbl[minor].ulClock,
<font color='#880000'>- (uint32_t) Console_Port_Tbl[minor].pDeviceParams
</font><font color='#000088'>+ (uint32_t) ((uintptr_t)Console_Port_Tbl[minor].pDeviceParams)
</font> );
/*
<font color='#997700'>@@ -253,7 +253,7 @@
</font>
Z85C30_STATIC void z85c30_init(int minor)
{
<font color='#880000'>- uint32_t ulCtrlPort;
</font><font color='#000088'>+ uintptr_t ulCtrlPort;
</font> uint8_t dummy;
z85c30_context *pz85c30Context;
setRegister_f setReg;
<font color='#997700'>@@ -430,7 +430,7 @@
</font> const struct termios *t
)
{
<font color='#880000'>- uint32_t ulCtrlPort;
</font><font color='#000088'>+ uintptr_t ulCtrlPort;
</font> uint32_t ulBaudDivisor;
uint32_t wr3;
uint32_t wr4;
<font color='#006600'>diff -u rtems/c/src/libchip/serial/z85c30_reg.c:1.7 rtems/c/src/libchip/serial/z85c30_reg.c:1.8
--- rtems/c/src/libchip/serial/z85c30_reg.c:1.7 Tue Apr 20 05:43:39 2004
+++ rtems/c/src/libchip/serial/z85c30_reg.c Sun Apr 25 19:58:39 2010
</font><font color='#997700'>@@ -27,7 +27,7 @@
</font> */
uint8_t _Z85C30_NAME(z85c30_get_register)(
<font color='#880000'>- uint32_t ulCtrlPort,
</font><font color='#000088'>+ uintptr_t ulCtrlPort,
</font> uint8_t ucRegNum
)
{
<font color='#997700'>@@ -53,7 +53,7 @@
</font> */
void _Z85C30_NAME(z85c30_set_register)(
<font color='#880000'>- uint32_t ulCtrlPort,
</font><font color='#000088'>+ uintptr_t ulCtrlPort,
</font> uint8_t ucRegNum,
uint8_t ucData
)
</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>