osaf/libs/common/edsv/include/eda.h     |    1 -
 osaf/libs/common/edsv/include/eds.h     |    1 -
 osaf/libs/core/common/saf_edu.c         |    1 -
 osaf/libs/core/include/Makefile.am      |    1 -
 osaf/libs/core/include/ncs_stack_pub.h  |  156 ------------
 osaf/libs/core/leap/Makefile.am         |    1 -
 osaf/libs/core/leap/hj_edp.c            |    1 -
 osaf/libs/core/leap/hj_edu.c            |    1 -
 osaf/libs/core/leap/hj_stack.c          |  483 
-------------------------------------
 osaf/libs/core/leap/include/Makefile.am |    1 -
 osaf/libs/core/leap/include/ncs_stack.h |   92 -------
 osaf/libs/core/leap/sysf_mem.c          |    5 -
 osaf/libs/core/mbcsv/include/mbcsv.h    |    1 -
 13 files changed, 0 insertions(+), 745 deletions(-)


diff --git a/osaf/libs/common/edsv/include/eda.h 
b/osaf/libs/common/edsv/include/eda.h
--- a/osaf/libs/common/edsv/include/eda.h
+++ b/osaf/libs/common/edsv/include/eda.h
@@ -25,7 +25,6 @@
 #include "ncsft.h"
 #include "ncs_ubaid.h"
 #include "ncsencdec_pub.h"
-#include "ncs_stack.h"
 #include "ncs_lib.h"
 
 #include "mds_papi.h"
diff --git a/osaf/libs/common/edsv/include/eds.h 
b/osaf/libs/common/edsv/include/eds.h
--- a/osaf/libs/common/edsv/include/eds.h
+++ b/osaf/libs/common/edsv/include/eds.h
@@ -26,7 +26,6 @@
 #include "ncsft.h"
 #include "ncs_ubaid.h"
 #include "ncsencdec_pub.h"
-#include "ncs_stack.h"
 #include "ncs_lib.h"
 
 /* From targsvcs/common/inc */
diff --git a/osaf/libs/core/common/saf_edu.c b/osaf/libs/core/common/saf_edu.c
--- a/osaf/libs/core/common/saf_edu.c
+++ b/osaf/libs/core/common/saf_edu.c
@@ -31,7 +31,6 @@
 #include <ncsgl_defs.h>
 
 #include "patricia.h"
-#include "ncs_stack.h"
 #include "ncsencdec_pub.h"
 
 #include "saAis.h"
diff --git a/osaf/libs/core/include/Makefile.am 
b/osaf/libs/core/include/Makefile.am
--- a/osaf/libs/core/include/Makefile.am
+++ b/osaf/libs/core/include/Makefile.am
@@ -37,7 +37,6 @@ noinst_HEADERS = \
        ncs_queue.h \
        ncs_saf.h \
        ncs_sprr_papi.h \
-       ncs_stack_pub.h \
        ncs_svd.h \
        ncssysf_def.h \
        ncssysf_ipc.h \
diff --git a/osaf/libs/core/include/ncs_stack_pub.h 
b/osaf/libs/core/include/ncs_stack_pub.h
deleted file mode 100644
--- a/osaf/libs/core/include/ncs_stack_pub.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*      -*- OpenSAF  -*-
- *
- * (C) Copyright 2008 The OpenSAF Foundation
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
- * under the GNU Lesser General Public License Version 2.1, February 1999.
- * The complete license can be accessed from the following location:
- * http://opensource.org/licenses/lgpl-license.php
- * See the Copying file included with the OpenSAF distribution for full
- * licensing terms.
- *
- * Author(s): Emerson Network Power
- *
- */
-
-/*****************************************************************************
-..............................................................................
-
-  
-
-..............................................................................
-
-  DESCRIPTION:
- 
-
-******************************************************************************
-*/
-
-/*
- * Module Inclusion Control...
- */
-#ifndef NCS_STACK_PUB_H
-#define NCS_STACK_PUB_H
-
-#include "ncsgl_defs.h"
-#include "ncs_ubaid.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/***************************************************************************
- ***************************************************************************
- *
- *   N e t P l a n e   H J M E M _ A I D
- *
- ***************************************************************************
- ***************************************************************************/
-
-/***************************************************************************
- * ncsmem_aid : this little guy manages an arbitrary hunk of memory. It was
- *             conceived in the context of managing stack space that is to 
- *             be used for multiple ends. 
- *
- *  THE ISSUE SOLVED: The invoker of a service that takes an NCSMEM_AID 
- *                    pointer for an argument can control where that memory
- *                    comes from:
- * 
- *                Stack : if the passed pointer is not NULL, get memory from
- *                        NCSMEM_AID via ncsmem_aid_alloc().
- *                Heap  : if the passed pointer IS NULL, get memory from heap.
- *
- ***************************************************************************/
-/***************************************************************************
- *
- * NOTE: All allocs from NCSMEM_AID are guarenteed to start on 4 byte 
- *       boundaries, aligned with the originally passed 'space' pointer.
- ***************************************************************************/ 
typedef struct ncsmem_aid {
-
-               /* P R I V A T E fields should not be referenced by client      
      */
-
-               uint32_t max_len;       /* start len of passed buffer (HEAP or 
STACK)       */
-               uint8_t *cur_ptr;       /* current place for getting memory     
            */
-               uint8_t *bgn_ptr;       /* original buffer ptr; if from HEAP, 
use to free   */
-
-               /* P U B L I C   inspectable by client; set by NCSMEM_AID 
member funcs */
-
-               uint32_t status;        /* If any alloc fails, mark it          
            */
-
-       } NCSMEM_AID;
-
-/***************************************************************************
- * NCSMEM_AID  public member function prototypes
- ***************************************************************************/
-
-       void ncsmem_aid_init(NCSMEM_AID *ma, uint8_t *space, uint32_t len);
-
-       uint8_t *ncsmem_aid_alloc(NCSMEM_AID *ma, uint32_t size);
-
-       uint8_t *ncsmem_aid_cpy(NCSMEM_AID *ma, const uint8_t *ref, uint32_t 
len);
-
-/***************************************************************************
- ***************************************************************************
- *
- *   N e t P l a n e   H J _ S t a c k
- *
- ***************************************************************************
- ***************************************************************************/
-
-/***************************************************************************
- *
- * P u b l i c   H J _ S t a c k    O b j e c t s
- *
- ***************************************************************************/
-
-/***************************************************************************
- *  NCS_STACK : keeps track of current stack state
- ***************************************************************************/
-
-       typedef struct ncs_stack {
-               uint16_t se_cnt;        /* Number of elements in stack     */
-               uint16_t max_depth;     /* Maximum Depth                   */
-               uint16_t cur_depth;     /* Current Depth                   */
-               uint16_t pad;   /* To 32 bit boundary...           */
-
-       } NCS_STACK;
-
-/***************************************************************************
- *  NCS_SE    : All Stack Elements are preceeded by one of these..
- ***************************************************************************/
-
-       typedef struct ncs_se {
-               uint16_t type;  /* Stack element type              */
-               uint16_t length;        /* lenght of stack element         */
-
-       } NCS_SE;
-
-/***************************************************************************
- *
- *     P u b l i c   H J _ S T A C K   F u n c t i o n s  &  M a c r o s
- *
- ***************************************************************************/
-
-#define m_NCSSTACK_SPACE(se)        ((uint8_t*)((uint8_t*)se + sizeof(NCS_SE)))
-
-       void ncsstack_init(NCS_STACK *st, uint16_t max_size);
-
-       NCS_SE *ncsstack_peek(NCS_STACK *st);
-
-       NCS_SE *ncsstack_push(NCS_STACK *st, uint16_t type, uint16_t size);
-
-       NCS_SE *ncsstack_pop(NCS_STACK *st);
-       uint32_t ncsstack_get_utilization(NCS_STACK *st);
-       uint32_t ncsstack_get_element_count(NCS_STACK *st);
-
-       uint32_t ncsstack_encode(NCS_STACK *st, struct ncs_ubaid *uba);
-
-       uint32_t ncsstack_decode(NCS_STACK *st, struct ncs_ubaid *uba);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif   /* NCS_STACK_PUB_H */
diff --git a/osaf/libs/core/leap/Makefile.am b/osaf/libs/core/leap/Makefile.am
--- a/osaf/libs/core/leap/Makefile.am
+++ b/osaf/libs/core/leap/Makefile.am
@@ -45,7 +45,6 @@ libleap_la_SOURCES = \
        hj_queue.c \
        hj_hdl.c \
        hj_tmr.c \
-       hj_stack.c \
        hj_ubaid.c \
        sysf_exc_scr.c \
        os_defs.c
diff --git a/osaf/libs/core/leap/hj_edp.c b/osaf/libs/core/leap/hj_edp.c
--- a/osaf/libs/core/leap/hj_edp.c
+++ b/osaf/libs/core/leap/hj_edp.c
@@ -29,7 +29,6 @@
 #include <ncsgl_defs.h>
 #include "ncs_osprm.h"
 #include "patricia.h"
-#include "ncs_stack.h"
 #include "ncssysf_mem.h"
 #include "ncsencdec_pub.h"
 #include "ncs_edu.h"
diff --git a/osaf/libs/core/leap/hj_edu.c b/osaf/libs/core/leap/hj_edu.c
--- a/osaf/libs/core/leap/hj_edu.c
+++ b/osaf/libs/core/leap/hj_edu.c
@@ -32,7 +32,6 @@
 #include "ncssysf_mem.h"
 #include "sysf_def.h"
 #include "patricia.h"
-#include "ncs_stack.h"
 #include "ncssysfpool.h"
 #include "ncsencdec_pub.h"
 #include "ncs_edu.h"
diff --git a/osaf/libs/core/leap/hj_stack.c b/osaf/libs/core/leap/hj_stack.c
deleted file mode 100644
--- a/osaf/libs/core/leap/hj_stack.c
+++ /dev/null
@@ -1,483 +0,0 @@
-/*      -*- OpenSAF  -*-
- *
- * (C) Copyright 2008 The OpenSAF Foundation
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
- * under the GNU Lesser General Public License Version 2.1, February 1999.
- * The complete license can be accessed from the following location:
- * http://opensource.org/licenses/lgpl-license.php
- * See the Copying file included with the OpenSAF distribution for full
- * licensing terms.
- *
- * Author(s): Emerson Network Power
- *
- */
-
-/*****************************************************************************
-..............................................................................
-
- 
-..............................................................................
-
-  DESCRIPTION:
-
-  This module contains procedures related to...
-  ncsmem_aid - specialized, simple heap/stack memory manager for limited cases.
-  ncs_stack  - a general scheme to push and pop stack elements from a hunk of
-              contiguous memory.
-
-..............................................................................
-
-  PUBLIC FUNCTIONS INCLUDED in this module:
-
-  ncsmem_aid_init  - put NCSMEM_AID in start state, with a hunk of memory.
-  ncsmem_aid_cpy   - copy data to NCSMEM_AID memory; update internal state
-  ncsmem_aid_alloc - return block of memory; update internal state
-
-  ncsstack_init    - Put NCS_STACK in start state
-  ncsstack_peek    - Fetch next stack element, but don't pop it off stack.
-  ncsstack_push    - Push a new stack element onto the stack
-  ncsstack_pop     - Like 'ppek', but internal state updated
-
-  PRIVATE FUNCTIONS INCLUDED in this module:
-
-  get_top_se      - used by pop & peek to find top stack element.
-
-******************************************************************************/
-
-#include <ncsgl_defs.h>
-#include "ncs_osprm.h"
-#include "ncssysf_def.h"
-#include "ncs_stack.h"
-#include "ncsencdec_pub.h"
-
-/*****************************************************************************
-
-  PROCEDURE NAME:   ncsmem_aid_init
-
-  DESCRIPTION:
-    put the NCSMEM_AID in start state
-
-  RETURNS:
-*****************************************************************************/
-
-void ncsmem_aid_init(NCSMEM_AID *ma, uint8_t *space, uint32_t len)
-{
-       ma->cur_ptr = space;
-       ma->bgn_ptr = space;
-       ma->max_len = len;
-       ma->status = NCSCC_RC_SUCCESS;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:   ncsmem_aid_cpy
-
-  DESCRIPTION:
-    copy stuff to the space overseen by the MEM_AID. Return NULL if it
-    wont fit.
-
-  RETURNS:
-     NULL        - it wont fit
-    PTR         - the ptr of where the copy lives.
-*****************************************************************************/
-
-uint8_t *ncsmem_aid_cpy(NCSMEM_AID *ma, const uint8_t *ref, uint32_t len)
-{
-       uint8_t *answer;
-
-       if ((answer = ncsmem_aid_alloc(ma, len)) != NULL) {
-               memcpy(answer, ref, len);
-               return answer;
-       }
-
-       m_LEAP_DBG_SINK(0);
-       return NULL;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:   ncsmem_aid_alloc
-
-  DESCRIPTION:
-    allocate memory requested from contiguous space. Return NULL if there is
-    not enough. Always allocate on 32 bit boundaries. 
-
-  RETURNS:
-     NULL        - it wont fit
-    PTR         - the ptr of where the copy lives.
-*****************************************************************************/
-
-uint8_t *ncsmem_aid_alloc(NCSMEM_AID *ma, uint32_t size)
-{
-       uint8_t *answer;
-
-       size = size + (size % 4);       /* only allocate on even boundaries */
-       if (ma->max_len > size) {
-               answer = ma->cur_ptr;
-               ma->cur_ptr = ma->cur_ptr + size;
-               ma->max_len = ma->max_len - size;
-               return answer;
-       }
-       ma->status = NCSCC_RC_FAILURE;
-       m_LEAP_DBG_SINK(0);
-       return NULL;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME: get_top_se
-
-  DESCRIPTION:
-  Find the Stack Element on the top of the stack. Do some sanity checking
-  to make sure the stack frames are aligned. Complain if they are not.
-
-  RETURNS:
-     NULL - Trouble
-     PTR  - To a stack frame
-
-*****************************************************************************/
-NCS_SE *get_top_se(NCS_STACK *st)
-{
-       uint16_t *p_size = (uint16_t *)((long)(st) + ((long)(st->cur_depth) - 
(long)(sizeof(uint16_t)) - (long)(sizeof(uint16_t))));
-       uint16_t size = *p_size++;
-
-       if (*p_size != SE_ALIGNMENT_MARKER) {
-               m_LEAP_DBG_SINK(0);
-               return NULL;
-       }
-
-       return (NCS_SE *)((uint8_t *)p_size - ((uint16_t)sizeof(uint16_t) + 
size));
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_init
-
-  DESCRIPTION:
-  Put the ncs_stack into start state.
-  stack.
-
-  RETURNS:
-     NONE
-
-  NOTES:
-     Invoker better know where the stack starts and what the max value is.
-     This function believes whatever its told.
-
-*****************************************************************************/
-
-void ncsstack_init(NCS_STACK *st, uint16_t max_size)
-{
-       st->se_cnt = 0;
-       st->max_depth = max_size;
-       st->cur_depth = sizeof(NCS_STACK);
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_get_utilization
-
-  DESCRIPTION:
-  Fetch the percentage stack utilization
-
-  RETURNS:
-    Number of elements on stack
-
-*****************************************************************************/
-
-uint32_t ncsstack_get_utilization(NCS_STACK *st)
-{
-       if (st->max_depth == 0)
-               return 0;
-
-       return ((st->cur_depth * 100) / (st->max_depth));
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_get_element_count
-
-  DESCRIPTION:
-  Fetch the number of elements currently on the stack
-
-  RETURNS:
-    Number of elements on stack
-
-*****************************************************************************/
-
-uint32_t ncsstack_get_element_count(NCS_STACK *st)
-{
-       return (st->se_cnt);
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_peek
-
-  DESCRIPTION:
-  Fetch the pointer of the top Stack Element in this stack. The first 
-  field is always assumed to be an NCS_SE.
-
-  RETURNS:
-    SUCCESS - fetched the next SE and put it in the passed container.
-    FAILURE - There is no SE to fetch.
-
-*****************************************************************************/
-
-NCS_SE *ncsstack_peek(NCS_STACK *st)
-{
-       if (st->se_cnt == 0)
-               return (NCS_SE *)NULL;
-
-       return get_top_se(st);
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_push
-
-  DESCRIPTION:
-  Push the passed SE on to the stack.
-
-  RETURNS:
-   SUCCESS - Pushed just fine
-   FAILURE - Stack overflow
-
-*****************************************************************************/
-
-NCS_SE *ncsstack_push(NCS_STACK *st, uint16_t type, uint16_t size)
-{
-       NCS_SE *top;
-       uint16_t *len;
-
-       if (st->max_depth <= (st->cur_depth + size + sizeof(uint16_t) + 
sizeof(uint16_t))) {
-               m_LEAP_DBG_SINK(NULL);
-               return NULL;
-       }
-
-       top = (NCS_SE *)((uint8_t *)st + st->cur_depth);
-
-       top->length = size;
-       top->type = type;
-       len = (uint16_t *)((uint8_t *)top + size);
-       *len++ = size;
-       *len = SE_ALIGNMENT_MARKER;
-
-       st->se_cnt++;
-
-       /* add SE size + 16bits of lenght + 16 bits of MARKER  to the cur_depth 
*/
-
-       st->cur_depth = (uint16_t)(st->cur_depth + size + sizeof(uint16_t) + 
sizeof(uint16_t));
-
-       return top;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_pop
-
-  DESCRIPTION:
-     Find the top SE in the stack. Update all the other fields.
-
-  RETURNS:
-     NULL - Can't get the next SE
-     PTR  - Got the next SE just fine.
-
-*****************************************************************************/
-
-NCS_SE *ncsstack_pop(NCS_STACK *st)
-{
-       NCS_SE *se;
-       if ((se = ncsstack_peek(st)) == NULL)
-               return (NCS_SE *)NULL;
-
-       st->se_cnt--;
-       st->cur_depth = (uint16_t)((uint8_t *)se - (uint8_t *)st);
-       return se;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_encode
-
-  DESCRIPTION:
-  Encodes the whole stack.
-
-  RETURNS:
-   NCSCC_RC_SUCCESS - Encoded the stack just fine
-   NCSCC_RC_FAILURE - Could not encode the stack
-
-*****************************************************************************/
-
-uint32_t ncsstack_encode(NCS_STACK *st, struct ncs_ubaid *uba)
-{
-       uint16_t cur_offset;
-       uint16_t cur_count;
-       uint8_t *stream;
-       NCS_SE *top;
-       uint16_t *len;
-
-       if (uba == NULL)
-               return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-       stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-       if (stream == NULL)
-               return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-       ncs_encode_16bit(&stream, st->se_cnt);
-       ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-       stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-       if (stream == NULL)
-               return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-       ncs_encode_16bit(&stream, st->max_depth);
-       ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-       stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-       if (stream == NULL)
-               return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-       ncs_encode_16bit(&stream, st->cur_depth);
-       ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-       cur_count = 0;
-       cur_offset = sizeof(NCS_STACK);
-
-       /* now encode the space */
-       while ((cur_offset < st->cur_depth) && (cur_count < st->se_cnt)) {
-
-               top = (NCS_SE *)((uint8_t *)st + cur_offset);
-
-               /* Need to encode NCS_SE separately,
-                  because the decode will decode them separately.
-                  Do it to prevent any problems with structure member
-                  alignments
-                */
-               stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-               if (stream == NULL)
-                       return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-               ncs_encode_16bit(&stream, top->type);
-               ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-               stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-               if (stream == NULL)
-                       return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-               ncs_encode_16bit(&stream, top->length);
-               ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-               stream = ncs_enc_reserve_space(uba, (top->length - 
sizeof(NCS_SE)));
-               if (stream == NULL)
-                       return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-               memcpy(stream, ((uint8_t *)top + sizeof(NCS_SE)), (top->length 
- sizeof(NCS_SE)));
-               ncs_enc_claim_space(uba, (top->length - sizeof(NCS_SE)));
-
-               len = (uint16_t *)((uint8_t *)top + top->length);
-
-               stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-               if (stream == NULL)
-                       return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-               ncs_encode_16bit(&stream, *len);
-               ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-               len++;
-
-               stream = ncs_enc_reserve_space(uba, sizeof(uint16_t));
-               if (stream == NULL)
-                       return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-               ncs_encode_16bit(&stream, *len);
-               ncs_enc_claim_space(uba, sizeof(uint16_t));
-
-               cur_count++;
-               cur_offset = (uint16_t)(cur_offset + top->length + 
sizeof(uint16_t) + sizeof(uint16_t));
-
-       }
-
-       return NCSCC_RC_SUCCESS;
-}
-
-/*****************************************************************************
-
-  PROCEDURE NAME:    ncsstack_decode
-
-  DESCRIPTION:
-  Decodes the whole stack.
-
-  RETURNS:
-   NCSCC_RC_SUCCESS - Decoded the stack just fine
-   NCSCC_RC_FAILURE - Could not decode the stack
-
-*****************************************************************************/
-
-uint32_t ncsstack_decode(NCS_STACK *st, NCS_UBAID *uba)
-{
-       uint16_t cur_offset;
-       uint16_t cur_count;
-       uint8_t *stream;
-       uint8_t space[128];
-       NCS_SE *top;
-       uint16_t *len;
-
-       if (uba == NULL)
-               return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
-
-       stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-       st->se_cnt = ncs_decode_16bit(&stream);
-       ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-       stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-       st->max_depth = ncs_decode_16bit(&stream);
-       ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-       stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-       st->cur_depth = ncs_decode_16bit(&stream);
-       ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-       cur_count = 0;
-       cur_offset = sizeof(NCS_STACK);
-
-       /* now decode the space */
-       while ((cur_offset < st->cur_depth) && (cur_count < st->se_cnt)) {
-
-               top = (NCS_SE *)((uint8_t *)st + cur_offset);
-
-               stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-               top->type = ncs_decode_16bit(&stream);
-               ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-               stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-               top->length = ncs_decode_16bit(&stream);
-               ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-               stream = ncs_dec_flatten_space(uba, space, (top->length - 
sizeof(NCS_SE)));
-               memcpy(((uint8_t *)top + sizeof(NCS_SE)), stream, (top->length 
- sizeof(NCS_SE)));
-               ncs_dec_skip_space(uba, (top->length - sizeof(NCS_SE)));
-
-               len = (uint16_t *)((uint8_t *)top + top->length);
-
-               stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-               *len = ncs_decode_16bit(&stream);
-               ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-               len++;
-
-               stream = ncs_dec_flatten_space(uba, space, sizeof(uint16_t));
-               *len = ncs_decode_16bit(&stream);
-               ncs_dec_skip_space(uba, sizeof(uint16_t));
-
-               cur_count++;
-               cur_offset = (uint16_t)(cur_offset + top->length + 
sizeof(uint16_t) + sizeof(uint16_t));
-
-       }
-
-       return NCSCC_RC_SUCCESS;
-
-}
diff --git a/osaf/libs/core/leap/include/Makefile.am 
b/osaf/libs/core/leap/include/Makefile.am
--- a/osaf/libs/core/leap/include/Makefile.am
+++ b/osaf/libs/core/leap/include/Makefile.am
@@ -23,7 +23,6 @@ noinst_HEADERS = \
        ncs_edu.h \
        ncsft.h \
        ncs_hdl.h \
-       ncs_stack.h \
        ncs_tasks.h \
        patricia.h \
        sysf_def.h \
diff --git a/osaf/libs/core/leap/include/ncs_stack.h 
b/osaf/libs/core/leap/include/ncs_stack.h
deleted file mode 100644
--- a/osaf/libs/core/leap/include/ncs_stack.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*      -*- OpenSAF  -*-
- *
- * (C) Copyright 2008 The OpenSAF Foundation
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
- * under the GNU Lesser General Public License Version 2.1, February 1999.
- * The complete license can be accessed from the following location:
- * http://opensource.org/licenses/lgpl-license.php
- * See the Copying file included with the OpenSAF distribution for full
- * licensing terms.
- *
- * Author(s): Emerson Network Power
- *
- */
-
-/*****************************************************************************
-..............................................................................
-
-  
-
-..............................................................................
-
-  DESCRIPTION:
- 
-
-******************************************************************************
-*/
-
-/*
- * Module Inclusion Control...
- */
-#ifndef NCS_STACK_H
-#define NCS_STACK_H
-
-#include "ncs_stack_pub.h"
-#include "ncs_svd.h"
-
-/***************************************************************************
- ***************************************************************************
- *
- *   N e t P l a n e   H J _ S t a c k
- *
- ***************************************************************************
- ***************************************************************************/
-
-/***************************************************************************
- * Private (internal) Stack abstractions
- ***************************************************************************/
-
-#define SE_ALIGNMENT_MARKER 0xFFFF
-
-
-/***************************************************************************
-
-  P u b l i c   S t a c k  E l e m e n t    S t r u c t u r e s 
-
- ***************************************************************************/
-
-/***************************************************************************
- * Filter ID : Used by MAB to identify an Access Filter instance
- ***************************************************************************/
-
-typedef struct ncs_se_filter_id {
-       NCS_SE se;              /* All NCS_STACK Stack Elements start with this 
*/
-
-       uint32_t fltr_id;               /* Filter ID */
-
-} NCS_SE_FILTER_ID;
-
-/***************************************************************************
- * Back To : Used by MAB to explain how to get back to the correct invoker
- ***************************************************************************/
-
-typedef struct ncs_se_backto {
-       NCS_SE se;              /* All NCS_STACK Stack Elements start with this 
*/
-       uint16_t svcid;         /* Back to Subcomponent's Service ID */
-       MDS_DEST vcard;         /* Back to Virtual Card ID */
-
-} NCS_SE_BACKTO;
-
-
-/***************************************************************************
- *
- *     P r i v a t e  H J _ S T A C K   F u n c t i o n s
- *
- ***************************************************************************/
-
-NCS_SE *get_top_se(NCS_STACK *st);
-
-#endif   /* NCS_STACK_H */
diff --git a/osaf/libs/core/leap/sysf_mem.c b/osaf/libs/core/leap/sysf_mem.c
--- a/osaf/libs/core/leap/sysf_mem.c
+++ b/osaf/libs/core/leap/sysf_mem.c
@@ -53,11 +53,6 @@
 #include "ncsusrbuf.h"
 #include "sysf_def.h"
 
-/**********************************************************************************/
-/*                       L E A P   B U F F E R    P O O L                      
   */
-/**********************************************************************************/
-
-#include "ncs_stack.h"
 
 
/*************************************************************************************/
 
diff --git a/osaf/libs/core/mbcsv/include/mbcsv.h 
b/osaf/libs/core/mbcsv/include/mbcsv.h
--- a/osaf/libs/core/mbcsv/include/mbcsv.h
+++ b/osaf/libs/core/mbcsv/include/mbcsv.h
@@ -46,7 +46,6 @@
 #include "ncsft.h"
 #include "ncs_ubaid.h"
 #include "ncsencdec_pub.h"
-#include "ncs_stack.h"
 
 #include "ncs_lib.h"
 

------------------------------------------------------------------------------
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to