diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:39:42 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:39:42 +0000 |
| commit | 47b29ac00eff0280c1e65dfa5125587a3d102bc6 (patch) | |
| tree | 0a45e75785bb571bf68a7096751c9853f79f9b76 /c | |
| parent | 2007-09-12 Daniel Hellstrom <daniel@gaisler.com> (diff) | |
| download | rtems-47b29ac00eff0280c1e65dfa5125587a3d102bc6.tar.bz2 | |
2007-09-12 Daniel Hellstrom <daniel@gaisler.com>
* leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO
Interrupt initialization fix and speed rate defaulted to 100Mbit/s
for boards with 50MHz system clock or greater now all defaults to
100Mbit/s
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index 9cc842a6e5..948f80b215 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,10 @@ +2007-09-12 Daniel Hellstrom <daniel@gaisler.com> + + * leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO + Interrupt initialization fix and speed rate defaulted to 100Mbit/s + for boards with 50MHz system clock or greater now all defaults to + 100Mbit/s + 2007-09-07 Daniel Hellstrom <daniel@gaisler.com> * leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings. diff --git a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c index aa744a2f2c..abb35cee93 100644 --- a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c +++ b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c @@ -33,7 +33,7 @@ scmv91111_configuration_t leon_scmv91111_configuration = { SMC91111_BASE_ADDR, /* base address */ SMC91111_BASE_IRQ, /* vector number */ SMC91111_BASE_PIO, /* PIO */ - 10, /* 10b */ + 100, /* 100b */ 1, /* fulldx */ 1 /* autoneg */ }; @@ -49,16 +49,13 @@ int _rtems_smc91111_driver_attach( int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config) { - if (LEON_REG.Scaler_Reload >= 49) - leon_scmv91111_configuration.ctl_rspeed = 100; - /* activate io area */ printk("Activating Leon2 io port\n"); /*configure pio */ *((volatile unsigned int *)0x80000000) |= 0x10f80000; *((volatile unsigned int *)0x800000A8) |= - (0xe0 | leon_scmv91111_configuration.vector) - << (8 * (leon_scmv91111_configuration.pio - 4)); + (0xe0 | leon_scmv91111_configuration.pio) + << (8 * ((leon_scmv91111_configuration.vector & 0x0f) - 4)); return _rtems_smc91111_driver_attach(config,&leon_scmv91111_configuration); |