diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-24 16:58:41 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-24 16:58:41 +0000 |
| commit | cadb5d1641059adb5bbef5900e2cefee653f2b74 (patch) | |
| tree | 6353a9fe2f02c1b89b69e6cf55eef27d24710ce7 /c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c | |
| parent | 2006-04-24 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-cadb5d1641059adb5bbef5900e2cefee653f2b74.tar.bz2 | |
2006-04-24 Jiri Gaisler <jiri@gaisler.com>
Edvin Catovic <edvin@gaisler.com>
PR bsps/972
* ChangeLog, Makefile.am, configure.ac, amba/amba.c, clock/ckinit.c,
console/Makefile.am, console/console.c, console/debugputs.c,
include/Makefile.am, include/amba.h, include/bsp.h, include/leon.h,
leon_smc91111/leon_smc91111.c, startup/bspstart.c, timer/timer.c,
tools/Makefile.am, wrapup/Makefile.am: Added Shared Memory Support
Driver. Added Leon Gaisler Research Ethernet support. Enhanced AMBA
bus support.
* console/debugprintf.c, console/spacewire.c, include/spacewire.h,
leon_greth/.cvsignore, leon_greth/Makefile.am,
leon_greth/leon_greth.c, shmsupp/.cvsignore, shmsupp/Makefile.am,
shmsupp/addrconv.c, shmsupp/getcfg.c, shmsupp/lock.c,
shmsupp/mpisr.c: New files.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c index a0ffd52186..6ba5d4ba35 100644 --- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c +++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c @@ -15,7 +15,7 @@ scmv91111_configuration_t leon_scmv91111_configuration = { SMC91111_BASE_ADDR, /* base address */ LEON_TRAP_TYPE(SMC91111_BASE_IRQ), /* vector number */ SMC91111_BASE_PIO, /* PIO */ - 10, /* 10b */ + 100, /* 100b */ 1, /* fulldx */ 1 /* autoneg */ }; @@ -37,7 +37,7 @@ int rtems_smc91111_driver_attach_leon3 ( { unsigned long irq_pio, irq_mctrl, addr_pio = 0; - unsigned long addr_mctrl = 0, addr_timer = 0; + unsigned long addr_mctrl = 0; i = 0; while (i < amba_conf.apbslv.devnr) @@ -57,24 +57,13 @@ int rtems_smc91111_driver_attach_leon3 ( iobar = amba_apb_get_membar(amba_conf.apbslv, i); addr_mctrl = (unsigned long) amba_iobar_start(amba_conf.apbmst, iobar); } - else if ((amba_vendor(conf) == VENDOR_GAISLER) && - (amba_device(conf) == GAISLER_GPTIMER)) - { - iobar = amba_apb_get_membar(amba_conf.apbslv, i); - addr_timer = (unsigned long) amba_iobar_start(amba_conf.apbmst, iobar); - } i++; } - if (addr_timer) { - LEON3_Timer_Regs_Map *timer = (LEON3_Timer_Regs_Map *)addr_timer; - if (timer->scaler_reload >= 49) - leon_scmv91111_configuration.ctl_rspeed = 100; - } - if (addr_pio && addr_mctrl) { LEON3_IOPORT_Regs_Map *io = (LEON3_IOPORT_Regs_Map *) addr_pio; + /* { char buf[1024]; @@ -84,6 +73,7 @@ int rtems_smc91111_driver_attach_leon3 ( (unsigned int)addr_mctrl); DEBUG_puts(buf); } + */ *((volatile unsigned int *)addr_mctrl) |= 0x10f80000; /*mctrl ctrl 1 */ io->irqmask |= (1 << leon_scmv91111_configuration.pio); |