RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2006-12-13 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
* 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>
This commit is contained in:
Till Straumann
2006-12-13 20:48:37 +00:00
parent a175c1fb77
commit 93cd2c6efe
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -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> 2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: New BUG-REPORT address. * configure.ac: New BUG-REPORT address.

7
c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
View File

@@ -81,7 +81,7 @@ const struct _int_map *bspmap; \
} \ } \
pins[4] = -1; \ pins[4] = -1; \
if ( 0 == vmeUniverseInstallIrqMgrAlt( \ if ( 0 == vmeUniverseInstallIrqMgrAlt( \
1, /* shared IRQs */ \ VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* shared IRQs */\
pins[0], names[0], \ pins[0], names[0], \
pins[1], names[1], \ pins[1], names[1], \
pins[2], names[2], \ pins[2], names[2], \
@@ -94,7 +94,10 @@ const struct _int_map *bspmap; \
} \ } \
} \ } \
if ( i >= 0 ) \ if ( i >= 0 ) \
vmeUniverseInstallIrqMgrAlt(1,0,-1,-1); \ vmeUniverseInstallIrqMgrAlt( \
VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, \
0,-1, \
-1); \
} \ } \
} while (0) } while (0)

3
c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
View File

@@ -5,6 +5,7 @@
#include <bsp/VME.h> #include <bsp/VME.h>
#include <bsp/VMEConfig.h> #include <bsp/VMEConfig.h>
#include <bsp/irq.h> #include <bsp/irq.h>
#define __INSIDE_RTEMS_BSP__
#include <bsp/vmeUniverse.h> #include <bsp/vmeUniverse.h>
/* Wrap BSP VME calls around driver calls - we do this so EPICS doesn't have to /* 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 #ifndef BSP_VME_UNIVERSE_INSTALL_IRQ_MGR
/* No map; use first line only and obtain PIC wire from PCI config */ /* No map; use first line only and obtain PIC wire from PCI config */
vmeUniverseInstallIrqMgrAlt( vmeUniverseInstallIrqMgrAlt(
1, /* use shared IRQs */ VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* use shared IRQs */
0, -1, /* Universe pin0 -> PIC line from config space */ 0, -1, /* Universe pin0 -> PIC line from config space */
-1 /* terminate list */ -1 /* terminate list */
); );