Changeset abe87b9 in rtems


Ignore:
Timestamp:
Apr 11, 2012, 9:20:48 AM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c

    r73839e9a rabe87b9  
    4848      iobar = amba_ahb_get_membar(amba_conf.ahbslv, i, 0);
    4949      base_addr = amba_iobar_start(LEON3_IO_AREA, iobar);
    50       eth_irq = amba_irq(conf) + 0x10;
     50      eth_irq = amba_irq(conf);
    5151      device_found = 1;
    5252      break;
     
    6262    *(volatile int *) base_addr = 0;
    6363    leon_open_eth_configuration.base_address = base_addr;
    64     leon_open_eth_configuration.vector = eth_irq;
     64    leon_open_eth_configuration.vector = eth_irq + 0x10;
    6565    leon_open_eth_configuration.txd_count = TDA_COUNT;
    6666    leon_open_eth_configuration.rxd_count = RDA_COUNT;
     
    6868    if (LEON3_Timer_Regs->scaler_reload >= 49) leon_open_eth_configuration.en100MHz = 1;
    6969    if (rtems_open_eth_driver_attach( config, &leon_open_eth_configuration )) {
    70       LEON_Clear_interrupt(leon_open_eth_configuration.vector);
    71       LEON_Unmask_interrupt(leon_open_eth_configuration.vector);
     70      LEON_Clear_interrupt(eth_irq);
     71      LEON_Unmask_interrupt(eth_irq);
    7272    }
    7373  }
Note: See TracChangeset for help on using the changeset viewer.