From 008c4b5ef9aba2c048fa982f6ef162b85ff217fb Mon Sep 17 00:00:00 2001 From: Eric Norum Date: Sat, 12 Feb 2005 22:26:37 +0000 Subject: [PATCH] Rearrange devLib address spaces. --- c/src/lib/libbsp/m68k/uC5282/README | 4 ++-- c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c/src/lib/libbsp/m68k/uC5282/README b/c/src/lib/libbsp/m68k/uC5282/README index 6b5bf47f1e..b29fc00669 100644 --- a/c/src/lib/libbsp/m68k/uC5282/README +++ b/c/src/lib/libbsp/m68k/uC5282/README @@ -134,8 +134,8 @@ CMDLINE - Path to startup script (epics/iocBoot/iocNobody/st.cmd). . . | | 2FFF FFFF +--------------------------------------------------+ -3000 0000 | CS1* space (First 'VME' A24/D16 space) | 30FF FFFF -3100 0000 | CS2* space (Second 'VME' A24/D16 space) | 31FF FFFF +3000 0000 | CS1* (devLib 'VME' A24 space) | 30FF FFFF +3100 0000 | CS2* (devLib 'VME' A32 and A16 space) | 31FF FFFF . . . . . . diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 62ea8c96d1..e018443195 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -442,9 +442,9 @@ BSP_vme2local_adrs(unsigned am, unsigned long vmeaddr, unsigned long *plocaladdr switch (am) { default: return -1; - case VME_AM_SUP_SHORT_IO: offset = 0x31000000; break; /* A16/D16 */ + case VME_AM_SUP_SHORT_IO: offset = 0x31FF0000; break; /* A16/D16 */ case VME_AM_STD_SUP_DATA: offset = 0x30000000; break; /* A24/D16 */ - case VME_AM_EXT_SUP_DATA: return -1; /* A32/D32 */ + case VME_AM_EXT_SUP_DATA: offset = 0x31000000; break; /* A32/D32 */ } *plocaladdr = vmeaddr + offset; return 0;