Changeset abe87b9 in rtems

Timestamp:

04/11/12 09:20:48 (12 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Children:

0c9173d

Parents:

73839e9a (diff), 7afcb26 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream'

File:

• c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c (modified) (3 diffs)

c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c

@@ -48 +48 @@
       iobar = amba_ahb_get_membar(amba_conf.ahbslv, i, 0);
       base_addr = amba_iobar_start(LEON3_IO_AREA, iobar);
-      eth_irq = amba_irq(conf) + 0x10;
+      eth_irq = amba_irq(conf);
       device_found = 1;
       break;
@@ -62 +62 @@
     *(volatile int *) base_addr = 0;
     leon_open_eth_configuration.base_address = base_addr;
-    leon_open_eth_configuration.vector = eth_irq;
+    leon_open_eth_configuration.vector = eth_irq + 0x10;
     leon_open_eth_configuration.txd_count = TDA_COUNT;
     leon_open_eth_configuration.rxd_count = RDA_COUNT;
@@ -68 +68 @@
     if (LEON3_Timer_Regs->scaler_reload >= 49) leon_open_eth_configuration.en100MHz = 1;
     if (rtems_open_eth_driver_attach( config, &leon_open_eth_configuration )) {
-      LEON_Clear_interrupt(leon_open_eth_configuration.vector);
-      LEON_Unmask_interrupt(leon_open_eth_configuration.vector);
+      LEON_Clear_interrupt(eth_irq);
+      LEON_Unmask_interrupt(eth_irq);
     }
   }