diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2012-04-05 10:23:16 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-04-06 11:38:25 -0500 |
| commit | 0f04edd9ccf392f03548defe2e1db05592025a94 (patch) | |
| tree | e018c7644ba331cf6819fb0400ec414ce308e0c4 /c/src/lib/libbsp | |
| parent | LEON3 - Fix spacing (diff) | |
| download | rtems-0f04edd9ccf392f03548defe2e1db05592025a94.tar.bz2 | |
SMC91111: updated to use shared IRQ service
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Diffstat (limited to 'c/src/lib/libbsp')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c | 4 |
2 files changed, 6 insertions, 8 deletions
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 47b4d7a413..b459edd7b8 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 @@ -26,12 +26,12 @@ #define SMC91111_BASE_ADDR (void*)0x20000300 -#define SMC91111_BASE_IRQ LEON_TRAP_TYPE(4) +#define SMC91111_BASE_IRQ 4 #define SMC91111_BASE_PIO 4 scmv91111_configuration_t leon_scmv91111_configuration = { SMC91111_BASE_ADDR, /* base address */ - SMC91111_BASE_IRQ, /* vector number */ + SMC91111_BASE_IRQ, /* IRQ number (on LEON vector is irq) */ SMC91111_BASE_PIO, /* PIO */ 100, /* 100b */ 1, /* fulldx */ @@ -55,9 +55,7 @@ int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config) *((volatile unsigned int *)0x80000000) |= 0x10f80000; *((volatile unsigned int *)0x800000A8) |= (0xe0 | leon_scmv91111_configuration.pio) - << (8 * ((leon_scmv91111_configuration.vector & 0x0f) - 4)); + << (8 * (leon_scmv91111_configuration.vector - 4)); /* vector = irq-no */ return _rtems_smc91111_driver_attach(config,&leon_scmv91111_configuration); - -}; - +} 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 5ebdc12cfc..841c4b6651 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 @@ -13,9 +13,9 @@ scmv91111_configuration_t leon_scmv91111_configuration = { SMC91111_BASE_ADDR, /* base address */ - LEON_TRAP_TYPE (SMC91111_BASE_IRQ), /* vector number */ + SMC91111_BASE_IRQ, /* IRQ number (on LEON vector is irq) */ SMC91111_BASE_PIO, /* PIO */ - 100, /* 100b */ + 100, /* 100b */ 1, /* fulldx */ 1 /* autoneg */ }; |