<!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-05-31)</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>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/network/open_eth.c:
Misc. changes to make code 16bit-target compliant.
</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.513&r2=text&tr2=1.514&diff_format=h">M</a></td><td width='1%'>1.514</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/network/open_eth.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>c/src/libchip/network/open_eth.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.513 rtems/c/src/ChangeLog:1.514
--- rtems/c/src/ChangeLog:1.513 Mon May 17 21:12:39 2010
+++ rtems/c/src/ChangeLog Mon May 31 07:16:43 2010
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libchip/network/open_eth.c:<span style="background-color: #FF0000"> </span>
+ Misc. changes to make code 16bit-target compliant.
+
</font> 2010-05-18 Chris Johns <chrisj@rtems.org>
* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: PR
<font color='#006600'>diff -u rtems/c/src/libchip/network/open_eth.c:1.17 rtems/c/src/libchip/network/open_eth.c:1.18
--- rtems/c/src/libchip/network/open_eth.c:1.17 Sun Nov 29 21:42:53 2009
+++ rtems/c/src/libchip/network/open_eth.c Mon May 31 07:16:43 2010
</font><font color='#997700'>@@ -313,8 +313,17 @@
</font> /* set ethernet address. */
regs->mac_addr1 = sc->arpcom.ac_enaddr[0] << 8 | sc->arpcom.ac_enaddr[1];
<font color='#880000'>- regs->mac_addr0 = sc->arpcom.ac_enaddr[2] << 24 | sc->arpcom.ac_enaddr[3] << 16 |
- sc->arpcom.ac_enaddr[4] << 8 | sc->arpcom.ac_enaddr[5];
</font><font color='#000088'>+
+ uint32_t mac_addr0;
+ mac_addr0 = sc->arpcom.ac_enaddr[2];
+ mac_addr0 <<= 8;
+ mac_addr0 |= sc->arpcom.ac_enaddr[3];
+ mac_addr0 <<= 8;
+ mac_addr0 |= sc->arpcom.ac_enaddr[4];
+ mac_addr0 <<= 8;
+ mac_addr0 |= sc->arpcom.ac_enaddr[5];
+<span style="background-color: #FF0000"> </span>
+ regs->mac_addr0 = mac_addr0;
</font>
/* install interrupt vector */
set_vector (open_eth_interrupt_handler, sc->vector, 1);
<font color='#997700'>@@ -347,7 +356,9 @@
</font> struct open_eth_softc *dp = (struct open_eth_softc *) &oc;
struct ifnet *ifp = &dp->arpcom.ac_if;
struct mbuf *m;
<font color='#880000'>- unsigned int len, len_status, bad;
</font><font color='#000088'>+ unsigned int len;
+ uint32_t len_status;
+ unsigned int bad;
</font> rtems_event_set events;
<font color='#997700'>@@ -437,7 +448,7 @@
</font> struct open_eth_softc *dp = ifp->if_softc;
unsigned char *temp;
struct mbuf *n;
<font color='#880000'>- unsigned int len, len_status;
</font><font color='#000088'>+ uint32_t len, len_status;
</font>
if (inside) printf ("error: sendpacket re-entered!!\n");
inside = 1;
</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>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/network/i82586.c:
Use int32_t instead of int for 16bit-target compliance.
</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.514&r2=text&tr2=1.515&diff_format=h">M</a></td><td width='1%'>1.515</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/network/i82586.c.diff?r1=text&tr1=1.16&r2=text&tr2=1.17&diff_format=h">M</a></td><td width='1%'>1.17</td><td width='100%'>c/src/libchip/network/i82586.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.514 rtems/c/src/ChangeLog:1.515
--- rtems/c/src/ChangeLog:1.514 Mon May 31 07:16:43 2010
+++ rtems/c/src/ChangeLog Mon May 31 07:20:17 2010
</font><font color='#997700'>@@ -1,5 +1,7 @@
</font> 2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libchip/network/i82586.c:
+ Use int32_t instead of int for 16bit-target compliance.
</font> * libchip/network/open_eth.c:<span style="background-color: #FF0000"> </span>
Misc. changes to make code 16bit-target compliant.
<font color='#006600'>diff -u rtems/c/src/libchip/network/i82586.c:1.16 rtems/c/src/libchip/network/i82586.c:1.17
--- rtems/c/src/libchip/network/i82586.c:1.16 Fri Mar 12 10:27:24 2010
+++ rtems/c/src/libchip/network/i82586.c Mon May 31 07:20:17 2010
</font><font color='#997700'>@@ -1508,7 +1508,7 @@
</font> static void
ie_run_tdr(struct ie_softc *sc, int cmd)
{
<font color='#880000'>- int result;
</font><font color='#000088'>+ uint32_t result;
</font>
setup_simple_command(sc, IE_CMD_TDR, cmd);
sc->ie_bus_write16(sc, IE_CMD_TDR_TIME(cmd), 0);
<font color='#997700'>@@ -1530,13 +1530,13 @@
</font> else if (result & IE_TDR_XCVR)
printf("%s: transceiver problem\n", sc->arpcom.ac_if.if_name);
else if (result & IE_TDR_OPEN)
<font color='#880000'>- printf("%s: TDR detected incorrect termination %d clocks away\n",
</font><font color='#000088'>+ printf("%s: TDR detected incorrect termination %" PRId32 " clocks away\n",
</font> sc->arpcom.ac_if.if_name, result & IE_TDR_TIME);
else if (result & IE_TDR_SHORT)
<font color='#880000'>- printf("%s: TDR detected a short circuit %d clocks away\n",
</font><font color='#000088'>+ printf("%s: TDR detected a short circuit %" PRId32 " clocks away\n",
</font> sc->arpcom.ac_if.if_name, result & IE_TDR_TIME);
else
<font color='#880000'>- printf("%s: TDR returned unknown status 0x%x\n",
</font><font color='#000088'>+ printf("%s: TDR returned unknown status 0x%" PRIx32 "\n",
</font> sc->arpcom.ac_if.if_name, result);
}
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/network/cs8900.c:
Misc. changes to make code 16bit-target compliant.
</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.515&r2=text&tr2=1.516&diff_format=h">M</a></td><td width='1%'>1.516</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/network/cs8900.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>c/src/libchip/network/cs8900.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.515 rtems/c/src/ChangeLog:1.516
--- rtems/c/src/ChangeLog:1.515 Mon May 31 07:20:17 2010
+++ rtems/c/src/ChangeLog Mon May 31 07:21:43 2010
</font><font color='#997700'>@@ -1,5 +1,7 @@
</font> 2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libchip/network/cs8900.c:
+ Misc. changes to make code 16bit-target compliant.
</font> * libchip/network/i82586.c:
Use int32_t instead of int for 16bit-target compliance.
* libchip/network/open_eth.c:<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u rtems/c/src/libchip/network/cs8900.c:1.14 rtems/c/src/libchip/network/cs8900.c:1.15
--- rtems/c/src/libchip/network/cs8900.c:1.14 Mon Mar 12 06:19:21 2007
+++ rtems/c/src/libchip/network/cs8900.c Mon May 31 07:21:43 2010
</font><font color='#997700'>@@ -65,16 +65,17 @@
</font> return data;
}
<font color='#880000'>-static inline unsigned long
-io_pp_get_reg_32 (cs8900_device *cs, unsigned short reg)
</font><font color='#000088'>+static inline uint32_t
+io_pp_get_reg_32 (cs8900_device *cs, uint16_t reg)
</font> {
rtems_interrupt_level level;
<font color='#880000'>- unsigned long data;
</font><font color='#000088'>+ uint32_t data;
</font> rtems_interrupt_disable (level);
cs8900_io_set_reg (cs, CS8900_IO_PACKET_PAGE_PTR,
0x3000 | CS8900_PPP_AUTO_INCREMENT | reg);
<font color='#880000'>- data = ((cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0) << 16) |
- cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1));
</font><font color='#000088'>+ data = cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0);
+ data <<= 16;
+ data |= cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1);
</font> rtems_interrupt_enable (level);
return data;
}
</pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1531/newlib
* libchip/network/i82586.c:
Add local copy of ALIGN().
</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.516&r2=text&tr2=1.517&diff_format=h">M</a></td><td width='1%'>1.517</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/network/i82586.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>c/src/libchip/network/i82586.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.516 rtems/c/src/ChangeLog:1.517
--- rtems/c/src/ChangeLog:1.516 Mon May 31 07:21:43 2010
+++ rtems/c/src/ChangeLog Mon May 31 07:22:38 2010
</font><font color='#997700'>@@ -1,5 +1,11 @@
</font> 2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ PR 1531/newlib
+ * libchip/network/i82586.c:
+ Add local copy of ALIGN().
+
+2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libchip/network/cs8900.c:
Misc. changes to make code 16bit-target compliant.
* libchip/network/i82586.c:
<font color='#006600'>diff -u rtems/c/src/libchip/network/i82586.c:1.17 rtems/c/src/libchip/network/i82586.c:1.18
--- rtems/c/src/libchip/network/i82586.c:1.17 Mon May 31 07:20:17 2010
+++ rtems/c/src/libchip/network/i82586.c Mon May 31 07:22:38 2010
</font><font color='#997700'>@@ -173,6 +173,15 @@
</font> #include "i82586reg.h"
#include "i82586var.h"
<font color='#000088'>+#if defined(ALIGNBYTES) && defined(ALIGN)
+/* FIXME: Redefine because some versions of<span style="background-color: #FF0000"> </span>
+ * RTEMS newlib and the BSDs ship a broken ALIGN */
+#undef ALIGN
+#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)
+#else
+#define ALIGN(p) (p)
+#endif
+
</font> /*
* A global way to change all async cmd requests at once. For RTEMS and running
* as tasks I wanted to see if the tx race condition is effected by this.
</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>