diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-30 16:48:13 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-30 16:48:13 +0000 |
commit | e3481dcd4f6eef47aa63653cb8071c52ba030250 (patch) | |
tree | 6ae743e7c7abc44012202b3a702ae44f4f3b1ce4 /c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c | |
parent | 2007-11-29 Till Straumann <strauman@slac.stanford.edu> (diff) | |
download | rtems-e3481dcd4f6eef47aa63653cb8071c52ba030250.tar.bz2 |
2007-11-30 Daniel Hellstrom <daniel@gaisler.com>
* shared/can/grcan.c, shared/can/grcan_rasta.c,
shared/include/ambapp.h: GRCAN CAN driver. Fixes Interrupt
enabling/disabling in the driver, interrupt may not be restored
correctly. Implements the baud rate calculation routine. Removed
unnecessary printk. Fixed scanning to support GRCAN and GRHCAN
hardware. Added GRCAN device number to ambapp.h.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c b/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c index 9dd9e55f20..96755547fb 100644 --- a/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c +++ b/c/src/lib/libbsp/sparc/shared/can/grcan_rasta.c @@ -2,7 +2,7 @@ #include <rasta.h> /* PCI frequency */ -#define SYS_FREQ_HZ 33000000 +#define SYS_FREQ_HZ 30000000 /*#define USE_AT697_RAM 1 */ @@ -29,8 +29,9 @@ static inline unsigned int memarea_to_hw(unsigned int addr) { #define IRQ_UNMASK(irqno) #define IRQ_MASK(irqno) -#define IRQ_GLOBAL_DISABLE() sparc_disable_interrupts() -#define IRQ_GLOBAL_ENABLE() sparc_enable_interrupts() +#define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level +#define IRQ_GLOBAL_DISABLE(level) rtems_interrupt_disable(level) +#define IRQ_GLOBAL_ENABLE(level) rtems_interrupt_enable(level) #define GRCAN_REG_INT(handler,irqno,arg) \ if ( grcan_rasta_int_reg ) \ |