<!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 (2011-07-22)</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>
<font color='#225522'><em>(on branch rtems-4-9-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-03-31 Kate Feng <feng@bnl.gov>
PR 1778/bsps
* vme/VMEConfig.h: Used the VME shared IRQ handlers.
* include/bsp.h: Removed BSP_PIC_DO_EOI.
* network/if_100MHz/GT64260eth.c:
Recycle the Rx mbuf if there is any Rx error.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog.diff?r1=text&tr1=1.88.2.4&r2=text&tr2=1.88.2.5&diff_format=h">M</a></td><td width='1%'>1.88.2.5</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h.diff?r1=text&tr1=1.13.2.2&r2=text&tr2=1.13.2.3&diff_format=h">M</a></td><td width='1%'>1.13.2.3</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c.diff?r1=text&tr1=1.4.2.1&r2=text&tr2=1.4.2.2&diff_format=h">M</a></td><td width='1%'>1.4.2.2</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.3.2.1&diff_format=h">M</a></td><td width='1%'>1.3.2.1</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.88.2.4 rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.88.2.5
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.88.2.4 Fri May 8 13:38:30 2009
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog Fri Jul 22 08:02:37 2011
</font><font color='#997700'>@@ -1,3 +1,11 @@
</font><font color='#000088'>+2011-03-31 Kate Feng <feng@bnl.gov>
+
+ PR 1778/bsps
+ * vme/VMEConfig.h: Used the VME shared IRQ handlers.
+ * include/bsp.h: Removed BSP_PIC_DO_EOI.
+ * network/if_100MHz/GT64260eth.c:
+ Recycle the Rx mbuf if there is any Rx error.
+<span style="background-color: #FF0000"> </span>
</font> 2009-05-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* irq/irq.c, network/if_1GHz/POSSIBLEBUG: Removed.
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.13.2.2 rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.13.2.3
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.13.2.2 Fri May 8 13:22:51 2009
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h Fri Jul 22 08:02:37 2011
</font><font color='#997700'>@@ -100,14 +100,6 @@
</font> #define BSP_MAX_PCI_BUS_ON_PCI1 2
#define BSP_MAX_PCI_BUS (BSP_MAX_PCI_BUS_ON_PCI0+BSP_MAX_PCI_BUS_ON_PCI1)
<font color='#880000'>-
-/* The glues to Till's vmeUniverse, although the name does not
- * actually reflect the relevant architect of the MVME5500.
- * Till TODO ? : BSP_PCI_DO_EOI instead ?<span style="background-color: #FF0000"> </span>
- * BSP_EXT_IRQ0 instead of BSP_PCI_IRQ0 ?
- *
- */
-#define BSP_PIC_DO_EOI inl(0xc34) /* PCI IACK */
</font> #define BSP_PCI_IRQ0 BSP_GPP_IRQ_LOWEST_OFFSET
/*
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c:1.4.2.1 rtems/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c:1.4.2.2
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c:1.4.2.1 Fri May 8 13:22:51 2009
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c Fri Jul 22 08:02:37 2011
</font><font color='#997700'>@@ -743,21 +743,22 @@
</font> if (cmdsts & RX_STS_SF) sc->stats.frame_errors++;
if ((cmdsts & RX_STS_LC) || (cmdsts & RX_STS_COL))
ifp->if_collisions++;
<font color='#880000'>- goto give_it_back;
</font><font color='#000088'>+ /* recycle the buffer */
+ m->m_len=sc->rx_buf_sz;<span style="background-color: #FF0000"> </span>
+ }
+ else {
+ m = sc->rxq_mbuf[sc->rxq_fi];
+ m->m_len = m->m_pkthdr.len = byteCount - sizeof(struct ether_header);
+ eh = mtod (m, struct ether_header *);
+ m->m_data += sizeof(struct ether_header);
+ ether_input (ifp, eh, m);
+
+ ifp->if_ipackets++;
+ ifp->if_ibytes+=byteCount;
+ --sc->rxq_active;
+ MGETHDR (m, M_WAIT, MT_DATA);
+ MCLGET (m, M_WAIT);
</font> }
<font color='#880000'>- m = sc->rxq_mbuf[sc->rxq_fi];
- m->m_len = m->m_pkthdr.len = byteCount - sizeof(struct ether_header);
- eh = mtod (m, struct ether_header *);
- m->m_data += sizeof(struct ether_header);
- ether_input (ifp, eh, m);
-
- ifp->if_ipackets++;
- ifp->if_ibytes+=byteCount;
- --sc->rxq_active;
-
- give_it_back:
- MGETHDR (m, M_WAIT, MT_DATA);
- MCLGET (m, M_WAIT);
</font> m->m_pkthdr.rcvif = ifp;
sc->rxq_mbuf[sc->rxq_fi]= m;
/* convert mbuf pointer to data pointer of correct type */<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h:1.3 rtems/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h:1.3.2.1
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h:1.3 Sat Dec 8 23:54:19 2007
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h Fri Jul 22 08:02:37 2011
</font><font color='#997700'>@@ -1,6 +1,21 @@
</font> #ifndef RTEMS_BSP_VME_CONFIG_H
#define RTEMS_BSP_VME_CONFIG_H
<font color='#880000'>-/* VMEConfig.h, S. Kate Feng modified it for MVME5500 3/04 */
</font><font color='#000088'>+/* VMEConfig.h, S. Kate Feng modified it for MVME5500 3/04<span style="background-color: #FF0000"> </span>
+ *<span style="background-color: #FF0000"> </span>
+ * May 2011 : Use the VME shared IRQ handlers.
+ *
+ * It seems that the implementation of VMEUNIVERSE_IRQ_MGR_FLAG_PW_WORKAROUND
+ * is not fully developed. The UNIV_REGOFF_VCSR_BS is defined for VME64
+ * specification, which does not apply to a VME32 crate. In order to avoid
+ * spurious VME interrupts, a better and more universal solution is
+ * to flush the vmeUniverse FIFO by reading a register back within the
+ * users' Interrupt Service Routine (ISR) before returning.
+ *
+ * Some devices might require the ISR to issue an interrupt status READ
+ * after its IRQ is cleared, but before its corresponding interrupt
+ * is enabled again.<span style="background-color: #FF0000"> </span>
+ *<span style="background-color: #FF0000"> </span>
+ */
</font> /* BSP specific address space configuration parameters */
/*<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -11,6 +26,10 @@
</font> * layout:
*/
#define _VME_A32_WIN0_ON_PCI 0x90000000
<font color='#000088'>+/* If _VME_CSR_ON_PCI is defined then the A32 window is reduced to accommodate
+ * CSR for space.
+ */
+#define _VME_CSR_ON_PCI 0x9e000000
</font> #define _VME_A24_ON_PCI 0x9f000000
#define _VME_A16_ON_PCI 0x9fff0000
<font color='#997700'>@@ -30,7 +49,12 @@
</font>
#define BSP_VME_UNIVERSE_INSTALL_IRQ_MGR(err) \
do { \
<font color='#880000'>- err = vmeUniverseInstallIrqMgr(0,64+12,1,64+13); \
</font><font color='#000088'>+ err = vmeUniverseInstallIrqMgrAlt(VMEUNIVERSE_IRQ_MGR_FLAG_SHARED,\
+ 0, BSP_GPP_VME_VLINT0, \<span style="background-color: #FF0000"> </span>
+ 1, BSP_GPP_VME_VLINT1, \<span style="background-color: #FF0000"> </span>
+ 2, BSP_GPP_VME_VLINT2, \<span style="background-color: #FF0000"> </span>
+ 3, BSP_GPP_VME_VLINT3, \
+ -1 /* terminate list */); \<span style="background-color: #FF0000"> </span>
</font> } while (0)
#endif
</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>