change log for rtems (2010-05-31)
rtems-vc at rtems.org
rtems-vc at rtems.org
Mon May 31 13:10:47 UTC 2010
*ralf*:
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
* libchip/network/open_eth.c:
Misc. changes to make code 16bit-target compliant.
M 1.514 c/src/ChangeLog
M 1.18 c/src/libchip/network/open_eth.c
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
@@ -1,3 +1,8 @@
+2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libchip/network/open_eth.c:
+ Misc. changes to make code 16bit-target compliant.
+
2010-05-18 Chris Johns <chrisj at rtems.org>
* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: PR
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
@@ -313,8 +313,17 @@
/* set ethernet address. */
regs->mac_addr1 = sc->arpcom.ac_enaddr[0] << 8 | sc->arpcom.ac_enaddr[1];
- 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];
+
+ 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];
+
+ regs->mac_addr0 = mac_addr0;
/* install interrupt vector */
set_vector (open_eth_interrupt_handler, sc->vector, 1);
@@ -347,7 +356,9 @@
struct open_eth_softc *dp = (struct open_eth_softc *) &oc;
struct ifnet *ifp = &dp->arpcom.ac_if;
struct mbuf *m;
- unsigned int len, len_status, bad;
+ unsigned int len;
+ uint32_t len_status;
+ unsigned int bad;
rtems_event_set events;
@@ -437,7 +448,7 @@
struct open_eth_softc *dp = ifp->if_softc;
unsigned char *temp;
struct mbuf *n;
- unsigned int len, len_status;
+ uint32_t len, len_status;
if (inside) printf ("error: sendpacket re-entered!!\n");
inside = 1;
*ralf*:
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
* libchip/network/i82586.c:
Use int32_t instead of int for 16bit-target compliance.
M 1.515 c/src/ChangeLog
M 1.17 c/src/libchip/network/i82586.c
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
@@ -1,5 +1,7 @@
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libchip/network/i82586.c:
+ Use int32_t instead of int for 16bit-target compliance.
* libchip/network/open_eth.c:
Misc. changes to make code 16bit-target compliant.
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
@@ -1508,7 +1508,7 @@
static void
ie_run_tdr(struct ie_softc *sc, int cmd)
{
- int result;
+ uint32_t result;
setup_simple_command(sc, IE_CMD_TDR, cmd);
sc->ie_bus_write16(sc, IE_CMD_TDR_TIME(cmd), 0);
@@ -1530,13 +1530,13 @@
else if (result & IE_TDR_XCVR)
printf("%s: transceiver problem\n", sc->arpcom.ac_if.if_name);
else if (result & IE_TDR_OPEN)
- printf("%s: TDR detected incorrect termination %d clocks away\n",
+ printf("%s: TDR detected incorrect termination %" PRId32 " clocks away\n",
sc->arpcom.ac_if.if_name, result & IE_TDR_TIME);
else if (result & IE_TDR_SHORT)
- printf("%s: TDR detected a short circuit %d clocks away\n",
+ printf("%s: TDR detected a short circuit %" PRId32 " clocks away\n",
sc->arpcom.ac_if.if_name, result & IE_TDR_TIME);
else
- printf("%s: TDR returned unknown status 0x%x\n",
+ printf("%s: TDR returned unknown status 0x%" PRIx32 "\n",
sc->arpcom.ac_if.if_name, result);
}
*ralf*:
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
* libchip/network/cs8900.c:
Misc. changes to make code 16bit-target compliant.
M 1.516 c/src/ChangeLog
M 1.15 c/src/libchip/network/cs8900.c
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
@@ -1,5 +1,7 @@
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libchip/network/cs8900.c:
+ Misc. changes to make code 16bit-target compliant.
* libchip/network/i82586.c:
Use int32_t instead of int for 16bit-target compliance.
* libchip/network/open_eth.c:
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
@@ -65,16 +65,17 @@
return data;
}
-static inline unsigned long
-io_pp_get_reg_32 (cs8900_device *cs, unsigned short reg)
+static inline uint32_t
+io_pp_get_reg_32 (cs8900_device *cs, uint16_t reg)
{
rtems_interrupt_level level;
- unsigned long data;
+ uint32_t data;
rtems_interrupt_disable (level);
cs8900_io_set_reg (cs, CS8900_IO_PACKET_PAGE_PTR,
0x3000 | CS8900_PPP_AUTO_INCREMENT | reg);
- data = ((cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0) << 16) |
- cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1));
+ data = cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT0);
+ data <<= 16;
+ data |= cs8900_io_get_reg (cs, CS8900_IO_PP_DATA_PORT1);
rtems_interrupt_enable (level);
return data;
}
*ralf*:
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
PR 1531/newlib
* libchip/network/i82586.c:
Add local copy of ALIGN().
M 1.517 c/src/ChangeLog
M 1.18 c/src/libchip/network/i82586.c
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
@@ -1,5 +1,11 @@
2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
+ PR 1531/newlib
+ * libchip/network/i82586.c:
+ Add local copy of ALIGN().
+
+2010-05-31 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* libchip/network/cs8900.c:
Misc. changes to make code 16bit-target compliant.
* libchip/network/i82586.c:
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
@@ -173,6 +173,15 @@
#include "i82586reg.h"
#include "i82586var.h"
+#if defined(ALIGNBYTES) && defined(ALIGN)
+/* FIXME: Redefine because some versions of
+ * 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
+
/*
* 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.
--
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/20100531/e69eaeb1/attachment.html>
More information about the vc
mailing list