change log for rtems (2010-05-03)
rtems-vc at rtems.org
rtems-vc at rtems.org
Mon May 3 15:10:37 UTC 2010
*sh*:
2010-05-03 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtl8019/rtl8019.c: Fixed interrupt handler.
M 1.24 c/src/lib/libbsp/arm/gumstix/ChangeLog
M 1.5 c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c
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
@@ -1,3 +1,7 @@
+2010-05-03 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * rtl8019/rtl8019.c: Fixed interrupt handler.
+
2010-04-30 Sebastian Huber <sebastian.huber at embedded-brains.de>
* Makefile.am, preinstall.am: Added generic interrupt support modules.
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
@@ -191,7 +191,7 @@
/* Forward declarations to avoid warnings */
-static void ne_init_irq_handler (int irno);
+static void ne_init_irq_handler (struct ne_softc *sc);
static void ne_stop (struct ne_softc *sc);
static void ne_stop_hardware (struct ne_softc *sc);
static void ne_init (void *arg);
@@ -202,24 +202,6 @@
static void ne_dump(struct ne_softc *sc);
#endif
-/* 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;
-}
-
/* Read data from an NE2000 device. Read LEN bytes at ADDR, storing
them into P. */
@@ -372,12 +354,11 @@
static void
ne_interrupt_on (const rtems_irq_connect_data *irq)
{
- struct ne_softc *sc;
+ struct ne_softc *sc = irq->handle;
#ifdef DEBUG_NE
printk ("ne_interrupt_on()\n");
#endif
- sc = ne_device_for_irno (irq->name);
if (sc != NULL)
outport_byte (sc->port + IMR, NE_INTERRUPTS);
}
@@ -387,12 +368,11 @@
static void
ne_interrupt_off (const rtems_irq_connect_data *irq)
{
- struct ne_softc *sc;
+ struct ne_softc *sc = irq->handle;
#ifdef DEBUG_NE
printk ("ne_interrupt_off()\n");
#endif
- sc = ne_device_for_irno (irq->name);
if (sc != NULL)
outport_byte (sc->port + IMR, 0);
}
@@ -404,12 +384,11 @@
static int
ne_interrupt_is_on (const rtems_irq_connect_data *irq)
{
- struct ne_softc *sc;
+ struct ne_softc *sc = irq->handle;
unsigned char imr;
#ifdef DEBUG_NE
printk("ne_interrupt_is_on()\n");
#endif
- sc = ne_device_for_irno(irq->name);
if(sc != NULL){
/*Read IMR in Page2*/
outport_byte (sc->port + CMDR, MSK_PG2 | MSK_RD2 | MSK_STP);
@@ -500,12 +479,12 @@
/* Set up interrupts.
*/
static void
-ne_init_irq_handler(ne_softc *sc)
+ne_init_irq_handler(struct ne_softc *sc)
{
rtems_irq_connect_data irq;
#ifdef DEBUG_NE
- printk("ne_init_irq_handler(%d)\n", irno);
+ printk("ne_init_irq_handler(%d)\n", sc->irno);
#endif
irq.name = sc->irno;
irq.hdl = ne_interrupt_handler;
--
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/20100503/5731aa51/attachment.html>
More information about the vc
mailing list