diff options
author | Ramsey Harris <ramsey@ti.com> | 2015-02-03 10:48:45 -0800 |
---|---|---|
committer | Robert Tivy <rtivy@ti.com> | 2015-02-03 17:51:01 -0800 |
commit | 9472831d28f772206850f0d06a414952256acad0 (patch) | |
tree | b2b754824cd1affdf7d502eb9c9c9163d4e61b20 | |
parent | 0467cb5654722c6ce20b9ca77895ec219be0b0eb (diff) | |
download | ipc-9472831d28f772206850f0d06a414952256acad0.tar.gz |
Fixed QNX build error due to transport header file changes
Updated the location of the transport header files to match
what is expected by MessageQ.h.
-rw-r--r-- | qnx/include/INetworkTransport.h | 63 | ||||
-rw-r--r-- | qnx/include/ti/ipc/interfaces/IMessageQTransport.h (renamed from qnx/include/IMessageQTransport.h) | 35 | ||||
-rw-r--r-- | qnx/include/ti/ipc/interfaces/INetworkTransport.h | 128 | ||||
-rw-r--r-- | qnx/include/ti/ipc/interfaces/ITransport.h (renamed from qnx/include/ITransport.h) | 1 |
4 files changed, 161 insertions, 66 deletions
diff --git a/qnx/include/INetworkTransport.h b/qnx/include/INetworkTransport.h deleted file mode 100644 index 956fc67..0000000 --- a/qnx/include/INetworkTransport.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * ======== INetworkTransport.h ======== - */ - -#ifndef INETWORKTRANSPORT_H -#define INETWORKTRANSPORT_H - -#include <ITransport.h> - -/* opaque instance handle */ -typedef struct INetworkTransport_Object *INetworkTransport_Handle; - -#define INetworkTransport_TypeId 0x03 - -/* virtual functions */ -typedef struct INetworkTransport_Fxns { - Int (*bind)(void *handle, UInt32 queueId); - Int (*unbind)(void *handle, UInt32 queueId); - Bool (*put)(void *handle, Ptr msg); -} INetworkTransport_Fxns; - -/* abstract instance object */ -typedef struct INetworkTransport_Object { - ITransport_Object base; /* inheritance */ - INetworkTransport_Fxns *fxns; /* virtual functions */ -} INetworkTransport_Object; - -/* function stubs */ -static inline -Bool INetworkTransport_bind(INetworkTransport_Handle inst, UInt32 queueId) -{ - INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; - return obj->fxns->bind((void *)inst, queueId); -} - -static inline -Bool INetworkTransport_unbind(INetworkTransport_Handle inst, UInt32 queueId) -{ - INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; - return obj->fxns->unbind((void *)inst, queueId); -} - -static inline -Bool INetworkTransport_put(INetworkTransport_Handle inst, Ptr msg) -{ - INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; - return obj->fxns->put((void *)inst, msg); -} - -/* instance convertors */ -ITransport_Handle INetworkTransport_upCast(INetworkTransport_Handle inst) -{ - INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; - return (ITransport_Handle)&obj->base; -} - -INetworkTransport_Handle INetworkTransport_downCast(ITransport_Handle base) -{ - return (INetworkTransport_Handle)base; -} - -#endif /* INETWORKTRANSPORT_H */ - diff --git a/qnx/include/IMessageQTransport.h b/qnx/include/ti/ipc/interfaces/IMessageQTransport.h index 81cff91..d003c5e 100644 --- a/qnx/include/IMessageQTransport.h +++ b/qnx/include/ti/ipc/interfaces/IMessageQTransport.h @@ -1,11 +1,43 @@ /* + * Copyright (c) 2014-2015 Texas Instruments Incorporated - http://www.ti.com + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of Texas Instruments Incorporated nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* * ======== IMessageQTransport.h ======== */ #ifndef IMESSAGEQTRANSPORT_H #define IMESSAGEQTRANSPORT_H -#include <ITransport.h> +#include <ti/ipc/interfaces/ITransport.h> /* opaque instance handle */ typedef struct IMessageQTransport_Object *IMessageQTransport_Handle; @@ -62,4 +94,3 @@ IMessageQTransport_Handle IMessageQTransport_downCast(ITransport_Handle base) } #endif /* IMESSAGEQTRANSPORT_H */ - diff --git a/qnx/include/ti/ipc/interfaces/INetworkTransport.h b/qnx/include/ti/ipc/interfaces/INetworkTransport.h new file mode 100644 index 0000000..7834032 --- /dev/null +++ b/qnx/include/ti/ipc/interfaces/INetworkTransport.h @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2014-2015 Texas Instruments Incorporated - http://www.ti.com + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of Texas Instruments Incorporated nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * ======== INetworkTransport.h ======== + */ + +#ifndef INETWORKTRANSPORT_H +#define INETWORKTRANSPORT_H + +#include <ti/ipc/interfaces/ITransport.h> + + +/* + * ======== INetworkTransport_Handle ======== + * Opaque handle to interface instance object + */ +typedef struct INetworkTransport_Object *INetworkTransport_Handle; + +/* + * ======== INetworkTransport_TypeId ======== + * Unique identifier for this interface + */ +#define INetworkTransport_TypeId 0x03 + +/* + * ======== INetworkTransport_Fxns ======== + * Interface virtual function table + */ +typedef struct INetworkTransport_Fxns { + Int (*bind)(void *handle, UInt32 queueId); + Int (*unbind)(void *handle, UInt32 queueId); + Bool (*put)(void *handle, Ptr msg); +} INetworkTransport_Fxns; + +/* + * ======== INetworkTransport_Object ======== + * Abstract instance object + */ +typedef struct INetworkTransport_Object { + ITransport_Object base; /* inheritance */ + INetworkTransport_Fxns *fxns; /* virtual functions */ +} INetworkTransport_Object; + +/* + * ======== INetworkTransport_bind ======== + * Instance function stub + */ +static inline +Bool INetworkTransport_bind(INetworkTransport_Handle inst, UInt32 queueId) +{ + INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; + return (obj->fxns->bind((void *)inst, queueId)); +} + +/* + * ======== INetworkTransport_unbind ======== + * Instance function stub + */ +static inline +Bool INetworkTransport_unbind(INetworkTransport_Handle inst, UInt32 queueId) +{ + INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; + return (obj->fxns->unbind((void *)inst, queueId)); +} + +/* + * ======== INetworkTransport_put ======== + * Instance function stub + */ +static inline +Bool INetworkTransport_put(INetworkTransport_Handle inst, Ptr msg) +{ + INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; + return (obj->fxns->put((void *)inst, msg)); +} + +/* + * ======== INetworkTransport_upCast ======== + * Instance converter + */ +static inline +ITransport_Handle INetworkTransport_upCast(INetworkTransport_Handle inst) +{ + INetworkTransport_Object *obj = (INetworkTransport_Object *)inst; + return ((ITransport_Handle)&obj->base); +} + +/* + * ======== INetworkTransport_downCast ======== + * Instance converter + */ +static inline +INetworkTransport_Handle INetworkTransport_downCast(ITransport_Handle base) +{ + return ((INetworkTransport_Handle)base); +} + +#endif /* INETWORKTRANSPORT_H */ diff --git a/qnx/include/ITransport.h b/qnx/include/ti/ipc/interfaces/ITransport.h index 4287242..1ffa705 100644 --- a/qnx/include/ITransport.h +++ b/qnx/include/ti/ipc/interfaces/ITransport.h @@ -24,4 +24,3 @@ Int ITransport_itype(ITransport_Handle inst) } #endif /* ITRANSPORT_H */ - |