<!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-03)</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>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-03 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtl8019/rtl8019.c: Fixed interrupt handler.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/arm/gumstix/ChangeLog.diff?r1=text&tr1=1.23&r2=text&tr2=1.24&diff_format=h">M</a></td><td width='1%'>1.24</td><td width='100%'>c/src/lib/libbsp/arm/gumstix/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.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/arm/gumstix/rtl8019/rtl8019.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/arm/gumstix/ChangeLog:1.23 rtems/c/src/lib/libbsp/arm/gumstix/ChangeLog:1.24
--- rtems/c/src/lib/libbsp/arm/gumstix/ChangeLog:1.23 Fri Apr 30 09:27:24 2010
+++ rtems/c/src/lib/libbsp/arm/gumstix/ChangeLog Mon May 3 09:49:57 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-05-03 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * rtl8019/rtl8019.c: Fixed interrupt handler.
+
</font> 2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* Makefile.am, preinstall.am: Added generic interrupt support modules.
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c:1.4 rtems/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c:1.5
--- rtems/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c:1.4 Fri Apr 30 09:27:24 2010
+++ rtems/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c Mon May 3 09:49:57 2010
</font><font color='#997700'>@@ -191,7 +191,7 @@
</font>
/* Forward declarations to avoid warnings */
<font color='#880000'>-static void ne_init_irq_handler (int irno);
</font><font color='#000088'>+static void ne_init_irq_handler (struct ne_softc *sc);
</font> static void ne_stop (struct ne_softc *sc);
static void ne_stop_hardware (struct ne_softc *sc);
static void ne_init (void *arg);
<font color='#997700'>@@ -202,24 +202,6 @@
</font> static void ne_dump(struct ne_softc *sc);
#endif
<font color='#880000'>-/* Find the NE2000 device which is attached at a particular interrupt
- vector. */
-
-static struct ne_softc *
-ne_device_for_irno (int irno)
-{
- int i;
-
- for (i = 0; i < NNEDRIVER; ++i)
- {
- if (ne_softc[i].irno == irno
- && ne_softc[i].arpcom.ac_if.if_softc != NULL)
- return &ne_softc[i];
- }
-
- return NULL;
-}
-
</font> /* Read data from an NE2000 device. Read LEN bytes at ADDR, storing
them into P. */
<font color='#997700'>@@ -372,12 +354,11 @@
</font> static void
ne_interrupt_on (const rtems_irq_connect_data *irq)
{
<font color='#880000'>- struct ne_softc *sc;
</font><font color='#000088'>+ struct ne_softc *sc = irq->handle;
</font>
#ifdef DEBUG_NE
printk ("ne_interrupt_on()\n");
#endif
<font color='#880000'>- sc = ne_device_for_irno (irq->name);
</font> if (sc != NULL)
outport_byte (sc->port + IMR, NE_INTERRUPTS);
}
<font color='#997700'>@@ -387,12 +368,11 @@
</font> static void
ne_interrupt_off (const rtems_irq_connect_data *irq)
{
<font color='#880000'>- struct ne_softc *sc;
</font><font color='#000088'>+ struct ne_softc *sc = irq->handle;
</font>
#ifdef DEBUG_NE
printk ("ne_interrupt_off()\n");
#endif
<font color='#880000'>- sc = ne_device_for_irno (irq->name);
</font> if (sc != NULL)
outport_byte (sc->port + IMR, 0);
}
<font color='#997700'>@@ -404,12 +384,11 @@
</font> static int
ne_interrupt_is_on (const rtems_irq_connect_data *irq)
{
<font color='#880000'>- struct ne_softc *sc;
</font><font color='#000088'>+ struct ne_softc *sc = irq->handle;
</font> unsigned char imr;
#ifdef DEBUG_NE
printk("ne_interrupt_is_on()\n");
#endif
<font color='#880000'>- sc = ne_device_for_irno(irq->name);
</font> if(sc != NULL){
/*Read IMR in Page2*/
outport_byte (sc->port + CMDR, MSK_PG2 | MSK_RD2 | MSK_STP);
<font color='#997700'>@@ -500,12 +479,12 @@
</font> /* Set up interrupts.
*/
static void
<font color='#880000'>-ne_init_irq_handler(ne_softc *sc)
</font><font color='#000088'>+ne_init_irq_handler(struct ne_softc *sc)
</font> {
rtems_irq_connect_data irq;
#ifdef DEBUG_NE
<font color='#880000'>- printk("ne_init_irq_handler(%d)\n", irno);
</font><font color='#000088'>+ printk("ne_init_irq_handler(%d)\n", sc->irno);
</font> #endif
irq.name = sc->irno;
irq.hdl = ne_interrupt_handler;
</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>