mmio: vxWorks m68k use default, add weak symbols for old versions
This commit is contained in:
@@ -120,6 +120,8 @@ Com_SRCS += osdMessageQueue.c
|
||||
Com_SRCS += devLibVME.c
|
||||
Com_SRCS += devLibVMEOSD.c
|
||||
|
||||
Com_SRCS_vxWorks += epicsMMIO.c
|
||||
|
||||
Com_SRCS_vxWorks += atReboot.cpp
|
||||
|
||||
# For old vxWorks applications
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
/*************************************************************************\
|
||||
* Copyright (c) 2014 Brookhaven Science Associates, as Operator of
|
||||
* Brookhaven National Laboratory.
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/*
|
||||
* Author: Michael Davidsaver <mdavidsaver@bnl.gov>
|
||||
*/
|
||||
|
||||
#ifndef __m68k__
|
||||
|
||||
#include "epicsMMIODef.h"
|
||||
|
||||
epicsUInt16 sysIn16 (volatile void*) __attribute__((weak));
|
||||
epicsUInt32 sysIn32 (volatile void*) __attribute__((weak));
|
||||
void sysOut16 (volatile void*, epicsUInt16) __attribute__((weak));
|
||||
void sysOut32 (volatile void*, epicsUInt32) __attribute__((weak));
|
||||
|
||||
epicsUInt16 sysIn16 (volatile void* addr)
|
||||
{
|
||||
return nat_read16(addr);
|
||||
}
|
||||
|
||||
epicsUInt32 sysIn32 (volatile void* addr)
|
||||
{
|
||||
return nat_read32(addr);
|
||||
}
|
||||
|
||||
void sysOut16 (volatile void* addr, epicsUInt16 val)
|
||||
{
|
||||
nat_write16(addr, val);
|
||||
}
|
||||
|
||||
void sysOut32 (volatile void* addr, epicsUInt32 val)
|
||||
{
|
||||
nat_write32(addr, val);
|
||||
}
|
||||
|
||||
#endif /* m68k */
|
||||
@@ -15,6 +15,10 @@
|
||||
* Author: Michael Davidsaver <mdavidsaver@bnl.gov>
|
||||
*/
|
||||
|
||||
#ifdef __m68k__
|
||||
#include "epicsMMIODef.h"
|
||||
#else
|
||||
|
||||
#ifndef EPICSMMIO_H
|
||||
#define EPICSMMIO_H
|
||||
|
||||
@@ -125,3 +129,4 @@ void sysOut32 (volatile void*, epicsUInt32); /* Synchronous 32 bit w
|
||||
#define rwbarr() VX_MEM_BARRIER_RW()
|
||||
|
||||
#endif /* EPICSMMIO_H */
|
||||
#endif /* m68k */
|
||||
|
||||
Reference in New Issue
Block a user