diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2006-12-13 20:48:37 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2006-12-13 20:48:37 +0000 |
| commit | 93cd2c6efe205900a660cfaec9932f64b8ec04a8 (patch) | |
| tree | 01ddf5082dc5238b00a6df66f94ad81990b9a900 /c | |
| parent | * vmeUniverse/vme_am_defs.h: Added address modifiers for 2eVME. Added (diff) | |
| download | rtems-93cd2c6efe205900a660cfaec9932f64b8ec04a8.tar.bz2 | |
2006-12-13 Till Straumann <strauman@slac.stanford.edu>
* shared/vme/vmeconfig.c, shared/vme/vme_universe.c:
use symbolic flag instead of numerical value
(vmeUniverseInstallIrqMgrAlt()). Define __INSIDE_RTEMS_BSP__
before including <bsp/vmeUniverse.h>
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 549fffda33..7982b4767e 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2006-12-13 Till Straumann <strauman@slac.stanford.edu> + + * shared/vme/vmeconfig.c, shared/vme/vme_universe.c: + use symbolic flag instead of numerical value + (vmeUniverseInstallIrqMgrAlt()). Define __INSIDE_RTEMS_BSP__ + before including <bsp/vmeUniverse.h> + 2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: New BUG-REPORT address. diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h index 4633f806e1..4da214b138 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h +++ b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h @@ -81,7 +81,7 @@ const struct _int_map *bspmap; \ } \ pins[4] = -1; \ if ( 0 == vmeUniverseInstallIrqMgrAlt( \ - 1, /* shared IRQs */ \ + VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* shared IRQs */\ pins[0], names[0], \ pins[1], names[1], \ pins[2], names[2], \ @@ -94,7 +94,10 @@ const struct _int_map *bspmap; \ } \ } \ if ( i >= 0 ) \ - vmeUniverseInstallIrqMgrAlt(1,0,-1,-1); \ + vmeUniverseInstallIrqMgrAlt( \ + VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, \ + 0,-1, \ + -1); \ } \ } while (0) diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c index 6a91f99d66..34ea7ebf52 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c +++ b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c @@ -5,6 +5,7 @@ #include <bsp/VME.h> #include <bsp/VMEConfig.h> #include <bsp/irq.h> +#define __INSIDE_RTEMS_BSP__ #include <bsp/vmeUniverse.h> /* Wrap BSP VME calls around driver calls - we do this so EPICS doesn't have to @@ -110,7 +111,7 @@ int BSP_VMEIrqMgrInstall() #ifndef BSP_VME_UNIVERSE_INSTALL_IRQ_MGR /* No map; use first line only and obtain PIC wire from PCI config */ vmeUniverseInstallIrqMgrAlt( - 1, /* use shared IRQs */ + VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* use shared IRQs */ 0, -1, /* Universe pin0 -> PIC line from config space */ -1 /* terminate list */ ); |