Merge "Documentation updates"
authorSphoorthi Dayanand <sphoorthi.dayanand@radisys.com>
Thu, 26 Nov 2020 16:09:48 +0000 (16:09 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Thu, 26 Nov 2020 16:09:48 +0000 (16:09 +0000)
166 files changed:
build/common/du_app.mak
build/common/o1.mak [new file with mode: 0755]
build/common/o1_client.mak [new file with mode: 0644]
build/o1/install_lib.sh [new file with mode: 0644]
build/o1/makefile [new file with mode: 0644]
build/o1/yang/o-ran-sc-odu-alarm-v1.yang [new file with mode: 0644]
build/odu/makefile
docs/README
src/5gnrmac/lwr_mac.h
src/5gnrmac/lwr_mac_fsm.c
src/5gnrmac/lwr_mac_handle_phy.c
src/5gnrmac/lwr_mac_phy.c
src/5gnrmac/mac_cfg_hdl.c
src/5gnrmac/mac_slot_ind.c
src/5gnrmac/mac_ue_mgr.c
src/5gnrmac/rg_cfg.c
src/5gnrmac/rg_com.c
src/5gnrmac/rg_dbm.c
src/5gnrmac/rg_dhm.c
src/5gnrmac/rg_dux.c
src/5gnrmac/rg_ex_ms.c
src/5gnrmac/rg_id.c
src/5gnrmac/rg_l2m.c
src/5gnrmac/rg_lim.c
src/5gnrmac/rg_lmm.c
src/5gnrmac/rg_mux.c
src/5gnrmac/rg_pom_scell.c
src/5gnrmac/rg_prg.c
src/5gnrmac/rg_prg_pt.c
src/5gnrmac/rg_ptli.c
src/5gnrmac/rg_ptmi.c
src/5gnrmac/rg_ptui.c
src/5gnrmac/rg_ram.c
src/5gnrmac/rg_rom.c
src/5gnrmac/rg_tom.c
src/5gnrmac/rg_uhm.c
src/5gnrmac/rg_uim.c
src/5gnrmac/rg_utl.c
src/5gnrrlc/kw_amm_dl.c
src/5gnrrlc/kw_amm_ul.c
src/5gnrrlc/kw_cfg_dl.c
src/5gnrrlc/kw_cfg_ul.c
src/5gnrrlc/kw_dbm_dl.c
src/5gnrrlc/kw_dbm_ul.c
src/5gnrrlc/kw_dl_ex_ms.c
src/5gnrrlc/kw_id.c
src/5gnrrlc/kw_lim.c
src/5gnrrlc/kw_lmm.c
src/5gnrrlc/kw_ptli.c
src/5gnrrlc/kw_ptmi.c
src/5gnrrlc/kw_ptui.c
src/5gnrrlc/kw_tenb_stats.c
src/5gnrrlc/kw_tmm_dl.c
src/5gnrrlc/kw_tmm_ul.c
src/5gnrrlc/kw_tmr.c
src/5gnrrlc/kw_udx.c
src/5gnrrlc/kw_udx_dl.c
src/5gnrrlc/kw_udx_ptdl.c
src/5gnrrlc/kw_udx_ptul.c
src/5gnrrlc/kw_udx_ul.c
src/5gnrrlc/kw_uim.c
src/5gnrrlc/kw_ul_ex_ms.c
src/5gnrrlc/kw_umm_dl.c
src/5gnrrlc/kw_umm_ul.c
src/5gnrrlc/kw_utl_dl.c
src/5gnrrlc/kw_utl_ul.c
src/5gnrrlc/rlc_msg_hdl.c
src/5gnrrlc/rlc_upr_inf_api.c
src/5gnrrlc/rlc_upr_inf_api.h
src/5gnrsch/rg_sch.c
src/5gnrsch/rg_sch_cfg.c
src/5gnrsch/rg_sch_cmn.c
src/5gnrsch/rg_sch_dbm.c
src/5gnrsch/rg_sch_dhm.c
src/5gnrsch/rg_sch_drx.c
src/5gnrsch/rg_sch_empty.c
src/5gnrsch/rg_sch_ex_ms.c
src/5gnrsch/rg_sch_gom.c
src/5gnrsch/rg_sch_hdfdd.c
src/5gnrsch/rg_sch_inf.c
src/5gnrsch/rg_sch_l2m.c
src/5gnrsch/rg_sch_lmm.c
src/5gnrsch/rg_sch_mga.c
src/5gnrsch/rg_sch_pt.c
src/5gnrsch/rg_sch_pwr.c
src/5gnrsch/rg_sch_ram.c
src/5gnrsch/rg_sch_sc1.c
src/5gnrsch/rg_sch_scell.c
src/5gnrsch/rg_sch_tmr.c
src/5gnrsch/rg_sch_tom.c
src/5gnrsch/rg_sch_uhm.c
src/5gnrsch/rg_sch_utl.c
src/5gnrsch/rg_sch_utl_clist.c
src/5gnrsch/sch_ue_mgr.c
src/cm/ckw.c
src/cm/cm_bdy5.c
src/cm/cm_gen.c
src/cm/cm_hash.c
src/cm/cm_inet.c
src/cm/cm_lib.c
src/cm/cm_llist.c
src/cm/cm_lte.c
src/cm/cm_math.c
src/cm/cm_mblk.c
src/cm/cm_mem.c
src/cm/cm_mem_wl.c
src/cm/cm_tenb_stats.c
src/cm/cm_tkns.c
src/cm/cm_tpt.c
src/cm/crg.c
src/cm/ctf.c
src/cm/du_app_mac_inf.h
src/cm/du_app_rlc_inf.c
src/cm/du_app_rlc_inf.h
src/cm/kwu.c
src/cm/lkw.c
src/cm/lrg.c
src/cm/mac_sch_interface.c
src/cm/mac_sch_interface.h
src/cm/rgm.c
src/cm/rgr.c
src/cm/rgu.c
src/cm/rlc_mac_inf.h
src/cu_stub/cu_f1ap_msg_hdl.c
src/cu_stub/cu_f1ap_msg_hdl.h
src/du_app/du_f1ap_msg_hdl.c
src/du_app/du_mgr.h
src/du_app/du_mgr_ex_ms.c
src/du_app/du_msg_hdl.c
src/du_app/du_ue_mgr.c
src/mt/mt_ss.c
src/mt/ss_drvr.c
src/mt/ss_gen.c
src/mt/ss_mem.c
src/mt/ss_msg.c
src/mt/ss_pack.c
src/mt/ss_queue.c
src/mt/ss_rbuf.c
src/mt/ss_strm.c
src/mt/ss_task.c
src/mt/ss_timer.c
src/o1/Alarm.hpp [new file with mode: 0644]
src/o1/Alarm3GPPYangModel.cpp [new file with mode: 0644]
src/o1/Alarm3GPPYangModel.hpp [new file with mode: 0644]
src/o1/AlarmManager.cpp [new file with mode: 0644]
src/o1/AlarmManager.hpp [new file with mode: 0644]
src/o1/AlarmOranYangModel.cpp [new file with mode: 0644]
src/o1/AlarmOranYangModel.hpp [new file with mode: 0644]
src/o1/GlobalDefs.cpp [new file with mode: 0644]
src/o1/GlobalDefs.hpp [new file with mode: 0644]
src/o1/NetconfManager.cpp [new file with mode: 0644]
src/o1/NetconfManager.hpp [new file with mode: 0644]
src/o1/O1_main.cpp [new file with mode: 0644]
src/o1/SessionHandler.cpp [new file with mode: 0644]
src/o1/SessionHandler.hpp [new file with mode: 0644]
src/o1/Singleton.hpp [new file with mode: 0644]
src/o1/TcpServer.cpp [new file with mode: 0644]
src/o1/TcpServer.hpp [new file with mode: 0644]
src/o1/o1_client/Alarm.h [new file with mode: 0644]
src/o1/o1_client/AlarmInterface.c [new file with mode: 0644]
src/o1/o1_client/AlarmInterface.h [new file with mode: 0644]
src/o1/o1_client/GlobalDefs.h [new file with mode: 0644]
src/o1/o1_client/TcpClient.c [new file with mode: 0644]
src/o1/o1_client/TcpClient.h [new file with mode: 0644]
src/phy_stub/l1.h
src/phy_stub/l1_bdy1.c

index d194a0e..ca0a07d 100644 (file)
@@ -40,6 +40,7 @@ I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/common
 I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/F1AP
 I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/RRC
 I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/E2AP
+I_OPTS+=-I$(ROOT_DIR)/src/o1/o1_client
 
 #-------------------------------------------------------------#
 #Linker macros
diff --git a/build/common/o1.mak b/build/common/o1.mak
new file mode 100755 (executable)
index 0000000..e3acf54
--- /dev/null
@@ -0,0 +1,55 @@
+################################################################################
+#   Copyright (c) [2017-2019] [Radisys]                                        #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# This is makefile for O1 module
+
+include ../common/rsys_fancy.mak
+include ../common/env.mak
+COLOR=$(COLOR_RED)
+
+ROOT_DIR=$(patsubst %/build/o1,%,$(BUILD_DIR))
+
+SRC_DIR=$(ROOT_DIR)/src/o1/
+CPP_SRCS=$(wildcard $(SRC_DIR)/*.cpp)
+CPP_OBJS=$(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(CPP_SRCS))
+
+lib: $(LIB_DIR)/libo1.a
+include $(COM_BUILD_DIR)/compile.mak
+
+L_OPTS=-lsysrepo -lyang
+L_OPTS+= -lsysrepo-cpp -lyang-cpp
+L_OPTS+= -lm -lpthread
+I_OPTS=-I$(ROOT_DIR)/src/o1/
+I_OPTS+=-I$(ROOT_DIR)/src/o1/o1_client
+
+#-------------------------------------------------------------#
+#Linker macros
+#-------------------------------------------------------------#
+
+$(LIB_DIR)/libo1.a:$(CPP_OBJS)
+                 @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
+                 $(Q)ar -cr $(LIB_DIR)/libo1.a $(CPP_OBJS)
+
+#-------------------------------------------------------------#
+#Clean macros
+#-------------------------------------------------------------#
+clean:
+                 @echo -e "$(COLOR_RED)Cleaning O1$(REVERT_COLOR)"
+                 $(Q)\rm -f $(LIB_DIR)/libo1.a $(CPP_OBJS) 
+
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/o1_client.mak b/build/common/o1_client.mak
new file mode 100644 (file)
index 0000000..f3b5535
--- /dev/null
@@ -0,0 +1,53 @@
+################################################################################
+#   Copyright (c) [2017-2019] [Radisys]                                        #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# This is makefile for O1 client
+
+include ../common/rsys_fancy.mak
+include ../common/env.mak
+COLOR=$(COLOR_RED)
+
+SRC_DIR=$(ROOT_DIR)/src/o1/o1_client
+C_SRCS=$(wildcard $(SRC_DIR)/*.c)
+C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
+
+lib: $(LIB_DIR)/libo1client.a
+include $(COM_BUILD_DIR)/compile.mak
+
+L_OPTS=-lsysrepo -lyang
+L_OPTS+= -lsysrepo-cpp -lyang-cpp
+L_OPTS+= -lm -lpthread
+I_OPTS+=-I$(ROOT_DIR)/src/o1/o1_client
+I_OPTS+=-I$(ROOT_DIR)/src/cm
+I_OPTS+=-I$(ROOT_DIR)/src/mt
+
+#-------------------------------------------------------------#
+#Linker macros
+#-------------------------------------------------------------#
+$(LIB_DIR)/libo1client.a:$(C_OBJS) $(C_WO_PED_OBJS)
+                 @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
+                 $(Q)ar -cr $(LIB_DIR)/libo1client.a $(C_OBJS) $(C_WO_PED_OBJS)
+
+#-------------------------------------------------------------#
+#Clean macros
+#-------------------------------------------------------------#
+clean:
+                 @echo -e "$(COLOR_RED)Cleaning O1 Client$(REVERT_COLOR)"
+                 $(Q)\rm -f $(LIB_DIR)/libo1client.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/o1/install_lib.sh b/build/o1/install_lib.sh
new file mode 100644 (file)
index 0000000..f807ba3
--- /dev/null
@@ -0,0 +1,245 @@
+################################################################################
+#   Copyright (c) [2020-2021] [HCL Technologies Ltd]                           #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+#!/bin/bash
+
+# Pre-requisite script for installing Netconf Libraries
+# and compiling the O1 module
+
+#variable declaration
+CURRENT_PATH=`pwd`
+HOME="$CURRENT_PATH/../.."
+MAKE_PATH="$HOME/build/o1"
+NETCONF_PATH="$HOME/build/o1/netconf"
+SYSREPOCTL_PATH="$NETCONF_PATH/sysrepo/build/sysrepoctl"
+YANG_PATH="$HOME/build/o1/yang"
+
+INSTALL="netconf"
+CLEANUP="no"
+SUDO="sudo"
+
+#logging functions
+log_error(){
+   echo ""
+   echo -e "\e[1;31m *****  $1  ***** \e[0m"
+   echo ""
+}
+log_warning() {
+   echo ""
+   echo -e "\e[1;35m *****  $1  ***** \e[0m"
+   echo ""
+}
+log_success() {   
+   echo ""
+   echo -e "\e[1;32m *****  $1  ***** \e[0m"
+   echo ""
+}
+log()         {
+   echo -e "$1 "
+}
+
+
+
+#functions definitions
+#TBD: install only mandatory packages
+
+#install pre-requisite packages
+
+prerequisite_netconf() {
+      $SUDO apt-get update
+
+      $SUDO apt-get install -y jq \
+      cmake \
+      build-essential \
+      supervisor \
+      libpcre3-dev \
+      pkg-config \
+      libavl-dev \
+      libev-dev \
+      libprotobuf-c-dev \
+      protobuf-c-compiler \
+      libssh-dev \
+      libssl-dev \
+      swig \
+      iputils-ping \
+      python-dev
+}
+
+#check return value
+check_ret() {
+
+   if [ $2 -eq 0 ]; then
+      log_success " $1 INSTALLATION DONE"
+   else
+      log_error " $1 INSTALLATION FAILED "
+      show_help
+   fi
+}
+
+
+#install netconf  libraries
+install_netconf_lib() {
+
+   #with sudo we can not create new user so we need to create it manually using 
+   #root credentials.
+
+      #$SUDO adduser --system netconf && \
+      #      echo "netconf:netconf" | chpasswd
+
+      #$SUDO mkdir -p /home/netconf/.ssh && \
+      #      ssh-keygen -A && \
+      #      ssh-keygen -t dsa -P '' -f /home/netconf/.ssh/id_dsa && \
+      #      cat /home/netconf/.ssh/id_dsa.pub > /home/netconf/.ssh/authorized_keys
+
+   if [[ "$CLEANUP" == "cleanup" ]]; then
+      rm -rf $NETCONF_PATH
+      log_warning "DELETED $NETCONF_PATH"
+   fi
+
+   mkdir -p $NETCONF_PATH
+
+   #1. libssh
+   cd $NETCONF_PATH && \
+      git clone http://git.libssh.org/projects/libssh.git && \
+      cd libssh; mkdir build; cd build && \
+      cmake .. && \
+      make && \
+      $SUDO make install
+
+   check_ret "LIBSSH" "$?"
+
+   # libyang
+   cd $NETCONF_PATH && \
+      git clone https://github.com/CESNET/libyang.git && \
+      cd libyang && mkdir build && cd build && \
+      cmake -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF \
+            -DCMAKE_BUILD_TYPE:String="Debug" -DENABLE_BUILD_TESTS=OFF .. && \
+      make -j2 && \
+      $SUDO make install && \
+      $SUDO ldconfig
+
+   check_ret "LIBYANG" "$?"
+
+   # sysrepo
+   cd $NETCONF_PATH && \
+      git clone https://github.com/sysrepo/sysrepo.git && \
+      cd sysrepo && sed -i -e 's/2000/30000/g;s/5000/30000/g' src/common.h.in && \
+      mkdir build && cd build && \
+      cmake -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF \
+            -DCMAKE_BUILD_TYPE:String="Debug" -DENABLE_TESTS=OFF \
+           -DREPOSITORY_LOC:PATH=/etc/sysrepo .. && \
+      make -j2 && \
+      $SUDO make install && $SUDO make sr_clean && \
+      $SUDO ldconfig
+
+   check_ret "SYSREPO" "$?"
+
+   # libnetconf2
+   cd $NETCONF_PATH && \
+      git clone https://github.com/CESNET/libnetconf2.git && \
+      cd libnetconf2 && mkdir build && cd build && \
+      cmake -DCMAKE_BUILD_TYPE:String="Debug" -DENABLE_BUILD_TESTS=OFF .. && \
+      make -j2 && \
+      $SUDO make install && \
+      $SUDO ldconfig
+
+   check_ret "LIBNETCONF2" "$?"
+
+   # netopeer2
+   cd $NETCONF_PATH && \
+      git clone https://github.com/CESNET/Netopeer2.git && \
+      cd Netopeer2 && mkdir build && cd build && \
+      cmake -DCMAKE_BUILD_TYPE:String="Debug" -DNP2SRV_DATA_CHANGE_TIMEOUT=30000 \
+            -DNP2SRV_DATA_CHANGE_WAIT=OFF .. && \
+      make -j2 && \
+      $SUDO make install -d
+   check_ret "NETOPEER2" "$?"
+
+}
+
+#install yang module
+
+install_yang_module() {
+   $SYSREPOCTL_PATH -i "$YANG_PATH/o-ran-sc-du-alarm-v1.yang"
+}
+
+
+#wait for ack of user
+acknowledge() {
+   echo "$1"
+   read -n 1 -p "Press any key to continue, or CTRL+C to abort" mainmenuinout
+   echo
+   }
+
+#show help for user to provide valid input
+show_help(){
+   echo "use -c option for cleanup"
+   echo "ex : $./install_netconf.sh -c"
+   exit
+}
+
+main() {
+
+   unset INSTALL CLEANUP
+   while (( "$#" )); do
+      case "$1" in
+         -h|\?)
+            show_help
+            shift
+            exit 0
+            ;;
+         -c)  CLEANUP="cleanup"
+            shift
+            ;;
+      esac
+   done
+
+   shift $((OPTIND-1))
+
+   [ "${1:-}" = "--" ] && shift
+
+   log_success "MAIN: PARSING OF ARGUMENT DONE"
+
+}
+
+#start execution / function calls
+if [[ "$#" -ge 2 ]] ; then
+   log_error " NUMBER OF PARAMETER : $# "
+   show_help
+fi
+
+main $@
+
+prerequisite_netconf
+
+install_netconf_lib
+
+#yang installation yet not enabled
+if [[ "$INSTALL" == "yang" ]] ; then
+{
+   log " YANG INSTALLATION PROCESSING "
+   install_yang_module
+   log_success " YANG INSTALLATION DONE "
+}
+fi
+
+
+log_success " SCRIPT COMPLETED"
+exit
+
+#**********************************************************************
+#    End of file
+#**********************************************************************
diff --git a/build/o1/makefile b/build/o1/makefile
new file mode 100644 (file)
index 0000000..ff985af
--- /dev/null
@@ -0,0 +1,126 @@
+################################################################################
+#   Copyright (c) [2017-2019] [Radisys]                                        #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# Master makefile for O1 module
+
+# Identify the location our software which is used by rest
+# of the build scripts
+
+include ../common/rsys_fancy.mak
+include ../common/env.mak
+
+ROOT_DIR=$(patsubst %/build/o1,%,$(BUILD_DIR))
+RULE=$(COLOR_RED)
+OPTS=$(COLOR_GREEN)
+NORM=$(REVERT_COLOR)
+
+# For improved speed
+CPUINFO=`cat /proc/cpuinfo | grep processor| wc -l`
+ifeq ($(CPUINFO), 1)
+   NUM_PARALLEL=1
+else
+      NUM_PARALLEL=$(shell echo $(CPUINFO) - 1 |bc)
+endif
+
+ifeq ($(FAST), 1)
+      NUM_PARALLEL=$(shell echo $(CPUINFO) + 2 |bc)
+endif
+
+PARALLEL_COMP=-j $(NUM_PARALLEL)
+
+# Different options to O1 build
+# # Other apsects of tool chain set here
+# # These should be made available appropriately to the builds
+ifeq ($(MACHINE),BIT64)
+CC          =gcc -m64
+CCPP        =g++ -m64
+else
+CC          =gcc -m32
+CCPP        =g++ -m32
+endif
+
+CC1= $(CC)
+CCPP1= $(CCPP)
+
+
+# The include options get merged with the options needed by
+# # the called makefiles and hence we export these to make them
+# # available to them.
+BUILD=i686-linux
+
+# The called makefiles depend on these macros and these need to be exported
+export PLTFRM
+export PLTFRM_FLAGS
+export BUILD
+export I_OPTS
+
+# Add to the linker options the platform specific components
+#L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp
+L_OPTS=-lsysrepo -lyang
+L_OPTS+= -lsysrepo-cpp -lyang-cpp
+L_OPTS+= -lm -lpthread
+
+# Export some of the flags expected from the command line.
+# # These macros are made available for the makefiles called from this makefile
+export MACHINE
+
+help:
+               @echo -e "******************************************************************"
+               @echo -e "BUILD COMMAND            DESCRIPTION                              "
+               @echo -e "------------------------------------------------------------------"
+               @echo -e "$(RULE)o1        - Builds all components of O1$(NORM)"
+               @echo -e "$(RULE)clean_o1  - clean up O1$(NORM)"
+               @echo -e "$(RULE)clean_all - cleanup O1 and all directories$(NORM)"
+               @echo -e "$(OPTS)  options: $(NORM)"
+               @echo -e "$(OPTS)    MACHINE=BIT64/BIT32  - Default is BIT32$(NORM)"
+               @echo -e "******************************************************************"
+
+prepare_dirs:
+       $(Q)echo -e "Preparing directories for build..."
+       $(Q)mkdir -p $(BUILD_DIR)/obj/o1
+       $(Q)mkdir -p $(LIB_ROOT)/o1
+       $(Q)mkdir -p $(BIN_DIR)/o1
+       $(Q)echo -e "Directories are successfully prepared"
+
+o1_mod:
+               $(Q)$(MAKE) -f $(COM_BUILD_DIR)/o1.mak OBJ_DIR=$(OBJ_ROOT)/o1 LIB_DIR=$(LIB_ROOT)/o1 LOG_DIR=$(LOG_ROOT)/o1 CC='$(CCPP1)'
+
+link_o1: o1_mod
+               $(Q)$(CCPP1) -g -o $(OBJ_ROOT)/o1/o1 -Wl,-R../lib/:. $(OBJ_ROOT)/o1/*.o\
+                       $(L_OPTS) -L$(LIB_ROOT)/o1
+
+clean_o1: 
+               $(Q)$(MAKE) -f $(COM_BUILD_DIR)/o1.mak clean OBJ_DIR=$(OBJ_ROOT)/o1 LIB_DIR=$(LIB_ROOT)/o1 LOG_DIR=$(LOG_ROOT)/o1 CC='$(CC1)'
+               $(Q)rm -rf $(OBJ_ROOT)/o1/*
+               $(Q)rm -rf $(LIB_ROOT)/o1/*
+               $(Q)rm -rf $(BIN_DIR)/o1/*
+               $(Q)echo -e "***** O1 CLEAN COMPLETE *****"
+
+clean_all: clean_o1
+                         $(Q)rm -rf $(OBJ_ROOT)
+                         $(Q)rm -rf $(LIB_ROOT)
+                         $(Q)rm -rf $(LOG_ROOT)
+                         $(Q)rm -rf $(BIN_DIR)
+
+copy_build: link_o1
+                       $(Q)cp -f ./obj/o1/o1 ./bin/o1
+                       $(Q)echo -e "***** O1 BUILD COMPLETE *****"
+
+o1: prepare_dirs copy_build
+
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/o1/yang/o-ran-sc-odu-alarm-v1.yang b/build/o1/yang/o-ran-sc-odu-alarm-v1.yang
new file mode 100644 (file)
index 0000000..10a7225
--- /dev/null
@@ -0,0 +1,89 @@
+module o-ran-sc-odu-alarm-v1 {
+  yang-version 1;
+  namespace "urn:o-ran:odu:alarm:1.0";
+  prefix rxad;
+
+  organization
+    "O-RAN Software Community";
+  contact
+    "www.o-ran.org";
+  description
+    "This module defines active alarm information visible to operators
+
+     Copyright 2020 the O-RAN Alliance.
+
+     Licensed under the Apache License, Version 2.0 (the 'License');
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.";
+
+  revision 2020-01-29 {
+    description
+      "initial revision";
+    reference
+      "O-RAN-OAM-Interface-Specification (O1)";
+  }
+
+  grouping alarm-info {
+    leaf alarm-id {
+      type string;
+      description
+        "The unique alarm ID";
+    }
+    leaf resource {
+      type string;
+      description
+        "The alarm  'resource' which is
+         basically the xpath to the entity
+         which raises the alarm and the
+         alarm-type-qualifier, which can be
+         in our case a static string for all
+         the alarms, e.g. 'O-RAN-SC:O-DU'.";
+    }
+    leaf alarm-text {
+      type string;
+      description
+        "The detailed text of the alarm";
+    }
+    leaf severity {
+      type string;
+      description
+        "The severity of the alarm";
+    }
+    leaf status {
+      type string;
+      description
+        "The status of the alarm";
+    }
+    leaf additional-info {
+      type string;
+      description
+        "Additional info about the alarm";
+    }
+    description
+      "Alarm information";
+  }
+
+  container odu {
+    container alarms {
+      config false;
+      list alarm {
+        key "alarm-id";
+        uses alarm-info;
+        description
+          "The list of active alarms in RIC";
+      }
+      description
+        "State data container of the alarms";
+    }
+    description
+      "Root object for RIC alarms";
+  }
+}
index f4cea29..1874e6c 100644 (file)
@@ -70,8 +70,7 @@ endif
 # macro for output file name and makefile name
 #
 
-PLTFRM_FLAGS= -UMSPD -DODU -DINTEL_FAPI #-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE \
-              #-DODU_SLOT_IND_DEBUG_LOG -DEGTP_TEST
+PLTFRM_FLAGS= -UMSPD -DODU -DINTEL_FAPI #-DODU_SLOT_IND_DEBUG_LOG -DEGTP_TEST
 
 ifeq ($(MODE),TDD)
    PLTFRM_FLAGS += -DMODE=TDD
@@ -83,6 +82,16 @@ endif
 ifeq ($(NODE),TEST_STUB)
        PLTFRM_FLAGS+=-DODU_TEST_STUB
 endif
+ifeq ($(PHY), INTEL_L1)
+       PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE
+ifeq ($(PHY_MODE),TIMER)
+       PLTFRM_FLAGS+=-DINTEL_TIMER_MODE
+endif
+endif
+
+ifeq ($(O1_ENABLE),YES)
+       PLTFRM_FLAGS+=-DO1_ENABLE
+endif
 
 # The include options get merged with the options needed by
 # # the called makefiles and hence we export these to make them
@@ -96,7 +105,9 @@ export BUILD
 export I_OPTS
 
 # Add to the linker options the platform specific components
-L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp #-L/root/intel/phy/wls_lib/lib -lwls                         \
+L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp 
+ifeq ($(PHY), INTEL_L1)
+       L_OPTS+=-L/root/intel/phy/wls_lib/lib -lwls                         \
         -lhugetlbfs -lnuma -ldl -L/root/intel/dpdk-19.11/x86_64-native-linuxapp-gcc/lib             \
         -ldpdk -lrte_gso -lrte_pmd_atlantic -lrte_pmd_iavf -lrte_pmd_tap -lrte_acl                  \
         -lrte_hash -lrte_pmd_avp -lrte_pmd_ice -lrte_pmd_thunderx_nicvf -lrte_bbdev                 \
@@ -125,6 +136,7 @@ L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp #-L/root/intel/phy/wls_lib/lib -lwls
         -lrte_table -lrte_fib -lrte_pipeline -lrte_pmd_hinic -lrte_pmd_skeleton_event -lrte_timer   \
         -lrte_flow_classify -lrte_pmd_af_packet -lrte_pmd_hns3 -lrte_pmd_softnic -lrte_vhost        \
         -lrte_gro -lrte_pmd_ark -lrte_pmd_i40e -lrte_pmd_sw_event
+endif
 
 # Export some of the flags expected from the command line.
 # # These macros are made available for the makefiles called from this makefile
@@ -135,6 +147,7 @@ export OAM_ENABLE
 export CNM_ENABLE
 export TEXT_LOG
 export CA_ENABLE
+export O1_ENABLE
 
 help:
                @echo -e "******************************************************************"
@@ -147,10 +160,12 @@ help:
                @echo -e "$(RULE)clean_cu  - clean up CU Stub$(NORM)"
                @echo -e "$(RULE)clean_ric  - clean up RIC Stub$(NORM)"
                @echo -e "$(RULE)clean_all - cleanup everything$(NORM)"
-               @echo -e "$(OPTS)  options: $(NORM)"
+               @echo -e "$(OPTS)options: $(NORM)"
                @echo -e "$(OPTS)    MACHINE=BIT64/BIT32  - Default is BIT32$(NORM)"
-               @echo -e "$(OPTS)    NODE=TEST_STUB         - Mandatory option for cu_stub/ric_stub$(NORM)"
+               @echo -e "$(OPTS)    NODE=TEST_STUB       - Mandatory option for cu_stub/ric_stub$(NORM)"
                @echo -e "$(OPTS)    MODE=TDD             - If not specified, MODE=FDD$(NORM)"
+               @echo -e "$(OPTS)    PHY=INTEL_L1         - If not specified, Phy stub is used$(NORM)"
+               @echo -e "$(OPTS)    PHY_MODE=TIMER       - Testing mode for INTEL_L1
                @echo -e "******************************************************************"
 
 prepare_dirs:
@@ -189,6 +204,7 @@ du:
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/mt.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/rl.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/phy_stub.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
+               $(Q)$(MAKE) -f $(COM_BUILD_DIR)/o1_client.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 
 link_du: du
                   $(Q)$(CC1) -g -o $(OBJ_ROOT)/odu/odu -Wl,-R../lib/:. $(OBJ_ROOT)/odu/*.o\
@@ -207,6 +223,7 @@ clean_odu:
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/mt.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/rl.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
                $(Q)$(MAKE) -f $(COM_BUILD_DIR)/phy_stub.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
+               $(Q)$(MAKE) -f $(COM_BUILD_DIR)/o1_client.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
                $(Q)rm -rf $(OBJ_ROOT)/odu/*
                $(Q)rm -rf $(LIB_ROOT)/odu/*
                $(Q)rm -rf $(BIN_DIR)/odu/*
index 9201a8e..a82ab65 100644 (file)
@@ -1,13 +1,14 @@
-Directory Structure :
----------------------
+A. Directory Structure :
+------------------------
 1. l2/build/ : contains files required to compile the code
    a. common : contains individual module's makefile
    b. odu    : contains main makefile to generate an executable binary
    c. scripts: contains scripts for logging
+   d. o1     : contains main makefile to generate an executable binary
 
 2. l2/docs/  : contains README and other configuration files for building docs
        
-2. l2/src/ : contains layer specific source code
+3. l2/src/ : contains layer specific source code
    a. 5gnrmac  : MAC source code
    b. 5gnrrlc  : RLC source code
    c. cm       : common, environment and interface files
@@ -16,10 +17,11 @@ Directory Structure :
    f. mt       : wrapper functions over OS
    g. phy_stub : Stub code for Physical layer
    h. rlog     : logging module
+   i. o1       : o1 module
 
 
-Pre-requisite for Compilation :
--------------------------------
+B. Pre-requisite for Compilation :
+----------------------------------
 1. Linux 32-bit/64-bit machine
 2. GCC version 4.6.3 and above
 3. Install LKSCTP
@@ -30,13 +32,41 @@ Pre-requisite for Compilation :
    b. On CentOS : yum install libpcap-devel
 
 
-How to Clean and Build:
+C. Pre-requisite for running O1 module:
+---------------------------------------
+Install netconf server
+----------------------
+
+1.     Create new netconf user (login with root user and run following command)
+       $adduser --system netconf && \
+        echo "netconf:netconf" | chpasswd
+
+       $mkdir -p /home/netconf/.ssh && \
+       ssh-keygen -A && \
+       ssh-keygen -t dsa -P '' -f /home/netconf/.ssh/id_dsa && \
+        cat /home/netconf/.ssh/id_dsa.pub > /home/netconf/.ssh/authorized_keys
+2.     Install netconf packages. 
+       $cd l2/build/o1/
+       $chmod +x install_lib.sh
+       $ ./install_lib.sh
+
+Install the yang module
 -----------------------
+1. cd l2/build/o1/yang
+   sysrepoctl -i o-ran-sc-odu-alarm-v1.yang
+
+
+D. How to Clean and Build:
+--------------------------
 1. Building ODU binary:
    a. Build folder
          cd l2/build/odu
    b. Building ODU binary
          make odu MACHINE=BIT64 MODE=FDD
+
+         Build with O1 module enabled:
+         make odu MACHINE=BIT64 MODE=FDD O1_ENABLE=YES
+
    c. Cleaning ODU binary
          make clean_odu MACHINE=BIT64 MODE=FDD
 
@@ -48,7 +78,7 @@ How to Clean and Build:
    c. Cleaning CU Stub binary
          make clean_cu NODE=TEST_STUB MACHINE=BIT64 MODE=FDD
 
-2. Building RIC Stub binary:
+3. Building RIC Stub binary:
    a. Build folder
          cd l2/build/odu
    b. Building RIC Stub binary
@@ -59,29 +89,110 @@ How to Clean and Build:
 4. Cleaning ODU, CU Stub and RIC Stub:
       make clean_all
 
-How to execute:
----------------
+5. Building O1 binary:
+   a. Build folder
+         cd l2/build/o1
+   b. Building O1 binary
+         make o1 MACHINE=BIT64
+   c. Cleaning O1 binary
+         make clean_o1 
+
+
+E. How to execute:
+------------------
 1. Assign virtual IP addresses as follows:
-      ifconfig <interface name>:ODU "192.168.130.81"
-      ifconfig <interface name>:CU_STUB "192.168.130.82"
-      ifconfig <interface name>:RIC_STUB "192.168.130.80"
-
-2. CU execution folder:
-      cd l2/bin/cu_stub
-     
-3. Run CU Stub binary:
-      ./cu_stub
-
-4. RIC execution folder:
-      cd l2/bin/ric_stub
-     
-5. Run RIC Stub binary:
-      ./ric_stub
-
-4. DU execution folder:
-      cd l2/bin/odu
-     
-5. Run ODU binary:
-      ./odu
+   a. ifconfig <interface name>:ODU "192.168.130.81"
+   b. ifconfig <interface name>:CU_STUB "192.168.130.82"
+   c. ifconfig <interface name>:RIC_STUB "192.168.130.80"
+
+2. Execute CU Stub:
+   a. CU execution folder:
+       cd l2/bin/cu_stub
+   b. Run CU Stub binary:
+       ./cu_stub
+
+3. Execute RIC Stub:
+   a. RIC execution folder:
+       cd l2/bin/ric_stub
+   b. Run RIC Stub binary:
+       ./ric_stub
+
+4. Execute DU:
+   a. DU execution folder:
+       cd l2/bin/odu
+   b. Run ODU binary:
+       ./odu
+
+5. Execute O1
+   a. O1 execution folder:
+       cd l2/build/o1/bin/o1
+   b. Run O1 binary:
+       ./o1
 
 PS: CU stub and RIC stub must be run (in no particular sequence) before ODU
+    If O1 module is enabled it must be run before ODU
+
+F. How to test with Intel L1:
+-----------------------------
+
+I. Compilation
+   1. Build ODU :
+      a. Create folder l2/src/wls_lib. Copy wls_lib.h from <intel_directory>/phy/wls_lib/ to l2/src/wls_lib.
+      b. Create folder l2/src/dpdk_lib. Copy following files from <intel_directory>/dpdk-19.11/x86_64-native-linuxapp-gcc/include/ to l2/sr        c/dpdk_lib.
+                rte_branch_prediction.h
+                rte_common.h
+                rte_config.h
+                rte_dev.h
+                rte_log.h
+                rte_pci_dev_feature_defs.h
+                rte_bus.h
+                rte_compat.h
+                rte_debug.h
+                rte_eal.h
+                rte_os.h
+                rte_per_lcore.h
+      c. Build folder
+                cd l2/build/odu
+      d. Build ODU Binary:
+                make odu PHY=INTEL_L1 PHY_MODE=TIMER MACHINE=BIT64 MODE=FDD
+
+   2. Build CU Stub and RIC Stub:
+      a. Execute steps in sections D.2 and D.3.
+
+II. Execution
+    1. Execute L1:
+       a. Setup environment:
+                cd <intel_directory>/phy/
+                source ./setupenv.sh
+       b. Run L1 binary :
+                cd <intel_directory>/FlexRAN/l1/bin/nr5g/gnb/l1
+                To run in timer mode : ./l1.sh -e
+                L1 is up when console prints follow:
+
+                   Non BBU threads in application
+                   ===========================================================================================================
+                   nr5g_gnb_phy2mac_api_proc_stats_thread: [PID:   8659] binding on [CPU  0] [PRIO:  0] [POLICY:  1]
+                   wls_rx_handler (non-rt):                [PID:   8663] binding on [CPU  0]
+                   ===========================================================================================================
+                Â 
+                   PHY>welcome to application console
+
+    2. Execute FAPI Translator:
+       a. Setup environment:
+                cd <intel_directory>/phy/
+                source ./setupenv.sh
+       b. Run FAPI translator binary:
+                cd <intel_directory>/phy/fapi_5g/bin/
+                ./oran_5g_fapi --cfg=oran_5g_fapi.cfg
+
+    3. Execute CU Stub and RIC Stub:
+       a. Run steps in sections E.1-E.3
+
+    4. Execute DU:
+       a. DU execution folder
+               cd l2/bin/odu
+       b. Export WLS library path
+               export LD_LIBRARY_PATH=<intel_directory>/phy/wls_lib/lib:$LD_LIBRARY_PATH
+       c. Run ODU binary
+               ./odu
+
index e1c075e..0d4e04d 100644 (file)
@@ -42,6 +42,9 @@ typedef enum
 
 /* Events in Lower Mac */
 typedef enum{
+#ifdef INTEL_TIMER_MODE
+   UL_IQ_SAMPLE,
+#endif
    PARAM_REQUEST,
    PARAM_RESPONSE,
    CONFIG_REQUEST,
index 9efc6ff..9808c78 100644 (file)
@@ -1891,6 +1891,70 @@ uint8_t lwr_mac_procParamRspEvt(void *msg)
 #endif
 }
 
+#ifdef INTEL_TIMER_MODE
+uint8_t lwr_mac_procIqSamplesReqEvt(void *msg)
+{
+   void * wlsHdlr = NULLP;
+   fapi_msg_header_t *msgHeader;
+   fapi_vendor_ext_iq_samples_req_t *iqSampleReq;
+   p_fapi_api_queue_elem_t  headerElem;
+   p_fapi_api_queue_elem_t  iqSampleElem;
+   char filename[100] = "/root/intel/FlexRAN/testcase/ul/mu0_20mhz/2/uliq00_prach_tst2.bin"; 
+
+   uint8_t buffer[] ={0,0,0,0,0,2,11,0,212,93,40,0,20,137,38,0,20,0,20,0,0,8,0,8,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,1,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,1,0};
+
+   size_t bufferSize = sizeof(buffer) / sizeof(buffer[0]);
+
+   /* Fill IQ sample req */
+   mtGetWlsHdl(&wlsHdlr);
+   //iqSampleElem = (p_fapi_api_queue_elem_t)WLS_Alloc(wlsHdlr, \
+      (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_ext_iq_samples_req_t))); 
+   LWR_MAC_ALLOC(iqSampleElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_ext_iq_samples_req_t)));
+   if(!iqSampleElem)
+   {
+      DU_LOG("\nLWR_MAC: Memory allocation failed for IQ sample req");
+      return RFAILED;
+   }
+   FILL_FAPI_LIST_ELEM(iqSampleElem, NULLP, FAPI_VENDOR_EXT_UL_IQ_SAMPLES, 1, \
+      sizeof(fapi_vendor_ext_iq_samples_req_t));
+
+   iqSampleReq = (fapi_vendor_ext_iq_samples_req_t *)(iqSampleElem + 1);
+   memset(iqSampleReq, 0, sizeof(fapi_vendor_ext_iq_samples_req_t));
+   fillMsgHeader(&iqSampleReq->header, FAPI_VENDOR_EXT_UL_IQ_SAMPLES, \
+      sizeof(fapi_vendor_ext_iq_samples_req_t));
+
+   iqSampleReq->iq_samples_info.carrNum = 0;
+   iqSampleReq->iq_samples_info.numSubframes = 40;
+   iqSampleReq->iq_samples_info.nIsRadioMode = 0;
+   iqSampleReq->iq_samples_info.timerModeFreqDomain = 0;
+   iqSampleReq->iq_samples_info.phaseCompensationEnable = 0;
+   iqSampleReq->iq_samples_info.startFrameNum = 0;
+   iqSampleReq->iq_samples_info.startSlotNum = 0;
+   iqSampleReq->iq_samples_info.startSymNum = 0;
+   strncpy(iqSampleReq->iq_samples_info.filename_in_ul_iq[0], filename, 100);
+   memcpy(iqSampleReq->iq_samples_info.buffer, buffer, bufferSize);
+
+   /* TODO : Fill remaining parameters */
+
+   /* Fill message header */
+   LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t)));
+   if(!headerElem)
+   {
+      DU_LOG("\nLWR_MAC: Memory allocation failed for FAPI header in lwr_mac_procIqSamplesReqEvt");
+      return RFAILED;
+   }
+   FILL_FAPI_LIST_ELEM(headerElem, iqSampleElem, FAPI_VENDOR_MSG_HEADER_IND, 1, \
+     sizeof(fapi_msg_header_t));
+   msgHeader = (fapi_msg_header_t *)(headerElem + 1);
+   msgHeader->num_msg = 1; 
+   msgHeader->handle = 0;
+
+   DU_LOG("\nLWR_MAC: Sending IQ Sample request to Phy");
+   LwrMacSendToL1(headerElem);
+   return ROK;
+}
+#endif
+
 /*******************************************************************
  *
  * @brief Sends FAPI Config req to PHY
@@ -4160,6 +4224,9 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
 {
    {
       /* PHY_STATE_IDLE */
+#ifdef INTEL_TIMER_MODE 
+      lwr_mac_procIqSamplesReqEvt,
+#endif
       lwr_mac_procParamReqEvt,
       lwr_mac_procParamRspEvt,
       lwr_mac_procConfigReqEvt,
@@ -4169,6 +4236,9 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
    },
    {
       /* PHY_STATE_CONFIGURED */
+#ifdef INTEL_TIMER_MODE
+      lwr_mac_procInvalidEvt,
+#endif
       lwr_mac_procParamReqEvt,
       lwr_mac_procParamRspEvt,
       lwr_mac_procConfigReqEvt,
@@ -4178,6 +4248,9 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
    },
    {
       /* PHY_STATE_RUNNING */
+#ifdef INTEL_TIMER_MODE
+      lwr_mac_procInvalidEvt,
+#endif
       lwr_mac_procInvalidEvt,
       lwr_mac_procInvalidEvt,
       lwr_mac_procConfigReqEvt,
index db000be..9e6d675 100644 (file)
@@ -493,6 +493,16 @@ void procPhyMessages(uint16_t msgType, uint32_t msgSize, void *msg)
 
    switch(header->msg_id)
    {
+#ifdef INTEL_TIMER_MODE
+      case FAPI_VENDOR_EXT_UL_IQ_SAMPLES:
+         {
+            printf("\nLWR_MAC: Received FAPI_VENDOR_EXT_UL_IQ_SAMPLES");
+            //send config req
+            uint16_t cellId = 1;
+            sendToLowerMac(CONFIG_REQUEST, 0, (void *)&cellId);
+            break;
+         } 
+#endif
       case FAPI_PARAM_RESPONSE:
         {
             sendToLowerMac(PARAM_RESPONSE, msgSize, msg);
index a02195c..c927a5c 100644 (file)
@@ -215,7 +215,6 @@ void LwrMacRecvPhyMsg()
    uint16_t msgType;
    uint16_t flag = 0;
    p_fapi_api_queue_elem_t currElem  = NULLP;
-   struct timeval time;
 
    mtGetWlsHdl(&wlsHdlr);
    if(WLS_Ready(wlsHdlr) == 0) 
index 3aa2907..25b783b 100644 (file)
@@ -346,7 +346,11 @@ uint8_t MacProcSchCellCfgCfm(Pst *pst, SchCellCfgCfm *schCellCfgCfm)
    if(schCellCfgCfm->rsp == RSP_OK)
    {
       cellId = &schCellCfgCfm->cellId;
+#ifdef INTEL_TIMER_MODE
+      sendToLowerMac(UL_IQ_SAMPLE, 0, (void *)cellId);
+#else
       sendToLowerMac(CONFIG_REQUEST, 0, (void *)cellId);
+#endif
    }
    else
    {
index 0b07501..7f9142e 100644 (file)
@@ -351,6 +351,9 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
    /*starting Task*/
    ODU_START_TASK(&startTime, PID_MAC_TTI_IND);
 
+/* When testing L2 with Intel-L1, any changes specific to 
+ * timer mode testing must be guarded under INTEL_TIMER_MODE*/
+#ifndef INTEL_TIMER_MODE
    /* send slot indication to scheduler */
    ret = sendSlotIndMacToSch(slotInd);
    if(ret != ROK)
@@ -367,6 +370,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
       MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
       return ret;
    }
+#endif
 
    /* send slot indication to du app */
    ret = sendSlotIndMacToDuApp(slotInd);
index a7e3b29..da91f17 100644 (file)
 #include "mac_utils.h"
 
 /* function pointers for packing slot ind from mac to sch */
-MacSchUeCreateReqFunc macSchUeCreateReqOpts[] =
+MacSchAddUeConfigReqFunc macSchAddUeConfigReqOpts[] =
 {
-   packMacSchUeCreateReq,    /* packing for loosely coupled */
-   MacSchUeCreateReq,        /* packing for tightly coupled */
-   packMacSchUeCreateReq     /* packing for light weight loosely coupled */
+   packMacSchAddUeConfigReq,    /* packing for loosely coupled */
+   MacSchAddUeConfigReq,        /* packing for tightly coupled */
+   packMacSchAddUeConfigReq     /* packing for light weight loosely coupled */
 };
 
-MacDuUeCfgRspFunc MacDuUeCfgRspOpts[] =
+MacDuUeCfgRspFunc macDuUeCfgRspOpts[] =
 {
    packDuMacUeCfgRsp,   /* packing for loosely coupled */
    DuProcMacUeCfgRsp,   /* packing for tightly coupled */
    packDuMacUeCfgRsp   /* packing for light weight loosly coupled */
 };
 
-MacSchUeReconfigReqFunc macSchUeReconfigReqOpts[] =
+MacSchModUeConfigReqFunc macSchModUeConfigReqOpts[] =
 {
-   packMacSchUeReconfigReq,    /* packing for loosely coupled */
-   MacSchUeReconfigReq,        /* packing for tightly coupled */
-   packMacSchUeReconfigReq     /* packing for light weight loosely coupled */
+   packMacSchModUeConfigReq,    /* packing for loosely coupled */
+   MacSchModUeConfigReq,        /* packing for tightly coupled */
+   packMacSchModUeConfigReq     /* packing for light weight loosely coupled */
 };
 
 /*******************************************************************
@@ -644,12 +644,12 @@ uint8_t sendUeReqToSch(Pst *pst, SchUeCfg *schUeCfg)
    switch(pst->event)
    {
       case EVENT_MAC_UE_CREATE_REQ:
-        FILL_PST_MAC_TO_SCH(schPst, EVENT_UE_CREATE_REQ_TO_SCH);
-        return(*macSchUeCreateReqOpts[schPst.selector])(&schPst, schUeCfg);
+        FILL_PST_MAC_TO_SCH(schPst, EVENT_ADD_UE_CONFIG_REQ_TO_SCH);
+        return(*macSchAddUeConfigReqOpts[schPst.selector])(&schPst, schUeCfg);
 
       case EVENT_MAC_UE_RECONFIG_REQ:
-        FILL_PST_MAC_TO_SCH(schPst, EVENT_UE_RECONFIG_REQ_TO_SCH);
-        return(*macSchUeReconfigReqOpts[schPst.selector])(&schPst,schUeCfg);
+        FILL_PST_MAC_TO_SCH(schPst, EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH);
+        return(*macSchModUeConfigReqOpts[schPst.selector])(&schPst,schUeCfg);
       default: 
         DU_LOG("\n Invalid Pst received %d", pst->event);
         return RFAILED;
@@ -897,18 +897,19 @@ uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
       return RFAILED;
    }
 
-   schUeCfg->aggrMaxBitRate = NULL;
-   if(ueCfg->maxAggrBitRate != NULL)
+   if(ueCfg->ambrCfg != NULLP)
    {
-      MAC_ALLOC(schUeCfg->aggrMaxBitRate, sizeof(SchAggrMaxBitRate));
-      if(!schUeCfg->aggrMaxBitRate)
+      MAC_ALLOC(schUeCfg->ambrCfg, sizeof(SchAmbrCfg));
+      if(!schUeCfg->ambrCfg)
       {
         DU_LOG("\nMAC : Memory allocation failed in sendReconfigReqToSch");
         return RFAILED;
       }
-      schUeCfg->aggrMaxBitRate->ulBitRate = ueCfg->maxAggrBitRate->ulBits;
-      schUeCfg->aggrMaxBitRate->dlBitRate = ueCfg->maxAggrBitRate->dlBits;
+      schUeCfg->ambrCfg->ulBr = ueCfg->ambrCfg->ulBr;
+      schUeCfg->ambrCfg->dlBr = ueCfg->ambrCfg->dlBr;
    }
+   else
+      schUeCfg->ambrCfg = NULLP;
 
    /* Fill sch Lc Cfg  to Add/ Mod/ Del */
    ret  = fillSchLcCfgList(schUeCfg, ueCfg);
@@ -1222,11 +1223,11 @@ uint8_t modifyUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg)
    if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\
       &&(ueCb->state == UE_STATE_ACTIVE))
    {
-      DU_LOG("\n MAC : Reconfig Req received for CRNTI %d ", ueCfg->crnti);
+      DU_LOG("\n MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti);
       ret = fillMacUeCb(ueCb, ueCfg, cellIdx);
       if(ret != ROK)
       {
-         DU_LOG("\nMAC : Failed to modify Ue Cb at modifyUeCb()");
+         DU_LOG("\nMAC : Failed to modify MacUeCb at modifyUeCb()");
          return ret;
       }
       else
@@ -1282,11 +1283,15 @@ uint8_t procMacUeCfgData(Pst *pst, MacUeCfg *ueCfg)
    ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx -1];
    switch(pst->event)
    {
-      case EVENT_UE_CREATE_RSP_TO_MAC:
+      case EVENT_UE_CONFIG_RSP_TO_MAC:
         ret = createUeCb(cellIdx, ueCb, ueCfg);
+        if(ret != ROK)
+            DU_LOG("\nMAC: AddUeConfigReq for cellIdx :%d failed in procMacUeCfgData()", cellIdx);
         break;
       case EVENT_UE_RECONFIG_RSP_TO_MAC:
         ret = modifyUeCb(cellIdx, ueCb, ueCfg);
+        if(ret != ROK)
+            DU_LOG("\nMAC: ModifyUeConfigReq for cellIdx :%d failed at procMacUeCfgData()", cellIdx);
         break;
       default:
         break;
@@ -1422,7 +1427,7 @@ uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp)
    /* Fill Post structure and send UE Create response*/
    memset(&rspPst, 0, sizeof(Pst));
    FILL_PST_MAC_TO_DUAPP(rspPst, EVENT_MAC_UE_CREATE_RSP);
-   return MacDuUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp); 
+   return (*macDuUeCfgRspOpts[rspPst.selector])(&rspPst, cfgRsp); 
 }
 
 /*******************************************************************
@@ -1462,7 +1467,7 @@ uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp)
    /* Fill Post structure and send UE Create response*/
    memset(&rspPst, 0, sizeof(Pst));
    FILL_PST_MAC_TO_DUAPP(rspPst, EVENT_MAC_UE_RECONFIG_RSP);
-   return MacDuUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp);
+   return (*macDuUeCfgRspOpts[rspPst.selector])(&rspPst, cfgRsp);
 }
 
 /*******************************************************************
@@ -1524,33 +1529,63 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
 
    GET_CELL_IDX(schCfgRsp->cellId, cellIdx);
    ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx);
+   if(ueCfg == NULLP)
+   {
+      DU_LOG("\nMAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event);
+      ret = RFAILED;
+   }
 
-   if(ueCfg)
+   switch(pst->event)
    {
-      if(schCfgRsp->rsp == RSP_NOK)
+      case EVENT_UE_CONFIG_RSP_TO_MAC:
       {
-         DU_LOG("\nMAC : SCH UE Config Response : FAILURE [CRNTI %d] for event %d", schCfgRsp->crnti, pst->event);
+         if(schCfgRsp->rsp != RSP_NOK)
+        {
+            DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+           if(ret == ROK)
+           {
+              ret = procMacUeCfgData(pst, ueCfg);
+              if(ret == ROK)
+              {
+                  result = MAC_DU_APP_RSP_OK;
+               }
+           }
+        }
+        else
+        {
+            DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+        }
+         ret = MacSendUeCreateRsp(result, schCfgRsp);
       }
-      else
+      break;
+
+      case EVENT_UE_RECONFIG_RSP_TO_MAC:
       {
-         DU_LOG("\nMAC : SCH UE Config Response : SUCCESS [CRNTI %d]", schCfgRsp->crnti);
-         ret = procMacUeCfgData(pst, ueCfg);
-        if(ret == ROK)
+         if(schCfgRsp->rsp != RSP_NOK)
         {
-            result = MAC_DU_APP_RSP_OK;
-         }
+            DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+           if(ret == ROK)
+           {
+              ret = procMacUeCfgData(pst, ueCfg);
+              if(ret == ROK)
+              {
+                  result = MAC_DU_APP_RSP_OK;
+               }
+           }
+        }
+        else
+        {
+            DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+        }
+         ret = MacSendUeReconfigRsp(result, schCfgRsp);
       }
-      MAC_FREE(ueCfg, sizeof(MacUeCfg));
-      ueCfg = NULLP;
-   }
-   if(pst->event == EVENT_UE_CREATE_RSP_TO_MAC)
-   {
-      ret = MacSendUeCreateRsp(result, schCfgRsp);
-   }
-   if(pst->event == EVENT_UE_RECONFIG_RSP_TO_MAC)
-   {
-      ret = MacSendUeReconfigRsp(result, schCfgRsp);
+      break;
+      
+      default:
+      break;
    }
+   MAC_FREE(ueCfg, sizeof(MacUeCfg));
+   ueCfg = NULLP;
    
    return ret; 
 }
index f7317c2..c389d65 100755 (executable)
@@ -112,19 +112,12 @@ static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
-Inst        inst;
-CrgCellCfg  *cellCfg;
-RgErrInfo   *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
    if ((rgCb[inst].cell != NULLP)
@@ -188,7 +181,6 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgUeCfg
 (
 Inst      inst,
@@ -196,13 +188,6 @@ CrgUeCfg  *ueCfg,
 RgCellCb  **cell,
 RgErrInfo *errInfo
 )
-#else
-S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
-Inst      inst;
-CrgUeCfg  *ueCfg;
-RgCellCb  **cell;
-RgErrInfo *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
    if ((ueCfg->txMode.pres == PRSNT_NODEF) && 
@@ -276,7 +261,6 @@ RgErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgLcCfg
 (
 Inst       inst, 
@@ -285,14 +269,6 @@ RgCellCb   **cell,
 RgUeCb     **ue,
 RgErrInfo  *errInfo
 )
-#else
-S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst       inst;
-CrgLchCfg  *lcCfg;
-RgCellCb   **cell;
-RgUeCb     **ue;
-RgErrInfo  *errInfo;
-#endif
 {
 
    if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
@@ -362,7 +338,6 @@ RgErrInfo  *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgCellRecfg
 (
 Inst          inst,
@@ -370,13 +345,6 @@ CrgCellRecfg  *cellRecfg,
 RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
-#else
-S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
-Inst          inst;
-CrgCellRecfg  *cellRecfg;
-RgCellCb      **cell;
-RgErrInfo     *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
    
@@ -430,7 +398,6 @@ RgErrInfo     *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgUeRecfg
 (
 Inst        inst,
@@ -439,14 +406,6 @@ RgCellCb    **cell,
 RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
-Inst        inst;
-CrgUeRecfg  *ueRecfg;
-RgCellCb    **cell;
-RgUeCb      **ue;
-RgErrInfo   *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
    
@@ -514,7 +473,6 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgLcRecfg
 (
 Inst        inst,
@@ -524,15 +482,6 @@ RgUeCb      **ue,
 RgUlLcCb    **ulLc,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
-Inst        inst;
-CrgLchRecfg  *lcRecfg;
-RgCellCb     **cell;
-RgUeCb       **ue;
-RgUlLcCb     **ulLc;
-RgErrInfo    *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
 
@@ -592,7 +541,6 @@ RgErrInfo    *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGVldtCrgUeReset
 (
 Inst        inst,
@@ -601,14 +549,6 @@ RgCellCb    **cell,
 RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
-Inst        inst;
-CrgRst      *reset;
-RgCellCb    **cell;
-RgUeCb      **ue;
-RgErrInfo   *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
    
@@ -657,19 +597,12 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
-Inst        inst;
-CrgCellCfg  *cellCfg;
-RgErrInfo   *errInfo;
-#endif
 {
    S16        ret;
    RgCellCb   *cell = NULLP;
@@ -790,19 +723,12 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCfgAddUeSCellCfg
 (
 Inst        dstMacInst,    
 RgPrgUeSCellCfgInfo *ueSCellCb,
 RgCellCb    *cell
 )
-#else
-S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
-Inst        dstMacInst;    
-RgPrgUeSCellCfgInfo *ueSCellCb;
-RgCellCb    *cell;
-#endif
 {
    RgUeCb     *ueCb = NULLP;
    SuId       rguUlSapId = 0;
@@ -902,7 +828,6 @@ RgCellCb    *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgFillAndAddSCellCfg
 (
 Inst            inst,
@@ -911,14 +836,6 @@ CrgUeRecfg      *ueRecfg,
 CrgCfgTransId   transId,
 Bool            *isCfmRqrd
 )
-#else
-S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
-Inst            inst;
-RgCellCb        *cell;
-CrgUeRecfg      *ueRecfg;
-CrgCfgTransId   transId;
-Bool            *isCfmRqrd;
-#endif
 {
    RgUeCb     *ue = NULLP;
    uint8_t     idx = 0;
@@ -1013,7 +930,6 @@ Bool            *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgUeCfg
 (
 Inst      inst,
@@ -1021,13 +937,6 @@ RgCellCb  *cell,
 CrgUeCfg  *ueCfg,
 RgErrInfo *errInfo
 )
-#else
-S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
-Inst      inst;
-RgCellCb  *cell;
-CrgUeCfg  *ueCfg;
-RgErrInfo *errInfo;
-#endif
 {
    RgUeCb    *ue = NULLP;
    Bool      handover = FALSE;
@@ -1116,7 +1025,6 @@ RgErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgLcCfg
 (
 Inst            inst,
@@ -1127,16 +1035,6 @@ RgErrInfo       *errInfo,
 Bool            *isCfmRqrd,
 CrgCfgTransId   transId
 )
-#else
-S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgLchCfg   *lcCfg;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-CrgCfgTransId   transId;
-#endif
 {
 
    /* Handle Config for dedicated/common logical channels */
@@ -1193,7 +1091,6 @@ CrgCfgTransId   transId;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgCellRecfg
 (
 Inst          inst,
@@ -1201,13 +1098,6 @@ RgCellCb      *cell,
 CrgCellRecfg  *cellRecfg,
 RgErrInfo     *errInfo
 )
-#else
-S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
-Inst          inst;
-RgCellCb      *cell;
-CrgCellRecfg  *cellRecfg;
-RgErrInfo     *errInfo;
-#endif
 {
    /* Store the given rachCfg */
    cell->rachCfg = cellRecfg->rachRecfg;
@@ -1244,7 +1134,6 @@ RgErrInfo     *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgUeRecfg
 (
 Inst        inst,
@@ -1253,14 +1142,6 @@ RgUeCb      *ue,
 CrgUeRecfg  *ueRecfg,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgUeRecfg  *ueRecfg;
-RgErrInfo   *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
 
@@ -1300,7 +1181,6 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgLcRecfg
 (
 Inst        inst,
@@ -1311,16 +1191,6 @@ CrgLchRecfg *lcRecfg,
 RgErrInfo   *errInfo,
 Bool        *isCfmRqrd
 )
-#else
-S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
-Inst        inst;
-RgCellCb    *cell;
-RgUeCb      *ue;
-RgUlLcCb    *ulLc;
-CrgLchRecfg *lcRecfg;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-#endif
 {
 
    if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
@@ -1354,7 +1224,6 @@ Bool        *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgUeReset
 (
 RgCellCb    *cell,
@@ -1362,13 +1231,6 @@ RgUeCb      *ue,
 CrgRst      *reset,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
-RgCellCb    *cell;
-RgUeCb      *ue;
-CrgRst      *reset;
-RgErrInfo   *errInfo;
-#endif
 {
 
    RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
@@ -1400,19 +1262,12 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgCellDel
 (
 Inst        inst,
 CrgDel      *cellDelInfo,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
-Inst        inst,
-CrgDel      *cellDelInfo;
-RgErrInfo   *errInfo;
-#endif
 {
    RgCellCb *cell;
    uint8_t  idx;
@@ -1479,19 +1334,12 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgUeDel
 (
 Inst        inst,
 CrgDel      *ueDelInfo,
 RgErrInfo   *errInfo
 )
-#else
-S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
-Inst        inst;
-CrgDel      *ueDelInfo;
-RgErrInfo   *errInfo;
-#endif
 {
 
    errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
@@ -1532,7 +1380,6 @@ RgErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgCFGCrgLcDel
 (
 Inst        inst,
@@ -1541,13 +1388,6 @@ RgErrInfo   *errInfo,
 Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
-#else
-S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
-Inst        inst;
-CrgDel      *lcDelInfo;
-RgErrInfo   *errInfo;
-CrgCfgTransId transId;
-#endif
 {
    Bool      dirVld = FALSE;
    RgCellCb  *cell;
@@ -1634,7 +1474,6 @@ CrgCfgTransId transId;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgCFGVldtCrgDedLcCfg
 (
 Inst          inst, 
@@ -1643,14 +1482,6 @@ RgCellCb      **cell,
 RgUeCb        **ue,
 RgErrInfo     *errInfo
 )
-#else
-static S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst          inst;
-CrgLchCfg     *lcCfg;
-RgCellCb      **cell;
-RgUeCb        **ue;
-RgErrInfo     *errInfo;
-#endif
 {
    uint8_t         dirVld   = FALSE;
 
@@ -1739,7 +1570,6 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgCFGVldtCrgCmnLcCfg
 (
 Inst          inst,
@@ -1747,13 +1577,6 @@ CrgLchCfg     *lcCfg,
 RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
-#else
-static S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
-Inst          inst;
-CrgLchCfg     *lcCfg;
-RgCellCb      **cell;
-RgErrInfo     *errInfo;
-#endif
 {
    uint8_t dirVld  = FALSE;
 
@@ -1864,7 +1687,6 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgCFGCrgDedLcCfg
 (
 RgCellCb      *cell,
@@ -1872,13 +1694,6 @@ RgUeCb        *ue,
 CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
-#else
-static S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
-RgCellCb      *cell;
-RgUeCb        *ue;
-CrgLchCfg     *lcCfg;
-RgErrInfo     *errInfo;
-#endif
 {
    //Inst     inst = cell->macInst - RG_INST_START;
    errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
@@ -1924,7 +1739,6 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgCFGCrgCmnLcCfg
 (
 Inst          inst,
@@ -1932,13 +1746,6 @@ RgCellCb      *cell,
 CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
-#else
-static S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
-Inst          inst;
-RgCellCb      *cell;
-CrgLchCfg     *lcCfg;
-RgErrInfo     *errInfo;
-#endif
 {
    errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
 
@@ -2017,15 +1824,7 @@ RgErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgCFGFreeUeUlAlloc
-(
-RgCellCb      *cell
-)
-#else
-static Void rgCFGFreeUeUlAlloc(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeUeUlAlloc(RgCellCb *cell)
 {
    uint8_t    sfIdx;
    Inst inst = cell->macInst - RG_INST_START;
@@ -2058,15 +1857,7 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgCFGFreeCellCb
-(
-RgCellCb      *cell
-)
-#else
-Void rgCFGFreeCellCb(cell)
-RgCellCb      *cell;
-#endif
+Void rgCFGFreeCellCb(RgCellCb  *cell)
 {
    Inst inst = cell->macInst - RG_INST_START;
 
@@ -2118,15 +1909,7 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgCFGFreeInactvCellCb
-(
-RgCellCb      *cell
-)
-#else
-Void rgCFGFreeInactvCellCb(cell)
-RgCellCb      *cell;
-#endif
+Void rgCFGFreeInactvCellCb(RgCellCb *cell)
 {
    Inst      inst = cell->macInst - RG_INST_START;
    /* De-initialize the Ue list */
@@ -2168,17 +1951,7 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgCFGFreeUeCb
-(
-RgCellCb    *cell,
-RgUeCb      *ue
-)
-#else
-Void rgCFGFreeUeCb(cell, ue)
-RgCellCb    *cell;
-RgUeCb      *ue;
-#endif
+Void rgCFGFreeUeCb(RgCellCb *cell,RgUeCb *ue)
 {
    Inst inst = cell->macInst - RG_INST_START;
 
@@ -2213,15 +1986,7 @@ RgUeCb      *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgCFGFreeCmnLcLst
-(
-RgCellCb      *cell
-)
-#else
-static Void rgCFGFreeCmnLcLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeCmnLcLst(RgCellCb *cell)
 {
    rgDBMFreeCmnLcLst(cell);
 
@@ -2247,15 +2012,7 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgCFGFreeUeLst
-(
-RgCellCb      *cell
-)
-#else
-static Void rgCFGFreeUeLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeUeLst(RgCellCb *cell)
 {
    RgUeCb     *ue;
 
@@ -2294,15 +2051,7 @@ RgCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgCFGFreeSpsUeLst
-(
-RgCellCb      *cell
-)
-#else
-static Void rgCFGFreeSpsUeLst(cell)
-RgCellCb      *cell;
-#endif
+static Void rgCFGFreeSpsUeLst(RgCellCb *cell)
 {
    RgUeCb     *ue;
 
@@ -2340,17 +2089,7 @@ RgCellCb      *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacCellRegReq
-(
-Pst*                pst,
-RgInfCellReg*       regReq 
-)
-#else
-S16 RgSchMacCellRegReq(pst, regReq)
-Pst*                pst;
-RgInfCellReg*       regReq;
-#endif
+S16 RgSchMacCellRegReq(Pst*  pst,RgInfCellReg* regReq)
 {
    Inst      inst;
    RgCellCb *cell = NULLP;
@@ -2386,36 +2125,36 @@ RgInfCellReg*       regReq;
 /*LTE_L2_MEAS_PHASE2*/
 S16 rgAddToL2MeasPerQci(RgCellCb  *cell,uint8_t qci)
 {
- S16        ret = ROK; 
- CmLList    *lnk;
- RgL2MeasCb *measCb;
- uint16_t   idx;
- lnk = cell->l2mList.first;
-  while(lnk != NULLP )
+   S16        ret = ROK;       
  CmLList    *lnk;
  RgL2MeasCb *measCb;
  uint16_t   idx;
+
  lnk = cell->l2mList.first;
+   while(lnk != NULLP )
    {
       measCb = (RgL2MeasCb *)lnk->node;
       if(measCb->measReq.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL)
       {
-             for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
-             {
-                     if(measCb->measReq.t.prbReq.qci[idx] == qci)
-                     {
-                             break; /*exit from for loop*/
-                     
-             } 
-             if(idx == measCb->measReq.t.prbReq.numQci)
-             {
-                     cell->qciArray[qci].mask = TRUE; 
-                     measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
-             }         
+        for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
+        {
+           if(measCb->measReq.t.prbReq.qci[idx] == qci)
+           {
+              break; /*exit from for loop*/
+           } 
+        }      
+        if(idx == measCb->measReq.t.prbReq.numQci)
+        {
+           cell->qciArray[qci].mask = TRUE; 
+           measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
+        }              
       }          
       lnk = lnk->next;
    }  /* End of While*/
-                
-       
- return (ret);
+
+
+
  return (ret);
 }
 
 
index 4c8686b..039d359 100755 (executable)
@@ -97,19 +97,12 @@ static S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo));
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgCOMCfgReq
 (
 Inst          inst,
 CrgCfgTransId transId,
 CrgCfgReqInfo *crgCfgReq
 )
-#else
-S16 rgCOMCfgReq(inst,transId, crgCfgReq)
-Inst          inst;
-CrgCfgTransId transId;
-CrgCfgReqInfo *crgCfgReq;
-#endif
 {
    S16             ret;
    uint8_t         cfmStatus = CRG_CFG_CFM_OK;
@@ -195,7 +188,6 @@ if(TRUE == isCfmRqrd)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgCOMHndlCfgReq
 (
 Inst             inst,
@@ -204,14 +196,6 @@ RgErrInfo        *errInfo,
 Bool             *isCfmRqrd,
 CrgCfgTransId    transId
 )
-#else
-static S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId)
-Inst            inst;
-CrgCfg          *cfg;
-RgErrInfo       *errInfo;
-Bool            *isCfmRqrd;
-CrgCfgTransId   transId;
-#endif
 {
    S16       ret;
    RgCellCb  *cell = NULLP;
@@ -296,7 +280,6 @@ CrgCfgTransId   transId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgCOMHndlRecfgReq
 (
 Inst             inst,
@@ -305,14 +288,6 @@ RgErrInfo        *errInfo,
 CrgCfgTransId    transId,
 Bool             *isCfmRqrd
 )
-#else
-static S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd)
-Inst            inst;
-CrgRecfg        *recfg;
-RgErrInfo       *errInfo;
-CrgCfgTransId   transId;
-Bool            *isCfmRqrd;
-#endif
 {
    S16       ret;
    RgCellCb  *cell = rgCb[inst].cell;
@@ -433,19 +408,12 @@ Bool            *isCfmRqrd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgCOMHndlResetReq
 (
 Inst       inst,
 CrgRst     *reset,
 RgErrInfo  *errInfo
 )
-#else
-static S16 rgCOMHndlResetReq(inst,reset, errInfo)
-Inst       inst;
-CrgRst     *reset;
-RgErrInfo  *errInfo;
-#endif
 {
    /* Fix : ccpu00126865: ignore CRG reset. Let SCH trigger it. */
    
@@ -477,7 +445,6 @@ RgErrInfo  *errInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgCOMHndlDelReq
 (
 Inst        inst,
@@ -486,14 +453,6 @@ RgErrInfo   *errInfo,
 Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
-#else
-static S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId)
-Inst        inst;
-CrgDel      *del;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-CrgCfgTransId transId;
-#endif
 {
 
    S16      ret;
@@ -560,17 +519,11 @@ CrgCfgTransId transId;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellCfgReq
 (
 Pst         *pst,    
 RgPrgUeSCellCfgInfo *ueSCellCb
 )
-#else
-S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb)
-Pst         *pst;    
-RgPrgUeSCellCfgInfo *ueSCellCb;
-#endif
 {
    RgPrgCfgCfmInfo  cfgCfm;
    Inst             inst = pst->dstInst;
@@ -641,17 +594,11 @@ RgPrgUeSCellCfgInfo *ueSCellCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgSMacPMacCfgCfm
 (
 Pst             *pst,    
 RgPrgCfgCfmInfo *cfgCfm
 )
-#else
-S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm)
-Pst             *pst;    
-RgPrgCfgCfmInfo *cfgCfm;
-#endif
 {
    Inst      inst = pst->dstInst;
    RgCellCb *cell;
@@ -739,17 +686,11 @@ RgPrgCfgCfmInfo *cfgCfm;
  *  @param[in] RgPrgUeSCellDelInfo *ueSCellDelInfo
  *  @return  ROK is SUCCESS 
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellDelReq
 (
 Pst                 *pst,
 RgPrgUeSCellDelInfo *ueSCellDelInfo
 )
-#else
-S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
-Pst                 *pst;
-RgPrgUeSCellDelInfo *ueSCellDelInfo;
-#endif
 {
    Inst        inst     = pst->dstInst - RG_INST_START;
    RgCellCb    *sCell   = rgCb[inst].cell;
index da8d945..3a673b3 100755 (executable)
@@ -85,15 +85,10 @@ uint16_t       numBins
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgDBMInitCell
 (
 RgCellCb       *cellCb
 )
-#else
-S16 rgDBMInitCell(cellCb)
-RgCellCb       *cellCb;
-#endif
 {
    S16 ret;
    
@@ -132,17 +127,11 @@ RgCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgDBMInitUeCbLst
 (
 RgCellCb       *cellCb,
 uint16_t       numBins
 )
-#else
-static S16 rgDBMInitUeCbLst(cellCb, numBins)
-RgCellCb       *cellCb;
-uint16_t       numBins;
-#endif
 {
    Inst inst = cellCb->macInst - RG_INST_START;
    RgUeCb ue;  
@@ -165,15 +154,7 @@ uint16_t       numBins;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMDeInitUeCbLst
-(
-RgCellCb       *cellCb
-)
-#else
-S16 rgDBMDeInitUeCbLst(cellCb)
-RgCellCb       *cellCb;
-#endif
+S16 rgDBMDeInitUeCbLst(RgCellCb *cellCb)
 {
 
    return (cmHashListDeinit(&cellCb->ueLst));
@@ -195,17 +176,7 @@ RgCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgDBMInitSpsUeCbLst
-(
-RgCellCb       *cellCb,
-uint16_t       numBins
-)
-#else
-static S16 rgDBMInitSpsUeCbLst(cellCb, numBins)
-RgCellCb       *cellCb;
-uint16_t       numBins;
-#endif
+static S16 rgDBMInitSpsUeCbLst(RgCellCb *cellCb,uint16_t numBins)
 {
    Inst inst = cellCb->macInst - RG_INST_START;
    RgUeCb ue;
@@ -228,15 +199,7 @@ uint16_t       numBins;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMDeInitSpsUeCbLst
-(
-RgCellCb       *cellCb
-)
-#else
-S16 rgDBMDeInitSpsUeCbLst(cellCb)
-RgCellCb       *cellCb;
-#endif
+S16 rgDBMDeInitSpsUeCbLst(RgCellCb *cellCb)
 {
 
    return (cmHashListDeinit(&cellCb->spsUeLst));
@@ -259,17 +222,7 @@ RgCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMInsUeCb
-(
-RgCellCb       *cellCb,
-RgUeCb         *ueCb
-)
-#else
-S16 rgDBMInsUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+S16 rgDBMInsUeCb(RgCellCb *cellCb,RgUeCb *ueCb)
 {
    return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, 
       (uint8_t *)&ueCb->ueId, (uint16_t)sizeof(ueCb->ueId)));
@@ -291,17 +244,7 @@ RgUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMInsSpsUeCb
-(
-RgCellCb       *cellCb,
-RgUeCb         *ueCb
-)
-#else
-S16 rgDBMInsSpsUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+S16 rgDBMInsSpsUeCb(RgCellCb *cellCb,RgUeCb  *ueCb)
 {
 
    return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
@@ -324,17 +267,7 @@ RgUeCb         *ueCb;
  *  @param[in]  ueId
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetUeCb
-(
-RgCellCb       *cellCb, 
-CmLteRnti      ueId
-)
-#else
-RgUeCb* rgDBMGetUeCb(cellCb, ueId)
-RgCellCb       *cellCb;
-CmLteRnti      ueId;
-#endif
+RgUeCb* rgDBMGetUeCb(RgCellCb *cellCb, CmLteRnti ueId)
 {
    RgUeCb *ueCb = NULLP; 
 
@@ -357,17 +290,7 @@ CmLteRnti      ueId;
  *  @param[in]  ueId
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetSpsUeCb
-(
-RgCellCb       *cellCb, 
-CmLteRnti      spsRnti
-)
-#else
-RgUeCb* rgDBMGetSpsUeCb(cellCb, spsRnti)
-RgCellCb       *cellCb;
-CmLteRnti      spsRnti;
-#endif
+RgUeCb* rgDBMGetSpsUeCb(RgCellCb  *cellCb, CmLteRnti spsRnti)
 {
    RgUeCb *ueCb = NULLP; 
 
@@ -391,17 +314,7 @@ CmLteRnti      spsRnti;
  *  @param[in]  *ueCb
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetNextUeCb
-(
-RgCellCb       *cellCb, 
-RgUeCb         *ueCb
-)
-#else
-RgUeCb* rgDBMGetNextUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+RgUeCb* rgDBMGetNextUeCb(RgCellCb *cellCb, RgUeCb *ueCb)
 {
    RgUeCb *nextUeCb = NULLP; 
 
@@ -423,17 +336,7 @@ RgUeCb         *ueCb;
  *  @param[in]  *ueCb
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetNextSpsUeCb
-(
-RgCellCb       *cellCb, 
-RgUeCb         *ueCb
-)
-#else
-RgUeCb* rgDBMGetNextSpsUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+RgUeCb* rgDBMGetNextSpsUeCb(RgCellCb *cellCb, RgUeCb *ueCb)
 {
    RgUeCb *nextUeCb = NULLP; 
 
@@ -459,17 +362,7 @@ RgUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMDelUeCb
-(
-RgCellCb       *cellCb,
-RgUeCb         *ueCb
-)
-#else
-S16 rgDBMDelUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+S16 rgDBMDelUeCb(RgCellCb *cellCb, RgUeCb *ueCb)
 {
    return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb));
 }  /* rgDBMDelUeCb */
@@ -490,17 +383,7 @@ RgUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDBMDelSpsUeCb
-(
-RgCellCb       *cellCb,
-RgUeCb         *ueCb
-)
-#else
-S16 rgDBMDelSpsUeCb(cellCb, ueCb)
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-#endif
+S16 rgDBMDelSpsUeCb(RgCellCb  *cellCb, RgUeCb *ueCb)
 {
 
    return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
@@ -523,15 +406,7 @@ RgUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgDBMInitUe
-(
-RgUeCb       *ueCb
-)
-#else
-Void rgDBMInitUe(ueCb)
-RgUeCb       *ueCb;
-#endif
+Void rgDBMInitUe(RgUeCb *ueCb)
 {
 #ifdef LTEMAC_SPS
    uint8_t        idx;
@@ -564,15 +439,7 @@ RgUeCb       *ueCb;
  *  @param[in]  RgUeCb *ueCb
  *  @return     Void 
  **/
-#ifdef ANSI
-static Void rgDBMInitDedLcLst
-(
-RgUeCb       *ueCb
-)
-#else
-static Void rgDBMInitDedLcLst(ueCb)
-RgUeCb       *ueCb;
-#endif
+static Void rgDBMInitDedLcLst(RgUeCb *ueCb)
 {
    uint8_t idx;
    
@@ -610,15 +477,7 @@ RgUeCb       *ueCb;
  *  @param[in]  RgCellCb *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgDBMInitCmnLcLst
-(
-RgCellCb       *cellCb
-)
-#else
-static Void rgDBMInitCmnLcLst(cellCb)
-RgCellCb       *cellCb;
-#endif
+static Void rgDBMInitCmnLcLst(RgCellCb *cellCb)
 {
    uint8_t idx;
    
@@ -651,15 +510,7 @@ RgCellCb       *cellCb;
  *  @param[in]  RgCellCb *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMFreeCmnLcLst
-(
-RgCellCb       *cellCb
-)
-#else
-Void rgDBMFreeCmnLcLst(cellCb)
-RgCellCb       *cellCb;
-#endif
+Void rgDBMFreeCmnLcLst(RgCellCb *cellCb)
 {
    uint8_t idx;
    
@@ -688,17 +539,7 @@ RgCellCb       *cellCb;
  *  @param[in]  RgDlLcCb* dlLcCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMInsDlDedLcCb
-(
-RgUeCb         *ueCb, 
-CmLteLcId        idx
-)
-#else
-Void rgDBMInsDlDedLcCb(ueCb, idx)
-RgUeCb         *ueCb; 
-CmLteLcId        idx;
-#endif
+Void rgDBMInsDlDedLcCb(RgUeCb  *ueCb, CmLteLcId idx)
 {
    if( idx >= RG_DEDLC_MIN_LCID )
    {
@@ -719,17 +560,7 @@ CmLteLcId        idx;
  *  @param[in]  RgDlLcCb* dlLcCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMDelDlDedLcCb
-(
-RgUeCb         *ueCb, 
-RgDlLcCb       *dlLcCb 
-)
-#else
-Void rgDBMDelDlDedLcCb(ueCb, dlLcCb)
-RgUeCb         *ueCb; 
-RgDlLcCb       *dlLcCb; 
-#endif
+Void rgDBMDelDlDedLcCb(RgUeCb  *ueCb, RgDlLcCb *dlLcCb)
 {
    ueCb->dl.lcCb[dlLcCb->lcId - 1].lcId = RG_INVALID_LC_ID;
 
@@ -750,17 +581,7 @@ RgDlLcCb       *dlLcCb;
  *  @param[in]  idx
  *  @return  RgDlLcCb*
  **/
-#ifdef ANSI
-RgDlLcCb* rgDBMGetDlDedLcCb
-(
-RgUeCb         *ueCb, 
-CmLteLcId        idx
-)
-#else
-RgDlLcCb* rgDBMGetDlDedLcCb(ueCb, idx)
-RgUeCb         *ueCb; 
-CmLteLcId        idx;
-#endif
+RgDlLcCb* rgDBMGetDlDedLcCb(RgUeCb *ueCb, CmLteLcId idx)
 {
    if (idx > RG_DEDLC_MAX_LCID || idx <= 0)
    {
@@ -789,35 +610,20 @@ CmLteLcId        idx;
  *  @return  Void
  **/
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 Void rgDBMInsUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
 LteLcgId       gId,
-uint8_t             qci
+uint8_t        qci
 )
 #else
-Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
-RgUeCb         *ueCb; 
-CmLteLcId      idx;
-LteLcgId       gId;
-uint8_t             qci;
-#endif
-#else
-#ifdef ANSI
 Void rgDBMInsUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
 LteLcgId       gId
 )
-#else
-Void rgDBMInsUlDedLcCb(ueCb, idx, gId)
-RgUeCb         *ueCb; 
-CmLteLcId      idx;
-LteLcgId       gId;
-#endif
 #endif
 {
    if ( idx >= RG_DEDLC_MIN_LCID)
@@ -853,19 +659,12 @@ LteLcgId       gId;
  *  @param[in]  LteLcgId gId
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgDBMUpdUlDedLcCb
 (
 RgUeCb         *ueCb, 
 RgUlLcCb       *ulLcCb,
 LteLcgId       gId
 )
-#else
-Void rgDBMUpdUlDedLcCb(ueCb, ulLcCb, gId)
-RgUeCb         *ueCb; 
-RgUlLcCb       *ulLcCb; 
-LteLcgId       gId;
-#endif
 {
    ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = 
                ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount - 1;
@@ -897,17 +696,7 @@ LteLcgId       gId;
  *  @param[in]  RgUlLcCb* ulLcCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMDelUlDedLcCb
-(
-RgUeCb         *ueCb, 
-RgUlLcCb       *ulLcCb 
-)
-#else
-Void rgDBMDelUlDedLcCb(ueCb, ulLcCb)
-RgUeCb         *ueCb; 
-RgUlLcCb       *ulLcCb; 
-#endif
+Void rgDBMDelUlDedLcCb(RgUeCb *ueCb, RgUlLcCb *ulLcCb)
 {
 
    ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = 
@@ -936,17 +725,7 @@ RgUlLcCb       *ulLcCb;
  *  @param[in]  idx
  *  @return  RgUlLcCb*
  **/
-#ifdef ANSI
-RgUlLcCb* rgDBMGetUlDedLcCb
-(
-RgUeCb         *ueCb, 
-CmLteLcId        idx
-)
-#else
-RgUlLcCb* rgDBMGetUlDedLcCb(ueCb, idx)
-RgUeCb         *ueCb; 
-CmLteLcId        idx;
-#endif
+RgUlLcCb* rgDBMGetUlDedLcCb(RgUeCb *ueCb, CmLteLcId  idx)
 {
 
    if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID)
@@ -976,17 +755,7 @@ CmLteLcId        idx;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgDBMChkCmnLcCb
-(
-RgCellCb       *cellCb, 
-CmLteLcId        lcId
-)
-#else
-S16 rgDBMChkCmnLcCb(cellCb, lcId)
-RgCellCb       *cellCb;
-CmLteLcId        lcId;
-#endif
+S16 rgDBMChkCmnLcCb(RgCellCb *cellCb, CmLteLcId lcId)
 {
    uint8_t idx;
 
@@ -1021,15 +790,7 @@ CmLteLcId        lcId;
  *  @param[in]  *cellCb
  *  @return  RgBcchBchLcCb*
  **/
-#ifdef ANSI
-RgBcchBchLcCb* rgDBMGetBcchOnBch
-(
-RgCellCb       *cellCb 
-)
-#else
-RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
-RgCellCb       *cellCb;
-#endif
+RgBcchBchLcCb* rgDBMGetBcchOnBch(RgCellCb *cellCb)
 {
 
    if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID)
@@ -1052,17 +813,7 @@ RgCellCb       *cellCb;
  *  @param[in]  lcId
  *  @return  RgBcchDlschLcCb*
  **/
-#ifdef ANSI
-RgBcchDlschLcCb* rgDBMGetBcchOnDlsch
-(
-RgCellCb       *cellCb,
-CmLteLcId      lcId
-)
-#else
-RgBcchDlschLcCb* rgDBMGetBcchOnDlsch(cellCb,lcId)
-RgCellCb       *cellCb;
-CmLteLcId      lcId;
-#endif
+RgBcchDlschLcCb* rgDBMGetBcchOnDlsch(RgCellCb *cellCb,CmLteLcId lcId)
 {
    uint8_t idx;
 
@@ -1087,15 +838,7 @@ CmLteLcId      lcId;
  *  @param[in]  *cellCb
  *  @return  RgPcchLcCb*
  **/
-#ifdef ANSI
-RgPcchLcCb* rgDBMGetPcch
-(
-RgCellCb       *cellCb
-)
-#else
-RgPcchLcCb* rgDBMGetPcch(cellCb)
-RgCellCb       *cellCb;
-#endif
+RgPcchLcCb* rgDBMGetPcch(RgCellCb *cellCb)
 {
  
    if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID)
@@ -1117,17 +860,7 @@ RgCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMInsBcchOnBch
-(
-RgCellCb       *cellCb, 
-CmLteLcId      idx
-)
-#else
-Void rgDBMInsBcchOnBch(cellCb, idx)
-RgCellCb       *cellCb;
-CmLteLcId      idx;
-#endif
+Void rgDBMInsBcchOnBch(RgCellCb *cellCb, CmLteLcId idx)
 {
 
    cellCb->bcchBchInfo.lcId = idx;
@@ -1148,17 +881,7 @@ CmLteLcId      idx;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMInsBcchOnDlsch
-(
-RgCellCb       *cellCb, 
-CmLteLcId      idx
-)
-#else
-Void rgDBMInsBcchOnDlsch(cellCb, idx)
-RgCellCb       *cellCb;
-CmLteLcId      idx;
-#endif
+Void rgDBMInsBcchOnDlsch(RgCellCb *cellCb, CmLteLcId idx)
 {
 
    cellCb->bcchDlschInfo[cellCb->numBcchDlschInfo].lcId = idx;
@@ -1180,17 +903,7 @@ CmLteLcId      idx;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMInsPcch
-(
-RgCellCb       *cellCb, 
-CmLteLcId      idx
-)
-#else
-Void rgDBMInsPcch(cellCb, idx)
-RgCellCb       *cellCb;
-CmLteLcId      idx;
-#endif
+Void rgDBMInsPcch(RgCellCb *cellCb, CmLteLcId idx)
 {
 
    cellCb->pcchInfo.lcId = idx;
@@ -1210,15 +923,7 @@ CmLteLcId      idx;
  *  @param[in] *cellCb 
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgDBMInitRachLst
-(
-RgCellCb       *cellCb
-)
-#else
-static Void rgDBMInitRachLst(cellCb)
-RgCellCb       *cellCb;
-#endif
+static Void rgDBMInitRachLst(RgCellCb *cellCb)
 {
 
    cmLListInit(&cellCb->raInfo.ueRachLst);
@@ -1237,17 +942,7 @@ RgCellCb       *cellCb;
  *  @param[in]  *ueCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgDBMInsUeCbInRachLst
-(
-RgCellCb       *cellCb, 
-RgUeCb         *ueCb
-)
-#else
-Void rgDBMInsUeCbInRachLst(cellCb, ueCb)
-RgCellCb       *cellCb; 
-RgUeCb         *ueCb;
-#endif
+Void rgDBMInsUeCbInRachLst(RgCellCb *cellCb, RgUeCb *ueCb)
 {
 
    cmLListAdd2Tail(&cellCb->raInfo.ueRachLst,&ueCb->rachLstEnt);
@@ -1267,17 +962,7 @@ RgUeCb         *ueCb;
  *  @param[in]  key
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetUeCbFromRachLst
-(
-RgCellCb       *cellCb, 
-CmLteRnti      key
-)
-#else
-RgUeCb* rgDBMGetUeCbFromRachLst(cellCb, key)
-RgCellCb       *cellCb; 
-CmLteRnti      key;
-#endif
+RgUeCb* rgDBMGetUeCbFromRachLst(RgCellCb *cellCb, CmLteRnti key)
 {
    CmLList *tmpNode;
 
@@ -1305,17 +990,7 @@ CmLteRnti      key;
  *  @param[in]  *ueCb
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgDBMGetNextUeCbFromRachLst
-(
-RgCellCb       *cellCb,
-RgUeCb         *ueCb
-)
-#else
-RgUeCb* rgDBMGetNextUeCbFromRachLst(cellCb, ueCb)
-RgCellCb       *cellCb; 
-RgUeCb         *ueCb;
-#endif
+RgUeCb* rgDBMGetNextUeCbFromRachLst(RgCellCb *cellCb,RgUeCb *ueCb)
 {
 
    if(!ueCb)
@@ -1339,17 +1014,7 @@ RgUeCb         *ueCb;
  *  @param[in]  key
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-Void rgDBMDelUeCbFromRachLst
-(
-RgCellCb       *cellCb, 
-RgUeCb         *ueCb 
-)
-#else
-Void rgDBMDelUeCbFromRachLst(cellCb, ueCb)
-RgCellCb       *cellCb; 
-RgUeCb         *ueCb;
-#endif
+Void rgDBMDelUeCbFromRachLst(RgCellCb *cellCb, RgUeCb *ueCb)
 {
 
    cmLListDelFrm(&cellCb->raInfo.ueRachLst, &ueCb->rachLstEnt);
index 84e4746..3c648e4 100755 (executable)
@@ -83,8 +83,8 @@ static Void rgDHMBldTfuDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgDlHqProcCb
 #ifdef L2_OPTMZ
 S16 rgDHMFreeHqProcTB
 (
-RgDlHqProcCb         *hqP,
-uint8_t              tbIndex
+RgDlHqProcCb *hqP,
+uint8_t      tbIndex
 );
 
 #endif
@@ -111,19 +111,7 @@ uint8_t              tbIndex
  *           -# RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgDHMHqEntInit
-(
-Inst               inst,
-RgDlHqEnt          *hqE,
-uint8_t            maxHqProcs
-)
-#else
-S16 rgDHMHqEntInit(inst,hqE, maxHqProcs)
-Inst               inst,
-RgDlHqEnt          *hqE;
-uint8_t            maxHqProcs;
-#endif
+S16 rgDHMHqEntInit(Inst  inst, RgDlHqEnt *hqE, uint8_t maxHqProcs)
 {
    uint8_t idx1,idx2;
 #ifdef L2_OPTMZ
@@ -195,17 +183,7 @@ uint8_t            maxHqProcs;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgDHMUeReset
-(
-RgCellCb *cell,
-RgDlHqEnt          *hqE
-)
-#else
-Void rgDHMUeReset(cell, hqE)
-RgCellCb *cell;
-RgDlHqEnt          *hqE;
-#endif
+Void rgDHMUeReset(RgCellCb *cell, RgDlHqEnt  *hqE)
 {
    uint8_t       i = 0;
 
@@ -241,16 +219,7 @@ RgDlHqEnt          *hqE;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgDHMHdlBufFree
-(
-Inst inst,
-Buffer **mBuf
-)
-#else
 Void rgDHMHdlBufFree(Inst inst, Buffer **mBuf)
-Inst inst;
-#endif
 {
    RgCb *rgCbP = &rgCb[inst];
 
@@ -287,15 +256,7 @@ Inst inst;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgDHMFreeTbBufs
-(
-Inst inst
-)
-#else
-Void rgDHMFreeTbBufs(inst)
-Inst inst;
-#endif
+Void rgDHMFreeTbBufs(Inst inst)
 {
    RgCb *rgCbP = &rgCb[inst];
    uint8_t start = rgCbP->bufCnt;
@@ -318,15 +279,7 @@ Inst inst;
    return;
 } /* rgDHMFreeTbBufs */
 
-#ifdef ANSI
-Void rgDHMFreeAllTbBufs
-(
-Inst inst
-)
-#else
-Void rgDHMFreeAllTbBufs(inst)
-Inst inst;
-#endif
+Void rgDHMFreeAllTbBufs(Inst inst)
 {
    RgCb *rgCbP = &rgCb[inst];
    uint8_t start = rgCbP->bufCnt;
@@ -358,19 +311,7 @@ Inst inst;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-S16 rgDHMRlsHqProcTB
-(
-RgCellCb             *cell,
-RgDlHqProcCb         *hqP,
-uint8_t              tbIndex
-)
-#else
-S16 rgDHMRlsHqProcTB(cell, hqP, tbIndex)
-RgCellCb             *cell;
-RgDlHqProcCb         *hqP;
-uint8_t              tbIndex;
-#endif
+S16 rgDHMRlsHqProcTB(RgCellCb  *cell, RgDlHqProcCb *hqP, uint8_t tbIndex)
 {
     uint8_t          idx;
 #ifdef L2_OPTMZ
@@ -447,19 +388,7 @@ uint8_t              tbIndex;
  *         -#   RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgDHMGetHqProcFrmId
-(
-RgUeCb               *ue,
-uint8_t              idx,
-RgDlHqProcCb         **hqP
-)
-#else
-S16 rgDHMGetHqProcFrmId(ue, idx, hqP)
-RgUeCb               *ue;
-uint8_t              idx;
-RgDlHqProcCb         **hqP;
-#endif
+S16 rgDHMGetHqProcFrmId(RgUeCb *ue, uint8_t  idx, RgDlHqProcCb **hqP)
 {
    /* Pick the proc based on the index provided */
    *hqP = (ue->dl.hqEnt.procs[idx]);
@@ -487,7 +416,6 @@ RgDlHqProcCb         **hqP;
  *      -#ROK 
  *      -#RFAILED 
  **/
-#ifdef ANSI
 S16 rgDHMSndDatReq
 (
 RgCellCb        *cellCb,
@@ -496,14 +424,6 @@ RgTfuDatReqInfo *datInfo,
 RgDlHqProcCb   *hqP,
 RgErrInfo      *err 
 )
-#else
-S16 rgDHMSndDatReq(cellCb, dlSf, datInfo, hqP, err)
-RgCellCb        *cellCb;
-RgDlSf          *dlSf;
-RgTfuDatReqInfo *datInfo;
-RgDlHqProcCb    *hqP;
-RgErrInfo       *err;
-#endif
 {
    uint8_t i;
    Inst    inst = cellCb->macInst - RG_INST_START;
@@ -670,7 +590,6 @@ RgErrInfo       *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgDHMHndlDedDatReq
 (
 Inst           inst,
@@ -679,14 +598,6 @@ RgRguDDatReqPerUe *datReq,
 RgDlSf            *dlSf,
 RgErrInfo      *err
 )
-#else
-S16 rgDHMHndlDedDatReq(inst,hqProc, datReq, dlSf, err)
-Inst           inst;
-RgDlHqProcCb   *hqProc;
-RgRguDDatReqPerUe *datReq;
-RgDlSf            *dlSf;
-RgErrInfo      *err;
-#endif
 {
 //   uint32_t            len;
    uint8_t        i;
@@ -815,7 +726,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgDHMHndlCmnDatReq
 (
 Inst           inst,
@@ -823,13 +733,6 @@ RgDlHqProcCb   *hqProc,
 RgRguCmnDatReq *datReq,
 RgErrInfo      *err
 )
-#else
-S16 rgDHMHndlCmnDatReq(inst,hqProc, datReq, err)
-Inst           inst;
-RgDlHqProcCb   *hqProc;
-RgRguCmnDatReq *datReq;
-RgErrInfo      *err;
-#endif
 {
    RgUstaDgn      dgn;
    RgBldPduInfo   bldPdu;
@@ -896,7 +799,6 @@ RgErrInfo      *err;
  *      -# RFAILED 
  **/
  RgUeCb  *gUe =NULLP;
-#ifdef ANSI
 S16 rgDHMSndConsolidatedStaInd
 (
 RgCellCb        *cell,
@@ -904,13 +806,6 @@ RgInfUeInfo     *ueInfo,
 CmLteTimingInfo timingInfo,
 RgErrInfo       *err
 )
-#else
-S16 rgDHMSndConsolidatedStaInd(cell, ueInfo, timingInfo, err)
-RgCellCb        *cell;
-RgInfUeInfo     *ueInfo;
-CmLteTimingInfo timingInfo;
-RgErrInfo       *err;
-#endif
 {
    SuId            rguDlSpId;/*need to use spID instead of suID*/
    uint8_t         idx;
@@ -1262,7 +1157,6 @@ RgErrInfo       *err;
  *              None 
  **/
 //uint8_t crashFlag = 0;
-#ifdef ANSI
 static Void rgDHMBldTfuDatReq
 (
 RgCellCb           *cellCb,
@@ -1270,13 +1164,6 @@ RgDlSf             *dlSf,
 RgDlHqProcCb       *hqP,
 RgTfuDatReqPduInfo *datReq
 )
-#else
-static Void rgDHMBldTfuDatReq(cellCb, dlSf, hqP, datReq)
-RgCellCb           *cellCb;
-RgDlSf             *dlSf;
-RgDlHqProcCb       *hqP;
-RgTfuDatReqPduInfo *datReq;
-#endif
 {
 
 #ifndef L2_OPTMZ
@@ -1431,17 +1318,7 @@ RgTfuDatReqPduInfo *datReq;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-S16 rgDHMFreeHqProcTB
-(
-RgDlHqProcCb         *hqP,
-uint8_t              tbIndex
-)
-#else
-S16 rgDHMFreeHqProcTB(hqP, tbIndex)
-RgDlHqProcCb         *hqP;
-uint8_t              tbIndex;
-#endif
+S16 rgDHMFreeHqProcTB(RgDlHqProcCb *hqP, uint8_t tbIndex)
 {
    RgTfuDatReqTbInfo     *tb;   /* TB to be sent to CL/PHY*/
    uint8_t               idx;
@@ -1488,17 +1365,7 @@ uint8_t              tbIndex;
  *  @return     None.
  *
  **/
-#ifdef ANSI
-Void rgDHMFreeUe
-(
-Inst               inst,
-RgDlHqEnt          *hqE
-)
-#else
-Void rgDHMFreeUe(inst,hqE)
-Inst               inst;
-RgDlHqEnt          *hqE;
-#endif
+Void rgDHMFreeUe(Inst  inst, RgDlHqEnt *hqE)
 {
    uint8_t             i;
 
@@ -1545,17 +1412,7 @@ RgDlHqEnt          *hqE;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacRstHqEntReq
-(
-Pst*                 pst,    
-RgInfResetHqEnt*     hqEntInfo
-)
-#else
-S16 RgSchMacRstHqEntReq(pst, hqEntInfo)
-Pst*                 pst;
-RgInfResetHqEnt*     hqEntInfo;
-#endif
+S16 RgSchMacRstHqEntReq(Pst* pst, RgInfResetHqEnt* hqEntInfo)
 {
    Inst      inst;
    RgCellCb  *cell;
@@ -1603,17 +1460,7 @@ uint32_t gSaveVal;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacRlsHqReq
-(
-Pst                 *pst,
-RgInfRlsHqInfo      *rlshqUeInfo
-)
-#else
-S16 RgSchMacRlsHqReq(pst, rlshqUeInfo)
-Pst                 *pst;
-RgInfRlsHqInfo      *rlshqUeInfo;
-#endif
+S16 RgSchMacRlsHqReq(Pst *pst, RgInfRlsHqInfo *rlshqUeInfo)
 {
    Inst           inst;
    RgCellCb       *cell = NULLP;
index d4cb889..f474bae 100755 (executable)
@@ -148,25 +148,7 @@ static int RLOG_MODULE_ID=4096;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgDUXInsSdu
-(
-Inst        inst,
-RgMacPdu    *pdu,
-RgMacSdu    **sdu,
-uint8_t     lcId,
-uint16_t    sduLen,
-RgErrInfo   *err
-)
-#else
-static S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err)
-Inst        inst;
-RgMacPdu    *pdu;
-RgMacSdu    **sdu,
-uint8_t     lcId;
-uint16_t    sduLen;
-RgErrInfo   *err;
-#endif
+static S16 rgDUXInsSdu(Inst inst, RgMacPdu *pdu, RgMacSdu **sdu, uint8_t lcId, uint16_t sduLen, RgErrInfo *err)
 {
    S16         ret;
    RgMacSdu    *sduAloc = NULLP;
@@ -207,26 +189,7 @@ RgErrInfo   *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgDUXExtSubHdr
-(
-Inst        inst,
-RgMacPdu    *pdu,
-Buffer      *mBuf,
-uint8_t     *lcId,
-uint16_t    *len,
-RgErrInfo   *err
-)
-#else
-static S16 rgDUXExtSubHdr(inst,pdu, mBuf, lcId,
-len, err)
-Inst        inst;
-RgMacPdu    *pdu;
-Buffer      *mBuf;
-uint8_t     *lcId;
-uint16_t    *len;
-RgErrInfo   *err;
-#endif
+static S16 rgDUXExtSubHdr(Inst inst, RgMacPdu *pdu, Buffer *mBuf, uint8_t *lcId, uint16_t *len, RgErrInfo *err)
 {
    uint8_t             byte;
    uint8_t             fmt=0;
@@ -290,27 +253,8 @@ RgErrInfo   *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgDUXExtCe
-(
-Inst        inst,
-RgMacPdu    *pdu,
-RgInfCeInfo *ceInfo,
-Buffer      *mBuf,
-uint8_t     lcId,
-uint16_t    subPduLen,
-RgErrInfo   *err
-)
-#else
-static S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err)
-Inst        inst;
-RgMacPdu    *pdu;
-RgInfCeInfo *ceInfo;
-Buffer      *mBuf;
-uint8_t     lcId;
-uint16_t    subPduLen;
-RgErrInfo   *err;
-#endif
+static S16 rgDUXExtCe(Inst inst, RgMacPdu *pdu, RgInfCeInfo *ceInfo, Buffer *mBuf, uint8_t lcId, uint16_t subPduLen,\
+RgErrInfo *err)
 {
    S16            ret;
 
@@ -486,27 +430,8 @@ RgErrInfo   *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgDUXExtSdu
-(
-Inst        inst,
-RgMacPdu    *pdu,
-RgInfCeInfo *ceInfo,
-Buffer      **mBuf,
-uint8_t     lcId,
-uint16_t    subPduLen,
-RgErrInfo   *err
-)
-#else
-static S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err)
-Inst        inst;
-RgMacPdu    *pdu;
-RgInfCeInfo *ceInfo;
-Buffer      **mBuf;
-uint8_t     lcId;
-uint16_t    subPduLen;
-RgErrInfo   *err;
-#endif
+static S16 rgDUXExtSdu(Inst inst, RgMacPdu *pdu, RgInfCeInfo *ceInfo, Buffer **mBuf, uint8_t lcId, uint16_t subPduLen,\
+RgErrInfo *err)
 {
    S16         ret;
    Buffer      *tmpBuf1;
@@ -563,23 +488,7 @@ RgErrInfo   *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgDUXDemuxData
-(
-Inst          inst,
-RgMacPdu      *pdu,
-RgInfCeInfo   *ceInfo,
-Buffer        **mBuf,
-RgErrInfo     *err
-)
-#else
-S16 rgDUXDemuxData(inst,pdu, ceInfo, mBuf, err)
-Inst          inst;
-RgMacPdu      *pdu;
-RgInfCeInfo   *ceInfo;
-Buffer        **mBuf;
-RgErrInfo     *err;
-#endif
+S16 rgDUXDemuxData(Inst inst, RgMacPdu  *pdu, RgInfCeInfo *ceInfo, Buffer **mBuf, RgErrInfo *err)
 {
    uint8_t     lcId;
    uint16_t    subPduLen;
index 6e64f4a..a4c422c 100755 (executable)
@@ -73,17 +73,11 @@ registered with SSI during the LTE MAC Task initialization.
  *  @param[in]  Reason reason.
  *  @return  void
  **/
-#ifdef ANSI
 static inline void rgHdlSMEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-static inline void rgHdlSMEvents(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -154,17 +148,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @return  void
  **/
-#ifdef ANSI
 static inline void rgHdlNHEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-static inline void rgHdlNHEvents(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -199,17 +187,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @return  void
  **/
-#ifdef ANSI
 static inline void rgHdlKWEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-static inline void rgHdlKWEvents(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -254,17 +236,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @return  void
  **/
-#ifdef ANSI
 static inline void rgHdlTFEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-static inline void rgHdlTFEvents(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -307,17 +283,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @return  void
  **/
-#ifdef ANSI
 static inline void rgHdlRGEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-static inline void rgHdlRGEvents(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -431,17 +401,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgActvTsk
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-S16 rgActvTsk(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->srcEnt)
    {
index 85c1378..a0c3d29 100755 (executable)
@@ -97,15 +97,10 @@ static const SystemId sId ={
 *
 */
  
-#ifdef ANSI
 Void rgGetSId
 (
 SystemId *s                 /* system id */
 )
-#else
-Void rgGetSId(s)
-SystemId *s;                /* system id */
-#endif
 {
    s->mVer = sId.mVer;
    s->mRev = sId.mRev;
index 71794cb..0ba47b0 100755 (executable)
@@ -93,7 +93,6 @@ static RgL2MeasCb * rgL2mAllocMeasCb ARGS((
  *      -# RFAILED 
  *
  */
-#ifdef ANSI
 S16 rgL2mCreateMeasCb 
 (
 RgCellCb       *cell,
@@ -101,13 +100,6 @@ RgInfL2MeasReq *measInfo,
 uint8_t        measType,
 RgErrInfo      *err
 )
-#else
-S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
-RgCellCb       *cell;
-RgInfL2MeasReq *measInfo; 
-uint8_t        measType;
-RgErrInfo      *err;
-#endif    
 {
   // Inst    inst = cell->macInst - RG_INST_START;
    uint32_t     idx;
@@ -164,19 +156,12 @@ RgErrInfo      *err;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgL2mMeasReq 
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo,
 RgErrInfo      *err
 )
-#else
-S16 rgL2mMeasReq(cell, measInfo, err)
-RgCellCb       *cell;
-RgInfL2MeasReq *measInfo; 
-RgErrInfo      *err;
-#endif    
 {
    S16  ret=RFAILED;
 
@@ -199,17 +184,7 @@ RgErrInfo      *err;
  * @param  [in] RgCellCb          *cell
  * @param  [in] RgInfL2MeasCfm    *measCfm
  */
-#ifdef ANSI
-static Void rgSndL2MeasCfm
-(
-RgCellCb          *cell, 
-RgInfL2MeasCfm    *measCfm
-)
-#else
-static Void rgSndL2MeasCfm (cell, measCfm)
-RgCellCb          *cell; 
-RgInfL2MeasCfm    *measCfm;   
-#endif
+static Void rgSndL2MeasCfm(RgCellCb *cell, RgInfL2MeasCfm *measCfm)
 {
    Pst             pst;
    Inst            macInst = cell->macInst - RG_INST_START;
@@ -231,17 +206,7 @@ RgInfL2MeasCfm    *measCfm;
  * @param  [in] RgCellCb          *cell
  * @param  [in] RgInfL2MeasCfm    *measCfm
  */
-#ifdef ANSI
-static Void rgSndL2MeasStopCfm
-(
-RgCellCb          *cell,
-RgInfL2MeasCfm    *measCfm
-)
-#else
-static Void rgSndL2MeasStopCfm (cell, measCfm)
-RgCellCb          *cell;
-RgInfL2MeasCfm    *measCfm;
-#endif
+static Void rgSndL2MeasStopCfm(RgCellCb *cell,RgInfL2MeasCfm *measCfm)
 {
    Pst             pst;
    Inst            macInst = cell->macInst - RG_INST_START;
@@ -267,17 +232,11 @@ RgInfL2MeasCfm    *measCfm;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgSchMacL2MeasReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasReq    *measInfo      /* Meas Req Info */
 )
-#else
-S16 RgSchMacL2MeasReq(pst, measInfo)
-Pst               *pst;          /* post structure  */
-RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
-#endif    
 {
    Inst            inst;
    RgCellCb        *cellCb = NULLP;
@@ -328,17 +287,11 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgSchMacL2MeasStopReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasStopReq *measInfo      /* Meas Req Info */
 )
-#else
-S16 RgSchMacL2MeasStopReq(pst, measInfo)
-Pst               *pst;          /* post structure  */
-RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
-#endif
 {
    S16            ret = ROK;   
    CmLList        *node   = NULLP;
@@ -398,17 +351,11 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgSchMacL2MeasSendReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasSndReq *measInfo      /* Meas Req Info */
 )
-#else
-S16 RgSchMacL2MeasSendReq(pst, measInfo)
-Pst               *pst;          /* post structure  */
-RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
-#endif
 {
    Inst            inst;
    RgCellCb       *cellCb = NULLP;
@@ -445,19 +392,12 @@ RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgL2mInsertMeasCb
 (
 RgCellCb       *cell,
 RgL2MeasCb     *measCb,
 RgInfL2MeasReq *measInfo
 )
-#else
-static S16 rgL2mInsertMeasCb(cell, measCb, measInfo)
-RgCellCb       *cell;
-RgL2MeasCb     *measCb;
-RgInfL2MeasReq *measInfo;
-#endif
 {
    CmLList    *lnk, *node;
    RgL2MeasCb *oldMeasCb;
@@ -510,19 +450,12 @@ RgInfL2MeasReq *measInfo;
  * @param  [out] RgErrInfo      *err
  * @return  RgSchL2MeasCb *
  */
-#ifdef ANSI
 static RgL2MeasCb * rgL2mAllocMeasCb
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo,
 RgErrInfo      *err
 )
-#else
-static RgL2MeasCb * rgL2mAllocMeasCb(cell, measInfo, err)
-RgCellCb       *cell;
-RgInfL2MeasReq *measInfo;
-RgErrInfo      *err;
-#endif
 {
    RgL2MeasCb       *measCb = NULLP;
    Inst             inst = cell->macInst - RG_INST_START;
@@ -558,15 +491,7 @@ RgErrInfo      *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgL2Meas
-(
-RgCellCb  *cell
-)
-#else
-S16 rgL2Meas(cell)
-RgCellCb  *cell;
-#endif
+S16 rgL2Meas(RgCellCb  *cell)
 {
    CmLList         *node   = NULLP;
    RgL2MeasCb      *measCb = NULLP;
index 9ce6360..9c92d9d 100755 (executable)
@@ -83,19 +83,12 @@ static Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgLiTfuBndCfm 
 (
 Pst     *pst,
 SuId    suId, 
 uint8_t status
 )
-#else
-S16 RgLiTfuBndCfm(pst, suId, status)
-Pst     *pst; 
-SuId    suId; 
-uint8_t status;
-#endif
 {
    Inst inst;
    S16 ret;
@@ -130,17 +123,7 @@ uint8_t status;
   *   -# RFAILED
   */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
-static S16 rgLIMValidateSap
-(
- Inst    inst,
- SuId    suId
-)
-#else
-static S16 rgLIMValidateSap(inst,suId)
- Inst    inst;
- SuId    suId;
-#endif
+static S16 rgLIMValidateSap(Inst  inst,SuId suId)
 {
    RgLowSapCb  *tfuSap;
 
@@ -176,17 +159,7 @@ static S16 rgLIMValidateSap(inst,suId)
  * @param  [in] Bool          *error
  * @return 
  */
-#ifdef ANSI
-static Void rgLIMUtlFreeDatIndEvnt 
-(
- TfuDatIndInfo *datInd,
- Bool          error
- )
-#else
-static Void rgLIMUtlFreeDatIndEvnt(datInd, error)
- TfuDatIndInfo *datInd;
- Bool          error;
-#endif
+static Void rgLIMUtlFreeDatIndEvnt(TfuDatIndInfo *datInd,Bool error)
 {
 
    TfuDatInfo     *datInfo;
@@ -227,19 +200,12 @@ static Void rgLIMUtlFreeDatIndEvnt(datInd, error)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgLiTfuDatInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuDatIndInfo    *datInd
 )
-#else
-S16 RgLiTfuDatInd(pst, suId, datInd)
-Pst                *pst; 
-SuId               suId; 
-TfuDatIndInfo    *datInd;
-#endif
 {
    Inst             inst;
    S16              ret;
@@ -296,17 +262,7 @@ TfuDatIndInfo    *datInd;
  * @param  [in] Bool          *error
  * @return 
  */
-#ifdef ANSI
-static Void rgLIMUtlFreeDatReqEvnt
-(
- TfuDatReqInfo *datReq,
- Bool          error
- )
-#else
-static Void rgLIMUtlFreeDatReqEvnt(datReq, error)
- TfuDatReqInfo *datReq;
- Bool          error;
-#endif
+static Void rgLIMUtlFreeDatReqEvnt(TfuDatReqInfo *datReq,Bool  error)
 {
 
    TfuDatReqPduInfo *datInfo;
@@ -364,17 +320,7 @@ static Void rgLIMUtlFreeDatReqEvnt(datReq, error)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgLIMTfuDelDatReq 
-(
-Inst          inst,
-TfuDelDatReqInfo *delDatReq
-)
-#else
-S16 rgLIMTfuDatReq(inst,delDatReq)
-Inst          inst;
-TfuDelDatReqInfo *delDatReq;
-#endif
+S16 rgLIMTfuDelDatReq(Inst inst,TfuDelDatReqInfo *delDatReq)
 {
    S16         ret;
    RgLowSapCb  *tfuSap;
@@ -417,17 +363,7 @@ TfuDelDatReqInfo *delDatReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuNonRtInd
-(
-Pst                 *pst,
-SuId                suId
-)
-#else
-S16 RgLiTfuNonRtInd(pst, suId)
-Pst                 *pst;
-SuId                suId;
-#endif
+S16 RgLiTfuNonRtInd(Pst  *pst,SuId  suId)
 {
 
 #ifdef NO_ERRCLS
index b346b74..db579fc 100755 (executable)
@@ -137,7 +137,6 @@ Pst           *cfmPst
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgActvInit
 (
 Ent entity,            /* entity */
@@ -145,13 +144,6 @@ Inst inst,             /* instance */
 Region region,         /* region */
 Reason reason          /* reason */
 )
-#else
-S16 rgActvInit(entity, inst, region, reason)
-Ent entity;            /* entity */
-Inst inst;             /* instance */
-Region region;         /* region */
-Reason reason;         /* reason */
-#endif
 {
    Inst macInst ;
 
@@ -233,17 +225,11 @@ Reason reason;         /* reason */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCfgReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfg     /* config structure  */
 )
-#else
-S16 RgMiLrgCfgReq(pst, cfg)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfg;    /* config structure  */
-#endif    
 {
    uint16_t  ret = LCM_PRIM_OK;
    uint16_t  reason = LCM_REASON_NOT_APPL;
@@ -327,17 +313,11 @@ RgMngmt  *cfg;    /* config structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStsReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *sts     /* statistics structure  */
 )
-#else
-S16 RgMiLrgStsReq(pst, sts)
-Pst      *pst;    /* post structure  */
-RgMngmt  *sts;    /* statistics structure  */
-#endif    
 {
    Pst       cfmPst;
    RgMngmt   cfm;
@@ -499,17 +479,11 @@ RgMngmt  *sts;    /* statistics structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStaReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *sta     /* status structure  */
 )
-#else
-S16 RgMiLrgStaReq(pst, sta)
-Pst      *pst;    /* post structure  */
-RgMngmt  *sta;    /* status structure  */
-#endif    
 {
    Pst       cfmPst;
    RgMngmt   cfm;
@@ -628,17 +602,11 @@ RgMngmt  *sta;    /* status structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCntrlReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cntrl   /* control structure  */
 )
-#else
-S16 RgMiLrgCntrlReq(pst, cntrl)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cntrl;  /* control structure  */
-#endif    
 {
    S16       ret = ROK;            /* return value */
    Pst       cfmPst;
@@ -711,19 +679,12 @@ RgMngmt  *cntrl;  /* control structure  */
  *      -# LCM_REASON_INVALID_SAP
  *      -# LCM_REASON_NOT_APPL
  **/
-#ifdef ANSI
 static uint16_t rgLMMSapCfg
 (
 Inst  inst,
 RgCfg *cfg,            /* Configuaration information */
 Elmnt sapType             /* Sap Type */
 )
-#else
-static uint16_t rgLMMSapCfg(inst,cfg,sapType)
-Inst  inst;
-RgCfg *cfg;            /* Configuaration information */
-Elmnt sapType;            /* Sap Type */
-#endif
 {
    uint16_t          ret = LCM_REASON_NOT_APPL;
    RgLowSapCfgInfo   *lowSapCfg = NULLP;
@@ -858,17 +819,11 @@ Elmnt sapType;            /* Sap Type */
  *      -# LCM_REASON_INVALID_MSGTYPE
  *      -# LCM_REASON_MEM_NOAVAIL
  **/
-#ifdef ANSI
 static uint16_t rgLMMGenCfg
 (
 Inst inst,
 RgCfg *cfg            /* Configuaration information */
 )
-#else
-static uint16_t rgLMMGenCfg(inst,cfg)
-Inst inst;
-RgCfg *cfg;            /* Configuaration information */
-#endif
 {
    uint16_t    ret = LCM_REASON_NOT_APPL;
 
@@ -972,15 +927,7 @@ RgCfg *cfg;            /* Configuaration information */
  *     File : rg_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgLMMShutdown
-(
-Inst inst
-)
-#else
-static Void rgLMMShutdown(inst)
-Inst inst;
-#endif
+static Void rgLMMShutdown(Inst inst)
 {
    RgCellCb   *cell = rgCb[inst].cell;
    uint8_t    idx;
@@ -1051,19 +998,12 @@ Inst inst;
  *     File : rg_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgLMMGenCntrl 
 (
 RgMngmt       *cntrl,
 RgMngmt       *cfm,
 Pst           *cfmPst
 )
-#else
-static Void rgLMMGenCntrl(cntrl, cfm, cfmPst)
-RgMngmt       *cntrl;
-RgMngmt       *cfm;
-Pst           *cfmPst;
-#endif
 {
    Inst      inst = (cfmPst->srcInst - RG_INST_START);
 
@@ -1175,19 +1115,12 @@ Pst           *cfmPst;
  *     File : rg_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgLMMSapCntrl 
 (
 RgMngmt       *cntrl,
 RgMngmt       *cfm,
 Pst           *cfmPst
 )
-#else
-static Void rgLMMSapCntrl(cntrl, cfm, cfmPst)
-RgMngmt       *cntrl;
-RgMngmt       *cfm;
-Pst           *cfmPst;
-#endif
 {
    Inst      inst = cfmPst->srcInst - RG_INST_START;
 
@@ -1337,19 +1270,12 @@ Pst           *cfmPst;
  *     File : rg_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgLMMFillCfmPst
 (
 Pst           *reqPst,
 Pst           *cfmPst,
 RgMngmt       *cfm
 )
-#else
-static Void rgLMMFillCfmPst(reqPst, cfmPst, cfm)
-Pst           *reqPst;
-Pst           *cfmPst;
-RgMngmt       *cfm;
-#endif
 {
    Inst inst;
    inst = (reqPst->dstInst - RG_INST_START);
@@ -1389,21 +1315,13 @@ RgMngmt       *cfm;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-   S16 rgLMMStartTmr
+S16 rgLMMStartTmr
 (
- Inst               inst,
- S16                tmrEvnt,            /* Timer Event */
- uint32_t           tmrVal,             /* Wait Time */
- PTR                cb                  /* Entry for which Timer Expired */
- )
-#else
-S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb)
-   Inst               inst;
-   S16                tmrEvnt;            /* Timer Event */
-   uint32_t           tmrVal;             /* Wait Time */
-   PTR                cb;                 /* Entry for which Timer Expired */
-#endif
+Inst               inst,
+S16                tmrEvnt,            /* Timer Event */
+uint32_t           tmrVal,             /* Wait Time */
+PTR                cb                  /* Entry for which Timer Expired */
+)
 {
    CmTmrArg    arg;
 
@@ -1447,19 +1365,12 @@ S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgLMMStopTmr
 (
 Inst               inst,             /* Scheduler instance */
 S16                tmrEvnt,            /* Timer Event */
 PTR                cb                  /* Entry for which Timer Expired */
 )
-#else
-S16 rgLMMStopTmr(inst,tmrEvnt, cb)
-Inst               inst;             /* Scheduler instance */
-S16                tmrEvnt;            /* Timer Event */
-PTR                cb;                 /* Entry for which Timer Expired */
-#endif
 {
    CmTmrArg   arg;
    uint8_t      i;
@@ -1513,17 +1424,11 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgLMMTmrExpiry
 (
 PTR cb,               /* Pointer to timer control block */
 S16 tmrEvnt           /* Timer Event */
 )
-#else
-S16 rgLMMTmrExpiry(cb,tmrEvnt)
-PTR cb;               /* Pointer to timer control block */
-S16 tmrEvnt;          /* Timer Event */
-#endif
 {
    S16        ret = ROK;
    RgLowSapCb *tfuSap = (RgLowSapCb *)cb;
@@ -1580,7 +1485,6 @@ S16 tmrEvnt;          /* Timer Event */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgLMMStaInd
 (
 Inst inst,
@@ -1589,18 +1493,8 @@ uint16_t event,
 uint16_t cause,
 RgUstaDgn *dgn
 )
-#else
-S16 rgLMMStaInd(inst,category, event, cause, dgn) 
-Inst inst;
-uint16_t category;
-uint16_t event;
-uint16_t cause;
-RgUstaDgn *dgn;
-#endif
 {
    RgMngmt    usta;
-
-
    if(rgCb[inst].rgInit.usta == FALSE)
    {
       return ROK;
@@ -1643,19 +1537,12 @@ RgUstaDgn *dgn;
  *  @param[in]   uint8_t event, the trace event.
  *  @return Void 
  **/
-#ifdef ANSI
 Void rgLMMTrcInd
 (
 Inst   inst,
 Buffer *srcMbuf,    /* Message Buffer */
 uint8_t event            /* event */
 )
-#else
-Void rgLMMTrcInd(inst,srcMbuf,event)
-Inst   inst;
-Buffer *srcMbuf;    /* Message Buffer */
-uint8_t event;           /* event */
-#endif
 {
    Buffer   *dstMbuf = NULLP;   
    MsgLen   bufLen  = 0;
@@ -1795,19 +1682,12 @@ uint8_t event;           /* event */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgLMMBndCfm
 (
 Pst *pst,               /* Post Structure */
 SuId suId,              /* Service user ID */
 uint8_t status               /* Status */
 )
-#else
-S16 rgLMMBndCfm(pst,suId,status)
-Pst *pst;               /* Post Structure */
-SuId suId;              /* Service user ID */
-uint8_t status;              /* Status */
-#endif
 {
    Inst      inst = pst->dstInst - RG_INST_START;
    S16       ret = ROK;
@@ -1894,17 +1774,7 @@ uint8_t status;              /* Status */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgActvTmr
-(
-Ent     ent,
-Inst    inst
-)
-#else
-S16 rgActvTmr(ent, inst)
-Ent     ent;
-Inst    inst;
-#endif
+S16 rgActvTmr(Ent ent,Inst inst)
 {
    Inst macInst = (inst  - RG_INST_START);
 
index bc9f0b3..1473e7a 100755 (executable)
@@ -155,7 +155,6 @@ uint16_t rgMUXCalcRiv ARGS((uint8_t bw,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgMUXAddCes
 (
 Inst           inst,
@@ -163,13 +162,6 @@ RgBldPduInfo   *pdu,
 Buffer         *ceBuf,
 RgErrInfo      *err
 )
-#else
-static S16 rgMUXAddCes(inst,pdu, ceShdrBuf, ceBuf, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         *ceBuf;
-RgErrInfo      *err;
-#endif
 {
    S16            ret;
    RgMUXSubHdr    subHdr;
@@ -278,7 +270,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgMUXInsSdu
 (
 Inst           inst,
@@ -288,15 +279,6 @@ Buffer         *sdu,
 Buffer         *sduBuf,
 RgErrInfo      *err
 )
-#else
-static S16 rgMUXInsSdu(inst,schdTbSz, lcId, sdu, sduBuf, err)
-Inst           inst;
-MsgLen         *schdTbSz;
-uint8_t        lcId;
-Buffer         *sdu;
-Buffer         *sduBuf;
-RgErrInfo      *err;
-#endif
 {
    S16            ret;
    MsgLen         msgLen = 0;
@@ -369,7 +351,6 @@ RgErrInfo      *err;
 #ifdef L2_OPTMZ
 uint32_t padSize = 0;
 #endif
-#ifdef ANSI
 S16 rgMUXAddPadd
 (
 Inst           inst,
@@ -378,14 +359,6 @@ Buffer         *sduBuf,
 Bool           isRar,
 RgErrInfo      *err
 )
-#else
-S16 rgMUXAddPadd(inst,schdTbSz, sduBuf, isRar, err)
-Inst           inst;
-MsgLen         *schdTbSz;
-Buffer         *sduBuf;
-Bool           isRar;
-RgErrInfo      *err;
-#endif
 {
    S16     ret = ROK;
    Buffer         *padBuf = NULLP;
@@ -509,7 +482,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgMUXAddSdus
 (
 Inst           inst,
@@ -517,13 +489,6 @@ RgBldPduInfo   *pdu,
 Buffer         *sduBuf,
 RgErrInfo      *err
 )
-#else
-static S16 rgMUXAddSdus(inst,pdu, sduBuf, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         *sduBuf;
-RgErrInfo      *err;
-#endif
 {
    RgRguDDatReqPerUe *dDatReq;
    RgRguCmnDatReq    *cDatReq;
@@ -643,7 +608,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldPdu
 (
 Inst           inst,
@@ -651,13 +615,6 @@ RgBldPduInfo   *pdu,
 Buffer         **txPdu,
 RgErrInfo      *err
 )
-#else
-S16 rgMUXBldPdu(inst, pdu, txPdu, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         **txPdu;
-RgErrInfo      *err;
-#endif
 {
    Buffer         *mBuf = NULLP;
 
@@ -708,7 +665,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgMUXAddSdus
 (
 Inst                inst,
@@ -717,14 +673,6 @@ Buffer              *sHdrBuf,
 RgTfuDatReqTbInfo   *tb,
 RgErrInfo           *err
 )
-#else
-static S16 rgMUXAddSdus(pdu, sHdrBuf, tb, err)
-Inst                inst;
-RgBldPduInfo        *pdu;
-Buffer              *sHdrBuf;
-RgTfuDatReqTbInfo   *tb;
-RgErrInfo           *err;
-#endif
 {
    RgRguDDatReqPerUe  *dDatReq;
    RgRguCmnDatReq     *cDatReq;
@@ -945,7 +893,6 @@ RgErrInfo           *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldPdu
 (
 Inst               inst,
@@ -953,13 +900,6 @@ RgBldPduInfo       *pdu,
 RgTfuDatReqTbInfo  *tb,
 RgErrInfo          *err
 )
-#else
-S16 rgMUXBldPdu(inst, pdu, tb, err)
-Inst               inst;
-RgBldPduInfo       *pdu;
-RgTfuDatReqTbInfo  *tb;
-RgErrInfo          *err;
-#endif
 {
    Buffer         *mBuf1; /* MAC hearder */
    Buffer         *mBuf2; /* MAC CEs */
@@ -1023,7 +963,6 @@ RgErrInfo          *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldRarPdu
 (
 RgCellCb        *cell,
@@ -1031,13 +970,6 @@ RgInfRaRntiInfo *alloc,
 Buffer          **txPdu,
 RgErrInfo       *err
 )
-#else
-S16 rgMUXBldRarPdu(cell, alloc, txPdu, err)
-RgCellCb        *cell;
-RgInfRaRntiInfo *alloc;
-Buffer          **txPdu;
-RgErrInfo       *err;
-#endif
 {
    Buffer      *datBuf = NULLP;
    S16         ret; 
@@ -1163,19 +1095,12 @@ RgErrInfo       *err;
  *     File : rg_mux.c
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgMUXGet20bitRarGrnt
 (
 uint8_t             ulBw,
 RgInfRarUlGrnt *msg3Grnt,
 uint8_t             *grnt
 )
-#else
-static Void rgMUXGet20bitRarGrnt(ulBw, msg3Grnt, grnt)
-uint8_t             ulBw;
-RgInfRarUlGrnt *msg3Grnt;
-uint8_t             *grnt;
-#endif
 {
    uint16_t       riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb);
 
@@ -1208,19 +1133,12 @@ uint8_t             *grnt;
  *     File : rg_mux.c
  *
  **********************************************************/
-#ifdef ANSI
 uint16_t rgMUXCalcRiv
 (
 uint8_t           bw,
 uint8_t           rbStart,
 uint8_t           numRb
 )
-#else
-uint16_t rgMUXCalcRiv(bw, rbStart, numRb)
-uint8_t           bw;
-uint8_t           rbStart;
-uint8_t           numRb;
-#endif
 {
    uint8_t           numRbMinus1 = numRb - 1;
    uint16_t          riv;
index 8965e8f..46ce511 100755 (executable)
@@ -84,17 +84,11 @@ static S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb                   *cell,
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellLchModReq
 (
 Pst                      *pst,    
 RgPrgUeSCellLchModInfo   *lchCfgCb
 )
-#else
-S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
-Pst                      *pst;    
-RgPrgUeSCellLchModInfo   *lchCfgCb;
-#endif
 {
    RgPrgCfgCfmInfo  cfgCfm;
    Inst             inst = pst->dstInst;
@@ -169,19 +163,12 @@ RgPrgUeSCellLchModInfo   *lchCfgCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomSndUeSCellLchDelToSmac
 (
 Inst            inst,
 CrgDel          *lcDel,
 Bool            *isCfmRqrd
 )
-#else
-S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
-Inst            inst;
-CrgDel          *lcDel;
-Bool            *isCfmRqrd;
-#endif
 {
    uint8_t                    idx = 0;
    Inst                       dstMacInst;
@@ -259,7 +246,6 @@ Bool            *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomSndUeSCellLchModToSmac
 (
 Inst           inst,
@@ -268,14 +254,6 @@ RgUeCb         *ue,
 CrgLchRecfg    *lchRecfg,
 Bool           *isCfmRqrd
 )
-#else
-S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
-Inst           inst;
-RgCellCb       *cell;
-RgUeCb         *ue;
-CrgLchRecfg    *lchRecfg;
-Bool           *isCfmRqrd;
-#endif
 {
    uint8_t                   idx = 0;
    Inst                      dstMacInst;
@@ -326,7 +304,6 @@ Bool           *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomSndUeSCellLchAddToSmac
 (
 Inst           inst,
@@ -335,14 +312,6 @@ RgUeCb         *ue,
 CrgLchCfg      *lchCfg,
 Bool           *isCfmRqrd
 )
-#else
-S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
-Inst           inst;
-RgCellCb       *cell;
-RgUeCb         *ue;
-CrgLchCfg      *lchCfg;
-Bool           *isCfmRqrd;
-#endif
 {
    uint8_t                   idx = 0;
    Inst                      dstMacInst;
@@ -394,17 +363,11 @@ Bool           *isCfmRqrd;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellLchDelReq
 (
 Pst                       *pst,    
 RgPrgUeSCellLchDelInfo    *delLcCb
 )
-#else
-S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
-Pst                       *pst;    
-RgPrgUeSCellLchDelInfo    *delLcCb;
-#endif
 {
    RgPrgCfgCfmInfo  cfgCfm;
    Inst             inst = pst->dstInst;
@@ -473,17 +436,11 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellLchAddReq
 (
 Pst                      *pst,    
 RgPrgUeSCellLchAddInfo   *lchCfgCb
 )
-#else
-S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
-Pst                      *pst;    
-RgPrgUeSCellLchAddInfo   *lchCfgCb;
-#endif
 {
    RgPrgCfgCfmInfo   cfgCfm;
    Inst              inst = pst->dstInst;
@@ -552,7 +509,6 @@ RgPrgUeSCellLchAddInfo   *lchCfgCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomVldtAddLch
 (
 Inst                    inst, 
@@ -560,13 +516,6 @@ RgPrgUeSCellLchAddInfo  *lcCfg,
 RgCellCb                **cell,
 RgUeCb                  **ue
 )
-#else
-S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
-Inst                    inst;
-RgPrgUeSCellLchAddInfo  *lcCfg;
-RgCellCb                **cell;
-RgUeCb                  **ue;
-#endif
 {
 
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC CONFIG: cellId %d ueId %d lcId %d\
@@ -626,7 +575,6 @@ RgUeCb                  **ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomUeSCellLcAdd
 (
 Inst                     inst,
@@ -634,13 +582,6 @@ RgCellCb                 *cell,
 RgUeCb                   *ue,
 RgPrgUeSCellLchAddInfo   *lcCfg
 )
-#else
-S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
-Inst                     inst;
-RgCellCb                 *cell;
-RgUeCb                   *ue;
-RgPrgUeSCellLchAddInfo   *lcCfg;
-#endif
 {
 
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC CONFIG: cellId %d ueId %d\
@@ -680,7 +621,6 @@ RgPrgUeSCellLchAddInfo   *lcCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgPomVldtSCellDedLchCfg
 (
 Inst                       inst, 
@@ -688,13 +628,6 @@ RgPrgUeSCellLchAddInfo     *lcCfg,
 RgCellCb                   **cell,
 RgUeCb                     **ue
 )
-#else
-static S16 rgPomVldtSCellDedLchCfg(inst,lcCfg, cell, ue)
-Inst                       inst;
-RgPrgUeSCellLchAddInfo     *lcCfg;
-RgCellCb                   **cell;
-RgUeCb                     **ue;
-#endif
 {
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATING CRG DEDICATED LC CONFIG \n"));
 
@@ -785,19 +718,12 @@ RgUeCb                     **ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgPomUeSCellDedLcCfg
 (
 RgCellCb                   *cell,
 RgUeCb                     *ue,
 RgPrgUeSCellLchAddInfo     *lcCfg
 )
-#else
-static S16 rgPomUeSCellDedLcCfg(cell, ue, lcCfg)
-RgCellCb                   *cell;
-RgUeCb                     *ue;
-RgPrgUeSCellLchAddInfo     *lcCfg;
-#endif
 {
    //Inst     inst = cell->macInst - RG_INST_START;
    //RGDBGPRM(inst,(rgPBuf(inst), "APPLYING DEDICATED LC CONFIG\n"));
@@ -843,23 +769,14 @@ RgPrgUeSCellLchAddInfo     *lcCfg;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 S16 rgPomVltdModLch
 (
- Inst                     inst,
- RgPrgUeSCellLchModInfo   *lchCfgCb,
- RgCellCb                 **cell,
- RgUeCb                   **ue,
- RgUlLcCb                 **ulLc
+Inst                     inst,
+RgPrgUeSCellLchModInfo   *lchCfgCb,
+RgCellCb                 **cell,
+RgUeCb                   **ue,
+RgUlLcCb                 **ulLc
 )
-#else
-S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
- Inst                     inst;
- RgPrgUeSCellLchModInfo   *lchCfgCb;
- RgCellCb                 **cell;
- RgUeCb                   **ue;
- RgUlLcCb                 **ulLc;
-#endif
 {
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
             lcId %d cell %p ue %p ulLc %p\n",lchCfgCb->cellId,
@@ -914,7 +831,6 @@ S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomUeSCellLcMod
 (
 Inst                    inst,
@@ -922,13 +838,6 @@ RgUeCb                  *ue,
 RgUlLcCb                *ulLc,
 RgPrgUeSCellLchModInfo  *lchCfgCb
 )
-#else
-S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
-Inst                    inst;
-RgUeCb                  *ue;
-RgUlLcCb                *ulLc;
-RgPrgUeSCellLchModInfo  *lchCfgCb;
-#endif
 {
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING SMAC LC RECONFIG: cellId %d ueId %d\
             lcId %d  \n",
@@ -960,25 +869,15 @@ RgPrgUeSCellLchModInfo  *lchCfgCb;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 S16 rgPomVltdDelLch
 (
- Inst                      inst,
- RgPrgUeSCellLchDelInfo    *delLcCb,
- RgCellCb                  **cell,
- RgUeCb                    **ue,
- RgUlLcCb                  **ulLc,
- RgDlLcCb                  **dlLc
+Inst                      inst,
+RgPrgUeSCellLchDelInfo    *delLcCb,
+RgCellCb                  **cell,
+RgUeCb                    **ue,
+RgUlLcCb                  **ulLc,
+RgDlLcCb                  **dlLc
 )
-#else
-S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
- Inst                      inst;
- RgPrgUeSCellLchDelInfo    *delLcCb;
- RgCellCb                  **cell;
- RgUeCb                    **ue;
- RgUlLcCb                  **ulLc;
- RgDlLcCb                  **dlLc;
-#endif
 {
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
             lcId %d cell %p ue %p ulLc %p\n",delLcCb->cellId,
@@ -1033,7 +932,6 @@ S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgPomUeSCellLcDel
 (
 Inst                      inst,
@@ -1042,14 +940,6 @@ RgUeCb                    *ue,
 RgUlLcCb                  *ulLc,
 RgDlLcCb                  *dlLc
 )
-#else
-S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
-Inst                      inst;
-RgPrgUeSCellLchDelInfo    *delLcCb;
-RgUeCb                    *ue;
-RgUlLcCb                  *ulLc;
-RgDlLcCb                  *dlLc;
-#endif
 {
 
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC DELETE: cellId %d ueId %d\
index a8dbcb7..bbdfa09 100755 (executable)
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgPMacSMacUeSCellCfgReq
-(
-Pst           *pst,
-RgPrgUeSCellCfgInfo   *ueSCellCfgInfo
-)
-#else
-S16 cmPkPrgPMacSMacUeSCellCfgReq(pst, ueSCellCfgInfo)
-Pst            *pst;
-RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellCfgReq(Pst  *pst,RgPrgUeSCellCfgInfo   *ueSCellCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -108,19 +98,7 @@ RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmUnpkPrgPMacSMacUeSCellCfgReq
-(
-RgPrgUeSCellCfgReq   func,
-Pst                  *pst,
-Buffer               *mBuf
-)
-#else
-S16 cmUnpkPrgPMacSMacUeSCellCfgReq(func, pst, mBuf)
-RgPrgUeSCellCfgReq   func;
-Pst                  *pst;
-Buffer               *mBuf;
-#endif
+S16 cmUnpkPrgPMacSMacUeSCellCfgReq(RgPrgUeSCellCfgReq   func,Pst *pst,Buffer  *mBuf)
 {
    RgPrgUeSCellCfgInfo    ueSCellCfgInfo;
    
@@ -147,17 +125,7 @@ Buffer               *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgSMacPMacCfgCfm
-(
-Pst               *pst,
-RgPrgCfgCfmInfo   *cfgCfm
-)
-#else
-S16 cmPkPrgSMacPMacCfgCfm(pst, cfgCfm)
-Pst                *pst;
-RgPrgCfgCfmInfo    *cfgCfm;
-#endif
+S16 cmPkPrgSMacPMacCfgCfm(Pst *pst,RgPrgCfgCfmInfo   *cfgCfm)
 {
    Buffer *mBuf = NULLP;
 
@@ -211,19 +179,12 @@ RgPrgCfgCfmInfo    *cfgCfm;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 cmUnpkPrgSMacPMacCfgCfm
 (
 RgSMacPMacCfgCfm    func,
 Pst                 *pst,
 Buffer              *mBuf
 )
-#else
-S16 cmUnpkPrgSMacPMacCfgCfm(func, pst, mBuf)
-RgSMacPMacCfgCfm    func;
-Pst                 *pst;
-Buffer              *mBuf;
-#endif
 {
    RgPrgCfgCfmInfo   cfgCfm;
    
@@ -250,17 +211,7 @@ Buffer              *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgPMacSMacUeSCellDelReq
-(
-Pst                   *pst,
-RgPrgUeSCellDelInfo   *ueSCellDelInfo
-)
-#else
-S16 cmPkPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
-Pst                    *pst;
-RgPrgUeSCellDelInfo    *ueSCellDelInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellDelReq(Pst *pst,RgPrgUeSCellDelInfo   *ueSCellDelInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -294,19 +245,12 @@ RgPrgUeSCellDelInfo    *ueSCellDelInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 cmUnpkPrgPMacSMacUeSCellDelReq
 (
 RgUeSCellDelReq    func,
 Pst                *pst,
 Buffer             *mBuf
 )
-#else
-S16 cmUnpkPrgPMacSMacUeSCellDelReq(func, pst, mBuf)
-RgUeSCellDelReq  func;
-Pst              *pst;
-Buffer           *mBuf;
-#endif
 {
   RgPrgUeSCellDelInfo ueSCellDelInfo;
    
@@ -334,17 +278,7 @@ Buffer           *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgPMacSMacUeSCellLchAddReq
-(
-Pst                      *pst,
-RgPrgUeSCellLchAddInfo   *lchCfgInfo,
-)
-#else
-S16 cmPkPrgPMacSMacUeSCellLchAddReq(pst, lchCfgInfo)
-Pst                       *pst;
-RgPrgUeSCellLchAddInfo    *lchCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchAddReq(Pst *pst,RgPrgUeSCellLchAddInfo   *lchCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -378,19 +312,12 @@ RgPrgUeSCellLchAddInfo    *lchCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 cmUnpkPrgPMacSMacUeSCellLchAddReq
 (
 RgPrgUeSCellLchAddInfo       func,
 Pst                          *pst,
 Buffer                       *mBuf
 )
-#else
-S16 cmUnpkPrgPMacSMacUeSCellLchAddReq(func, pst, mBuf)
-RgPrgUeSCellLchAddInfo       func;
-Pst                          *pst;
-Buffer                       *mBuf;
-#endif
 {
    RgPrgLchRecfgInfo    lchCfgInfo;
    
@@ -417,17 +344,7 @@ Buffer                       *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgPMacSMacUeSCellLchDelReq
-(
-Pst                       *pst,
-RgPrgUeSCellLchDelInfo    *delLcCb
-)
-#else
-S16 cmPkPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
-Pst                       *pst;
-RgPrgUeSCellLchDelInfo    *delLcCb;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchDelReq(Pst *pst,RgPrgUeSCellLchDelInfo *delLcCb)
 {
    Buffer *mBuf = NULLP;
 
@@ -461,17 +378,7 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 cmPkPrgPMacSMacUeSCellLchModReq
-(
-Pst                      *pst,
-RgPrgUeSCellLchModInfo   *lchCfgInfo
-)
-#else
-S16 cmPkPrgPMacSMacUeSCellLchModReq(pst, lchCfgInfo)
-Pst                       *pst;
-RgPrgUeSCellLchModInfo    *lchCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchModReq(Pst  *pst,RgPrgUeSCellLchModInfo  *lchCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -506,19 +413,12 @@ RgPrgUeSCellLchModInfo    *lchCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 cmUnpkPrgPMacSMacUeSCellLchModReq
 (
 RgPrgUeScellModLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
-#else
-S16 cmUnpkPrgPMacSMacAddLchCfgReq(func, pst, mBuf)
-RgPrgUeScellModLchReq   func;
-Pst                     *pst;
-Buffer                  *mBuf;
-#endif
 {
    RgPrgUeSCellLchModInfo   lchCfgInfo;
    
@@ -547,19 +447,12 @@ Buffer                  *mBuf;
  *  @return      S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 cmUnpkPrgPMacSMacUeSCellLchDelReq
 (
 RgPrgUeScellDelLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
-#else
-S16 cmUnpkPrgPMacSMacUeSCellLchDelReq(func, pst, mBuf)
-RgPrgUeScellDelLchReq   func;
-Pst                     *pst;
-Buffer                  *mBuf;
-#endif
 {
    RgPrgUeSCellLchDelInfo   lchCfgInfo;
    
index 5834fde..f01df71 100755 (executable)
@@ -75,17 +75,7 @@ static const RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgPMacSMacUeSCellCfg
-(
- Pst         *pst,
- RgPrgUeSCellCfgInfo *ueSCellCfgInfo
-)
-#else
-S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
- Pst         *pst;
- RgPrgUeSCellCfgInfo *ueSCellCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeSCellCfg(Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCfgInfo)
 {
 
    return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
@@ -113,17 +103,7 @@ static const RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgSMacPMacCfg
-(
- Pst             *pst,
- RgPrgCfgCfmInfo *cfgCfm
-)
-#else
-S16 RgPrgSMacPMacCfg(pst, cfgCfm)
- Pst             *pst;
- RgPrgCfgCfmInfo *cfgCfm;
-#endif
+S16 RgPrgSMacPMacCfg(Pst *pst,RgPrgCfgCfmInfo *cfgCfm)
 {
 
    return ((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm));
@@ -151,17 +131,7 @@ static const RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgPMacSMacUeSCellDel
-(
- Pst                 *pst,
- RgPrgUeSCellDelInfo *ueSCellDelInfo
-)
-#else
-S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
- Pst                 *pst;
- RgPrgUeSCellDelInfo *ueSCellDelInfo;
-#endif
+S16 RgPrgPMacSMacUeSCellDel(Pst *pst,RgPrgUeSCellDelInfo *ueSCellDelInfo)
 {
 
    return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
@@ -192,17 +162,7 @@ static const RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgPMacSMacUeScellLchMod
-(
- Pst                      *pst,
- RgPrgUeSCellLchModInfo   *lchCfgInfo
-)
-#else
-S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
- Pst                      *pst;
- RgPrgUeSCellLchModInfo   *lchCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeScellLchMod(Pst *pst,RgPrgUeSCellLchModInfo *lchCfgInfo)
 {
 
    return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
@@ -232,17 +192,7 @@ static const RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgPMacSMacUeScellLchDel
-(
- Pst                       *pst,
- RgPrgUeSCellLchDelInfo    *delLcCb
-)
-#else
-S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
- Pst                       *pst;
- RgPrgUeSCellLchDelInfo    *delLcCb;
-#endif
+S16 RgPrgPMacSMacUeScellLchDel(Pst *pst,RgPrgUeSCellLchDelInfo *delLcCb)
 {
 
    return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
@@ -272,17 +222,7 @@ static const RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgPrgPMacSMacUeScellLchAdd
-(
- Pst                      *pst,
- RgPrgUeSCellLchAddInfo   *lchCfgInfo
-)
-#else
-S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
- Pst                      *pst;
- RgPrgUeSCellLchAddInfo   *lchCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeScellLchAdd(Pst *pst,RgPrgUeSCellLchAddInfo *lchCfgInfo)
 {
 
    return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
index 95d3955..0068e5c 100755 (executable)
@@ -204,19 +204,12 @@ static const TfuDelDatReq RgLiTfuDelDatReqMt[RG_MAX_TFU_PROV] =
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 RgLiTfuDelDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDelDatReqInfo * delDatReq
 )
-#else
-S16 RgLiTfuDelDatReq(pst, spId, delDatReq)
-Pst * pst;
-SpId spId;
-TfuDelDatReqInfo * delDatReq;
-#endif
 {
 
    return ((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq));
@@ -249,22 +242,14 @@ TfuDelDatReqInfo * delDatReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 PtLiTfuBndReq(pst, suId, spId)
-Pst * pst;
-SuId suId;
-SpId spId;
-#endif
 {
 
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(spId);
@@ -294,19 +279,12 @@ SpId spId;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuSchBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 PtLiTfuSchBndReq(pst, suId, spId)
-Pst * pst;
-SuId suId;
-SpId spId;
-#endif
 {
 
    UNUSED(pst);
@@ -338,19 +316,12 @@ SpId spId;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 PtLiTfuUbndReq(pst, spId, reason)
-Pst * pst;
-SpId spId;
-Reason reason;
-#endif
 {
 
    UNUSED(pst);
@@ -382,19 +353,12 @@ Reason reason;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuSchUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 PtLiTfuSchUbndReq(pst, spId, reason)
-Pst * pst;
-SpId spId;
-Reason reason;
-#endif
 {
 
    UNUSED(pst);
@@ -440,19 +404,12 @@ Reason reason;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuRecpReq
 (
 Pst * pst,
 SpId spId,
 TfuRecpReqInfo * recpReq
 )
-#else
-S16 PtLiTfuRecpReq(pst, spId, recpReq)
-Pst * pst;
-SpId spId;
-TfuRecpReqInfo * recpReq;
-#endif
 {
 
    UNUSED(pst);
@@ -491,19 +448,12 @@ TfuRecpReqInfo * recpReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuCntrlReq
 (
 Pst * pst,
 SpId spId,
 TfuCntrlReqInfo * cntrlReq
 )
-#else
-S16 PtLiTfuCntrlReq(pst, spId, cntrlReq)
-Pst * pst;
-SpId spId;
-TfuCntrlReqInfo * cntrlReq;
-#endif
 {
 
    UNUSED(pst);
@@ -541,19 +491,12 @@ TfuCntrlReqInfo * cntrlReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDatReqInfo * datReq
 )
-#else
-S16 PtLiTfuDatReq(pst, spId, datReq)
-Pst * pst;
-SpId spId;
-TfuDatReqInfo * datReq;
-#endif
 {
 
    UNUSED(pst);
@@ -590,19 +533,12 @@ TfuDatReqInfo * datReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 PtLiTfuDelDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDelDatReqInfo * delDatReq
 )
-#else
-S16 PtLiTfuDelDatReq(pst, spId, delDatReq)
-Pst * pst;
-SpId spId;
-TfuDelDatReqInfo * DelDatReq;
-#endif
 {
 
    UNUSED(pst);
index 0ce1260..c928a92 100755 (executable)
@@ -279,17 +279,11 @@ static const LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR] =
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
-#else
-S16 RgMiLrgCfgCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* config confirm structure  */
-#endif    
 {
    
    (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm);
@@ -315,17 +309,11 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchCfgCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* config confirm structure  */
 )
-#else
-S16 RgMiLrgSchCfgCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* config confirm structure  */
-#endif    
 {
    
    (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm);
@@ -353,17 +341,11 @@ RgMngmt  *cfm;    /* config confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStsCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* statistics confirm structure  */
 )
-#else
-S16 RgMiLrgStsCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* statistics confirm structure  */
-#endif    
 {
    
    (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm);
@@ -390,17 +372,11 @@ RgMngmt  *cfm;    /* statistics confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStaCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* status confirm structure  */
 )
-#else
-S16 RgMiLrgStaCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* status confirm structure  */
-#endif    
 {
    
    (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm);
@@ -427,17 +403,11 @@ RgMngmt  *cfm;    /* status confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
-#else
-S16 RgMiLrgCntrlCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* control confirm structure  */
-#endif    
 {
    
    (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm);
@@ -463,17 +433,11 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchCntrlCfm
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfm     /* control confirm structure  */
 )
-#else
-S16 RgMiLrgSchCntrlCfm(pst, cfm)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cfm;    /* control confirm structure  */
-#endif    
 {
    
    (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm);
@@ -500,17 +464,11 @@ RgMngmt  *cfm;    /* control confirm structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
-#else
-S16 RgMiLrgStaInd(pst, usta)
-Pst      *pst;    /* post structure  */
-RgMngmt  *usta;    /* status indication structure  */
-#endif    
 {
    
    (*RgMiLrgStaIndMt[pst->selector])(pst,usta);
@@ -536,17 +494,11 @@ RgMngmt  *usta;    /* status indication structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchStaInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *usta    /* status indication structure  */
 )
-#else
-S16 RgMiLrgSchStaInd(pst, usta)
-Pst      *pst;    /* post structure  */
-RgMngmt  *usta;    /* status indication structure  */
-#endif    
 {
    
    (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta);
@@ -574,19 +526,12 @@ RgMngmt  *usta;    /* status indication structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgTrcInd
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *trc,    /* Trace event  */
 Buffer   *mBuf    /* Trace message  */
 )
-#else
-S16 RgMiLrgTrcInd(pst, trc, mBuf)
-Pst      *pst;    /* post structure  */
-RgMngmt  *trc;    /* Trace event  */
-Buffer   *mBuf;   /* Trace message  */
-#endif    
 {
    
    (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf);
@@ -598,17 +543,11 @@ Buffer   *mBuf;   /* Trace message  */
 #ifdef LTE_L2_MEAS
 
 /* TODO: Function header */
-#ifdef ANSI
 S16 RgMiLrgSchL2MeasCfm
 (
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )
-#else
-S16 RgMiLrgSchL2MeasCfm(pst, cfm)
-Pst               *pst;          /* post structure  */
-LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
-#endif    
 {
    
    (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm);
@@ -634,17 +573,11 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  *      -# ROK
  **/
 
-#ifdef ANSI 
 S16 RgMiLrgSchL2MeasStopCfm
 (        
 Pst               *pst,          /* post structure  */
 LrgSchMeasCfmInfo *cfm       /* Meas Cfm Info */
 )        
-#else    
-S16 RgMiLrgSchL2MeasStopCfm(pst, cfm)
-Pst               *pst;          /* post structure  */
-LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
-#endif    
 {
    (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm);
           
@@ -677,17 +610,11 @@ LrgSchMeasCfmInfo *cfm;       /* Meas Cfm Info */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
-#else
-S16 PtMiLrgCfgCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Config Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgCfgCfm */
@@ -711,17 +638,11 @@ RgMngmt *cfm;           /* Config Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchCfgCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Config Confirm */
 )
-#else
-S16 PtMiLrgSchCfgCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Config Confirm */
-#endif
 {
 
    return ROK;
@@ -748,17 +669,11 @@ RgMngmt *cfm;           /* Config Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStsCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Statistics Confirm */
 )
-#else
-S16 PtMiLrgStsCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Statistics Confirm */
-#endif
 {
 
    return ROK;
@@ -785,17 +700,11 @@ RgMngmt *cfm;           /* Statistics Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStaCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Status Confirm */
 )
-#else
-S16 PtMiLrgStaCfm  (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Status Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgStaCfm */
@@ -821,17 +730,11 @@ RgMngmt *cfm;           /* Status Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
-#else
-S16 PtMiLrgStaInd  (pst, usta)
-Pst *pst;               /* post structure */
-RgMngmt *usta;          /* Status indication */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgStaInd */
@@ -855,17 +758,11 @@ RgMngmt *usta;          /* Status indication */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchStaInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *usta           /* Status Indication */
 )
-#else
-S16 PtMiLrgSchStaInd  (pst, usta)
-Pst *pst;               /* post structure */
-RgMngmt *usta;          /* Status indication */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgSchStaInd */
@@ -890,17 +787,11 @@ RgMngmt *usta;          /* Status indication */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
-#else
-S16 PtMiLrgCntrlCfm (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Control Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgCntrlCfm */
@@ -924,17 +815,11 @@ RgMngmt *cfm;           /* Control Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchCntrlCfm
 (
 Pst *pst,               /* post structure */
 RgMngmt *cfm            /* Control Confirm */
 )
-#else
-S16 PtMiLrgSchCntrlCfm (pst, cfm)
-Pst *pst;               /* post structure */
-RgMngmt *cfm;           /* Control Confirm */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgSchCntrlCfm */
@@ -959,19 +844,12 @@ RgMngmt *cfm;           /* Control Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgTrcInd
 (
 Pst *pst,               /* post structure */
 RgMngmt *trc,           /* Trace Event */
 Buffer *mBuf            /* Trace message */
 )
-#else
-S16 PtMiLrgTrcInd (pst, trc,mBuf)
-Pst *pst;               /* post structure */
-RgMngmt *trc;           /* Trace Event */
-Buffer *mBuf;           /* Trace message */
-#endif
 {
    return ROK;
 }/* end of PtMiLrgTrcInd */
@@ -990,17 +868,11 @@ Buffer *mBuf;           /* Trace message */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchL2MeasCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
-#else
-S16 PtMiLrgSchL2MeasCfm(pst, cfm)
-Pst *pst;               /* post structure */
-LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
-#endif
 {
 
    return ROK;
@@ -1020,17 +892,11 @@ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 PtMiLrgSchL2MeasStopCfm
 (
 Pst *pst,               /* post structure */
 LrgSchMeasCfmInfo *cfm  /* Measurement Confirm */
 )
-#else
-S16 PtMiLrgSchL2MeasStopCfm(pst, cfm)
-Pst *pst;               /* post structure */
-LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */
-#endif
 {
 
    return ROK;
index 6d007c7..071901b 100755 (executable)
@@ -548,19 +548,7 @@ static const RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 RgUiRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 RgUiRgrBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status));
@@ -580,19 +568,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgmBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 RgUiRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 RgUiRgmBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status));
@@ -616,19 +592,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrTtiInd
-(
-Pst* pst,
-SuId suId,
-RgrTtiIndInfo  *ttiInd
-)
-#else
-S16 RgUiRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
+S16 RgUiRgrTtiInd(Pst* pst,SuId suId,RgrTtiIndInfo *ttiInd)
 {
 
    return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd));
@@ -651,19 +615,7 @@ RgrTtiIndInfo *ttiInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrCfgCfm
-(
-Pst* pst,
-RgrCfgTransId transId,
-uint8_t status
-)
-#else
-S16 RgUiRgrCfgCfm(pst, transId, status)
-Pst* pst;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
+S16 RgUiRgrCfgCfm(Pst* pst,RgrCfgTransId transId,uint8_t status)
 {
 
    return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status));
@@ -685,19 +637,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiCrgBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 RgUiCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 RgUiCrgBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status));
@@ -720,21 +660,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiCrgCfgCfm
-(
-Pst* pst,
-SuId suId,
-CrgCfgTransId transId,
-uint8_t status
-)
-#else
-S16 RgUiCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-uint8_t status;
-#endif
+S16 RgUiCrgCfgCfm(Pst* pst,SuId suId,CrgCfgTransId transId,uint8_t status)
 {
 
    return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status));
@@ -756,19 +682,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 RgUiRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 RgUiRguBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status));
@@ -793,19 +707,7 @@ int macCDatIndSnt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguCDatInd
-(
-Pst* pst,
-SuId suId,
-RguCDatIndInfo  * datInd
-)
-#else
-S16 RgUiRguCDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguCDatIndInfo  * datInd;
-#endif
+S16 RgUiRguCDatInd(Pst* pst,SuId suId,RguCDatIndInfo *datInd)
 {
    macCDatIndSnt++;
 
@@ -828,19 +730,7 @@ RguCDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguDDatInd
-(
-Pst* pst,
-SuId suId,
-RguDDatIndInfo  * datInd
-)
-#else
-S16 RgUiRguDDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguDDatIndInfo  * datInd;
-#endif
+S16 RgUiRguDDatInd(Pst* pst,SuId suId,RguDDatIndInfo *datInd)
 {
    macDDatIndSnt++;
 
@@ -869,19 +759,7 @@ RguDDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguCStaInd
-(
-Pst* pst,
-SuId suId,
-RguCStaIndInfo  * staInd
-)
-#else
-S16 RgUiRguCStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguCStaIndInfo  * staInd;
-#endif
+S16 RgUiRguCStaInd(Pst* pst,SuId suId,RguCStaIndInfo *staInd)
 {
 
    return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd));
@@ -906,19 +784,7 @@ RguCStaIndInfo  * staInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRguDStaInd
-(
-Pst* pst,
-SuId suId,
-RguDStaIndInfo  * staInd
-)
-#else
-S16 RgUiRguDStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguDStaIndInfo  * staInd;
-#endif
+S16 RgUiRguDStaInd(Pst* pst,SuId suId,RguDStaIndInfo  *staInd)
 {
 
    return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd));
@@ -926,19 +792,7 @@ RguDStaIndInfo  * staInd;
 }
 #ifdef LTE_L2_MEAS
 /* TODO: Function header */
-#ifdef ANSI
-S16 RgUiRguHqStaInd
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 RgUiRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 RgUiRguHqStaInd(Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
 
 #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF)
@@ -952,19 +806,7 @@ RguHarqStatusInd *harqStatusInd;
 } /* RgUiRguHqStaInd */
 #endif /* LTE_L2_MEAS */
 
-#ifdef ANSI
-S16 RgUiRguFlowCntrlInd
-(
-Pst* pst,
-SuId suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 RgUiRguFlowCntrlInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguFlowCntrlInd *flowCntrlInd;
-#endif
+S16 RgUiRguFlowCntrlInd(Pst* pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
   return ((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd));
 }
@@ -984,21 +826,7 @@ RguFlowCntrlInd *flowCntrlInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-uint8_t status
-)
-#else
-S16 RgUiRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
+S16 RgUiRgrSiCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t status)
 {
 
    return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status));
@@ -1020,23 +848,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrWarningSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-uint8_t   siId,
-uint8_t status
-)
-#else
-S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t  siId;
-uint8_t status;
-#endif
+S16 RgUiRgrWarningSiCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t siId,uint8_t status)
 {
    return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector])
          (pst, suId, transId, siId, status));
@@ -1061,19 +873,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrStaInd
-(
-Pst* pst,
-SuId suId,
-RgrStaIndInfo  *staInd
-)
-#else
-S16 RgUiRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo *staInd;
-#endif
+S16 RgUiRgrStaInd(Pst* pst,SuId suId,RgrStaIndInfo *staInd)
 {
 
    return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd));
@@ -1095,19 +895,7 @@ RgrStaIndInfo *staInd;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 RgUiRgrLoadInfInd
-(
- Pst* pst,
- SuId suId,
- RgrLoadInfIndInfo  *loadInfInd
- )
-#else
-S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
-   Pst* pst;
-   SuId suId;
-   RgrLoadInfIndInfo *loadInfInd;
-#endif
+S16 RgUiRgrLoadInfInd( Pst* pst, SuId suId,RgrLoadInfIndInfo *loadInfInd )
 {
 
    return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd));
@@ -1128,19 +916,7 @@ S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgrUeStaInd
-(
-Pst             *pst,
-SuId            suId,
-RgrUeStaIndInfo *ueStaInd
-)
-#else
-S16 RgUiRgrUeStaInd(pst, suId, ueStaInd)
-Pst             *pst;
-SuId            suId;
-RgrUeStaIndInfo *ueStaInd;
-#endif
+S16 RgUiRgrUeStaInd(Pst  *pst,SuId  suId,RgrUeStaIndInfo *ueStaInd)
 {
 
    return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd));
@@ -1164,19 +940,7 @@ RgrUeStaIndInfo *ueStaInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiCrgBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 PtUiCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 PtUiCrgBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1203,21 +967,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiCrgCfgCfm
-(
-Pst* pst,
-SuId suId,
-CrgCfgTransId transId,
-uint8_t status
-)
-#else
-S16 PtUiCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-uint8_t status;
-#endif
+S16 PtUiCrgCfgCfm(Pst* pst,SuId suId,CrgCfgTransId transId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1246,19 +996,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 PtUiRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 PtUiRguBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1285,19 +1023,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguCDatInd
-(
-Pst* pst,
-SuId suId,
-RguCDatIndInfo  * datInd
-)
-#else
-S16 PtUiRguCDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguCDatIndInfo  * datInd;
-#endif
+S16 PtUiRguCDatInd(Pst* pst,SuId suId,RguCDatIndInfo  *datInd)
 {
 
    UNUSED(pst);
@@ -1324,19 +1050,7 @@ RguCDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguDDatInd
-(
-Pst* pst,
-SuId suId,
-RguDDatIndInfo  * datInd
-)
-#else
-S16 PtUiRguDDatInd(pst, suId, datInd)
-Pst* pst;
-SuId suId;
-RguDDatIndInfo  * datInd;
-#endif
+S16 PtUiRguDDatInd(Pst* pst,SuId suId,RguDDatIndInfo  *datInd)
 {
 
    UNUSED(pst);
@@ -1365,19 +1079,7 @@ RguDDatIndInfo  * datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguCStaInd
-(
-Pst* pst,
-SuId suId,
-RguCStaIndInfo  * staInd
-)
-#else
-S16 PtUiRguCStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguCStaIndInfo  * staInd;
-#endif
+S16 PtUiRguCStaInd(Pst* pst,SuId suId,RguCStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1406,19 +1108,7 @@ RguCStaIndInfo  * staInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRguDStaInd
-(
-Pst* pst,
-SuId suId,
-RguDStaIndInfo  * staInd
-)
-#else
-S16 PtUiRguDStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RguDStaIndInfo  * staInd;
-#endif
+S16 PtUiRguDStaInd(Pst* pst,SuId suId,RguDStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1430,19 +1120,7 @@ RguDStaIndInfo  * staInd;
 }
 #ifdef LTE_L2_MEAS
 /* TODO: Function Header */
-#ifdef ANSI
-S16 PtUiRguHqStaInd
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 PtUiRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 PtUiRguHqStaInd(Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
 
    UNUSED(pst);
@@ -1454,19 +1132,7 @@ RguHarqStatusInd *harqStatusInd;
 }
 #endif /* LTE_L2_MEAS */
 
-#ifdef ANSI
-S16 PtUiRguFlowCntrlInd
-(
-Pst* pst,
-SuId suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 PtUiRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *flowCntrlInd;
-#endif
+S16 PtUiRguFlowCntrlInd(Pst* pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
 
    UNUSED(pst);
@@ -1495,19 +1161,7 @@ RguHarqStatusInd *flowCntrlInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 PtUiRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 PtUiRgrBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1533,19 +1187,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrTtiInd
-(
-Pst* pst,
-SuId suId,
-RgrTtiIndInfo *ttiInd
-)
-#else
-S16 PtUiRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
+S16 PtUiRgrTtiInd(Pst* pst,SuId suId,RgrTtiIndInfo *ttiInd)
 {
 
    UNUSED(pst);
@@ -1572,21 +1214,7 @@ RgrTtiIndInfo *ttiInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-uint8_t status
-)
-#else
-S16 PtUiRgrCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
+S16 PtUiRgrCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1614,21 +1242,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-uint8_t status
-)
-#else
-S16 PtUiRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
+S16 PtUiRgrSiCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1655,23 +1269,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrWarningSiCfgCfm
-(
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-uint8_t siId,
-uint8_t status
-)
-#else
-S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t  siId;
-uint8_t status;
-#endif
+S16 PtUiRgrWarningSiCfgCfm(Pst* pst,SuId suId,RgrCfgTransId transId,uint8_t siId,uint8_t status)
 {
    UNUSED(pst);
    UNUSED(suId);
@@ -1700,19 +1298,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrStaInd
-(
-Pst* pst,
-SuId suId,
-RgrStaIndInfo  *staInd
-)
-#else
-S16 PtUiRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo *staInd;
-#endif
+S16 PtUiRgrStaInd(Pst* pst,SuId suId,RgrStaIndInfo *staInd)
 {
 
    UNUSED(pst);
@@ -1737,19 +1323,7 @@ RgrStaIndInfo *staInd;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 PtUiRgrLoadInfInd
-(
- Pst* pst,
- SuId suId,
- RgrLoadInfIndInfo  *loadInfInd
- )
-#else
-S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
-   Pst* pst;
-   SuId suId;
-   RgrLoadInfIndInfo *loadInfInd;
-#endif
+S16 PtUiRgrLoadInfInd( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd )
 {
 
    UNUSED(pst);
@@ -1774,19 +1348,7 @@ S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgrUeStaInd
-(
-Pst* pst,
-SuId suId,
-RgrUeStaIndInfo  *ueStaInd
-)
-#else
-S16 PtUiRgrUeStaInd(pst, suId, ueStaInd)
-Pst* pst;
-SuId suId;
-RgrUeStaIndInfo *ueStaInd;
-#endif
+S16 PtUiRgrUeStaInd(Pst* pst,SuId suId,RgrUeStaIndInfo  *ueStaInd)
 {
 
    UNUSED(pst);
@@ -1814,19 +1376,7 @@ RgrUeStaIndInfo *ueStaInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgmBndCfm
-(
-Pst* pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 PtUiRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 PtUiRgmBndCfm(Pst* pst,SuId suId,uint8_t status)
 {
 
    UNUSED(pst);
@@ -1850,19 +1400,7 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgmPrbRprtInd
-(
-Pst* pst,
-SuId suId,
-RgmPrbRprtInd *prbRprtInd
-)
-#else
-S16 PtUiRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd *prbRprtInd;
-#endif
+S16 PtUiRgmPrbRprtInd(Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)
 {
 
    UNUSED(pst);
@@ -1886,19 +1424,7 @@ RgmPrbRprtInd *prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 PtUiRgmTransModeInd
-(
-Pst* pst,
-SuId suId,
-RgmTransModeInd *transModeInd
-)
-#else
-S16 PtUiRgmTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
+S16 PtUiRgmTransModeInd(Pst* pst,SuId suId,RgmTransModeInd *transModeInd)
 {
 
    UNUSED(pst);
@@ -1923,20 +1449,7 @@ RgmTransModeInd *transModeInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgmSendPrbRprtInd
-(
-Pst* pst,
-SuId suId,
-RgmPrbRprtInd *prbRprtInd
-)
-#else
-S16 RgUiRgmSendPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd *prbRprtInd;
-#endif
-
+S16 RgUiRgmSendPrbRprtInd(Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)
 {
    return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd));
 }
@@ -1954,20 +1467,7 @@ RgmPrbRprtInd *prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgUiRgmChangeTransModeInd
-(
-Pst* pst,
-SuId suId,
-RgmTransModeInd *transModeInd
-)
-#else
-S16 RgUiRgmChangeTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
-
+S16 RgUiRgmChangeTransModeInd(Pst* pst,SuId suId,RgmTransModeInd *transModeInd)
 {
    return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd));
 }
@@ -2007,15 +1507,10 @@ static S16 RgUiRguDDatIndRbuf(RguDDatIndInfo  *datInd)
 }
 #endif
 #ifdef RLC_MAC_DAT_REQ_RBUF
-#ifdef ANSI
 S16 rgDlDatReqBatchProc
 (
 Void
 )
-#else
-S16 rgDlDatReqBatchProc()
-Void;
-#endif
 {
 /* Read from Ring Buffer and process PDCP packets */
 
@@ -2077,15 +1572,7 @@ Void;
 #endif 
 
 #ifdef RLC_MAC_STA_RSP_RBUF
-#ifdef ANSI
-S16 rgDlStaRspBatchProc
-(
-Void
-)
-#else
-S16 rgDlStaRspBatchProc()
-Void;
-#endif
+S16 rgDlStaRspBatchProc(Void)
 {
 /* Read from Ring Buffer and process PDCP packets */
 
@@ -2149,19 +1636,7 @@ Void;
 #endif 
 #ifdef LTE_L2_MEAS
 #ifdef MAC_RLC_HARQ_STA_RBUF
-#ifdef ANSI
-S16 RgUiRguHqStaIndRbuf 
-(
-Pst* pst,
-SuId suId,
-RguHarqStatusInd *harqStatusInd
-)
-#else
-S16 RgUiRguHqStaIndRbuf(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd *harqStatusInd;
-#endif
+S16 RgUiRguHqStaIndRbuf (Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd)
 {
    S16  ret = ROK;
    Void *elem = NULLP;
index ea819cd..e8e3473 100755 (executable)
@@ -82,17 +82,7 @@ static int RLOG_MODULE_ID=4096;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgRAMFreeUeCb
-(
-Inst        inst,
-RgUeCb      *ue
-)
-#else
-Void rgRAMFreeUeCb(inst,ue)
-Inst        inst;
-RgUeCb      *ue;
-#endif
+Void rgRAMFreeUeCb(Inst  inst,RgUeCb *ue)
 {
    rgDHMFreeUe(inst,&ue->dl.hqEnt);
 
@@ -120,21 +110,7 @@ RgUeCb      *ue;
  *  @param[out]      RgErrInfo      *err
  *  @return  RgUeCb*
  **/
-#ifdef ANSI
-RgUeCb* rgRAMCreateUeCb
-(
-RgCellCb       *cell,
-CmLteRnti      tmpCrnti,
-Bool           insert,
-RgErrInfo      *err
-)
-#else
-RgUeCb* rgRAMCreateUeCb(cell, tmpCrnti, insert, err)
-RgCellCb       *cell;
-CmLteRnti      tmpCrnti;
-Bool           insert;
-RgErrInfo      *err;
-#endif
+RgUeCb* rgRAMCreateUeCb(RgCellCb *cell,CmLteRnti  tmpCrnti,Bool insert,RgErrInfo *err)
 {
    Inst       inst = cell->macInst - RG_INST_START;
    RgUeCb    *ueCb = NULLP;
@@ -192,15 +168,7 @@ RgErrInfo      *err;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgRAMFreeCell
-(
-RgCellCb    *cell
-)
-#else
-S16 rgRAMFreeCell(cell)
-RgCellCb    *cell;
-#endif
+S16 rgRAMFreeCell(RgCellCb *cell)
 {
    Inst    inst = cell->macInst - RG_INST_START;
    RgUeCb  *ueCb;
@@ -237,21 +205,7 @@ RgCellCb    *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgHndlRaResp
-(
-RgCellCb            *cell,
-CmLteTimingInfo     timingInfo,
-RgInfRarInfo        *rarInfo,
-RgErrInfo           *err
-)
-#else
-S16 rgHndlRaResp(cell, timingInfo, rarInfo, err)
-RgCellCb            *cell;
-CmLteTimingInfo     timingInfo;
-RgInfRarInfo        *rarInfo;
-RgErrInfo           *err;
-#endif
+S16 rgHndlRaResp(RgCellCb *cell,CmLteTimingInfo timingInfo,RgInfRarInfo *rarInfo,RgErrInfo *err)
 {
    uint8_t  idx1,idx2;
    Buffer   *rarPdu;
index 81bbc4a..363209d 100755 (executable)
@@ -104,17 +104,7 @@ S16 rgTOMUtlProcDlSf ARGS(( RgDlSf     *dlSf,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgROMDedDatReq
-(
-Inst      inst,
-RgRguDedDatReq *datReq
-)
-#else
-S16 rgROMDedDatReq(inst,datReq)
-Inst      inst;
-RgRguDedDatReq *datReq;
-#endif
+S16 rgROMDedDatReq(Inst inst,RgRguDedDatReq *datReq)
 {
 #if 0
    RgCellCb     *cell;
@@ -328,17 +318,7 @@ RgRguDedDatReq *datReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgROMCmnDatReq
-(
-Inst            inst,
-RgRguCmnDatReq *datReq
-)
-#else
-S16 rgROMCmnDatReq(inst,datReq)
-Inst            inst;
-RgRguCmnDatReq *datReq;
-#endif
+S16 rgROMCmnDatReq(Inst inst, RgRguCmnDatReq *datReq)
 {
    RgCellCb    *cell;
    RgErrInfo   err;
@@ -432,19 +412,7 @@ RgRguCmnDatReq *datReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgROMHndlCcchDatReq
-(
-RgCellCb       *cell,
-RgRguCmnDatReq *datReq,
-RgErrInfo      *err
-)
-#else
-static S16 rgROMHndlCcchDatReq(cell, datReq, err)
-RgCellCb       *cell;
-RgRguCmnDatReq *datReq;
-RgErrInfo      *err;
-#endif
+static S16 rgROMHndlCcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)
 {
    Inst     inst = cell->macInst - RG_INST_START;
    RgUeCb   *ue;
@@ -530,19 +498,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgROMHndlBcchPcchDatReq
-(
-RgCellCb       *cell,
-RgRguCmnDatReq *datReq,
-RgErrInfo      *err
-)
-#else
-static S16 rgROMHndlBcchPcchDatReq(cell, datReq, err)
-RgCellCb       *cell;
-RgRguCmnDatReq *datReq;
-RgErrInfo      *err;
-#endif
+static S16 rgROMHndlBcchPcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)
 {
    Inst            inst = cell->macInst - RG_INST_START;
    RgPcchLcCb      *pcch;
@@ -631,17 +587,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgROMDedStaRsp
-(
-Inst           inst,
-RgRguDedStaRsp *staRsp
-)
-#else
-S16 rgROMDedStaRsp(inst,staRsp)
-Inst           inst;
-RgRguDedStaRsp *staRsp;
-#endif
+S16 rgROMDedStaRsp(Inst inst, RgRguDedStaRsp *staRsp)
 {
    RgCellCb   *cell;
 
@@ -724,17 +670,7 @@ S32 bo
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgROMCmnStaRsp
-(
-Inst            inst, 
-RgRguCmnStaRsp *staRsp
-)
-#else
-S16 rgROMCmnStaRsp(inst,staRsp)
-Inst            inst;
-RgRguCmnStaRsp *staRsp;
-#endif
+S16 rgROMCmnStaRsp(Inst inst, RgRguCmnStaRsp *staRsp)
 {
    RgCellCb   *cell;
    RgErrInfo  err;
@@ -783,17 +719,7 @@ RgRguCmnStaRsp *staRsp;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgROML2MUlThrpMeasReq 
-(
-Inst                  inst,
-RgRguL2MUlThrpMeasReq *measReq
-)
-#else
-S16 rgROML2MUlThrpMeasReq(inst,measReq)
-Inst                  inst;
-RgRguL2MUlThrpMeasReq *measReq;
-#endif
+S16 rgROML2MUlThrpMeasReq(Inst inst, RgRguL2MUlThrpMeasReq *measReq)
 {
    RgCellCb   *cell;
    RgUeCb     *ue;
@@ -846,19 +772,7 @@ RgRguL2MUlThrpMeasReq *measReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgROMHndlCcchStaRsp
-(
-RgCellCb       *cell,
-RgRguCmnStaRsp *staRsp,
-RgErrInfo      *err
-)
-#else
-static S16 rgROMHndlCcchStaRsp(cell, staRsp, err)
-RgCellCb       *cell;
-RgRguCmnStaRsp *staRsp;
-RgErrInfo      *err;
-#endif
+static S16 rgROMHndlCcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp, RgErrInfo *err)
 {
    Pst      schPst;
    Inst     macInst = cell->macInst - RG_INST_START;
@@ -897,19 +811,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgROMHndlBcchPcchStaRsp
-(
-RgCellCb       *cell,
-RgRguCmnStaRsp *staRsp,
-RgErrInfo      *err
-)
-#else
-static S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err)
-RgCellCb       *cell;
-RgRguCmnStaRsp *staRsp;
-RgErrInfo      *err;
-#endif
+static S16 rgROMHndlBcchPcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp,RgErrInfo *err)
 {
    Pst      schPst;
    //RgInfCmnBoRpt boRpt;
@@ -977,17 +879,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgROMUpdDlSfRemDataCnt
-(
-RgCellCb       *cellCb,
-RgDlSf         *dlSf
-)
-#else
-static S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf)
-RgCellCb       *cellCb;
-RgDlSf         *dlSf;
-#endif
+static S16 rgROMUpdDlSfRemDataCnt(RgCellCb *cellCb, RgDlSf *dlSf)
 {
    RgErrInfo            err;
    //Inst                 inst = cellCb->macInst - RG_INST_START;
index ba4d25d..dc5ec8c 100755 (executable)
@@ -181,21 +181,7 @@ uint32_t grgUlrate_tfu;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-static S16 rgTOMUtlFillDatReqPdus 
-(
- TfuDatReqInfo *datInfo,
- RgDlSf        *dlSf,
- RgCellCb      *cellCb,
- RgErrInfo     *err
- )
-#else
-static S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
- TfuDatReqInfo *datInfo;
- RgDlSf        *dlSf;
- RgCellCb      *cellCb;
- RgErrInfo     *err;
-#endif
+static S16 rgTOMUtlFillDatReqPdus (TfuDatReqInfo *datInfo,RgDlSf *dlSf,RgCellCb *cellCb, RgErrInfo *err)
 {
    S16              ret;
    TfuDatReqPduInfo *datReq=NULLP;
@@ -371,33 +357,9 @@ static S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
  */
 /* ADD Changes for Downlink UE Timing Optimization */
 #ifndef LTEMAC_DLUE_TMGOPTMZ 
-#ifdef ANSI
-static S16 rgTOMUtlProcDlSf
-(
- RgDlSf     *dlSf,
- RgCellCb   *cellCb,
- RgErrInfo  *err
- )
+static S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err)
 #else
-static S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
- RgDlSf     *dlSf;
- RgCellCb   *cellCb;
- RgErrInfo  *err;
-#endif
-#else
-#ifdef ANSI
-S16 rgTOMUtlProcDlSf
-(
- RgDlSf     *dlSf,
- RgCellCb   *cellCb,
- RgErrInfo  *err
- )
-#else
-S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
- RgDlSf     *dlSf;
- RgCellCb   *cellCb;
- RgErrInfo  *err;
-#endif
+S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err)
 #endif
 {
    S16               ret;
@@ -485,17 +447,7 @@ uint32_t  rgMacGT;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-static S16 rgTOMUtlAllocPduEvnt 
-(
-Inst             inst,
- RgMacPdu         **pdu
- )
-#else
-static S16 rgTOMUtlAllocPduEvnt (inst,pdu)
-Inst             inst;
-RgMacPdu         **pdu;
-#endif
+static S16 rgTOMUtlAllocPduEvnt (Inst inst,RgMacPdu **pdu)
 {
 
    Mem               evntMem;
@@ -543,17 +495,7 @@ RgMacPdu         **pdu;
  * @param  [in] Bool       *error
  * @return 
  */
-#ifdef ANSI
-static Void rgTOMUtlFreePduEvnt
-(
- RgMacPdu *pdu,
- Bool      error
- )
-#else
-static Void rgTOMUtlFreePduEvnt (pdu, error)
-   RgMacPdu *pdu;
-   Bool      error;
-#endif
+static Void rgTOMUtlFreePduEvnt( RgMacPdu *pdu,Bool  error)
 {
 
    RgMacSdu       *sdu;
@@ -592,17 +534,7 @@ static Void rgTOMUtlFreePduEvnt (pdu, error)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-static S16 rgTOMInfAllocPduEvnt 
-(
-Inst           inst,
-RgInfSfDatInd **sfInfo
- )
-#else
-static S16 rgTOMInfAllocPduEvnt (inst,sfInfo)
-Inst             inst;
-RgInfSfDatInd **sfInfo;
-#endif
+static S16 rgTOMInfAllocPduEvnt (Inst inst,RgInfSfDatInd **sfInfo)
 {
 
    Mem               evntMem;
@@ -648,15 +580,7 @@ RgInfSfDatInd **sfInfo;
  * @param  [in] Bool       *error
  * @return 
  */
-#ifdef ANSI
-static Void rgTOMInfFreePduEvnt
-(
-RgInfSfDatInd *sfInfo
- )
-#else
-static Void rgTOMInfFreePduEvnt (sfInfo)
-RgInfSfDatInd *sfInfo;
-#endif
+static Void rgTOMInfFreePduEvnt(RgInfSfDatInd *sfInfo)
 {
 
    RG_FREE_MEM(sfInfo);
@@ -681,19 +605,7 @@ RgInfSfDatInd *sfInfo;
  * @param  [out] RgRguDedDatInd *dDatInd
  * @return 
  */
-#ifdef ANSI
-static S16 rgTomUtlPrepareL2MUlThrpInfo
-(
-   RgCellCb *cellCb,
-   RgUeCb  *ueCb,
-   RgRguDedDatInd  *dDatInd
- )
-#else
-static S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
-   RgCellCb *cellCb;
-   RgUeCb *ueCb;
-   RgRguDedDatInd    *dDatInd;
-#endif
+static S16 rgTomUtlPrepareL2MUlThrpInfo(RgCellCb *cellCb,RgUeCb *ueCb,RgRguDedDatInd *dDatInd)
 {
    uint8_t lcId;
    uint8_t lcgId;
@@ -750,47 +662,26 @@ static S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
  RgUeCb  *glblueCb5;
 
 #ifdef LTEMAC_SPS
-#ifdef ANSI
 static S16 rgTOMUtlProcMsg
 (
- RgCellCb      *cellCb, 
- RgUeCb        *ueCb,
- RgMacPdu      *pdu,
- Bool          isSpsRnti,
- Bool          *spsToBeActvtd,
- uint16_t      *sduSize,
- uint16_t      slot,
- uint32_t      *lcgBytes
- )
-#else
-static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes)
-   RgCellCb      *cellCb; 
-   RgUeCb        *ueCb;
-   RgMacPdu      *pdu;
-   Bool          isSpsRnti;
-   Bool          *spsToBeActvtd;
-   uint16_t      *sduSize;
-   uint16_t      slot;
-   uint32_t      *lcgBytes;
-#endif   
+RgCellCb      *cellCb, 
+RgUeCb        *ueCb,
+RgMacPdu      *pdu,
+Bool          isSpsRnti,
+Bool          *spsToBeActvtd,
+uint16_t      *sduSize,
+uint16_t      slot,
+uint32_t      *lcgBytes
+)
 #else /* LTEMAC_SPS */
-#ifdef ANSI
 static S16 rgTOMUtlProcMsg
 (
- RgCellCb      *cellCb, 
- RgUeCb        *ueCb,
- RgMacPdu      *pdu,
- uint16_t      slot,
- uint32_t      *lcgBytes
- )
-#else
-static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
-   RgCellCb      *cellCb; 
-   RgUeCb        *ueCb;
-   RgMacPdu      *pdu;
-   uint16_t       slot;
-   uint32_t       *lcgByes;
-#endif  
+RgCellCb      *cellCb, 
+RgUeCb        *ueCb,
+RgMacPdu      *pdu,
+uint16_t      slot,
+uint32_t      *lcgBytes
+)
 #endif
 {
    Inst              inst = cellCb->macInst - RG_INST_START;
@@ -1126,7 +1017,6 @@ static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
  * @return 
  */
 #ifdef LTEMAC_SPS
-#ifdef ANSI
 static S16 rgTOMUtlInsSchInfo
 (
 RgMacPdu *pdu,
@@ -1138,18 +1028,6 @@ uint16_t       sduSize,
 uint32_t       *lcgBytes
 )
 #else
-static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes)
-RgMacPdu *pdu;
-RgInfSfDatInd   *sfInfo;
-RgInfCeInfo    *ceInfo;
-CmLteRnti        rnti;
-Bool             spsToBeActvtd;
-uint16_t         sduSize;
-uint32_t         *lcgBytes;
-#endif
-
-#else
-#ifdef ANSI
 static S16 rgTOMUtlInsSchInfo
 (
 RgMacPdu *pdu,
@@ -1158,14 +1036,6 @@ RgInfCeInfo *ceInfo,
 CmLteRnti   rnti,
 uint32_t    *lcgBytes
 )
-#else
-static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes)
-RgMacPdu *pdu;
-RgInfSfDatInd *sfInfo;
-RgInfCeInfo *ceInfo;
-CmLteRnti   rnti;
-uint32_t    *lcgBytes;
-#endif
 #endif
 {
    S16            ret;
@@ -1238,17 +1108,7 @@ uint32_t    *lcgBytes;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgTOMDatInd
-(
-Inst           inst,
- TfuDatIndInfo *datInd
- )
-#else
-S16 rgTOMDatInd(inst,datInd)
-Inst             inst;
- TfuDatIndInfo *datInd;
-#endif
+S16 rgTOMDatInd(Inst inst, TfuDatIndInfo *datInd)
 {
    S16               ret = ROK;
    RgErrInfo         err;
@@ -1532,7 +1392,6 @@ Inst             inst;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgHndlCmnChnl
 (
 RgCellCb            *cell,
@@ -1540,13 +1399,6 @@ CmLteTimingInfo     timingInfo,
 RgInfCmnLcInfo      *cmnLcInfo,
 RgErrInfo           *err
 )
-#else
-static S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err)
-RgCellCb            *cell;
-CmLteTimingInfo     timingInfo;
-RgInfCmnLcInfo      *cmnLcInfo;
-RgErrInfo           *err;
-#endif
 {
    #if (ERRCLASS & ERRCLS_DEBUG)
    RgPcchLcCb           *pcch;
@@ -1723,7 +1575,6 @@ RgErrInfo           *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgHndlSchdUe
 (
 RgCellCb            *cell,
@@ -1731,13 +1582,6 @@ CmLteTimingInfo     timingInfo,
 RgInfUeInfo         *ueInfo,
 RgErrInfo           *err
 )
-#else
-static S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */
-RgCellCb            *cell;
-CmLteTimingInfo     timingInfo;
-RgInfUeInfo         *ueInfo;
-RgErrInfo           *err;
-#endif
 {
 
 
@@ -1767,19 +1611,12 @@ RgErrInfo           *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgHndlUlUeInfo
 (
 RgCellCb            *cell,
 CmLteTimingInfo     timingInfo,
 RgInfUlUeInfo       *ueInfo
 )
-#else
-static S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo)
-RgCellCb            *cell;
-CmLteTimingInfo     timingInfo;
-RgInfUlUeInfo       *ueInfo;
-#endif
 {
    Inst           inst = cell->macInst - RG_INST_START;
    uint8_t        idx;
@@ -1848,17 +1685,7 @@ RgInfUlUeInfo       *ueInfo;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-Void rgTOMRlsSf
-(
-Inst                inst,
-RgDlSf              *dlSf
-)
-#else
-Void rgTOMRlsSf(dlSf)
-Inst                inst;
-RgDlSf              *dlSf;
-#endif
+Void rgTOMRlsSf(Inst inst,RgDlSf *dlSf)
 {
    uint8_t          idx;
 
@@ -1945,17 +1772,7 @@ RgDlSf              *dlSf;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgHndlFlowCntrl
-(
-RgCellCb       *cell,
-RgInfSfAlloc        *sfInfo
-)
-#else
-S16 rgHndlFlowCntrl(cell, sfInfo)
-RgCellCb            *cell;
-RgInfSfAlloc        *sfInfo;
-#endif
+S16 rgHndlFlowCntrl(RgCellCb *cell,RgInfSfAlloc *sfInfo)
 {
    RguFlowCntrlInd  *flowCntrlInd;
    Pst              *pst;
@@ -2013,17 +1830,7 @@ RgInfSfAlloc        *sfInfo;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacSfAllocReq
-(
-Pst                 *pst,
-RgInfSfAlloc        *sfInfo
-)
-#else
-S16 RgSchMacSfAllocReq(pst, sfInfo)
-Pst                 *pst;
-RgInfSfAlloc        *sfInfo;
-#endif
+S16 RgSchMacSfAllocReq(Pst *pst,RgInfSfAlloc *sfInfo)
 {
    RgCellCb       *cell;
    RgDlSf         *dlSf;
@@ -2159,7 +1966,6 @@ RgInfSfAlloc        *sfInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgTOMProcCrntiCEInDatInd
 (
 RgMacPdu          *pdu,
@@ -2169,15 +1975,6 @@ TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
 uint16_t               slot
 )
-#else
-static S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
-RgMacPdu          *pdu;
-RgUeCb            *prevUeCb;
-RgCellCb          *cellCb;
-TfuDatInfo        *datInfo;
-RgInfCeInfo       *ceInfo;
-uint16_t               slot;
-#endif
 {
    RgUeCb *ueCb = NULLP;
    Inst   inst  = cellCb->macInst - RG_INST_START;
@@ -2260,7 +2057,6 @@ uint16_t               slot;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgTOMProcCCCHSduInDatInd
 (
 RgMacPdu          *pdu,
@@ -2270,15 +2066,6 @@ TfuDatInfo        *datInfo,
 RgInfCeInfo       *ceInfo,
 uint16_t               slot 
 )
-#else
-static S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
-RgMacPdu          *pdu;
-RgUeCb            *prevUeCb;
-RgCellCb          *cellCb;
-TfuDatInfo        *datInfo;
-RgInfCeInfo       *ceInfo;
-uint16_t               slot;
-#endif
 {
    RgUeCb *ueCb = NULLP;
    Inst   inst  = cellCb->macInst - RG_INST_START;
@@ -2358,17 +2145,7 @@ uint16_t               slot;
  * @return S16
  */
 
-#ifdef ANSI
-static S16 rgTOMUtlL2MStoreBufSz
-(
- RgUeCb      *ueCb,
- RgInfCeInfo *ceInfo
- )
-#else
-static S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
- RgUeCb      *ueCb;
- RgInfCeInfo *ceInfo;
-#endif
+static S16 rgTOMUtlL2MStoreBufSz( RgUeCb *ueCb, RgInfCeInfo *ceInfo )
 {
    uint8_t lcgId;
    uint8_t bsr;
@@ -2409,21 +2186,7 @@ static S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-static Void rgTOML2MCompileActiveLCs
-(
- RgCellCb      *cellCb, 
- RgUeCb        *ueCb,
- RgMacPdu      *pdu,
- RgInfCeInfo   *ceInfo 
- )
-#else
-static Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo)
-   RgCellCb      *cellCb; 
-   RgUeCb        *ueCb;
-   RgMacPdu      *pdu;
-   RgInfCeInfo   *ceInfo; 
-#endif 
+static Void rgTOML2MCompileActiveLCs(RgCellCb *cellCb,RgUeCb *ueCb,RgMacPdu *pdu,RgInfCeInfo *ceInfo)
 {
    CmLList           *node;
    RgMacSdu          *sdu;
index dfd240a..343db6f 100755 (executable)
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgUHMCrgUeCfg
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb,
 CrgUeCfg       *ueCfg
 )
-#else
-Void rgUHMCrgUeCfg(cellCb, ueCb, ueCfg) 
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-CrgUeCfg       *ueCfg;
-#endif
 {
    ueCb->ul.hqEnt.maxHqRetx = (ueCfg->ueUlHqCfg.maxUlHqTx - 1); 
    return;
@@ -118,19 +111,12 @@ CrgUeCfg       *ueCfg;
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgUHMCrgUeRecfg
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb,
 CrgUeRecfg     *ueRecfg
 )
-#else
-Void rgUHMCrgUeRecfg(cellCb, ueCb, ueRecfg) 
-RgCellCb       *cellCb;
-RgUeCb         *ueCb;
-CrgUeRecfg     *ueRecfg;
-#endif
 {
 
    ueCb->ul.hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1); 
index 6bdc8f0..043292d 100755 (executable)
@@ -95,19 +95,12 @@ uint8_t rgRguUlSap;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguBndReq
 (
 Pst  *pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 RgUiRguBndReq(pst, suId, spId)
-Pst  *pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Inst      inst; 
    S16       ret = ROK;
@@ -200,19 +193,12 @@ SpId spId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguUbndReq
 (
 Pst    *pst,
 SpId   spId,
 Reason reason
 )
-#else
-S16 RgUiRguUbndReq(pst, spId, reason)
-Pst    *pst;
-SpId   spId;
-Reason reason;
-#endif
 {
    Inst      inst;
 
@@ -265,19 +251,7 @@ Reason reason;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgUIMRguBndCfm
-(
-Inst inst,
-SpId spId,
-uint8_t status
-)
-#else
-S16 rgUIMRguBndCfm(inst,spId, status)
-Inst          inst;
-SpId          spId;
-uint8_t       status;
-#endif
+S16 rgUIMRguBndCfm(Inst inst,SpId spId,uint8_t status)
 {
    S16  ret = ROK;
    
@@ -309,19 +283,7 @@ uint8_t       status;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRguDDatReq
-(
-Pst             *pst,
-SpId            spId,
-RguDDatReqInfo  *datReq
-)
-#else
-S16 RgUiRguDDatReq(pst, spId, datReq)
-Pst             *pst;
-SpId            spId;
-RguDDatReqInfo  *datReq;
-#endif
+S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo  *datReq)
 {
    S16   ret = ROK;
    Inst  inst;
@@ -428,19 +390,12 @@ RguDDatReqInfo  *datReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguCDatReq
 (
 Pst             *pst,
 SpId            spId,
 RguCDatReqInfo  *datReq
 )
-#else
-S16 RgUiRguCDatReq(pst, spId, datReq)
-Pst             *pst;
-SpId            spId;
-RguCDatReqInfo  *datReq;
-#endif
 {
    Inst  inst;
    S16   ret = ROK;
@@ -516,19 +471,12 @@ RguCDatReqInfo  *datReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguDStaRsp
 (
 Pst             *pst,
 SpId            spId,
 RguDStaRspInfo  *staRsp
 )
-#else
-S16 RgUiRguDStaRsp(pst, spId, staRsp)
-Pst             *pst;
-SpId            spId;
-RguDStaRspInfo  *staRsp;
-#endif
 {
    Inst  inst;
    S16   ret       = ROK;
@@ -572,19 +520,12 @@ RguDStaRspInfo  *staRsp;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguCStaRsp
 (
 Pst             *pst,
 SpId            spId,
 RguCStaRspInfo  *staRsp
 )
-#else
-S16 RgUiRguCStaRsp(pst, spId, staRsp)
-Pst             *pst;
-SpId            spId;
-RguCStaRspInfo  *staRsp;
-#endif
 {
    Inst  inst;
    S16   ret = ROK;
@@ -652,19 +593,12 @@ RguCStaRspInfo  *staRsp;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiRguL2MUlThrpMeasReq 
 (
 Pst             *pst,
 SpId            spId,
 RguL2MUlThrpMeasReqInfo  *measReq
 )
-#else
-S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq)
-Pst             *pst;
-SpId            spId;
-RguL2MUlThrpMeasReqInfo  *measReq;
-#endif
 {
    Inst  inst;
 
@@ -733,19 +667,12 @@ RguL2MUlThrpMeasReqInfo  *measReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgUIMSndDedStaInd
 (
 Inst         inst,
 RgUpSapCb    *rguSap,
 RgRguDedStaInd  *staInd
 )
-#else
-S16 rgUIMSndDedStaInd(inst,rguSap,staInd)
-Inst         inst;
-RgUpSapCb    *rguSap;
-RgRguDedStaInd  *staInd;
-#endif
 {
    S16  ret = ROK;
    
@@ -780,19 +707,12 @@ RgRguDedStaInd  *staInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgUIMSndCmnStaInd
 (
 Inst            inst,
 RgUpSapCb    *rguDlSap,
 RgRguCmnStaInd  *staInd
 )
-#else
-S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd)
-Inst          inst,
-RgUpSapCb    *rguDlSap,
-RgRguCmnStaInd  *staInd;
-#endif
 {
    S16  ret = ROK;
 
@@ -825,19 +745,12 @@ RgRguCmnStaInd  *staInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgUIMSndDedDatInd
 (
 Inst         inst,
 RgUpSapCb    *rguUlSap,
 RgRguDedDatInd  *datInd
 )
-#else
-S16 rgUIMSndDedDatInd(datInd)
-Inst         inst;
-RgUpSapCb    *rguUlSap;
-RgRguDedDatInd  *datInd;
-#endif
 {
    S16  ret = ROK;
 
@@ -876,19 +789,7 @@ RgRguDedDatInd  *datInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgUIMSndCmnDatInd
-(
-Inst         inst,
-RgUpSapCb    *rguUlSap,
-RgRguCmnDatInd  *datInd
-)
-#else
-S16 rgUIMSndCmnDatInd(datInd)
-Inst         inst;
-RgUpSapCb    *rguUlSap;
-RgRguCmnDatInd  *datInd;
-#endif
+S16 rgUIMSndCmnDatInd(Inst inst,RgUpSapCb *rguUlSap,RgRguCmnDatInd  *datInd)
 {
    S16  ret = ROK;
 
@@ -927,19 +828,7 @@ RgRguCmnDatInd  *datInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiCrgBndReq
-(
-Pst   *pst, 
-SuId  suId,
-SpId  spId
-)
-#else
-S16 RgUiCrgBndReq(pst, suId, spId)
-Pst   *pst; 
-SuId  suId;
-SpId  spId;
-#endif
+S16 RgUiCrgBndReq(Pst   *pst, SuId  suId,SpId  spId)
 {
    S16       ret = ROK;
    Pst       tmpPst;   /* Temporary Post Structure */
@@ -1032,19 +921,7 @@ SpId  spId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiCrgUbndReq
-(
-Pst    *pst,
-SpId   spId,
-Reason reason
-)
-#else
-S16 RgUiCrgUbndReq(pst, spId, reason)
-Pst    *pst; 
-SpId   spId;
-Reason reason;
-#endif
+S16 RgUiCrgUbndReq(Pst *pst,SpId spId,Reason reason)
 {
    Inst      inst;
 
@@ -1098,19 +975,7 @@ Reason reason;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgUIMCrgBndCfm
-(
-Inst  inst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 rgUIMCrgBndCfm(inst,suId, status)
-Inst          inst;
-SuId          suId;
-uint8_t       status;
-#endif
+S16 rgUIMCrgBndCfm(Inst  inst,SuId suId,uint8_t status)
 {
 
    if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK)
@@ -1142,7 +1007,6 @@ uint8_t       status;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgUiCrgCfgReq
 (
 Pst           *pst, 
@@ -1150,13 +1014,6 @@ SpId          spId,
 CrgCfgTransId transId,
 CrgCfgReqInfo *cfgReqInfo
 )
-#else
-S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo)
-Pst           *pst; 
-SpId          spId;
-CrgCfgTransId transId;
-CrgCfgReqInfo *cfgReqInfo;
-#endif
 {
    Inst      inst;
    S16       ret       = ROK;
@@ -1242,19 +1099,12 @@ CrgCfgReqInfo *cfgReqInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgUIMCrgCfgCfm
 (
 Inst      inst,
 CrgCfgTransId transId,
 uint8_t       status
 )
-#else
-S16 rgUIMCrgCfgCfm(inst,transId, status)
-Inst      inst;
-CrgCfgTransId transId;
-uint8_t       status;
-#endif
 {
    S16  ret = ROK;
    uint8_t   prntTrans[CRG_CFG_TRANSID_SIZE+1];
@@ -1274,15 +1124,7 @@ uint8_t       status;
 }  /* rgUIMCrgCfgCfm */
 #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
 
-#ifdef ANSI
-S16 rgBatchProc
-(
-Void
-)
-#else
-S16 rgBatchProc()
-Void;
-#endif
+S16 rgBatchProc(Void)
 {
 /* Read from Ring Buffer and process RLC BO Update */
    Pst pst = {0};
index aa02d4c..5736fc8 100755 (executable)
@@ -112,19 +112,12 @@ static S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgAllocShrablSBuf
 (
 Inst    inst,
 Data    **pData,            /* Pointer of the data to be returned */
 Size    size                /* size */
 )
-#else
-S16 rgAllocShrablSBuf(inst,pData, size)
-Inst    inst;
-Data    **pData;            /* Pointer of the data to be returned */
-Size    size;               /* size */
-#endif
 {
    RgUstaDgn dgn;      /* Alarm diagnostics structure */
 
@@ -182,19 +175,12 @@ Size    size;               /* size */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgAllocSBuf
 (
 Inst    inst,
 Data    **pData,            /* Pointer of the data to be returned */
 Size    size                /* size */
 )
-#else
-S16 rgAllocSBuf(inst,pData, size)
-Inst    inst;
-Data    **pData;            /* Pointer of the data to be returned */
-Size    size;               /* size */
-#endif
 {
    RgUstaDgn dgn;      /* Alarm diagnostics structure */
 
@@ -245,19 +231,12 @@ Size    size;               /* size */
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
 Void rgFreeSharableSBuf
 (
 Inst inst,
 Data **data,         /* address of pointer to data */
 Size size            /* size */
 )
-#else
-Void rgFreeSharableSBuf(inst,data, size)
-Inst inst;
-Data **data;         /* address of pointer to data */
-Size size;          /* size */
-#endif
 {
 
    S16 ret;
@@ -299,19 +278,12 @@ Size size;          /* size */
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
 Void rgFreeSBuf
 (
 Inst inst,
 Data **data,         /* address of pointer to data */
 Size size            /* size */
 )
-#else
-Void rgFreeSBuf(inst,data, size)
-Inst  inst;
-Data **data;         /* address of pointer to data */
-Size size;          /* size */
-#endif
 {
 
    S16 ret;
@@ -357,17 +329,11 @@ Size size;          /* size */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgGetMsg
 (
 Inst    inst,
 Buffer  **mBuf            /* Message Buffer pointer be returned */
 )
-#else
-S16 rgGetMsg(inst,mBuf)
-Inst    inst;
-Buffer  **mBuf;           /* Message Buffer pointer be returned */
-#endif
 {
    S16         ret;
 
@@ -408,19 +374,12 @@ Buffer  **mBuf;           /* Message Buffer pointer be returned */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgFillDgnParams
 (
 Inst        inst,
 RgUstaDgn   *dgn,
-uint8_t          dgnType
+uint8_t     dgnType
 )
-#else
-Void rgFillDgnParams(inst,dgn, dgnType)
-Inst        inst;
-RgUstaDgn   *dgn;
-uint8_t          dgnType;
-#endif
 {
 
    switch(dgnType)
@@ -455,7 +414,6 @@ uint8_t          dgnType;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgUpdtRguDedSts
 (
 Inst           inst,
@@ -463,13 +421,6 @@ RgUpSapCb      *rguDlSap,
 uint8_t        stsType,   /* Statistics type to update */
 RgRguDedDatReq *datReq    /* DatReq pointer */
 )
-#else
-Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
-Inst           inst;
-RgUpSapCb      *rguDlSap;
-uint8_t        stsType;   /* Statistics type to update */
-RgRguDedDatReq *datReq;   /* DatReq pointer */
-#endif
 {
    uint8_t idx1,idx2;
    uint32_t idx;
@@ -530,19 +481,12 @@ RgRguDedDatReq *datReq;   /* DatReq pointer */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgUpdtRguCmnSts
 (
 Inst           inst,
 RgUpSapCb     *rguDlSap,
 uint8_t       stsType   /* Statistics type to update */
 )
-#else
-Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
-Inst           inst;
-RgUpSapCb     *rguDlSap;
-uint8_t       stsType;   /* Statistics type to update */
-#endif
 {
 
    switch(stsType)
@@ -577,17 +521,7 @@ uint8_t       stsType;   /* Statistics type to update */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgUpdtCellCnt
-(
-Inst inst,
-uint8_t updtType
-)
-#else
-Void rgUpdtCellCnt(inst,updtType)
-Inst inst;
-uint8_t updtType;
-#endif
+Void rgUpdtCellCnt(Inst inst,uint8_t updtType)
 {
 
    switch (updtType)
@@ -623,17 +557,7 @@ uint8_t updtType;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgUpdtUeCnt
-(
-Inst inst,
-uint8_t updtType
-)
-#else
-Void rgUpdtUeCnt (inst,updtType)
-Inst inst;
-uint8_t updtType;
-#endif
+Void rgUpdtUeCnt(Inst inst,uint8_t updtType)
 {
    switch (updtType)
    {
@@ -663,19 +587,12 @@ uint8_t updtType;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
 S16 rgAllocEventMem
 (
 Inst     inst,
 Ptr       *memPtr,
 Size      memSize
 )
-#else
-S16 rgAllocEventMem(inst,memPtr, memSize)
-Inst     inst;
-Ptr       *memPtr;
-Size      memSize;
-#endif
 {
    Mem               sMem;
    volatile uint32_t startTime=0;
@@ -730,7 +647,6 @@ Size      memSize;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
 S16 rgGetEventMem
 (
 Inst      inst,
@@ -738,13 +654,6 @@ Ptr       *ptr,
 Size      len,
 Ptr       memCp
 )
-#else
-S16 rgGetEventMem(inst,ptr, len, memCp)
-Inst      inst;
-Ptr       *ptr;
-Size      len;
-Ptr       memCp;
-#endif
 {
    S16   ret;
 
@@ -773,19 +682,12 @@ Ptr       memCp;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgGetPstToInst
 (
 Pst           *pst,
 Inst          srcInst,
 Inst          dstInst
 )
-#else
-Void rgGetPstToInst (pst, srcInst, dstInst)
-Pst           *pst;
-Inst          srcInst;
-Inst          dstInst;
-#endif
 {
 
    pst->srcEnt = rgCb[srcInst].rgInit.ent; 
@@ -826,17 +728,7 @@ Inst          dstInst;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacLcgRegReq
-(
-Pst            *pst,
-RgInfLcgRegReq *lcgRegReq
-)
-#else
-S16 RgSchMacLcgRegReq (pst, lcgRegReq)
-Pst            *pst;
-RgInfLcgRegReq *lcgRegReq;
-#endif
+S16 RgSchMacLcgRegReq(Pst *pst,RgInfLcgRegReq *lcgRegReq)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -883,17 +775,7 @@ RgInfLcgRegReq *lcgRegReq;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacUlSpsResetReq
-(
-Pst            *pst,
-RgInfUlSpsReset *ulSpsResetInfo
-)
-#else
-S16 RgSchMacUlSpsResetReq (pst, lcInfo)
-Pst            *pst;
-RgInfUlSpsReset *ulSpsResetInfo;
-#endif
+S16 RgSchMacUlSpsResetReq(Pst *pst,RgInfUlSpsReset *ulSpsResetInfo)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -951,17 +833,7 @@ RgInfUlSpsReset *ulSpsResetInfo;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcRegReq
-(
-Pst            *pst,
-RgInfSpsLcInfo *lcInfo
-)
-#else
-S16 RgSchMacSpsLcRegReq (pst, lcInfo)
-Pst            *pst;
-RgInfSpsLcInfo *lcInfo;
-#endif
+S16 RgSchMacSpsLcRegReq(Pst *pst,RgInfSpsLcInfo *lcInfo)
 {
    Inst       inst;
    RgCellCb   *cell= NULLP;
@@ -1032,19 +904,7 @@ RgInfSpsLcInfo *lcInfo;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcDeregReq
-(
-Pst            *pst,
-CmLteCellId    cellId,
-CmLteRnti      crnti
-)
-#else
-S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti)
-Pst            *pst;
-CmLteCellId    cellId;
-CmLteRnti      crnti;
-#endif
+S16 RgSchMacSpsLcDeregReq(Pst  *pst,CmLteCellId cellId,CmLteRnti crnti)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -1098,7 +958,6 @@ CmLteRnti      crnti;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgUtlHndlCrntiChng 
 (
 Inst            inst,
@@ -1106,13 +965,6 @@ RgCellCb        *cell,
 CmLteRnti       rnti,
 CmLteRnti       newRnti
 )
-#else
-static S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti)
-Inst            inst;
-RgCellCb        *cell;
-CmLteRnti       rnti;
-CmLteRnti       newRnti;
-#endif
 {
    RgUeCb         *ue = NULLP;
    RgUeCb         *newUe = NULLP;
@@ -1164,17 +1016,7 @@ CmLteRnti       newRnti;
  *  @param[in] RgUeCb    *ue
  *  @return  ROK is SUCCESS 
  **/
-#ifdef ANSI
-S16 rgDelUeFrmAllSCell
-(
-RgCellCb      *cell,
-RgUeCb        *ue
-)
-#else
-S16 rgDelUeFrmAllSCell(cell, ue)
-RgCellCb      *cell;
-RgUeCb        *ue;
-#endif
+S16 rgDelUeFrmAllSCell(RgCellCb *cell,RgUeCb *ue)
 {
    Inst        inst     = cell->macInst - RG_INST_START;
    uint8_t     idx      = 0;
@@ -1219,19 +1061,7 @@ RgUeCb        *ue;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgUtlVltdAddSCellCfg
-(
- RgPrgUeSCellCfgInfo *ueSCellCb,
- RgCellCb    *cell,
- Inst        inst
-)
-#else
-S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
- RgPrgUeSCellCfgInfo *ueSCellCb;
- RgCellCb    *cell;
- Inst        inst;
-#endif
+S16 rgUtlVltdAddSCellCfg(RgPrgUeSCellCfgInfo *ueSCellCb,RgCellCb *cell,Inst inst)
 {
   S16 ret = ROK; 
   
@@ -1276,19 +1106,12 @@ S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 static S16 rgUtlSndCrntiChngReq2AllSMacs
 (
 RgCellCb        *cell,
 CmLteRnti       rnti,
 CmLteRnti       newRnti
 )
-#else
-static S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti)
-RgCellCb        *cell;
-CmLteRnti       rnti;
-CmLteRnti       newRnti;
-#endif
 {
    Inst                inst = cell->macInst - RG_INST_START;
    Inst                sCellInstIdx;
@@ -1358,17 +1181,7 @@ TfuDelDatReqInfo delDatReq;
  *  @param[in] CmLteRnti     rnti
  *  @return  Void 
  **/
-#ifdef ANSI
-static Void rgUtlHndlCrntiRls
-(
-RgCellCb        *cell,
-RgInfRlsRnti    *rlsRnti
-)
-#else
-static Void rgUtlHndlCrntiRls(cell, rlsRnti)
-RgCellCb        *cell;
-CmLteRnti       *rlsRnti;
-#endif
+static Void rgUtlHndlCrntiRls(RgCellCb *cell,RgInfRlsRnti *rlsRnti)
 {
    Inst           inst = cell->macInst - RG_INST_START;
    RgUeCb        *ue = NULLP;
@@ -1446,17 +1259,7 @@ CmLteRnti       *rlsRnti;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacRlsRntiReq
-(
-Pst                 *pst,
-RgInfRlsRnti        *rlsRnti
-)
-#else
-S16 RgSchMacRlsRntiReq(pst, rlsRnti)
-Pst                 *pst;
-RgInfRlsRnti        *rlsRnti;
-#endif
+S16 RgSchMacRlsRntiReq(Pst *pst,RgInfRlsRnti *rlsRnti)
 {
 //   Pst            schPst;
 //   RgInfUeDelInd  ueDelInd;
@@ -1541,15 +1344,7 @@ TfuDelDatReqInfo delDatReq;
 } /* end of RgSchMacRlsRntiReq */
 
 #ifdef L2_OPTMZ
-#ifdef ANSI
-Bool RgUtlIsTbMuxed
-(
- TfuDatReqTbInfo *tb
-)
-#else
-Bool RgUtlIsTbMuxed()
-   TfuDatReqTbInfo *tb
-#endif
+Bool RgUtlIsTbMuxed(TfuDatReqTbInfo *tb)
 {
    MsgLen len = 0;
    SFndLenMsg(tb->macHdr, &len);
index 0c4d596..8d642d4 100755 (executable)
@@ -274,19 +274,7 @@ void rlcAmmSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmDl *amDl)
  * 
  * @return  Void
 */
-#ifdef ANSI
-static Void rlcAmmDlCheckAndStopPollTmr
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,
-RlcSn       mAckSn
-)
-#else
-static Void rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-RlcSn       mAckSn;
-#endif
+static Void rlcAmmDlCheckAndStopPollTmr(RlcCb *gCb,RlcDlRbCb *rbCb,RlcSn mAckSn)
 {
    RlcSn mPollSn;                                                   
                                                                    
@@ -311,17 +299,7 @@ RlcSn       mAckSn;
  * 
  * @return  Void
 */
-#ifdef ANSI
-static Void rlcAmmDlSetTxNextAck
-(
-RlcAmDl   *amDl,
-RlcSn      sn
-)
-#else
-static Void rlcAmmDlSetTxNextAck(amDl, sn)
-RlcAmDl   *amDl;
-RlcSn     sn
-#endif
+static Void rlcAmmDlSetTxNextAck(RlcAmDl *amDl,RlcSn sn)
 {
    amDl->txNextAck = sn;
    
@@ -341,21 +319,13 @@ RlcSn     sn
  * 
  * @return  Void
 */
-#ifdef ANSI
 static Void rlcAmmDlProcessSuccessfulReTx
 (
 RlcCb            *gCb,
 RlcDlRbCb        *rbCb,
 RlcRetx          *retx,
-KwuDatCfmInfo   **datCfm
+KwuDatCfmInfo    **datCfm
 )
-#else
-static Void rlcAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcRetx          *retx;
-KwuDatCfmInfo   **datCfm;
-#endif
 {
    rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, &(retx->sduMap), datCfm);
    
@@ -380,7 +350,6 @@ KwuDatCfmInfo   **datCfm;
  *            
  */
 
-#ifdef ANSI
 static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer
 (
 RlcCb          *gCb,
@@ -388,13 +357,6 @@ RlcAmDl        *amDl,
 RlcRetx        **retx,
 RlcDlPduInfo   *pduInfo
 )
-#else
-static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo)
-RlcCb          *gCb;
-RlcAmDl        *amDl;
-RlcRetx        **retx;
-RlcDlPduInfo   *pduInfo;
-#endif
 {
 
    RLC_ALLOC_WC(gCb,*retx, sizeof(RlcRetx));
@@ -454,7 +416,6 @@ RlcDlPduInfo   *pduInfo;
  *            
  */
 
-#ifdef ANSI
 static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf
 (
 RlcCb          *gCb,
@@ -463,16 +424,6 @@ RlcNackInfo    *nackSnInfo,
 RlcRetx        **retx,
 KwuDatCfmInfo ** datCfm
 )
-#else
-static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf(gCb, rbCb, nackSnInfo, retx, datCfm)
-(
-RlcCb          *gCb;
-RlcDlRbCb      *rbCb;
-RlcNackInfo    *nackSnInfo;
-RlcRetx        **retx;
-KwuDatCfmInfo **datCfm;
-)
-#endif
 {
    RlcTx    *txBuf=NULLP;
    CmLList *lnk;
@@ -543,25 +494,14 @@ KwuDatCfmInfo **datCfm;
  * @return Void
  *            
  */
-#ifdef ANSI
 static Void rlcAmmDlUpdateTxAndReTxBufForNackSn
 (
- RlcCb          *gCb,
- RlcDlRbCb      *rbCb,
- RlcNackInfo    *nackSnInfo,
- CmLList        **retxNode,
- KwuDatCfmInfo **datCfm
- )
-#else
-static Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, datCfm)
-(
- RlcCb          *gCb;
- RlcDlRbCb      *rbCb;
- RlcNackInfo    *nackSnInfo;
- CmLList       **retxNode;
- KwuDatCfmInfo **datCfm;
- )
-#endif
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
+RlcNackInfo    *nackSnInfo,
+CmLList        **retxNode,
+KwuDatCfmInfo **datCfm
+)
 {
    RlcTx    *txBuf;
    RlcRetx  *retx;
@@ -663,7 +603,6 @@ static Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode,
  * @return Void
  *            
  */
-#ifdef ANSI
 static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx
 (
 RlcAmDl        *amDl,
@@ -672,16 +611,6 @@ CmLList        *retxNode,
 RlcNackInfo    *nackSnInfo,
 uint8_t        idx
 )
-#else
-static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx)
-(
-RlcAmDl        *amDl;
-RlcNackInfo    *nackInfo;
-CmLList        *retxNode;
-RlcNackInfo    *nackSnInfo;
-uint8_t        idx;
-)
-#endif
 {
    RlcTx     *txBuf;
    RlcRetx   *retx;
@@ -774,19 +703,7 @@ uint8_t        idx;
  * 
  * @return  Void
 */
-#ifdef ANSI
-Void rlcAmmDlHndlStatusPdu
-(
-RlcCb          *gCb,
-RlcDlRbCb      *rbCb,
-RlcUdxStaPdu   *pStaPdu
-)
-#else
-Void rlcAmmDlHndlStatusPdu(gCb, rbCb, pStaPdu)
-RlcCb          *gCb;
-RlcDlRbCb      *rbCb;
-RlcUdxStaPdu   *pStaPdu;
-#endif
+Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu)
 {
    RlcSn      mAckSn;
    S32       oldRetxBo;
@@ -1001,15 +918,7 @@ RlcUdxStaPdu   *pStaPdu;
  *  @return S16
  *      Calculated bo
 */
-#ifdef ANSI
-S32 rlcAmmCalculateBo
-(
-RlcAmDl *amDl
-)
-#else
-S32 rlcAmmCalculateBo(amDl)
-RlcAmDl *amDl;
-#endif
+S32 rlcAmmCalculateBo(RlcAmDl *amDl)
 {
    S32 bo;
 
@@ -2288,19 +2197,7 @@ RlcDlPduInfo *pduInfo, Buffer *pdu)
  * @return Void 
  *
  */
-#ifdef ANSI
-static Void rlcRemRetxPdu
-(  
-RlcCb          *gCb,
-RlcDlRbCb      *rbCb,
-RlcRetx        *retx
-)
-#else
-static Void rlcRemRetxPdu(gCb, rbCb, retx)
-RlcCb          *gCb;
-RlcDlRbCb      *rbCb;
-RlcRetx        *retx;
-#endif
+static Void rlcRemRetxPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcRetx *retx)
 {
    cmLListDelFrm(&AMDL.retxLst, &retx->lstEnt); 
 
@@ -2337,19 +2234,7 @@ RlcRetx        *retx;
  * @return Void 
  *
  */
-#ifdef ANSI
-static Void rlcAmmDlMarkPduForReTx
-(
-RlcCb          *gCb,
-RlcDlRbCb      *rbCb,
-RlcRetx        *retx
-)
-#else
-static Void rlcAmmDlMarkPduForReTx(*gCb, rbCb, retx)
-RlcCb          *gCb;
-RlcDlRbCb      *rbCb;
-RlcRetx        *retx;
-#endif
+static Void rlcAmmDlMarkPduForReTx(RlcCb *gCb,RlcDlRbCb *rbCb,RlcRetx *retx)
 {
    if (AMDL.maxReTxReached == TRUE)
    {
@@ -2416,21 +2301,13 @@ RlcRetx        *retx;
  * @return Void 
  *
  */
-#ifdef ANSI
 static Void rlcAmmDlCheckIsSDUDelivered
 (
 RlcCb            *gCb,
 RlcDlRbCb        *rbCb,
 RlcSduMap        *sduMap,
-KwuDatCfmInfo   **datCfm
+KwuDatCfmInfo    **datCfm
 )
-#else
-static Void rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcSduMap        *sduMap;
-KwuDatCfmInfo   **datCfm;
-#endif
 {
    RlcSdu *sdu;
    
@@ -2501,21 +2378,13 @@ KwuDatCfmInfo   **datCfm;
  * @return Void 
  *
  */
-#ifdef ANSI
 static Void rlcAmmDlProcessSuccessfulTxPdu
 (
 RlcCb            *gCb,
 RlcDlRbCb        *rbCb,
 RlcSn            sn,
-KwuDatCfmInfo   **datCfm
+KwuDatCfmInfo    **datCfm
 )
-#else
-static Void rlcAmmDlProcessSuccessfulTxPdu(gCb, rbCb, sn, datCfm)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcSn            sn;
-KwuDatCfmInfo   **datCfm;
-#endif
 {
    CmLList *pduNode;
   
@@ -2558,19 +2427,12 @@ KwuDatCfmInfo   **datCfm;
  * @return  Void
  *
  */
-#ifdef ANSI
 static Void rlcAmmSndStaInd
 (
 RlcCb       *gCb,
 RlcDlRbCb   *rbCb,
 RlcRetx     *retx
 )
-#else
-static Void rlcAmmSndStaInd(gCb, rbCb, retx)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-RlcRetx     *retx;
-#endif
 {
    KwuStaIndInfo   *staInd;
    RlcKwuSapCb      *rlckwuSap;
@@ -2655,19 +2517,12 @@ static void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx)
  * @return  Void 
  *
  */
-#ifdef ANSI
 Void rlcAmmDlReEstablish
 (
 RlcCb         *gCb,
 CmLteRlcId   rlcId,
 RlcDlRbCb     *rbCb
 )
-#else
-Void rlcAmmDlReEstablish(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   rlcId;
-RlcDlRbCb     *rbCb;
-#endif
 {
    /* create a new AM DL RB, reset it and replace in the UeCb*/
    RlcDlUeCb   *ueCb;
@@ -2778,19 +2633,7 @@ RlcDlRbCb     *rbCb;
  *     -# ROK      In case of successful discard
  *     -# RFAILED  In case the SDU is not found or already mapped
  */
-#ifdef ANSI
-S16 rlcAmmDiscSdu
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,
-uint32_t    sduId 
-)
-#else
-S16 rlcAmmDiscSdu(gCb, rbCb, sduId)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;  
-uint32_t    sduId; 
-#endif
+S16 rlcAmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId )
 {
    return (RFAILED);
 } 
@@ -2807,17 +2650,7 @@ uint32_t    sduId;
  *
  * @return  Void 
  */
-#ifdef ANSI
-Void rlcAmmPollRetxTmrExp
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb
-)
-#else
-Void rlcAmmPollRetxTmrExp(gCb, rbCb)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-#endif
+Void rlcAmmPollRetxTmrExp(RlcCb *gCb,RlcDlRbCb *rbCb)
 {
    RlcRetx        *retx; 
    RlcAmDl        *amDl = &(rbCb->m.amDl);
@@ -2890,7 +2723,6 @@ RlcDlRbCb   *rbCb;
  *
  */
 
-#ifdef ANSI
 static Void rlcAmmDlUpdateTxAndReTxBufForAckSn
 (
 RlcCb            *gCb,
@@ -2899,14 +2731,6 @@ RlcSn            mAckSn,
 CmLList         *retxNode,
 KwuDatCfmInfo   **datCfm
 )
-#else
-static Void rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcSn            mAckSn;
-CmLList         *retxNode;
-KwuDatCfmInfo   **datCfm;
-#endif
 {
    RlcSn    mSn;
    RlcSn    sn;
@@ -2970,7 +2794,6 @@ KwuDatCfmInfo   **datCfm;
  * @return  Void
  *
  */
-#ifdef ANSI
 static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn
 (
 RlcCb            *gCb,
@@ -2980,15 +2803,6 @@ RlcSn            mNackSn,
 CmLList         **retxNode,
 KwuDatCfmInfo   **datCfm
 )
-#else
-static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn(gCb, rbCb, sn, mNackSn, retxNode, datCfm)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcSn            sn;
-RlcSn            mNackSn;
-CmLList         **retxNode;
-KwuDatCfmInfo   **datCfm;
-#endif
 {
    RlcSn    mSn;
    RlcRetx  *retx;
@@ -3099,17 +2913,7 @@ static void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint
  * @return Void
  *            
  */
-#ifdef ANSI
-static Void rlcAmmAddPduToRetxLst
-(
-RlcAmDl   *amDl,
-RlcRetx   *retx
-)
-#else
-static Void rlcAmmAddPduToRetxLst(amDl, retx)
-RlcAmDl   *amDl;
-RlcRetx   *retx;
-#endif
+static Void rlcAmmAddPduToRetxLst(RlcAmDl *amDl,RlcRetx *retx)
 {
    CmLList   *node;
    RlcRetx    *tRetx;
@@ -3168,7 +2972,6 @@ RlcRetx   *retx;
  *            
  */
 
-#ifdef ANSI
 static Void rlcAmmDlMoveFrmTxtoRetxBuffer
 (
 RlcCb          *gCb,
@@ -3176,13 +2979,6 @@ RlcAmDl        *amDl,
 RlcRetx        **retx,
 RlcSn          sn
 )
-#else
-static Void rlcAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn)
-RlcCb          *gCb;
-RlcAmDl        *amDl;
-RlcRetx        **retx;
-RlcSn          sn; 
-#endif
 {
    RlcTx* txBuf = rlcUtlGetTxBuf(amDl->txBufLst, sn);
 
@@ -3234,17 +3030,7 @@ RlcSn          sn;
  *
  * @return Void
  */
-#ifdef ANSI
-Void rlcAmmFreeDlRbCb
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb
-)
-#else
-Void rlcAmmFreeDlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-#endif
+Void rlcAmmFreeDlRbCb(RlcCb  *gCb,RlcDlRbCb  *rbCb)
 {
    /* stop the re-transmission timer */
    if(TRUE == rlcChkTmr(gCb,(PTR)rbCb,RLC_EVT_AMDL_POLL_RETX_TMR))
@@ -3571,19 +3357,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat
 S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId,
       CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu);
 
-#ifdef ANSI
-static Void rgAmmExtractElmnt
-(
-RlcCb       *gCb,
-Buffer     *pdu,
-RlcExtHdr   *hdrInfo
-)
-#else
-static Void rgAmmExtractElmnt(gCb, pdu, hdrInfo)
-RlcCb       *gCb;
-Buffer     *pdu;
-RlcExtHdr   *hdrInfo;
-#endif
+static Void rgAmmExtractElmnt(RlcCb *gCb,Buffer *pdu,RlcExtHdr *hdrInfo)
 {
    uint8_t   hdr;
    uint8_t   pLen = hdrInfo->pLen;
@@ -3651,25 +3425,15 @@ RlcExtHdr   *hdrInfo;
 
 
 
-#ifdef ANSI
 static Void rgAmmUlHndlStatusPdu
 (
 Pst        *udxPst,
 SuId       suId,
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,
+RlcCb      *gCb,
+RlcDlRbCb  *rbCb,
 Buffer     *cntrlPdu,
-uint8_t         *fByte
+uint8_t    *fByte
 )
-#else
-static Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte)
-Pst        *udxPst;
-SuId       suId;
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-Buffer     *cntrlPdu;
-uint8_t         *fByte;
-#endif
 {
    uint8_t             e1;
    RlcExtHdr       hdrInfo;
index 5002352..f76fda6 100755 (executable)
@@ -841,21 +841,7 @@ static uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmH
  *     -# RFAILED
  *
  */
-#ifdef ANSI
-static S16 rlcAmmExtractHdrOld
-(
-RlcCb       *gCb,
-Buffer     *pdu,
-RlcAmHdr    *amHdr,
-uint8_t         *fByte
-)
-#else
-static S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte)
-RlcCb       *gCb;
-Buffer     *pdu;
-RlcAmHdr    *amHdr;
-uint8_t         *fByte;
-#endif
+static S16 rlcAmmExtractHdrOld(RlcCb *gCb,Buffer *pdu,RlcAmHdr *amHdr,uint8_t *fByte)
 {
    uint8_t         e;
    uint8_t         snByte;
@@ -1547,21 +1533,7 @@ static uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *
  * @return  Void
  *
  */
-#ifdef ANSI
-Void rlcAmmUlReEstablish
-(
-RlcCb         *gCb,
-CmLteRlcId   rlcId,
-Bool         sendReEst,
-RlcUlRbCb     *rbCb
-)
-#else
-Void rlcAmmUlReEstablish(gCb, rlcId, sendReEst, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   rlcId;
-Bool         sendReEst;
-RlcUlRbCb     *rbCb;
-#endif
+Void rlcAmmUlReEstablish(RlcCb *gCb,CmLteRlcId rlcId,Bool sendReEst,RlcUlRbCb  *rbCb)
 {
    RlcSn   sn;
    RlcSn   mSn;
@@ -1651,17 +1623,7 @@ RlcUlRbCb     *rbCb;
  *
  */
 
-#ifdef ANSI
-Void rlcAmmReOrdTmrExp
-(
-RlcCb        *gCb,
-RlcUlRbCb    *rbCb
-)
-#else
-Void rlcAmmReOrdTmrExp(rbCb)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;
-#endif
+Void rlcAmmReOrdTmrExp(RlcCb *gCb,RlcUlRbCb *rbCb)
 {
    RlcAmUl *amUl = &(rbCb->m.amUl);
    RlcSn sn;
@@ -1730,17 +1692,7 @@ RlcUlRbCb    *rbCb;
  *
  */
 
-#ifdef ANSI
-Void rlcAmmStaProTmrExp
-(
-RlcCb        *gCb,
-RlcUlRbCb    *rbCb
-)
-#else
-Void rlcAmmStaProTmrExp(gCb, rbCb)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;
-#endif
+Void rlcAmmStaProTmrExp(RlcCb *gCb,RlcUlRbCb *rbCb)
 {
    RlcAmUl *amUl = &(rbCb->m.amUl);
 
@@ -1917,17 +1869,7 @@ static void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg)
  *
  * @return   void
  */
-#ifdef ANSI
-Void rlcAmmFreeUlRbCb
-(
-RlcCb       *gCb,
-RlcUlRbCb   *rbCb
-)
-#else
-Void rlcAmmFreeUlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;
-#endif
+Void rlcAmmFreeUlRbCb(RlcCb       *gCb,RlcUlRbCb   *rbCb)
 {
    RlcSn         curSn = 0;           /* Sequence number of PDU */
    RlcSn         windSz;              /* PDU window size */
index f0055df..de810a3 100755 (executable)
@@ -315,21 +315,7 @@ static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
-static S16 rlcCfgFillDlRbCb
-(
-RlcCb            *gCb,
-RlcDlRbCb        *rbCb,
-RlcDlUeCb        *ueCb,
-RlcEntCfgInfo   *entCfg
-)
-#else
-static S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcDlUeCb        *ueCb;
-RlcEntCfgInfo   *entCfg;
-#endif
+static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfgInfo *entCfg)
 {
 
    RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
@@ -431,21 +417,13 @@ RlcEntCfgInfo   *entCfg;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
 static S16 rlcCfgUpdateDlRb
 (
-RlcCb            *gCb,
-RlcDlRbCb        *rbCb,
+RlcCb           *gCb,
+RlcDlRbCb       *rbCb,
 void            *ptr,
 RlcEntCfgInfo   *entCfg
 )
-#else
-static S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-void            *ptr;
-RlcEntCfgInfo   *entCfg;
-#endif
 {
    
    if (rbCb->mode != entCfg->entMode)
@@ -546,7 +524,6 @@ RlcEntCfgInfo   *entCfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgAddDlRb
 (
 RlcCb               *gCb,
@@ -555,14 +532,6 @@ CmLteCellId        cellId,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb               *gCb;
-CmLteRnti          ueId;
-CmLteCellId        cellId;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    RlcDlUeCb     *ueCb = NULLP;   /* UE Control Block */
    RlcDlCellCb   *cellCb;         /* Cell Control Block */
@@ -871,7 +840,6 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgReCfgDlRb
 (
 RlcCb               *gCb,
@@ -880,14 +848,6 @@ CmLteCellId        cellId,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb               *gCb;
-CmLteRnti          ueId;
-CmLteCellId        cellId;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    RlcDlRbCb     *rbCb;     /* RB Control Block */
    RlcDlRbCb     tRbCb;     /* KW RB Control Block */
@@ -1072,7 +1032,6 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgDelDlRb
 (
 RlcCb               *gCb,
@@ -1081,14 +1040,6 @@ CmLteCellId        cellId,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb               *gCb;
-CmLteRnti          ueId;
-CmLteCellId        cellId;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    S16          ret;       /* Return Value */
    RlcDlUeCb     *ueCb;     /* UE Control Block */
@@ -1266,25 +1217,15 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgReEstDlRb
 (
-RlcCb               *gCb,
+RlcCb              *gCb,
 CmLteRnti          ueId,
 CmLteCellId        cellId,
 Bool               sndReEstInd,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm)
-RlcCb               *gCb;
-CmLteRnti          ueId;
-CmLteCellId        cellId;
-Bool               sndReEstInd;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    RlcDlRbCb     *rbCb;   /* RB Control Block */
    CmLteRlcId   rlcId;   /* RLC Identifier */
@@ -1367,23 +1308,14 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgDelDlUe
 (
-RlcCb               *gCb,
+RlcCb              *gCb,
 CmLteRnti          ueId,
 CmLteCellId        cellId,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm)
-RlcCb               *gCb;
-CmLteRnti          ueId;
-CmLteCellId        cellId;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    S16        ret;     /* Return Value */
    RlcDlUeCb   *ueCb;   /* UE Control Block */
@@ -1458,7 +1390,6 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgDelDlCell
 (
 RlcCb               *gCb,
@@ -1466,13 +1397,6 @@ CmLteCellId        cellId,
 RlcEntCfgInfo      *entCfg,
 RlcEntCfgCfmInfo   *entCfm
 )
-#else
-S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm)
-RlcCb               *gCb;
-CmLteCellId        cellId;
-RlcEntCfgInfo      *entCfg;
-RlcEntCfgCfmInfo   *entCfm;
-#endif
 {
    RlcDlCellCb   *cellCb;   /* UE Control Block */
    uint8_t       rbId;      /* RB Identifier */
@@ -1542,7 +1466,6 @@ RlcEntCfgCfmInfo   *entCfm;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgDlUeIdChng
 (
 RlcCb        *gCb,
@@ -1550,13 +1473,6 @@ CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo,
 CmStatus    *status
 )
-#else
-S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status)
-RlcCb        *gCb;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-CmStatus    *status;
-#endif
 {
    RlcDlUeCb *ueCb;
 /*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
index d2d08c0..9372c21 100755 (executable)
@@ -306,21 +306,7 @@ static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
-static S16 rlcCfgFillUlRbCb
-(
-RlcCb            *gCb,
-RlcUlRbCb        *rbCb,
-RlcUlUeCb        *ueCb,
-RlcEntCfgInfo   *entCfg
-)
-#else
-static S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg)
-RlcCb            *gCb;
-RlcUlRbCb        *rbCb;
-RlcUlUeCb        *ueCb;
-RlcEntCfgInfo   *entCfg;
-#endif
+static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg)
 {
 
    RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId, 
@@ -415,21 +401,7 @@ RlcEntCfgInfo   *entCfg;
  *    -#ROK
  *    -#RFAILED
  */
-#ifdef ANSI
-static S16 rlcCfgUpdateUlRb
-(
-RlcCb            *gCb,
-RlcUlRbCb        *rbCb,
-void            *ptr,
-RlcEntCfgInfo   *entCfg
-)
-#else
-static S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg)
-RlcCb            *gCb;
-RlcUlRbCb        *rbCb;
-void            *ptr;
-RlcEntCfgInfo   *entCfg;
-#endif
+static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg)
 {
    
    switch (rbCb->mode)
@@ -484,23 +456,7 @@ RlcEntCfgInfo   *entCfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 rlcValidateRbCfgParams
-(
-RlcCb            *gCb,
-CmLteRnti       ueId,
-CmLteCellId     cellId,
-RlcEntCfgInfo   *cfgToValidate,
-CmStatus        *status
-)
-#else
-S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status)
-RlcCb            *gCb;
-CmLteRnti       ueId;
-CmLteCellId     cellId;
-RlcEntCfgInfo   *cfgToValidate;
-CmStatus        *status;
-#endif
+S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status)
 {
    if (cellId == 0)
    {
@@ -614,7 +570,6 @@ CmStatus        *status;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateUlRb
 (
 RlcCb             *gCb,
@@ -622,13 +577,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData 
 )
-#else
-S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData)
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData; 
-#endif
 {
 
    RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
@@ -835,7 +783,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgRollBackUlRb
 (
 RlcCb             *gCb,
@@ -843,15 +790,6 @@ CmLteRnti        ueId,
 RlcEntCfgInfo    *cfg,
 RlcUlEntTmpData   *cfgEntData
 )
-#else
-S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData)
-(
-RlcCb             *gCb;
-CmLteRnti        ueId;
-RlcEntCfgInfo    *cfg;
-RlcUlEntTmpData   *cfgEntData;
-)
-#endif
 {
 
    if(CKW_CFG_ADD == cfg->cfgType)
@@ -888,7 +826,6 @@ RlcUlEntTmpData   *cfgEntData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 Void rlcCfgApplyUlRb
 (
 RlcCb             *gCb,
@@ -896,15 +833,6 @@ RlcEntCfgInfo    *cfgToAply,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData)
-(
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToAply;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-)
-#endif
 {
   
    switch(cfgToAply->cfgType)
@@ -1031,7 +959,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateDelUlUe
 (
 RlcCb             *gCb,
@@ -1039,13 +966,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData)
-RlcCb             *gCb;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
 
    RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId, 
@@ -1085,19 +1005,11 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyDelUlUe
 (
 RlcCb             *gCb,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-Void rlcCfgApplyDelUlUe(gCb, cfgTmpData)
-(
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgTmpData;
-)
-#endif
 {
    
 #ifdef LTE_L2_MEAS
@@ -1123,7 +1035,6 @@ RlcUlCfgTmpData   *cfgTmpData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateDelUlCell
 (
 RlcCb             *gCb,
@@ -1132,14 +1043,6 @@ RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData,
 RlcUlCfgTmpData   *cfgTmpData
 )
-#else
-S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData)
-RlcCb             *gCb;
-CmLteCellId      cellId;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
 
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
@@ -1177,19 +1080,7 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
-Void rlcCfgApplyDelUlCell
-(
-RlcCb             *gCb,
-RlcUlCfgTmpData   *cfgInfo
-)
-#else
-Void rlcCfgApplyDelUlCell(gCb, cfgEntData)
-(
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgInfo;
-)
-#endif
+Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo)
 {
    
    rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb);
@@ -1210,7 +1101,6 @@ RlcUlCfgTmpData   *cfgInfo;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateReEstRb
 (
 RlcCb             *gCb,
@@ -1219,14 +1109,6 @@ CmLteCellId      cellId,
 RlcEntCfgInfo    *cfgToValidate,
 RlcUlEntTmpData   *cfgEntData
 )
-#else
-S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData)
-RlcCb             *gCb;
-CmLteRnti        ueId;
-CmLteCellId      cellId;
-RlcEntCfgInfo    *cfgToValidate;
-RlcUlEntTmpData   *cfgEntData;
-#endif
 {
    CmLteRlcId   rlcId;   /* RLC Identifier */
 
@@ -1270,25 +1152,14 @@ RlcUlEntTmpData   *cfgEntData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyReEstUlRb
 (
-RlcCb             *gCb,
-CmLteRnti        ueId,
-CmLteCellId      cellId,
-Bool             sndReEstInd,
-RlcUlEntTmpData   *cfgEntData
-)
-#else
-Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData)
-(
-RlcCb             *gCb;
-CmLteRnti        ueId;
-CmLteCellId      cellId;
-Bool             sndReEstInd;
-RlcUlEntTmpData   *cfgEntData;
+RlcCb           *gCb,
+CmLteRnti       ueId,
+CmLteCellId     cellId,
+Bool            sndReEstInd,
+RlcUlEntTmpData *cfgEntData
 )
-#endif
 {
    CmLteRlcId   rlcId;   /* RLC Identifier */
    
@@ -1333,21 +1204,13 @@ RlcUlEntTmpData   *cfgEntData;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcCfgValidateUeIdChng
 (
-RlcCb             *gCb,
+RlcCb            *gCb,
 CkwUeInfo        *ueInfo,
 CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData
+RlcUlCfgTmpData  *cfgTmpData
 )
-#else
-S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData)
-RlcCb             *gCb;
-CkwUeInfo        *ueInfo;
-CkwUeInfo        *newUeInfo;
-RlcUlCfgTmpData   *cfgTmpData;
-#endif
 {
    RlcUlUeCb   *ueCb;
 
@@ -1398,23 +1261,13 @@ RlcUlCfgTmpData   *cfgTmpData;
  * @return  S16
  *    -# ROK
  */
-#ifdef ANSI
 Void rlcCfgApplyUlUeIdChng
 (
-RlcCb             *gCb,
-CkwUeInfo        *ueInfo,
-CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData
-)
-#else
-Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData)
-(
-RlcCb             *gCb;
+RlcCb            *gCb,
 CkwUeInfo        *ueInfo,
 CkwUeInfo        *newUeInfo,
-RlcUlCfgTmpData   *cfgTmpData;
+RlcUlCfgTmpData  *cfgTmpData
 )
-#endif
 {
    
 #ifdef LTE_L2_MEAS
index c69fd18..1e3afc4 100755 (executable)
@@ -94,15 +94,7 @@ TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti);
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmDlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlInit(RlcCb *gCb)
 {
 
    /* Initialize ueCb Hash List */
@@ -177,15 +169,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDlDeInit(RlcCb *gCb)
 {
 
 
@@ -335,19 +319,7 @@ CmLteLcId lcId, RlcDlRbCb **rbCb)
  * @return  Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlRb
-(
-RlcCb       *gCb,
-RlcDlRbCb   **rbCbLst,
-uint8_t     numRbCb 
-)
-#else
-Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcDlRbCb   **rbCbLst;
-uint8_t     numRbCb;   
-#endif
+Void rlcDbmDelAllDlRb(RlcCb *gCb,RlcDlRbCb **rbCbLst,uint8_t numRbCb)
 {
    uint32_t idx;
 
@@ -401,21 +373,7 @@ uint8_t     numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlUeCb
-(
-RlcCb          *gCb,
-CmLteRnti     ueId,  
-CmLteCellId   cellId,
-RlcDlUeCb      **ueCb 
-)
-#else
-S16 rlcDbmCreateDlUeCb(gCb,ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;
-CmLteCellId   cellId;
-RlcDlUeCb      **ueCb;
-#endif
+S16 rlcDbmCreateDlUeCb(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcDlUeCb **ueCb)
 {
    RlcDlUeCb *tUeCb;        
 
@@ -494,19 +452,7 @@ uint8_t rlcDbmFetchDlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcDl
  * @return Void
  *
 */
-#ifdef ANSI
-Void rlcDbmDelDlUeCb
-(
-RlcCb       *gCb,
-RlcDlUeCb   *ueCb,   
-Bool       abortFlag 
-)
-#else
-Void rlcDbmDelDlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcDlUeCb   *ueCb; 
-Bool       abortFlag;
-#endif
+Void rlcDbmDelDlUeCb(RlcCb *gCb,RlcDlUeCb *ueCb,Bool abortFlag)
 {
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -551,15 +497,7 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlUe
-(
-RlcCb  *gCb
-)
-#else
-Void rlcDbmDelAllDlUe(gCb)
-RlcCb  *gCb;
-#endif
+Void rlcDbmDelAllDlUe(RlcCb  *gCb)
 {
    RlcDlUeCb *ueCb = NULLP; 
 
@@ -579,17 +517,7 @@ RlcCb  *gCb;
 
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-Void rlcDbmDelAllDlL2MeasTbFrmUe
-(
-RlcCb      *gCb,
-RlcDlUeCb  *ueCb
-)
-#else
-Void rlcDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb)
-RlcCb      *gCb;
-RlcDlUeCb  *ueCb;
-#endif
+Void rlcDbmDelAllDlL2MeasTbFrmUe(RlcCb *gCb,RlcDlUeCb  *ueCb)
 {
    uint8_t       tbIdx;
    RlcL2MeasTb   *l2MeasTb = NULLP;
@@ -621,19 +549,7 @@ RlcDlUeCb  *ueCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmCreateDlCellCb
-(
-RlcCb          *gCb,
-CmLteCellId   cellId, 
-RlcDlCellCb    **cellCb 
-)
-#else
-S16 rlcDbmCreateDlCellCb(gCb,cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;   
-RlcDlCellCb    **cellCb;
-#endif
+S16 rlcDbmCreateDlCellCb(RlcCb *gCb,CmLteCellId cellId,RlcDlCellCb **cellCb)
 {
    RlcDlCellCb *tCellCb; 
    
@@ -709,17 +625,7 @@ uint8_t rlcDbmFetchDlCellCb(RlcCb *gCb, CmLteCellId  cellId, RlcDlCellCb **cellC
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelDlCellCb
-(
-RlcCb         *gCb,
-RlcDlCellCb   *cellCb  
-)
-#else
-Void rlcDbmDelDlCellCb(gCb,cellCb)
-RlcCb         *gCb;
-RlcDlCellCb   *cellCb;
-#endif
+Void rlcDbmDelDlCellCb(RlcCb *gCb,RlcDlCellCb *cellCb)
 {
 
    /* Delete all rbCbs in cellCb */
@@ -748,15 +654,7 @@ RlcDlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllDlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllDlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllDlCell(RlcCb *gCb)
 {
    RlcDlCellCb *cellCb = NULLP;
 
@@ -785,15 +683,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-S16 rlcDbmDlShutdown
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDlShutdown(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDlShutdown(RlcCb *gCb)
 {
 
    rlcDbmDelAllDlCell(gCb);
index 63054fb..e34412e 100755 (executable)
@@ -73,15 +73,7 @@ static int RLOG_FILE_ID=194;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
-S16 rlcDbmUlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmUlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmUlInit(RlcCb *gCb)
 {
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp), 
@@ -140,15 +132,7 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmUlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlDeInit(RlcCb *gCb)
 {
 
    /* De Initialize ueCb Hash List */
@@ -182,19 +166,12 @@ RlcCb *gCb;
  *
  * @return  Void
 */
-#ifdef ANSI
 Void rlcDbmFetchUlRbCbByRbId
 (
 RlcCb         *gCb,
 CmLteRlcId   *rlcId,  
 RlcUlRbCb     **rbCb  
 )
-#else
-Void rlcDbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   *rlcId;    
-RlcUlRbCb     **rbCb;   
-#endif
 {
    *rbCb= NULLP;
 
@@ -319,19 +296,12 @@ void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
  * @return  Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelAllUlRb
 (
 RlcCb       *gCb,
 RlcUlRbCb   **rbCbLst,          
-uint8_t         numRbCb            
+uint8_t     numRbCb            
 )
-#else
-Void rlcDbmDelAllUlRb(gCb, rbCbLst, numRbCb)
-RlcCb       *gCb;
-RlcUlRbCb   **rbCbLst;        
-uint8_t         numRbCb;         
-#endif
 {
    uint32_t idx; /* Index */
 
@@ -374,7 +344,6 @@ uint8_t         numRbCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlUeCb
 (
 RlcCb          *gCb,
@@ -382,13 +351,6 @@ CmLteRnti     ueId,
 CmLteCellId   cellId,    
 RlcUlUeCb      *ueCb    
 )
-#else
-S16 rlcDbmAddUlUeCb(gCb, ueId, cellId, ueCb)
-RlcCb          *gCb;
-CmLteRnti     ueId;    
-CmLteCellId   cellId; 
-RlcUlUeCb      *ueCb;
-#endif
 {
 
    ueCb->ueId = ueId;
@@ -426,17 +388,11 @@ RlcUlUeCb      *ueCb;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmAddUlTransaction 
 (
 RlcCb        *gCb,
 RlcUlCfgTmpData   *cfg
 )
-#else
-S16 rlcDbmAddUlTransaction(gCb, cfg)
-RlcCb        *gCb;
-RlcUlCfgTmpData   *cfg;
-#endif
 {
 #ifndef ALIGN_64BIT
    RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
@@ -467,19 +423,12 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmFindUlTransaction
 (
 RlcCb             *gCb,
-uint32_t              transId,
+uint32_t          transId,
 RlcUlCfgTmpData   **cfg
 )
-#else
-S16 rlcDbmFindUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-uint32_t              transId;
-RlcUlCfgTmpData   **cfg;
-#endif
 {
 
    if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
@@ -510,17 +459,11 @@ RlcUlCfgTmpData   **cfg;
  *      -# RFAILED 
  *
 */
-#ifdef ANSI
 S16 rlcDbmDelUlTransaction
 (
 RlcCb             *gCb,
 RlcUlCfgTmpData   *cfg       
 )
-#else
-S16 rlcDbmDelUlTransaction(gCb, cfg)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfg;     
-#endif
 {
 
    if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) 
@@ -546,15 +489,7 @@ RlcUlCfgTmpData   *cfg;
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 rlcDbmDelAllUlTransactions
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDelAllUlTransactions(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDelAllUlTransactions(RlcCb *gCb)
 {
    RlcUlCfgTmpData *cfg = NULL;
 
@@ -615,19 +550,12 @@ uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId  cellId, RlcUl
  * @return Void
  *
 */
-#ifdef ANSI
 Void rlcDbmDelUlUeCb
 (
 RlcCb       *gCb,
 RlcUlUeCb   *ueCb,       
 Bool       abortFlag   
 )
-#else
-Void rlcDbmDelUlUeCb(gCb,eCb, abortFlag)
-RlcCb       *gCb;
-RlcUlUeCb   *ueCb;      
-Bool       abortFlag; 
-#endif
 {
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -669,15 +597,7 @@ Bool       abortFlag;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlUe
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlUe(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlUe(RlcCb *gCb)
 {
    RlcUlUeCb *ueCb = NULLP;  /* UE Control Block */
 
@@ -710,19 +630,12 @@ RlcCb *gCb;
  *     -# ROK 
  *     -# RFAILED 
 */
-#ifdef ANSI
 S16 rlcDbmAddUlCellCb
 (
 RlcCb          *gCb,
 CmLteCellId   cellId,    
 RlcUlCellCb    *cellCb  
 )
-#else
-S16 rlcDbmAddUlCellCb(gCb, cellId, cellCb)
-RlcCb          *gCb;
-CmLteCellId   cellId;    
-RlcUlCellCb    *cellCb;  
-#endif
 {
    RlcUlCellCb *tCellCb; 
 
@@ -785,17 +698,7 @@ void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
  *
  *  @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelUlCellCb
-(
-RlcCb         *gCb,
-RlcUlCellCb   *cellCb     
-)
-#else
-Void rlcDbmDelUlCellCb(gCb, cellCb)
-RlcCb         *gCb;
-RlcUlCellCb   *cellCb;     
-#endif
+Void rlcDbmDelUlCellCb(RlcCb *gCb,RlcUlCellCb *cellCb)
 {
 
    /* Delete all rbCbs in cellCb */
@@ -824,15 +727,7 @@ RlcUlCellCb   *cellCb;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcDbmDelAllUlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlCell(RlcCb *gCb)
 {
    RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
 
@@ -860,15 +755,7 @@ RlcCb *gCb;
  * @param[in] gCb      RLC Instance Control Block
  *
 */
-#ifdef ANSI
-Void rlcDbmUlShutdown
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlShutdown(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlShutdown(RlcCb *gCb)
 {
 
    rlcDbmDelAllUlCell(gCb);
index 9ac5064..77d3a52 100755 (executable)
@@ -93,13 +93,7 @@ S16 rlcDlInitExt ARGS (( Void ));
  *
 */
   
-#ifdef ANSI
-S16 rlcDlInitExt 
-(
-)
-#else
 S16 rlcDlInitExt()
-#endif
 {
    return ROK;
 } /* kwInitExt */
@@ -133,7 +127,6 @@ S16 rlcDlInitExt()
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcDlActvInit
 (
 Ent    ent,                 /* entity */
@@ -141,13 +134,6 @@ Inst   inst,                /* instance */
 Region region,              /* region */
 Reason reason               /* reason */
 )
-#else
-S16 rlcDlActvInit(ent, inst, region, reason)
-Ent    ent;                 /* entity */
-Inst   inst;                /* instance */
-Region region;              /* region */
-Reason reason;              /* reason */
-#endif
 {
    RlcCb    *tRlcCb;
 
@@ -227,17 +213,11 @@ Reason reason;              /* reason */
 #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
 pthread_t gRlcTId = 0;
 #endif
-#ifdef ANSI
 S16 rlcDlActvTsk
 (
 Pst *pst,              /* pst structure */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 rlcDlActvTsk(pst, mBuf)
-Pst *pst;              /* pst structure */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
    S16 ret = ROK;
 
index 4272896..a27196d 100755 (executable)
@@ -107,15 +107,10 @@ static const SystemId sId ={
 *
 */
 
-#ifdef ANSI
 S16 rlcGetSId
 (
 SystemId *s                 /* system id */
 )
-#else
-S16 rlcGetSId(s)
-SystemId *s;                /* system id */
-#endif
 {
 
    s->mVer = sId.mVer;
index 6015596..a7eff98 100755 (executable)
@@ -99,19 +99,7 @@ extern "C" {
  *    -# RFAILED 
  *
 */
-#ifdef ANSI
-S16 RlcLiRguBndCfm
-(
-Pst     *pst,   
-SuId    suId, 
-uint8_t status 
-)
-#else
-S16 RlcLiRguBndCfm (pst, suId, status)
-Pst     *pst; 
-SuId    suId;
-uint8_t status;
-#endif
+S16 RlcLiRguBndCfm(Pst *pst,SuId suId,uint8_t status)
 {
    uint16_t      event;     /* Event */
    uint16_t      cause;     /* Cause */
@@ -469,19 +457,7 @@ uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo *staInd)
  *    -# RFAILED 
  *
 */ 
-#ifdef ANSI
-S16 RlcLiRguFlowCntrlInd
-(
-Pst              *pst,  
-SuId             suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 RlcLiRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst              *pst; 
-SuId             suId; 
-RguFlowCntrlInd  *flowCntrlInd; 
-#endif
+S16 RlcLiRguFlowCntrlInd(Pst *pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
 {
    RlcCb       *tRlcCb; 
    RlcDlRbCb   *rbCb = NULLP;
@@ -551,19 +527,7 @@ RguFlowCntrlInd  *flowCntrlInd;
  *      -# RFAILED
  *
  */
-#ifdef ANSI
-S16 RlcLiRguHqStaInd
-(
-Pst                *pst, 
-SuId               suId,
-RguHarqStatusInd   *staInd 
-)
-#else
-S16 RlcLiRguHqStaInd(pst,suId,staInd)
-Pst                *pst;  
-SuId               suId; 
-RguHarqStatusInd   *staInd;
-#endif
+S16 RlcLiRguHqStaInd(Pst *pst, SuId suId,RguHarqStatusInd *staInd)
 {
 
    RlcUeKey   ueKey;
index 08eae8c..5fa275d 100755 (executable)
@@ -122,17 +122,7 @@ static S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action
  *    LCM_REASON_INVALID_PAR_VAL
  *    LCM_REASON_HASHING_FAILED
  */
-#ifdef ANSI
-static S16 rlcLmmGenCfg
-(
-RlcCb       *gCb,
-RlcGenCfg   *cfg
-)
-#else
-static S16 rlcLmmGenCfg(gCB,cfg)
-RlcCb       *gCb;
-RlcGenCfg   *cfg;
-#endif
+static S16 rlcLmmGenCfg(RlcCb  *gCb,RlcGenCfg *cfg)
 {
    Size     rlcSapSize;
    Size     rlcUdxSapSize;
@@ -422,7 +412,6 @@ RlcGenCfg   *cfg;
  * @return  S16
  *     -# ROK
  */
-#ifdef ANSI
 static Void rlcLmmSendCfm
 (
 RlcCb      *gCb,
@@ -431,14 +420,6 @@ RlcMngmt   *cfm,
 uint8_t    type,              
 Header     *hdr              
 )
-#else
-static Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr)
-RlcCb      gCb;
-Pst        *pst;            
-RlcMngmt   *cfm;           
-uint8_t    type;          
-Header     *hdr;         
-#endif
 {
    Pst   rPst;   /* Reply post structure */
 
@@ -561,17 +542,7 @@ Header     *hdr;
  *    -# Failure : RFAILED
  */
 
-#ifdef ANSI
-uint8_t RlcMiRlcConfigReq 
-(
-Pst       *pst, 
-RlcMngmt   *cfg
-)
-#else
-uint8_t RlcMiRlcConfigReq (pst, cfg)
-Pst       *pst;
-RlcMngmt   *cfg;
-#endif
+uint8_t RlcMiRlcConfigReq (Pst *pst,RlcMngmt *cfg)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
@@ -715,17 +686,7 @@ RlcMngmt   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-uint8_t RlcMiLkwCntrlReq
-(
-Pst       *pst, 
-RlcMngmt   *cntrl
-)
-#else
-uint8_t RlcMiLkwCntrlReq(pst, cntrl)
-Pst       *pst;
-RlcMngmt   *cntrl;
-#endif
+uint8_t RlcMiLkwCntrlReq(Pst *pst, RlcMngmt *cntrl)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
@@ -821,17 +782,7 @@ RlcMngmt   *cntrl;
  *    -# ROK (SUCCESS)
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcMiLkwStaReq
-(
-Pst       *pst, 
-RlcMngmt   *sta
-)
-#else
-S16 RlcMiLkwStaReq(pst, sta)
-Pst       *pst;
-RlcMngmt   *sta;
-#endif
+S16 RlcMiLkwStaReq(Pst *pst,RlcMngmt *sta)
 {
    RlcMngmt   rSta;     /* Status */
    Reason    reason;   /* Failure reason */
@@ -953,19 +904,7 @@ RlcMngmt   *sta;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcMiLkwStsReq 
-(
-Pst      *pst, 
-Action    action, 
-RlcMngmt   *sts
-)
-#else
-S16 RlcMiLkwStsReq (pst, action, sts)
-Pst       *pst;
-Action    action;
-RlcMngmt   *sts;
-#endif
+S16 RlcMiLkwStsReq (Pst *pst, Action action,RlcMngmt *sts)
 {
    RlcMngmt   rSts;     /* Statistics */
    Reason    reason;   /* Reason for failure */
@@ -1069,17 +1008,7 @@ measurement confirm is sent.
  *      -# Success : ROK
  *      -# Failure : RFAILED
 */
-#ifdef ANSI
-S16 RlcMiLkwL2MeasReq 
-(
-Pst            *pst, 
-RlcL2MeasReqEvt *measReqEvt 
-)
-#else
-S16 RlcMiLkwL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-RlcL2MeasReqEvt *measReqEvt;
-#endif
+S16 RlcMiLkwL2MeasReq(Pst *pst, RlcL2MeasReqEvt *measReqEvt)
 {
    S16            ret = ROK;
    uint16_t       cntr;
@@ -1196,17 +1125,7 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-S16 RlcMiLkwL2MeasStopReq
-(
-Pst            *pst,
-uint8_t             measType
-)
-#else
-S16 RlcMiLkwL2MeasStopReq (pst, measType)
-Pst            *pst;
-uint8_t             measType;
-#endif
+S16 RlcMiLkwL2MeasStopReq(Pst *pst,uint8_t measType)
 {
    S16 ret = ROK;
    RlcL2MeasEvtCb *measEvtCb = NULLP;
@@ -1262,17 +1181,7 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-S16 RlcMiLkwL2MeasSendReq
-(
-Pst            *pst,
-uint8_t             measType
-)
-#else
-S16 RlcMiLkwL2MeasSendReq (pst, measType)
-Pst            *pst;
-uint8_t             measType;
-#endif
+S16 RlcMiLkwL2MeasSendReq(Pst *pst,uint8_t measType)
 {
    /*S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
@@ -1320,17 +1229,7 @@ uint8_t             measType;
  *    -# LCM_REASON_MEM_NOAVAIL 
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
-#ifdef ANSI
-static S16 rlcLmmCfgKwuSap
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg                
-)
-#else
-static S16 rlcLmmCfgKwuSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;               
-#endif
+static S16 rlcLmmCfgKwuSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcKwuSapCb   *rlcKwuSapCb;
 
@@ -1376,17 +1275,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP 
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
-#ifdef ANSI
-static S16 rlcLmmCfgCkwSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg             
-)
-#else
-static S16 rlcLmmCfgCkwSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;             
-#endif
+static S16 rlcLmmCfgCkwSap(RlcCb  *gCb,RlcSapCfg *cfg)
 {
    RlcCkwSapCb  *ckwSap;
    
@@ -1434,17 +1323,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP
  *    -# LCM_REASON_RECONFIG_FAIL
  */
-#ifdef ANSI
-static S16 rlcLmmCfgUdxSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg         
-)
-#else
-static S16 rlcLmmCfgUdxSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;       
-#endif
+static S16 rlcLmmCfgUdxSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcUdxDlSapCb   *udxDlSap;
    RlcUdxUlSapCb   *udxUlSap;
@@ -1508,17 +1387,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP
  *    -# LCM_REASON_RECONFIG_FAIL
  */
-#ifdef ANSI
-static S16 rlcLmmCfgRguSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg               
-)
-#else
-static S16 rlcLmmCfgRguSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;             
-#endif
+static S16 rlcLmmCfgRguSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcRguSapCb   *rguSap;
 
@@ -1569,15 +1438,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SUBACTION
  *    -# LCM_REASON_INVALID_ACTION
  */
-#ifdef ANSI
-static S16 rlcLmmValidateGenCntrl
-(
-RlcMngmt   *cntrl                 
-)
-#else
-static S16 rlcLmmValidateGenCntrl(cntrl)
-RlcMngmt   *cntrl;                
-#endif
+static S16 rlcLmmValidateGenCntrl(RlcMngmt   *cntrl)
 {
    S16     reason;    /* reason for failure */
    uint8_t sAction;   /* subaction field */
@@ -1614,15 +1475,7 @@ RlcMngmt   *cntrl;
  * 
  * @return  Void
  */
-#ifdef ANSI
-static Void rlcLmmCleanGblRsrcs
-(
-RlcCb   *gCb
-)
-#else
-static Void rlcLmmCleanGblRsrcs(gCb)
-RlcCb   *gCb;
-#endif
+static Void rlcLmmCleanGblRsrcs(RlcCb *gCb)
 {
    Size   rlcSapSize;
    Size   rlcUdxSapSize;
@@ -1721,15 +1574,7 @@ RlcCb   *gCb;
  *    -# LCM_REASON_NOT_APPL (SUCCESS)
  *    -# LCM_REASON_HASHING_FAILED 
  */
-#ifdef ANSI
-static S16 rlcLmmShutdown
-(
-RlcCb   *gCb
-)
-#else
-static S16 rlcLmmShutdown(gCb)
-RlcCb   *gCb;
-#endif
+static S16 rlcLmmShutdown(RlcCb *gCb)
 {
    RlcRguSapCb   *rguSap;
    uint32_t          idx;
@@ -1785,17 +1630,7 @@ RlcCb   *gCb;
  *    -# LCM_REASON_INVALID_SUBACTION
  *    -# LCM_REASON_INVALID_ACTION
  */
-#ifdef ANSI
-static S16 rlcLmmGenCntrl
-(
-RlcCb *gCb,
-RlcMngmt *cntrl       
-)
-#else
-static S16 rlcLmmGenCntrl(gCb,cntrl)
-RlcCb    *gCb;
-RlcMngmt *cntrl;     
-#endif
+static S16 rlcLmmGenCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
    RlcTrcCntrl *trcCntrl; /* trace */
 #ifdef DEBUGP
@@ -1890,17 +1725,7 @@ RlcMngmt *cntrl;
  *    -# LCM_REASON_INVALID_STATE
  *    -# LCM_REASON_INVALID_ACTION 
  */
-#ifdef ANSI
-static S16 rlcLmmUdxSapCntrl
-(
-RlcCb      *gCb,
-RlcMngmt   *cntrl               
-)
-#else
-static S16 rlcLmmUdxSapCntrl(gCb,cntrl)
-RlcCb      *gCb;
-RlcMngmt   *cntrl;               
-#endif
+static S16 rlcLmmUdxSapCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1971,17 +1796,7 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_INVALID_STATE
  *    -# LCM_REASON_INVALID_ACTION 
  */
-#ifdef ANSI
-static S16 rlcLmmLSapCntrl
-(
-RlcCb      *gCb,
-RlcMngmt   *cntrl 
-)
-#else
-static S16 rlcLmmLSapCntrl(gCb,cntrl)
-RlcCb      *gCb;
-RlcMngmt   *cntrl; 
-#endif
+static S16 rlcLmmLSapCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
    RlcRguSapCb   *rguSap;   /* rgu sap pointer */
 
@@ -2054,17 +1869,7 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-static S16 rlcLmmGetKwuSapSta 
-(
-RlcCb          *gCb,
-RlcKwuSapSta   *sta         
-)
-#else
-static S16 rlcLmmGetKwuSapSta(gCb,sta)
-RlcCb          *gCb;
-RlcKwuSapSta   *sta;         
-#endif
+static S16 rlcLmmGetKwuSapSta (RlcCb *gCb,RlcKwuSapSta *sta)
 {
    RlcKwuSapCb   *rlcKwSapCb;
    
@@ -2097,17 +1902,7 @@ RlcKwuSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS) 
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE) 
  */
-#ifdef ANSI
-static S16 rlcLmmGetRguSapSta 
-(
-RlcCb          *gCb,
-RlcRguSapSta   *sta         
-)
-#else
-static S16 rlcLmmGetRguSapSta(gCb,sta)
-RlcCb          *gCb;
-RlcRguSapSta   *sta;       
-#endif
+static S16 rlcLmmGetRguSapSta(RlcCb *gCb,RlcRguSapSta *sta)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2135,17 +1930,7 @@ RlcRguSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-static S16 rlcLmmGetCkwCntSapSta
-(
-RlcCb             *gCb,
-RlcCkwCntSapSta   *sta     
-)
-#else
-static S16 rlcLmmGetCkwCntSapSta(gCb,sta)
-rlcCb             *gCb,
-RlcCkwCntSapSta   *sta;   
-#endif
+static S16 rlcLmmGetCkwCntSapSta(RlcCb *gCb,RlcCkwCntSapSta *sta)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2174,19 +1959,7 @@ RlcCkwCntSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-static S16 rlcLmmGetGenSts
-(
-RlcCb       *gCb,
-RlcGenSts   *sts,       
-Action     action         
-)
-#else
-static S16 rlcLmmGetGenSts(gCb,sts, action)
-RlcCb       *gCb;
-RlcGenSts   *sts;          
-Action     action;         
-#endif
+static S16 rlcLmmGetGenSts(RlcCb *gCb,RlcGenSts *sts,Action action)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2220,21 +1993,7 @@ Action     action;
  *    -# LCM_REASON_NOT_APPL (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL (FAIL)
  */
-#ifdef ANSI
-static S16 rlcLmmGetSapSts
-(
-RlcCb      *gCb,
-RlcMngmt   *sts,               
-Elmnt     elmnt,               
-Action    action             
-)
-#else
-static S16 rlcLmmGetSapSts(sts, elmnt, action)
-RlcCb      *gCb;
-RlcMngmt   *sts;            
-Elmnt     elmnt;            
-Action    action;         
-#endif
+static S16 rlcLmmGetSapSts(RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt, Action action)
 {
 
    /* Validate protocol parameters */
@@ -2307,7 +2066,6 @@ Action    action;
  * @return  Void
  */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 Void rlcLmmSendAlarm
 (
 RlcCb      *gCb,
@@ -2318,18 +2076,7 @@ SuId        suId,
 uint32_t    ueId,  
 uint8_t     qci   
 )
-#else
-Void rlcLmmSendAlarm(category, event, cause, suId, ueId, qci)
-RlcCb   *gCb;
-uint16_t    category; 
-uint16_t    event;   
-uint16_t    cause;  
-SuId        suId;  
-uint32_t    ueId; 
-uint8_t     qci;    
-#endif
 #else /* LTE_L2_MEAS */
-#ifdef ANSI
 Void rlcLmmSendAlarm
 (
 RlcCb       *gCb,
@@ -2339,15 +2086,6 @@ uint16_t    cause,
 SuId        suId,  
 uint32_t    ueId  
 )
-#else
-Void rlcLmmSendAlarm(category, event, cause, suId, ueId)
-RlcCb       *gCb;
-uint16_t    category; 
-uint16_t    event;   
-uint16_t    cause;  
-SuId        suId;  
-uint32_t    ueId; 
-#endif
 #endif /* LTE_L2_MEAS */
 {
    RlcMngmt   usta;   /* Rlc Management Structure */
@@ -2397,19 +2135,7 @@ uint32_t    ueId;
  *    -# ROK 
  *    -# RFAILED 
  */
-#ifdef ANSI
-S16 rlcLmmSendTrc
-(
-RlcCb     *gCb,
-Event    event,     
-Buffer   *mBuf     
-)
-#else
-S16 rlcLmmSendTrc(gCb,event, mBuf)
-RlcCb     *gCb;
-Event    event;   
-Buffer   *mBuf;  
-#endif
+S16 rlcLmmSendTrc(RlcCb *gCb,Event event,Buffer *mBuf)
 {
    RlcMngmt   trc;              /* RLC management control block */
    Buffer    *dstMbuf;   
@@ -2537,17 +2263,7 @@ Buffer   *mBuf;
  *
  */
  
-#ifdef ANSI
-S16 rlcActvTmr
-(
-Ent    ent,
-Inst   inst
-)
-#else
-S16 rlcActvTmr(ent,inst)
-Ent    ent;
-Inst   inst;
-#endif
+S16 rlcActvTmr(Ent ent,Inst inst)
 {
    RlcCb   *gCb; 
 
index e53bfed..59da209 100755 (executable)
@@ -163,19 +163,12 @@ RguL2MUlThrpMeasReq kwLiRguL2MUlThrpMeasReqMt[] =
  *      -# ROK 
  */
 
-#ifdef ANSI
 S16 RlcLiRguBndReq
 (
 Pst  *post,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                       /* Service Provider Id */
 )
-#else
-S16 RlcLiRguBndReq(post, suId, spId)
-Pst  *post;                       /* post structure */
-SuId suId;                      /* Service User Id */
-SpId spId;                      /* Service Provider Id */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -205,19 +198,7 @@ SpId spId;                      /* Service Provider Id */
  *      -# ROK 
  */
 
-#ifdef ANSI
-S16 RlcLiRguUbndReq
-(
-Pst         *post,
-SpId        spId,
-Reason      reason
-)
-#else
-S16 RlcLiRguUbndReq(post, spId, reason)
-Pst         *post;
-SpId        spId;
-Reason      reason;
-#endif
+S16 RlcLiRguUbndReq(Pst *post,SpId spId,Reason reason)
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -252,19 +233,7 @@ Reason      reason;
  *      -# RFAILED
  *
  */
-#ifdef ANSI
-S16 RlcLiRguL2MUlThrpMeasReq
-(
-Pst                     *post,
-SpId                    spId,
-RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq
-)
-#else
-S16 RlcLiRguL2MUlThrpMeasReq(post, spId, l2mUlThrpMeasReq)
-Pst                     *post;
-SpId                    spId;
-RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
-#endif
+S16 RlcLiRguL2MUlThrpMeasReq(Pst *post,SpId spId,RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq)
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -282,15 +251,7 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
 S16 rlcUlBatchProc ARGS ((Void));
 Void rlcUtlFreeUlRBuf ARGS((void));
 
-#ifdef ANSI
-S16 rlcUlBatchProc
-(
-Void
-)
-#else
-S16 rlcUlBatchProc()
-Void;
-#endif
+S16 rlcUlBatchProc(Void)
 {
 /* Read from Ring Buffer and process PDCP packets */
    RguDDatIndInfo   *datInd;
@@ -361,11 +322,7 @@ Void;
  *      -# RFAILED
  *
  */
-#ifdef ANSI
 Void rlcUtlFreeUlRBuf(void)
-#else
-Void rlcUtlFreeUlRBuf()  
-#endif
 {
    RguDDatIndInfo *datInd;
    PTR            elem;
@@ -391,19 +348,7 @@ Void rlcUtlFreeUlRBuf()
 }
 #endif
 #ifdef RLC_MAC_STA_RSP_RBUF
-#ifdef ANSI
-S16 rlcLiRguStaRspRbuf
-(
-Pst               *post,
-SpId              spId,
-Void             *staRsp
-)
-#else
-S16 rlcLiRguStaRspRbuf(post, spId, staRsp)
-Pst               *post;
-SpId              spId;
-Void              *staRsp;
-#endif /* ANSI */
+S16 rlcLiRguStaRspRbuf(Pst *post,SpId spId,Void *staRsp)
 {
    S16 ret1 = ROK;
    
@@ -430,19 +375,7 @@ Void              *staRsp;
 
 #endif
 #ifdef RLC_MAC_DAT_REQ_RBUF
-#ifdef ANSI
-S16 rlcLiRguDatReqRbuf
-(
-Pst               *post,
-SpId              spId,
-Void             *datReq
-)
-#else
-S16 rlcLiRguDatReqRbuf(post, spId, datReq)
-Pst               *post;
-SpId              spId;
-Void             *datReq;
-#endif /* ANSI */
+S16 rlcLiRguDatReqRbuf(Pst *post,SpId spId,Void *datReq)
 {
    S16 ret1 = ROK;
    
index bc8576d..2696268 100755 (executable)
@@ -174,17 +174,11 @@ static const LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] =
      the layer manager API provided.
 
 */
-#ifdef ANSI
 S16 RlcMiRlcConfigCfm
 (
 Pst        *pst,                /* post structure */
 RlcMngmt    *cfm                 /* Layer Management structure */
 )
-#else
-S16 RlcMiRlcConfigCfm(pst, cfm)
-Pst        *pst;                /* post structure */
-RlcMngmt    *cfm;                /* Layer Management structure */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -207,17 +201,11 @@ RlcMngmt    *cfm;                /* Layer Management structure */
      layer manager API provided.
 
 */
-#ifdef ANSI
 S16 RlcMiLkwCntrlCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* configure */
 )
-#else
-S16 RlcMiLkwCntrlCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* confirm */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -245,17 +233,11 @@ RlcMngmt *cfm;                /* confirm */
    - For a tightly coupled interface, the actual function called depends on
      the layer manager API provided.
 */
-#ifdef ANSI
 S16 RlcMiLkwStaInd
 (
 Pst     *pst,                /* post structure */
 RlcMngmt *usta                /* unsolicited status */
 )
-#else
-S16 RlcMiLkwStaInd(pst, usta)
-Pst     *pst;                /* post structure */
-RlcMngmt *usta;               /* unsolicited status */
-#endif
 {
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwStaIndMt[pst->selector])(pst, usta);
@@ -281,17 +263,11 @@ RlcMngmt *usta;               /* unsolicited status */
       on the layer manager API provided.
 
 */
-#ifdef ANSI
 S16 RlcMiLkwStaCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* solicited status confirmation */
 )
-#else
-S16 RlcMiLkwStaCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* solicited status confirmation */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -319,19 +295,12 @@ RlcMngmt *cfm;                /* solicited status confirmation */
       on the layer manager API provided.
 
 */
-#ifdef ANSI
 S16 RlcMiLkwStsCfm
 (
 Pst *pst,                    /* post structure */
 Action action,               /* action */
 RlcMngmt *cfm                 /* statistics confirmation */
 )
-#else
-S16 RlcMiLkwStsCfm(pst, action, cfm)
-Pst *pst;                    /* post structure */
-Action action;               /* action */
-RlcMngmt *cfm;                /* statistics confirmation */
-#endif
 {
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwStsCfmMt[pst->selector])(pst, action, cfm);
@@ -357,19 +326,12 @@ RlcMngmt *cfm;                /* statistics confirmation */
       the layer manager API provided.
 
 */
-#ifdef ANSI
 S16 RlcMiLkwTrcInd
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *trc,                /* trace indication */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 RlcMiLkwTrcInd(pst, trc, mBuf)
-Pst *pst;                    /* post structure */
-RlcMngmt *trc;                /* trace indication */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    /* jump to specific primitive depending on configured selector */
    (*kwMiLkwTrcIndMt[pst->selector])(pst, trc, mBuf);
@@ -381,17 +343,7 @@ Buffer *mBuf;                /* message buffer */
 
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-S16 RlcMiLkwL2MeasCfm
-(
-Pst * pst,
-RlcL2MeasCfmEvt *measEvt
-)
-#else
-S16 RlcMiLkwL2MeasCfm(pst, measEvt)
-Pst * pst;
-RlcL2MeasCfmEvt *measEvt;
-#endif
+S16 RlcMiLkwL2MeasCfm(Pst * pst,RlcL2MeasCfmEvt *measEvt)
 {
 
    (*rlcMiLkwL2MeasCfmMt[pst->selector])(pst, measEvt);
@@ -399,19 +351,7 @@ RlcL2MeasCfmEvt *measEvt;
    return ROK;
 
 }
-#ifdef ANSI
-S16 RlcMiLkwL2MeasStopCfm
-(  
-Pst *pst,
-uint8_t  measType,
-uint8_t  status
-)
-#else
-S16 RlcMiLkwL2MeasStopCfm(pst, measType,status)
-Pst *pst;
-uint8_t  measType;
-uint8_t  status;
-#endif
+S16 RlcMiLkwL2MeasStopCfm(Pst *pst,uint8_t measType,uint8_t status)
 {
 
    (*RlcMiLkwL2MeasStopCfmMt[pst->selector])(pst, measType,status);
index 47c1ab7..874b02e 100755 (executable)
@@ -253,19 +253,12 @@ KwuDatAckInd kwUiKwuDatAckIndMt[] =
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 RlcUiKwuBndCfm
 (
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-uint8_t   status                     /* Status */
+Pst     *pst,                       /* post structure */
+SuId    suId,                      /* Service User Id */
+uint8_t status                     /* Status */
 )
-#else
-S16 RlcUiKwuBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-uint8_t   status;                    /* Status */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -296,19 +289,12 @@ uint8_t   status;                    /* Status */
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rlcSendUlDataToDu
 (
 Pst               *pst,
 KwuDatIndInfo     *datInd,
 Buffer            *mBuf
 )
-#else
-S16 rlcSendUlDataToDu(pst, datInd, mBuf)
-Pst               *pst;
-KwuDatIndInfo     *datInd;
-Buffer            *mBuf;
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -340,19 +326,12 @@ Buffer            *mBuf;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuDatCfm
 (
-Pst               *pst,
-SuId              suId,
-KwuDatCfmInfo     *datCfm
+Pst            *pst,
+SuId           suId,
+KwuDatCfmInfo  *datCfm
 )
-#else
-S16 RlcUiKwuDatCfm(pst, suId, datCfm)
-Pst               *pst;
-SuId              suId;
-KwuDatCfmInfo     *datCfm;
-#endif
 {
    rlcDatCfmsSent++;
 
@@ -384,19 +363,12 @@ KwuDatCfmInfo     *datCfm;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuStaInd
 (
 Pst               *pst,
 SuId              suId,
 KwuStaIndInfo     *staInd
 )
-#else
-S16 RlcUiKwuStaInd(pst, suId, staInd)
-Pst               *pst;
-SuId              suId;
-KwuStaIndInfo     *staInd;
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -427,19 +399,12 @@ KwuStaIndInfo     *staInd;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuReEstCmpInd
 (
 Pst               *pst,
 SuId              suId,
 CmLteRlcId        rlcId
 )
-#else
-S16 RlcUiKwuReEstCmpInd(pst, suId, rlcId)
-Pst               *pst;
-SuId              suId;
-CmLteRlcId        rlcId;
-#endif
 {
    RLOG0(L_DEBUG, "In RlcUiKwuReEstCmpInd");
 
@@ -469,19 +434,12 @@ CmLteRlcId        rlcId;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuDiscSduCfm
 (
 Pst               *pst,
 SuId              suId,
 KwuDiscSduInfo    *discCfm
 )
-#else
-S16 RlcUiKwuDiscSduCfm(pst, suId, discCfm)
-Pst               *pst;
-SuId              suId;
-KwuDiscSduInfo    *discCfm;
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -510,19 +468,7 @@ KwuDiscSduInfo    *discCfm;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 RlcUiKwuFlowCntrlInd
-(
-Pst                   *pst,
-SuId                  suId,
-KwuFlowCntrlIndInfo   *flowCntrlIndInfo
-)
-#else
-S16 RlcUiKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo)
-Pst                   *pst;
-SuId                  suId;
-KwuFlowCntrlIndInfo   *flowCntrlIndInfo;
-#endif
+S16 RlcUiKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo)
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -551,19 +497,7 @@ KwuFlowCntrlIndInfo   *flowCntrlIndInfo;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 RlcUiKwuDatAckInd
-(
-Pst               *pst,
-SuId              suId,
-KwuDatAckInfo     *datAckInd
-)
-#else
-S16 RlcUiKwuDatAckInd(pst, suId, datAckInd)
-Pst               *pst;
-SuId              suId;
-KwuDatAckInfo     *datAckInd;
-#endif
+S16 RlcUiKwuDatAckInd(Pst *pst,SuId suId,KwuDatAckInfo *datAckInd)
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -639,19 +573,12 @@ CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] =
  *  @return  S16
  *      -# ROK 
  */
-#ifdef ANSI
 S16 RlcUiCkwBndCfm
 (
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-uint8_t   status                     /* Status */
+Pst     *pst,                       /* post structure */
+SuId    suId,                      /* Service User Id */
+uint8_t status                     /* Status */
 )
-#else
-S16 RlcUiCkwBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-uint8_t   status;                    /* Status */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -682,19 +609,12 @@ uint8_t   status;                    /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 RlcUiRlcCfgCfm
 (
 Pst            *pst,                      /* post structure */
 SuId           suId,                      /* Service User Id */
 RlcCfgCfmInfo  *cfmInfo                    /* Configuration Confirm */
 )
-#else
-S16 RlcUiRlcCfgCfm(pst, suId, cfmInfo)
-Pst            *pst;                      /* post structure */
-SuId           suId;                      /* Service User Id */
-RlcCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -725,7 +645,6 @@ RlcCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 RlcUiCkwUeIdChgCfm 
 (
 Pst            *pst,                      /* post structure */
@@ -734,14 +653,6 @@ uint32_t       transId,
 CkwUeInfo      *ueInfo,
 CmStatus       status
 )
-#else
-S16 RlcUiCkwUeIdChgCfm(pst, suId, transId,ueInfo,status)
-Pst            *pst;                      /* post structure */
-SuId           suId;                      /* Service User Id */
-uint32_t       transId;
-CkwUeInfo      *ueInfo;
-CmStatus       status;
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -762,15 +673,7 @@ CmStatus       status;
  *  @return  S16
  *      -# ROK 
  */
-#ifdef ANSI
-S16 rlcDlBatchProcSplit 
-(
-Void
-)
-#else
-S16 rlcDlBatchProcSplit()
-Void;
-#endif
+S16 rlcDlBatchProcSplit(Void)
 {
 
 /* Read from Ring Buffer and process PDCP packets */
@@ -842,15 +745,7 @@ Void;
 #endif
 
 #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF)
-#ifdef ANSI
-S16 rlcDlBatchProc
-(
-Void
-)
-#else
-S16 rlcDlBatchProc()
-Void;
-#endif
+S16 rlcDlBatchProc(Void)
 {
 /* Read from Ring Buffer and process PDCP packets */
 
@@ -912,15 +807,7 @@ Void;
 }
 
 
-#ifdef ANSI
-S16 rlcUtlDlBatchProcPkts
-(
-Void
-)
-#else
-S16 rlcUtlDlBatchProcPkts
-Void;
-#endif
+S16 rlcUtlDlBatchProcPkts(Void)
 {
     rlcDlBatchProc();
 #ifdef SS_RBUF
@@ -933,15 +820,7 @@ Void;
 }   
 
 
-#ifdef ANSI
-S16 rlcUtlDlFreeRlcRBuf
-(
-Void
-)
-#else
-S16 rlcUtlDlFreeRlcRBuf
-Void;
-#endif
+S16 rlcUtlDlFreeRlcRBuf(Void)
 {
 /* Read from Ring Buffer and process PDCP packets */
    Void *elmIndx = NULLP;
index ccd97a5..a10b138 100755 (executable)
@@ -69,17 +69,7 @@ CmLListCp        inUseL2UeStatsLst;/*!< In Use Pool of UE stats Blocks */
 *
 *
 */
-#ifdef ANSI
-Void TSL2AllocStatsMem 
-(
- Region region,
- Pool   pool 
-)
-#else
-Void TSL2AllocStatsMem(region, pool)
- Region region;
- Pool   pool;
-#endif
+Void TSL2AllocStatsMem(Region region,Pool pool)
 {
    uint32_t cnt=0;
 
@@ -130,15 +120,7 @@ Void TSL2AllocStatsMem(region, pool)
 *
 *
 */
-#ifdef ANSI
-TSL2UeStatsCb* TSL2AllocUeStatsBlk 
-(
- uint16_t   rnti
-)
-#else
-TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti)
- uint16_t   rnti;
-#endif
+TSL2UeStatsCb* TSL2AllocUeStatsBlk (uint16_t rnti)
 {
    CmLList          *tmp = NULLP;
    TSL2UeStatsCb  *statsCb = NULLP;
@@ -170,17 +152,7 @@ TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti)
 *
 *
 */
-#ifdef ANSI
-Void TSL2DeallocUeStatsBlk 
-(
- uint16_t       rnti,
- TSL2UeStatsCb  *statsCb
-)
-#else
-Void TSL2DeallocUeStatsBlk(rnti, statsCb)
- uint16_t       rnti;
- TSL2UeStatsCb  *statsCb;
-#endif
+Void TSL2DeallocUeStatsBlk(uint16_t rnti,TSL2UeStatsCb *statsCb)
 {
    statsCb->inUse = FALSE;
    cmLListDelFrm(&inUseL2UeStatsLst, &statsCb->lnk);
@@ -202,15 +174,7 @@ Void TSL2DeallocUeStatsBlk(rnti, statsCb)
 *
 *
 */
-#ifdef ANSI
-TSL2CellStatsCb* TSL2AllocCellStatsBlk 
-(
- uint32_t cellId
-)
-#else
-TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId)
- uint32_t cellId;
-#endif
+TSL2CellStatsCb* TSL2AllocCellStatsBlk(uint32_t cellId)
 {
    if (cellId != 1)
    {
@@ -232,15 +196,7 @@ TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId)
 *
 *
 */
-#ifdef ANSI
-Void TSL2DeallocCellStatsBlk 
-(
- uint32_t cellId
-)
-#else
-Void TSL2DeallocCellStatsBlk(cellId)
- uint32_t cellId;
-#endif
+Void TSL2DeallocCellStatsBlk(uint32_t cellId)
 {
 
    return;
@@ -261,17 +217,7 @@ Void TSL2DeallocCellStatsBlk(cellId)
 *
 *
 */
-#ifdef ANSI
-Void TSL2SendStatsToApp
-(
- Pst    *pst,
- SuId   suId
- )
-#else
-Void TSL2SendStatsToApp(pst, suId)
- Pst    *pst;
- SuId   suId;
-#endif
+Void TSL2SendStatsToApp(Pst    *pst, SuId   suId)
 {
    uint32_t idx;
 
index 279ec57..0b29d64 100755 (executable)
@@ -90,7 +90,6 @@ uint32_t rgMacGT ;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 Void rlcTmmQSdu
 (
 RlcCb            *gCb,
@@ -98,13 +97,6 @@ RlcDlRbCb        *rbCb,
 KwuDatReqInfo   *datReqInfo, 
 Buffer          *mBuf       
 )
-#else
-Void rlcTmmQSdu(gCb,rbCb,datReqInfo,mBuf)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;       
-KwuDatReqInfo   *datReqInfo;  
-Buffer          *mBuf;         
-#endif
 {
    RlcSdu   *sdu;              
  
@@ -377,17 +369,11 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta
  * @return  S16
  *    -# ROK 
  */
-#ifdef ANSI
 Void rlcDlTmmReEstablish
 (
 RlcCb       *gCb,
 RlcDlRbCb   *rbCb    
 )
-#else
-Void rlcDlTmmReEstablish(gCb,rbCb)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;     
-#endif
 {
 
 #ifdef LTE_L2_MEAS_RLC
index 72b4360..0f50d58 100755 (executable)
@@ -71,17 +71,11 @@ uint32_t loadStart;
 #endif
 
 S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf);
-#ifdef ANSI
 Void AddUeContext
 (
 CmLteRnti   crnti,
 uint8_t rrcMsgType
 )
-#else
-Void AddUeContext(crnti,rrcMsgType)
-CmLteRnti   crnti,
-uint8_t rrcMsgType 
-#endif
 {
    KwuDatIndInfo   *datIndInfo;   /* Data Indication Information */
    uint8_t rrcConReq[6] ={ 0x50, 0x30, 0x30, 0x30, 0x30, 0x34 };
@@ -304,19 +298,12 @@ void rlcTmmRcvFrmMac(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu)
  *    -# ROK 
  *       
  **/
-#ifdef ANSI
 Void rlcTmmUlReEstablish
 (
 RlcCb        *gCb,
 RlcUlRbCb    *rbCb        
 )
-#else
-Void rlcTmmUlReEstablish(rbCb)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;          
-#endif
 {
-
    RLOG_ARG0(L_DEBUG,DBG_RBID,rbCb->rlcId.rbId,"do nothing for TMM for ReEstablish");
    return;
 }
index 297ab7f..76bfb93 100755 (executable)
@@ -294,17 +294,7 @@ void rlcStopTmr(RlcCb *gCb, PTR cb, uint8_t tmrType)
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcTmrExpiry
-(
-PTR   cb,
-S16   tmrEvnt 
-)
-#else
-Void rlcTmrExpiry (cb, tmrEvnt)
-PTR   cb;
-S16   tmrEvnt;
-#endif
+Void rlcTmrExpiry(PTR cb,S16 tmrEvnt)
 {
 /* kw005.201 added support for L2 Measurement */
 
@@ -416,15 +406,7 @@ bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
  *
  * @return  Void
 */
-#ifdef ANSI
-static Void rlcBndTmrExpiry
-(
-PTR cb
-)
-#else
-static Void rlcBndTmrExpiry(cb)
-PTR cb;
-#endif
+static Void rlcBndTmrExpiry(PTR cb)
 {
    RlcRguSapCb *rguSapCb; 
 
index 7f10dbc..0959f75 100755 (executable)
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-static S16 cmUnpkUdxStruct
-(
-Buffer    *srcMBuf,
-uint32_t  offset,
-uint8_t   *dstBuf,
-uint32_t  size
-)
-#else
-static S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size)
-Buffer    *srcMBuf;
-uint32_t  offset;
-uint8_t   *dstBuf;
-MsgLen    size;
-#endif
+static S16 cmUnpkUdxStruct(Buffer *srcMBuf,uint32_t offset,uint8_t *dstBuf,uint32_t size)
 {
     MsgLen tmpLen;
 
@@ -88,19 +74,7 @@ MsgLen    size;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-static S16 cmPkUdxStruct
-(
-uint8_t  *srcBuf,
-MsgLen   size,
-Buffer   *dstMBuf
-)
-#else
-static S16 cmPkUdxStruct(dstMBuf,srcBuf,size)
-uint8_t *srcBuf;
-MsgLen  size;
-Buffer  *dstMBuf;
-#endif
+static S16 cmPkUdxStruct(uint8_t *srcBuf,MsgLen size,Buffer *dstMBuf)
 {
 
     return (SAddPstMsgMult(srcBuf,size,dstMBuf));
@@ -119,19 +93,7 @@ Buffer  *dstMBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxBndReq
-(
-Pst *pst,
-SuId suId,
-SpId spId
-)
-#else
-S16 cmPkUdxBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
+S16 cmPkUdxBndReq(Pst *pst,SuId suId,SpId spId)
 {
     S16 ret1;
     Buffer *mBuf;
@@ -169,19 +131,7 @@ SpId spId;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxUbndReq
-(
-Pst *pst,
-SpId spId,
-Reason reason
-)
-#else
-S16 cmPkUdxUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
+S16 cmPkUdxUbndReq(Pst *pst,SpId spId,Reason reason)
 {
     S16 ret1;
     Buffer *mBuf;
@@ -219,19 +169,7 @@ Reason reason;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxBndCfm
-(
-Pst *pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 cmPkUdxBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 cmPkUdxBndCfm(Pst *pst,SuId suId,uint8_t status)
 {
     S16 ret1;
     Buffer *mBuf;
@@ -271,19 +209,7 @@ uint8_t status;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxCfgReq
-(
-Pst               *pst,
-SpId              spId,
-RlcCfgInfo        *cfgInfo
-)
-#else
-S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
-Pst               *pst;
-SpId              spId;
-RlcCfgInfo        *cfgInfo;
-#endif
+S16 cmPkUdxCfgReq(Pst *pst,SpId  spId,RlcCfgInfo *cfgInfo)
 {
     S16 ret1;
     Buffer *mBuf;
@@ -340,19 +266,7 @@ RlcCfgInfo        *cfgInfo;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxCfgCfm
-(
-Pst               *pst,
-SuId              suId,
-RlcCfgCfmInfo     *cfgCfmInfo
-)
-#else
-S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
-Pst               *pst;
-SuId              suId;
-RlcCfgCfmInfo     *cfgCfmInfo;
-#endif
+S16 cmPkUdxCfgCfm(Pst *pst,SuId suId,RlcCfgCfmInfo  *cfgCfmInfo)
 {
     S16 ret1;
     Buffer *mBuf;
@@ -411,23 +325,14 @@ RlcCfgCfmInfo     *cfgCfmInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkUdxUeIdChgReq
 (
-Pst               *pst,
-SpId              spId,
-uint32_t          transId,
-CkwUeInfo         *ueInfo,
-CkwUeInfo         *newUeInfo
+Pst        *pst,
+SpId       spId,
+uint32_t   transId,
+CkwUeInfo  *ueInfo,
+CkwUeInfo  *newUeInfo
 )
-#else
-S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst               *pst;
-SpId              spId;
-uint32_t          transId;
-CkwUeInfo         *ueInfo;
-CkwUeInfo         *newUeInfo;
-#endif
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -491,21 +396,7 @@ CkwUeInfo         *newUeInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxUeIdChgCfm
-(
-Pst               *pst,
-SuId              suId,
-uint32_t               transId,
-CmStatus          status
-)
-#else
-S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status)
-Pst               *pst;
-SuId              suId;
-uint32_t               transId;
-CmStatus          status;
-#endif
+S16 cmPkUdxUeIdChgCfm(Pst *pst,SuId suId,uint32_t transId,CmStatus status)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -546,21 +437,7 @@ CmStatus          status;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxStaUpdCfm
-(
-Pst               *pst,
-SuId              suId,
-CmLteRlcId        *rlcId,
-RlcUdxBufLst       *pStaPdu
-)
-#else
-S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SuId              suId;
-CmLteRlcId        *rlcId;
-RlcUdxBufLst       *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdCfm(Pst *pst,SuId suId,CmLteRlcId *rlcId,RlcUdxBufLst *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -614,19 +491,7 @@ RlcUdxBufLst       *pStaPdu;
 *    File:   Kw_udx.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxStaProhTmrStart
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId
-)
-#else
-S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-#endif
+S16 cmPkUdxStaProhTmrStart(Pst *pst,SpId spId,CmLteRlcId *rlcId)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -678,21 +543,7 @@ CmLteRlcId        *rlcId;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxStaUpdReq
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId,
-RlcUdxStaPdu      *pStaPdu
-)
-#else
-S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-RlcUdxStaPdu       *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxStaPdu *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -749,21 +600,7 @@ RlcUdxStaPdu       *pStaPdu;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-S16 cmPkUdxStaPduReq
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId,
-RlcUdxDlStaPdu     *pStaPdu
-)
-#else
-S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-RlcUdxDlStaPdu     *pStaPdu;
-#endif
+S16 cmPkUdxStaPduReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxDlStaPdu *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -818,17 +655,7 @@ RlcUdxDlStaPdu     *pStaPdu;
 *
 *
 */
-#ifdef ANSI
-S16 cmPkUdxL2MeasReq
-(
-Pst               *pst,
-RlcL2MeasReqEvt    *measReqEvt 
-)
-#else
-S16 cmPkUdxL2MeasReq(pst, measReqEvt)
-Pst               *pst;
-RlcL2MeasReqEvt    *measReqEvt; 
-#endif
+S16 cmPkUdxL2MeasReq(Pst  *pst,RlcL2MeasReqEvt *measReqEvt)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -876,17 +703,7 @@ RlcL2MeasReqEvt    *measReqEvt;
 *
 *
 */
-#ifdef ANSI
-S16 cmPkUdxL2MeasSendReq
-(
-Pst              *pst,
-uint8_t          measType
-)
-#else
-S16 cmPkUdxL2MeasSendReq(pst, measReqEvt)
-Pst               *pst;
-uint8_t           measType
-#endif
+S16 cmPkUdxL2MeasSendReq(Pst  *pst,uint8_t measType)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -930,17 +747,7 @@ uint8_t           measType
 *
 *
 */
-#ifdef ANSI
-S16 cmPkUdxL2MeasStopReq
-(
-Pst              *pst,
-uint8_t          measType
-)
-#else
-S16 cmPkUdxL2MeasStopReq(pst, measType)
-Pst               *pst;
-uint8_t           measType
-#endif
+S16 cmPkUdxL2MeasStopReq(Pst *pst,uint8_t measType)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -991,19 +798,7 @@ uint8_t           measType
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxBndReq
-(
-UdxBndReq      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkUdxBndReq(func, pst, mBuf)
-UdxBndReq      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxBndReq(UdxBndReq func,Pst  *pst,Buffer *mBuf)
 {
     SuId       suId = 0;
     SpId       spId = 0;
@@ -1028,19 +823,7 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxUbndReq
-(
-UdxUbndReq     func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkUdxUbndReq(func, pst, mBuf)
-UdxUbndReq     func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxUbndReq(UdxUbndReq func,Pst *pst,Buffer *mBuf)
 {
     SpId       spId = 0;
     Reason     reason = 0;
@@ -1064,19 +847,7 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxBndCfm
-(
-UdxBndCfm      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkUdxBndCfm(func, pst, mBuf)
-UdxBndCfm      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxBndCfm(UdxBndCfm func,Pst *pst,Buffer *mBuf)
 {
     SuId       suId = 0;
     uint8_t         status = 0;
@@ -1102,19 +873,7 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxCfgReq
-(
-UdxCfgReq         func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxCfgReq(func, pst, mBuf)
-UdxCfgReq         func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxCfgReq(UdxCfgReq func,Pst  *pst,Buffer *mBuf)
 {
 #if(ERRCLASS & ERRCLS_DEBUG)
     S16           ret1;
@@ -1171,19 +930,7 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxCfgCfm
-(
-UdxCfgCfm         func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxCfgCfm(func, pst, mBuf)
-UdxCfgCfm         func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxCfgCfm(UdxCfgCfm func,Pst  *pst,Buffer *mBuf)
 {
     S16 ret1;
     SuId             suId = 0;
@@ -1248,19 +995,7 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxUeIdChgReq
-(
-UdxUeIdChgReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf)
-UdxUeIdChgReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgReq(UdxUeIdChgReq func,Pst *pst,Buffer *mBuf)
 {
     SpId      spId = 0;
     uint32_t  transId = 0;
@@ -1317,19 +1052,7 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxUeIdChgCfm
-(
-UdxUeIdChgCfm     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf)
-UdxUeIdChgCfm     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgCfm(UdxUeIdChgCfm func,Pst  *pst,Buffer *mBuf)
 {
     SuId      suId = 0;
     uint32_t  transId = 0;
@@ -1361,19 +1084,7 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxStaUpdCfm
-(
-UdxStaUpdCfm     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf)
-UdxStaUpdCfm     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdCfm(UdxStaUpdCfm func,Pst *pst,Buffer *mBuf)
 {
     SuId      suId = 0;
     CmLteRlcId *rlcId = NULLP;  /* KW_FIX */
@@ -1413,19 +1124,7 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxStaUpdReq
-(
-UdxStaUpdReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxStaUpdReq(func, pst, mBuf)
-UdxStaUpdReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdReq(UdxStaUpdReq func,Pst *pst,Buffer *mBuf)
 {
     SpId      spId = 0;
     CmLteRlcId *rlcId = NULLP; /* KW_FIX */ 
@@ -1483,19 +1182,7 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxStaPduReq
-(
-UdxStaPduReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxStaPduReq(func, pst, mBuf)
-UdxStaPduReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaPduReq(UdxStaPduReq func,Pst *pst,Buffer *mBuf)
 {
     S16       ret1;
     SpId      spId = 0;
@@ -1552,19 +1239,7 @@ Buffer            *mBuf;
 *    File:    kw_udx.c
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxStaProhTmrStart
-(
-UdxStaProhTmrStart     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf)
-UdxStaProhTmrStart     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaProhTmrStart(UdxStaProhTmrStart func,Pst *pst,Buffer *mBuf)
 {
     SpId      spId = 0;
     CmLteRlcId tmpRlcId;
@@ -1604,19 +1279,7 @@ Buffer            *mBuf;
 *
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxL2MeasReq
-(
-UdxL2MeasReq     func,
-Pst              *pst,
-Buffer           *mBuf
-)
-#else
-S16 cmUnpkUdxL2MeasReq(func, pst, mBuf)
-UdxL2MeasReq     func;
-Pst              *pst;
-Buffer           *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasReq(UdxL2MeasReq func,Pst *pst,Buffer *mBuf)
 {
     RlcL2MeasReqEvt    tmpMeasReqEvt;
     RlcL2MeasReqEvt    *measReqEvt = NULLP;  /* KW_FIX */
@@ -1651,19 +1314,7 @@ Buffer           *mBuf;
 *
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxL2MeasSendReq
-(
-UdxL2MeasSendReq   func,
-Pst                *pst,
-Buffer             *mBuf
-)
-#else
-S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf)
-UdxL2MeasSendReq   func;
-Pst                *pst;
-Buffer             *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasSendReq(UdxL2MeasSendReq func,Pst *pst,Buffer *mBuf)
 {
     uint8_t     measType = 0;  /* KW_FIX */
 
@@ -1692,19 +1343,7 @@ Buffer             *mBuf;
 *
 *
 */
-#ifdef ANSI
-S16 cmUnpkUdxL2MeasStopReq
-(
-UdxL2MeasStopReq   func,
-Pst                *pst,
-Buffer             *mBuf
-)
-#else
-S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf)
-UdxL2MeasSendReq     func;
-Pst                  *pst;
-Buffer               *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasStopReq(UdxL2MeasStopReq func,Pst *pst,Buffer *mBuf)
 {
     uint8_t     measType = 0; /* KW_FIX */
 
index 12812cb..d01382b 100755 (executable)
@@ -82,19 +82,12 @@ S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxBndReq 
 (
 Pst    *pst,  
 SuId   suId, 
 SpId   spId 
 )
-#else
-S16 rlcDlUdxBndReq (pst, suId, spId)
-Pst    *pst;   
-SuId   suId;  
-SpId   spId; 
-#endif
 {
    RlcUdxDlSapCb   *udxSap;            /* pointer to session SAP */
    RlcCb           *tRlcCb;
@@ -179,19 +172,12 @@ SpId   spId;
  *  @return  S16
  *      -# ROK 
  */
-#ifdef ANSI
 S16 rlcDlUdxUbndReq
 (
 Pst      *pst,    
 SpId     spId,   
 Reason   reason 
 )
-#else
-S16 rlcDlUdxUbndReq(pst, spId, reason)
-Pst      *pst;   
-SpId     spId;   
-Reason   reason; 
-#endif
 {
    RlcUdxDlSapCb   *udxSap; 
    RlcCb           *tRlcCb;
@@ -240,19 +226,12 @@ Reason   reason;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxCfgReq
 (
 Pst          *pst,
 SpId         spId,
 RlcCfgInfo   *cfg
 )
-#else
-S16 rlcDlUdxCfgReq(pst, spId, cfg)
-Pst          *pst;
-SpId         spId;
-RlcCfgInfo   *cfg;
-#endif
 {
    RlcCfgCfmInfo   *cfgCfm; 
    uint8_t         idx;    
@@ -427,7 +406,6 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcDlUdxUeIdChgReq
 (
 Pst         *pst, 
@@ -436,14 +414,6 @@ uint32_t    transId,
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo)
-Pst         *pst;
-SpId        spId;
-uint32_t    transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    CmStatus       status;
    RlcCb           *tRlcCb;
@@ -493,7 +463,6 @@ CkwUeInfo   *newUeInfo;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaPduReq
 (
 Pst             *pst,
@@ -501,13 +470,6 @@ SpId            spId,
 CmLteRlcId      *rlcId,
 RlcUdxDlStaPdu   *pStaPdu
 )
-#else
-S16  rlcDlUdxStaPduReq(pst, spId, rlcId, pStaPdu)
-Pst             *pst;
-SpId            spId;
-CmLteRlcId      *rlcId;
-RlcUdxDlStaPdu   *pStaPdu;
-#endif
 {
    RlcDlRbCb   *rbCb;
    RlcCb       *tRlcCb;
@@ -556,7 +518,6 @@ RlcUdxDlStaPdu   *pStaPdu;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
 S16  rlcDlUdxStaUpdReq
 (
 Pst*          pst,
@@ -564,13 +525,6 @@ SpId          spId,
 CmLteRlcId    *rlcId,
 RlcUdxStaPdu   *pStaPdu
 )
-#else
-S16 rlcDlUdxStaUpdReq(pst, spId, rlcId,pStaPdu)
-Pst*          pst;
-SpId          spId;
-CmLteRlcId    *rlcId;
-RlcUdxStaPdu   *pStaPdu;
-#endif
 {
    RlcCb          *tRlcCb;
    RlcDlRbCb      *rbCb;
@@ -598,17 +552,11 @@ RlcUdxStaPdu   *pStaPdu;
 #ifdef LTE_L2_MEAS
 /**
 */
-#ifdef ANSI
 S16 rlcDlUdxL2MeasReq 
 (
 Pst            *pst, 
 RlcL2MeasReqEvt *measReqEvt 
 )
-#else
-S16 rlcDlUdxL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-RlcL2MeasReqEvt *measReqEvt;
-#endif
 {
    uint32_t  cntr;
    uint8_t   measType;
@@ -671,17 +619,11 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasStopReq
 (
 Pst            *pst,
 uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasStopReq (pst, measType)
-Pst            *pst;
-uint8_t         measType;
-#endif
 {
   /* S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
@@ -732,17 +674,11 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
 S16 rlcDlUdxL2MeasSendReq
 (
 Pst            *pst,
 uint8_t         measType
 )
-#else
-S16 rlcDlUdxL2MeasSendReq (pst, measType)
-Pst            *pst;
-uint8_t         measType;
-#endif
 {
    RlcL2MeasEvtCb *measEvtCb;
    uint16_t            cntr;
index a077743..f1011ae 100755 (executable)
@@ -87,19 +87,12 @@ static S16  PtDlUdxStaUpdCfm ARGS(( Pst* pst,SuId suId,CmLteRlcId *rlcId,
  *      -# ROK 
  *
  */
-#ifdef ANSI
 static S16 PtDlUdxBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 uint8_t   status                     /* Status */
 )
-#else
-static S16 PtDlUdxBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-uint8_t   status;                    /* Status */
-#endif
 {
 
    return ROK;
@@ -128,19 +121,12 @@ uint8_t   status;                    /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 static S16 PtDlUdxCfgCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 RlcCfgCfmInfo *cfmInfo                    /* Status */
 )
-#else
-static S16 PtDlUdxCfgCfm(pst, suId, status)
-Pst           *pst;            /* post structure */
-SuId          suId;            /* Service User Id */
-RlcCfgCfmInfo *cfmInfo;        /* Status */
-#endif
 {
 
    return ROK;
@@ -167,21 +153,13 @@ RlcCfgCfmInfo *cfmInfo;        /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 static S16 PtDlUdxUeIdChgCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-uint32_t      transId,
-CmStatus      status
+uint32_t transId,
+CmStatus status
 )
-#else
-static S16 PtDlUdxUeIdChgCfm(pst, suId, status)
-Pst           *pst;            /* post structure */
-SuId          suId;            /* Service User Id */
-uint32_t      transId;
-CmStatus      status;
-#endif
 {
 
    return ROK;
@@ -309,19 +287,12 @@ static const UdxStaProhTmrStart rlcDlUdxStaProhTmrStartMt[UDX_MAX_SEL] =
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcDlUdxBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-uint8_t   status                     /* Status */
+uint8_t status                     /* Status */
 )
-#else
-S16 rlcDlUdxBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-uint8_t   status;                    /* Status */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -353,19 +324,12 @@ uint8_t   status;                    /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcDlUdxCfgCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 RlcCfgCfmInfo *cfmInfo                    /* Status */
 )
-#else
-S16 rlcDlUdxCfgCfm(pst, suId, status)
-Pst           *pst;            /* post structure */
-SuId          suId;            /* Service User Id */
-RlcCfgCfmInfo *cfmInfo;        /* Status */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -395,7 +359,6 @@ RlcCfgCfmInfo *cfmInfo;        /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcDlUdxUeIdChgCfm
 (
 Pst *pst,                       /* post structure */
@@ -403,13 +366,6 @@ SuId suId,                      /* Service User Id */
 uint32_t      transId,
 CmStatus      status
 )
-#else
-S16 rlcDlUdxUeIdChgCfm(pst, suId, status)
-Pst           *pst;            /* post structure */
-SuId          suId;            /* Service User Id */
-uint32_t      transId;
-CmStatus      status;
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
index 5bfbbc0..c6e6cca 100755 (executable)
@@ -65,19 +65,12 @@ static S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId,
                                    CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo));
 static S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId  spId, CmLteRlcId *rlcId,
                              RlcUdxDlStaPdu  *pStaPdu ));
-#ifdef ANSI
 static S16 PtUlUdxBndReq
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                    /* Status */
 )
-#else
-static S16 PtUlUdxBndReq(pst, suId,spId)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-SpId spId;                    /* Status */
-#endif
 {
 
    return ROK;
@@ -104,45 +97,30 @@ SpId spId;                    /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 static S16 PtUlUdxUbndReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 Reason   reason                     /* Status */
 )
-#else
-static S16 PtUlUdxUbndReq(pst, suId, status)
-Pst *pst;                       /* post structure */
-SpId spId;                      /* Service User Id */
-Reason Reason;                    /* Status */
-#endif
 {
 
    return ROK;
 
 } /* end of PtDlUdxBndReq */
 
-#ifdef ANSI
 static S16 PtUlUdxCfgReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 RlcCfgInfo *cfmInfo             /* Config Info */
 )
-#else
-static S16 PtUlUdxCfgReq(pst, spId, status)
-Pst *pst;                       /* post structure */
-SpId spId;                      /* Service User Id */
-RlcCfgInfo *cfmInfo;              /* Config Info */
-#endif
 {
 
    return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
-#ifdef ANSI
 static S16 PtUlUdxUeIdChgReq
 (
 Pst *pst,                      /* post structure */
@@ -151,14 +129,6 @@ uint32_t  transId,              /* transaction Id */
 CkwUeInfo *ueInfo,             /* Config Info */
 CkwUeInfo *newUeInfo           /* Config Info */
 )
-#else
-static S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
-Pst *pst;                      /* post structure */
-SpId spId;                     /* Service User Id */
-uint32_t  transId;              /* transaction Id */
-CkwUeInfo *ueInfo;             /* Config Info */
-CkwUeInfo *newUeInfo;          /* Config Info */
-#endif
 {
 
    return ROK;
@@ -190,7 +160,6 @@ RlcUdxDlStaPdu       *pStaPdu
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16  PtUlUdxStaUpdReq
 (
 Pst*                pst,
@@ -198,13 +167,6 @@ SpId                spId,
 CmLteRlcId          *rlcId,
 RlcUdxStaPdu       *pStaPdu
 )
-#else
-static S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu)
-Pst*                pst;
-SpId                spId;
-CmLteRlcId          *rlcId;
-RlcUdxDlStaPdu       *pStaPdu;
-#endif
 {
 
    return ROK;
@@ -223,17 +185,7 @@ RlcUdxDlStaPdu       *pStaPdu;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-static S16  PtUlUdxL2MeasReq
-(
-Pst*                pst,
-RlcL2MeasReqEvt      *measReqEvt
-)
-#else
-static S16 PtUlUdxL2MeasReq(pst, measReqEvt )
-Pst*                pst;
-RlcL2MeasReqEvt      *measReqEvt;
-#endif
+static S16  PtUlUdxL2MeasReq(Pst* pst,RlcL2MeasReqEvt  *measReqEvt)
 {
 
    return ROK;
@@ -251,17 +203,7 @@ RlcL2MeasReqEvt      *measReqEvt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-static S16  PtUlUdxL2MeasSendReq
-(
-Pst*       pst,
-uint8_t    status
-)
-#else
-static S16 PtUlUdxL2MeasSendReq(pst, status )
-Pst*        pst;
-uint8_t     status
-#endif
+static S16  PtUlUdxL2MeasSendReq(Pst*  pst,uint8_t status)
 {
 
    return ROK;
@@ -279,17 +221,7 @@ uint8_t     status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-static S16  PtUlUdxL2MeasStopReq
-(
-Pst*      pst,
-uint8_t   status
-)
-#else
-static S16 PtUlUdxL2MeasStopReq(pst, status )
-Pst*       pst;
-uint8_t    status
-#endif
+static S16  PtUlUdxL2MeasStopReq(Pst*      pst,uint8_t   status)
 {
 
    return ROK;
@@ -490,19 +422,12 @@ static const UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] =
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcUlUdxBndReq
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                     /* Status */
 )
-#else
-S16 rlcUlUdxBndReq(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-SpId spId;                    /* Status */
-#endif
 {
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId);
@@ -531,19 +456,12 @@ SpId spId;                    /* Status */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcUlUdxUbndReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 Reason   reason                     /* Status */
 )
-#else
-S16 rlcUlUdxUbndReq(pst, suId, status)
-Pst *pst;                       /* post structure */
-SpId spId;                      /* Service User Id */
-Reason Reason;                    /* Status */
-#endif
 {
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason );
@@ -552,19 +470,12 @@ Reason Reason;                    /* Status */
 
 } /* end of rlcDlUdxBndReq */
 
-#ifdef ANSI
 S16 rlcUlUdxCfgReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 RlcCfgInfo *cfmInfo             /* Config Info */
 )
-#else
-S16 rlcUlUdxCfgReq(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId spId;                      /* Service User Id */
-RlcCfgInfo *cfmInfo;              /* Config Info */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -574,7 +485,6 @@ RlcCfgInfo *cfmInfo;              /* Config Info */
 
 } /* end of rlcDlUdxCfgReq */
 
-#ifdef ANSI
 S16 rlcUlUdxUeIdChgReq
 (
 Pst *pst,                      /* post structure */
@@ -583,14 +493,6 @@ uint32_t  transId,              /* transaction Id */
 CkwUeInfo *ueInfo,             /* Config Info */
 CkwUeInfo *newUeInfo           /* Config Info */
 )
-#else
-S16 rlcUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
-Pst *pst;                      /* post structure */
-SpId spId;                     /* Service User Id */
-uint32_t  transId;              /* transaction Id */
-CkwUeInfo *ueInfo;             /* Config Info */
-CkwUeInfo *newUeInfo;          /* Config Info */
-#endif
 {
 
    /* jump to specific primitive depending on configured selector */
@@ -637,17 +539,7 @@ uint8_t rlcUlUdxStaUpdReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu *
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16  rlcUlUdxL2MeasReq
-(
-Pst*                pst,
-RlcL2MeasReqEvt      *measReqEvt 
-)
-#else
-S16 rlcUlUdxL2MeasReq(pst,measReqEvt)
-Pst*                pst;
-RlcL2MeasReqEvt      *measReqEvt; 
-#endif
+S16  rlcUlUdxL2MeasReq(Pst* pst,RlcL2MeasReqEvt *measReqEvt )
 {
 
    return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt));
@@ -665,17 +557,7 @@ RlcL2MeasReqEvt      *measReqEvt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16  rlcUlUdxL2MeasSendReq
-(
-Pst*        pst,
-uint8_t     measType
-)
-#else
-S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
-Pst*        pst;
-uint8_t     measType;
-#endif
+S16  rlcUlUdxL2MeasSendReq(Pst* pst,uint8_t measType)
 {
 
    return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType));
@@ -693,17 +575,7 @@ uint8_t     measType;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16  rlcUlUdxL2MeasStopReq
-(
-Pst*        pst,
-uint8_t     measType
-)
-#else
-S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
-Pst*        pst;
-uint8_t     measType;
-#endif
+S16  rlcUlUdxL2MeasStopReq(Pst*  pst,uint8_t  measType)
 {
 
    return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
index 18385dc..2750aef 100755 (executable)
@@ -96,19 +96,12 @@ S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb  *gCb,RlcUlCfgTmpData *cfgTmpData,
  *    -# RFAILED
  */
 
-#ifdef ANSI
 S16 rlcUlUdxBndCfm
 (
 Pst    *pst,  
 SuId   suId, 
 uint8_t status 
 )
-#else
-S16 rlcUlUdxBndCfm (pst, suId, status)
-Pst    *pst; 
-SuId   suId;   
-uint8_t status; 
-#endif
 {
    uint16_t        event;        
    uint16_t        cause;       
@@ -203,19 +196,12 @@ uint8_t status;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcUlUdxCfgCfm
 (
 Pst             *pst,  
 SuId            suId, 
 RlcCfgCfmInfo   *cfmInfo  
 )
-#else
-S16 rlcUlUdxCfgCfm (pst, suId, cfmInfo)
-Pst             *pst;   
-SuId            suId;  
-RlcCfgCfmInfo   *cfmInfo;  
-#endif
 {
    RlcCb             *tRlcCb;
    RlcCfgCfmInfo    *cfgCfm;
@@ -321,7 +307,6 @@ RlcCfgCfmInfo   *cfmInfo;
  *      -# RFAILED
  */
 
-#ifdef ANSI
 S16 rlcUlUdxUeIdChgCfm
 (
 Pst        *pst,          
@@ -329,13 +314,6 @@ SuId       suId,
 uint32_t        transId,
 CmStatus   status
 )
-#else
-S16 rlcUlUdxUeIdChgCfm (pst, suId, cfmInfo)
-Pst        *pst;         
-SuId       suId;        
-uint32_t        transId;
-CmStatus   status;
-#endif
 {
    RlcCb             *tRlcCb;
    RlcUlCfgTmpData   *cfgTmpData;
@@ -442,7 +420,6 @@ CmLteRlcId   *rlcId
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 rlcHdlCrlcUlCfgReq
 (
 RlcCb             *gCb,
@@ -450,13 +427,6 @@ RlcUlCfgTmpData   *cfgTmpData,
 RlcCfgCfmInfo    *cfmInfo,
 RlcCfgCfmInfo    *cfgCfm
 )
-#else
-S16 rlcHdlCrlcUlCfgReq(gCb,cfgTmpData,cfmInfo,cfmInfo)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgTmpData;
-RlcCfgCfmInfo    *cfmInfo;
-RlcCfgCfmInfo    *cfgCfm;
-#endif
 {
    RlcCfgInfo   *cfg;
    uint32_t     idx;
index f768821..484ec84 100755 (executable)
@@ -97,19 +97,12 @@ static int RLOG_FILE_ID=205;
  *    -# RFAILED
  *
 */
-#ifdef ANSI
 S16 RlcUiCkwBndReq 
 (
 Pst    *pst,
 SuId   suId,
 SpId   spId 
 )
-#else
-S16 RlcUiCkwBndReq (pst, suId, spId)
-Pst    *pst; 
-SuId   suId;
-SpId   spId;
-#endif
 {
    RlcCkwSapCb   *ckwSap;  
    RlcCb         *tRlcCb;
@@ -202,19 +195,12 @@ SpId   spId;
  *    -# ROK 
  *    -# RFAILED
 */ 
-#ifdef ANSI
 S16 RlcUiCkwUbndReq
 (
 Pst      *pst,   
 SpId     spId,  
 Reason   reason 
 )
-#else
-S16 RlcUiCkwUbndReq(pst, spId, reason)
-Pst      *pst; 
-SpId     spId; 
-Reason   reason;
-#endif
 {
    RlcCb *tRlcCb;
 
@@ -260,17 +246,11 @@ Reason   reason;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcProcCfgReq
 (
 Pst          *pst,
 RlcCfgInfo   *cfg
 )
-#else
-S16 RlcProcCfgReq(pst, cfg)
-Pst          *pst;
-RlcCfgInfo   *cfg;
-#endif
 {
    RlcCb        *tRlcCb;
    RlcUlCfgTmpData   *cfgTmpData;
@@ -334,7 +314,6 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiCkwUeIdChgReq
 (
 Pst         *pst, 
@@ -343,14 +322,6 @@ uint32_t    transId,
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-S16 RlcUiCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst         *pst;
-SpId        spId;
-uint32_t    transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    S16              ret = ROK;
    RlcCb             *tRlcCb;
@@ -442,19 +413,12 @@ CkwUeInfo   *newUeInfo;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 Void rlcUlHdlCfgReq
 (
-RlcCb             *gCb,
-RlcUlCfgTmpData   *cfgTmpData,
-RlcCfgInfo       *cfg
+RlcCb           *gCb,
+RlcUlCfgTmpData *cfgTmpData,
+RlcCfgInfo      *cfg
 )
-#else
-Void rlcUlHdlCfgReq(gCb, cfgTmpData, cfg)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgTmpData;
-RlcCfgInfo       *cfg;
-#endif
 {
    uint8_t   idx;  
 
@@ -596,19 +560,12 @@ RlcCfgInfo       *cfg;
  *    -# RFAILED
  *
  */
-#ifdef ANSI
 S16 RlcUiKwuBndReq 
 (
 Pst    *pst,  
 SuId   suId, 
 SpId   spId 
 )
-#else
-S16 RlcUiKwuBndReq (pst, suId, spId)
-Pst    *pst;  
-SuId   suId; 
-SpId   spId; 
-#endif
 {
    RlcKwuSapCb   *rlckwuSap;     /* SAP Config Block */
    RlcCb         *tRlcCb;
@@ -713,19 +670,12 @@ SpId   spId;
  *     -# ROK 
  *     -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuUbndReq
 (
 Pst      *pst,  
 SpId     spId, 
 Reason   reason 
 )
-#else
-S16 RlcUiKwuUbndReq(pst, spId, reason)
-Pst      *pst; 
-SpId     spId; 
-Reason   reason; 
-#endif
 {
    RlcKwuSapCb   *rlckwuSap;   /* KWU SAP control block */
    RlcCb         *tRlcCb;
@@ -858,19 +808,12 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuDiscSduReq 
 (
 Pst              *pst,   
 SpId             spId,  
 KwuDiscSduInfo   *discSdu 
 )
-#else
-S16 RlcUiKwuDiscSduReq(pst, spId, discSdu)
-Pst              *pst;   
-SpId             spId;  
-KwuDiscSduInfo   *discSdu; 
-#endif
 {
    RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo));
    return ROK;
index fea94de..654a92b 100755 (executable)
@@ -81,13 +81,7 @@ S16 rlcUlInitExt ARGS (( Void ));
  *
 */
   
-#ifdef ANSI
-S16 rlcUlInitExt 
-(
-)
-#else
 S16 rlcUlInitExt()
-#endif
 {
 
    return ROK;
@@ -122,7 +116,6 @@ S16 rlcUlInitExt()
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcUlActvInit
 (
 Ent    ent,                 /* entity */
@@ -130,13 +123,6 @@ Inst   inst,                /* instance */
 Region region,              /* region */
 Reason reason               /* reason */
 )
-#else
-S16 rlcUlActvInit(ent, inst, region, reason)
-Ent    ent;                 /* entity */
-Inst   inst;                /* instance */
-Region region;              /* region */
-Reason reason;              /* reason */
-#endif
 {
    RlcCb    *tRlcCb;
 
@@ -203,17 +189,11 @@ Reason reason;              /* reason */
  *      -# ROK 
  *
  */
-#ifdef ANSI
 S16 rlcUlActvTsk
 (
 Pst *pst,              /* pst structure */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 rlcUlActvTsk(pst, mBuf)
-Pst *pst;              /* pst structure */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
    S16 ret = ROK;
 
index 8d6f13b..95ce617 100755 (executable)
@@ -571,21 +571,7 @@ void rlcUmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *datReq)
  *
  * @return  Void
 */ 
-#ifdef ANSI
-Void rlcDlUmmReEstablish
-(
-RlcCb         *gCb,
-CmLteRlcId   rlcId,
-Bool         sendReEst,
-RlcDlRbCb     *rbCb
-)
-#else
-Void rlcDlUmmReEstablish(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   rlcId;
-Bool         sendReEst;
-RlcDlRbCb       *rbCb;
-#endif
+Void rlcDlUmmReEstablish(RlcCb *gCb,CmLteRlcId rlcId,Bool sendReEst,RlcDlRbCb *rbCb)
 {
    /* The re-establishment indication is sent from the UL only */
 
@@ -761,19 +747,7 @@ static void rlcUmmEstHdrSz(RlcUmDl *umDl)
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcUmmDiscSdu
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,                
-uint32_t        sduId                
-)
-#else
-Void rlcUmmDiscSdu(gCb,rbCb,sduId)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;                
-uint32_t        sduId;                
-#endif
+Void rlcUmmDiscSdu(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t sduId)
 {
    CmLList *tmpNode;  /* Temporary Node in SDU queue */
    CM_LLIST_FIRST_NODE(&rbCb->m.umDl.sduQ,tmpNode);
@@ -806,17 +780,7 @@ uint32_t        sduId;
  *
  * @return Void
  */
-#ifdef ANSI
-Void rlcUmmFreeDlRbCb
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb
-)
-#else
-Void rlcUmmFreeDlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-#endif
+Void rlcUmmFreeDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb)
 {
 
    /* cat the SDU queue to the to be freed list */
index 98cfe36..5926729 100755 (executable)
@@ -521,19 +521,12 @@ static void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRec
  *
  * @return  Void
 */ 
-#ifdef ANSI
 Void rlcUmmUlReEstablish
 (
 RlcCb         *gCb,
 CmLteRlcId   *rlcId,
 RlcUlRbCb     *rbCb
 )
-#else
-Void rlcUmmUlReEstablish(gCb, rlcId, rbCb)
-RlcCb         *gCb;
-CmLteRlcId   *rlcId;
-RlcUlRbCb     *rbCb;
-#endif
 {
    RlcSn         curSn;
    RlcSn         vrUh;
@@ -740,17 +733,11 @@ static uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmH
  *
  * @return  Void
 */
-#ifdef ANSI
 Void rlcUmmReOrdTmrExp
 (
 RlcCb       *gCb,
 RlcUlRbCb   *rbCb     
 )
-#else
-Void rlcUmmReOrdTmrExp(gCb, rbCb)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;   
-#endif
 {
    RlcSn prevVrUr;   /* prevVrUr */
    prevVrUr = RLC_UMUL.vrUr;
@@ -797,17 +784,11 @@ RlcUlRbCb   *rbCb;
  * @return   void
  */
 
-#ifdef ANSI
 Void rlcUmmFreeUlRbCb
 (
 RlcCb       *gCb,
 RlcUlRbCb   *rbCb
 )
-#else
-Void rlcUmmFreeUlRbCb(gCb,rbCb)
-RlcCb       *gCb;
-RlcUlRbCb   *rbCb;
-#endif
 {
    RlcSn         curSn = 0;           /* sequence number of PDU */
    RlcSn         windSz;              /* PDU window size */
index 146eaf9..2d1938c 100755 (executable)
@@ -73,7 +73,9 @@ static int RLOG_FILE_ID=209;
 
 #include "rlc_utils.h"
 #include "rlc_mac_inf.h"
+#include "du_app_rlc_inf.h"
 #include "rlc_lwr_inf_api.h"
+#include "rlc_upr_inf_api.h"
 
 #include "ss_rbuf.h"
 #include "ss_rbuf.x" 
@@ -230,14 +232,15 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo)
    RguDatReqTb      datPerTb;   /* DL data info per TB */
    RguLchDatReq     datPerLch;  /* DL data info per Lch */
    RlcData          *dlData;    /* DL data to be sent to MAC */
+   RlcDlRrcMsgRsp   *dlRrcMsgRsp;/* DL Data Msg Rsp sent to DU */
    Pst              pst;        /* Post structure */
    uint16_t         pduLen;     /* PDU length */
    uint16_t         copyLen;    /* Number of bytes copied */
 
    dlData = NULLP;
+   dlRrcMsgRsp = NULLP;
    RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL,
                        dlData, sizeof(RlcData));
-#if (ERRCLASS & ERRCLS_ADD_RES)
    if ( dlData == NULLP )
    {
       DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dl data");
@@ -245,7 +248,6 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo)
           datReqInfo, sizeof(RguDDatReqInfo));
       return RFAILED;
    }
-#endif /* ERRCLASS & ERRCLS_ADD_RES */
 
    for(ueIdx = 0; ueIdx < datReqInfo->nmbOfUeGrantPerTti; ueIdx++)
    {
@@ -304,6 +306,25 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo)
          }/* For Data per Lch */
       }/* For Data per Tb */
 
+      RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL,
+                     dlRrcMsgRsp, sizeof(RlcDlRrcMsgRsp));
+      if( dlRrcMsgRsp == NULLP )
+      {
+         DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dlRrcMsgRsp");
+         for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++)
+         {
+            RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData->pduInfo[pduIdx].pduBuf,\
+               dlData->pduInfo[pduIdx].pduLen);
+         }
+          RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData, sizeof(RlcData));
+         RLC_FREE_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL,
+             datReqInfo, sizeof(RguDDatReqInfo));
+         return RFAILED;
+      }
+
+      dlRrcMsgRsp->cellId = dlData->cellId;
+      dlRrcMsgRsp->crnti = dlData->rnti;
+
       /* Sending DL Data per UE to MAC */
       memset(&pst, 0, sizeof(Pst));
       FILL_PST_RLC_TO_MAC(pst, RLC_DL_INST, EVENT_DL_DATA_TO_MAC);
@@ -315,6 +336,17 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo)
               dlData->pduInfo[pduIdx].pduLen);
         }
          RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData, sizeof(RlcData));
+        /* Update DL RRC MSG Rsp State */
+         dlRrcMsgRsp->state = TRANSMISSION_FAILED;
+      }
+      else
+         dlRrcMsgRsp->state = TRANSMISSION_COMPLETE;
+
+      /* Send Dl RRC Msg Rsp to DU APP */
+      FILL_PST_RLC_TO_DUAPP(pst, RLC_DL_INST, EVENT_DL_RRC_MSG_RSP_TO_DU);
+      if(rlcSendDlRrcMsgRspToDu(&pst, dlRrcMsgRsp) != ROK)
+      {
+         RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlRrcMsgRsp, sizeof(RlcDlRrcMsgRsp));
       }
    } /* For Data per UE */
 
@@ -637,7 +669,6 @@ uint8_t rlcUtlSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, int32_t bo, \
  */
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS_RLC
-#ifdef ANSI
 Void rlcUtlEmptySduQ
 (
 RlcCb        *gCb, 
@@ -645,23 +676,11 @@ RlcDlRbCb    *rbCb,
 CmLListCp   *sduQ 
 )
 #else
-Void rlcUtlEmptySduQ(gCb,rbCb, sduQ)
-RlcCb        *gCb;
-RlcDlRbCb    *rbCb;
-CmLListCp   *sduQ;
-#endif
-#else
-#ifdef ANSI
 Void rlcUtlEmptySduQ
 (
 RlcCb        *gCb,
 CmLListCp   *sduQ 
 )
-#else
-Void rlcUtlEmptySduQ(gCb,sduQ)
-RlcCb        *gCb;
-CmLListCp   *sduQ; 
-#endif
 #endif
 {
 #ifdef LTE_L2_MEAS_RLC
@@ -747,17 +766,7 @@ void rlcUtlCalcLiForSdu(RlcCb *gCb, uint16_t numLi, MsgLen msgLen, int16_t *pduS
  *
  * @return  void 
  */
-#ifdef ANSI
-Void rlcDlUtlSetReestInProgressForRB
-(
-RlcCb     *gCb,
-RlcDlRbCb *rbCb
-)
-#else
-Void rlcDlUtlSetReestInProgressForRB(gCb,rbCb)
-RlcCb     *gCb;
-RlcDlRbCb *rbCb;
-#endif 
+Void rlcDlUtlSetReestInProgressForRB(RlcCb *gCb,RlcDlRbCb *rbCb)
 {
       
    rbCb->reestInProgress = TRUE;
@@ -806,15 +815,7 @@ bool rlcDlUtlIsReestInProgress(RlcDlRbCb *rbCb)
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcDlUtlResetReestInProgress
-(
-RlcDlRbCb *rbCb
-)
-#else
-Void rlcDlUtlResetReestInProgress(rbCb)
-RlcDlRbCb *rbCb;
-#endif 
+Void rlcDlUtlResetReestInProgress(RlcDlRbCb *rbCb)
 {
 
    rbCb->reestInProgress = FALSE;
@@ -833,17 +834,7 @@ RlcDlRbCb *rbCb;
  *
  * @return  void 
  */
-#ifdef ANSI
-Void rlcDlUtlSetReestInProgressForAllRBs
-(
-RlcCb     *gCb,
-RlcDlUeCb *ueCb
-)
-#else
-Void rlcDlUtlSetReestInProgressForAllRBs(gCb,ueCb)
-RlcCb     *gCb;
-RlcDlUeCb *ueCb;
-#endif 
+Void rlcDlUtlSetReestInProgressForAllRBs(RlcCb *gCb,RlcDlUeCb *ueCb)
 {
    uint32_t        rbIdx;
    
@@ -921,17 +912,7 @@ void rlcUtlIncrementGenStsBytesAndPdusSent(RlcGenSts *genSts, Buffer *pdu)
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcUtlInitToBeFreed
-(
-RlcCb                *gCb,
-RlcDlDataToBeFreed   *toBeFreed
-)
-#else
-Void rlcUtlInitToBeFreed(gCb, toBeFreed)
-RlcCb                *gCb;
-RlcDlDataToBeFreed   *toBeFreed;
-#endif
+Void rlcUtlInitToBeFreed(RlcCb *gCb,RlcDlDataToBeFreed *toBeFreed)
 {
    cmLListInit(&(toBeFreed->sduLst));
    cmLListInit(&(toBeFreed->rbLst));
@@ -949,15 +930,7 @@ RlcDlDataToBeFreed   *toBeFreed;
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcUtlInitializeSelfPst
-(
-RlcCb *gCb  
-)
-#else
-Void rlcUtlInitializeSelfPst(gCb)
-RlcCb *gCb;
-#endif
+Void rlcUtlInitializeSelfPst(RlcCb *gCb)
 {
    Pst *selfPst = &gCb->u.dlCb->selfPst;
    
@@ -1016,17 +989,7 @@ void rlcUtlAddSduToBeFreedQueue(RlcCb *gCb, RlcSdu *sdu)
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcUtlAddReTxPduToBeFreedQueue
-(
-RlcCb     *gCb,
-RlcRetx   *retx
-)
-#else
-Void rlcUtlAddReTxPduToBeFreedQueue(gCb, retx)
-RlcCb     *gCb;
-RlcRetx   *retx;
-#endif
+Void rlcUtlAddReTxPduToBeFreedQueue(RlcCb *gCb,RlcRetx *retx)
 {
    cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.reTxLst), &(retx->lstEnt));
    return;
@@ -1041,17 +1004,7 @@ RlcRetx   *retx;
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcUtlAddTxPduToBeFreedQueue
-(
-RlcCb   *gCb,
-RlcTx   *pdu
-)
-#else
-Void rlcUtlAddTxPduToBeFreedQueue(gCb, pdu)
-RlcCb   *gCb;
-RlcTx   *pdu;
-#endif
+Void rlcUtlAddTxPduToBeFreedQueue(RlcCb   *gCb,RlcTx   *pdu)
 {
    pdu->rlsLnk.node = (PTR)pdu;
    cmLListAdd2Tail(&(gCb->u.dlCb->toBeFreed.txLst), &(pdu->rlsLnk));
@@ -1074,19 +1027,7 @@ RlcTx   *pdu;
  *     - TRUE if more data to be freed
  *     - FALSE if all the data has been freed
  */
-#ifdef ANSI
-static Bool rlcUtlFreeDlAmRbMemory
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,
-uint32_t    *toBeFreed
-)
-#else
-static Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-uint32_t    *toBeFreed
-#endif
+static Bool rlcUtlFreeDlAmRbMemory(RlcCb *gCb,RlcDlRbCb *rbCb,uint32_t *toBeFreed)
 {
    RlcRetx   *retx;   /* retransmission buffer */
    RlcSn     mTxNext;    /* send state variable */
@@ -1177,15 +1118,7 @@ uint32_t    *toBeFreed
  *
  * @return  Void
  */
-#ifdef ANSI
-Void rlcUtlFreeDlMemory
-(
-RlcCb *gCb  
-)
-#else
-Void rlcUtlFreeDlMemory(gCb)
-RlcCb *gCb;
-#endif
+Void rlcUtlFreeDlMemory(RlcCb *gCb)
 {
    uint32_t toBeFreed; 
 
@@ -1346,7 +1279,6 @@ S16 rlcUtlL2MeasDlInit(RlcCb *gCb)
  *  @return  Void
  *
  */
-#ifdef ANSI
 Void rlcUtlUpdateBurstSdus
 (
 RlcCb            *gCb,
@@ -1355,14 +1287,6 @@ RlcContSduLst    *contSduLst,
 S32              dataVol,
 uint32_t         schPduSz
 )
-#else
-Void  rlcUtlUpdateBurstSdus (gCb, rbCb, contSduLst, dataVol, schPduSz)
-RlcCb            *gCb;
-RlcDlRbCb        *rbCb;
-RlcContSduLst    *contSduLst;
-S32              dataVol;
-uint32_t         schPduSz;
-#endif
 {
 
    RlcL2MeasDlIpTh   *l2MeasDlIpThruput = NULLP;
@@ -1444,17 +1368,7 @@ uint32_t         schPduSz;
  *
  *  @return  Void
  */
-#ifdef ANSI
-Void rlcUtlUpdateContainedSduLst
-(
-uint8_t            sduIdx,
-RlcContSduLst  *contSduLst
-)
-#else
-Void rlcUtlUpdateContainedSduLst(sduIdx, contSduLst)
-uint8_t            sduIdx;
-RlcContSduLst  *contSduLst;
-#endif
+Void rlcUtlUpdateContainedSduLst(uint8_t sduIdx,RlcContSduLst *contSduLst)
 {
    if (contSduLst->numSdus < RLC_L2MEAS_MAX_OUTSTNGSDU)
    {
@@ -1482,23 +1396,14 @@ RlcContSduLst  *contSduLst;
  *
  *  @return  Void
  */
-#ifdef ANSI
 Void rlcUtlUpdateOutStandingSduLst
 (
 RlcL2MeasDlIpTh   *dlIpThPut, 
-uint8_t               sduIdx, 
-MsgLen           sduLen, 
-uint32_t              sduId,
-Bool             newIdx
+uint8_t           sduIdx, 
+MsgLen            sduLen, 
+uint32_t          sduId,
+Bool              newIdx
 )
-#else
-Void rlcUtlUpdateOutStandingSduLst(dlIpThPut, sduIdx, sduLen, sduId, newIdx)
-RlcL2MeasDlIpTh   *dlIpThPut;
-uint8_t               sduIdx;
-MsgLen           sduLen; 
-uint32_t              sduId;
-Bool             newIdx;
-#endif
 {
    if (sduIdx < RLC_L2MEAS_MAX_OUTSTNGSDU)
    {
@@ -1512,17 +1417,7 @@ Bool             newIdx;
    }
    return;
 }
-#ifdef ANSI
-RlcL2MeasTb * rlcUtlGetCurMeasTb
-(
-RlcCb     *gCb,
-RlcDlRbCb *rbCb
-)
-#else
-RlcL2MeasTb * rlcUtlGetCurMeasTb(gCb, rbCb)
-RlcCb     *gCb;
-RlcDlRbCb *rbCb;
-#endif
+RlcL2MeasTb * rlcUtlGetCurMeasTb(RlcCb *gCb,RlcDlRbCb *rbCb)
 {
    RlcL2MeasTb  *curL2MeasTb;
    uint16_t         idx;
@@ -1574,7 +1469,6 @@ RlcDlRbCb *rbCb;
  *      -# ROK
  */
 
-#ifdef ANSI
 S16 rlcUtlProcHarqInd
 (
 RlcCb            *gCb,
@@ -1582,13 +1476,6 @@ RguHarqStatusInd *hqStaInd,
 RlcDlUeCb        *ueCb,
 uint8_t          tbIdx
 )
-#else
-S16 rlcUtlProcHarqInd(gCb, hqStaInd, ueCb, tbIdx)
-RlcCb             *gCb;
-RguHarqStatusInd  *hqStaInd;
-RlcDlUeCb         *ueCb;
-uint8_t            tbIdx;
-#endif
 {
 #ifdef LTE_L2_MEAS
    RlcDlRbCb        *rlcRbCb;           /* KW Control Block */
@@ -1782,17 +1669,7 @@ uint8_t            tbIdx;
  *      -# ROK
  */
 
-#ifdef ANSI
-S16 rlcUtlSndDlL2MeasCfm
-(
-RlcCb                  *gCb,
-RlcL2MeasEvtCb         *measEvtCb
-)
-#else
-S16 rlcUtlSndDlL2MeasCfm(gCb, measEvtCb)
-RlcCb                  *gCb;
-RlcL2MeasEvtCb         *measEvtCb;
-#endif
+S16 rlcUtlSndDlL2MeasCfm(RlcCb *gCb,RlcL2MeasEvtCb *measEvtCb)
 {
    uint32_t         qciIdx;
    RlcL2MeasCb      *measCb = NULLP;
@@ -1939,19 +1816,7 @@ RlcL2MeasEvtCb         *measEvtCb;
  *      -# ROK
  */
 
-#ifdef ANSI
-S16 rlcUtlSndDlL2MeasNCfm
-(
-RlcCb           *gCb,
-RlcL2MeasReqEvt *measReqEvt,
-RlcL2MeasCfmEvt *measCfmEvt
-)
-#else
-S16 rlcUtlSndDlL2MeasNCfm(gCb,measReqEvt, measCfmEvt)
-RlcCb           *gCb;
-RlcL2MeasReqEvt *measReqEvt;
-RlcL2MeasCfmEvt *measCfmEvt;
-#endif
+S16 rlcUtlSndDlL2MeasNCfm(RlcCb *gCb,RlcL2MeasReqEvt *measReqEvt,RlcL2MeasCfmEvt *measCfmEvt)
 {
 
    RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt);
@@ -1971,20 +1836,8 @@ RlcL2MeasCfmEvt *measCfmEvt;
  *
  *  @return  Void
  */
-#ifdef ANSI
 
-Void rlcUtlResetDlL2MeasInRlcRb
-(
-RlcCb       *gCb,
-RlcL2MeasCb *measCb,
-uint8_t      measType
-)
-#else
-Void rlcUtlResetDlL2MeasInRlcRb(gCb, measCb, measType)
-RlcCb       *gCb;
-RlcL2MeasCb *measCb;
-uint8_t      measType;
-#endif
+Void rlcUtlResetDlL2MeasInRlcRb(RlcCb *gCb,RlcL2MeasCb *measCb,uint8_t measType)
 {
    uint32_t           ueIdx;
    uint32_t           qciIdx;
@@ -2134,15 +1987,7 @@ Void DumpRLCDlDebugInformation(Void)
  *  @return  Void
  */
 
-#ifdef ANSI
-void rlcUtlFreeDlMem
-(
- Void
-)
-#else
-void rlcUtlFreeDlMem()
-Void;
-#endif
+void rlcUtlFreeDlMem( Void)
 {
   rlcUtlFreeDlMemory(RLC_GET_RLCCB(RLC_DL_INST));
 }
@@ -2166,15 +2011,7 @@ void rlcUtlGetCurrTime(uint32_t  *currTime)
 
 #if defined(MAC_RLC_HARQ_STA_RBUF) || defined (SS_RBUF)
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-void rlcUtlDlBatchProcHqStaInd
-(
- Void
-)
-#else
-void rlcUtlDlBatchProcHqStaInd()
-Void;
-#endif
+void rlcUtlDlBatchProcHqStaInd( Void)
 {
    /* Read from Ring Buffer and process PDCP packets */
    //Pst pst = {0};
@@ -2218,19 +2055,7 @@ Void;
  *  @return  Void
  *
  */
-#ifdef ANSI
-Void rlcUtlTrigPdbFlowCntrl
-(
-RlcCb       *gCb,
-RlcDlRbCb   *rbCb,
-uint32_t    pktAdmitCnt
-)
-#else
-Void rlcUtlTrigPdbFlowCntrl(gCb,rbCb,pktAdmitCnt)
-RlcCb       *gCb;
-RlcDlRbCb   *rbCb;
-uint32_t    pktAdmitCnt;
-#endif
+Void rlcUtlTrigPdbFlowCntrl(RlcCb  *gCb,RlcDlRbCb *rbCb,uint32_t pktAdmitCnt)
 {
    KwuFlowCntrlIndInfo    *flowCntrlInfo;
    RlcKwuSapCb*            rlckwuSap;
@@ -2323,19 +2148,7 @@ RlcTx* rlcUtlGetTxBuf(CmLListCp *txBufLst, RlcSn sn)
  *
  *  @return  Void
  */
-#ifdef ANSI
-Void rlcUtlDelTxBuf 
-(
-CmLListCp        *txBufLst,
-RlcTx            *txBuf,
-RlcCb              *gCb                              
-)
-#else
-Void rlcUtlDelTxBuf(txBufLst, txBuf, gCb)
-CmLListCp        *txBufLst;
-RlcTx             *txBuf;
-RlcCb             *gCb;                              
-#endif
+Void rlcUtlDelTxBuf (CmLListCp *txBufLst,RlcTx  *txBuf,RlcCb *gCb)
 {
    uint32_t            hashKey; 
    CmLListCp           *txBufLstCp;
@@ -2363,19 +2176,7 @@ RlcCb             *gCb;
  *
  *  @return  Void
  */
-#ifdef ANSI
-Void rlcUtlRemovTxBuf 
-(
-CmLListCp        *txBufLst,
-RlcTx            *txBuf,
-RlcCb              *gCb                              
-)
-#else
-Void rlcUtlRemovTxBuf(txBufLst, txBuf, gCb)
-CmLListCp        *txBufLst;
-RlcTx             *txBuf;
-RlcCb             *gCb;                              
-#endif
+Void rlcUtlRemovTxBuf(CmLListCp *txBufLst,RlcTx  *txBuf,RlcCb *gCb)
 {
    uint32_t            hashKey; 
    CmLListCp           *txBufLstCp;
index 18cf51e..f954e76 100755 (executable)
@@ -400,19 +400,7 @@ S16 rlcUtlL2MeasUlInit(RlcCb *gCb)
  *  @return  Void
  *
  */
-#ifdef ANSI
- Void rlcUtlCalUlIpThrPutIncTTI
-(
-RlcCb                  *gCb,
-RlcUlRbCb              *rbCb,
-uint32_t               ttiCnt
-)
-#else
-Void rlcUtlCalUlIpThrPutIncTTI(gCb, rbCb, ttiCnt)
-RlcCb                  *gCb;
-RlcUlRbCb              *rbCb;
-uint32_t               ttiCnt;
-#endif
+Void rlcUtlCalUlIpThrPutIncTTI(RlcCb *gCb,RlcUlRbCb *rbCb,uint32_t ttiCnt)
 {
    volatile uint32_t     startTime = 0;
 
@@ -478,21 +466,13 @@ uint32_t               ttiCnt;
  *  @return  Void
  *
  */
-#ifdef ANSI
- Void rlcUtlCalUlIpThrPut
+Void rlcUtlCalUlIpThrPut
 (
 RlcCb        *gCb,
 RlcUlRbCb    *rbCb,
 Buffer       *pdu,
 uint32_t     ttiCnt
 )
-#else
-Void rlcUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
-RlcCb        *gCb;
-RlcUlRbCb    *rbCb;
-Buffer       *pdu;
-uint32_t     ttiCnt;
-#endif
 {
    MsgLen        rlcSduSz = 0;  /*Holds length of Rlc Sdu*/
    volatile uint32_t     startTime = 0;
@@ -533,17 +513,7 @@ uint32_t     ttiCnt;
  *      -# ROK
  */
 
-#ifdef ANSI
-S16 rlcUtlHdlL2TmrExp
-(
-RlcCb          *gCb,
-RlcL2MeasEvtCb *measEvtCb
-)
-#else
-S16 rlcUtlHdlL2TmrExp(measEvtCb)
-RlcCb          *gCb;
-RlcL2MeasEvtCb *measEvtCb;
-#endif
+S16 rlcUtlHdlL2TmrExp(RlcCb *gCb,RlcL2MeasEvtCb *measEvtCb)
 {
 
 #ifdef LTE_L2_MEAS_RLC
@@ -588,17 +558,7 @@ RlcL2MeasEvtCb *measEvtCb;
  *      -# ROK
  */
 
-#ifdef ANSI
-S16 rlcUtlSndUlL2MeasCfm
-(
-RlcCb                  *gCb,
-RlcL2MeasEvtCb         *measEvtCb
-)
-#else
-S16 rlcUtlSndUlL2MeasCfm(gCb, measEvtCb)
-RlcCb                  *gCb;
-RlcL2MeasEvtCb         *measEvtCb;
-#endif
+S16 rlcUtlSndUlL2MeasCfm(RlcCb *gCb,RlcL2MeasEvtCb  *measEvtCb)
 {
    uint32_t            qciIdx;
    RlcL2MeasCb         *measCb;
@@ -693,19 +653,7 @@ RlcL2MeasEvtCb         *measEvtCb;
  *      -# ROK
  */
 
-#ifdef ANSI
-S16 rlcUtlSndUlL2MeasNCfm
-(
-RlcCb           *gCb,
-RlcL2MeasReqEvt *measReqEvt,
-RlcL2MeasCfmEvt *measCfmEvt
-)
-#else
-S16 rlcUtlSndUlL2MeasNCfm(gCb, measReqEvt, measCfmEvt)
-RlcCb           *gCb;
-RlcL2MeasReqEvt *measReqEvt;
-RlcL2MeasCfmEvt *measCfmEvt;
-#endif
+S16 rlcUtlSndUlL2MeasNCfm(RlcCb *gCb,RlcL2MeasReqEvt *measReqEvt,RlcL2MeasCfmEvt *measCfmEvt)
 {
 
    RlcMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt);
@@ -727,21 +675,13 @@ RlcL2MeasCfmEvt *measCfmEvt;
  *  @param[out] numLCh     Number of LCh in array lChId.
  **/
 
-#ifdef ANSI
 S16 rlcUtlValidateL2Meas
 (
 RlcL2MeasReqEvt *measReqEvt,
 RlcL2MeasCfmEvt *measCfmEvt,
-CmLteLcId      *lChId,
-uint8_t             *numLCh
+CmLteLcId       *lChId,
+uint8_t         *numLCh
 )
-#else
-S16 rlcUtlValidateL2Meas(measReqEvt, measCfmEvt, lChId, numLCh)
-RlcL2MeasReqEvt *measReqEvt;
-RlcL2MeasCfmEvt *measCfmEvt;
-CmLteLcId      *lChId;
-uint8_t             *numLCh;
-#endif
 {
    uint8_t    measType;
    S16        ret;
@@ -868,17 +808,7 @@ uint8_t             *numLCh;
 }/* rlcUtlValidateL2Meas */
 #endif
 
-#ifdef ANSI
-S16 rlcUtlValidateIpThL2Meas
-(
-RlcL2MeasReqEvt *measReqEvt,
-RlcL2MeasCfmEvt *measCfmEvt
-)
-#else
-S16 rlcUtlValidateIpThL2Meas(measReqEvt, measCfmEvt)
-RlcL2MeasReqEvt *measReqEvt;
-RlcL2MeasCfmEvt *measCfmEvt;
-#endif
+S16 rlcUtlValidateIpThL2Meas(RlcL2MeasReqEvt *measReqEvt,RlcL2MeasCfmEvt *measCfmEvt)
 {
    uint8_t      measType;
    uint8_t         lsbNibble = 0;
@@ -926,20 +856,8 @@ RlcL2MeasCfmEvt *measCfmEvt;
  *
  *  @return  Void
  */
-#ifdef ANSI
 
-Void rlcUtlResetUlL2MeasInRlcRb
-(
-RlcCb       *gCb,
-RlcL2MeasCb *measCb,
-uint8_t      measType
-)
-#else
-Void rlcUtlResetUlL2MeasInRlcRb(measCb, measType)
-RlcCb       *gCb;
-RlcL2MeasCb *measCb;
-uint8_t     measType;
-#endif
+Void rlcUtlResetUlL2MeasInRlcRb(RlcCb *gCb,RlcL2MeasCb *measCb,uint8_t measType)
 {
    uint32_t           rbIdx;
    uint32_t           ueIdx;
@@ -997,19 +915,7 @@ uint8_t     measType;
  *  @return  S16
  *      -# ROK
  */
-#ifdef ANSI
-Void rlcUtlPlcMeasDatInL2Sts
-(
-RlcL2Cntr       *measData, 
-RlcL2MeasRbCb   *rbL2Cb,
-uint8_t         measType
-)
-#else
-Void rlcUtlPlcMeasDatInL2Sts(measData, rbL2Cb, measType)
-RlcL2Cntr       *measData; 
-RlcL2MeasRbCb   *rbL2Cb;
-uint8_t         measType;
-#endif
+Void rlcUtlPlcMeasDatInL2Sts(RlcL2Cntr *measData,RlcL2MeasRbCb *rbL2Cb,uint8_t measType)
 {
    /* We should check the number of measType in the request. This can be done 
     * by looking at each bit in the measType. Also store the measData in the 
index e7085d0..1c41b15 100644 (file)
@@ -360,7 +360,10 @@ uint8_t RlcProcDlRrcMsgTransfer(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo)
    }
    oduCpyFixBufToMsg(dlRrcMsgInfo->rrcMsg, mBuf, dlRrcMsgInfo->msgLen);
 
-   rlcProcDlData(pst, datReqInfo, mBuf);
+   if(rlcProcDlData(pst, datReqInfo, mBuf) != ROK)
+   {
+      return RFAILED;
+   }
 
    /* RRC Delivery report is only send when RRC Delivery status report is true in DL RRC Message */
    if(dlRrcMsgInfo->deliveryStaRpt)
index 52dd083..ff43058 100644 (file)
@@ -32,6 +32,15 @@ RlcRrcDeliveryReportToDuFunc rlcSendRrcDeliveryReportToDuOpts[]=
    DuProcRlcRrcDeliveryReport,    /* 1 - Tightly coupled */
    packRrcDeliveryReportToDu           /* 2 - Light weight loosely coupled */
 };
+
+/* Function pointer array for DL RRC Msg Rsp Transfer */
+RlcDlRrcMsgRspToDuFunc rlcSendDlRrcMsgRspToDuOpts[] = 
+{
+   packRlcDlRrcMsgRspToDu,       /* 0 - Loosely coupled */
+   DuProcRlcDlRrcMsgRsp,         /* 1 - Tightly coupled */
+   packRlcDlRrcMsgRspToDu        /* 2 - Light weight loosely coupled */
+};
+
 /*******************************************************************
  *
  * @brief Sends UL RRC Message Info to DU APP
@@ -73,6 +82,28 @@ uint8_t rlcSendRrcDeliveryReportToDu(Pst *pst, RrcDeliveryReport *rrcDelivery)
 {
    return (*rlcSendRrcDeliveryReportToDuOpts[pst->selector])(pst, rrcDelivery);
 }
+
+/*******************************************************************
+ *
+ * @brief Sends DL RRC Message Status to DU APP
+ *
+ * @details
+ *
+ *    Function : rlcSendDlRrcMsgRspToDu
+ *
+ *    Functionality:  Sends DL RRC Message Status to DU APP
+ *
+ * @params[in] Pst structure
+ *             DL RRC Msg Info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t rlcSendDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
+{
+   return (*rlcSendDlRrcMsgRspToDuOpts[pst->selector])(pst, dlRrcMsg);
+}
+
 /**********************************************************************
          End of file
 **********************************************************************/
index 71bd23a..0a930d0 100644 (file)
@@ -18,6 +18,7 @@
 
 uint8_t rlcSendUlRrcMsgToDu(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo);
 uint8_t rlcSendRrcDeliveryReportToDu(Pst *pst, RrcDeliveryReport *rrcDelivery);
+uint8_t rlcSendDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsgRsp);
 /**********************************************************************
          End of file
 **********************************************************************/
index 4bb40f5..5ad2fcc 100755 (executable)
@@ -100,17 +100,11 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchCntrlReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cntrl   /* control structure  */
 )
-#else
-S16 RgMiLrgSchCntrlReq(pst, cntrl)
-Pst      *pst;    /* post structure  */
-RgMngmt  *cntrl;  /* control structure  */
-#endif    
 {
    S16       ret = ROK;            /* return value */
    Pst       cfmPst;
@@ -190,17 +184,11 @@ RgMngmt  *cntrl;  /* control structure  */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchL2MeasReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasReqInfo *measInfo /* Meas Req Info */
 )
-#else
-S16 RgMiLrgSchL2MeasReq(pst, measInfo)
-   Pst               *pst;     /* post structure  */
-   LrgSchMeasReqInfo *measInfo; /* Meas Req Info */
-#endif    
 {
    Pst                 cfmPst;
    RgSchCellCb         *cell;
@@ -210,7 +198,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo)
 #if (ERRCLASS & ERRCLS_ADD_RES) 
    CmLList             *lnk;
 #endif
-   uint32_t                 idx;
+   uint32_t            idx;
    RgSchL2MeasCb       *measCb = NULLP;
 #ifdef DEBUGP
    Inst      inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */
@@ -304,25 +292,19 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo)
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchL2MeasStopReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasStopReqInfo *measInfo /* Meas Req Info */
 )
-#else
-S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
-   Pst               *pst;     /* post structure  */
-   LrgSchMeasStopReqInfo *measInfo; /* Meas Req Info */
-#endif
 {
-   S16                 ret = ROK;
-   RgSchCellCb         *cell = NULLP;
-   RgSchCb             *instCb =  &rgSchCb[(pst->dstInst - SCH_INST_START)];
-   CmLList             *node = NULLP;
-   RgSchL2MeasCb       *measCb = NULLP;
+   S16               ret = ROK;
+   RgSchCellCb       *cell = NULLP;
+   RgSchCb           *instCb =  &rgSchCb[(pst->dstInst - SCH_INST_START)];
+   CmLList           *node = NULLP;
+   RgSchL2MeasCb     *measCb = NULLP;
    LrgSchMeasCfmInfo measCfm;
-   uint8_t                  idx;
+   uint8_t           idx;
 
    for (idx = 0; idx < instCb->numSaps; idx++)
    {
@@ -385,22 +367,16 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 RgMiLrgSchL2MeasSendReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasSndReqInfo *measInfo /* Meas Req Info */
 )
-#else
-S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
-   Pst               *pst;     /* post structure  */
-   LrgSchMeasSndReqInfo *measInfo; /* Meas Req Info */
-#endif
 {
    S16                 ret = ROK;
    RgSchCellCb         *cell;
    RgSchCb             *instCb =  &rgSchCb[(pst->dstInst - SCH_INST_START)];
-   uint8_t                  idx;
+   uint8_t             idx;
 
    cell = NULLP;
    for (idx = 0; idx < instCb->numSaps; idx++)
@@ -463,19 +439,7 @@ S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgrBndReq
-(
- Pst   *pst, 
- SuId  suId,
- SpId  spId
- )
-#else
-S16 RgUiRgrBndReq(pst, suId, spId)
-   Pst   *pst; 
-   SuId  suId;
-   SpId  spId;
-#endif
+S16 RgUiRgrBndReq(Pst   *pst, SuId  suId, SpId  spId)
 {
    S16       ret = ROK;
    Pst       tmpPst;   /* Temporary Post Structure */
@@ -559,19 +523,7 @@ S16 RgUiRgrBndReq(pst, suId, spId)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgrUbndReq
-(
- Pst    *pst,
- SpId   spId,
- Reason reason
- )
-#else
-S16 RgUiRgrUbndReq(pst, spId, reason)
-   Pst    *pst; 
-   SpId   spId;
-   Reason reason;
-#endif
+S16 RgUiRgrUbndReq(Pst *pst,SpId spId,Reason reason)
 {
    Inst instId = pst->dstInst-SCH_INST_START;
 
@@ -628,25 +580,11 @@ S16 RgUiRgrUbndReq(pst, spId, reason)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgrSiCfgReq
-(
-Pst           *pst, 
-SpId          spId,
-RgrCfgTransId transId,
-RgrSiCfgReqInfo *cfgReqInfo
-)
-#else
-S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo)
-Pst           *pst; 
-SpId          spId;
-RgrCfgTransId transId;
-RgrSiCfgReqInfo *cfgReqInfo;
-#endif
+S16 RgUiRgrSiCfgReq(Pst *pst, SpId  spId,RgrCfgTransId transId,RgrSiCfgReqInfo *cfgReqInfo)
 {
    S16       ret       = ROK;
-   uint8_t        cfmStatus = RGR_CFG_CFM_NOK;
-   uint8_t        prntTrans[RGR_CFG_TRANSID_SIZE+1];
+   uint8_t   cfmStatus = RGR_CFG_CFM_NOK;
+   uint8_t   prntTrans[RGR_CFG_TRANSID_SIZE+1];
    Inst      instId = pst->dstInst-SCH_INST_START;
 
    memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
@@ -740,32 +678,16 @@ else
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgrWarningSiCfgReq
-(
-Pst           *pst, 
-SpId          spId,
-RgrCfgTransId transId,
-RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
-)
-#else
-S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo)
-Pst           *pst; 
-SpId          spId;
-RgrCfgTransId transId;
-RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
-#endif
+S16 RgUiRgrWarningSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrWarningSiCfgReqInfo *warningSiCfgReqInfo)
 {
    Inst     instId = pst->dstInst-SCH_INST_START;
    S16      ret    = ROK;
-   uint8_t       cfmStatus = RGR_CFG_CFM_NOK;
-   uint8_t       prntTrans[RGR_CFG_TRANSID_SIZE+1];
+   uint8_t  cfmStatus = RGR_CFG_CFM_NOK;
+   uint8_t  prntTrans[RGR_CFG_TRANSID_SIZE+1];
 
    memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
 
-
-
    if (warningSiCfgReqInfo == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer "
@@ -855,21 +777,7 @@ else
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgrWarningSiStopReq
-(
-Pst           *pst,
-SpId          spId,
-RgrCfgTransId transId,
-uint8_t            siId
-)
-#else
-S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId)
-Pst           *pst;
-SpId          spId;
-RgrCfgTransId transId;
-uint8_t            siId;
-#endif
+S16 RgUiRgrWarningSiStopReq(Pst *pst,SpId  spId,RgrCfgTransId transId,uint8_t siId)
 {         
    Inst         instId = pst->dstInst-SCH_INST_START;
 
@@ -925,24 +833,10 @@ uint8_t            siId;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 RgUiRgrLoadInfReq
-(
- Pst               *pst,
- SpId              spId,
- RgrCfgTransId     transId,
- RgrLoadInfReqInfo *loadInfReq
- )
-#else
-S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
-   Pst               *pst;
-   SpId              spId;
-   RgrCfgTransId     transId;
-   RgrLoadInfReqInfo *loadInfReq;
-#endif
+S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId  transId,RgrLoadInfReqInfo *loadInfReq)
 {
    S16       ret       = ROK;
-   uint8_t        prntTrans[RGR_CFG_TRANSID_SIZE+1];
+   uint8_t   prntTrans[RGR_CFG_TRANSID_SIZE+1];
    Inst      instId = pst->dstInst-SCH_INST_START;
 
    memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
@@ -1014,28 +908,16 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgMacSchDedBoUpdtReq
-(
-Pst*           pst,
-RgInfDedBoRpt  *boRpt
-)
-#else
-S16 RgMacSchDedBoUpdtReq(pst, boRpt)
-Pst*           pst;
-RgInfDedBoRpt  *boRpt;
-#endif
+S16 RgMacSchDedBoUpdtReq(Pst*  pst,RgInfDedBoRpt  *boRpt)
 {
    RgSchCellCb   *cell;
    RgSchUeCb     *ue;
 #ifdef SCH_STATS
-      RgSchCmnDlUe  *dlUe;
+   RgSchCmnDlUe  *dlUe;
 #endif
 
-
    Inst          inst = (pst->dstInst - SCH_INST_START);
    S16           cellSapId = boRpt->cellSapId;
-
 /*
    RLOG_ARG2(L_DEBUG,DBG_CELLID,boRpt->cellId,"rgMacSchDedBoUpdtReq():"
             " boRpt->rnti = %u  boRpt->lcId = %u",boRpt->rnti, boRpt->lcId);
@@ -1152,17 +1034,7 @@ RgInfDedBoRpt  *boRpt;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgMacSchCmnBoUpdtReq
-(
-Pst*           pst,
-RgInfCmnBoRpt  *boRpt
-)
-#else
-S16 RgMacSchCmnBoUpdtReq(pst, boRpt)
-Pst*           pst;
-RgInfCmnBoRpt  *boRpt;
-#endif
+S16 RgMacSchCmnBoUpdtReq(Pst* pst,RgInfCmnBoRpt  *boRpt)
 {
    RgSchCellCb   *cell;
    Inst          inst = (pst->dstInst - SCH_INST_START);
@@ -1209,17 +1081,7 @@ RgInfCmnBoRpt  *boRpt;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgMacSchUeDelInd
-(
-Pst*             pst,
-RgInfUeDelInd    *ueDelInd
-)
-#else
-S16 RgMacSchUeDelInd(pst, ueDelInd)
-Pst*             pst;
-RgInfUeDelInd    *ueDelInd;
-#endif
+S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd)
 {
    RgSchCellCb       *cell;
    Inst              inst = (pst->dstInst - SCH_INST_START);
@@ -1295,17 +1157,7 @@ RgInfUeDelInd    *ueDelInd;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgMacSchSfRecpInd
-(
-Pst*             pst,
-RgInfSfDatInd    *subfrmInfo
-)
-#else
-S16 RgMacSchSfRecpInd(pst, subfrmInfo)
-Pst*             pst;
-RgInfSfDatInd    *subfrmInfo;
-#endif
+S16 RgMacSchSfRecpInd(Pst*  pst,RgInfSfDatInd *subfrmInfo)
 {
    S16               ret = RFAILED;
    RgSchErrInfo      err;
@@ -1570,17 +1422,7 @@ RgInfSfDatInd    *subfrmInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgMacSchSpsRelInd
-(
-Pst                *pst, 
-RgInfSpsRelInfo    *relInfo
-)
-#else
-S16 RgMacSchSpsRelInd(pst, relInfo)
-Pst                *pst;
-RgInfSpsRelInfo    *relInfo;
-#endif
+S16 RgMacSchSpsRelInd(Pst *pst,RgInfSpsRelInfo *relInfo)
 {
    RgSchUeCb       *ue;
    RgSchCellCb     *cell;
@@ -1630,28 +1472,18 @@ RgInfSpsRelInfo    *relInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgMacSchL2MeasCfm
-(
-Pst                *pst, 
-RgInfL2MeasCfm     *measCfm
-)
-#else
-S16 RgMacSchL2MeasCfm(pst, measCfm)
-Pst                *pst;
-RgInfL2MeasCfm     *measCfm;
-#endif
+S16 RgMacSchL2MeasCfm(Pst *pst, RgInfL2MeasCfm *measCfm)
 {
    RgSchCellCb       *cell = NULLP;
    Inst              inst = (pst->dstInst - SCH_INST_START);
    CmLList           *lnk;
    RgSchL2MeasCb     *measCb = NULLP;
    RgSchCb           *instCb =  &rgSchCb[inst];
-   uint32_t               idx;
+   uint32_t          idx;
    LrgSchMeasCfmInfo schMeasCfm;
-   uint8_t                qciVal;
-   uint8_t                idx1; /*LTE_L2_MEAS_PHASE2*/ 
-   uint8_t                qciVal1;
+   uint8_t           qciVal;
+   uint8_t           idx1; /*LTE_L2_MEAS_PHASE2*/ 
+   uint8_t           qciVal1;
 
    /* Find the cellCb using cellId in measInfo. Iterate through all cells
     * in rgrsapCb in RgschCb */
@@ -1756,17 +1588,7 @@ RgInfL2MeasCfm     *measCfm;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgMacSchL2MeasStopCfm
-(
-Pst                *pst,
-RgInfL2MeasCfm     *measCfm
-)
-#else
-S16 RgMacSchL2MeasStopCfm(pst, measCfm)
-Pst                *pst;
-RgInfL2MeasCfm     *measCfm;
-#endif
+S16 RgMacSchL2MeasStopCfm(Pst *pst,RgInfL2MeasCfm  *measCfm)
 {
    LrgSchMeasCfmInfo schMeasCfm;
    Inst              inst = (pst->dstInst - SCH_INST_START);
@@ -1801,19 +1623,7 @@ RgInfL2MeasCfm     *measCfm;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuSchBndCfm 
-(
-Pst     *pst,
-SuId    suId, 
-uint8_t      status
-)
-#else
-S16 RgLiTfuSchBndCfm(pst, suId, status)
-Pst     *pst; 
-SuId    suId; 
-uint8_t      status;
-#endif
+S16 RgLiTfuSchBndCfm (Pst *pst,SuId suId, uint8_t status)
 {
    S16 ret;
    RgSchLowSapCb  *tfuSap;
@@ -1855,19 +1665,7 @@ uint8_t      status;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuRaReqInd
-(
-Pst              *pst, 
-SuId             suId, 
-TfuRaReqIndInfo  *raReqInd
-)
-#else
-S16 RgLiTfuRaReqInd(pst, suId, raReqInd)
-Pst              *pst; 
-SuId             suId; 
-TfuRaReqIndInfo  *raReqInd;
-#endif
+S16 RgLiTfuRaReqInd(Pst *pst,SuId suId, TfuRaReqIndInfo *raReqInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -1917,19 +1715,7 @@ TfuRaReqIndInfo  *raReqInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuUlCqiInd
-(
-Pst              *pst, 
-SuId             suId, 
-TfuUlCqiIndInfo  *ulCqiInd
-)
-#else
-S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd)
-Pst              *pst; 
-SuId             suId; 
-TfuUlCqiIndInfo  *ulCqiInd;
-#endif
+S16 RgLiTfuUlCqiInd(Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -1972,19 +1758,7 @@ TfuUlCqiIndInfo  *ulCqiInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuPucchDeltaPwrInd
-(
-Pst                     *pst,
-SuId                    suId,
-TfuPucchDeltaPwrIndInfo *pucchDeltaPwr
-)
-#else
-S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr)
-Pst                     *pst;
-SuId                    suId;
-TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
-#endif
+S16 RgLiTfuPucchDeltaPwrInd(Pst *pst,SuId suId,TfuPucchDeltaPwrIndInfo *pucchDeltaPwr)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2028,19 +1802,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuHqInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuHqIndInfo       *harqAckInd
-)
-#else
-S16 RgLiTfuHqInd(pst, suId, harqAckInd)
-Pst                *pst; 
-SuId               suId; 
-TfuHqIndInfo       *harqAckInd;
-#endif
+S16 RgLiTfuHqInd(Pst *pst, SuId suId, TfuHqIndInfo *harqAckInd)
 {
    S16   ret;
    Inst  inst = (pst->dstInst - SCH_INST_START);
@@ -2087,19 +1849,7 @@ TfuHqIndInfo       *harqAckInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuSrInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuSrIndInfo       *srInd
-)
-#else 
-S16 RgLiTfuSrInd(pst, suId, srInd)
-Pst                *pst; 
-SuId               suId; 
-TfuSrIndInfo       *srInd;
-#endif
+S16 RgLiTfuSrInd(Pst *pst, SuId suId, TfuSrIndInfo *srInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2144,19 +1894,7 @@ TfuSrIndInfo       *srInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuDlCqiInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuDlCqiIndInfo    *dlCqiInd
-)
-#else
-S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd)
-Pst                *pst; 
-SuId               suId; 
-TfuDlCqiIndInfo    *dlCqiInd;
-#endif
+S16 RgLiTfuDlCqiInd(Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2199,19 +1937,7 @@ TfuDlCqiIndInfo    *dlCqiInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuRawCqiInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuRawCqiIndInfo    *rawCqiInd
-)
-#else
-S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd)
-Pst                *pst; 
-SuId               suId; 
-TfuRawCqiIndInfo    *rawCqiInd;
-#endif
+S16 RgLiTfuRawCqiInd(Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2255,19 +1981,7 @@ TfuRawCqiIndInfo    *rawCqiInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuSrsInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuSrsIndInfo    *srsInd
-)
-#else
-S16 RgLiTfuSrsInd(pst, suId, srsInd)
-Pst                *pst; 
-SuId               suId; 
-TfuSrsIndInfo    *srsInd;
-#endif
+S16 RgLiTfuSrsInd(Pst *pst, SuId suId, TfuSrsIndInfo *srsInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2311,19 +2025,7 @@ TfuSrsIndInfo    *srsInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuDoaInd 
-(
-Pst                *pst, 
-SuId               suId, 
-TfuDoaIndInfo      *doaInd
-)
-#else
-S16 RgLiTfuDoaInd(pst, suId, doaInd)
-Pst                *pst; 
-SuId               suId; 
-TfuDoaIndInfo      *doaInd;
-#endif
+S16 RgLiTfuDoaInd(Pst *pst, SuId suId, TfuDoaIndInfo *doaInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2363,19 +2065,7 @@ TfuDoaIndInfo      *doaInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuCrcInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuCrcIndInfo  *crcInd
-)
-#else
-S16 RgLiTfuCrcInd (pst, suId, crcInd)
-Pst                *pst; 
-SuId               suId; 
-TfuCrcIndInfo  *crcInd;
-#endif
+S16 RgLiTfuCrcInd(Pst *pst, SuId suId, TfuCrcIndInfo  *crcInd)
 {
    S16              ret;
    Inst             inst      = pst->dstInst-SCH_INST_START;
@@ -2426,19 +2116,7 @@ gettimeofday(&end6, NULL);
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuTimingAdvInd
-(
-Pst                  *pst, 
-SuId                 suId, 
-TfuTimingAdvIndInfo  *timingAdvInd
-)
-#else
-S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd)
-Pst                  *pst; 
-SuId                 suId; 
-TfuTimingAdvIndInfo  *timingAdvInd;
-#endif
+S16 RgLiTfuTimingAdvInd(Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd)
 {
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
@@ -2483,19 +2161,7 @@ TfuTimingAdvIndInfo  *timingAdvInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgmBndReq
-(
-Pst   *pst, 
-SuId  suId,
-SpId  spId
-)
-#else
-S16 RgUiRgmBndReq(pst, suId, spId)
-Pst   *pst; 
-SuId  suId;
-SpId  spId;
-#endif
+S16 RgUiRgmBndReq(Pst *pst,SuId  suId,SpId  spId)
 {
    S16       ret = ROK;
    Pst       tmpPst;   /* Temporary Post Structure */
@@ -2581,19 +2247,7 @@ SpId  spId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgmUbndReq
-(
-Pst    *pst,
-SpId   spId,
-Reason reason
-)
-#else
-S16 RgUiRgmUbndReq(pst, spId, reason)
-Pst    *pst; 
-SpId   spId;
-Reason reason;
-#endif
+S16 RgUiRgmUbndReq(Pst    *pst,SpId   spId,Reason reason)
 {
    Inst instId = pst->dstInst-SCH_INST_START;
 
@@ -2648,19 +2302,7 @@ Reason reason;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgUiRgmCfgPrbRprt
-(
-Pst   *pst, 
-SpId  spId,
-RgmPrbRprtCfg   *prbRprtCfg
-)
-#else
-S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg)
-Pst   *pst; 
-SpId  spId;
-RgmPrbRprtCfg   *prbRprtCfg;
-#endif
+S16 RgUiRgmCfgPrbRprt(Pst   *pst, SpId  spId,RgmPrbRprtCfg *prbRprtCfg)
 {
 /* Initalize*/
    RgSchCellCb   *cell;
@@ -2706,19 +2348,7 @@ RgmPrbRprtCfg   *prbRprtCfg;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuErrInd
-(
-Pst                *pst, 
-SuId               suId, 
-TfuErrIndInfo      *errInd
-)
-#else
-S16 RgLiTfuErrInd(pst, suId, errInd)
-Pst                *pst; 
-SuId               suId; 
-TfuErrIndInfo      *errInd;
-#endif
+S16 RgLiTfuErrInd(Pst *pst, SuId suId, TfuErrIndInfo  *errInd)
 {
    S16   ret = ROK;
 #ifdef LTE_ADV
index 7b37b01..e66826e 100755 (executable)
@@ -477,19 +477,12 @@ S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb  *cell));
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrSchedEnbCfg
 (
 Inst              inst,
 RgrSchedEnbCfg   *schedEnbCfg,
 RgSchErrInfo     *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo)
-Inst              inst;
-RgrSchedEnbCfg   *schedEnbCfg;
-RgSchErrInfo     *errInfo;
-#endif
 {
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR SCH ENB CONFIG: \n"));
 
@@ -552,7 +545,6 @@ RgSchErrInfo     *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrCellCfg
 (
 Inst         inst,
@@ -560,13 +552,6 @@ RgrCellCfg   *cellCfg,
 RgSchCellCb  *cell,
 RgSchErrInfo *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo)
-Inst         inst;
-RgrCellCfg   *cellCfg;
-RgSchCellCb  *cell;
-RgSchErrInfo *errInfo;
-#endif
 {
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_CFG;
 
@@ -836,17 +821,11 @@ RgSchErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrSchCfg
 (
 Inst         inst,
 RgrSchedEnbCfg   *rgSchedCfg
 )
-#else
-S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg)
-Inst         inst;
-RgrSchedCfg   *rgSchedCfg;
-#endif
 {
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Validating \
                scheduler related Configuration"));
@@ -885,17 +864,11 @@ RgrSchedCfg   *rgSchedCfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrCellSchCfg
 (
 Inst         inst,
 RgrCellCfg   *cellCfg
 )
-#else
-S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg)
-Inst         inst;
-RgrCellCfg   *cellCfg;
-#endif
 {
 
 #if RGSCH_NUM_DLFS_SCHEDULERS
@@ -929,17 +902,11 @@ RgrCellCfg   *cellCfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrCellRACfg
 (
 Inst         inst,
 RgrCellCfg   *cellCfg
 )
-#else
-S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg)
-Inst         inst;
-RgrCellCfg   *cellCfg;
-#endif
 {
 
 #ifdef LTE_TDD
@@ -1049,7 +1016,6 @@ RgrCellCfg   *cellCfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeCfg
 (
 Inst         inst,
@@ -1057,13 +1023,6 @@ RgrUeCfg     *ueCfg,
 RgSchCellCb  **cell,
 RgSchErrInfo *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo)
-Inst         inst;
-RgrUeCfg     *ueCfg;
-RgSchCellCb  **cell;
-RgSchErrInfo *errInfo;
-#endif
 {
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_CFG;
 
@@ -1253,7 +1212,6 @@ RgSchErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrCellRecfg
 (
 Inst          inst,
@@ -1261,13 +1219,6 @@ RgrCellRecfg  *cellRecfg,
 RgSchCellCb   **cell,
 RgSchErrInfo  *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo)
-Inst          inst;
-RgrCellRecfg  *cellRecfg;
-RgSchCellCb   **cell;
-RgSchErrInfo  *errInfo;
-#endif
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_RECFG;
@@ -1446,7 +1397,6 @@ RgSchErrInfo  *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHSCellCfgUeCfg
 (
 RgSchCellCb  *cell,
@@ -1454,19 +1404,12 @@ RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
 {
-   uint8_t                  idx;
-   Inst                inst = cell->instIdx;
-   RgSchCellCb         *secCellCb = NULLP;
-   uint8_t                  sCellidx = 0;
-   RgSchUeCellInfo     *sCellInfo = NULLP;
+   uint8_t          idx;
+   Inst             inst = cell->instIdx;
+   RgSchCellCb      *secCellCb = NULLP;
+   uint8_t          sCellidx = 0;
+   RgSchUeCellInfo  *sCellInfo = NULLP;
    RgrUeSecCellCfg  *sCellInfoCfg = NULLP;
 #ifdef TFU_UPGRADE
    RgrUeAprdDlCqiCfg   *aCqiCfg;
@@ -1707,7 +1650,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHSCellCfgUePucchReCfg
 (
 RgSchCellCb  *cell,
@@ -1715,13 +1657,6 @@ RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
 {
    Inst         inst = cell->instIdx;
    RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP;
@@ -1810,7 +1745,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeSCellRecfg
 (
 RgrUeRecfg     *ueRecfg,
@@ -1818,13 +1752,6 @@ RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo)
-RgrUeRecfg     *ueRecfg;
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchErrInfo   *errInfo;
-#endif
 {
    RgrUeSecCellCfg   *ueSCellDedCfg = NULLP;
    RgSchCellCb          *sCell = NULLP;
@@ -1944,19 +1871,12 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHSCellCfgUeCfgRollBack
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg
 )
-#else
-static S16 rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-#endif
 {
    Inst                inst = cell->instIdx;
    RgrUeSecCellCfg  *sCellInfoCfg = NULLP;
@@ -2033,7 +1953,6 @@ RgrUeRecfg   *ueRecfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeRecfg
 (
 Inst           inst,
@@ -2042,14 +1961,6 @@ RgSchCellCb    **cell,
 RgSchUeCb      **ue,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo)
-Inst           inst;
-RgrUeRecfg     *ueRecfg;
-RgSchCellCb    **cell;
-RgSchUeCb      **ue;
-RgSchErrInfo   *errInfo;
-#endif
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RECFG;
@@ -2260,7 +2171,6 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrLchRecfg
 (
 Inst           inst,
@@ -2270,15 +2180,6 @@ RgSchUeCb      **ue,
 RgSchDlLcCb    **dlLc,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo)
-Inst            inst;
-RgrLchRecfg     *lcRecfg;
-RgSchCellCb     **cell;
-RgSchUeCb       **ue;
-RgSchDlLcCb     **dlLc;
-RgSchErrInfo    *errInfo;
-#endif
 {
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LC_RECFG;
 
@@ -2332,7 +2233,6 @@ RgSchErrInfo    *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeReset
 (
 Inst         inst,
@@ -2341,14 +2241,6 @@ RgSchCellCb  *cell,
 RgSchUeCb    **ue,
 RgSchErrInfo *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo)
-Inst         inst;
-RgrRst       *reset;
-RgSchCellCb  *cell;
-RgSchUeCb    **ue;
-RgSchErrInfo *errInfo;
-#endif
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RESET;
@@ -2400,7 +2292,6 @@ RgSchErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrLcgRecfg
 (
 Inst           inst,
@@ -2409,14 +2300,6 @@ RgSchCellCb    *cell,
 RgSchUeCb      **ue,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo)
-Inst            inst;
-RgrLcgRecfg     *lcgRecfg;
-RgSchCellCb     *cell;
-RgSchUeCb       **ue;
-RgSchErrInfo    *errInfo;
-#endif
 {
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LCG_RECFG;
 
@@ -2466,17 +2349,11 @@ RgSchErrInfo    *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHDynCfiCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg
 )
-#else
-static S16 rgSCHDynCfiCfg(cell, cellCfg)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-#endif  
 {
    uint8_t        cfi; 
 #ifdef LTE_TDD
@@ -2595,7 +2472,6 @@ RgrCellCfg    *cellCfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrSchedEnbCfg
 (
 Inst            inst,
@@ -2603,13 +2479,6 @@ SpId            spId,
 RgrSchedEnbCfg *schedEnbCfg,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo)
-Inst             inst,
-SpId             spId;
-RgrSchedEnbCfg  *schedEnbCfg;
-RgSchErrInfo    *errInfo;
-#endif
 {
 
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "APPLYING RGR SCH ENB CONFIG: \n"));
@@ -2650,17 +2519,11 @@ RgSchErrInfo    *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCH5gtfCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg
 )
-#else
-S16 rgSCH5gtfCellCfg(cell, cellCfg)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-#endif
 {
    uint8_t           idx;
 
@@ -2712,7 +2575,6 @@ uint16_t gWrMaxUlItbs;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrCellCfg
 (
 RgSchCb       *instCb,
@@ -2720,13 +2582,6 @@ SpId          spId,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *errInfo
 )
-#else
-S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo)
-RgSchCb       *instCb;
-SpId           spId;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *errInfo;
-#endif
 {
    S16          ret;
    uint8_t           idx;
@@ -3094,19 +2949,12 @@ RgSchErrInfo  *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrUeCfg
 (
 RgSchCellCb  *cell,
 RgrUeCfg     *ueCfg,
 RgSchErrInfo *errInfo
 )
-#else
-S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo)
-RgSchCellCb  *cell;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *errInfo;
-#endif
 {
    S16          ret;
    RgSchRaCb    *raCb=NULLP;
@@ -3490,7 +3338,6 @@ RgSchErrInfo *errInfo;
  *  @param[in]  RgSchRaCb    *raCb
  *  @param[out] RgSchErrInfo *errInfo
  **/
-#ifdef ANSI
 static Void rgSCHCfgRgrUePhrMsg3
 (
 RgSchCellCb  *cell,
@@ -3498,13 +3345,6 @@ RgSchRaCb    *raCb,
 RgSchUeCb    *ue,
 RgSchErrInfo *errInfo
 )
-#else
-static Void rgSCHCfgRgrUePhrMsg3(cell, raCb, ue, errInfo)
-RgSchCellCb  *cell;
-RgSchRaCb    *raCb;
-RgSchUeCb    *ue;
-RgSchErrInfo *errInfo;
-#endif
 {
 
    /* Record msg3 allocation in the UE */
@@ -3532,17 +3372,11 @@ RgSchErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 Void rgSCHDynCfiReCfg
 (
 RgSchCellCb   *cell,
 Bool          isDynCfiEnb
 )
-#else
-Void rgSCHDynCfiReCfg(cell, isDynCfiEnb)
-RgSchCellCb   *cell;
-Bool          isDynCfiEnb;
-#endif 
 {            
    uint8_t                idx;
    RgSchCmnDlCell    *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -3590,19 +3424,12 @@ Bool          isDynCfiEnb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrCellRecfg
 (
 RgSchCellCb   *cell,
 RgrCellRecfg  *cellRecfg,
 RgSchErrInfo  *errInfo
 )
-#else
-S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo)
-RgSchCellCb   *cell;
-RgrCellRecfg  *cellRecfg;
-RgSchErrInfo  *errInfo;
-#endif
 {
    S16      ret;
    Inst    inst = cell->instIdx;
@@ -3860,7 +3687,6 @@ RgSchErrInfo  *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHCfgRgrUeRecfgRntiChg
 (
 RgSchCellCb    *cell,
@@ -3868,13 +3694,6 @@ RgSchUeCb      *ue,
 RgrUeRecfg     *ueRecfg,
 RgSchErrInfo   *errInfo
 )
-#else
-static S16 rgSCHCfgRgrUeRecfgRntiChg(cell, ue, ueRecfg, errInfo)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrUeRecfg     *ueRecfg;
-RgSchErrInfo   *errInfo;
-#endif
 {
 #ifdef LTE_ADV
    uint8_t          sCellIdx;
@@ -4074,7 +3893,6 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrUeRecfg
 (
 RgSchCellCb    *cell,
@@ -4082,13 +3900,6 @@ RgSchUeCb      *ue,
 RgrUeRecfg     *ueRecfg,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrUeRecfg     *ueRecfg;
-RgSchErrInfo   *errInfo;
-#endif
 {
    S16          ret;
 #ifdef LTE_ADV
@@ -4339,7 +4150,6 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrLchRecfg
 (
 RgSchCellCb    *cell,
@@ -4348,14 +4158,6 @@ RgSchDlLcCb    *dlLc,
 RgrLchRecfg    *lcRecfg,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchDlLcCb    *dlLc;
-RgrLchRecfg    *lcRecfg;
-RgSchErrInfo   *errInfo;
-#endif
 {
    S16     ret = ROK;
 
@@ -4394,7 +4196,6 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrLcgRecfg
 (
 RgSchCellCb    *cell,
@@ -4402,13 +4203,6 @@ RgSchUeCb      *ue,
 RgrLcgRecfg    *lcgRecfg,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrLcgRecfg    *lcgRecfg;
-RgSchErrInfo   *errInfo;
-#endif
 {
    S16     ret = ROK;
 
@@ -4450,7 +4244,6 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrUeReset
 (
 RgSchCellCb    *cell,
@@ -4458,13 +4251,6 @@ RgSchUeCb      *ue,
 RgrRst         *reset,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrRst         *reset;
-RgSchErrInfo   *errInfo;
-#endif
 {
    uint32_t     idx;
    RgSchRaCb *raCb;
@@ -4559,19 +4345,12 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrCellDel
 (
 RgSchCellCb    *cell,
 RgrDel         *cellDelInfo,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo)
-RgSchCellCb    *cell;
-RgrDel         *cellDelInfo;
-RgSchErrInfo   *errInfo;
-#endif
 { 
 
    errInfo->errCause = RGSCHERR_CFG_RGR_CELL_DEL;
@@ -4611,19 +4390,12 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrUeDel
 (
 RgSchCellCb         *cell,
 RgrDel              *ueDelInfo,
 RgSchErrInfo        *errInfo
 )
-#else
-S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo)
-RgSchCellCb         *cell;
-RgrDel              *ueDelInfo;
-RgSchErrInfo        *errInfo;
-#endif
 {
    RgSchUeCb        *ue;
    RgSchRaCb        *raCb;
@@ -4753,19 +4525,12 @@ RgSchErrInfo        *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrLcDel
 (
 RgSchCellCb    *cell,
 RgrDel         *lcDelInfo,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo)
-RgSchCellCb    *cell;
-RgrDel         *lcDelInfo;
-RgSchErrInfo   *errInfo;
-#endif
 {
    RgSchUeCb    *ue;
    RgSchDlLcCb  *dlLc;
@@ -4879,19 +4644,12 @@ RgSchErrInfo   *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgRgrLcgDel
 (
 RgSchCellCb    *cell,
 RgrDel         *lcDelInfo,
 RgSchErrInfo   *errInfo
 )
-#else
-S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo)
-RgSchCellCb    *cell;
-RgrDel         *lcDelInfo;
-RgSchErrInfo   *errInfo;
-#endif
 {
    RgSchUeCb    *ue = NULLP;
 #ifdef LTE_L2_MEAS
@@ -4972,7 +4730,6 @@ RgSchErrInfo   *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrLcCfg
 (
 Inst             inst,
@@ -4981,14 +4738,6 @@ RgSchCellCb      **cell,
 RgSchUeCb        **ue,
 RgSchErrInfo     *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo)
-Inst             inst;
-RgrLchCfg     *lcCfg;
-RgSchCellCb      **cell;
-RgSchUeCb        **ue;
-RgSchErrInfo     *errInfo;
-#endif
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LC_CFG;
@@ -5044,7 +4793,6 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrLcgCfg
 (
 Inst             inst,
@@ -5053,14 +4801,6 @@ RgSchCellCb      **cell,
 RgSchUeCb        **ue,
 RgSchErrInfo     *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo)
-Inst             inst;
-RgrLcgCfg        *lcgCfg;
-RgSchCellCb      **cell;
-RgSchUeCb        **ue;
-RgSchErrInfo     *errInfo;
-#endif
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LCG_CFG;
@@ -5105,19 +4845,12 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtRgrCellPwrCfg
 (
 Inst             inst,
 RgrCellCfg       *cellCfg,
 RgSchErrInfo     *errInfo
 )
-#else
-static S16 rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo)
-Inst             inst;
-RgrCellCfg       *cellCfg;
-RgSchErrInfo     *errInfo;
-#endif
 {
    UNUSED(inst);
    UNUSED(cellCfg);
@@ -5150,19 +4883,12 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtRgrCmnLcCfg
 (
 Inst             inst,
 RgrCellCfg       *cellCfg,
 RgSchErrInfo     *errInfo
 )
-#else
-static S16 rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo)
-Inst             inst;
-RgrCellCfg       *cellCfg;
-RgSchErrInfo     *errInfo;
-#endif
 {
    uint8_t            idx;
    RgrCmnLchCfg  *lcCfg; 
@@ -5285,17 +5011,11 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUeCqiModeCfg
 (
 RgSchCellCb       *cell,
 RgrUeDlCqiCfg     *ueDlCqiCfg
 )
-#else
-static S16 rgSCHCfgVldtUeCqiModeCfg(cell, ueDlCqiCfg)
-RgSchCellCb       *cell;
-RgrUeDlCqiCfg     *ueDlCqiCfg;
-#endif
 {
    
 #ifndef TFU_UPGRADE
@@ -5367,17 +5087,11 @@ RgrUeDlCqiCfg     *ueDlCqiCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg
 (
 RgSchCellCb       *cell,
 RgrUeCfg          *ueCfg
 )
-#else
-static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg(cell, ueCfg)
-RgSchCellCb       *cell;
-RgrUeCfg          *ueCfg;
-#endif
 {
 
 #ifdef LTE_TDD
@@ -5456,17 +5170,11 @@ RgrUeCfg          *ueCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg
 (
 RgSchCellCb       *cell,
 RgrUeRecfg        *ueRecfg
 )
-#else
-static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg(cell, ueRecfg)
-RgSchCellCb       *cell;
-RgrUeRecfg        *ueRecfg;
-#endif
 {
 
    if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) &&
@@ -5535,17 +5243,11 @@ RgrUeRecfg        *ueRecfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUeDlSpsCfg
 (
 RgSchCellCb       *cell,
 RgrUeSpsDlCfg     *dlSpsCfg
 )
-#else
-static S16 rgSCHCfgVldtUeDlSpsCfg(cell, dlSpsCfg)
-RgSchCellCb       *cell;
-RgrUeSpsDlCfg     *dlSpsCfg;
-#endif
 {
 
    uint8_t                 idx = 0;
@@ -5602,17 +5304,11 @@ RgrUeSpsDlCfg     *dlSpsCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUePwrCfg
 (
 RgSchCellCb       *cell,
 RgrUeUlPwrCfg     *pwrCfg
 )
-#else
-static S16 rgSCHCfgVldtUePwrCfg(cell, pwrCfg)
-RgSchCellCb       *cell;
-RgrUeUlPwrCfg     *pwrCfg;
-#endif
 {
 
    /* Group power control works only in accumulated mode */
@@ -5659,17 +5355,11 @@ RgrUeUlPwrCfg     *pwrCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtUeGrpPwrCfg
 (
 RgSchCellCb       *cell,
 RgrUeGrpPwrCfg *grpPwrCfg
 )
-#else
-static S16 rgSCHCfgVldtUeGrpPwrCfg(cell, grpPwrCfg)
-RgSchCellCb       *cell;
-RgrUeGrpPwrCfg *grpPwrCfg;
-#endif
 {
 
    if ((grpPwrCfg->pres) &&
@@ -5703,19 +5393,12 @@ RgrUeGrpPwrCfg *grpPwrCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtSpsReCfg
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ue,
 RgrUeRecfg        *ueRecfg
 )
-#else
-static S16 rgSCHCfgVldtSpsReCfg(cell, ue, ueRecfg)
-RgSchCellCb       *cell;
-RgSchUeCb         *ue;
-RgrUeRecfg     *ueRecfg;
-#endif
 {
 
    if ((ueRecfg->ueRecfgTypes & RGR_UE_DLSPS_RECFG) &&
@@ -5802,17 +5485,11 @@ RgrUeRecfg     *ueRecfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtCqiReptReCfg
 (
 RgSchCellCb       *cell,
 RgrUeRecfg     *ueRecfg
 )
-#else
-static S16 rgSCHCfgVldtCqiReptReCfg(cell, ueRecfg)
-RgSchCellCb       *cell;
-RgrUeRecfg     *ueRecfg;
-#endif
 {
 
    /* Validate DL Power Control Config parameters */
@@ -5845,7 +5522,6 @@ RgrUeRecfg     *ueRecfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHCfgRgrLchCfg
 (
 RgSchCellCb      *cell,
@@ -5853,13 +5529,6 @@ RgSchUeCb        *ue,
 RgrLchCfg     *lcCfg,
 RgSchErrInfo     *errInfo
 )
-#else
-S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-RgrLchCfg     *lcCfg;
-RgSchErrInfo     *errInfo;
-#endif
 {
    S16       ret;
    RgSchDlLcCb  *dlLc = NULLP;
@@ -5968,7 +5637,6 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHCfgRgrLcgCfg
 (
 RgSchCellCb      *cell,
@@ -5976,13 +5644,6 @@ RgSchUeCb        *ue,
 RgrLcgCfg        *lcgCfg,
 RgSchErrInfo     *errInfo
 )
-#else
-S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-RgrLcgCfg        *lcgCfg;
-RgSchErrInfo     *errInfo;
-#endif
 {
    S16          ret = ROK;
 
@@ -6061,19 +5722,12 @@ RgSchErrInfo     *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgRgrCmnLcCfg
 (
 RgSchCellCb           *cell,
 RgrCmnLchCfg          *lcCfg,
 RgSchErrInfo          *errInfo
 )
-#else
-static S16 rgSCHCfgRgrCmnLcCfg(cell, lcCfg, errInfo)
-RgSchCellCb         *cell;
-RgrCmnLchCfg        *lcCfg;
-RgSchErrInfo        *errInfo;
-#endif
 {
    RgSchClcDlLcCb cmnLcCb;
 
@@ -6138,19 +5792,12 @@ RgSchErrInfo        *errInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgFreeDlDedLcCb
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
 RgSchDlLcCb      *dlLc
 )
-#else
-static Void rgSCHCfgFreeDlDedLcCb(cell, ue, dlLc)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-RgSchDlLcCb      *dlLc;
-#endif
 {
    Inst    inst = cell->instIdx;
 
@@ -6184,15 +5831,7 @@ RgSchDlLcCb      *dlLc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCfgFreeDlCmnLcCb
-(
-RgSchClcDlLcCb   *cmnDlLc
-)
-#else
-static Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc)
-RgSchClcDlLcCb      *cmnDlLc;
-#endif
+static Void rgSCHCfgFreeDlCmnLcCb(RgSchClcDlLcCb   *cmnDlLc)
 {
  
    memset(cmnDlLc, 0, sizeof(*cmnDlLc));
@@ -6217,15 +5856,7 @@ RgSchClcDlLcCb      *cmnDlLc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCfgFreeCellCb
-(
-RgSchCellCb      *cell
-)
-#else
-Void rgSCHCfgFreeCellCb(cell)
-RgSchCellCb      *cell;
-#endif
+Void rgSCHCfgFreeCellCb(RgSchCellCb      *cell)
 {
    Inst    inst = cell->instIdx;
    CmLList            *node;
@@ -6337,17 +5968,11 @@ RgSchCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgFreeUeCb
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
-#else
-static Void rgSCHCfgFreeUeCb(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    RgUeUlHqCb       *ulHqEnt;
@@ -6464,15 +6089,10 @@ RgSchUeCb      *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgFreeRgrCfgLst
 (
 RgSchCellCb      *cell
 )
-#else
-static Void rgSCHCfgFreeRgrCfgLst(cell)
-RgSchCellCb      *cell;
-#endif
 {
    RgSchCfgElem  *rgCfgElem;
    Inst    inst = cell->instIdx;
@@ -6518,15 +6138,10 @@ RgSchCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgFreeCmnLcLst
 (
 RgSchCellCb      *cell
 )
-#else
-static Void rgSCHCfgFreeCmnLcLst(cell)
-RgSchCellCb      *cell;
-#endif
 {
    RgSchClcDlLcCb *dlCmnLc;
 
@@ -6571,15 +6186,10 @@ RgSchCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgFreeUeLst
 (
 RgSchCellCb      *cell
 )
-#else
-static Void rgSCHCfgFreeUeLst(cell)
-RgSchCellCb      *cell;
-#endif
 {
    RgSchUeCb     *ue;
 #ifdef LTE_ADV
@@ -6641,15 +6251,7 @@ RgSchCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCfgFreeSpsUeLst
-(
-RgSchCellCb      *cell
-)
-#else
-static Void rgSCHCfgFreeSpsUeLst(cell)
-RgSchCellCb      *cell;
-#endif
+static Void rgSCHCfgFreeSpsUeLst(RgSchCellCb *cell)
 {
    RgSchUeCb     *ue;
 
@@ -6682,17 +6284,11 @@ RgSchCellCb      *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtRgrCellSiCfg
 (
 Inst             inst,
 RgrSiCfg         *siCfg
 )
-#else
-static S16 rgSCHCfgVldtRgrCellSiCfg(inst, siCfg)
-Inst             inst;
-RgrSiCfg       *siCfg;
-#endif
 {
    uint8_t   idx; /* idx for iteration */
 
@@ -6761,19 +6357,12 @@ RgrSiCfg       *siCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtRgrCellLteAdvCfg
 (
- Inst                     inst,
- RgrLteAdvancedCellConfig *lteAdvCfg,
- uint8_t                       dlTotalBw  
- )
-#else
-static S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw)
-   Inst                     inst;
-   RgrLteAdvancedCellConfig *lteAdvCfg;
-   uint8_t                       dlTotalBw;  
-#endif
+Inst                     inst,
+RgrLteAdvancedCellConfig *lteAdvCfg,
+uint8_t                       dlTotalBw  
+)
 {
    uint8_t temp[RGR_ABS_PATTERN_LEN];
    uint32_t idx;
@@ -6844,17 +6433,11 @@ static S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtRgrCellCsgParamCfg
 (
 Inst                     inst,
 RgrCellCsgParamCfg       *csgParam
 )
-#else
-static S16 rgSCHCfgVldtRgrCellCsgParamCfg(inst, csgParam)
-Inst                     inst;
-RgrCellCsgParamCfg       *csgParam;
-#endif
 {
 
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "Validating CSG Parameters \n"));
@@ -6897,7 +6480,6 @@ RgrCellCsgParamCfg       *csgParam;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrSiCfg
 (
 Inst         inst,
@@ -6905,13 +6487,6 @@ RgrSiCfgReqInfo *siCfg,
 RgSchCellCb      *cell,
 RgSchErrInfo *errInfo
 )
-#else
-S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo)
-Inst         inst;
-RgrSiCfgReqInfo *siCfg;
-RgSchCellCb      *cell;
-RgSchErrInfo *errInfo;
-#endif
 {
    MsgLen  msgLen = 0;
    uint8_t      numSi;
@@ -7029,21 +6604,13 @@ RgSchErrInfo *errInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrLoadInf
 (
- Inst              inst,
- RgrLoadInfReqInfo *loadInfReq,
- RgSchCellCb       *cell,
- RgSchErrInfo      *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
-   Inst              inst;
-   RgrLoadInfReqInfo *loadInfReq;
-   RgSchCellCb       *cell;
-   RgSchErrInfo      *errInfo;
-#endif
+Inst              inst,
+RgrLoadInfReqInfo *loadInfReq,
+RgSchCellCb       *cell,
+RgSchErrInfo      *errInfo
+)
 {
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LOAD_INF;
@@ -7101,21 +6668,13 @@ S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrTxmodePuschMode 
 (
- RgSchCellCb     *cellCb,
- RgrTxMode       txMde,
- RgrAprdCqiMode  puschMode,
- RgSchErrInfo    *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo)
-   RgSchCellCb     *cellCb;
-   RgrTxMode       txMde;
-   RgrAprdCqiMode  puschMode;
-   RgSchErrInfo    *errInfo;
-#endif
+RgSchCellCb     *cellCb,
+RgrTxMode       txMde,
+RgrAprdCqiMode  puschMode,
+RgSchErrInfo    *errInfo
+)
 {
 
    if (txMde == RGR_UE_TM_1 ||  txMde == RGR_UE_TM_2 ||
@@ -7185,23 +6744,14 @@ S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeACqiCfg 
 (
- RgSchCellCb        *cellCb,
- CmLteRnti          crnti,  
- RgrUeAprdDlCqiCfg  *acqiCfg,  
- RgrUeTxModeCfg     txMode,
- RgSchErrInfo       *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
-   RgSchCellCb        *cellCb;
-   CmLteRnti          crnti; 
-   RgrUeAprdDlCqiCfg  *acqiCfg;
-   RgrUeTxModeCfg     txMode;
-   RgSchErrInfo       *errInfo;
-#endif
+RgSchCellCb        *cellCb,
+CmLteRnti          crnti,  
+RgrUeAprdDlCqiCfg  *acqiCfg,  
+RgrUeTxModeCfg     txMode,
+RgSchErrInfo       *errInfo
+)
 {
    RgrTxMode      txMde;
    RgrAprdCqiMode puschMode; 
@@ -7247,21 +6797,13 @@ S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrTxmodePucchMode 
 (
-   RgSchCellCb     *cellCb,
-   RgrTxMode       txMde,
-   RgrPrdCqiMode   pucchMode,
-   RgSchErrInfo    *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo)
-   RgSchCellCb     *cellCb;
-   RgrTxMode       txMde;
-   RgrPrdCqiMode   pucchMode;
-   RgSchErrInfo    *errInfo;
-#endif
+RgSchCellCb     *cellCb,
+RgrTxMode       txMde,
+RgrPrdCqiMode   pucchMode,
+RgSchErrInfo    *errInfo
+)
 {
 
   if (pucchMode == RGR_PRD_CQI_MOD10 || pucchMode == RGR_PRD_CQI_MOD20 )
@@ -7308,44 +6850,24 @@ S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo)
  *      -# RFAILED
  */
 #ifdef LTEMAC_HDFDD
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUePCqiCfg 
 (
- RgSchCellCb        *cellCb,
- CmLteRnti          crnti,  
- RgrUePrdDlCqiCfg   *cqiCfg,
- Bool               hdFdd,
- RgrUeTxModeCfg     txMode,
- RgSchErrInfo       *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, 
-       txMode, errInfo)
-   RgSchCellCb        *cellCb;
-   CmLteRnti          crnti; 
-   RgrUePrdDlCqiCfg   *cqiCfg;
-   Bool               hdFdd;
-   RgrUeTxModeCfg     txMode;
-   RgSchErrInfo       *errInfo;
-#endif
+RgSchCellCb        *cellCb,
+CmLteRnti          crnti,  
+RgrUePrdDlCqiCfg   *cqiCfg,
+Bool               hdFdd,
+RgrUeTxModeCfg     txMode,
+RgSchErrInfo       *errInfo
+)
 #else
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUePCqiCfg 
-   (
-    RgSchCellCb        *cellCb,
-    CmLteRnti          crnti,  
-    RgrUePrdDlCqiCfg   *cqiCfg,  
-    RgrUeTxModeCfg     txMode,
-    RgSchErrInfo       *errInfo
-   )
-#else
-S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
-   RgSchCellCb        *cellCb;
-   CmLteRnti          crnti; 
-   RgrUePrdDlCqiCfg   *cqiCfg;
-   RgrUeTxModeCfg     txMode;
-   RgSchErrInfo       *errInfo;
-#endif
+(
+RgSchCellCb        *cellCb,
+CmLteRnti          crnti,  
+RgrUePrdDlCqiCfg   *cqiCfg,  
+RgrUeTxModeCfg     txMode,
+RgSchErrInfo       *errInfo
+)
 #endif
 {
    RgrTxMode     txMde; 
@@ -7531,7 +7053,6 @@ S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
  *      -# RFAILED
  */
 #ifdef LTEMAC_HDFDD
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeUlSrsCfg 
 (
  RgSchCellCb       *cellCb,
@@ -7541,29 +7062,13 @@ S16 rgSCHCfgVldtRgrUeUlSrsCfg
  RgSchErrInfo      *errInfo
  )
 #else
-S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo)
-   RgSchCellCb     *cellCb;
-   CmLteRnti       crnti; 
-   RgrUeUlSrsCfg   *srsCfg;
-   Bool            hdFdd;
-   RgSchErrInfo    *errInfo;
-#endif
-#else
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeUlSrsCfg 
 (
- RgSchCellCb       *cellCb,
- CmLteRnti         crnti,  
- RgrUeUlSrsCfg     *srsCfg,  
- RgSchErrInfo      *errInfo
- )
-#else
-S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
-   RgSchCellCb     *cellCb;
-   CmLteRnti       crnti; 
-   RgrUeUlSrsCfg   *srsCfg;
-   RgSchErrInfo    *errInfo;
-#endif
+RgSchCellCb       *cellCb,
+CmLteRnti         crnti,  
+RgrUeUlSrsCfg     *srsCfg,  
+RgSchErrInfo      *errInfo
+)
 #endif
 {
    uint16_t    srsPeri=0;
@@ -7693,7 +7198,6 @@ S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
  *      -# RFAILED
  */
 #ifdef LTEMAC_HDFDD 
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeSrCfg 
 (
  RgSchCellCb      *cellCb,
@@ -7703,15 +7207,6 @@ S16 rgSCHCfgVldtRgrUeSrCfg
  RgSchErrInfo     *errInfo
  )
 #else
-S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo)
-   RgSchCellCb    *cellCb;
-   CmLteRnti      crnti; 
-   RgrUeSrCfg     *srCfg;
-   Bool           hdFdd;
-   RgSchErrInfo   *errInfo;
-#endif
-#else
-#ifdef ANSI
 S16 rgSCHCfgVldtRgrUeSrCfg 
 (
  RgSchCellCb      *cellCb,
@@ -7719,13 +7214,6 @@ S16 rgSCHCfgVldtRgrUeSrCfg
  RgrUeSrCfg       *srCfg,  
  RgSchErrInfo     *errInfo
  )
-#else
-S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo)
-   RgSchCellCb    *cellCb;
-   CmLteRnti      crnti; 
-   RgrUeSrCfg     *srCfg;
-   RgSchErrInfo   *errInfo;
-#endif
 #endif
 {
 
@@ -7800,19 +7288,12 @@ S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 static S16 rgSCHCfgVldtCqiSrSrsUeCfg 
 (
- RgSchCellCb       *cellCb,  
- RgrUeCfg          *ueCfg,  
- RgSchErrInfo      *errInfo
- )
-#else
-static S16  rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg,  errInfo)
-   RgSchCellCb     *cellCb;  
-   RgrUeCfg        *ueCfg;
-   RgSchErrInfo    *errInfo;
-#endif
+RgSchCellCb       *cellCb,  
+RgrUeCfg          *ueCfg,  
+RgSchErrInfo      *errInfo
+)
 {
 
    /*  1. Validate UE Aperiodic CQI related parameters */
@@ -7901,21 +7382,13 @@ static S16  rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg,  errInfo)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 static S16 rgSCHCfgVldtCqiSrSrsUeReCfg 
 (
- RgSchCellCb          *cellCb,
- RgSchUeCb            *ueCb,
- RgrUeRecfg           *ueReCfg,  
- RgSchErrInfo         *errInfo
- )
-#else
-static S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo)
-   RgSchCellCb          *cellCb;  
-   RgSchUeCb            *ueCb;
-   RgrUeRecfg           *ueReCfg;
-   RgSchErrInfo         *errInfo;
-#endif
+RgSchCellCb          *cellCb,
+RgSchUeCb            *ueCb,
+RgrUeRecfg           *ueReCfg,  
+RgSchErrInfo         *errInfo
+)
 {
    RgrUeTxModeCfg     txMode;
 
@@ -8028,7 +7501,6 @@ static S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo)
     *      -# ROK
     *
     **/
-#ifdef ANSI
 S16 rgSCHCfgACqiUeCfg
 (
 RgSchCellCb        *cellCb, 
@@ -8038,15 +7510,6 @@ RgrTxMode           ueTxMode,
 RgrUeAprdDlCqiCfg  *aCqiCfg,
 CmLteUeCategory     ueCat
 )
-#else
-S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat)
-RgSchCellCb       *cellCb; 
-RgSchUeCb          *ue; 
-RgSchUeACqiCb     *acqiCb;
-RgrTxMode          ueTxMode;
-RgrUeAprdDlCqiCfg *aCqiCfg;
-CmLteUeCategory   ueCat;
-#endif
 {
    uint8_t     M;  /*Num of Subbands -- Applicable only for Mode 2-0 and 2-2*/
    uint8_t     k;  /*SubBand Size (RB)  -- 
@@ -8165,21 +7628,13 @@ CmLteUeCategory   ueCat;
  *      -# ROK
  *
  **/
-#ifdef ANSI
 S16 rgSCHCfgPCqiUeCfg
 (
- RgSchCellCb         *cellCb, 
- RgSchUeCb           *ueCb, 
- RgrUePrdDlCqiCfg    *cqiCfg,
- CmLteUeCategory     ueCat
- )
-#else
-S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
-   RgSchCellCb       *cellCb; 
-   RgSchUeCb         *ueCb; 
-   RgrUePrdDlCqiCfg  *cqiCfg;
-   CmLteUeCategory   ueCat;
-#endif
+RgSchCellCb         *cellCb, 
+RgSchUeCb           *ueCb, 
+RgrUePrdDlCqiCfg    *cqiCfg,
+CmLteUeCategory     ueCat
+)
 {  
    CmLteTimingInfo timingInfo;
    uint16_t    crntTime;           
@@ -8338,21 +7793,13 @@ S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
  *      -# ROK
  *
  **/
-#ifdef ANSI
 S16 rgSCHCfgRiUeCfg
 (
- RgSchCellCb        *cellCb, 
- RgSchUeCb          *ueCb, 
- RgrUePrdDlCqiCfg   *cqiCfg,
- CmLteUeCategory    ueCat
- )
-#else
-S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
-   RgSchCellCb       *cellCb; 
-   RgSchUeCb         *ueCb; 
-   RgrUePrdDlCqiCfg  *cqiCfg;
-   CmLteUeCategory   ueCat;
-#endif
+RgSchCellCb        *cellCb, 
+RgSchUeCb          *ueCb, 
+RgrUePrdDlCqiCfg   *cqiCfg,
+CmLteUeCategory    ueCat
+)
 {
    uint16_t     crntTime;  
    uint16_t     riTrInsTime;  
@@ -8520,19 +7967,12 @@ S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgSrsUeCfg
 (
- RgSchCellCb     *cellCb,
- RgSchUeCb       *ueCb,
- RgrUeUlSrsCfg   *srsCfg 
- )
-#else
-S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
-   RgSchCellCb     *cellCb;
-   RgSchUeCb       *ueCb;
-   RgrUeUlSrsCfg   *srsCfg;
-#endif
+RgSchCellCb     *cellCb,
+RgSchUeCb       *ueCb,
+RgrUeUlSrsCfg   *srsCfg 
+)
 {
    uint16_t      srsTrInsTime;
    uint16_t      crntTime;  
@@ -8667,19 +8107,12 @@ S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgSrUeCfg
 (
- RgSchCellCb      *cellCb,
- RgSchUeCb        *ueCb,
- RgrUeSrCfg       *srCfg
- )
-#else
-S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
-   RgSchCellCb    *cellCb;
-   RgSchUeCb      *ueCb;
-   RgrUeSrCfg     *srCfg;
-#endif
+RgSchCellCb      *cellCb,
+RgSchUeCb        *ueCb,
+RgrUeSrCfg       *srCfg
+)
 {
    uint16_t     srTrInsTime;
    uint16_t     crntTime;
@@ -8807,21 +8240,13 @@ S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
  *      -# ROK
  *
  */
-#ifdef ANSI
 S16 rgSCHCfgPCqiUeReCfg
 (
- RgSchCellCb        *cellCb, 
- RgSchUeCb          *ueCb, 
- RgrUePrdDlCqiCfg   *cqiCfg,
- CmLteUeCategory      ueCat
- )
-#else
-S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
-   RgSchCellCb       *cellCb; 
-   RgSchUeCb         *ueCb; 
-   RgrUePrdDlCqiCfg  *cqiCfg;
-   CmLteUeCategory  ueCat;
-#endif
+RgSchCellCb        *cellCb, 
+RgSchUeCb          *ueCb, 
+RgrUePrdDlCqiCfg   *cqiCfg,
+CmLteUeCategory      ueCat
+)
 {
 
    RgSchUePCqiCb *cqiCb = NULLP;
@@ -8921,19 +8346,12 @@ S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgSrsUeReCfg
 (
- RgSchCellCb        *cellCb, 
- RgSchUeCb          *ueCb, 
- RgrUeUlSrsCfg      *srsCfg
- )
-#else
-S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg)
-   RgSchCellCb      *cellCb; 
-   RgSchUeCb        *ueCb; 
-   RgrUeUlSrsCfg    *srsCfg;
-#endif
+RgSchCellCb        *cellCb, 
+RgSchUeCb          *ueCb, 
+RgrUeUlSrsCfg      *srsCfg
+)
 {
 
 
@@ -9017,19 +8435,12 @@ S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgSrUeReCfg
 (
- RgSchCellCb    *cellCb, 
- RgSchUeCb      *ueCb, 
- RgrUeSrCfg     *srCfg
- )
-#else
-S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg)
-   RgSchCellCb   *cellCb; 
-   RgSchUeCb     *ueCb; 
-   RgrUeSrCfg    *srCfg;
-#endif
+RgSchCellCb    *cellCb, 
+RgSchUeCb      *ueCb, 
+RgrUeSrCfg     *srCfg
+)
 {
 
    /* Fix : syed Incorrect check for SR RECFG */
@@ -9098,21 +8509,13 @@ S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg)
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHCfgAcqiUeReCfg
 (
- RgSchCellCb    *cellCb, 
- RgSchUeCb      *ueCb, 
- RgrUeAprdDlCqiCfg   *acqiCfg,
- CmLteUeCategory   ueCat
- )
-#else
-S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat)
-   RgSchCellCb   *cellCb; 
-   RgSchUeCb     *ueCb; 
-   RgrUeAprdDlCqiCfg   *acqiCfg;
-   CmLteUeCategory   ueCat;
-#endif
+RgSchCellCb    *cellCb, 
+RgSchUeCb      *ueCb, 
+RgrUeAprdDlCqiCfg   *acqiCfg,
+CmLteUeCategory   ueCat
+)
 {
 
    return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb))
@@ -9158,17 +8561,11 @@ S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat)
  *  @return  S16
  *      -# ROK
  */
-#ifdef ANSI
 S16 rgSCHCfgPCqiSrsSrUeDel 
 (
- RgSchCellCb      *cellCb,
- RgSchUeCb        *ueCb
- )
-#else
-S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
-   RgSchCellCb    *cellCb;
-   RgSchUeCb      *ueCb;
-#endif
+RgSchCellCb      *cellCb,
+RgSchUeCb        *ueCb
+)
 {
 #ifdef LTE_ADV
    uint32_t cellIdx;
@@ -9278,21 +8675,13 @@ S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
  *      -# ROK
  *
  */
-#ifdef ANSI
 S16 rgSCHUtlGetCfgPerOff
 (
- RgSchPerTbl     tbl,
- uint16_t             cfgIdx, 
- uint16_t             *peri, 
- uint16_t             *offset
- )
-#else
-S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset)
-   RgSchPerTbl   tbl;
-   uint16_t           cfgIdx;
-   uint16_t           *peri; 
-   uint16_t           *offset;
-#endif
+RgSchPerTbl   tbl,
+uint16_t      cfgIdx, 
+uint16_t      *peri, 
+uint16_t      *offset
+)
 {
    uint8_t     mid;
    uint8_t     min = 0;
@@ -9343,24 +8732,16 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCfgUtlFetchAcqiBitSz
 (
- RgSchUeACqiCb      *acqiCb,
- uint8_t                numTxAnt,
- uint8_t*               cqiPmiSzR1,
- uint8_t*               cqiPmiSzRn1
- )
-#else
-static  Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1)
- RgSchUeACqiCb      *acqiCb;
- uint8_t                numTxAnt;
- uint8_t*               cqiPmiSzR1;
- uint8_t*               cqiPmiSzRn1;
-#endif
+RgSchUeACqiCb  *acqiCb,
+uint8_t        numTxAnt,
+uint8_t*       cqiPmiSzR1,
+uint8_t*       cqiPmiSzRn1
+)
 {
 
-   uint32_t               confRepMode;
+   uint32_t    confRepMode;
 
    confRepMode = acqiCb->aCqiCfg.aprdModeEnum;
    switch(confRepMode)
@@ -9446,19 +8827,12 @@ static  Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1
  *
  **********************************************************/
 
-#ifdef ANSI
 static const RgSchUePCqiSrsSrCfgIdxTbl *  rgSCHCfgUtlGetPcqiSrsSrRiTbl
 (
-   RgSchPerTbl tblType, 
-   uint8_t* min, 
-   uint8_t* max
+RgSchPerTbl tblType, 
+uint8_t* min, 
+uint8_t* max
 )
-#else
-static const RgSchUePCqiSrsSrCfgIdxTbl *  rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType, min, max)
-   RgSchPerTbl tblType; 
-   uint8_t* min; 
-   uint8_t* max;
-#endif
 {
     const RgSchUePCqiSrsSrCfgIdxTbl * table;
     
@@ -9537,17 +8911,11 @@ static const RgSchUePCqiSrsSrCfgIdxTbl *  rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType,
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtDrxUeCfg
 (
 RgSchCellCb       *cell,
 RgrUeDrxCfg       *ueDrxCfg
 )
-#else
-static S16 rgSCHCfgVldtDrxUeCfg(cell, ueDrxCfg)
-RgSchCellCb       *cell;
-RgrUeDrxCfg       *ueDrxCfg;
-#endif
 {
 
    if (ueDrxCfg->isDrxEnabled == FALSE)
@@ -9736,15 +9104,10 @@ RgrUeDrxCfg       *ueDrxCfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgVldtDrxOnDurCfg
 (
 uint8_t      onDurTmr 
 )
-#else
-static S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr)
-uint8_t      onDurTmr;
-#endif
 {
 
    switch ( onDurTmr )
@@ -9793,15 +9156,7 @@ uint8_t      onDurTmr;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCfgVldtDrxInActvCfg
-(
-uint16_t      inActvTmr
-)
-#else
-static S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr)
-uint16_t      inActvTmr;
-#endif
+static S16 rgSCHCfgVldtDrxInActvCfg(uint16_t inActvTmr)
 {
    switch ( inActvTmr )
    {
@@ -9855,15 +9210,7 @@ uint16_t      inActvTmr;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCfgVldtDrxReTxCfg
-(
-uint8_t       reTxTmr
-)
-#else
-static S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr)
-uint8_t       reTxTmr;
-#endif
+static S16 rgSCHCfgVldtDrxReTxCfg(uint8_t reTxTmr)
 {
    switch ( reTxTmr )
    {
@@ -9904,15 +9251,7 @@ uint8_t       reTxTmr;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCfgVldtDrxLngCycCfg
-(
-RgrDrxLongCycleOffst       lngCycleOffst
-)
-#else
-static S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst)
-RgrDrxLongCycleOffst       lngCycleOffst;
-#endif
+static S16 rgSCHCfgVldtDrxLngCycCfg(RgrDrxLongCycleOffst lngCycleOffst)
 {
    if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK )
    {
@@ -9945,15 +9284,7 @@ RgrDrxLongCycleOffst       lngCycleOffst;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCfgVldtDrxLngCyclTmrs
-(
-uint16_t      val 
-)
-#else
-static S16 rgSCHCfgVldtDrxLngCyclTmrs(val)
-uint16_t      val;
-#endif
+static S16 rgSCHCfgVldtDrxLngCyclTmrs(uint16_t val)
 {
 
    switch ( val )
@@ -10003,15 +9334,7 @@ uint16_t      val;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCfgVldtDrxShrtCycCfg
-(
-RgrDrxShortDrx      shrtCycCfg 
-)
-#else
-static S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg)
-RgrDrxShortDrx      shrtCycCfg;
-#endif
+static S16 rgSCHCfgVldtDrxShrtCycCfg(RgrDrxShortDrx shrtCycCfg )
 {
    switch(shrtCycCfg.shortDrxCycle)
    {
@@ -10068,7 +9391,6 @@ RgrDrxShortDrx      shrtCycCfg;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static Void rgSCHCfgUeTaRecfg
 (
 RgSchCellCb       *cell,
@@ -10076,13 +9398,6 @@ RgSchUeCb         *ueCb,
 RgrUeRecfg        *ueCfg,
 RgSchErrInfo      *err
 )
-#else
-static Void rgSCHCfgUeTaRecfg(cell, ueCb, ueCfg, err)
-RgSchCellCb       *cell;
-RgSchUeCb         *ueCb;
-RgrUeRecfg        *ueCfg;
-RgSchErrInfo      *err;
-#endif
 {
    UNUSED(err);
 
@@ -10130,19 +9445,12 @@ RgSchErrInfo      *err;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCfgUeCqiReptReCfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgrUeRecfg     *ueRecfg
 )
-#else
-static  S16 rgSCHCfgUeCqiReptReCfg(cell, ue, ueRecfg)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrUeRecfg     *ueRecfg;
-#endif
 {
    S16 retVal;
 
@@ -10231,21 +9539,13 @@ static S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)
  *  @param[out] uint8_t           idx 
  *  @return  VOID
  **/
-#ifdef ANSI
 Void rgSCHSCellFreeBuf
 (
 Inst         inst,         
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
-uint8_t           idx
+uint8_t      idx
 )
-#else
-Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx)
-Inst         inst;         
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-uint8_t           idx;
-#endif
 {
    RgSchUeCellInfo *sCellInfo = NULLP;
    RgrUeSecCellCfg *sCellInfoRecfg = NULLP;
index a290ad2..9ef9e9f 100755 (executable)
@@ -1861,26 +1861,12 @@ static Void rgSCHCmnFindUlCqiUlTxAnt ARGS
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnCompEff
-(
-uint8_t                    noPdcchSym,
-uint8_t                    cpType,
-uint8_t                    txAntIdx,
-RgSchCmnTbSzEff            *effTbl
-)
-#else
-static Void rgSCHCmnCompEff(noPdcchSym, cpType, txAntIdx, effTbl)
-uint8_t                    noPdcchSym;
-uint8_t                    cpType;
-uint8_t                    txAntIdx;
-RgSchCmnTbSzEff            *effTbl;
-#endif
+static Void rgSCHCmnCompEff(uint8_t noPdcchSym,uint8_t cpType,uint8_t txAntIdx,RgSchCmnTbSzEff *effTbl)
 {
-   uint8_t               noResPerRb;
-   uint8_t               noSymPerRb;
-   uint8_t               resOfCrs; /* Effective REs occupied by CRS */
-   uint8_t               i, j;
+   uint8_t   noResPerRb;
+   uint8_t   noSymPerRb;
+   uint8_t   resOfCrs; /* Effective REs occupied by CRS */
+   uint8_t   i, j;
 
 
    switch (cpType)
@@ -1945,23 +1931,11 @@ RgSchCmnTbSzEff            *effTbl;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnCompUlEff
-(
-uint8_t                    noUlRsSym,
-uint8_t                    cpType,
-RgSchCmnTbSzEff           *effTbl
-)
-#else
-static Void rgSCHCmnCompUlEff(noUlRsSym, cpType, effTbl)
-uint8_t                    noUlRsSym;
-uint8_t                    cpType;
-RgSchCmnTbSzEff            *effTbl;
-#endif
+static Void rgSCHCmnCompUlEff(uint8_t noUlRsSym,uint8_t cpType,RgSchCmnTbSzEff *effTbl)
 {
-   uint8_t               noResPerRb;
-   uint8_t               noSymPerRb;
-   uint8_t               i, j;
+   uint8_t noResPerRb;
+   uint8_t noSymPerRb;
+   uint8_t i, j;
 
 
    switch (cpType)
@@ -2010,26 +1984,12 @@ RgSchCmnTbSzEff            *effTbl;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmn2LyrCompEff
-(
-uint8_t                    noPdcchSym,
-uint8_t                    cpType,
-uint8_t                    txAntIdx,
-RgSchCmnTbSzEff       *effTbl2Lyr
-)
-#else
-static Void rgSCHCmn2LyrCompEff(noPdcchSym, cpType, txAntIdx, effTbl2Lyr)
-uint8_t                    noPdcchSym;
-uint8_t                    cpType;
-uint8_t                    txAntIdx;
-RgSchCmnTbSzEff       *effTbl2Lyr;
-#endif
+static Void rgSCHCmn2LyrCompEff(uint8_t noPdcchSym,uint8_t cpType,uint8_t txAntIdx,RgSchCmnTbSzEff *effTbl2Lyr)
 {
-   uint8_t               noResPerRb;
-   uint8_t               noSymPerRb;
-   uint8_t               resOfCrs; /* Effective REs occupied by CRS */
-   uint8_t               i, j;
+   uint8_t  noResPerRb;
+   uint8_t  noSymPerRb;
+   uint8_t  resOfCrs; /* Effective REs occupied by CRS */
+   uint8_t  i, j;
 
 
    switch (cpType)
@@ -2093,15 +2053,7 @@ RgSchCmnTbSzEff       *effTbl2Lyr;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnGetDciFrmtSizes
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSCHCmnGetDciFrmtSizes(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSCHCmnGetDciFrmtSizes(RgSchCellCb *cell)
 {
 
 
@@ -2238,15 +2190,7 @@ RgSchCellCb *cell;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnGetCqiDciFrmt2AggrLvl
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSCHCmnGetCqiDciFrmt2AggrLvl(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSCHCmnGetCqiDciFrmt2AggrLvl(RgSchCellCb *cell)
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
    uint8_t            i;
@@ -2298,20 +2242,14 @@ RgSchCellCb *cell;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlInit
-(
-)
-#else
 static Void rgSCHCmnDlInit()
-#endif
 {
-   uint8_t                   i;
-   S16                  j;
-   S16                  k;
-   uint8_t                   idx;
-   RgSchCmnTbSzEff      *effTbl;
-   RgSchCmnCqiToTbs     *tbsTbl;
+   uint8_t  i;
+   S16      j;
+   S16      k;
+   uint8_t  idx;
+   RgSchCmnTbSzEff  *effTbl;
+   RgSchCmnCqiToTbs *tbsTbl;
 
 
    /* 0 corresponds to Single layer case, 1 corresponds to 2 layers case*/
@@ -2539,15 +2477,9 @@ static Void rgSCHCmnDlInit()
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlInit
-(
-)
-#else
 static Void rgSCHCmnUlInit()
-#endif
 {
-   uint8_t              *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0];
+   uint8_t            *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0];
    RgSchCmnTbSzEff    *effTbl    = &rgSchCmnNorUlEff[0];
    const RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0];
    S16              i;
@@ -2614,13 +2546,7 @@ static Void rgSCHCmnUlInit()
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnInit
-(
-)
-#else
 Void rgSCHCmnInit()
-#endif
 {
    uint8_t   idx;
 
@@ -2734,20 +2660,10 @@ Void rgSCHCmnInit()
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlRlsSubFrm
-(
-RgSchCellCb        *cell,
-CmLteTimingInfo   frm
-)
-#else
-Void rgSCHCmnDlRlsSubFrm(cell, frm)
-RgSchCellCb        *cell;
-CmLteTimingInfo    frm;
-#endif
+Void rgSCHCmnDlRlsSubFrm(RgSchCellCb *cell,CmLteTimingInfo frm)
 {
-   RgSchCmnCell        *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   RgSchDlSf           *sf;
+   RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgSchDlSf     *sf;
 
 
    /* Get the pointer to the subframe */
@@ -2780,15 +2696,7 @@ CmLteTimingInfo    frm;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchRarAlloc
-(
-RgSchCellCb             *cell
-)
-#else
-static Void rgSCHCmnDlCcchRarAlloc(cell)
-RgSchCellCb             *cell;
-#endif
+static Void rgSCHCmnDlCcchRarAlloc(RgSchCellCb *cell)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -2894,23 +2802,11 @@ RgSchCellCb             *cell;
  *  @return  S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnCcchSduAlloc
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ueCb,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static S16 rgSCHCmnCcchSduAlloc(cell, ueCb, allocInfo)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ueCb;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static S16 rgSCHCmnCcchSduAlloc(RgSchCellCb *cell,RgSchUeCb *ueCb,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlRbAlloc  *rbAllocInfo;
-   RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   RgSchCmnDlUe       *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
+   RgSchCmnCell    *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgSchCmnDlUe    *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
 
 
    /* Return if subframe BW exhausted */
@@ -2961,24 +2857,13 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchSduTx
-(
-RgSchCellCb             *cell,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchSduTx(cell, allocInfo)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchSduTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   CmLList           *node;
-   RgSchUeCb         *ueCb;
-   RgSchCmnDlUe      *ueCmnDl;
-   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-
-   RgSchDlSf         *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
+   CmLList      *node;
+   RgSchUeCb    *ueCb;
+   RgSchCmnDlUe *ueCmnDl;
+   RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgSchDlSf    *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
    
 
    node = cell->ccchSduUeLst.first;
@@ -3034,23 +2919,12 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchTx
-(
-RgSchCellCb             *cell,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchTx(cell, allocInfo)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   CmLList           *node;
-   RgSchRaCb         *raCb;
-   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   RgSchDlSf         *dlSf = allocInfo->msg4Alloc.msg4DlSf;
-   
+   CmLList       *node;
+   RgSchRaCb     *raCb;
+   RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgSchDlSf     *dlSf = allocInfo->msg4Alloc.msg4DlSf;
 
    node = cell->raInfo.toBeSchdLst.first;
    while(node)
@@ -3092,26 +2966,16 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchSduRetx
-(
-RgSchCellCb             *cell,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchSduRetx(cell, allocInfo)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchSduRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlRbAlloc  *rbAllocInfo;
-   CmLList           *node;
-   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   RgSchUeCb         *ueCb;
-   RgSchDlHqProcCb   *hqP;
-   uint8_t                retxBw = 0;
-   RgSchCmnDlUe      *ueDl;
-   RgSchDlSf         *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
+   CmLList         *node;
+   RgSchCmnCell    *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgSchUeCb       *ueCb;
+   RgSchDlHqProcCb *hqP;
+   uint8_t         retxBw = 0;
+   RgSchCmnDlUe    *ueDl;
+   RgSchDlSf       *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
    
 
    node = cellSch->dl.ccchSduRetxLst.first;
@@ -3189,23 +3053,13 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchRetx
-(
-RgSchCellCb             *cell,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchRetx(cell, allocInfo)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList           *node;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchRaCb         *raCb;
    RgSchDlHqProcCb   *hqP;
-   uint8_t                retxBw = 0;
+   uint8_t           retxBw = 0;
    RgSchDlSf         *dlSf = allocInfo->msg4Alloc.msg4DlSf;
         
 
@@ -3281,19 +3135,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlBcchPcch
-(
-RgSchCellCb             *cell,
-RgSchCmnDlRbAllocInfo   *allocInfo,
-RgInfSfAlloc            *subfrmAlloc
-)
-#else
-static Void rgSCHCmnDlBcchPcch(cell, allocInfo, subfrmAlloc)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-RgInfSfAlloc            *subfrmAlloc;
-#endif
+static Void rgSCHCmnDlBcchPcch(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo,RgInfSfAlloc *subfrmAlloc)
 {
    CmLteTimingInfo   frm;
    RgSchDlSf         *sf;
@@ -3305,7 +3147,6 @@ RgInfSfAlloc            *subfrmAlloc;
 #endif/*RGR_SI_SCH*/
 
 
-
    frm   = cell->crntTime;
 #ifdef LTEMAC_HDFDD
    /* For HDFDD we need scheduling information at least RG_SCH_CMN_DL_DELTA
@@ -3449,19 +3290,7 @@ RgInfSfAlloc            *subfrmAlloc;
 *       File:  rg_sch_cmn.c
 *
 */
-#ifdef ANSI
-Bool rgSCHCmnChkInWin
-(
-CmLteTimingInfo   frm,
-CmLteTimingInfo   start,
-CmLteTimingInfo   end
-)
-#else
-Bool rgSCHCmnChkInWin(frm, start, end)
-CmLteTimingInfo   frm;
-CmLteTimingInfo   start;
-CmLteTimingInfo   end;
-#endif
+Bool rgSCHCmnChkInWin(CmLteTimingInfo frm,CmLteTimingInfo start,CmLteTimingInfo end)
 {
    Bool    inWin = FALSE;
 
@@ -3526,17 +3355,7 @@ CmLteTimingInfo   end;
 *       File:  rg_sch_cmn.c
 *
 */
-#ifdef ANSI
-Bool rgSCHCmnChkPastWin
-(
-CmLteTimingInfo   frm,
-CmLteTimingInfo   end
-)
-#else
-Bool rgSCHCmnChkPastWin(frm, end)
-CmLteTimingInfo   frm;
-CmLteTimingInfo   end;
-#endif
+Bool rgSCHCmnChkPastWin(CmLteTimingInfo frm,CmLteTimingInfo end)
 {
    CmLteTimingInfo  refFrm = end;
    Bool             pastWin;
@@ -3570,23 +3389,7 @@ CmLteTimingInfo   end;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnClcAlloc
-(
-RgSchCellCb             *cell,
-RgSchDlSf               *sf,
-RgSchClcDlLcCb          *lch,
-uint16_t                     rnti,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static Void rgSCHCmnClcAlloc(cell, sf, lch, rnti, allocInfo)
-RgSchCellCb             *cell;
-RgSchDlSf               *sf;
-RgSchClcDlLcCb          *lch;
-uint16_t                     rnti;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static Void rgSCHCmnClcAlloc(RgSchCellCb *cell,RgSchDlSf *sf,RgSchClcDlLcCb  *lch,uint16_t rnti,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchClcBoRpt        *bo;
@@ -3688,23 +3491,13 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *               -# NULLP when unsuccessful
  *
  **/
-#ifdef ANSI
-RgSchPdcch *rgSCHCmnCmnPdcchAlloc
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm
-)
-#else
-RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-#endif
+RgSchPdcch *rgSCHCmnCmnPdcchAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm)
 {
    CmLteAggrLvl         aggrLvl;
    RgSchPdcchInfo       *pdcchInfo;
    RgSchPdcch           *pdcch;
    RgSchCmnCell         *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t                   numCce;  /*store num CCEs based on 
+   uint8_t              numCce;  /*store num CCEs based on 
                                   aggregation level */
 
    aggrLvl   = cellSch->dl.cmnChAggrLvl;
@@ -3784,62 +3577,38 @@ RgSchDlSf                  *subFrm;
  *
  **/
 #ifdef LTEMAC_SPS
-#ifdef ANSI
 Void rgSCHCmnClcRbAlloc
 (
-RgSchCellCb                 *cell,
-uint32_t                     bo,
-uint8_t                      cqi,
-uint8_t                      *rb,
-uint32_t                     *tbs,
-uint8_t                      *mcs,
-uint8_t                      *iTbs,
-Bool                         isSpsBo,
-RgSchDlSf                    *sf 
+RgSchCellCb  *cell,
+uint32_t     bo,
+uint8_t      cqi,
+uint8_t      *rb,
+uint32_t     *tbs,
+uint8_t      *mcs,
+uint8_t      *iTbs,
+Bool         isSpsBo,
+RgSchDlSf    *sf 
 )
 #else
-Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo)
-RgSchCellCb                  *cell;
-uint32_t                     bo;
-uint8_t                      cqi;
-uint8_t                      *rb;
-uint32_t                     *tbs;
-uint8_t                      *mcs;
-uint8_t                      *iTbs;
-Bool                         isSpsBo;
-RgSchDlSf                    *sf; 
-#endif
-#else
-#ifdef ANSI
 static Void rgSCHCmnClcRbAlloc
 (
-RgSchCellCb                  *cell,
-uint32_t                     bo,
-uint8_t                      cqi,
-uint8_t                      *rb,
-uint32_t                     *tbs,
-uint8_t                      *mcs,
-RgSchDlSf                    *sf 
+RgSchCellCb  *cell,
+uint32_t     bo,
+uint8_t      cqi,
+uint8_t      *rb,
+uint32_t     *tbs,
+uint8_t      *mcs,
+RgSchDlSf    *sf 
 )
-#else
-static Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, sf)
-RgSchCellCb                  *cell;
-uint32_t                     bo;
-uint8_t                      cqi;
-uint8_t                      *rb;
-uint32_t                     *tbs;
-uint8_t                      *mcs;
-RgSchDlSf                    *sf; 
-#endif
 #endif /* LTEMAC_SPS */
 {
-   uint8_t                   iTbsVal;
-   RgSchCmnTbSzEff           *effTbl;
-   uint32_t                  eff;
-   uint32_t                  noRes;
-   RgSchCmnCell              *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t                   cfi = cellSch->dl.currCfi;
-   uint32_t                  tmpRb=0;
+   uint8_t          iTbsVal;
+   RgSchCmnTbSzEff  *effTbl;
+   uint32_t         eff;
+   uint32_t         noRes;
+   RgSchCmnCell     *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   uint8_t          cfi = cellSch->dl.currCfi;
+   uint32_t         tmpRb=0;
 
    /* first get the CQI to MCS table and determine the number of RBs */
    effTbl = (RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[0][cfi]);
@@ -3892,24 +3661,12 @@ RgSchDlSf                    *sf;
  *  @return  S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnMsg4Alloc
-(
-RgSchCellCb                *cell,
-RgSchRaCb                  *raCb,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static S16 rgSCHCmnMsg4Alloc(cell, raCb, allocInfo)
-RgSchCellCb                *cell;
-RgSchRaCb                  *raCb;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static S16 rgSCHCmnMsg4Alloc(RgSchCellCb *cell,RgSchRaCb *raCb,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
 
- /* SR_RACH_STATS : MSG4 TO BE TXED */
  /* SR_RACH_STATS : MSG4 TO BE TXED */
    rgNumMsg4ToBeTx++;
    /* Return if subframe BW exhausted */
    if (allocInfo->msg4Alloc.msg4DlSf->bw <=
@@ -3967,25 +3724,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *         -# NULLP when unsuccessful
  *
  **/
-#ifdef ANSI
-RgSchPdcch *rgSCHCmnPdcchAlloc
-(
-RgSchCellCb             *cell,
-RgSchUeCb               *ue,
-RgSchDlSf               *subFrm,
-uint8_t                      cqi,
-TfuDciFormat            dciFrmt,
-Bool                    isDtx
-)
-#else
-RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx)
-RgSchCellCb             *cell;
-RgSchUeCb               *ue;
-RgSchDlSf               *subFrm;
-uint8_t                      cqi;
-TfuDciFormat            dciFrmt;
-Bool                    isDtx;
-#endif
+RgSchPdcch *rgSCHCmnPdcchAlloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlSf *subFrm,uint8_t cqi,TfuDciFormat dciFrmt,Bool isDtx)
 {
    CmLteAggrLvl     aggrLvl;
    RgSchPdcchInfo   *pdcchInfo;
@@ -4125,26 +3864,16 @@ Bool                    isDtx;
  *  @return S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnCcchSduDedAlloc
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ueCb
-)
-#else
-static S16 rgSCHCmnCcchSduDedAlloc(cell, ueCb)
-RgSchCellCb      *cell;
-RgSchUeCb        *ueCb;
-#endif
+static S16 rgSCHCmnCcchSduDedAlloc(RgSchCellCb *cell,RgSchUeCb *ueCb)
 {
-   RgSchDlHqEnt      *hqE = NULLP;
-   uint32_t                  effBo;
-   RgSchDlRbAlloc       *rbAllocinfo = NULLP;
-   RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   uint8_t                   iTbs;
-   uint8_t                   numRb;
+   RgSchDlHqEnt   *hqE = NULLP;
+   uint32_t       effBo;
+   RgSchDlRbAlloc *rbAllocinfo = NULLP;
+   RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
+   uint8_t        iTbs;
+   uint8_t        numRb;
 #ifdef LTE_TDD
-   uint8_t                   cfi     = cellDl->currCfi;
+   uint8_t        cfi     = cellDl->currCfi;
 #endif
 
 
@@ -4225,25 +3954,15 @@ RgSchUeCb        *ueCb;
  *  @return S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnMsg4DedAlloc
-(
-RgSchCellCb      *cell,
-RgSchRaCb        *raCb
-)
-#else
-static S16 rgSCHCmnMsg4DedAlloc(cell, raCb)
-RgSchCellCb      *cell;
-RgSchRaCb        *raCb;
-#endif
+static S16 rgSCHCmnMsg4DedAlloc(RgSchCellCb *cell,RgSchRaCb *raCb)
 {
-   uint32_t                  effBo;
-   RgSchDlRbAlloc       *rbAllocinfo = &raCb->rbAllocInfo;
-   uint8_t                   iTbs;
-   uint8_t                   numRb;
+   uint32_t          effBo;
+   RgSchDlRbAlloc    *rbAllocinfo = &raCb->rbAllocInfo;
+   uint8_t           iTbs;
+   uint8_t           numRb;
 #ifdef LTE_TDD
-   RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   uint8_t                   cfi     = cellDl->currCfi;
+   RgSchCmnDlCell    *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
+   uint8_t           cfi     = cellDl->currCfi;
 #endif
 
 
@@ -4321,17 +4040,7 @@ RgSchRaCb        *raCb;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlRaRsp
-(
-RgSchCellCb                *cell,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHCmnDlRaRsp(cell, allocInfo)
-RgSchCellCb                *cell;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHCmnDlRaRsp(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLteTimingInfo      frm;
    CmLteTimingInfo      schFrm;
@@ -4416,27 +4125,17 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlRaRsp  //FDD
-(
-RgSchCellCb                *cell,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHCmnDlRaRsp(cell, allocInfo)
-RgSchCellCb                *cell;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHCmnDlRaRsp(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   CmLteTimingInfo      frm;
-   CmLteTimingInfo      winStartFrm;
-   RgSchDlSf            *subFrm;
-   uint8_t              winStartIdx;
-   uint8_t              winGap;
-   uint8_t              rarnti;
-   uint8_t              raIdx;
-   RgSchCmnCell         *sched;
-   uint8_t              i,noRaRnti=0;
+   CmLteTimingInfo frm;
+   CmLteTimingInfo winStartFrm;
+   RgSchDlSf       *subFrm;
+   uint8_t         winStartIdx;
+   uint8_t         winGap;
+   uint8_t         rarnti;
+   uint8_t         raIdx;
+   RgSchCmnCell    *sched;
+   uint8_t         i,noRaRnti=0;
 
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
@@ -4510,43 +4209,25 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @return  S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnRaRspAlloc
-(
-RgSchCellCb             *cell,
-RgSchDlSf               *subFrm,
-uint16_t                     raIndex,
-uint16_t                     rarnti,
-uint8_t                      noRaRnti,
-RgSchCmnDlRbAllocInfo   *allocInfo
-)
-#else
-static S16 rgSCHCmnRaRspAlloc(cell,subFrm,raIndex,rarnti,noRaRnti,allocInfo)
-RgSchCellCb             *cell;
-RgSchDlSf               *subFrm;
-uint16_t                     raIndex;
-uint16_t                     rarnti;
-uint8_t                      noRaRnti;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-#endif
+static S16 rgSCHCmnRaRspAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,uint16_t raIndex,uint16_t rarnti,uint8_t noRaRnti,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   RgSchCmnUlCell       *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   uint16_t                  noBytes;
-   uint32_t                  rb = 0;
-   uint32_t                  tbs;
+   RgSchCmnDlCell   *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
+   RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   uint16_t         noBytes;
+   uint32_t         rb = 0;
+   uint32_t         tbs;
    /*ccpu00116700,ccpu00116708- Corrected the wrong type for mcs*/
-   uint8_t                   mcs;
-   CmLListCp            *reqLst;
+   uint8_t          mcs;
+   CmLListCp        *reqLst;
    /* RACH handling related changes */
-   Bool                 isAlloc = FALSE;
-   static uint8_t            schdNumRapid = 0;
-   uint8_t                   remNumRapid = 0;
-   uint8_t                   nPrb = 0;
-   S32                  allwdTbSz = 0;
+   Bool             isAlloc = FALSE;
+   static uint8_t   schdNumRapid = 0;
+   uint8_t          remNumRapid = 0;
+   uint8_t          nPrb = 0;
+   S32              allwdTbSz = 0;
 #ifdef LTE_TDD   
-   uint16_t                  lostRe;  
-   uint8_t                   cfi = cellDl->currCfi;  
+   uint16_t         lostRe;  
+   uint8_t          cfi = cellDl->currCfi;  
 #endif   
 
 #ifndef RGR_V1
@@ -4676,19 +4357,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlAllocFillRbInfo
-(
-RgSchCellCb   *cell,
-RgSchUlSf      *sf,
-RgSchUlAlloc  *alloc
-)
-#else
-Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc)
-RgSchCellCb    *cell;
-RgSchUlSf      *sf;
-RgSchUlAlloc   *alloc;
-#endif
+Void rgSCHCmnUlAllocFillRbInfo(RgSchCellCb *cell,RgSchUlSf *sf,RgSchUlAlloc  *alloc)
 {
     RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
     RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -4728,7 +4397,6 @@ RgSchUlAlloc   *alloc;
  *  @param[out] uint8_t                *hqProcIdRef
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnMsg3GrntReq
 (
 RgSchCellCb     *cell,
@@ -4736,25 +4404,15 @@ CmLteRnti       rnti,
 Bool            preamGrpA,
 RgSchUlHqProcCb *hqProc,
 RgSchUlAlloc    **ulAllocRef,
-uint8_t              *hqProcIdRef
+uint8_t         *hqProcIdRef
 )
-#else
-static Void rgSCHCmnMsg3GrntReq(cell, rnti, preamGrpA, hqProc,
-                                 ulAllocRef, hqProcIdRef)
-RgSchCellCb     *cell;
-CmLteRnti       rnti;
-Bool            preamGrpA;
-RgSchUlHqProcCb *hqProc;
-RgSchUlAlloc    **ulAllocRef;
-uint8_t              *hqProcIdRef;
-#endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlSf       *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx];
    RgSchUlHole     *hole;
    RgSchUlAlloc    *alloc;
-   uint8_t              iMcs;
-   uint8_t              numSb;
+   uint8_t         iMcs;
+   uint8_t         numSb;
 
 
    *ulAllocRef = NULLP;
@@ -4859,24 +4517,12 @@ uint8_t              *hqProcIdRef;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlSetUeAllocLmt
-(
-RgSchCellCb   *cell,
-RgSchCmnDlUe  *ueDl,
-Bool          isEmtcUe
-)
-#else
-static Void rgSCHCmnDlSetUeAllocLmt(cell, ueDl, isEmtcUe)
-RgSchCellCb   *cell;
-RgSchCmnDlUe  *ueDl;
-Bool          isEmtcUe;
-#endif
+static Void rgSCHCmnDlSetUeAllocLmt(RgSchCellCb *cell,RgSchCmnDlUe *ueDl,Bool isEmtcUe)
 {
-   uint8_t            modOrder;
-   uint32_t           maxRb;
+   uint8_t       modOrder;
+   uint32_t      maxRb;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t            cfi = cellSch->dl.currCfi;
+   uint8_t       cfi = cellSch->dl.currCfi;
 
 
 #ifdef EMTC_ENABLE
@@ -5023,24 +4669,14 @@ Bool          isEmtcUe;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCheckAndSetTxScheme 
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue
-)
-#else
-static Void rgSCHCheckAndSetTxScheme(cell, ue)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-#endif
+static Void rgSCHCheckAndSetTxScheme(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe  *ueDl =  RG_SCH_CMN_GET_DL_UE(ue ,cell);
-   uint8_t            cfi = cellSch->dl.currCfi;
-   uint8_t            maxiTbs;
-   uint8_t            cqiBasediTbs;
-   uint8_t            actualiTbs;
+   uint8_t       cfi = cellSch->dl.currCfi;
+   uint8_t       maxiTbs;
+   uint8_t       cqiBasediTbs;
+   uint8_t       actualiTbs;
 
 
    maxiTbs      = (*(RgSchCmnCqiToTbs*)(cellSch->dl.cqiToTbsTbl[0][cfi]))\
@@ -5083,26 +4719,16 @@ RgSchUeCb     *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlSetUeAllocLmtLa
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue
-)
-#else
-Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-#endif
+Void rgSCHCmnDlSetUeAllocLmtLa(RgSchCellCb *cell,RgSchUeCb *ue)
 {
-   uint8_t            modOrder;
-   uint32_t           maxRb;
-   uint8_t            reportediTbs;
+   uint8_t       modOrder;
+   uint32_t      maxRb;
+   uint8_t       reportediTbs;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe  *ueDl =  RG_SCH_CMN_GET_DL_UE(ue,cell);
-   uint8_t            cfi = cellSch->dl.currCfi;
-   uint8_t            maxiTbs;
-   uint8_t            cwIdx = 0; 
+   uint8_t       cfi = cellSch->dl.currCfi;
+   uint8_t       maxiTbs;
+   uint8_t       cwIdx = 0; 
 
 
    maxiTbs      = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
@@ -5197,18 +4823,9 @@ RgSchUeCb     *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnDlHqPResetTemp 
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHCmnDlHqPResetTemp(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHCmnDlHqPResetTemp(RgSchDlHqProcCb *hqP)
 {
 
-
    /* Fix: syed having a hqP added to Lists for RB assignment rather than
     * a UE, as adding UE was limiting handling some scenarios */ 
     hqP->reqLnk.node = (PTR)NULLP;
@@ -5231,20 +4848,10 @@ RgSchDlHqProcCb         *hqP;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnDlUeResetTemp
-(
-RgSchUeCb               *ue,
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHCmnDlUeResetTemp(ue, hqP)
-RgSchUeCb               *ue;
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHCmnDlUeResetTemp(RgSchUeCb *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchDlRbAlloc  *allocInfo;
-   RgSchCmnDlUe       *cmnUe = RG_SCH_CMN_GET_DL_UE(ue,hqP->hqE->cell);
+   RgSchCmnDlUe    *cmnUe = RG_SCH_CMN_GET_DL_UE(ue,hqP->hqE->cell);
 #ifdef LTE_ADV
    Void           *tmpCb;
 #endif
@@ -5289,20 +4896,9 @@ RgSchDlHqProcCb         *hqP;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlUeResetTemp
-(
-RgSchCellCb             *cell,
-RgSchUeCb               *ue
-)
-#else
-Void rgSCHCmnUlUeResetTemp(cell, ue)
-RgSchCellCb             *cell;
-RgSchUeCb               *ue;
-#endif
+Void rgSCHCmnUlUeResetTemp(RgSchCellCb *cell,RgSchUeCb *ue)
 {
-   RgSchCmnUlUe       *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell);
-
+   RgSchCmnUlUe *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell);
 
    memset(&cmnUlUe->alloc, 0, sizeof(cmnUlUe->alloc));
 
@@ -5328,22 +4924,9 @@ RgSchUeCb               *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnFillPdcch
-(
-RgSchCellCb                *cell,
-RgSchPdcch                 *pdcch,
-RgSchDlRbAlloc             *rbAllocInfo
-)
-#else
-Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo)
-RgSchCellCb                *cell;
-RgSchPdcch                 *pdcch;
-RgSchDlRbAlloc             *rbAllocInfo;
-#endif
+Void rgSCHCmnFillPdcch(RgSchCellCb *cell,RgSchPdcch *pdcch,RgSchDlRbAlloc *rbAllocInfo)
 {
 
-
    /* common channel pdcch filling,
     * only 1A and Local is supported */
    pdcch->rnti                       = rbAllocInfo->rnti;
@@ -5484,26 +5067,11 @@ RgSchDlRbAlloc             *rbAllocInfo;
  *  @return  Bool
  *
  **/
-#ifdef ANSI
-static Bool rgSCHCmnIsSplSubfrm
-(
-uint8_t                   splfrmCnt,
-uint8_t                   curSubfrmIdx,
-uint8_t                   periodicity,
-RgSchTddSubfrmInfo   *subfrmInfo
-)
-#else
-static Bool rgSCHCmnIsSplSubfrm(splfrmCnt, curSubfrmIdx, periodicity, subfrmInfo)
-uint8_t                   splfrmCnt;
-uint8_t                   curSubfrmIdx;
-uint8_t                   periodicity;
-RgSchTddSubfrmInfo   *subfrmInfo;
-#endif
+static Bool rgSCHCmnIsSplSubfrm(uint8_t splfrmCnt,uint8_t curSubfrmIdx,uint8_t periodicity,RgSchTddSubfrmInfo *subfrmInfo)
 {
    uint8_t dlSfCnt = 0;
    uint8_t splfrmIdx  = 0;
 
-
    if(splfrmCnt > 0)
    {
       if(periodicity == RG_SCH_CMN_5_MS_PRD)
@@ -5559,21 +5127,7 @@ RgSchTddSubfrmInfo   *subfrmInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnUpdHqAndDai
-(
-RgSchDlHqProcCb   *hqP,
-RgSchDlSf         *subFrm,
-RgSchDlHqTbCb     *tbCb,
-uint8_t                tbAllocIdx
-)
-#else
-static Void rgSCHCmnUpdHqAndDai(hqP, subFrm, tbCb,tbAllocIdx)
-RgSchDlHqProcCb   *hqP;
-RgSchDlSf         *subFrm;
-RgSchDlHqTbCb     *tbCb;
-uint8_t                tbAllocIdx;
-#endif
+static Void rgSCHCmnUpdHqAndDai(RgSchDlHqProcCb *hqP,RgSchDlSf *subFrm,RgSchDlHqTbCb *tbCb,uint8_t tbAllocIdx)
 {
    RgSchUeCb      *ue = hqP->hqE->ue;
    
@@ -5640,31 +5194,19 @@ uint8_t                tbAllocIdx;
  *  @return  uint8_t dlDai 
  *
  **/
-#ifdef ANSI
 uint8_t rgSCHCmnUpdDai
 (
-RgSchUeCb         *ue,
-CmLteTimingInfo   *fdbkTime,
-uint8_t                 m,
-Bool               havePdcch,
-RgSchDlHqProcCb   *hqP,
-uint8_t                *ulDai
+RgSchUeCb       *ue,
+CmLteTimingInfo *fdbkTime,
+uint8_t         m,
+Bool            havePdcch,
+RgSchDlHqProcCb *hqP,
+uint8_t         *ulDai
 )
-#else
-uint8_t rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai)
-RgSchUeCb         *ue;
-CmLteTimingInfo   *fdbkTime;
-uint8_t                 m;
-Bool               havePdcch;
-RgSchDlHqProcCb   *hqP;
-uint8_t                *ulDai;
-#endif
 {
    RgSchTddANInfo *anInfo;
-   uint8_t             servCellIdx;
-   uint8_t             ackNackFdbkArrSize;
-  
-
+   uint8_t servCellIdx;
+   uint8_t ackNackFdbkArrSize;
 
    if(hqP != NULLP)
    {/* Non SPS */
@@ -5755,37 +5297,21 @@ uint32_t rgUlrate_grant;
  *
  **/
 #ifdef LTEMAC_SPS
-#ifdef ANSI
 Void rgSCHCmnFillHqPTb
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-uint8_t                         tbAllocIdx,
-RgSchPdcch                 *pdcch
+RgSchCellCb    *cell,
+RgSchDlRbAlloc *rbAllocInfo,
+uint8_t        tbAllocIdx,
+RgSchPdcch     *pdcch
 )
 #else
-Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-uint8_t                         tbAllocIdx;
-RgSchPdcch                 *pdcch;
-#endif
-#else
-#ifdef ANSI
 static Void rgSCHCmnFillHqPTb
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-uint8_t                         tbAllocIdx,
-RgSchPdcch                 *pdcch
+RgSchCellCb    *cell,
+RgSchDlRbAlloc *rbAllocInfo,
+uint8_t        tbAllocIdx,
+RgSchPdcch     *pdcch
 )
-#else
-static Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-uint8_t                         tbAllocIdx;
-RgSchPdcch                 *pdcch;
-#endif
 #endif /* LTEMAC_SPS */
 {
    RgSchCmnDlCell     *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -5879,23 +5405,14 @@ RgSchPdcch                 *pdcch;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmtB1B2
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 
 
@@ -5993,23 +5510,11 @@ uint32_t addedForScell2;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnFillHqPPdcch
-(
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHCmnFillHqPPdcch(RgSchCellCb *cell,RgSchDlRbAlloc *rbAllocInfo,RgSchDlHqProcCb *hqP)
 {
-   RgSchCmnDlCell     *cmnCell = RG_SCH_CMN_GET_DL_CELL(cell);
-   RgSchPdcch         *pdcch = rbAllocInfo->pdcch;
-   uint8_t                 tpc = 1;
+   RgSchCmnDlCell *cmnCell = RG_SCH_CMN_GET_DL_CELL(cell);
+   RgSchPdcch     *pdcch = rbAllocInfo->pdcch;
+   uint8_t        tpc = 1;
 
 
    if (hqP->hqE->ue)
@@ -6154,27 +5659,18 @@ RgSchDlHqProcCb            *hqP;
  *
  **/
 
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmt1
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmt1(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 
 #ifdef LTE_TDD
-   RgSchTddANInfo     *anInfo;
+   RgSchTddANInfo *anInfo;
 #endif
 
 #ifdef LTEMAC_SPS
@@ -6291,23 +5787,14 @@ uint8_t                         tpc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmt1A
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmt1A(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 
 #ifdef LTE_TDD
@@ -6423,23 +5910,14 @@ uint8_t                         tpc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmt1B
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmt1B(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 
 #ifdef LTE_TDD
@@ -6544,23 +6022,14 @@ uint8_t                         tpc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmt2
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmt2(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 
 #ifdef LTE_TDD
@@ -6700,23 +6169,14 @@ uint8_t                         tpc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillHqPPdcchDciFrmt2A
 (
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-uint8_t                         tpc
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *rbAllocInfo,
+RgSchDlHqProcCb *hqP,
+RgSchPdcch      *pdcch,
+uint8_t         tpc
 )
-#else
-static Void rgSCHCmnFillHqPPdcchDciFrmt2A(cell, rbAllocInfo, hqP, pdcch, tpc)
-RgSchCellCb                *cell;
-RgSchDlRbAlloc             *rbAllocInfo;
-RgSchDlHqProcCb            *hqP;
-RgSchPdcch                 *pdcch;
-uint8_t                         tpc;
-#endif
 {
 #ifdef LTE_TDD
    RgSchTddANInfo     *anInfo;
@@ -6848,15 +6308,7 @@ uint8_t                         tpc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnInitVars
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSCHCmnInitVars(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSCHCmnInitVars(RgSchCellCb *cell)
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
@@ -6892,15 +6344,7 @@ RgSchCellCb *cell;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnUpdVars
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHCmnUpdVars(cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHCmnUpdVars(RgSchCellCb *cell)
 {
    CmLteTimingInfo   timeInfo;
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
@@ -6979,25 +6423,15 @@ RgSchCellCb *cell;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t  rgSCHCmnGetPhichUlSfIdx
-(
-CmLteTimingInfo *timeInfo,
-RgSchCellCb *cell
-)
-#else
-uint8_t  rgSCHCmnGetPhichUlSfIdx(timeInfo, cell)
-CmLteTimingInfo *timeInfo;
-RgSchCellCb        *cell;
-#endif
+uint8_t  rgSCHCmnGetPhichUlSfIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell)
 {
-   RgSchCmnUlCell       *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   RgSchDlSf            *dlsf;
-   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   uint8_t                   idx;
-   uint16_t                  numUlSf;
-   uint16_t                  sfn;
-   uint8_t                   subframe;
+   RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   RgSchDlSf       *dlsf;
+   uint8_t         ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t         idx;
+   uint16_t        numUlSf;
+   uint16_t        sfn;
+   uint8_t         subframe;
 
 
    dlsf = rgSCHUtlSubFrmGet(cell, *timeInfo);
@@ -7034,22 +6468,12 @@ RgSchCellCb        *cell;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t  rgSCHCmnGetUlSfIdx
-(
-CmLteTimingInfo *timeInfo,
-RgSchCellCb *cell
-)
-#else
-uint8_t  rgSCHCmnGetUlSfIdx(timeInfo, cell)
-CmLteTimingInfo *timeInfo;
-RgSchCellCb *cell;
-#endif
+uint8_t  rgSCHCmnGetUlSfIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell)
 {
-   RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   uint8_t                ulDlCfgIdx = cell->ulDlCfgIdx;
-   uint8_t                idx = 0;
-   uint16_t               numUlSf;
+   RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   uint8_t  ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t  idx = 0;
+   uint16_t numUlSf;
 
 
    /* ccpu00130980: numUlSf(uint16_t) parameter added to avoid integer
@@ -7078,30 +6502,20 @@ RgSchCellCb *cell;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t  rgSCHCmnGetUlHqProcIdx
-(
-CmLteTimingInfo *timeInfo,
-RgSchCellCb *cell
-)
-#else
-uint8_t  rgSCHCmnGetUlHqProcIdx(timeInfo, cell)
-CmLteTimingInfo *timeInfo;
-RgSchCellCb *cell;
-#endif
+uint8_t  rgSCHCmnGetUlHqProcIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell)
 {
-   uint8_t            procId;
-   uint32_t           numUlSf;
+   uint8_t  procId;
+   uint32_t numUlSf;
   
 #ifndef LTE_TDD
    numUlSf  = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->slot);
    procId   = numUlSf % RGSCH_NUM_UL_HQ_PROC;
 #else
-   uint8_t            ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t  ulDlCfgIdx = cell->ulDlCfgIdx;
    /*ccpu00130639 - MOD - To get correct UL HARQ Proc IDs for all UL/DL Configs*/
-   uint8_t            numUlSfInSfn;
-   S8            sfnCycle = cell->tddHqSfnCycle;
-   uint8_t            numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx]
+   uint8_t  numUlSfInSfn;
+   S8       sfnCycle = cell->tddHqSfnCycle;
+   uint8_t  numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx]
 
    /* TRACE 5 Changes */
 
@@ -7146,17 +6560,7 @@ RgSchCellCb *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlFreeAlloc
-(
-RgSchCellCb     *cell,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHCmnUlFreeAlloc(cell, alloc)
-RgSchCellCb     *cell;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHCmnUlFreeAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc)
 {
    RgSchUlHqProcCb *hqProc;
 
@@ -7196,19 +6600,7 @@ RgSchUlAlloc    *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlFreeAllocation
-(
-RgSchCellCb     *cell,
-RgSchUlSf       *sf,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHCmnUlFreeAllocation(cell, sf, alloc)
-RgSchCellCb     *cell;
-RgSchUlSf       *sf;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHCmnUlFreeAllocation(RgSchCellCb *cell,RgSchUlSf *sf,RgSchUlAlloc *alloc)
 {
    RgSchUlHqProcCb *hqProc;
 
@@ -7260,22 +6652,12 @@ RgSchUlAlloc    *alloc;
  *  @return  RgSchPdcch *
  *         -# NULLP when unsuccessful
  **/
-#ifdef ANSI
-RgSchPdcch *rgSCHCmnPdcchAllocCrntSf
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(RgSchCellCb *cell,RgSchUeCb *ue)
 {
-   CmLteTimingInfo      frm = cell->crntTime;
-   RgSchCmnDlUe         *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   RgSchDlSf            *sf;
-   RgSchPdcch           *pdcch = NULLP;
+   CmLteTimingInfo frm = cell->crntTime;
+   RgSchCmnDlUe    *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
+   RgSchDlSf       *sf;
+   RgSchPdcch      *pdcch = NULLP;
 
    RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
@@ -7314,17 +6696,7 @@ RgSchUeCb                  *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlAllocFillNdmrs
-(
-RgSchCmnUlCell *cellUl,
-RgSchUlAlloc   *alloc
-)
-#else
-Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc)
-RgSchCmnUlCell *cellUl;
-RgSchUlAlloc   *alloc;
-#endif
+Void rgSCHCmnUlAllocFillNdmrs(RgSchCmnUlCell *cellUl,RgSchUlAlloc *alloc)
 {
    alloc->grnt.nDmrs = cellUl->dmrsArr[alloc->sbStart];
    return;
@@ -7344,21 +6716,7 @@ RgSchUlAlloc   *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlAllocLnkHqProc
-(
-RgSchUeCb       *ue,
-RgSchUlAlloc    *alloc,
-RgSchUlHqProcCb *proc,
-Bool            isRetx
-)
-#else
-Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx)
-RgSchUeCb       *ue;
-RgSchUlAlloc    *alloc;
-RgSchUlHqProcCb *proc;
-Bool            isRetx;
-#endif
+Void rgSCHCmnUlAllocLnkHqProc(RgSchUeCb *ue,RgSchUlAlloc *alloc,RgSchUlHqProcCb *proc,Bool isRetx)
 {
 
    if(TRUE == isRetx)
@@ -7396,21 +6754,10 @@ Bool            isRetx;
  *  @param[in]  RgSchPdcch   *pdcch
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnPdcchRlsCrntSf
-(
-RgSchCellCb                *cell,
-RgSchPdcch                 *pdcch
-)
-#else
-Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch)
-RgSchCellCb                *cell;
-RgSchPdcch                 *pdcch;
-#endif
+Void rgSCHCmnPdcchRlsCrntSf(RgSchCellCb *cell,RgSchPdcch *pdcch)
 {
-   CmLteTimingInfo      frm = cell->crntTime;
-   RgSchDlSf               *sf;
-
+   CmLteTimingInfo frm = cell->crntTime;
+   RgSchDlSf *sf;
 
    RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
@@ -7430,22 +6777,9 @@ RgSchPdcch                 *pdcch;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlFillPdcchWithAlloc
-(
-RgSchPdcch      *pdcch,
-RgSchUlAlloc    *alloc,
-RgSchUeCb       *ue
-)
-#else
-Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue)
-RgSchPdcch      *pdcch;
-RgSchUlAlloc    *alloc;
-RgSchUeCb       *ue;
-#endif
+Void rgSCHCmnUlFillPdcchWithAlloc(RgSchPdcch *pdcch,RgSchUlAlloc *alloc,RgSchUeCb *ue)
 {
 
-
    pdcch->ue = ue;
    pdcch->rnti = alloc->rnti;
    //pdcch->dci.dciFormat = TFU_DCI_FORMAT_A2;
@@ -7528,19 +6862,7 @@ RgSchUeCb       *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlAllocFillTpc
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchUlAlloc *alloc
-)
-#else
-Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHCmnUlAllocFillTpc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchUlAlloc *alloc)
 {
    alloc->grnt.tpc = rgSCHPwrPuschTpcForUe(cell, ue);
    return;
@@ -7562,19 +6884,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnAddUeToRefreshQ
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-uint32_t             wait
-)
-#else
-static Void rgSCHCmnAddUeToRefreshQ(cell, ue, wait)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-uint32_t             wait;
-#endif
+static Void rgSCHCmnAddUeToRefreshQ(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t wait)
 {
    RgSchCmnCell   *sched  = RG_SCH_CMN_GET_CELL(cell);
    CmTmrArg       arg;
@@ -7610,21 +6920,11 @@ uint32_t             wait;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlUeReset
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHCmnUlUeReset(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHCmnUlUeReset(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUlUe         *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
-   uint8_t                   lcgCnt=0;
+   uint8_t              lcgCnt=0;
    RgSchCmnLcg          *lcgCmn;
    CmLList              *node;
    RgSchCmnAllocRecord  *allRcd;
@@ -7676,17 +6976,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnResetRiCqi 
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHCmnResetRiCqi(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHCmnResetRiCqi(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell  *cellSchd = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUe    *ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell);
@@ -7742,21 +7032,11 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlUeReset
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHCmnDlUeReset(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHCmnDlUeReset(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   RgSchCmnDlCell       *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   RgSchCmnDlUe         *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
+   RgSchCmnCell   *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
+   RgSchCmnDlUe   *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
 
    if (ueDl->rachInfo.poLnk.node != NULLP)
@@ -7801,20 +7081,10 @@ RgSchUeCb    *ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHCmnUeReset
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHCmnUeReset(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHCmnUeReset(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
    uint8_t idx;
-   Pst               pst;
+   Pst     pst;
    RgInfResetHqEnt   hqEntRstInfo;
 
    /* RACHO: remove UE from pdcch, handover and rapId assoc Qs */
@@ -7875,19 +7145,9 @@ RgSchUeCb    *ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHCmnActvtUlUe
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHCmnActvtUlUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHCmnActvtUlUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell);
 
    /* : take care of this in UL retransmission */
    cellSchd->apisUl->rgSCHUlActvtUe(cell, ue);
@@ -7910,19 +7170,9 @@ RgSchUeCb    *ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHCmnActvtDlUe
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHCmnActvtDlUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHCmnActvtDlUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell);
 
    cellSchd->apisDl->rgSCHDlActvtUe(cell, ue);
    return;
@@ -7942,19 +7192,7 @@ RgSchUeCb    *ue;
  *
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHCmnHdlUlTransInd
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-CmLteTimingInfo timingInfo
-)
-#else
-Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-CmLteTimingInfo timingInfo;
-#endif
+Void rgSCHCmnHdlUlTransInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo)
 {
 
    /* Update the latest UL dat/sig transmission time */
@@ -7986,15 +7224,7 @@ CmLteTimingInfo timingInfo;
  *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
-#ifdef ANSI
-static RgSchCmnRank rgSCHCmnComp4TxMode4
-(
- uint32_t    *pmiBitMap
- )
-#else
-static RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap)
-   uint32_t  *pmiBitMap;
-#endif
+static RgSchCmnRank rgSCHCmnComp4TxMode4(uint32_t *pmiBitMap)
 {
    uint32_t bitMap0, bitMap1;
    bitMap0 = pmiBitMap[0];
@@ -8037,15 +7267,7 @@ static RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap)
  *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
-#ifdef ANSI
-static RgSchCmnRank rgSCHCmnComp2TxMode4
-(
- uint32_t    *pmiBitMap
- )
-#else
-static RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap)
-   uint32_t  *pmiBitMap;
-#endif
+static RgSchCmnRank rgSCHCmnComp2TxMode4(uint32_t *pmiBitMap)
 {
    uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
@@ -8078,15 +7300,7 @@ static RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap)
  *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
-#ifdef ANSI
-static RgSchCmnRank rgSCHCmnComp4TxMode3
-(
- uint32_t    *pmiBitMap
- )
-#else
-static RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap)
-   uint32_t  *pmiBitMap;
-#endif
+static RgSchCmnRank rgSCHCmnComp4TxMode3(uint32_t *pmiBitMap)
 {
    uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
@@ -8127,15 +7341,7 @@ static RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap)
  *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
-#ifdef ANSI
-static RgSchCmnRank rgSCHCmnComp2TxMode3
-(
- uint32_t *pmiBitMap
- )
-#else
-static RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap)
-   uint32_t *pmiBitMap;
-#endif
+static RgSchCmnRank rgSCHCmnComp2TxMode3(uint32_t *pmiBitMap)
 {
    uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
@@ -8170,19 +7376,7 @@ static RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap)
  *  @param[in]  uint8_t numTxPorts
  *  @return  RgSchCmnRank
  **/
-#ifdef ANSI
-static RgSchCmnRank rgSCHCmnComputeRank
-(
- RgrTxMode    txMode,
- uint32_t          *pmiBitMap,
- uint8_t           numTxPorts
- )
-#else
-static RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts)
-   RgrTxMode    txMode;
-   uint32_t          *pmiBitMap;
-   uint8_t           numTxPorts;
-#endif
+static RgSchCmnRank rgSCHCmnComputeRank(RgrTxMode txMode,uint32_t *pmiBitMap,uint8_t numTxPorts)
 {
 
    if (numTxPorts ==2 && txMode == RGR_UE_TM_3)
@@ -8223,23 +7417,12 @@ static RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts)
  *  @return  VOID
  **/
 /*KWORK_FIX:Changed function return type to void */
-#ifdef ANSI
-Void rgSCHCmnDlDeInitHqEnt 
-(
-RgSchCellCb  *cell,
-RgSchDlHqEnt *hqE
-)
-#else
-Void rgSCHCmnDlDeInitHqEnt(cell, hqE)
-RgSchCellCb  *cell;
-RgSchDlHqEnt *hqE;
-#endif
+Void rgSCHCmnDlDeInitHqEnt(RgSchCellCb  *cell,RgSchDlHqEnt *hqE)
 {
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   RgSchDlHqProcCb      *hqP;
-   uint8_t                   cnt;
-   S16                  ret;
-
+   RgSchCmnCell    *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchDlHqProcCb *hqP;
+   uint8_t         cnt;
+   S16             ret;
 
    ret = cellSchd->apisDl->rgSCHDlUeHqEntDeInit(cell, hqE);
    /* Free only If the Harq proc are created*/
@@ -8278,23 +7461,11 @@ RgSchDlHqEnt *hqE;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnDlInitHqEnt 
-(
-RgSchCellCb  *cell,
-RgSchDlHqEnt  *hqEnt
-)
-#else
-S16 rgSCHCmnDlInitHqEnt(cell, hqEnt)
-RgSchCellCb  *cell;
-RgSchDlHqEnt  *hqEnt;
-#endif
-
+S16 rgSCHCmnDlInitHqEnt(RgSchCellCb *cell,RgSchDlHqEnt *hqEnt)
 {
-   RgSchDlHqProcCb      *hqP;
-   uint8_t                   cnt;
-
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchDlHqProcCb *hqP;
+   uint8_t         cnt;
+   RgSchCmnCell    *cellSchd = RG_SCH_CMN_GET_CELL(cell);
 
    for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++)
    {
@@ -8343,17 +7514,7 @@ RgSchDlHqEnt  *hqEnt;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static uint8_t rgSCHCmnGetRefreshDist 
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue
-)
-#else
-static uint8_t rgSCHCmnGetRefreshDist(cell, ue)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-#endif
+static uint8_t rgSCHCmnGetRefreshDist(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    uint8_t   refOffst;
 #ifdef DEBUGP
@@ -8391,27 +7552,15 @@ RgSchUeCb          *ue;
  *     Invoked by: rgSCHCmnGetRefreshPer 
  *
  *  @param[in]  RgSchCellCb        *cell
- *  @param[in]  RgSchUeCb          *ue
- *  @param[in]  uint32_t                *waitPer 
- *  @return  Void
- *
- **/
-#ifdef ANSI
-static Void rgSCHCmnGetRefreshPer 
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint32_t                *waitPer
-)
-#else
-static Void rgSCHCmnGetRefreshPer(cell, ue, waitPer)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint32_t                *waitPer;
-#endif
+ *  @param[in]  RgSchUeCb          *ue
+ *  @param[in]  uint32_t                *waitPer 
+ *  @return  Void
+ *
+ **/
+static Void rgSCHCmnGetRefreshPer(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t *waitPer)
 {
-   uint32_t       refreshPer;     
-   uint32_t       crntSubFrm;
+   uint32_t  refreshPer;          
+   uint32_t  crntSubFrm;
 
 
    refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES;
@@ -8448,25 +7597,11 @@ uint32_t                *waitPer;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrSCellUeCfg
-(
-RgSchCellCb  *sCell,
-RgSchUeCb    *ue,
-RgrUeSecCellCfg  *sCellInfoCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err)
-RgSchCellCb  *sCell;
-RgSchUeCb    *ue;
-RgrUeSecCellCfg  *sCellInfoCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHCmnRgrSCellUeCfg(RgSchCellCb *sCell,RgSchUeCb *ue,RgrUeSecCellCfg *sCellInfoCfg,RgSchErrInfo *err)
 {
    uint8_t i;
-   S16                  ret;
-   uint8_t                   cnt;
+   S16     ret;
+   uint8_t cnt;
    RgSchCmnAllocRecord  *allRcd;
    RgSchDlRbAlloc       *allocInfo;
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell);
@@ -8673,20 +7808,10 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrSCellUeDel
-(
-RgSchUeCellInfo *sCellInfo,
-RgSchUeCb    *ue
-)
-#else
-S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue)
-RgSchUeCellInfo *sCellInfo;
-RgSchUeCb    *ue;
-#endif
+S16 rgSCHCmnRgrSCellUeDel(RgSchUeCellInfo *sCellInfo,RgSchUeCb *ue)
 {
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell);
-   Inst                 inst = ue->cell->instIdx;
+   RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell);
+   Inst         inst = ue->cell->instIdx;
 
 
    cellSchd->apisDl->rgSCHRgrSCellDlUeDel(sCellInfo, ue);
@@ -8743,19 +7868,7 @@ RgSchUeCb    *ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmn5gtfUeCfg
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-RgrUeCfg    *cfg
-)
-#else
-S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgrUeCfg    *cfg;
-#endif
+S16 rgSCHCmn5gtfUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *cfg)
 {
 
    RgSchUeGrp *ue5gtfGrp;
@@ -8813,33 +7926,19 @@ RgrUeCfg    *cfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrUeCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeCfg     *ueCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHCmnRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg,RgSchErrInfo *err)
 {
    RgSchDlRbAlloc  *allocInfo;
-   S16                  ret;
-   RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   RgSchCmnUe           *ueSchCmn;
-   RgSchCmnUlUe         *ueUl;
-   RgSchCmnDlUe         *ueDl;
-   uint8_t                   cnt;
+   S16              ret;
+   RgSchCmnCell     *cellSchd = RG_SCH_CMN_GET_CELL(cell);
+   RgSchCmnUe       *ueSchCmn;
+   RgSchCmnUlUe     *ueUl;
+   RgSchCmnDlUe     *ueDl;
+   uint8_t          cnt;
    RgSchCmnAllocRecord  *allRcd;
-   uint32_t                  waitPer;
-   uint32_t                  idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
-   RgSchUeCellInfo      *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue);
+   uint32_t         waitPer;
+   uint32_t         idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
+   RgSchUeCellInfo  *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue);
 
 
    /* 1. Allocate Common sched control block */
@@ -9080,35 +8179,9 @@ RgSchErrInfo *err;
  *  @return  Void
  **/
 #ifdef TFU_UPGRADE
-#ifdef ANSI
-static Void rgSCHCmnDlHdlTxModeRecfg
-(
-RgSchCellCb *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-uint8_t numTxPorts
-)
-#else
-static Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg, numTxPorts)
-RgSchCellCb *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-uint8_t numTxPorts;
-#endif
+static Void rgSCHCmnDlHdlTxModeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,uint8_t numTxPorts)
 #else
-#ifdef ANSI
-static Void rgSCHCmnDlHdlTxModeRecfg
-(
-RgSchCellCb *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg
-)
-#else
-static Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg)
-RgSchCellCb *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-#endif
+static Void rgSCHCmnDlHdlTxModeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg)
 #endif
 {
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -9199,21 +8272,7 @@ RgrUeRecfg   *ueRecfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUpdUeMimoInfo
-(
-RgrUeCfg     *ueCfg,
-RgSchCmnDlUe *ueDl,
-RgSchCellCb  *cell,
-RgSchCmnCell *cellSchd
-)
-#else
-static Void rgSCHCmnUpdUeMimoInfo(ueCfg, ueDl, cell, cellSchd)
-RgrUeCfg     *ueCfg;
-RgSchCmnDlUe *ueDl;
-RgSchCellCb  *cell;
-RgSchCmnCell *cellSchd;
-#endif
+static Void rgSCHCmnUpdUeMimoInfo(RgrUeCfg *ueCfg,RgSchCmnDlUe *ueDl,RgSchCellCb  *cell,RgSchCmnCell *cellSchd)
 {
 #ifdef TFU_UPGRADE
    if(ueCfg->txMode.pres)
@@ -9263,28 +8322,9 @@ RgSchCmnCell *cellSchd;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUpdUeUlCqiInfo
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-RgSchCmnUlUe  *ueUl,
-RgSchCmnUe    *ueSchCmn,
-RgSchCmnCell  *cellSchd,
-Bool          isEcp
-)
-#else
-static Void rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, isEcp)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchCmnUlUe *ueUl;
-RgSchCmnUe   *ueSchCmn;
-RgSchCmnCell *cellSchd;
-Bool          isEcp;
-#endif
+static Void rgSCHCmnUpdUeUlCqiInfo(RgSchCellCb *cell,RgSchUeCb *ue,RgSchCmnUlUe *ueUl,RgSchCmnUe *ueSchCmn,RgSchCmnCell *cellSchd,Bool isEcp)
 {
 
-
 #ifdef TFU_UPGRADE
    if(ue->srsCb.srsCfg.type  ==  RGR_SCH_SRS_SETUP)
    {
@@ -9339,17 +8379,7 @@ Bool          isEcp;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUpdUeCatCfg
-(
-RgSchUeCb    *ue,
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnUpdUeCatCfg(ue, cell)
-RgSchUeCb    *ue;
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnUpdUeCatCfg(RgSchUeCb *ue,RgSchCellCb  *cell)
 {
    RgSchDlHqEnt *hqE = NULLP;
    RgSchCmnUlUe *ueUl     = RG_SCH_CMN_GET_UL_UE(ue,cell);
@@ -9408,24 +8438,10 @@ RgSchCellCb  *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHCmnRgrUeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err)
 {
    RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell);
-   uint32_t          waitPer;
+   uint32_t     waitPer;
 
    /* Basic validations */
    if (ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG)
@@ -9570,17 +8586,7 @@ RgSchErrInfo *err;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUlUeDelAllocs
-(
-RgSchCellCb  *cell,
-RgSchUeCb   *ue
-)
-#else
-static Void rgSCHCmnUlUeDelAllocs(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb   *ue;
-#endif
+static Void rgSCHCmnUlUeDelAllocs(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@ -9651,17 +8657,7 @@ RgSchUeCb   *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnDelUeFrmRefreshQ
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue
-)
-#else
-static Void rgSCHCmnDelUeFrmRefreshQ(cell, ue)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-#endif
+static Void rgSCHCmnDelUeFrmRefreshQ(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell   *sched  = RG_SCH_CMN_GET_CELL(cell);
    CmTmrArg       arg;
@@ -9705,17 +8701,7 @@ RgSchUeCb       *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUeCcchSduDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ueCb
-)
-#else
-static Void rgSCHCmnUeCcchSduDel(cell, ueCb)
-RgSchCellCb  *cell;
-RgSchUeCb    *ueCb;
-#endif
+static Void rgSCHCmnUeCcchSduDel(RgSchCellCb  *cell,RgSchUeCb *ueCb)
 {
    RgSchDlHqEnt      *hqE = NULLP;
    RgSchDlHqProcCb   *ccchSduHqP = NULLP;
@@ -9780,17 +8766,7 @@ RgSchUeCb    *ueCb;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUeDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHCmnUeDel(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHCmnUeDel(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchDlHqEnt         *hqE = NULLP;
    RgSchCmnUlUe         *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
@@ -9920,24 +8896,14 @@ RgSchUeCb    *ue;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlCnsdrCmnRt
-(
-RgSchCellCb             *cell,
-RgrDlCmnCodeRateCfg     *dlCmnCodeRate
-)
-#else
-static S16 rgSCHCmnDlCnsdrCmnRt(cell, dlCmnCodeRate)
-RgSchCellCb             *cell;
-RgrDlCmnCodeRateCfg     *dlCmnCodeRate;
-#endif
+static S16 rgSCHCmnDlCnsdrCmnRt(RgSchCellCb *cell,RgrDlCmnCodeRateCfg  *dlCmnCodeRate)
 {
-   RgSchCmnCell         *cellDl = RG_SCH_CMN_GET_CELL(cell);
-   uint32_t                  bitsPerRb;
-   uint32_t                  bitsPer2Rb;
-   uint32_t                  bitsPer3Rb;
-   uint8_t                   i, rbNum;
-   uint32_t                  pdcchBits;
+   RgSchCmnCell *cellDl = RG_SCH_CMN_GET_CELL(cell);
+   uint32_t     bitsPerRb;
+   uint32_t     bitsPer2Rb;
+   uint32_t     bitsPer3Rb;
+   uint8_t      i, rbNum;
+   uint32_t     pdcchBits;
 
 
    /* code rate is bits per 1024 phy bits, since modl'n scheme is 2. it is
@@ -10042,39 +9008,27 @@ RgrDlCmnCodeRateCfg     *dlCmnCodeRate;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlRgrCellCfg
-(
-RgSchCellCb    *cell,
-RgrCellCfg     *cfg,
-RgSchErrInfo   *err
-)
-#else
-static S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err)
-RgSchCellCb    *cell;
-RgrCellCfg     *cfg;
-RgSchErrInfo   *err;
-#endif
+static S16 rgSCHCmnDlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cfg,RgSchErrInfo *err)
 {
    RgSchCmnCell         *cellSch;
-   uint8_t                   cp;
-   uint8_t                   sfCount;
-   uint8_t                   numPdcchSym;
-   uint8_t                   noSymPerSlot;
-   uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
-   uint8_t                   splSubfrmIdx = cfg->spclSfCfgIdx;
-   uint8_t                   swPtCnt = 0;
+   uint8_t              cp;
+   uint8_t              sfCount;
+   uint8_t              numPdcchSym;
+   uint8_t              noSymPerSlot;
+   uint8_t              maxDlSubfrms = cell->numDlSubfrms;
+   uint8_t              splSubfrmIdx = cfg->spclSfCfgIdx;
+   uint8_t              swPtCnt = 0;
    Bool                 isSplfrm;
    RgSchTddSubfrmInfo   subfrmInfo = rgSchTddMaxUlSubfrmTbl[cell->ulDlCfgIdx];
    S16                  ret;
-   uint8_t                   splSfIdx;
-   uint8_t                   antPortIdx;
-   uint8_t                   numCrs;
-   uint8_t                   cfi;  
-   uint8_t                   cfiIdx;
+   uint8_t              splSfIdx;
+   uint8_t              antPortIdx;
+   uint8_t              numCrs;
+   uint8_t              cfi;  
+   uint8_t              cfiIdx;
    RgSchDlSf            *sf;
-   uint8_t                   splSfCfi;
-   uint8_t                   mPhich;
+   uint8_t              splSfCfi;
+   uint8_t              mPhich;
 
    
 
@@ -10451,27 +9405,15 @@ RgSchErrInfo   *err;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlRgrCellCfg
-(
-RgSchCellCb             *cell,
-RgrCellCfg              *cfg,
-RgSchErrInfo            *err
-)
-#else
-static S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err)
-RgSchCellCb             *cell;
-RgrCellCfg              *cfg;
-RgSchErrInfo            *err;
-#endif
+static S16 rgSCHCmnDlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cfg,RgSchErrInfo *err)
 {
-   S16                 ret;
-   RgSchCmnCell        *cellSch;
-   uint8_t                   cp;
-   uint8_t                   numPdcchSym;
-   uint8_t                   noSymPerSlot;
-   uint8_t                   cfi;  
-   uint8_t                   cfiIdx;
+   S16          ret;
+   RgSchCmnCell *cellSch;
+   uint8_t      cp;
+   uint8_t      numPdcchSym;
+   uint8_t      noSymPerSlot;
+   uint8_t      cfi;  
+   uint8_t      cfiIdx;
 
 
    cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -10670,19 +9612,7 @@ RgSchErrInfo            *err;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-uint8_t rgSCHCmnUlCalcReqRbCeil
-(
-uint32_t            bytes,
-uint8_t             cqi,
-RgSchCmnUlCell *cellUl
-)
-#else
-uint8_t rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl)
-uint32_t            bytes;
-uint8_t             cqi;
-RgSchCmnUlCell *cellUl;
-#endif
+uint8_t rgSCHCmnUlCalcReqRbCeil(uint32_t bytes,uint8_t cqi,RgSchCmnUlCell *cellUl)
 {
    uint32_t numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff);
    return ((uint8_t)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl)));
@@ -10704,30 +9634,14 @@ RgSchCmnUlCell *cellUl;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnPrecompMsg3Vars
-(
-RgSchCmnUlCell *cellUl,
-uint8_t           ccchCqi,
-uint16_t          msgSzA,
-uint8_t           sbSize,
-Bool         isEcp
-)
-#else
-static S16 rgSCHCmnPrecompMsg3Vars(cellUl, ccchCqi, msgSzA, sbSize, isEcp)
-RgSchCmnUlCell *cellUl;
-uint8_t           ccchCqi;
-uint16_t          msgSzA;
-uint8_t           sbSize;
-Bool         isEcp;
-#endif
+static S16 rgSCHCmnPrecompMsg3Vars(RgSchCmnUlCell *cellUl,uint8_t ccchCqi,uint16_t msgSzA,uint8_t sbSize,Bool isEcp)
 {
-   uint8_t numSb;
-   uint8_t ccchTbs;
-   uint8_t ccchMcs;
-   uint8_t   numRb = 0;
-   uint8_t   iTbs = 0;
-   uint16_t  msg3GrntSz = 0;
+   uint8_t  numSb;
+   uint8_t  ccchTbs;
+   uint8_t  ccchMcs;
+   uint8_t  numRb = 0;
+   uint8_t  iTbs = 0;
+   uint16_t msg3GrntSz = 0;
 
 
    if (ccchCqi > cellUl->max16qamCqi)
@@ -10820,23 +9734,7 @@ uint32_t gPrntPucchDet=0;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnUlCalcAvailBw
-(
-RgSchCellCb    *cell,
-RgrCellCfg     *cellCfg,
-uint8_t              cfi,
-uint8_t             *rbStartRef,
-uint8_t             *bwAvailRef
-)
-#else
-static S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-uint8_t             cfi;  
-uint8_t            *rbStartRef;
-uint8_t            *bwAvailRef;
-#endif
+static S16 rgSCHCmnUlCalcAvailBw(RgSchCellCb *cell,RgrCellCfg *cellCfg,uint8_t cfi,uint8_t *rbStartRef,uint8_t  *bwAvailRef)
 {
    uint8_t  c        = 3;
    uint8_t  ulBw     = cell->bwCfg.ulTotalBw;
@@ -10844,7 +9742,6 @@ uint8_t            *bwAvailRef;
    uint8_t  pucchDeltaShft = cell->pucchCfg.deltaShift;
    uint16_t n1Pucch  = cell->pucchCfg.n1PucchAn;
    uint8_t  n1Cs     = cell->pucchCfg.cyclicShift;
-
    uint8_t  n1PerRb;
    uint8_t  totalCce;
    uint16_t n1Max;
@@ -10936,23 +9833,7 @@ uint8_t            *bwAvailRef;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnUlCalcAvailBw
-(
-RgSchCellCb    *cell,
-RgrCellCfg     *cellCfg,
-uint8_t              cfi,
-uint8_t             *rbStartRef,
-uint8_t             *bwAvailRef
-)
-#else
-static S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-uint8_t             cfi;
-uint8_t            *rbStartRef;
-uint8_t            *bwAvailRef;
-#endif
+static S16 rgSCHCmnUlCalcAvailBw(RgSchCellCb *cell,RgrCellCfg *cellCfg,uint8_t cfi,uint8_t *rbStartRef,uint8_t *bwAvailRef)
 {
    uint8_t  c        = 3;
    uint8_t  ulBw     = cell->bwCfg.ulTotalBw;
@@ -11056,51 +9937,41 @@ uint8_t            *bwAvailRef;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnUlCellInit
-(
- RgSchCellCb  *cell,
- RgrCellCfg   *cellCfg
- )
-#else
-static S16 rgSCHCmnUlCellInit(cell, cellCfg)
-   RgSchCellCb *cell;
-   RgrCellCfg  *cellCfg;
-#endif
+static S16 rgSCHCmnUlCellInit(RgSchCellCb  *cell,RgrCellCfg *cellCfg)
 {
    S16            ret;
    RgSchCmnUlCell *cellUl      = RG_SCH_CMN_GET_UL_CELL(cell);
-   uint8_t             maxUePerUlSf = cellCfg->maxUePerUlSf;
+   uint8_t maxUePerUlSf = cellCfg->maxUePerUlSf;
 #ifdef RGR_V1
    /* Added configuration for maximum number of MSG3s */
-   uint8_t             maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf;
-#endif
-   uint8_t             maxUlBwPerUe = cellCfg->maxUlBwPerUe;
-   uint8_t             sbSize       = cellCfg->puschSubBand.size;
-   uint8_t             i;
-   uint8_t             rbStart;
-   uint8_t             bwAvail;
-   uint8_t             cfi;  
-   uint8_t             maxSbPerUe;
-   uint8_t             numSb;
+   uint8_t maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf;
+#endif
+   uint8_t maxUlBwPerUe = cellCfg->maxUlBwPerUe;
+   uint8_t sbSize       = cellCfg->puschSubBand.size;
+   uint8_t i;
+   uint8_t rbStart;
+   uint8_t bwAvail;
+   uint8_t cfi;  
+   uint8_t maxSbPerUe;
+   uint8_t numSb;
 #ifdef LTE_TDD
-   uint16_t            ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint16_t ulDlCfgIdx = cell->ulDlCfgIdx;
    /* [ccpu00127294]-MOD-Change the max Ul subfrms size in TDD */
-   uint8_t             maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; 
-   uint8_t             ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL  * 2 */
-   uint8_t             maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
+   uint8_t  maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; 
+   uint8_t  ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL  * 2 */
+   uint8_t  maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                            [RGSCH_NUM_SUB_FRAMES-1];
-   uint16_t             subfrm;
-   S8             dlIdx;
+   uint16_t subfrm;
+   S8       dlIdx;
 #else
-   uint8_t             maxSubfrms = RG_SCH_CMN_UL_NUM_SF;
+   uint8_t  maxSubfrms = RG_SCH_CMN_UL_NUM_SF;
 #endif
 #ifdef LTE_L2_MEAS
-   uint8_t             idx;
+   uint8_t  idx;
 #endif
    uint8_t  iTbs;
 #if (defined(LTE_L2_MEAS) )
-   Inst           inst         = cell->instIdx;
+   Inst  inst         = cell->instIdx;
 #endif /* #if (defined(LTE_L2_MEAS) || defined(DEBUGP) */
    RgSchCmnCell      *cellSch =  (RgSchCmnCell *)(cell->sc.sch);
    
@@ -11390,21 +10261,9 @@ static S16 rgSCHCmnUlCellInit(cell, cellCfg)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrCellCfg
-(
-RgSchCellCb   *cell,
-RgrCellCfg    *cellCfg,
-RgSchErrInfo  *err
-)
-#else
-S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *err;
-#endif
+S16 rgSCHCmnRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err)
 {
-   S16       ret;
+   S16 ret;
    RgSchCmnCell *cellSch;
 
    /* As part of RGR cell configuration, validate the CRGCellCfg
@@ -11526,19 +10385,7 @@ RgSchErrInfo  *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHCmnRgrCellRecfg
-(
-RgSchCellCb             *cell,
-RgrCellRecfg            *recfg,
-RgSchErrInfo            *err
-)
-#else
-S16 rgSCHCmnRgrCellRecfg(cell, recfg, err)
-RgSchCellCb             *cell;
-RgrCellRecfg            *recfg;
-RgSchErrInfo            *err;
-#endif
+S16 rgSCHCmnRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err)
 {
    S16                  ret;
    RgSchCmnCell         *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -11646,18 +10493,10 @@ RgSchErrInfo            *err;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUlCellDeinit
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSCHCmnUlCellDeinit(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSCHCmnUlCellDeinit(RgSchCellCb *cell)
 {
    RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   uint8_t               ulSfIdx;
+   uint8_t          ulSfIdx;
 #ifdef LTE_TDD
    uint8_t        maxSubfrms = cellUl->numUlSubfrms;
 #endif
@@ -11740,15 +10579,7 @@ RgSchCellCb *cell;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnCellDel
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHCmnCellDel(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHCmnCellDel(RgSchCellCb *cell)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -11825,19 +10656,9 @@ RgSchCellCb  *cell;
  *  @return                    S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnValidateDlQos
-(
-RgrLchQosCfg            *dlQos
-)
-#else
-static S16 rgSCHCmnValidateDlQos(dlQos)
-RgrLchQosCfg            *dlQos;
-#endif
+static S16 rgSCHCmnValidateDlQos(RgrLchQosCfg *dlQos)
 {
    uint8_t qci = dlQos->qci;
-
-
    if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI )
    {
       return RFAILED;
@@ -11874,7 +10695,6 @@ RgrLchQosCfg            *dlQos;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnRgrLchCfg
 (
 RgSchCellCb  *cell,
@@ -11883,14 +10703,6 @@ RgSchDlLcCb  *dlLc,
 RgrLchCfg *lcCfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchCfg *lcCfg;
-RgSchErrInfo *err;
-#endif
 {
    S16 ret;
 
@@ -12018,7 +10830,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnRgrLchRecfg
 (
 RgSchCellCb  *cell,
@@ -12027,14 +10838,6 @@ RgSchDlLcCb  *dlLc,
 RgrLchRecfg  *lcRecfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchRecfg  *lcRecfg;
-RgSchErrInfo *err;
-#endif
 {
    S16   ret;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -12138,7 +10941,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnRgrLcgCfg
 (
 RgSchCellCb  *cell,
@@ -12147,14 +10949,6 @@ RgSchLcgCb   *lcg,
 RgrLcgCfg    *lcgCfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgCfg    *lcgCfg;
-RgSchErrInfo *err;
-#endif
 {
    S16 ret;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -12212,7 +11006,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnRgrLcgRecfg
 (
 RgSchCellCb  *cell,
@@ -12221,14 +11014,6 @@ RgSchLcgCb   *lcg,
 RgrLcgRecfg  *reCfg,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgRecfg  *reCfg;
-RgSchErrInfo *err;
-#endif
 {
    S16 ret;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -12284,21 +11069,7 @@ RgSchErrInfo *err;
  *
  *     File :
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHCmnRgrLchDel 
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-CmLteLcId     lcId,
-uint8_t            lcgId
-)
-#else
-S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-CmLteLcId     lcId;
-uint8_t            lcgId;
-#endif
+S16 rgSCHCmnRgrLchDel(RgSchCellCb *cell,RgSchUeCb *ue,CmLteLcId lcId,uint8_t lcgId)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 #ifdef EMTC_ENABLE
@@ -12328,19 +11099,7 @@ uint8_t            lcgId;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnLcgDel
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-RgSchLcgCb    *lcg
-)
-#else
-Void rgSCHCmnLcgDel(cell, ue, lcg)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-RgSchLcgCb    *lcg;
-#endif
+Void rgSCHCmnLcgDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnLcg  *lcgCmn = RG_SCH_CMN_GET_UL_LCG(lcg);
@@ -12400,19 +11159,7 @@ RgSchLcgCb    *lcg;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnFreeDlLc
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHCmnFreeDlLc(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHCmnFreeDlLc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    if (svc->sch == NULLP)
@@ -12482,17 +11229,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchSduRetxFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchSduRetxFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchSduRetxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList           *node;
    RgSchCmnDlCell    *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -12555,17 +11292,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchRetxFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchRetxFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchRetxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList           *node;
    RgSchCmnDlCell    *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -12629,17 +11356,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchSduTxFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchSduTxFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchSduTxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList           *node;
    RgSchUeCb         *ueCb;
@@ -12720,17 +11437,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlCcchTxFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlCcchTxFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlCcchTxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList           *node;
    RgSchRaCb         *raCb;
@@ -12813,17 +11520,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t rgSCHCmnGetBiIndex
-(
-RgSchCellCb   *cell,
-uint32_t           ueCount
-)
-#else
-uint8_t rgSCHCmnGetBiIndex(cell, ueCount)
-RgSchCellCb   *cell;
-uint32_t           ueCount;
-#endif
+uint8_t rgSCHCmnGetBiIndex(RgSchCellCb *cell,uint32_t ueCount)
 {
    S16  prevVal = 0;      /* To Store Intermediate Value */
    uint16_t  newBiVal = 0;     /* To store Bi Value in millisecond */
@@ -12900,19 +11597,9 @@ uint32_t           ueCount;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlRaRspFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlRaRspFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlRaRspFnlz(RgSchCellCb  *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   uint32_t            rarCnt = 0;
+   uint32_t       rarCnt = 0;
    RgSchDlRbAlloc *raRspAlloc;
    RgSchDlSf      *subFrm = NULLP;
    RgSchRaCb      *raCb;
@@ -12922,11 +11609,11 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    Bool           preamGrpA;
    RgSchUlAlloc   *ulAllocRef=NULLP;
    RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   uint8_t              allocRapidCnt = 0;
+   uint8_t        allocRapidCnt = 0;
 #ifdef LTE_TDD
-   uint32_t            msg3SchdIdx = 0;
-   uint8_t             ulDlCfgIdx = cell->ulDlCfgIdx;
-   uint8_t             msg3Subfrm;
+   uint32_t       msg3SchdIdx = 0;
+   uint8_t        ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t        msg3Subfrm;
 #endif
 
 
@@ -13111,20 +11798,8 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @param[in]   uint16_t             i
  *  @return  uint8_t
  *
- **/
-#ifdef ANSI
-static uint8_t rgSCHCmnDlCalcRvForBcch
-(
-RgSchCellCb          *cell,
-Bool                 si,
-uint16_t             i
-)
-#else
-static uint8_t rgSCHCmnDlCalcRvForBcch(cell, si, i)
-RgSchCellCb          *cell;
-Bool                 si;
-uint16_t             i;
-#endif
+ **/
+static uint8_t rgSCHCmnDlCalcRvForBcch(RgSchCellCb *cell,Bool si,uint16_t i)
 {
    uint8_t k, rv;
    CmLteTimingInfo   frm;
@@ -13165,28 +11840,18 @@ uint16_t             i;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlBcchPcchFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlBcchPcchFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlBcchPcchFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlRbAlloc *rbAllocInfo;
    RgSchDlSf      *subFrm;
 
 #ifdef LTE_TDD
-   uint8_t             nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
+   uint8_t        nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
 #else
 #ifdef LTEMAC_HDFDD
-   uint8_t             nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t        nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
 #else
-   uint8_t             nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t        nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
 #endif
 #endif
 
@@ -13374,15 +12039,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlSetAllUnSched
-(
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnUlSetAllUnSched(allocInfo)
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnUlSetAllUnSched(RgSchCmnUlRbAllocInfo *allocInfo)
 {
    CmLList            *node;
 
@@ -13427,17 +12084,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnUlAdd2CntResLst
-(
-RgSchCmnUlRbAllocInfo *allocInfo,
-RgSchUeCb             *ue
-)
-#else
-Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue)
-RgSchCmnUlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-#endif
+Void rgSCHCmnUlAdd2CntResLst(RgSchCmnUlRbAllocInfo *allocInfo,RgSchUeCb *ue)
 {
    RgSchCmnUeUlAlloc  *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,ue->cell))->alloc);
    cmLListAdd2Tail(&allocInfo->contResLst, &ulAllocInfo->reqLnk);
@@ -13460,19 +12107,7 @@ RgSchUeCb             *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnUlAdd2UeLst
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-RgSchUeCb             *ue
-)
-#else
-Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-#endif
+Void rgSCHCmnUlAdd2UeLst(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUeCb *ue)
 {
    RgSchCmnUeUlAlloc  *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,cell))->alloc);
    if (ulAllocInfo->reqLnk.node == NULLP)
@@ -13497,17 +12132,7 @@ RgSchUeCb             *ue;
  *  @param[in]  RgSchCmnUlRbAllocInfo *allocInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnAllocUlRb
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHCmnAllocUlRb(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHCmnAllocUlRb(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchUlSf         *sf = allocInfo->sf;
 
@@ -13532,28 +12157,16 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCmnUlRbAllocForLst
 (
-RgSchCellCb           *cell,
-RgSchUlSf             *sf,
-uint32_t                   count,
-CmLListCp             *reqLst,
-CmLListCp             *schdLst,
-CmLListCp             *nonSchdLst,
-Bool                  isNewTx
+RgSchCellCb  *cell,
+RgSchUlSf    *sf,
+uint32_t     count,
+CmLListCp    *reqLst,
+CmLListCp    *schdLst,
+CmLListCp    *nonSchdLst,
+Bool         isNewTx
 )
-#else
-static Void rgSCHCmnUlRbAllocForLst(cell, sf, count, reqLst, schdLst,
-                                     nonSchdLst, isNewTx)
-RgSchCellCb           *cell;
-RgSchUlSf             *sf;
-uint32_t                   count;
-CmLListCp             *reqLst;
-CmLListCp             *schdLst;
-CmLListCp             *nonSchdLst;
-Bool                  isNewTx;
-#endif
 {
    CmLList          *lnk;
    RgSchUlHole      *hole;
@@ -13662,29 +12275,17 @@ Bool                  isNewTx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCmnUlMdfyGrntForCqi
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-uint32_t          maxRb,
-uint32_t          *numSb,
-uint8_t           *iTbs,
-uint32_t          hqSz,
-uint32_t          stepDownItbs,
-uint32_t          effTgt
+uint32_t     maxRb,
+uint32_t     *numSb,
+uint8_t      *iTbs,
+uint32_t     hqSz,
+uint32_t     stepDownItbs,
+uint32_t     effTgt
 )
-#else
-static S16 rgSCHCmnUlMdfyGrntForCqi(cell, ue, maxRb, numSb, iTbs, hqSz, stepDownItbs, effTgt)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint32_t          maxRb;
-uint32_t          *numSb;
-uint8_t           *iTbs;
-uint32_t          hqSz;
-uint32_t          stepDownItbs;
-uint32_t          effTgt;
-#endif
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(ue->cell);
    uint32_t  nPrb;
@@ -13788,31 +12389,22 @@ uint32_t          effTgt;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCmnUlRbAllocForUe
 (
-RgSchCellCb           *cell,
-RgSchUlSf             *sf,
-RgSchUeCb             *ue,
-uint8_t                    maxRb,
-RgSchUlHole           *hole
+RgSchCellCb  *cell,
+RgSchUlSf    *sf,
+RgSchUeCb    *ue,
+uint8_t      maxRb,
+RgSchUlHole  *hole
 )
-#else
-static S16 rgSCHCmnUlRbAllocForUe(cell, sf, ue, maxRb, hole)
-RgSchCellCb           *cell;
-RgSchUlSf             *sf;
-RgSchUeCb             *ue;
-uint8_t                    maxRb;
-RgSchUlHole           *hole;
-#endif
 {
-   RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   RgSchCmnUlUe    *ueUl    = RG_SCH_CMN_GET_UL_UE(ue, cell);
-   RgSchUlAlloc     *alloc = NULLP;
-   uint32_t              nPrb = 0;
-   uint8_t               numVrbg;
-   uint8_t               iMcs;
-   uint8_t               iMcsCrnt;
+   RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   RgSchCmnUlUe   *ueUl    = RG_SCH_CMN_GET_UL_UE(ue, cell);
+   RgSchUlAlloc   *alloc = NULLP;
+   uint32_t       nPrb = 0;
+   uint8_t        numVrbg;
+   uint8_t        iMcs;
+   uint8_t        iMcsCrnt;
 #ifndef RG_5GTF
    RgSchUlHqProcCb  *proc = &ueUl->hqEnt.hqProcCb[cellUl->schdHqProcIdx];
 #else
@@ -13965,19 +12557,7 @@ RgSchUlHole           *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHCmnUlRbAllocAddUeToLst
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue,
-CmLListCp             *lst
-)
-#else
-Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-CmLListCp             *lst;
-#endif
+Void rgSCHCmnUlRbAllocAddUeToLst(RgSchCellCb *cell,RgSchUeCb *ue,CmLListCp *lst)
 {
    RgSchCmnUlUe   *ueUl   = RG_SCH_CMN_GET_UL_UE(ue,cell);
    UNUSED(cell);
@@ -14008,17 +12588,7 @@ CmLListCp             *lst;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnUlAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnUlAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -14044,15 +12614,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlAllocFnlz
-(
-RgSchCellCb           *cell
-)
-#else
-Void rgSCHCmnDlAllocFnlz(cell)
-RgSchCellCb           *cell;
-#endif
+Void rgSCHCmnDlAllocFnlz(RgSchCellCb  *cell)
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlRbAllocInfo  *allocInfo = &cellSch->allocInfo; 
@@ -14093,19 +12655,7 @@ RgSchCellCb           *cell;
  *  @param[in]  RgSchUlSf *sf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlUpdSf
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-RgSchUlSf *sf
-)
-#else
-static Void rgSCHCmnUlUpdSf(cell, allocInfo, sf)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-RgSchUlSf *sf;
-#endif
+static Void rgSCHCmnUlUpdSf(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUlSf *sf)
 {
    CmLList        *lnk;
 
@@ -14164,23 +12714,9 @@ RgSchUlSf *sf;
  *  @param[in]  RgSchUlAlloc  *alloc
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlHndlAllocRetx
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-RgSchUlSf     *sf,
-RgSchUlAlloc  *alloc
-)
-#else
-static Void rgSCHCmnUlHndlAllocRetx(cell, allocInfo, sf, alloc)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-RgSchUlSf     *sf;
-RgSchUlAlloc  *alloc;
-#endif
+static Void rgSCHCmnUlHndlAllocRetx(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUlSf *sf,RgSchUlAlloc  *alloc)
 {
-   uint32_t            bytes;
+   uint32_t       bytes;
    RgSchCmnUlUe   *ueUl;
    bytes = \
       rgTbSzTbl[0][rgSCHCmnUlGetITbsFrmIMcs(alloc->grnt.iMcs)]\
@@ -14235,15 +12771,7 @@ RgSchUlAlloc  *alloc;
  *  @return  Void
  **/
 /* ccpu00132653- The definition of this function made common for TDD and FDD*/
-#ifdef ANSI
-static Void rgSCHCmnUlAlloc
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnUlAlloc(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnUlAlloc(RgSchCellCb  *cell)
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUlCell         *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
@@ -14360,19 +12888,11 @@ RgSchCellCb  *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnSndCnsldtInfo
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHCmnSndCnsldtInfo(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHCmnSndCnsldtInfo(RgSchCellCb *cell)
 {
-   RgInfSfAlloc           *subfrmAlloc;
-   Pst                    pst;
-   RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   RgInfSfAlloc  *subfrmAlloc;
+   Pst           pst;
+   RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
 
    subfrmAlloc = &(cell->sfAllocArr[cell->crntSfIdx]);
@@ -14428,23 +12948,15 @@ RgSchCellCb  *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnCnsldtSfAlloc
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHCmnCnsldtSfAlloc(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHCmnCnsldtSfAlloc(RgSchCellCb  *cell)
 {
-   RgInfSfAlloc           *subfrmAlloc;
-   CmLteTimingInfo        frm;
-   RgSchDlSf              *dlSf;
-   CmLListCp              dlDrxInactvTmrLst;
-   CmLListCp              dlInActvLst;
-   CmLListCp              ulInActvLst;
-   RgSchCmnCell           *cellSch = NULLP;
+   RgInfSfAlloc     *subfrmAlloc;
+   CmLteTimingInfo  frm;
+   RgSchDlSf        *dlSf;
+   CmLListCp        dlDrxInactvTmrLst;
+   CmLListCp        dlInActvLst;
+   CmLListCp        ulInActvLst;
+   RgSchCmnCell     *cellSch = NULLP;
 
 
    cmLListInit(&dlDrxInactvTmrLst);
@@ -14494,15 +13006,7 @@ RgSchCellCb  *cell;
  *  @param[out]  RgSchCmnDlRbAllocInfo  *allocInfo
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnInitDlRbAllocInfo
-(
-RgSchCmnDlRbAllocInfo  *allocInfo
-)
-#else
-static Void rgSCHCmnInitDlRbAllocInfo(allocInfo)
-RgSchCmnDlRbAllocInfo  *allocInfo;
-#endif
+static Void rgSCHCmnInitDlRbAllocInfo(RgSchCmnDlRbAllocInfo  *allocInfo)
 {
    memset(&allocInfo->pcchAlloc, 0, sizeof(RgSchDlRbAlloc));
    memset(&allocInfo->bcchAlloc, 0, sizeof(RgSchDlRbAlloc));
@@ -14568,15 +13072,7 @@ RgSchCmnDlRbAllocInfo  *allocInfo;
  *  @param[out]  RgSchCmnUlRbAllocInfo  *allocInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnInitUlRbAllocInfo
-(
-RgSchCmnUlRbAllocInfo  *allocInfo
-)
-#else
-Void rgSCHCmnInitUlRbAllocInfo(allocInfo)
-RgSchCmnUlRbAllocInfo  *allocInfo;
-#endif
+Void rgSCHCmnInitUlRbAllocInfo(RgSchCmnUlRbAllocInfo  *allocInfo)
 {
    allocInfo->sf = NULLP;
    cmLListInit(&allocInfo->contResLst);
@@ -14604,21 +13100,9 @@ RgSchCmnUlRbAllocInfo  *allocInfo;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnGrpPwrCntrlPucch
-(
-RgSchCellCb            *cell,
-RgSchDlSf              *dlSf
-)
-#else
-static Void rgSCHCmnGrpPwrCntrlPucch(cell, dlSf)
-RgSchCellCb            *cell;
-RgSchDlSf              *dlSf;
-#endif
+static Void rgSCHCmnGrpPwrCntrlPucch(RgSchCellCb *cell,RgSchDlSf *dlSf)
 {
-
    rgSCHPwrGrpCntrlPucch(cell, dlSf);
-
    return;
 }
 
@@ -14637,17 +13121,7 @@ RgSchDlSf              *dlSf;
  *  @param[in]  RgSchUlSf   *ulSf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnGrpPwrCntrlPusch
-(
-RgSchCellCb            *cell,
-RgSchUlSf              *ulSf
-)
-#else
-static Void rgSCHCmnGrpPwrCntrlPusch(cell, ulSf)
-RgSchCellCb            *cell;
-RgSchUlSf              *ulSf;
-#endif
+static Void rgSCHCmnGrpPwrCntrlPusch(RgSchCellCb *cell,RgSchUlSf *ulSf)
 {
    /*removed unused variable *cellSch*/
    CmLteTimingInfo        frm;
@@ -14693,22 +13167,12 @@ RgSchUlSf              *ulSf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnApplyUeRefresh 
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue
-)
-#else
-static S16 rgSCHCmnApplyUeRefresh(cell, ue)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-#endif
+static S16 rgSCHCmnApplyUeRefresh(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
-   RgSchCmnCell    *cellSch     = RG_SCH_CMN_GET_CELL(cell);
-   uint32_t             effGbrBsr    = 0;
-   uint32_t             effNonGbrBsr = 0;
-   uint32_t             lcgId;
+   RgSchCmnCell *cellSch     = RG_SCH_CMN_GET_CELL(cell);
+   uint32_t     effGbrBsr    = 0;
+   uint32_t     effNonGbrBsr = 0;
+   uint32_t     lcgId;
 
 
    /* Reset the refresh cycle variableCAP */
@@ -14766,17 +13230,11 @@ RgSchUeCb       *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCmnTmrExpiry
 (
 PTR cb,               /* Pointer to timer control block */
 S16 tmrEvnt           /* Timer Event */
 )
-#else
-static S16 rgSCHCmnTmrExpiry(cb, tmrEvnt)
-PTR cb;               /* Pointer to timer control block */
-S16 tmrEvnt;           /* Timer Event */
-#endif
 {
    RgSchUeCb       *ue = (RgSchUeCb *)cb;
    RgSchCellCb     *cell = ue->cell;
@@ -14817,15 +13275,7 @@ S16 tmrEvnt;           /* Timer Event */
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnTmrProc
-(
-RgSchCellCb *cell
-)
-#else
-static S16 rgSCHCmnTmrProc(cell)
-RgSchCellCb *cell;
-#endif
+static S16 rgSCHCmnTmrProc(RgSchCellCb *cell)
 {
    RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
@@ -14875,27 +13325,17 @@ RgSchCellCb *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSchCmnUpdCfiVal
-(
-RgSchCellCb     *cell,
-uint8_t              delta
-)
-#else
-static Void rgSchCmnUpdCfiVal(cell, delta)
-RgSchCellCb     *cell;
-uint8_t              delta;
-#endif  
+static Void rgSchCmnUpdCfiVal(RgSchCellCb *cell,uint8_t delta)
 {
    RgSchDlSf        *dlSf;
    CmLteTimingInfo  pdsch;
-   RgSchCmnDlCell  *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); 
-   uint8_t               dlIdx;
+   RgSchCmnDlCell   *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); 
+   uint8_t          dlIdx;
 #ifdef LTE_TDD
-   uint8_t               mPhich;
+   uint8_t          mPhich;
    RgSchDlSf        *tddSf;
-   uint8_t               idx;
-   uint8_t               splSfCfi = 0;
+   uint8_t          idx;
+   uint8_t          splSfCfi = 0;
 #endif    
 
 
@@ -14976,34 +13416,12 @@ uint8_t              delta;
  *
  **********************************************************/
 #ifdef LTE_TDD
-#ifdef ANSI
-static Void rgSchCmnUpdtPdcchSfIdx 
-(
-RgSchCellCb     *cell,
-uint8_t              dlIdx,
-uint8_t              sfNum
-)
-#else
-static Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx, sfNum)
-RgSchCellCb     *cell;
-uint8_t              dlIdx;
-uint8_t              sfNum;
-#endif   
-#else
-#ifdef ANSI
-static Void rgSchCmnUpdtPdcchSfIdx 
-(
-RgSchCellCb     *cell,
-uint8_t              dlIdx
-)
+static Void rgSchCmnUpdtPdcchSfIdx(RgSchCellCb *cell,uint8_t dlIdx,uint8_t sfNum)
 #else
-static Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx)
-RgSchCellCb     *cell;
-uint8_t              dlIdx;
-#endif    
+static Void rgSchCmnUpdtPdcchSfIdx(RgSchCellCb *cell,uint8_t dlIdx)
 #endif
 {
-   uint8_t         idx;
+   uint8_t  idx;
 
 
    /* Resetting the parameters on CFI switching */
@@ -15049,31 +13467,21 @@ uint8_t              dlIdx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSchCmnUpdCfiDb 
-(
-RgSchCellCb     *cell,
-uint8_t              delta 
-)
-#else
-Void rgSchCmnUpdCfiDb(cell, delta)
-RgSchCellCb     *cell;
-uint8_t              delta;
-#endif 
+Void rgSchCmnUpdCfiDb(RgSchCellCb *cell,uint8_t delta)
 {
-   CmLteTimingInfo        frm;
-   RgSchDlSf              *dlSf;
+   CmLteTimingInfo   frm;
+   RgSchDlSf         *dlSf;
 #ifdef LTE_TDD
-   uint8_t                     mPhich;
-   Bool                   isHiDci0; 
+   uint8_t           mPhich;
+   Bool              isHiDci0; 
 #endif      
-   RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell); 
-   uint8_t                     nCceLowerCfi = 0;
-   uint8_t                     currCfi;
-   uint8_t                     cceFailIdx;
-   uint32_t                    totalCce;
-   uint8_t                     dlIdx;
-   uint16_t                    ttiMod;
+   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell); 
+   uint8_t           nCceLowerCfi = 0;
+   uint8_t           currCfi;
+   uint8_t           cceFailIdx;
+   uint32_t          totalCce;
+   uint8_t           dlIdx;
+   uint16_t          ttiMod;
 
 
    /* Get Downlink Subframe */   
@@ -15245,15 +13653,7 @@ uint8_t              delta;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnDlCommonChSch
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHCmnDlCommonChSch(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHCmnDlCommonChSch(RgSchCellCb  *cell)
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -15301,15 +13701,7 @@ RgSchCellCb  *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlSch
-(
-RgSchCellCb  *cell
-)
-#else
-Void  rgSCHCmnUlSch(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHCmnUlSch(RgSchCellCb  *cell)
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    
@@ -15382,19 +13774,7 @@ RgSchCellCb  *cell;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlDedBoUpd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHCmnDlDedBoUpd(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHCmnDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb   *ue,RgSchDlLcCb *svc)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -15457,17 +13837,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnRmvFrmTaLst
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-Void rgSCHCmnRmvFrmTaLst(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+Void rgSCHCmnRmvFrmTaLst(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
 
@@ -15505,17 +13875,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlMsg4ProcRmvFrmRetx 
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHCmnDlMsg4ProcRmvFrmRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -15557,17 +13917,7 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlProcAddToRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHCmnDlProcAddToRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHCmnDlProcAddToRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -15631,24 +13981,10 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlSetUeRi
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint8_t                 ri,
-Bool               isPer
-)
-#else
-static Void rgSCHCmnDlSetUeRi(cell, ue, ri, isPer)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint8_t                 ri;
-Bool               isPer;
-#endif
+static Void rgSCHCmnDlSetUeRi(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t ri,Bool isPer)
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   RgSchCmnUeInfo    *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue);
+   RgSchCmnUeInfo *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue);
    
 #ifdef TFU_UPGRADE
    RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ue,cell);
@@ -15747,19 +14083,7 @@ Bool               isPer;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlSetUePmi
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint8_t                 pmi
-)
-#else
-static S16 rgSCHCmnDlSetUePmi(cell, ue, pmi)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint8_t                 pmi;
-#endif
+static S16 rgSCHCmnDlSetUePmi(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t pmi)
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
@@ -15823,35 +14147,20 @@ uint8_t                 pmi;
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode10
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi,
- Bool               *isCqiAvail
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi, isCqiAvail)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
- Bool               *isCqiAvail;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi,
+Bool          *isCqiAvail
+)
 #else
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode10
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -15914,37 +14223,21 @@ static inline Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi)
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode11
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi,
- Bool               *isCqiAvail,
- Bool               *is2ndCwCqiAvail
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
- Bool               *isCqiAvail;
- Bool               *is2ndCwCqiAvail;
-#endif
+RgSchCellCb    *cell,
+RgSchUeCb      *ue,
+TfuDlCqiPucch  *pucchCqi,
+Bool           *isCqiAvail,
+Bool           *is2ndCwCqiAvail
+)
 #else
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode11
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
-#endif
+RgSchCellCb    *cell,
+RgSchUeCb      *ue,
+TfuDlCqiPucch  *pucchCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -16019,35 +14312,20 @@ static inline Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi)
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode20
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi,
- Bool               *isCqiAvail
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi, isCqiAvail )
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
- Bool               *isCqiAvail;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi,
+Bool          *isCqiAvail
+)
 #else
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode20
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -16114,38 +14392,21 @@ static inline Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi)
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode21
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi,
- Bool               *isCqiAvail,
- Bool               *is2ndCwCqiAvail
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail)
-   RgSchCellCb        *cell;
-   RgSchUeCb          *ue;
- TfuDlCqiPucch        *pucchCqi;
-   TfuDlCqiRpt        *dlCqiRpt;
-   Bool               *isCqiAvail;
-   Bool               *is2ndCwCqiAvail;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi,
+Bool          *isCqiAvail,
+Bool          *is2ndCwCqiAvail
+)
 #else
-#ifdef ANSI
 static inline Void rgSCHCmnDlProcCqiMode21
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi
- )
-#else
-static inline Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -16227,39 +14488,22 @@ static inline Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi)
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static Void rgSCHCmnDlCqiOnPucchInd
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi,
- RgrUeCqiRept       *ueCqiRept,
- Bool               *isCqiAvail,
- Bool               *is2ndCwCqiAvail
- )
-#else
-static Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
- RgrUeCqiRept       *ueCqiRept;
- Bool               *isCqiAvail;
- Bool               *is2ndCwCqiAvail;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi,
+RgrUeCqiRept  *ueCqiRept,
+Bool          *isCqiAvail,
+Bool          *is2ndCwCqiAvail
+)
 #else
-#ifdef ANSI
 static Void rgSCHCmnDlCqiOnPucchInd
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPucch      *pucchCqi
- )
-#else
-static Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPucch      *pucchCqi;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPucch *pucchCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -16347,39 +14591,22 @@ static Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi)
  *      -# RFAILED
  **/
 #ifdef RGR_CQI_REPT
-#ifdef ANSI
 static Void rgSCHCmnDlCqiOnPuschInd
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPusch      *puschCqi,
- RgrUeCqiRept       *ueCqiRept,
- Bool               *isCqiAvail,
- Bool               *is2ndCwCqiAvail
- )
-#else
-static Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail)
- RgSchCellCb        *cell;
- RgSchUeCb          *ue;
- TfuDlCqiPusch      *puschCqi;
- RgrUeCqiRept       *ueCqiRept;
- Bool               *isCqiAvail;
- Bool               *is2ndCwCqiAvail;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPusch *puschCqi,
+RgrUeCqiRept  *ueCqiRept,
+Bool          *isCqiAvail,
+Bool          *is2ndCwCqiAvail
+)
 #else
-#ifdef ANSI
 static Void rgSCHCmnDlCqiOnPuschInd
 (
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuDlCqiPusch      *puschCqi
- )
-#else
-static Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
-   RgSchCellCb        *cell;
-   RgSchUeCb          *ue;
-   TfuDlCqiPusch      *puschCqi;
-#endif
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+TfuDlCqiPusch *puschCqi
+)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -16615,23 +14842,14 @@ static Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnDlCqiInd
 (
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-Bool               isPucchInfo,
-Void               *dlCqi,
-CmLteTimingInfo    timingInfo
+RgSchCellCb     *cell,
+RgSchUeCb       *ue,
+Bool            isPucchInfo,
+Void            *dlCqi,
+CmLteTimingInfo timingInfo
 )
-#else
-Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-Bool               isPucchInfo;
-Void               *dlCqi;
-CmLteTimingInfo    timingInfo;
-#endif
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 /* ccpu00117452 - MOD - Changed macro name from
@@ -16801,17 +15019,7 @@ CmLteTimingInfo    timingInfo;
  *  @return  Wideband CQI
  *
  **/
-#ifdef ANSI
-static uint8_t rgSCHCmnCalcWcqiFrmSnr
-(
- RgSchCellCb        *cell,
- TfuSrsRpt        *srsRpt
- )
-#else
-static uint8_t rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
-   RgSchCellCb        *cell;
-   TfuSrsRpt            *srsRpt;
-#endif
+static uint8_t rgSCHCmnCalcWcqiFrmSnr(RgSchCellCb *cell, TfuSrsRpt *srsRpt)
 {
    uint8_t wideCqi=1; /*Calculated value from SNR*/
    /*Need to map a certain SNR with a WideCQI value.
@@ -16861,21 +15069,7 @@ static uint8_t rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnSrsInd
-(
- RgSchCellCb        *cell,
- RgSchUeCb          *ue,
- TfuSrsRpt        *srsRpt,
- CmLteTimingInfo    timingInfo
- )
-#else
-Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
-    RgSchCellCb        *cell;
-    RgSchUeCb          *ue;
-    TfuSrsRpt            *srsRpt;
-    CmLteTimingInfo    timingInfo;
-#endif
+Void rgSCHCmnSrsInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuSrsRpt  *srsRpt,CmLteTimingInfo  timingInfo)
 {
     uint8_t wideCqi; /*Calculated value from SNR*/
     uint32_t recReqTime; /*Received Time in TTI*/
@@ -16914,17 +15108,7 @@ Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnDlTARpt
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue
-)
-#else
-Void rgSCHCmnDlTARpt(cell, ue)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-#endif
+Void rgSCHCmnDlTARpt(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell    *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlCell  *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -17002,19 +15186,7 @@ RgSchUeCb          *ue;
  *  @param[in]   uint8_t                 wideCqi
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnFindUlCqiUlTxAnt
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-uint8_t              wideCqi
-)
-#else
-static Void rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-uint8_t              wideCqi;
-#endif
+static Void rgSCHCmnFindUlCqiUlTxAnt(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t wideCqi)
 {
    ue->validTxAnt = 1;
    return;
@@ -17036,24 +15208,12 @@ uint8_t              wideCqi;
  *  @param[in]  TfuUlCqiRpt         *ulCqiInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlCqiInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-TfuUlCqiRpt          *ulCqiInfo
-)
-#else
-Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-TfuUlCqiRpt          *ulCqiInfo;
-#endif
+Void rgSCHCmnUlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo)
 {
    RgSchCmnUlUe  *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 #ifdef UL_LA
-   uint8_t            iTbsNew;
+   uint8_t       iTbsNew;
    S32           previTbs;
 #endif
 #if (defined(SCH_STATS) || defined(TENB_STATS))
@@ -17150,21 +15310,13 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @param[out] RgSchUlHqProcCb    **procRef
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgSCHCmnUlHqProcForUe
 (
-RgSchCellCb         *cell,
-CmLteTimingInfo     frm,
-RgSchUeCb           *ue,
-RgSchUlHqProcCb     **procRef
+RgSchCellCb     *cell,
+CmLteTimingInfo frm,
+RgSchUeCb       *ue,
+RgSchUlHqProcCb **procRef
 )
-#else
-Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef)
-RgSchCellCb         *cell;
-CmLteTimingInfo     frm;
-RgSchUeCb           *ue;
-RgSchUlHqProcCb     **procRef;
-#endif
 {
 #ifndef RG_5GTF
    uint8_t procId = rgSCHCmnGetUlHqProcIdx(&frm, cell);
@@ -17196,19 +15348,12 @@ RgSchUlHqProcCb     **procRef;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUlHqProcCb  *curProc,
 RgSchUlHqProcCb  *oldProc
 )
-#else
-S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc)
-RgSchCellCb      *cell;
-RgSchUlHqProcCb  *curProc;
-RgSchUlHqProcCb  *oldProc;
-#endif
 {
 
    UNUSED(cell);
@@ -17239,15 +15384,7 @@ RgSchUlHqProcCb  *oldProc;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHCmnBsrTmrExpry
-(
-RgSchUeCb  *ueCb
-)
-#else
-S16 rgSCHCmnBsrTmrExpry(ueCb)
-RgSchUeCb  *ueCb;
-#endif
+S16 rgSCHCmnBsrTmrExpry(RgSchUeCb  *ueCb)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ueCb->cell);
 
@@ -17294,23 +15431,14 @@ RgSchUeCb  *ueCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdBsrShort
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-RgSchLcgCb *ulLcg,
-uint8_t           bsr,
+RgSchLcgCb   *ulLcg,
+uint8_t      bsr,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb *ulLcg;
-uint8_t           bsr;
-RgSchErrInfo *err;
-#endif
 {
    uint8_t  lcgCnt;
 #ifdef LTE_L2_MEAS
@@ -17477,23 +15605,14 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdBsrTrunc
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-RgSchLcgCb *ulLcg,
-uint8_t           bsr,
+RgSchLcgCb   *ulLcg,
+uint8_t      bsr,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb *ulLcg;
-uint8_t           bsr;
-RgSchErrInfo *err;
-#endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnLcg  *cmnLcg = NULLP;
@@ -17654,31 +15773,22 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdBsrLong
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-uint8_t           *bsArr,
+uint8_t      *bsArr,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           *bsArr;
-RgSchErrInfo *err;
-#endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint32_t           tmpBsArr[4] = {0, 0, 0, 0};
-   uint32_t           nonGbrBs = 0;
+   uint32_t     tmpBsArr[4] = {0, 0, 0, 0};
+   uint32_t     nonGbrBs = 0;
 #ifdef LTE_L2_MEAS
-   uint8_t            idx1;
-   uint8_t            idx2;
+   uint8_t      idx1;
+   uint8_t      idx2;
 #endif
-   uint32_t           lcgId;
-
+   uint32_t     lcgId;
 
 #ifdef LTE_L2_MEAS
    for(idx1 = 1; idx1 < RGSCH_MAX_LCG_PER_UE; idx1++)
@@ -17820,7 +15930,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdExtPhr
 (
 RgSchCellCb    *cell,
@@ -17828,13 +15937,6 @@ RgSchUeCb      *ue,
 RgInfExtPhrCEInfo *extPhr,
 RgSchErrInfo   *err
 )
-#else
-S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgInfExtPhrCEInfo *extPhr;
-RgSchErrInfo   *err;
-#endif
 {
    RgSchCmnUlUe        *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    RgSchCmnAllocRecord *allRcd;
@@ -17886,21 +15988,13 @@ RgSchErrInfo   *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnUpdPhr
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-uint8_t             phr,
+uint8_t        phr,
 RgSchErrInfo   *err
 )
-#else
-S16 rgSCHCmnUpdPhr(cell, ue, phr, err)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-uint8_t             phr;
-RgSchErrInfo   *err;
-#endif
 {
    RgSchCmnUlUe        *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    RgSchCmnAllocRecord *allRcd;
@@ -17949,19 +16043,12 @@ RgSchErrInfo   *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnContResUlGrant
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnContResUlGrant(cell, ue, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchErrInfo *err;
-#endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -18000,7 +16087,6 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHCmnSrRcvd
 (
 RgSchCellCb  *cell,
@@ -18008,13 +16094,6 @@ RgSchUeCb    *ue,
 CmLteTimingInfo frm,
 RgSchErrInfo *err
 )
-#else
-S16 rgSCHCmnSrRcvd(cell, ue, frm, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-CmLteTimingInfo frm;
-RgSchErrInfo *err;
-#endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
@@ -18071,15 +16150,7 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHCmnFirstRcptnReq
-(
-RgSchCellCb      *cell
-)
-#else
-RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell)
-RgSchCellCb      *cell;
-#endif
+RgSchUlAlloc *rgSCHCmnFirstRcptnReq(RgSchCellCb *cell)
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 /* ACC_TDD */
@@ -18117,17 +16188,7 @@ RgSchCellCb      *cell;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHCmnNextRcptnReq
-(
-RgSchCellCb      *cell,
-RgSchUlAlloc     *alloc
-)
-#else
-RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc)
-RgSchCellCb      *cell;
-RgSchUlAlloc     *alloc;
-#endif
+RgSchUlAlloc *rgSCHCmnNextRcptnReq(RgSchCellCb *cell,RgSchUlAlloc *alloc)
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 /* ACC-TDD */
@@ -18168,15 +16229,7 @@ RgSchUlAlloc     *alloc;
  *  @param[in]  RgSchCellCb      *cell
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHCmnDrxStrtInActvTmrInUl
-(
-RgSchCellCb      *cell
-)
-#else
-Void rgSCHCmnDrxStrtInActvTmrInUl(cell)
-RgSchCellCb      *cell;
-#endif
+Void rgSCHCmnDrxStrtInActvTmrInUl(RgSchCellCb *cell)
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlSf      *sf     = &(cellUl->ulSfArr[cellUl->schdIdx]);
@@ -18233,17 +16286,7 @@ RgSchCellCb      *cell;
  *  @param[in]  uint8_t               idx
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc
-(
-RgSchCellCb      *cell,
-uint8_t               idx 
-)
-#else
-RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx)
-RgSchCellCb      *cell;
-uint8_t               idx;
-#endif
+RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(RgSchCellCb  *cell,uint8_t idx)
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 /* ACC-TDD */
@@ -18279,19 +16322,7 @@ uint8_t               idx;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc
-(
-RgSchCellCb      *cell,
-RgSchUlAlloc     *alloc,
-uint8_t               idx 
-)
-#else
-RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx)
-RgSchCellCb      *cell;
-RgSchUlAlloc     *alloc;
-uint8_t               idx; 
-#endif
+RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc,uint8_t idx)
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
@@ -18326,17 +16357,8 @@ uint8_t               idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-uint8_t rgSCHCmnUlGetITbsFrmIMcs
-(
-uint8_t          iMcs
-)
-#else
-uint8_t rgSCHCmnUlGetITbsFrmIMcs(iMcs)
-uint8_t          iMcs;
-#endif
+uint8_t rgSCHCmnUlGetITbsFrmIMcs(uint8_t iMcs)
 {
-
    return (rgUlIMcsTbl[iMcs].iTbs);
 }
 
@@ -18356,17 +16378,7 @@ uint8_t          iMcs;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-uint8_t rgSCHCmnUlGetIMcsFrmITbs
-(
-uint8_t                iTbs,
-CmLteUeCategory   ueCtg
-)
-#else
-uint8_t rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg)
-uint8_t                iTbs;
-CmLteUeCategory   ueCtg;
-#endif
+uint8_t rgSCHCmnUlGetIMcsFrmITbs(uint8_t iTbs,CmLteUeCategory ueCtg)
 {
    uint8_t iMcs;
 
@@ -18418,17 +16430,7 @@ CmLteUeCategory   ueCtg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-uint32_t rgSCHCmnUlMinTbBitsForITbs
-(
-RgSchCmnUlCell     *cellUl,
-uint8_t                 iTbs
-)
-#else
-uint32_t rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs)
-RgSchCmnUlCell   *cellUl;
-uint8_t               iTbs;
-#endif
+uint32_t rgSCHCmnUlMinTbBitsForITbs(RgSchCmnUlCell *cellUl,uint8_t  iTbs)
 {
 
    RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); 
@@ -18452,21 +16454,14 @@ uint8_t               iTbs;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 RgSchUlAlloc *rgSCHCmnUlSbAlloc
 (
-RgSchUlSf       *sf,
-uint8_t              numSb,
-RgSchUlHole     *hole
+RgSchUlSf    *sf,
+uint8_t      numSb,
+RgSchUlHole  *hole
 )
-#else
-RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole)
-RgSchUlSf       *sf;
-uint8_t              numSb;
-RgSchUlHole     *hole;
-#endif
 {
-   uint8_t           holeSz; /* valid hole size */
+   uint8_t      holeSz; /* valid hole size */
    RgSchUlAlloc *alloc;
 
    if ((holeSz = rgSchCmnMult235Tbl[hole->num].prvMatch) == hole->num)
@@ -18516,17 +16511,7 @@ RgSchUlHole     *hole;
  *  @param[out] RgSchUeCb        *ue
  *  @return   Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlUeFillAllocInfo
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue
-)
-#else
-Void rgSCHCmnUlUeFillAllocInfo(cell, ue)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-#endif
+Void rgSCHCmnUlUeFillAllocInfo(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnUlCell     *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUeUlAlloc  *ulAllocInfo;
@@ -18571,15 +16556,7 @@ RgSchUeCb        *ue;
  *  @param[in]  RgSchUeCb *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUpdUlCompEffBsr
-(
-RgSchUeCb *ue
-)
-#else
-static Void rgSCHCmnUpdUlCompEffBsr(ue)
-RgSchUeCb *ue;
-#endif
+static Void rgSCHCmnUpdUlCompEffBsr(RgSchUeCb *ue)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,ue->cell);
    CmLList   *node = ueUl->ulAllocLst.last;
@@ -18666,17 +16643,7 @@ RgSchUeCb *ue;
  *  @param[in]  RgSchUeCb   *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlRecordUeAlloc
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-Void rgSCHCmnUlRecordUeAlloc(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+Void rgSCHCmnUlRecordUeAlloc(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
 #ifdef LTE_TDD
    RgSchCmnUlCell     *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
@@ -18743,19 +16710,7 @@ RgSchUeCb   *ue;
  *  @param[in]  RgSchRaCb   *raCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlRecMsg3Alloc
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-RgSchRaCb   *raCb
-)
-#else
-Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgSchRaCb   *raCb;
-#endif
+Void rgSCHCmnUlRecMsg3Alloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchRaCb *raCb)
 {
    RgSchCmnUlUe        *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    CmLListCp           *lst = &ueUl->ulAllocLst;
@@ -18797,21 +16752,9 @@ RgSchRaCb   *raCb;
  *  @param[in]  uint32_t alloc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnUlUpdOutStndAlloc
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-uint32_t alloc
-)
-#else
-Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-uint32_t alloc;
-#endif
+Void rgSCHCmnUlUpdOutStndAlloc(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t alloc)
 {
-   uint32_t                 nonLcg0Alloc=0;
+   uint32_t  nonLcg0Alloc=0;
 
    /* Update UEs LCG0's bs according to the total outstanding BSR allocation.*/
    if (((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs > alloc)
@@ -18877,27 +16820,20 @@ uint32_t alloc;
  *  @param[in]  RgSchUeCb        *ue
  *  @return     uint8_t
  **/
-#ifdef ANSI
 uint8_t rgSCHCmnUlGetITbs
 (
-RgSchCellCb      *cell,
-RgSchUeCb        *ue,
-Bool             isEcp
+RgSchCellCb *cell,
+RgSchUeCb   *ue,
+Bool        isEcp
 )
-#else
-uint8_t rgSCHCmnUlGetITbs(cell, ue, isEcp)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-Bool             isEcp;
-#endif
 {
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
    /* CQI will be capped to maxUlCqi for 16qam UEs */
    CmLteUeCategory  ueCtgy = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
-   uint8_t            cqi;
+   uint8_t          cqi;
 #ifdef UL_LA
    S32            iTbs;
-   uint8_t            maxiTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ueUl->maxUlCqi]; 
+   uint8_t        maxiTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ueUl->maxUlCqi]; 
 #endif
 
 
@@ -18960,7 +16896,6 @@ Bool             isEcp;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlRbInfoAddUeTx
 (
 RgSchCellCb        *cell,
@@ -18968,13 +16903,6 @@ RgSchCmnDlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue,
 RgSchDlHqProcCb       *hqP
 )
-#else
-static Void rgSCHCmnDlRbInfoAddUeTx(cell, allocInfo, ue, hqP)
-RgSchCellCb        *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-RgSchDlHqProcCb       *hqP;
-#endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -19013,7 +16941,6 @@ RgSchDlHqProcCb       *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlRbInfoAddUeRetx
 (
 RgSchCellCb        *cell,
@@ -19021,13 +16948,6 @@ RgSchCmnDlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue,
 RgSchDlHqProcCb       *hqP
 )
-#else
-static Void rgSCHCmnDlRbInfoAddUeRetx(cell, allocInfo, ue, hqP)
-RgSchCellCb        *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-RgSchDlHqProcCb       *hqP;
-#endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(ue->cell);
 
@@ -19062,7 +16982,6 @@ RgSchDlHqProcCb       *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlRbInfoAddUeRetxTx
 (
 RgSchCellCb        *cell,
@@ -19070,13 +16989,6 @@ RgSchCmnDlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue,
 RgSchDlHqProcCb       *hqP
 )
-#else
-static Void rgSCHCmnDlRbInfoAddUeRetxTx(allocInfo, ue, hqP)
-RgSchCellCb        *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-RgSchDlHqProcCb       *hqP;
-#endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(ue->cell);
 
@@ -19113,19 +17025,12 @@ RgSchDlHqProcCb       *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAdd2NonSchdRetxLst 
 (
 RgSchCmnDlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue,
 RgSchDlHqProcCb       *hqP
 )
-#else
-static Void rgSCHCmnDlAdd2NonSchdRetxLst(allocInfo, ue, hqP)
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb             *ue;
-RgSchDlHqProcCb       *hqP;
-#endif
 {
    CmLList         *schdLnkNode;
 
@@ -19186,27 +17091,19 @@ RgSchDlHqProcCb       *hqP;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlANFdbkInit
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlANFdbkInit(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlANFdbkInit(RgSchCellCb  *cell)
 {
- uint8_t                   sfCount;
- uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
- uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
- uint8_t                   sfNum;
- uint8_t                   idx;
- uint8_t                   dlIdx;
- uint8_t                   calcSfnOffset;
+ uint8_t              sfCount;
+ uint8_t              ulDlCfgIdx = cell->ulDlCfgIdx;
+ uint8_t              maxDlSubfrms = cell->numDlSubfrms;
+ uint8_t              sfNum;
+ uint8_t              idx;
+ uint8_t              dlIdx;
+ uint8_t              calcSfnOffset;
  S8                   calcSfNum;
- uint8_t                   ulSfCnt =0;
+ uint8_t              ulSfCnt =0;
  RgSchTddSubfrmInfo   ulSubfrmInfo;
- uint8_t                   maxUlSubfrms;
+ uint8_t              maxUlSubfrms;
 
 
    ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
@@ -19295,28 +17192,19 @@ RgSchCellCb                *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlKdashUlAscInit
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlKdashUlAscInit(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlKdashUlAscInit(RgSchCellCb *cell)
 {
- uint8_t                   sfCount;
- uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
- uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
- uint8_t                   sfNum;
- uint8_t                   dlIdx;
+ uint8_t              sfCount;
+ uint8_t              ulDlCfgIdx = cell->ulDlCfgIdx;
+ uint8_t              maxDlSubfrms = cell->numDlSubfrms;
+ uint8_t              sfNum;
+ uint8_t              dlIdx;
  S8                   calcSfnOffset;
  S8                   calcSfNum;
- uint8_t                   ulSfCnt =0;
+ uint8_t              ulSfCnt =0;
  RgSchTddSubfrmInfo   ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
- uint8_t                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
-                                     [RGSCH_NUM_SUB_FRAMES-1];
- uint8_t                   dlPres = 0;
+ uint8_t              maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
+ uint8_t              dlPres = 0;
 
 
    /* Generate ACK/NACK offset information for each DL subframe in a radio frame
@@ -19411,15 +17299,7 @@ RgSchCellCb                *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlNpValInit
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlNpValInit(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlNpValInit(RgSchCellCb *cell)
 {
    uint8_t    idx;
    uint16_t   np;
@@ -19454,20 +17334,11 @@ RgSchCellCb                *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlCreateRachPrmLst
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlCreateRachPrmLst(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlCreateRachPrmLst(RgSchCellCb *cell)
 {
- uint8_t       raArrSz;
- S16       ret;
- uint8_t       lstSize;
-
+   uint8_t   raArrSz;
+   S16       ret;
+   uint8_t   lstSize;
 
    RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz);
 
@@ -19504,15 +17375,7 @@ RgSchCellCb                *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlRachInfoInit
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlRachInfoInit(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlRachInfoInit(RgSchCellCb  *cell)
 {
    uint8_t                   sfCount;
    uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
@@ -19669,27 +17532,19 @@ RgSchCellCb                *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-static S16 rgSCHCmnDlPhichOffsetInit
-(
-RgSchCellCb                *cell
-)
-#else
-static S16 rgSCHCmnDlPhichOffsetInit(cell)
-RgSchCellCb                *cell;
-#endif
+static S16 rgSCHCmnDlPhichOffsetInit(RgSchCellCb *cell)
 {
-   uint8_t                   sfCount;
-   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
-   uint8_t                   sfNum;
-   uint8_t                   dlIdx;
-   uint8_t                   dlPres = 0;
-   uint8_t                   calcSfnOffset;
-   uint8_t                   calcSfNum;
-   uint8_t                   ulSfCnt =0;
+   uint8_t              sfCount;
+   uint8_t              ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t              maxDlSubfrms = cell->numDlSubfrms;
+   uint8_t              sfNum;
+   uint8_t              dlIdx;
+   uint8_t              dlPres = 0;
+   uint8_t              calcSfnOffset;
+   uint8_t              calcSfNum;
+   uint8_t              ulSfCnt =0;
    RgSchTddSubfrmInfo   ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
-   uint8_t                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
+   uint8_t              maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                        [RGSCH_NUM_SUB_FRAMES-1];
 
 
@@ -19779,15 +17634,7 @@ RgSchCellCb                *cell;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHCmnUpdVars
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHCmnUpdVars(cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHCmnUpdVars(RgSchCellCb *cell)
 {
    RgSchCmnUlCell         *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    CmLteTimingInfo        timeInfo;
@@ -19906,17 +17753,7 @@ RgSchCellCb *cell;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t  rgSCHCmnGetPValFrmCCE
-(
-RgSchCellCb *cell,
-uint8_t          cce
-)
-#else
-uint8_t  rgSCHCmnGetPValFrmCCE(cell, cce)
-RgSchCellCb *cell;
-uint8_t          cce;
-#endif
+uint8_t  rgSCHCmnGetPValFrmCCE(RgSchCellCb *cell,uint8_t cce)
 {
    uint8_t i;
 
@@ -19944,17 +17781,7 @@ uint8_t          cce;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHCmnUlAdapRetx
-(
-RgSchUlAlloc    *alloc,
-RgSchUlHqProcCb *proc
-)
-#else
-static Void rgSCHCmnUlAdapRetx(alloc, proc)
-RgSchUlAlloc    *alloc;
-RgSchUlHqProcCb *proc;
-#endif
+static Void rgSCHCmnUlAdapRetx(RgSchUlAlloc  *alloc,RgSchUlHqProcCb *proc)
 {
 
    rgSCHUhmRetx(proc, alloc);
@@ -19984,15 +17811,7 @@ RgSchUlHqProcCb *proc;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnHdlUlInactUes
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnHdlUlInactUes(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnHdlUlInactUes(RgSchCellCb  *cell)
 {
    RgSchCmnCell  *cellSch  = RG_SCH_CMN_GET_CELL(cell);
    CmLListCp     ulInactvLst;
@@ -20020,15 +17839,7 @@ RgSchCellCb  *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnHdlDlInactUes
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnHdlDlInactUes(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnHdlDlInactUes(RgSchCellCb  *cell)
 {
    RgSchCmnCell *cellSch  = RG_SCH_CMN_GET_CELL(cell);
    CmLListCp    dlInactvLst;
@@ -20054,25 +17865,14 @@ RgSchCellCb  *cell;
  *
  *     Notes:
  *
- *     File :
- *
- **********************************************************/
-#ifdef ANSI
-static S16 rgSCHCmnUeIdleExdThrsld
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue
-)
-#else
-static S16 rgSCHCmnUeIdleExdThrsld(cell, ue)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-#endif
+ *     File :
+ *
+ **********************************************************/
+static S16 rgSCHCmnUeIdleExdThrsld(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    /* Time difference in subframes */
    uint32_t sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime);
 
-
    if (sfDiff > (uint32_t)RG_SCH_CMN_UE_IDLE_THRSLD(ue))
    {
       return ROK;
@@ -20098,20 +17898,12 @@ RgSchUeCb       *ue;
  *  @param[in]  RgSchCellCb   *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnCfgRachDedPrm
-(
-RgSchCellCb   *cell
-)
-#else
-static Void rgSCHCmnCfgRachDedPrm(cell)
-RgSchCellCb   *cell;
-#endif
+static Void rgSCHCmnCfgRachDedPrm(RgSchCellCb   *cell)
 {
    RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   uint32_t          gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
-   uint32_t          sfDiff;
-   uint8_t           cnt;
+   uint32_t     gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
+   uint32_t     sfDiff;
+   uint8_t      cnt;
 
    if (cell->macPreambleSet.pres == NOTPRSNT)
    {
@@ -20219,15 +18011,7 @@ RgSchCellCb   *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUpdNxtPrchMskIdx
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnUpdNxtPrchMskIdx(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnUpdNxtPrchMskIdx(RgSchCellCb  *cell)
 {
    RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
 
@@ -20281,20 +18065,12 @@ RgSchCellCb  *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUpdRachParam
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnUpdRachParam(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnUpdRachParam(RgSchCellCb  *cell)
 {
 
-   RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   uint32_t             gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
-   uint32_t             sfDiff;
+   RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch);
+   uint32_t     gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
+   uint32_t     sfDiff;
 
    if (cell->macPreambleSet.pres == NOTPRSNT)
    {
@@ -20333,25 +18109,15 @@ RgSchCellCb  *cell;
  *  @param[out]  uint8_t          *prachMskIdx
  *  @return  Void
  **/
-#ifdef ANSI
 static S16 rgSCHCmnAllocPOParam
 (
 RgSchCellCb  *cell,
 RgSchDlSf    *dlSf,
 RgSchUeCb    *ue,
 RgSchPdcch   **pdcch,
-uint8_t           *rapId,
-uint8_t           *prachMskIdx
+uint8_t      *rapId,
+uint8_t      *prachMskIdx
 )
-#else
-static S16 rgSCHCmnAllocPOParam(cell, dlSf, ue, pdcch, rapId, prachMskIdx)
-RgSchCellCb  *cell;
-RgSchDlSf    *dlSf;
-RgSchUeCb    *ue;
-RgSchPdcch   **pdcch;
-uint8_t           *rapId;
-uint8_t           *prachMskIdx;
-#endif
 {
 
    RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
@@ -20415,25 +18181,14 @@ uint8_t           *prachMskIdx;
  *  @param[in]  RgSchDlSf   *dlSf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnGenPdcchOrder
-(
-RgSchCellCb  *cell,
-RgSchDlSf    *dlSf
-)
-#else
-static Void rgSCHCmnGenPdcchOrder(cell, dlSf)
-RgSchCellCb  *cell;
-RgSchDlSf    *dlSf;
-#endif
+static Void rgSCHCmnGenPdcchOrder(RgSchCellCb  *cell,RgSchDlSf    *dlSf)
 {
-   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   CmLList           *node = cellSch->rachCfg.pdcchOdrLst.first;
-   RgSchUeCb         *ue;
-   uint8_t                rapId;
-   uint8_t                prachMskIdx;
-   RgSchPdcch        *pdcch = NULLP;
-
+   RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   CmLList       *node = cellSch->rachCfg.pdcchOdrLst.first;
+   RgSchUeCb     *ue;
+   uint8_t       rapId;
+   uint8_t       prachMskIdx;
+   RgSchPdcch    *pdcch = NULLP;
 
    while (node)
    {
@@ -20491,17 +18246,7 @@ RgSchDlSf    *dlSf;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlAdd2PdcchOdrQ
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHCmnDlAdd2PdcchOdrQ(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHCmnDlAdd2PdcchOdrQ(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -20531,22 +18276,11 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlRmvFrmPdcchOdrQ
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHCmnDlRmvFrmPdcchOdrQ(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHCmnDlRmvFrmPdcchOdrQ(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-
    cmLListDelFrm(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk);
    ueDl->rachInfo.poLnk.node = NULLP;
    return;
@@ -20568,23 +18302,14 @@ RgSchUeCb                  *ue;
  *  @param[in]  uint8_t          prachMskIdx
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnFillPdcchOdr2Sf
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgSchPdcch  *pdcch,
-uint8_t          rapId,
-uint8_t          prachMskIdx
+uint8_t     rapId,
+uint8_t     prachMskIdx
 )
-#else
-static Void rgSCHCmnFillPdcchOdr2Sf(ue, pdcch, rapId, prachMskIdx)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgSchPdcch  *pdcch;
-uint8_t          rapId;
-uint8_t          prachMskIdx;
-#endif
 {
    RgSchUeACqiCb  *acqiCb = RG_SCH_CMN_GET_ACQICB(ue,cell); 
 
@@ -20623,17 +18348,7 @@ uint8_t          prachMskIdx;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnDelRachInfo
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHCmnDelRachInfo(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHCmnDelRachInfo(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -20680,19 +18395,12 @@ RgSchUeCb    *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnHdlHoPo
 (
 RgSchCellCb           *cell,
 CmLListCp             *raRspLst,
 RgSchRaReqInfo        *raReq
 )
-#else
-static Void rgSCHCmnHdlHoPo(cell, raRspLst, raReq)
-RgSchCellCb           *cell;
-CmLListCp             *raRspLst;
-RgSchRaReqInfo        *raReq;
-#endif
 {
    RgSchUeCb             *ue = raReq->ue;
 
@@ -20722,23 +18430,13 @@ RgSchRaReqInfo        *raReq;
  *  @return  RgSchUeCb*
  *
  **/
-#ifdef ANSI
-RgSchUeCb* rgSCHCmnGetHoUe
-(
-RgSchCellCb           *cell,
-uint16_t                   rapId
-)
-#else
-RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId)
-RgSchCellCb           *cell;
-uint16_t                   rapId
-#endif
+RgSchUeCb* rgSCHCmnGetHoUe(RgSchCellCb *cell,uint16_t rapId)
 {
-   RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   CmLList               *node;
-   CmLListCp             *ueLst;
-   RgSchUeCb             *ue;
-   RgSchCmnDlUe          *ueDl;
+   RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
+   CmLList         *node;
+   CmLListCp       *ueLst;
+   RgSchUeCb       *ue;
+   RgSchCmnDlUe    *ueDl;
 
    ueLst = &cellSch->rachCfg.hoUeLst;
    node = ueLst->first;
@@ -20755,23 +18453,13 @@ uint16_t                   rapId
    return (NULLP);
 }
 
-#ifdef ANSI
-static Void rgSCHCmnDelDedPreamble
-(
-RgSchCellCb           *cell,
-uint8_t                    preambleId
-)
-#else
-static rgSCHCmnDelDedPreamble(cell, preambleId)
-RgSchCellCb           *cell;
-uint8_t                    preambleId;
-#endif
+static Void rgSCHCmnDelDedPreamble(RgSchCellCb *cell,uint8_t preambleId)
 {
-   RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   CmLList               *node;
-   CmLListCp             *ueLst;
-   RgSchUeCb             *ue;
-   RgSchCmnDlUe          *ueDl;
+   RgSchCmnCell  *cellSch = (RgSchCmnCell *)(cell->sc.sch);
+   CmLList       *node;
+   CmLListCp     *ueLst;
+   RgSchUeCb     *ue;
+   RgSchCmnDlUe  *ueDl;
 
    ueLst = &cellSch->rachCfg.hoUeLst;
    node = ueLst->first;
@@ -20806,26 +18494,19 @@ uint8_t                    preambleId;
  *  @return  RgSchUeCb*
  *
  **/
-#ifdef ANSI
 RgSchUeCb* rgSCHCmnGetPoUe
 (
-RgSchCellCb           *cell,
-uint16_t              rapId,
-CmLteTimingInfo       timingInfo
+RgSchCellCb     *cell,
+uint16_t        rapId,
+CmLteTimingInfo timingInfo
 )
-#else
-RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo)
-RgSchCellCb           *cell;
-uint16_t              rapId;
-CmLteTimingInfo       timingInfo;
-#endif
 {
-   RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   CmLList               *node;
-   CmLListCp             *ueLst;
-   RgSchUeCb             *ue;
-   RgSchCmnDlUe          *ueDl;
-   uint8_t                rapIdIdx;
+   RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch);
+   CmLList      *node;
+   CmLListCp    *ueLst;
+   RgSchUeCb    *ue;
+   RgSchCmnDlUe *ueDl;
+   uint8_t      rapIdIdx;
 
    rapIdIdx = rapId -cellSch->rachCfg.dedPrmStart;
    ueLst = &cellSch->rachCfg.rapIdMap[rapIdIdx].assgndUes;
@@ -20864,19 +18545,12 @@ CmLteTimingInfo       timingInfo;
  *  @param[in]  uint8_t               ueCtgy
  *  @return     uint8_t 
  **/
-#ifdef ANSI
 uint8_t rgSCHCmnUlGetCqi
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
 CmLteUeCategory  ueCtgy
 )
-#else
-uint8_t rgSCHCmnUlGetCqi(cell, ue, ueCtgy)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-CmLteUeCategory  ueCtgy;
-#endif
 {
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
    uint8_t            cqi;
@@ -20915,28 +18589,20 @@ CmLteUeCategory  ueCtgy;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHCmnUlRbAllocForPoHoUe
 (
-RgSchCellCb           *cell,
-RgSchUlSf             *sf,
-RgSchUeCb             *ue,
-uint8_t                    maxRb
+RgSchCellCb  *cell,
+RgSchUlSf    *sf,
+RgSchUeCb    *ue,
+uint8_t      maxRb
 )
-#else
-static S16 rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, maxRb)
-RgSchCellCb           *cell;
-RgSchUlSf             *sf;
-RgSchUeCb             *ue;
-uint8_t                    maxRb;
-#endif
 {
-   RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
+   RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   RgSchCmnUlUe      *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
    uint8_t           sbSize  = cellUl->sbSize;
    uint32_t          maxBits = ue->ul.maxBytesPerUePerTti*8;
    uint32_t          bits;
-   RgSchUlAlloc *alloc;
+   RgSchUlAlloc      *alloc;
    uint32_t          nPrb;
    uint8_t           iTbs;
    uint32_t          eff;
@@ -20947,7 +18613,7 @@ uint8_t                    maxRb;
    uint8_t           modOdr;
    RgSchUlHole      *hole;
    RgSchUlHqProcCb  *proc = &ueUl->hqEnt.hqProcCb[cellUl->msg3SchdHqProcIdx];
-   CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
+   CmLteUeCategory  ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
 
    if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP)
    {
@@ -21072,21 +18738,13 @@ uint8_t                    maxRb;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnAllocPoHoGrnt
 (
-RgSchCellCb           *cell,
-CmLListCp             *raRspLst,
-RgSchUeCb             *ue,
-RgSchRaReqInfo        *raReq
+RgSchCellCb     *cell,
+CmLListCp       *raRspLst,
+RgSchUeCb       *ue,
+RgSchRaReqInfo  *raReq
 )
-#else
-static Void rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq)
-RgSchCellCb           *cell;
-CmLListCp             *raRspLst;
-RgSchUeCb             *ue;
-RgSchRaReqInfo        *raReq;
-#endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe    *ueUl   = RG_SCH_CMN_GET_UL_UE(ue,cell);
@@ -21174,19 +18832,12 @@ RgSchRaReqInfo        *raReq;
  *
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Void rgSCHCmnUlNonadapRetx
 (
 RgSchCmnUlCell  *cellUl,
 RgSchUlAlloc    *alloc,
-uint8_t              idx
+uint8_t         idx
 )
-#else
-static Void rgSCHCmnUlNonadapRetx(cellUl, alloc, idx)
-RgSchCmnUlCell  *cellUl;
-RgSchUlAlloc    *alloc;
-uint8_t              idx;
-#endif
 {
    rgSCHUhmRetx(alloc->hqProc, alloc);
 
@@ -21219,20 +18870,9 @@ uint8_t              idx;
  *  @param[in]  RgSchUlAlloc  *alloc2
  *  @return  Bool
  **/
-#ifdef ANSI
-static Bool rgSCHCmnUlAllocsOvrLap
-(
-RgSchUlAlloc    *alloc1,
-RgSchUlAlloc    *alloc2
-)
-#else
-static Bool rgSCHCmnUlAllocsOvrLap(alloc1, alloc2)
-RgSchUlAlloc    *alloc1;
-RgSchUlAlloc    *alloc2;
-#endif
+static Bool rgSCHCmnUlAllocsOvrLap(RgSchUlAlloc *alloc1,RgSchUlAlloc *alloc2)
 {
 
-
    if (((alloc1->sbStart >= alloc2->sbStart) &&
          (alloc1->sbStart <= alloc2->sbStart + alloc2->numSb-1)) ||
         ((alloc2->sbStart >= alloc1->sbStart) &&
@@ -21255,19 +18895,7 @@ RgSchUlAlloc    *alloc2;
  *  @param[in]  RgSchUlAlloc  *dstAlloc
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlCpyAllocInfo
-(
-RgSchCellCb     *cell,
-RgSchUlAlloc    *srcAlloc,
-RgSchUlAlloc    *dstAlloc
-)
-#else
-static Void rgSCHCmnUlCpyAllocInfo(cell, srcAlloc, dstAlloc)
-RgSchCellCb     *cell;
-RgSchUlAlloc    *srcAlloc;
-RgSchUlAlloc    *dstAlloc;
-#endif
+static Void rgSCHCmnUlCpyAllocInfo(RgSchCellCb *cell,RgSchUlAlloc *srcAlloc,RgSchUlAlloc *dstAlloc)
 {
    RgSchCmnUlUe *ueUl;
 
@@ -21330,7 +18958,6 @@ RgSchUlAlloc    *dstAlloc;
  *  @param[in]  RgSchUlAlloc  *srcAlloc
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnUlInsAllocFrmNewSf2OldSf
 (
 RgSchCellCb     *cell,
@@ -21338,13 +18965,6 @@ RgSchUlSf       *newSf,
 RgSchUlSf       *oldSf,
 RgSchUlAlloc    *srcAlloc
 )
-#else
-static Void rgSCHCmnUlInsAllocFrmNewSf2OldSf(cell, newSf, oldSf, srcAlloc)
-RgSchCellCb     *cell;
-RgSchUlSf       *newSf;
-RgSchUlSf       *oldSf;
-RgSchUlAlloc    *srcAlloc;
-#endif
 {
    RgSchUlAlloc   *alloc, *dstAlloc, *nxtAlloc;
 
@@ -21441,19 +19061,7 @@ RgSchUlAlloc    *srcAlloc;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlMergeSfAllocs
-(
-RgSchCellCb  *cell,
-RgSchUlSf    *oldSf,
-RgSchUlSf    *newSf
-)
-#else
-static Void rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf)
-RgSchCellCb  *cell;
-RgSchUlSf    *oldSf;
-RgSchUlSf    *newSf;
-#endif
+static Void rgSCHCmnUlMergeSfAllocs(RgSchCellCb *cell,RgSchUlSf  *oldSf,RgSchUlSf  *newSf)
 {
    RgSchUlAlloc    *alloc, *nxtAlloc;
    UNUSED(cell);
@@ -21485,23 +19093,11 @@ RgSchUlSf    *newSf;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlSwapSfAllocs
-(
-RgSchCellCb  *cell,
-RgSchUlSf    *oldSf,
-RgSchUlSf    *newSf
-)
-#else
-static Void rgSCHCmnUlSwapSfAllocs(cell, oldSf, newSf)
-RgSchCellCb  *cell;
-RgSchUlSf    *oldSf;
-RgSchUlSf    *newSf;
-#endif
+static Void rgSCHCmnUlSwapSfAllocs(RgSchCellCb *cell,RgSchUlSf  *oldSf,RgSchUlSf  *newSf)
 {
    RgSchUlAllocDb *tempAllocDb  = newSf->allocDb;
    RgSchUlHoleDb  *tempHoleDb   = newSf->holeDb;
-   uint8_t              tempAvailSbs = newSf->availSubbands;
+   uint8_t        tempAvailSbs = newSf->availSubbands;
 
    UNUSED(cell);
 
@@ -21532,19 +19128,7 @@ RgSchUlSf    *newSf;
  *  @param[in]  uint8_t           idx
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlPrcNonAdptRetx
-(
-RgSchCellCb  *cell,
-RgSchUlSf    *newSf,
-uint8_t           idx
-)
-#else
-static Void rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx)
-RgSchCellCb  *cell;
-RgSchUlSf    *newSf;
-uint8_t           idx;
-#endif
+static Void rgSCHCmnUlPrcNonAdptRetx(RgSchCellCb *cell,RgSchUlSf  *newSf,uint8_t idx)
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlAlloc    *alloc, *nxtAlloc;
@@ -21592,21 +19176,13 @@ uint8_t           idx;
  *  @param[in]  uint8_t           idx 
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnUlPrfmSfMerge
 (
 RgSchCellCb  *cell,
 RgSchUlSf    *oldSf,
 RgSchUlSf    *newSf,
-uint8_t           idx
+uint8_t      idx
 )
-#else
-static Void rgSCHCmnUlPrfmSfMerge(cell, oldSf, newSf, idx)
-RgSchCellCb  *cell;
-RgSchUlSf    *oldSf;
-RgSchUlSf    *newSf;
-uint8_t           idx;
-#endif
 {
    /* Preassigned resources for msg3 in newSf.
     * Hence do adaptive retx for all NACKED TXs */
@@ -21637,17 +19213,7 @@ uint8_t           idx;
  *  @param[in]  RgSchUlSf      *sf
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlRmvCmpltdAllocs
-(
-RgSchCellCb    *cell,
-RgSchUlSf      *sf
-)
-#else
-static Void rgSCHCmnUlRmvCmpltdAllocs(cell, sf)
-RgSchCellCb    *cell;
-RgSchUlSf      *sf;
-#endif
+static Void rgSCHCmnUlRmvCmpltdAllocs(RgSchCellCb *cell,RgSchUlSf *sf)
 {
    RgSchUlAlloc    *alloc, *nxtAlloc;
 
@@ -21741,21 +19307,10 @@ RgSchUlSf      *sf;
  *  @param[in]  uint8_t        idx 
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHCmnRlsUlSf
-(
-RgSchCellCb    *cell,
-uint8_t              idx
-)
-#else
-Void rgSCHCmnRlsUlSf(cell, idx)
-RgSchCellCb    *cell;
-uint8_t              idx;
-#endif
+Void rgSCHCmnRlsUlSf(RgSchCellCb *cell,uint8_t idx)
 {
 
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   
    if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) 
    {
       RgSchUlSf   *oldSf  = &cellUl->ulSfArr[cellUl->hqFdbkIdx[idx]];
@@ -21786,21 +19341,10 @@ uint8_t              idx;
  *  @param[in]  RgSchUlAlloc  *alloc
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlUpdAllocRetx
-(
-RgSchCellCb    *cell,
-RgSchUlAlloc   *alloc
-)
-#else
-static Void rgSCHCmnUlUpdAllocRetx(cell, alloc)
-RgSchCellCb    *cell;
-RgSchUlAlloc   *alloc;
-#endif
+static Void rgSCHCmnUlUpdAllocRetx(RgSchCellCb *cell,RgSchUlAlloc *alloc)
 {
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
 
-
    alloc->hqProc->reTxAlloc.rnti    =  alloc->rnti;
    alloc->hqProc->reTxAlloc.numSb   =  alloc->numSb;
    alloc->hqProc->reTxAlloc.iMcs   =  alloc->grnt.iMcs;
@@ -21849,7 +19393,6 @@ RgSchUlAlloc   *alloc;
  *  @param[in]  RgSchUlHole       *hole;
  *  @return  uint8_t
  **/
-#ifdef ANSI
 static Bool rgSCHCmnUlAdapRetxAlloc
 (
 RgSchCellCb       *cell,
@@ -21857,16 +19400,9 @@ RgSchUlSf         *sf,
 RgSchUlHqProcCb   *proc,
 RgSchUlHole       *hole
 )
-#else
-static Bool rgSCHCmnUlAdapRetxAlloc(cell, sf, proc, hole)
-RgSchCellCb       *cell;
-RgSchUlSf         *sf;
-RgSchUlHqProcCb   *proc;
-RgSchUlHole       *hole;
-#endif
 {
-   uint8_t              numSb = proc->reTxAlloc.numSb;
-   uint8_t              iMcs  = proc->reTxAlloc.iMcs;
+   uint8_t         numSb = proc->reTxAlloc.numSb;
+   uint8_t         iMcs  = proc->reTxAlloc.iMcs;
    CmLteTimingInfo frm = cell->crntTime;
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchDlSf       *dlSf;
@@ -22019,24 +19555,13 @@ RgSchUlHole       *hole;
  *  @return  uint8_t
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
-static Void rgSCHCmnUlSfRlsRetxProcs
-(
-RgSchCellCb *cell,
-RgSchUlSf   *sf
-)
-#else
-static Void rgSCHCmnUlSfRlsRetxProcs(cell, sf)
-RgSchCellCb *cell;
-RgSchUlSf   *sf;
-#endif
+static Void rgSCHCmnUlSfRlsRetxProcs(RgSchCellCb *cell,RgSchUlSf *sf)
 {
    CmLListCp         *cp;
    CmLList           *node;
    RgSchUlHqProcCb   *proc;
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
-
    cp = &(cellUl->reTxLst);
    node = cp->first;
    while (node)
@@ -22066,17 +19591,7 @@ RgSchUlSf   *sf;
  *  @param[in]  RgSchUlSf   *sf
  *  @return  uint8_t
  **/
-#ifdef ANSI
-static Void rgSCHCmnUlSfReTxAllocs
-(
-RgSchCellCb *cell,
-RgSchUlSf   *sf
-)
-#else
-static Void rgSCHCmnUlSfReTxAllocs(cell, sf)
-RgSchCellCb *cell;
-RgSchUlSf   *sf;
-#endif
+static Void rgSCHCmnUlSfReTxAllocs(RgSchCellCb *cell,RgSchUlSf  *sf)
 {
    CmLListCp         *cp;
    CmLList           *node;
@@ -22143,17 +19658,7 @@ RgSchUlSf   *sf;
  *  @return  Void
  **/
 
-#ifdef ANSI
-static Void rgSCHCmnDlRbAlloc
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHCmnDlRbAlloc(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHCmnDlRbAlloc(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -22189,24 +19694,14 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *   @param[out] RgSchBwRbgInfo *rbgInfo
  *  @return Void
  **/
-#ifdef ANSI
 Void rgSCHCmnDlGetRbgInfo
 (
-uint8_t             dlTotalBw,
-uint8_t             dlSubsetBw,
-uint8_t             maxRaType1SubsetBw,
-uint8_t             rbgSize,
+uint8_t        dlTotalBw,
+uint8_t        dlSubsetBw,
+uint8_t        maxRaType1SubsetBw,
+uint8_t        rbgSize,
 RgSchBwRbgInfo *rbgInfo
 )
-#else
-Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw,
-      rbgSize, rbgInfo)
-uint8_t             dlTotalBw;
-uint8_t             dlSubsetBw;
-uint8_t             maxRaType1SubsetBw;
-uint8_t             rbgSize;
-RgSchBwRbgInfo *rbgInfo;
-#endif
 {
 #ifdef RGSCH_SPS_UNUSED
    uint8_t    idx           = 0;
@@ -22278,26 +19773,15 @@ RgSchBwRbgInfo *rbgInfo;
  *  @return  Void
  **/
 
-#ifdef ANSI
 uint8_t rgSCHCmnDlRaType0Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-uint8_t                 rbsReq,
+uint8_t            rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-uint8_t                 *numAllocRbs,
+uint8_t            *numAllocRbs,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
-#else
-uint8_t rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo,
-      numAllocRbs, resAllocInfo, isPartialAlloc)
-RgSchDlSfAllocInfo *allocedInfo;
-uint8_t                 rbsReq;
-RgSchBwRbgInfo     *rbgInfo;
-uint8_t                 *numAllocRbs;
-RgSchDlSfAllocInfo *resAllocInfo;
-Bool               isPartialAlloc;
-#endif
 {
    /* Note: This function atttempts allocation only full allocation */
    uint32_t      remNumRbs, rbgPosInRbgMask, ueRaType2Mask;
@@ -22455,46 +19939,34 @@ Bool               isPartialAlloc;
  *  Number of allocated RBs
  **/
 
-#ifdef ANSI
 uint8_t rgSCHCmnDlRaType1Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-uint8_t                 rbsReq,
+uint8_t            rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-uint8_t                 startRbgSubset,
-uint8_t                 *allocRbgSubset,
+uint8_t            startRbgSubset,
+uint8_t            *allocRbgSubset,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
-#else
-uint8_t rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset,
-      allocRbgSubset, resAllocInfo, isPartialAlloc)
-RgSchDlSfAllocInfo *allocedInfo;
-uint8_t                 rbsReq;
-RgSchBwRbgInfo     *rbgInfo;
-uint8_t                 startRbgSubset;
-uint8_t                 *allocRbgSubset;
-RgSchDlSfAllocInfo *resAllocInfo;
-Bool               isPartialAlloc;
-#endif
 {
    /* Note: This function atttempts only full allocation */
-   uint8_t          *rbgSubsetSzArr;
-   uint8_t          type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset;
-   uint8_t          offset, rbg, maskSize, bestSubsetIdx;
-   uint8_t          startPos = 0;
-   uint8_t          bestNumAvailRbs = 0;
-   uint8_t          numAllocRbs = 0;
-   uint32_t         ueRaType2Mask, ueRaType0Mask, rbPosInSubset;
-   uint32_t         remNumRbs, allocedMask;
-   uint8_t          usedRbs = 0;
-   uint8_t          rbgSize = rbgInfo->rbgSize;
-   uint8_t          rbgSubset = startRbgSubset;
-   uint32_t         *rbgMask = &resAllocInfo->raType0Mask;
-   uint32_t         *raType1Mask = resAllocInfo->raType1Mask;
-   uint32_t         *raType2Mask = resAllocInfo->raType2Mask;
-   uint32_t         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
-   uint32_t         *allocMask = allocedInfo->raType1Mask;
+   uint8_t   *rbgSubsetSzArr;
+   uint8_t   type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset;
+   uint8_t   offset, rbg, maskSize, bestSubsetIdx;
+   uint8_t   startPos = 0;
+   uint8_t   bestNumAvailRbs = 0;
+   uint8_t   numAllocRbs = 0;
+   uint32_t  ueRaType2Mask, ueRaType0Mask, rbPosInSubset;
+   uint32_t  remNumRbs, allocedMask;
+   uint8_t   usedRbs = 0;
+   uint8_t   rbgSize = rbgInfo->rbgSize;
+   uint8_t   rbgSubset = startRbgSubset;
+   uint32_t  *rbgMask = &resAllocInfo->raType0Mask;
+   uint32_t  *raType1Mask = resAllocInfo->raType1Mask;
+   uint32_t  *raType2Mask = resAllocInfo->raType2Mask;
+   uint32_t  *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
+   uint32_t  *allocMask = allocedInfo->raType1Mask;
 
    /* Initialize the subset size Array */
    rbgSubsetSzArr = rbgInfo->rbgSubsetSize;
@@ -22606,39 +20078,28 @@ Bool               isPartialAlloc;
  *  Number of allocated RBs
  **/
 
-#ifdef ANSI
 uint8_t rgSCHCmnDlRaType2Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-uint8_t                 rbsReq,
+uint8_t            rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-uint8_t                 *rbStart,
+uint8_t            *rbStart,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
-#else
-uint8_t rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart,
-      resAllocInfo, isPartialAlloc)
-RgSchDlSfAllocInfo *allocedInfo;
-uint8_t                 rbsReq;
-RgSchBwRbgInfo     *rbgInfo;
-uint8_t                 *rbStart;
-RgSchDlSfAllocInfo *resAllocInfo;
-Bool               isPartialAlloc;
-#endif
-{
-   uint8_t          numAllocRbs = 0;
-   uint8_t          rbIdx;
-   uint8_t          rbgSize = rbgInfo->rbgSize;
-   uint32_t         *rbgMask = &resAllocInfo->raType0Mask;
+{
+   uint8_t    numAllocRbs = 0;
+   uint8_t    rbIdx;
+   uint8_t    rbgSize = rbgInfo->rbgSize;
+   uint32_t   *rbgMask = &resAllocInfo->raType0Mask;
 #ifdef RGSCH_SPS_UNUSED
-   uint32_t         *raType1Mask = resAllocInfo->raType1Mask;
+   uint32_t   *raType1Mask = resAllocInfo->raType1Mask;
 #endif
-   uint32_t         *raType2Mask = resAllocInfo->raType2Mask;
+   uint32_t   *raType2Mask = resAllocInfo->raType2Mask;
 #ifdef RGSCH_SPS_UNUSED
-   uint32_t         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
+   uint32_t   *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
 #endif
-   uint32_t         *allocedMask = allocedInfo->raType2Mask;
+   uint32_t   *allocedMask = allocedInfo->raType2Mask;
 
    /* Note: This function atttempts only full allocation */
    rgSCHCmnDlGetBestFitHole(allocedMask, rbgInfo->numRbs,
@@ -22690,17 +20151,7 @@ Bool               isPartialAlloc;
  *  @param[in]  uint8_t          rbgSize
  *  @return  uint32_t RA type 0 mask
  **/
-#ifdef ANSI
-static uint32_t rgSCHCmnGetRaType0Mask
-(
-uint8_t                rbIdx,
-uint8_t                rbgSize
-)
-#else
-static uint32_t rgSCHCmnGetRaType0Mask(rbIdx, rbgSize)
-uint8_t                rbIdx;
-uint8_t                rbgSize;
-#endif
+static uint32_t rgSCHCmnGetRaType0Mask(uint8_t rbIdx,uint8_t rbgSize)
 {
    uint8_t rbg;
    uint32_t rbgPosInRbgMask = 0;
@@ -22728,19 +20179,7 @@ uint8_t                rbgSize;
  *  @param[out] uint8_t          *type1Subset
  *  @return  uint32_t RA type 1 mask
  **/
-#ifdef ANSI
-static uint32_t rgSCHCmnGetRaType1Mask
-(
-uint8_t                rbIdx,
-uint8_t                rbgSize,
-uint8_t                *type1Subset
-)
-#else
-static uint32_t rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset)
-uint8_t                rbIdx;
-uint8_t                rbgSize;
-uint8_t                *type1Subset;
-#endif
+static uint32_t rgSCHCmnGetRaType1Mask(uint8_t  rbIdx,uint8_t  rbgSize,uint8_t  *type1Subset)
 {
    uint8_t rbg, rbgSubset, rbgInSubset, offset, rbInSubset;
    uint32_t rbPosInSubset;
@@ -22771,17 +20210,7 @@ uint8_t                *type1Subset;
  *  @param[out] uint8_t          *maskIdx
  *  @return  uint32_t RA type 2 mask
  **/
-#ifdef ANSI
-static uint32_t rgSCHCmnGetRaType2Mask
-(
-uint8_t                rbIdx,
-uint8_t                *maskIdx
-)
-#else
-static uint32_t rgSCHCmnGetRaType2Mask(rbIdx, maskIdx)
-uint8_t                rbIdx;
-uint8_t                *maskIdx;
-#endif
+static uint32_t rgSCHCmnGetRaType2Mask(uint8_t rbIdx,uint8_t *maskIdx)
 {
    uint32_t rbPosInType2;
 
@@ -22813,7 +20242,6 @@ uint8_t                *maskIdx;
  *             ROK      success
  *             RFAILED  failed
  **/
-#ifdef ANSI
 Bool rgSCHCmnAllocUeInSpsBw
 (
 RgSchDlSf           *dlSf,
@@ -22822,23 +20250,15 @@ RgSchUeCb           *ue,
 RgSchDlRbAlloc      *rbAllocInfo,
 Bool                isPartialAlloc
 )
-#else
-Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc)
-RgSchDlSf           *dlSf;
-RgSchCellCb         *cell;
-RgSchUeCb           *ue;
-RgSchDlRbAlloc      *rbAllocInfo;
-Bool                isPartialAlloc;
-#endif
 {
-   uint8_t                  rbgSize = cell->rbgSize;
-   uint8_t                  numAllocRbs = 0;
-   uint8_t                  numAllocRbgs = 0;
-   uint8_t                  rbStart = 0;
-   uint8_t                  idx, noLyr, iTbs;
-   RgSchCmnDlUe        *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   RgSchDlSfAllocInfo  *dlSfAlloc = &rbAllocInfo->dlSf->dlSfAllocInfo;
-   RgSchBwRbgInfo      *spsRbgInfo = &cell->spsBwRbgInfo;
+   uint8_t            rbgSize = cell->rbgSize;
+   uint8_t            numAllocRbs = 0;
+   uint8_t            numAllocRbgs = 0;
+   uint8_t            rbStart = 0;
+   uint8_t            idx, noLyr, iTbs;
+   RgSchCmnDlUe       *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell);
+   RgSchDlSfAllocInfo *dlSfAlloc = &rbAllocInfo->dlSf->dlSfAllocInfo;
+   RgSchBwRbgInfo     *spsRbgInfo = &cell->spsBwRbgInfo;
 
    /* SPS_FIX : Check if this Hq proc is scheduled */
    if ((0 == rbAllocInfo->tbInfo[0].schdlngForTb) &&
@@ -22986,28 +20406,16 @@ Bool                isPartialAlloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHCmnDlGetBestFitHole
 (
-uint32_t         *allocMask,
-uint8_t          numMaskRbs,
-uint32_t         *crntAllocMask,
-uint8_t          rbsReq,
-uint8_t          *allocStart,
-uint8_t          *allocNumRbs,
-Bool        isPartialAlloc
+uint32_t  *allocMask,
+uint8_t   numMaskRbs,
+uint32_t  *crntAllocMask,
+uint8_t   rbsReq,
+uint8_t   *allocStart,
+uint8_t   *allocNumRbs,
+Bool      isPartialAlloc
 )
-#else
-static  Void rgSCHCmnDlGetBestFitHole (allocMask, numMaskRbs,
-        crntAllocMask, rbsReq, allocStart, allocNumRbs, isPartialAlloc)
-uint32_t         *allocMask;
-uint8_t          numMaskRbs;
-uint32_t         *crntAllocMask;
-uint8_t          rbsReq;
-uint8_t          *allocStart;
-uint8_t          *allocNumRbs;
-Bool        isPartialAlloc;
-#endif
 {
    uint8_t maskSz = (numMaskRbs + 31)/32;
    uint8_t maxMaskPos = (numMaskRbs % 32);
@@ -23112,21 +20520,13 @@ Bool        isPartialAlloc;
  *  @return  void
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Void rgSCHCmnFindCodeRate
 (
-RgSchCellCb           *cell,
-RgSchDlSf             *dlSf,
-RgSchDlRbAlloc        *allocInfo,
-uint8_t                    idx
+RgSchCellCb    *cell,
+RgSchDlSf      *dlSf,
+RgSchDlRbAlloc *allocInfo,
+uint8_t        idx
 )
-#else
-static Void rgSCHCmnFindCodeRate(cell,dlSf,allocInfo,idx)
-RgSchCellCb           *cell;
-RgSchDlSf             *dlSf;
-RgSchDlRbAlloc        *allocInfo;
-uint8_t                    idx;
-#endif
 {
     return;
 
@@ -23150,28 +20550,20 @@ uint8_t                    idx;
  *  @param[in]      uint8_t              *idx
  *  @return  void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsPbchTbImcsAdj
 (
-RgSchCellCb      *cell,
-RgSchDlRbAlloc   *allocInfo,
-uint8_t               idx,
-uint8_t               rbsReq
+RgSchCellCb     *cell,
+RgSchDlRbAlloc  *allocInfo,
+uint8_t         idx,
+uint8_t         rbsReq
 )
-#else
-static Void rgSCHCmnNonDlfsPbchTbImcsAdj(cell,allocInfo, idx, rbsReq)
-RgSchCellCb      *cell;
-RgSchDlRbAlloc   *allocInfo;
-uint8_t               idx;
-uint8_t               rbsReq;
-#endif
 {
-   uint8_t             noLyrs = 0;
-   uint8_t             tbs = 0;
-   uint32_t            origBytesReq;
-   uint8_t             noRbgs = 0;
-   uint8_t             noRbs = 0;
-   RgSchDlSf     *dlSf = allocInfo->dlSf;
+   uint8_t     noLyrs = 0;
+   uint8_t     tbs = 0;
+   uint32_t    origBytesReq;
+   uint8_t     noRbgs = 0;
+   uint8_t     noRbs = 0;
+   RgSchDlSf   *dlSf = allocInfo->dlSf;
 
    RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs);
    noLyrs = allocInfo->tbInfo[idx].noLyr;
@@ -23233,28 +20625,19 @@ uint8_t               rbsReq;
  *  @param[in]      uint8_t            pbchSsRsSym
  *  @return  void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsPbchTbSizeAdj
 (
-RgSchDlRbAlloc        *allocInfo,
-uint8_t                    numOvrlapgPbchRb,
-uint8_t                    pbchSsRsSym,
-uint8_t                    idx,
-uint32_t                   bytesReq
+RgSchDlRbAlloc  *allocInfo,
+uint8_t         numOvrlapgPbchRb,
+uint8_t         pbchSsRsSym,
+uint8_t         idx,
+uint32_t        bytesReq
 )
-#else
-static Void rgSCHCmnNonDlfsPbchTbSizeAdj(allocInfo,numOvrlapgPbchRb,pbchSsRsSym,idx,bytesReq)
-RgSchDlRbAlloc        *allocInfo;
-uint8_t                    numOvrlapgPbchRb;
-uint8_t                    pbchSsRsSym;
-uint8_t                    idx;
-uint32_t                   bytesReq;
-#endif
 {
-   uint32_t             reducedTbs = 0;
-   uint8_t              noLyrs = 0;
-   uint8_t              tbs = 0;
-
+   uint32_t     reducedTbs = 0;
+   uint8_t      noLyrs = 0;
+   uint8_t      tbs = 0;
+   
    noLyrs = allocInfo->tbInfo[idx].noLyr;
 
    RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs);
@@ -23299,23 +20682,9 @@ uint32_t                   bytesReq;
  *  @param[out]      uint8_t            addtlRbsAvl
  *  @return  void
  **/
-#ifdef ANSI
-static uint8_t rgSCHCmnFindNumAddtlRbsAvl
-(
-RgSchCellCb           *cell,
-RgSchDlSf             *dlSf,
-RgSchDlRbAlloc        *allocInfo
-)
-#else
-static uint8_t rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo)
-RgSchCellCb           *cell;
-RgSchDlSf             *dlSf;
-RgSchDlRbAlloc        *allocInfo;
-#endif
+static uint8_t rgSCHCmnFindNumAddtlRbsAvl(RgSchCellCb *cell,RgSchDlSf *dlSf,RgSchDlRbAlloc *allocInfo)
 {
     uint8_t addtlRbsAvl = 0;
-
-
     if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0)
     {
          addtlRbsAvl = (((dlSf->type0End - dlSf->type2End + 1)*\
@@ -23346,21 +20715,13 @@ RgSchDlRbAlloc        *allocInfo;
  *  @param[out]      uint8_t*            numOvrlapgPbchRb
  *  @return  void
  **/
-#ifdef ANSI
 static Void rgSCHCmnFindNumPbchOvrlapRbs
 (
-RgSchCellCb           *cell,
-RgSchDlSf             *dlSf,
-RgSchDlRbAlloc        *allocInfo,
-uint8_t                    *numOvrlapgPbchRb
+RgSchCellCb    *cell,
+RgSchDlSf      *dlSf,
+RgSchDlRbAlloc *allocInfo,
+uint8_t        *numOvrlapgPbchRb
 )
-#else
-static Void rgSCHCmnFindNumPbchOvrlapRbs(cell,dlSf,allocInfo,numOvrlapgPbchRb)
-RgSchCellCb           *cell;
-RgSchDlSf             *dlSf;
-RgSchDlRbAlloc        *allocInfo;
-uint8_t                    *numOvrlapgPbchRb;
-#endif
 {
     *numOvrlapgPbchRb = 0;
    /*Find if we have already crossed the start boundary for PBCH 6 RBs,
@@ -23417,35 +20778,27 @@ uint8_t                    *numOvrlapgPbchRb;
  *  @param[in]      uint8_t               pbchSsRsSym
  *  @return  void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsPbchRbAllocAdj
 (
 RgSchCellCb      *cell,
 RgSchDlRbAlloc   *allocInfo,
-uint8_t               pbchSsRsSym,
+uint8_t          pbchSsRsSym,
 Bool             isBcchPcch
-)
-#else
-static Void rgSCHCmnNonDlfsPbchRbAllocAdj(cell, allocInfo,pbchSsRsSym)
-RgSchCellCb      *cell;
-RgSchDlRbAlloc   *allocInfo;
-uint8_t               pbchSsRsSym;
-Bool             isBcchPcch;
-#endif
+)
 {
-   RgSchDlSf     *dlSf = allocInfo->dlSf;
-   uint8_t             numOvrlapgPbchRb = 0;
-   uint8_t             numOvrlapgAdtlPbchRb = 0;
-   uint8_t             totSym;
-   uint8_t             addtlRbsReq = 0;
-   uint8_t             moreAddtlRbsReq = 0;
-   uint8_t             addtlRbsAdd = 0;
-   uint8_t             moreAddtlRbsAdd = 0;
-   uint8_t             tbs;
-   uint8_t             origRbsReq = 0;
-   uint32_t            bytesReq;
-   uint8_t             noLyr;
-   uint8_t             divResult;
+   RgSchDlSf  *dlSf = allocInfo->dlSf;
+   uint8_t    numOvrlapgPbchRb = 0;
+   uint8_t    numOvrlapgAdtlPbchRb = 0;
+   uint8_t    totSym;
+   uint8_t    addtlRbsReq = 0;
+   uint8_t    moreAddtlRbsReq = 0;
+   uint8_t    addtlRbsAdd = 0;
+   uint8_t    moreAddtlRbsAdd = 0;
+   uint8_t    tbs;
+   uint8_t    origRbsReq = 0;
+   uint32_t   bytesReq;
+   uint8_t    noLyr;
+   uint8_t    divResult;
 
 
 
@@ -23609,17 +20962,7 @@ Bool             isBcchPcch;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-static S16 rgSCHCmnNonDlfsCmnRbAlloc
-(
-RgSchCellCb      *cell,
-RgSchDlRbAlloc   *allocInfo
-)
-#else
-static S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
-RgSchCellCb      *cell;
-RgSchDlRbAlloc   *allocInfo;
-#endif
+static S16 rgSCHCmnNonDlfsCmnRbAlloc(RgSchCellCb  *cell,RgSchDlRbAlloc  *allocInfo)
 {
 #ifndef LTE_TDD
 #ifdef LTEMAC_SPS
@@ -23836,21 +21179,10 @@ RgSchDlRbAlloc   *allocInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-static S16 rgSCHCmnNonDlfsCmnRbAllocRar
-(
- RgSchCellCb      *cell,
- RgSchDlRbAlloc   *allocInfo
- )
-#else
-static S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
-   RgSchCellCb      *cell;
-   RgSchDlRbAlloc   *allocInfo;
-#endif
+static S16 rgSCHCmnNonDlfsCmnRbAllocRar(RgSchCellCb *cell,RgSchDlRbAlloc *allocInfo)
 {
    RgSchDlSf     *dlSf   = allocInfo->dlSf;
 
-
    if(dlSf->bwAlloced == dlSf->bw)
    {
       return RFAILED;
@@ -23937,23 +21269,14 @@ static S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
  *      -# FALSE
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Bool rgSCHCmnNonDlfsSFRBwAvlbl
 (
-RgSchCellCb        *cell,
-RgSchSFRPoolInfo   **sfrpoolInfo,
-RgSchDlSf          *dlSf,
-RgSchDlRbAlloc     *allocInfo,
-Bool               isUeCellEdge
+RgSchCellCb      *cell,
+RgSchSFRPoolInfo **sfrpoolInfo,
+RgSchDlSf        *dlSf,
+RgSchDlRbAlloc   *allocInfo,
+Bool             isUeCellEdge
 )
-#else
-static Bool rgSCHCmnNonDlfsSFRBwAvlbl(cell, sfrpoolInfo, dlSf, allocInfo, isUeCellEdge)
-RgSchCellCb        *cell;
-RgSchSFRPoolInfo   **sfrpoolInfo;
-RgSchDlSf          *dlSf;
-RgSchDlRbAlloc     *allocInfo;
-Bool               isUeCellEdge;
-#endif
 {
    CmLListCp   *l;
    CmLListCp   *l1;
@@ -24337,19 +21660,12 @@ Bool               isUeCellEdge;
  *      -# FALSE
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Bool rgSCHCmnNonDlfsBwAvlbl
 (
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-RgSchDlRbAlloc     *allocInfo
+RgSchCellCb     *cell,
+RgSchDlSf       *dlSf,
+RgSchDlRbAlloc  *allocInfo
 )
-#else
-static Bool rgSCHCmnNonDlfsBwAvlbl(cell, dlSf, allocInfo)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-RgSchDlRbAlloc     *allocInfo;
-#endif
 {
    uint8_t tbs;
    uint8_t noLyrs;
@@ -24537,21 +21853,13 @@ RgSchDlRbAlloc     *allocInfo;
  *
  *  @return Void
  **/
-#ifdef ANSI
 Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc
 (
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-uint8_t                 rbStrt,
-uint8_t                 numRb
+RgSchCellCb  *cell,
+RgSchDlSf    *dlSf,
+uint8_t      rbStrt,
+uint8_t      numRb
 )
-#else
-Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-uint8_t                 rbStrt;
-uint8_t                 numRb;
-#endif
 { 
    CmLListCp   *l;
    CmLList     *n;
@@ -24617,23 +21925,14 @@ uint8_t                 numRb;
  *  @return Void
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgSchDlSf          *dlSf,
-uint8_t                 rbStrt,
-uint8_t                 numRb
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+RgSchDlSf    *dlSf,
+uint8_t      rbStrt,
+uint8_t      numRb
 )
-#else
-static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc(cell, ue, dlSf, rbStrt, numRb)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgSchDlSf          *dlSf;
-uint8_t                 rbStrt;
-uint8_t                 numRb;
-#endif
 {
    CmLListCp   *l;
    CmLList     *n;
@@ -24728,21 +22027,13 @@ uint8_t                 numRb;
  *
  *  @return Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsUpdTyp2Alloc
 (
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-uint8_t                 rbStrt,
-uint8_t                 numRb
+RgSchCellCb *cell,
+RgSchDlSf   *dlSf,
+uint8_t     rbStrt,
+uint8_t     numRb
 )
-#else
-static Void rgSCHCmnNonDlfsUpdTyp2Alloc(cell, dlSf, rbStrt, numRb)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-uint8_t                 rbStrt;
-uint8_t                 numRb;
-#endif
 {
    /* Move the type2End pivot forward */
    dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize);
@@ -24774,21 +22065,13 @@ uint8_t                 numRb;
  *  @return Void
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsType0Alloc
 (
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-RgSchDlRbAlloc     *allocInfo,
-RgSchUeCb          *ue
+RgSchCellCb     *cell,
+RgSchDlSf       *dlSf,
+RgSchDlRbAlloc  *allocInfo,
+RgSchUeCb       *ue
 )
-#else
-static Void rgSCHCmnNonDlfsType0Alloc(cell, dlSf, allocInfo, dlUe)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-RgSchDlRbAlloc     *allocInfo;
-RgSchUeCb          *ue;
-#endif
 {
    uint32_t dlAllocMsk = 0;
    uint8_t  rbgFiller = dlSf->lstRbgDfct;
@@ -24951,23 +22234,14 @@ RgSchUeCb          *ue;
  *  @return Void
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHCmnBuildRntpInfo
 (
-RgSchCellCb        *cell,
-uint8_t                 *rntpPtr,
-uint8_t                              startRb,
-uint8_t                  nmbRb,
-uint16_t                 bw
+RgSchCellCb  *cell,
+uint8_t      *rntpPtr,
+uint8_t             startRb,
+uint8_t      nmbRb,
+uint16_t     bw
 )
-#else
-static S16 rgSCHCmnBuildRntpInfo(cell, rntpPtr, startRb, nmbRb, bw)
-RgSchCellCb        *cell;
-uint8_t                 *rntpPtr;
-uint8_t                              startRb;
-uint8_t                  nmbRb;
-uint16_t                 bw;
-#endif
 {
    uint16_t rbPtrStartIdx;              /* Start Index of Octete Buffer to be filled */
    uint16_t rbPtrEndIdx;                /* End Index of Octete Buffer to be filled */
@@ -25033,25 +22307,15 @@ uint16_t                 bw;
  *
  *  @return Void
  **/
-#ifdef ANSI
 static S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc
 (
 RgSchCellCb        *cell,
-RgSchUeCb                 *ue,
+RgSchUeCb         *ue,
 RgSchDlSf          *dlSf,
 RgSchSFRPoolInfo   *sfrPool,
-uint8_t                 rbStrt,
-uint8_t                 numRb
+uint8_t            rbStrt,
+uint8_t            numRb
 )
-#else
-static S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc(cell, ue, dlSf, sfrPool, rbStrt, numRb)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgSchDlSf          *dlSf;
-RgSchSFRPoolInfo   *sfrPool;
-uint8_t                 rbStrt;
-uint8_t                 numRb;
-#endif
 {
 #ifndef LTEMAC_SPS
    S16 ret;
@@ -25121,7 +22385,6 @@ uint8_t                 numRb;
  *
  *  @return Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsSFRPoolType0Alloc
 (
 RgSchCellCb        *cell,
@@ -25129,13 +22392,6 @@ RgSchDlSf          *dlSf,
 RgSchSFRPoolInfo   *poolInfo,
 RgSchDlRbAlloc     *allocInfo
 )
-#else
-static Void rgSCHCmnNonDlfsSFRPoolType0Alloc(cell, dlSf, poolInfo, allocInfo)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-RgSchSFRPoolInfo   *poolInfo;
-RgSchDlRbAlloc     *allocInfo;
-#endif
 {
    uint32_t dlAllocMsk = 0;
    uint8_t  rbgFiller = 0;
@@ -25245,17 +22501,7 @@ RgSchDlRbAlloc     *allocInfo;
  *  @return  void
  
  **/
-#ifdef ANSI
-static void rgSCHCmnNonDlfsDsfrRntpComp
-(
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf
-)
-#else
-static void rgSCHCmnNonDlfsDsfrRntpComp(cell, dlSf)
-RgSchCellCb        *cell;
-RgSchDlSf          *dlSf;
-#endif
+static void rgSCHCmnNonDlfsDsfrRntpComp(RgSchCellCb *cell,RgSchDlSf *dlSf)
 {
    static uint16_t samples = 0;
    uint16_t i;
@@ -25333,21 +22579,13 @@ RgSchDlSf          *dlSf;
  *      -# RFAILED
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHCmnSFRNonDlfsUeRbAlloc
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgSchDlSf          *dlSf,
-uint8_t                 *isDlBwAvail
+uint8_t           *isDlBwAvail
 )
-#else
-static S16 rgSCHCmnSFRNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgSchDlSf          *dlSf;
-uint8_t                 *isDlBwAvail;
-#endif
 {
    RgSchDlRbAlloc  *allocInfo;
    RgSchCmnDlUe    *dlUe;
@@ -25455,21 +22693,13 @@ uint8_t                 *isDlBwAvail;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHCmnNonDlfsUeRbAlloc
 (
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgSchDlSf          *dlSf,
-uint8_t                 *isDlBwAvail
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+RgSchDlSf    *dlSf,
+uint8_t      *isDlBwAvail
 )
-#else
-static S16 rgSCHCmnNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgSchDlSf          *dlSf;
-uint8_t                 *isDlBwAvail;
-#endif
 {
    RgSchDlRbAlloc  *allocInfo;
    RgSchCmnDlUe    *dlUe;
@@ -25558,19 +22788,12 @@ uint8_t                 *isDlBwAvail;
  *
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsCcchSduAlloc
 (
 RgSchCellCb         *cell,
 RgSchCmnCcchSduRbAlloc *allocInfo,
 uint8_t                  isRetx
 )
-#else
-static Void rgSCHCmnNonDlfsCcchSduAlloc(cell, allocInfo, isRetx)
-RgSchCellCb         *cell;
-RgSchCmnCcchSduRbAlloc *allocInfo;
-uint8_t                  isRetx;
-#endif
 {
    S16             ret;
    CmLListCp       *ccchSduLst        = NULLP;
@@ -25648,19 +22871,12 @@ uint8_t                  isRetx;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHCmnNonDlfsCcchSduRbAlloc
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ueCb,
 RgSchDlSf          *dlSf
 )
-#else
-static S16 rgSCHCmnNonDlfsCcchSduRbAlloc(cell, ueCb, dlSf)
-RgSchCellCb        *cell;
-RgSchUeCb          *ueCb;
-RgSchDlSf          *dlSf;
-#endif
 {
    RgSchDlRbAlloc  *allocInfo;
    RgSchCmnDlUe         *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
@@ -25754,19 +22970,12 @@ RgSchDlSf          *dlSf;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static S16 rgSCHCmnNonDlfsMsg4RbAlloc
 (
 RgSchCellCb        *cell,
 RgSchRaCb          *raCb,
 RgSchDlSf          *dlSf
 )
-#else
-static S16 rgSCHCmnNonDlfsMsg4RbAlloc(cell, raCb, dlSf)
-RgSchCellCb        *cell;
-RgSchRaCb          *raCb;
-RgSchDlSf          *dlSf;
-#endif
 {
    RgSchDlRbAlloc  *allocInfo;
 
@@ -25889,19 +23098,12 @@ RgSchDlSf          *dlSf;
  *
  *  @return  Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsMsg4Alloc
 (
 RgSchCellCb         *cell,
 RgSchCmnMsg4RbAlloc *allocInfo,
-uint8_t                  isRetx
+uint8_t             isRetx
 )
-#else
-static Void rgSCHCmnNonDlfsMsg4Alloc(cell, allocInfo, isRetx)
-RgSchCellCb         *cell;
-RgSchCmnMsg4RbAlloc *allocInfo;
-uint8_t                  isRetx;
-#endif
 {
    S16             ret;
    CmLListCp       *msg4Lst        = NULLP;
@@ -25985,7 +23187,6 @@ uint8_t                  isRetx;
  *
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgSCHCmnNonDlfsDedRbAlloc
 (
 RgSchCellCb        *cell,
@@ -25994,15 +23195,6 @@ CmLListCp          *ueLst,
 CmLListCp          *schdHqPLst,
 CmLListCp          *nonSchdHqPLst
 )
-#else
-Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst,
-        schdHqPLst, nonSchdHqPLst)
-RgSchCellCb        *cell;
-RgSchCmnUeRbAlloc  *allocInfo;
-CmLListCp          *ueLst;
-CmLListCp          *schdHqPLst;
-CmLListCp          *nonSchdHqPLst;
-#endif
 {
    S16             ret;
    CmLList         *schdLnkNode  = NULLP;
@@ -26089,20 +23281,14 @@ CmLListCp          *nonSchdHqPLst;
  *  @return  Void
  **/
 
-#ifdef ANSI
 Void rgSCHCmnNonDlfsRbAlloc
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
-#else
-Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
 {
-   uint8_t                 raRspCnt = 0;
-   RgSchDlRbAlloc     *reqAllocInfo;
+   uint8_t        raRspCnt = 0;
+   RgSchDlRbAlloc *reqAllocInfo;
 
    /* Allocate for MSG4 retransmissions */
    if (allocInfo->msg4Alloc.msg4RetxLst.count)
@@ -26227,37 +23413,23 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *
  **********************************************************/
 #ifdef LTEMAC_SPS
-#ifdef ANSI
 uint32_t rgSCHCmnCalcRiv
 (
-uint8_t           bw,
-uint8_t           rbStart,
-uint8_t           numRb
+uint8_t    bw,
+uint8_t    rbStart,
+uint8_t    numRb
 )
 #else
-uint32_t rgSCHCmnCalcRiv(bw, rbStart, numRb)
-uint8_t           bw;
-uint8_t           rbStart;
-uint8_t           numRb;
-#endif
-#else
-#ifdef ANSI
 uint32_t rgSCHCmnCalcRiv
 (
-uint8_t           bw,
-uint8_t           rbStart,
-uint8_t           numRb
+uint8_t    bw,
+uint8_t    rbStart,
+uint8_t    numRb
 )
-#else
-uint32_t rgSCHCmnCalcRiv(bw, rbStart, numRb)
-uint8_t           bw;
-uint8_t           rbStart;
-uint8_t           numRb;
-#endif
 #endif
 {
-   uint8_t           numRbMinus1 = numRb - 1;
-   uint32_t          riv;
+   uint8_t  numRbMinus1 = numRb - 1;
+   uint32_t riv;
 
 
    if (numRbMinus1 <= bw/2)
@@ -26292,28 +23464,21 @@ uint8_t           numRb;
  *  @return     S16
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlCpyRachInfo
 (
-RgSchCellCb                *cell,
-RgSchTddRachRspLst         rachRspLst[][RGSCH_NUM_SUB_FRAMES],
-uint8_t                         raArrSz
+RgSchCellCb         *cell,
+RgSchTddRachRspLst  rachRspLst[][RGSCH_NUM_SUB_FRAMES],
+uint8_t             raArrSz
 )
-#else
-static S16 rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz)
-RgSchCellCb                *cell;
-RgSchTddRachRspLst         rachRspLst[][RGSCH_NUM_SUB_FRAMES];
-uint8_t                         raArrSz;
-#endif
 {
-   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   uint8_t                   sfNum;
-   S16                  sfnIdx;
-   uint16_t                  subfrmIdx;
-   uint8_t                   numRfs;
-   uint8_t                   numSubfrms;
-   uint8_t                   sfcount;
-   S16                   ret;
+   uint8_t   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t   sfNum;
+   S16       sfnIdx;
+   uint16_t  subfrmIdx;
+   uint8_t   numRfs;
+   uint8_t   numSubfrms;
+   uint8_t   sfcount;
+   S16       ret;
 
 
    /* Allocate RACH response information for each DL
@@ -26398,47 +23563,26 @@ uint8_t                         raArrSz;
  *
  **/
 #ifdef LTE_TDD
-#ifdef ANSI
 static S32 rgSchCmnFetchItbs 
 (
-RgSchCellCb        *cell,
-RgSchCmnDlUe       *ueDl,
-RgSchDlSf          *subFrm,
-uint8_t                 cqi,
-uint8_t                 cfi,
-uint8_t                 cwIdx,
-uint8_t                 noLyr
+RgSchCellCb   *cell,
+RgSchCmnDlUe  *ueDl,
+RgSchDlSf     *subFrm,
+uint8_t       cqi,
+uint8_t       cfi,
+uint8_t       cwIdx,
+uint8_t       noLyr
 )
 #else
-static S32 rgSchCmnFetchItbs (cell, ueDl, subFrm, cqi, cfi, cwIdx, noLyr)
-RgSchCellCb        *cell;
-RgSchCmnDlUe       *ueDl; 
-RgSchDlSf          *subFrm;
-uint8_t                 cqi;
-uint8_t                 cfi;
-uint8_t                 cwIdx;
-uint8_t                 noLyr;
-#endif
-#else
-#ifdef ANSI
 static S32 rgSchCmnFetchItbs 
 (
-RgSchCellCb        *cell,
-RgSchCmnDlUe       *ueDl,
-uint8_t                 cqi,
-uint8_t                 cfi,
-uint8_t                 cwIdx,
-uint8_t                 noLyr
+RgSchCellCb   *cell,
+RgSchCmnDlUe  *ueDl,
+uint8_t       cqi,
+uint8_t       cfi,
+uint8_t       cwIdx,
+uint8_t       noLyr
 )
-#else
-static S32 rgSchCmnFetchItbs (cell, ueDl, cqi, cfi, cwIdx, noLyr)
-RgSchCellCb        *cell;
-RgSchCmnDlUe       *ueDl; 
-uint8_t                 cqi;
-uint8_t                 cfi;
-uint8_t                 cwIdx;
-uint8_t                 noLyr;
-#endif 
 #endif
 {
 
@@ -26510,31 +23654,20 @@ uint8_t                 noLyr;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRb1Tb1Cw
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchDlRbAlloc   *allocInfo;
    S16              ret;
-   uint8_t               numRb;
+   uint8_t          numRb;
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -26595,31 +23728,20 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRb1Tb1Cw
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchDlRbAlloc   *allocInfo;
    S16              ret;
-   uint8_t               numRb;
+   uint8_t          numRb;
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -26679,27 +23801,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM1
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb            *cell,
+RgSchDlSf              *subFrm,
+RgSchUeCb              *ue,
+uint32_t               bo,
+uint32_t               *effBo,
+RgSchDlHqProcCb        *proc,
+RgSchCmnDlRbAllocInfo  *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -26730,27 +23841,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM1
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -26781,27 +23881,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM2
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -26832,27 +23921,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM2
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -26883,27 +23961,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM3
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 
 
@@ -26939,27 +24006,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM3
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 
 
@@ -27011,19 +24067,12 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  TfuDciFormat
  *
  **/
-#ifdef ANSI
 TfuDciFormat rgSCHCmnSlctPdcchFrmt
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                         *raType
+RgSchCellCb   *cell,
+RgSchUeCb     *ue,
+uint8_t       *raType
 )
-#else
-TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                         *raType;
-#endif
 {
    RgSchCmnCell   *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -27073,35 +24122,24 @@ uint8_t                         *raType;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM3RetxRetx
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    S16           ret;
    RgSchDlRbAlloc *allocInfo;
-   uint8_t            numRb;
+   uint8_t       numRb;
    Bool          swpFlg;
-   uint8_t            precInfo;
-   uint8_t            noTxLyrs;
-   uint8_t            precInfoAntIdx;
+   uint8_t       precInfo;
+   uint8_t       noTxLyrs;
+   uint8_t       precInfoAntIdx;
 
 
    ret = ROK;
@@ -27183,37 +24221,26 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM4RetxRetx
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlTM4RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    S16            ret;
    RgSchDlRbAlloc *allocInfo;
-   uint8_t             numRb;
+   uint8_t        numRb;
    Bool           swpFlg = FALSE;
-   uint8_t             precInfo;
+   uint8_t        precInfo;
 #ifdef FOUR_TX_ANTENNA
-   uint8_t             precInfoAntIdx;
+   uint8_t        precInfoAntIdx;
 #endif
-   uint8_t             noTxLyrs;
+   uint8_t        noTxLyrs;
 
 
    ret = ROK;
@@ -27291,7 +24318,6 @@ precInfo = (getPrecInfoFunc[1][precInfoAntIdx])(cell, ue, noTxLyrs, TRUE);
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlSMGetAttrForTxRetx
 (
 RgSchUeCb                  *ue,
@@ -27301,16 +24327,6 @@ RgSchDlHqTbCb              **txTb,
 Bool                       *frthrScp,
 Bool                       *swpFlg
 )
-#else
-static Void rgSCHCmnDlSMGetAttrForTxRetx(ue, proc, retxTb, txTb, frthrScp,\
-        swpFlg)
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *proc;
-RgSchDlHqTbCb              **retxTb;
-RgSchDlHqTbCb              **txTb;
-Bool                       *frthrScp;
-Bool                       *swpFlg;
-#endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,proc->hqE->cell);
    RgSchDlRbAlloc  *allocInfo;
@@ -27370,21 +24386,13 @@ Bool                       *swpFlg;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
 static uint8_t rgSCHCmnDlTM3PrecInf2
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                         numTxLyrs,
-Bool                       bothCwEnbld
+RgSchCellCb *cell,
+RgSchUeCb   *ue,
+uint8_t     numTxLyrs,
+Bool        bothCwEnbld
 )
-#else
-static uint8_t rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                         numTxLyrs;
-Bool                       bothCwEnbld;
-#endif
 {
 
    return (0);
@@ -27408,21 +24416,13 @@ Bool                       bothCwEnbld;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
 static uint8_t rgSCHCmnDlTM4PrecInf2
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                         numTxLyrs,
-Bool                       bothCwEnbld
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+uint8_t      numTxLyrs,
+Bool         bothCwEnbld
 )
-#else
-static uint8_t rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                         numTxLyrs;
-Bool                       bothCwEnbld;
-#endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
    uint8_t            precIdx;
@@ -27496,23 +24496,15 @@ Bool                       bothCwEnbld;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
 static uint8_t rgSCHCmnDlTM3PrecInf4
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                         numTxLyrs,
-Bool                       bothCwEnbld
+RgSchCellCb *cell,
+RgSchUeCb   *ue,
+uint8_t     numTxLyrs,
+Bool        bothCwEnbld
 )
-#else
-static uint8_t rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                         numTxLyrs;
-Bool                       bothCwEnbld;
-#endif
 {
-   uint8_t            precIdx;
+   uint8_t  precIdx;
 
 
    if (bothCwEnbld)
@@ -27544,24 +24536,16 @@ Bool                       bothCwEnbld;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
 static uint8_t rgSCHCmnDlTM4PrecInf4
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                         numTxLyrs,
-Bool                       bothCwEnbld
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+uint8_t      numTxLyrs,
+Bool         bothCwEnbld
 )
-#else
-static uint8_t rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                         numTxLyrs;
-Bool                       bothCwEnbld;
-#endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   uint8_t            precInfoBaseIdx, precIdx;
+   uint8_t       precInfoBaseIdx, precIdx;
 
 
    precInfoBaseIdx  = (ue->mimoInfo.puschFdbkVld)? (16):
@@ -27613,39 +24597,23 @@ Bool                       bothCwEnbld;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlGetAttrForTM3
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *proc,
-uint8_t                         *numTxLyrs,
-TfuDciFormat               *dciFrmt,
-uint8_t                         *prcdngInf,
-RgSchDlHqTbCb              **retxTb,
-RgSchDlHqTbCb              **txTb,
-Bool                       *frthrScp,
-Bool                       *swpFlg,
-uint8_t                         *raType
+RgSchCellCb      *cell,
+RgSchUeCb        *ue,
+RgSchDlHqProcCb  *proc,
+uint8_t          *numTxLyrs,
+TfuDciFormat     *dciFrmt,
+uint8_t          *prcdngInf,
+RgSchDlHqTbCb    **retxTb,
+RgSchDlHqTbCb    **txTb,
+Bool             *frthrScp,
+Bool             *swpFlg,
+uint8_t          *raType
 )
-#else
-static Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\
-        prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *proc;
-uint8_t                         *numTxLyrs;
-TfuDciFormat               *dciFrmt;
-uint8_t                         *prcdngInf;
-RgSchDlHqTbCb              **retxTb;
-RgSchDlHqTbCb              **txTb;
-Bool                       *frthrScp;
-Bool                       *swpFlg;
-uint8_t                         *raType;
-#endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   uint8_t            precInfoAntIdx;
+   uint8_t       precInfoAntIdx;
 
 
    /* Avoiding Tx-Retx for LAA cell as firstSchedTime is associated with 
@@ -27813,36 +24781,20 @@ uint8_t                         *raType;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlGetAttrForTM4
 (
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *proc,
-uint8_t                         *numTxLyrs,
-TfuDciFormat               *dciFrmt,
-uint8_t                         *prcdngInf,
-RgSchDlHqTbCb              **retxTb,
-RgSchDlHqTbCb              **txTb,
-Bool                       *frthrScp,
-Bool                       *swpFlg,
-uint8_t                         *raType
+RgSchCellCb      *cell,
+RgSchUeCb        *ue,
+RgSchDlHqProcCb  *proc,
+uint8_t          *numTxLyrs,
+TfuDciFormat     *dciFrmt,
+uint8_t          *prcdngInf,
+RgSchDlHqTbCb    **retxTb,
+RgSchDlHqTbCb    **txTb,
+Bool             *frthrScp,
+Bool             *swpFlg,
+uint8_t          *raType
 )
-#else
-static Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\
-        prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *proc;
-uint8_t                         *numTxLyrs;
-TfuDciFormat               *dciFrmt;
-uint8_t                         *prcdngInf;
-RgSchDlHqTbCb              **retxTb;
-RgSchDlHqTbCb              **txTb;
-Bool                       *frthrScp;
-Bool                       *swpFlg;
-uint8_t                         *raType;
-#endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
    uint8_t precInfoAntIdx;
@@ -27995,36 +24947,25 @@ uint8_t                         *raType;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM3TxRetx
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
-)
-#else
-static Void rgSCHCmnDlTM3TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
+)
 {
    S16              ret;
    RgSchDlRbAlloc   *allocInfo;
-   uint8_t               numRb;
+   uint8_t          numRb;
    RgSchDlHqTbCb    *retxTb, *txTb;
    Bool             frthrScp;
    Bool             swpFlg;
-   uint8_t               prcdngInf;
-   uint8_t               numTxLyrs;
+   uint8_t          prcdngInf;
+   uint8_t          numTxLyrs;
 
    frthrScp = FALSE;
 
@@ -28109,36 +25050,25 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM4TxRetx
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlTM4TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    S16              ret;
    RgSchDlRbAlloc   *allocInfo;
-   uint8_t               numRb;
+   uint8_t          numRb;
    RgSchDlHqTbCb    *retxTb, *txTb;
    Bool             frthrScp;
    Bool             swpFlg;
-   uint8_t               prcdngInf;
-   uint8_t               numTxLyrs;
+   uint8_t          prcdngInf;
+   uint8_t          numTxLyrs;
 
 
    ret = ROK;
@@ -28226,35 +25156,24 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM3TxTx
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchCmnDlUe     *ueDl;
    RgSchDlRbAlloc   *allocInfo;
-   uint8_t               numRb;
-   uint8_t               noTxLyrs;
-   uint8_t               precInfo;
+   uint8_t          numRb;
+   uint8_t          noTxLyrs;
+   uint8_t          precInfo;
    S16              ret;
-   uint8_t               precInfoAntIdx;
+   uint8_t          precInfoAntIdx;
 
 
    ret = ROK;
@@ -28359,34 +25278,23 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlTM4TxTx
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchCmnDlUe     *ueDl;
    RgSchDlRbAlloc   *allocInfo;
-   uint8_t               numRb;
-   uint8_t               precInfo;
-   uint8_t               noTxLyrs;
-   uint8_t               precInfoAntIdx;
+   uint8_t          numRb;
+   uint8_t          precInfo;
+   uint8_t          noTxLyrs;
+   uint8_t          precInfoAntIdx;
    S16              ret;
 
 
@@ -28495,27 +25403,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM4
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb            *cell,
+RgSchDlSf              *subFrm,
+RgSchUeCb              *ue,
+uint32_t               bo,
+uint32_t               *effBo,
+RgSchDlHqProcCb        *proc,
+RgSchCmnDlRbAllocInfo  *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 
    /* Both TBs free for TX allocation */
@@ -28551,27 +25448,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM4
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb           *cell,
+RgSchDlSf             *subFrm,
+RgSchUeCb             *ue,
+uint32_t              bo,
+uint32_t              *effBo,
+RgSchDlHqProcCb       *proc,
+RgSchCmnDlRbAllocInfo *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 
    if ((proc->tbInfo[0].state == HQ_TB_NACKED) &&
@@ -28618,27 +25504,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM5
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 #if (ERRCLASS & ERRCLS_DEBUG)
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId);
@@ -28671,27 +25546,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM5
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
-RgSchDlHqProcCb            *proc,
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
+RgSchCellCb            *cell,
+RgSchDlSf              *subFrm,
+RgSchUeCb              *ue,
+uint32_t               bo,
+uint32_t               *effBo,
+RgSchDlHqProcCb        *proc,
+RgSchCmnDlRbAllocInfo  *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
 #if (ERRCLASS & ERRCLS_DEBUG)
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId);
@@ -28725,32 +25589,21 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM6
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchDlRbAlloc *allocInfo;
    RgSchCmnDlUe   *ueDl;
    S16            ret;
-   uint8_t             numRb;
+   uint8_t        numRb;
 
 
    ret       = ROK;
@@ -28819,32 +25672,21 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM6
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    RgSchDlRbAlloc *allocInfo;
    RgSchCmnDlUe   *ueDl;
    S16            ret;
-   uint8_t             numRb;
+   uint8_t        numRb;
 
 
    ret       = ROK;
@@ -28911,27 +25753,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocTxRbTM7
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocTxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -28962,27 +25793,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return Void
  *
  **/
-#ifdef ANSI
 static Void rgSCHCmnDlAllocRetxRbTM7
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-static Void rgSCHCmnDlAllocRetxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
    return;
@@ -29010,30 +25830,19 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  S16
  *
  **/
-#ifdef ANSI
 S16 rgSCHCmnDlAllocTxRb
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
-   uint32_t                     newSchBits = 0;
-   uint32_t                     prevSchBits = 0;
+   uint32_t                newSchBits = 0;
+   uint32_t                prevSchBits = 0;
    RgSchDlRbAlloc          *allocInfo;
 
 
@@ -29099,19 +25908,12 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  Bool 
  *
  **/
-#ifdef ANSI
 Bool rgSCHCmnRetxAvoidTdd 
 (
 RgSchDlSf                  *curSf,
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *proc
 )
-#else
-Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc)
-RgSchDlSf                  *curSf;
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *proc;
-#endif
 {
    RgSchTddSfType   txSfType = 0;
 
@@ -29179,19 +25981,12 @@ RgSchDlHqProcCb            *proc;
  *  @return  Bool 
  *
  **/
-#ifdef ANSI
 Bool rgSCHCmnRetxAllocAvoid 
 (
 RgSchDlSf                  *subFrm,
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *proc
 )
-#else
-Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc)
-RgSchDlSf                  *subFrm;
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *proc;
-#endif
 {
    uint8_t          reqRbs;
 
@@ -29242,27 +26037,16 @@ RgSchDlHqProcCb            *proc;
  *  @return  S16
  *
  **/
-#ifdef ANSI
 S16 rgSCHCmnDlAllocRetxRb
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-uint32_t                        bo,
-uint32_t                        *effBo,
+uint32_t                   bo,
+uint32_t                   *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
-#else
-S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-uint32_t                        bo;
-uint32_t                        *effBo;
-RgSchDlHqProcCb            *proc;
-RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
-#endif
 {
    uint32_t                     newSchBits = 0;
    RgSchDlRbAlloc          *allocInfo;
@@ -29328,38 +26112,27 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @return  S16
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlAlloc1CwTxRb
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-RgSchDlHqTbCb              *tbInfo,
-uint32_t                        bo,
-uint8_t                         *numRb,
-uint32_t                        *effBo
+RgSchCellCb       *cell,
+RgSchDlSf         *subFrm,
+RgSchUeCb         *ue,
+RgSchDlHqTbCb     *tbInfo,
+uint32_t          bo,
+uint8_t           *numRb,
+uint32_t          *effBo
 )
-#else
-static S16 rgSCHCmnDlAlloc1CwTxRb(cell, subFrm, ue, tbInfo, bo, numRb, effBo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-RgSchDlHqTbCb              *tbInfo;
-uint32_t                        bo;
-uint8_t                         *numRb;
-uint32_t                        *effBo;
-#endif
-{
-   uint32_t                tbSz;
-   uint8_t                 imcs;
-   uint8_t                 iTbs;
-   RgSchCmnDlUe       *ueDl;
-   RgSchDlRbAlloc     *allocInfo;
-   uint32_t                oldReq;
-   uint32_t                reqBytes;
+{
+   uint32_t        tbSz;
+   uint8_t         imcs;
+   uint8_t         iTbs;
+   RgSchCmnDlUe    *ueDl;
+   RgSchDlRbAlloc  *allocInfo;
+   uint32_t        oldReq;
+   uint32_t        reqBytes;
    /* Correcting wrap around issue.
     * This change has been done at mutliple places in this function.*/
-   uint32_t                tempNumRb;
+   uint32_t        tempNumRb;
 
    reqBytes  = bo;
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -29425,19 +26198,12 @@ uint32_t                        *effBo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnRdcImcsTxTb
 (
 RgSchDlRbAlloc   *allocInfo,
-uint8_t               tbInfoIdx,
-uint32_t              cnsmdBytes
+uint8_t          tbInfoIdx,
+uint32_t         cnsmdBytes
 )
-#else
-Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes)
-RgSchDlRbAlloc   *allocInfo;
-uint8_t               tbInfoIdx;
-uint32_t              cnsmdBytes;
-#endif
 {
    return;
    /*The below functionality is not needed.*/
@@ -29499,47 +26265,36 @@ uint32_t              cnsmdBytes;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlAlloc2CwTxRb
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *proc,
-uint32_t                        bo,
-uint8_t                         *numRbRef,
-uint32_t                        *effBo
-)
-#else
-static S16 rgSCHCmnDlAlloc2CwTxRb(cell, subFrm, ue, proc, bo, numRbRef, effBo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *proc;
-uint32_t                        bo;
-uint8_t                         *numRbRef;
-uint32_t                        *effBo;
-#endif
-{
-   uint32_t                noRes;
-   uint32_t                eff1, eff2;
-   uint32_t                tb1Sz, tb2Sz;
-   uint8_t                 imcs1, imcs2;
-   uint8_t                 noLyr1, noLyr2;
-   uint8_t                 iTbs1, iTbs2;
-   RgSchCmnDlCell     *cellDl;
-   RgSchCmnDlUe       *ueDl;
-   RgSchDlRbAlloc     *allocInfo;
-   uint32_t                oldReq;
-   uint32_t                reqBytes;
+RgSchCellCb      *cell,
+RgSchDlSf        *subFrm,
+RgSchUeCb        *ue,
+RgSchDlHqProcCb  *proc,
+uint32_t         bo,
+uint8_t          *numRbRef,
+uint32_t         *effBo
+)
+{
+   uint32_t       noRes;
+   uint32_t       eff1, eff2;
+   uint32_t       tb1Sz, tb2Sz;
+   uint8_t        imcs1, imcs2;
+   uint8_t        noLyr1, noLyr2;
+   uint8_t        iTbs1, iTbs2;
+   RgSchCmnDlCell *cellDl;
+   RgSchCmnDlUe   *ueDl;
+   RgSchDlRbAlloc *allocInfo;
+   uint32_t       oldReq;
+   uint32_t       reqBytes;
    /* Fix: MUE_PERTTI_DL */
-   uint32_t                numRb;
-   RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t                 cfi = cellSch->dl.currCfi;
-   S16                availBw; 
-   uint32_t                availBits = 0;
+   uint32_t       numRb;
+   RgSchCmnCell   *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   uint8_t        cfi = cellSch->dl.currCfi;
+   S16            availBw; 
+   uint32_t       availBits = 0;
 #ifdef LTE_ADV
-   uint32_t                boTmp = bo;
+   uint32_t       boTmp = bo;
 #endif
 
 
@@ -29762,39 +26517,27 @@ uint32_t                        *effBo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlAlloc2CwTxRetxRb
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-RgSchDlHqTbCb              *reTxTb,
-RgSchDlHqTbCb              *txTb,
-uint8_t                         *numRb,
+RgSchCellCb     *cell,
+RgSchDlSf       *subFrm,
+RgSchUeCb       *ue,
+RgSchDlHqTbCb   *reTxTb,
+RgSchDlHqTbCb   *txTb,
+uint8_t         *numRb,
 uint32_t                        *effBo
 )
-#else
-static S16 rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, reTxTb, txTb, numRb,\
-        effBo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-RgSchDlHqTbCb              *reTxTb;
-RgSchDlHqTbCb              *txTb;
-uint8_t                         *numRb;
-uint32_t                        *effBo;
-#endif
 {
    RgSchCmnDlUe       *ueDl;
    RgSchDlRbAlloc     *allocInfo;
-   uint8_t                 imcs1, imcs2;
-   uint8_t                  noLyr2;
-   uint16_t                 tb2Sz;
+   uint8_t            imcs1, imcs2;
+   uint8_t            noLyr2;
+   uint16_t           tb2Sz;
    RgSchCmnDlUeCwInfo *otherCw;
    S16                 availBw;
    RgSchCmnDlCell     *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   uint8_t                 cfi = cellDl->currCfi; 
-   uint8_t                 iTbs;
+   uint8_t            cfi = cellDl->currCfi; 
+   uint8_t            iTbs;
 
 
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -29891,33 +26634,21 @@ uint32_t                        *effBo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlAlloc2CwRetxRb
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *proc,
-uint8_t                         *numRb,
-Bool                       *swpFlg,
-uint32_t                        *effBo
+RgSchCellCb      *cell,
+RgSchDlSf        *subFrm,
+RgSchUeCb        *ue,
+RgSchDlHqProcCb  *proc,
+uint8_t          *numRb,
+Bool             *swpFlg,
+uint32_t         *effBo
 )
-#else
-static S16 rgSCHCmnDlAlloc2CwRetxRb(cell, subFrm, ue, proc,\
-        numRb, swpFlg, effBo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *proc;
-uint8_t                         *numRb;
-Bool                       *swpFlg;
-uint32_t                        *effBo;
-#endif
 {
-   RgSchDlRbAlloc     *allocInfo;
-   uint8_t                 imcs1;
-   uint8_t                 imcs2;
-   RgSchDlHqTbCb      *lrgTbInfo, *othrTbInfo;
+   RgSchDlRbAlloc  *allocInfo;
+   uint8_t         imcs1;
+   uint8_t         imcs2;
+   RgSchDlHqTbCb   *lrgTbInfo, *othrTbInfo;
 
 
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -29996,28 +26727,16 @@ uint32_t                        *effBo;
  *  @return  S16
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnDlAlloc1CwRetxRb
 (
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchUeCb                  *ue,
-RgSchDlHqTbCb              *tbInfo,
-uint8_t                         noLyr,
-uint8_t                         *numRb,
-uint32_t                        *effBo
+RgSchCellCb    *cell,
+RgSchDlSf      *subFrm,
+RgSchUeCb      *ue,
+RgSchDlHqTbCb  *tbInfo,
+uint8_t        noLyr,
+uint8_t        *numRb,
+uint32_t       *effBo
 )
-#else
-static S16 rgSCHCmnDlAlloc1CwRetxRb(cell, subFrm, ue, tbInfo, noLyr,\
-        numRb, effBo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchUeCb                  *ue;
-RgSchDlHqTbCb              *tbInfo;
-uint8_t                         noLyr;
-uint8_t                         *numRb;
-uint32_t                        *effBo;
-#endif
 {
    RgSchDlRbAlloc  *allocInfo;
    uint8_t              imcs;
@@ -30064,19 +26783,12 @@ uint32_t                        *effBo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnDlRelPdcchFbk
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 Bool               isAck
 )
-#else
-Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-Bool               isAck;
-#endif
 {
 
    rgSCHCmnSpsDlRelPdcchFbk(cell, ue, isAck);
@@ -30100,17 +26812,11 @@ Bool               isAck;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnDlProcAck
 (
 RgSchCellCb        *cell,
 RgSchDlHqProcCb    *hqP
 )
-#else
-Void rgSCHCmnDlProcAck(cell, hqP)
-RgSchCellCb        *cell;
-RgSchDlHqProcCb    *hqP;
-#endif
 {
 
 
@@ -30139,17 +26845,11 @@ uint32_t rgSchStatCrntiCeRcvCnt;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnHdlCrntiCE
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue
 )
-#else
-Void rgSCHCmnHdlCrntiCE(cell, ue)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-#endif
 {
 
 #ifdef RGSCH_SPS_STATS   
@@ -30200,19 +26900,12 @@ RgSchUeCb          *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnUlSpsRelInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 Bool               isExplRel
 )
-#else
-Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-Bool               isExplRel;
-#endif
 {
 
    rgSCHCmnSpsUlProcRelInd(cell, ue, isExplRel);
@@ -30235,19 +26928,12 @@ Bool               isExplRel;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnUlSpsActInd
 (
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint16_t                spsSduSize
+RgSchCellCb     *cell,
+RgSchUeCb       *ue,
+uint16_t        spsSduSize
 )
-#else
-Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint16_t                spsSduSize;
-#endif
 {
 
 
@@ -30276,19 +26962,12 @@ uint16_t                spsSduSize;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnUlCrcInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 CmLteTimingInfo    crcTime
 )
-#else
-Void rgSCHCmnUlCrcInd(cell, ue, crcTime)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-CmLteTimingInfo    crcTime;
-#endif
 {
 
    if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE)
@@ -30315,19 +26994,12 @@ CmLteTimingInfo    crcTime;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnUlCrcFailInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 CmLteTimingInfo    crcTime
 )
-#else
-Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-CmLteTimingInfo    crcTime;
-#endif
 {
 
    if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE)
@@ -30357,15 +27029,7 @@ CmLteTimingInfo    crcTime;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHCmnDlBcchPcchAlloc
-(
-RgSchCellCb  *cell
-)
-#else
-static Void rgSCHCmnDlBcchPcchAlloc(cell)
-RgSchCellCb  *cell;
-#endif
+static Void rgSCHCmnDlBcchPcchAlloc(RgSchCellCb  *cell)
 {
 #ifdef LTE_TDD
    uint8_t           nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
@@ -30423,17 +27087,11 @@ RgSchCellCb  *cell;
  *  @return  Void
  **/
 
-#ifdef ANSI
 static Void rgSCHBcchPcchDlRbAlloc
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
-#else
-static Void rgSCHBcchPcchDlRbAlloc(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -30473,17 +27131,11 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  **/
 
-#ifdef ANSI
 static Void rgSCHCmnNonDlfsBcchPcchRbAlloc
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
-#else
-static Void rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
 {
    RgSchDlRbAlloc     *reqAllocInfo;
 
@@ -30523,15 +27175,10 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static Void rgSCHChkNUpdSiCfg
 (
 RgSchCellCb             *cell
 )
-#else
-static Void rgSCHChkNUpdSiCfg(cell)
-RgSchCellCb             *cell;
-#endif
 {
    CmLteTimingInfo   pdSchTmInfo;
 
@@ -30688,20 +27335,15 @@ RgSchCellCb             *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static Void rgSCHSelectSi
 (
 RgSchCellCb             *cell
 )
-#else
-static Void rgSCHSelectSi(cell)
-RgSchCellCb             *cell;
-#endif
 {
-   CmLteTimingInfo        crntTmInfo;
-   uint8_t                     siWinSize;
-   uint16_t                    x; 
-   uint16_t                    windowId; 
+   CmLteTimingInfo crntTmInfo;
+   uint8_t         siWinSize;
+   uint16_t        x; 
+   uint16_t        windowId; 
 
 
 
@@ -30804,31 +27446,24 @@ RgSchCellCb             *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 static Void rgSCHDlSiSched
 (
 RgSchCellCb             *cell,
 RgSchCmnDlRbAllocInfo   *allocInfo,
 RgInfSfAlloc            *subfrmAlloc
 )
-#else
-static Void rgSCHDlSiSched(cell, allocInfo, subfrmAlloc)
-RgSchCellCb             *cell;
-RgSchCmnDlRbAllocInfo   *allocInfo;
-RgInfSfAlloc            *subfrmAlloc;
-#endif
 {
    CmLteTimingInfo   crntTimInfo;
    RgSchDlSf         *sf;
-   uint8_t                nPrb = 0;
-   uint8_t                mcs  = 0;
+   uint8_t           nPrb = 0;
+   uint8_t           mcs  = 0;
    MsgLen            msgLen = 0;
-   uint32_t               rb=0;
+   uint32_t          rb=0;
    RgSchCmnDlCell    *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    /* DwPTS Scheduling Changes Start */
 #ifdef LTE_TDD   
-   uint16_t                lostRe;  
-   uint8_t                 cfi = cellDl->currCfi;      
+   uint16_t          lostRe;  
+   uint8_t           cfi = cellDl->currCfi;      
 #endif
    /* DwPTS Scheduling Changes End */
 
@@ -31090,19 +27725,12 @@ RgInfSfAlloc            *subfrmAlloc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 static S16 rgSCHCmnUeDlPwrCtColltCqiRept
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgrUeCqiRept        *ueCqiRpt
 )
-#else
-static S16 rgSCHCmnUeDlPwrCtColltCqiRept(cell, ue, ueCqiRpt)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgrUeCqiRept        *ueCqiRpt;
-#endif
 {
    uint8_t    *cqiCount = NULLP;
    S16   retVal;
@@ -31164,7 +27792,6 @@ RgrUeCqiRept        *ueCqiRpt;
  *  @return  Void
  *
  **/
-#ifdef ANSI
 Void rgSCHCmnChkRetxAllowDtx
 (
 RgSchCellCb        *cell,
@@ -31172,13 +27799,6 @@ RgSchUeCb          *ueCb,
 RgSchDlHqProcCb    *proc,
 Bool               *reTxAllwd
 )
-#else
-Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd)
-RgSchCellCb        *cell;
-RgSchUeCb          *ueCb;
-RgSchDlHqProcCb    *proc;
-Bool               *reTxAllwd;
-#endif
 {
 
 
@@ -31210,19 +27830,12 @@ Bool               *reTxAllwd;
  *  @param[in]  uint8_t      sf
  *  @return     uint16_t     siSetId
  **/
-#ifdef ANSI
 uint16_t rgSCHCmnGetSiSetId
 (
 uint16_t    sfn,
 uint8_t     sf,
 uint16_t    minPeriodicity
 )
-#else
-uint16_t rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity)
-uint16_t    sfn;
-uint8_t     sf
-uint16_t    minPeriodicity;
-#endif
 {
    /* 80 is the minimum SI periodicity in sf. Also
     * all other SI periodicities are multiples of 80 */
@@ -31244,30 +27857,20 @@ uint16_t    minPeriodicity;
  *  @param[in]     uint8_t              cfi
  *  @return        uint32_t             tbSz
  **/
-#ifdef ANSI
 static uint32_t rgSCHCmnCalcDwPtsTbSz
 (
-RgSchCellCb    *cell,
-uint32_t             bo,
-uint8_t             *rb,
-uint8_t             *iTbs,
-uint8_t              lyr,
-uint8_t              cfi
+RgSchCellCb *cell,
+uint32_t    bo,
+uint8_t     *rb,
+uint8_t     *iTbs,
+uint8_t     lyr,
+uint8_t     cfi
 )
-#else
-static uint32_t rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi)
-RgSchCellCb    *cell;
-uint32_t             bo;
-uint8_t             *rb;
-uint8_t             *iTbs;
-uint8_t              lyr;
-uint8_t              cfi;
-#endif
 {
-    uint32_t             tbSz;
+    uint32_t       tbSz;
     RgSchCmnDlCell *cellDl     = RG_SCH_CMN_GET_DL_CELL(cell);
-    uint32_t             numRE      = *rb * cellDl->noResPerRb[cfi];
-    uint32_t             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
+    uint32_t       numRE      = *rb * cellDl->noResPerRb[cfi];
+    uint32_t       numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
 
 
     /* DwPts Rb cannot exceed the cell Bw */
@@ -31317,40 +27920,24 @@ uint8_t              cfi;
  *  @return[in/out] uint32_t            *tb2Sz
  *  @param[in]      uint8_t              cfi 
  **/
-#ifdef ANSI
 static Void rgSCHCmnCalcDwPtsTbSz2Cw
 (
-RgSchCellCb    *cell,
-uint32_t             bo,
-uint8_t             *rb,
-uint8_t              maxRb,
-uint8_t             *iTbs1,
-uint8_t             *iTbs2,
-uint8_t              lyr1,
-uint8_t              lyr2,
-uint32_t            *tb1Sz, 
-uint32_t            *tb2Sz,
-uint8_t              cfi
+RgSchCellCb  *cell,
+uint32_t     bo,
+uint8_t      *rb,
+uint8_t      maxRb,
+uint8_t      *iTbs1,
+uint8_t      *iTbs2,
+uint8_t      lyr1,
+uint8_t      lyr2,
+uint32_t     *tb1Sz, 
+uint32_t     *tb2Sz,
+uint8_t      cfi
 )
-#else
-static Void rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, rb, maxRb, iTbs1, iTbs2, 
-      lyr1, lyr2, tb1Sz, tb2Sz, cfi)
-RgSchCellCb    *cell;
-uint32_t             bo;
-uint8_t             *rb;
-uint8_t              maxRb;
-uint8_t             *iTbs1;
-uint8_t             *iTbs2;
-uint8_t              lyr1;
-uint8_t              lyr2;
-uint32_t            *tb1Sz; 
-uint32_t            *tb2Sz;
-uint8_t              cfi;
-#endif
 {
     RgSchCmnDlCell *cellDl     = RG_SCH_CMN_GET_DL_CELL(cell);
-    uint32_t             numRE      = *rb * cellDl->noResPerRb[cfi];
-    uint32_t             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
+    uint32_t       numRE      = *rb * cellDl->noResPerRb[cfi];
+    uint32_t       numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
 
 
     /* DwPts Rb cannot exceed the cell Bw */
@@ -31396,19 +27983,12 @@ uint8_t              cfi;
  *  @param[in]  RgInfUeDatInd    *datInd
  *  @return Void
  **/
-#ifdef ANSI
 Void rgSCHCmnUpdUeDataIndLcg 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgInfUeDatInd  *datInd
 )
-#else
-Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgInfUeDatInd  *datInd;
-#endif
 {
    uint32_t idx = 0;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -31496,20 +28076,15 @@ RgInfUeDatInd  *datInd;
  * Returns: Void
  *
  */
-#ifdef ANSI
 static Void  rgSCHCmnInitRbAlloc 
 (
 RgSchCellCb        *cell
 )
-#else
-static Void  rgSCHCmnInitRbAlloc (cell)
-RgSchCellCb        *cell;
-#endif
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
    CmLteTimingInfo        frm;
    RgSchDlSf              *dlSf;
-       uint8_t                     idx;
+   uint8_t                idx;
    
 
 /* Initializing RgSchCmnUlRbAllocInfo structure.*/
@@ -31580,19 +28155,12 @@ RgSchCellCb        *cell;
  *  @param[in]  uint8_t               newTxMode
  *  @return Void
  **/
-#ifdef ANSI
 static Void rgSCHCmnSendTxModeInd 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-uint8_t             newTxMode
+uint8_t        newTxMode
 )
-#else
-static Void rgSCHCmnSendTxModeInd(cell, ue, newTxMode)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-uint8_t             newTxMode;
-#endif
 { 
    RgmTransModeInd   *txModeChgInd;
    RgSchCmnDlUe      *ueDl =  RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -31636,23 +28204,14 @@ uint8_t             newTxMode;
  *  @param[in]  uint8_t               iTbs
  *  @return Void
  **/
-#ifdef ANSI
 Void rgSchCheckAndTriggerModeChange
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-uint8_t             reportediTbs,
-uint8_t             previTbs,
-uint8_t             maxiTbs
+uint8_t        reportediTbs,
+uint8_t        previTbs,
+uint8_t        maxiTbs
 )
-#else
-Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-uint8_t             reportediTbs;
-uint8_t             previTbs;
-uint8_t             maxiTbs;
-#endif
 {
    RgrTxMode          txMode;       /*!< UE's Transmission Mode */
    RgrTxMode          modTxMode;       /*!< UE's Transmission Mode */
@@ -31729,15 +28288,7 @@ uint8_t             maxiTbs;
  *  @param[in]  RgInfUeDatInd    *datInd
  *  @return Void
  **/
-#ifdef ANSI
-Bool rgSCHCmnIsDlCsgPrio
-(
-RgSchCellCb    *cell
-)
-#else
-Bool rgSCHCmnIsDlCsgPrio(cell)
-RgSchCellCb    *cell;
-#endif
+Bool rgSCHCmnIsDlCsgPrio(RgSchCellCb    *cell)
 {
   
    RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -31776,15 +28327,7 @@ RgSchCellCb    *cell;
  *  @param[in]  RgInfUeDatInd    *datInd
  *  @return Void
  **/
-#ifdef ANSI
-Bool rgSCHCmnIsUlCsgPrio
-(
-RgSchCellCb    *cell
-)
-#else
-Bool rgSCHCmnIsUlCsgPrio(cell)
-RgSchCellCb    *cell;
-#endif
+Bool rgSCHCmnIsUlCsgPrio(RgSchCellCb    *cell)
 {
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
  
@@ -31817,23 +28360,16 @@ RgSchCellCb    *cell;
  *   Returns: Void
  *
  */
-#ifdef ANSI
-   Void rgSchCmnPreDlSch
+Void rgSchCmnPreDlSch
 (
- RgSchCellCb        **cell,
- uint8_t                 nCell,
- RgSchCellCb        **cellLst
- )
-#else
-Void rgSchCmnPreDlSch(cell, nCell, cellLst)
-   RgSchCellCb        **cell;
-   uint8_t                 nCell;
-   RgSchCellCb        **cellLst;
-#endif
+RgSchCellCb   **cell,
+uint8_t       nCell,
+RgSchCellCb   **cellLst
+)
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell[0]);
    RgSchDlSf     *sf;
-   uint8_t            idx;
+   uint8_t       idx;
 
 
    if(nCell > CM_LTE_MAX_CELLS)
@@ -31898,15 +28434,7 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst)
  *        Returns: Void
  *
  */
-#ifdef ANSI
-Void rgSchCmnPstDlSch
-(
- RgSchCellCb       *cell
-)
-#else
-Void rgSchCmnPstDlSch(cell)
-   RgSchCellCb        *cell
-#endif
+Void rgSchCmnPstDlSch(RgSchCellCb  *cell)
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -31917,17 +28445,7 @@ Void rgSchCmnPstDlSch(cell)
    }
 }
 
-#ifdef ANSI
-uint8_t rgSCHCmnCalcPcqiBitSz
-(
- RgSchUeCb    *ueCb, 
- uint8_t           numTxAnt
-)
-#else
-uint8_t rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
-   RgSchUeCb     *ueCb;
-   uint8_t            numTxAnt;
-#endif
+uint8_t rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb, uint8_t   numTxAnt)
 {
    uint8_t confRepMode;
    uint8_t pcqiSz;
@@ -32066,15 +28584,7 @@ uint8_t rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
  * Returns: Void
  *
  */
-#ifdef ANSI
-Void rgSCHCmnDlSch
-(
- RgSchCellCb        *cell
- )
-#else
-Void rgSCHCmnDlSch (cell)
-   RgSchCellCb        *cell;
-#endif
+Void rgSCHCmnDlSch(RgSchCellCb *cell)
 {
    RgSchDlSf *dlSf;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
index efae2ee..92dde46 100755 (executable)
@@ -100,15 +100,7 @@ static Void rgSCHDbmInitPndngRgrCfgLst ARGS(( RgSchCellCb *cellCb));
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHDbmInitCell
-(
-RgSchCellCb       *cellCb
-)
-#else
-S16 rgSCHDbmInitCell(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+S16 rgSCHDbmInitCell(RgSchCellCb *cellCb)
 {
    S16 ret;
    
@@ -165,17 +157,7 @@ RgSchCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHDbmInitUeCbLst
-(
-RgSchCellCb    *cellCb,
-uint16_t            numBins
-)
-#else
-static S16 rgSCHDbmInitUeCbLst(cellCb, numBins)
-RgSchCellCb    *cellCb;
-uint16_t            numBins;
-#endif
+static S16 rgSCHDbmInitUeCbLst(RgSchCellCb  *cellCb,uint16_t numBins)
 {
    RgSchUeCellInfo ueCellInfo;
 
@@ -201,15 +183,7 @@ uint16_t            numBins;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDeInitUeCbLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-S16 rgSCHDbmDeInitUeCbLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+S16 rgSCHDbmDeInitUeCbLst(RgSchCellCb       *cellCb)
 {
 
    return (cmHashListDeinit(&cellCb->ueLst));
@@ -231,17 +205,7 @@ RgSchCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHDbmInitSpsUeCbLst
-(
-RgSchCellCb       *cellCb,
-uint16_t               numBins
-)
-#else
-static S16 rgSCHDbmInitSpsUeCbLst(cellCb, numBins)
-RgSchCellCb       *cellCb;
-uint16_t               numBins;
-#endif
+static S16 rgSCHDbmInitSpsUeCbLst(RgSchCellCb *cellCb,uint16_t numBins)
 {
    RgSchUeCb ue;
 
@@ -265,15 +229,7 @@ uint16_t               numBins;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDeInitSpsUeCbLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-S16 rgSCHDbmDeInitSpsUeCbLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+S16 rgSCHDbmDeInitSpsUeCbLst(RgSchCellCb  *cellCb)
 {
 
    return (cmHashListDeinit(&cellCb->spsUeLst));
@@ -296,17 +252,7 @@ RgSchCellCb       *cellCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmInsUeCb
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHDbmInsUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHDbmInsUeCb(RgSchCellCb  *cellCb,RgSchUeCb  *ueCb)
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
 
@@ -332,17 +278,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmInsSpsUeCb
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHDbmInsSpsUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHDbmInsSpsUeCb(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
    return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
       (uint8_t *)&ueCb->spsRnti, (uint16_t)sizeof(ueCb->spsRnti)));
@@ -364,17 +300,7 @@ RgSchUeCb         *ueCb;
  *  @param[in]  ueId
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-RgSchUeCb* rgSCHDbmGetUeCb
-(
-RgSchCellCb       *cellCb, 
-CmLteRnti      ueId
-)
-#else
-RgSchUeCb* rgSCHDbmGetUeCb(cellCb, ueId)
-RgSchCellCb       *cellCb;
-CmLteRnti      ueId;
-#endif
+RgSchUeCb* rgSCHDbmGetUeCb(RgSchCellCb *cellCb,CmLteRnti ueId)
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
 
@@ -398,17 +324,7 @@ CmLteRnti      ueId;
  *  @param[in]  ueId
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-RgSchUeCb* rgSCHDbmGetSpsUeCb
-(
-RgSchCellCb       *cellCb, 
-CmLteRnti         spsRnti
-)
-#else
-RgSchUeCb* rgSCHDbmGetSpsUeCb(cellCb, spsRnti)
-RgSchCellCb       *cellCb;
-CmLteRnti         spsRnti;
-#endif
+RgSchUeCb* rgSCHDbmGetSpsUeCb(RgSchCellCb *cellCb, CmLteRnti  spsRnti)
 {
    RgSchUeCb *ueCb = NULLP; 
 
@@ -431,17 +347,7 @@ CmLteRnti         spsRnti;
  *  @param[in]  *ueCb
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-RgSchUeCb* rgSCHDbmGetNextUeCb
-(
-RgSchCellCb       *cellCb, 
-RgSchUeCb         *ueCb
-)
-#else
-RgSchUeCb* rgSCHDbmGetNextUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+RgSchUeCb* rgSCHDbmGetNextUeCb(RgSchCellCb *cellCb, RgSchUeCb *ueCb)
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
    RgSchUeCellInfo *nextUeCellInfo = NULLP;
@@ -470,17 +376,7 @@ RgSchUeCb         *ueCb;
  *  @param[in]  *ueCb
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-RgSchUeCb* rgSCHDbmGetNextSpsUeCb
-(
-RgSchCellCb       *cellCb, 
-RgSchUeCb         *ueCb
-)
-#else
-RgSchUeCb* rgSCHDbmGetNextSpsUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+RgSchUeCb* rgSCHDbmGetNextSpsUeCb(RgSchCellCb *cellCb, RgSchUeCb  *ueCb)
 {
    RgSchUeCb *nextUeCb = NULLP; 
 
@@ -506,17 +402,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDelL2MUe
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHDbmDelL2MUe(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHDbmDelL2MUe(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
    uint8_t lcCnt = 0;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
@@ -567,17 +453,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDelUeCb
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHDbmDelUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHDbmDelUeCb(RgSchCellCb *cellCb,RgSchUeCb  *ueCb)
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
 
@@ -602,17 +478,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDelSpsUeCb
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHDbmDelSpsUeCb(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHDbmDelSpsUeCb(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
 
    return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
@@ -635,15 +501,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHDbmInitUe
-(
-RgSchUeCb       *ueCb
-)
-#else
-S16 rgSCHDbmInitUe(ueCb)
-RgSchUeCb       *ueCb;
-#endif
+S16 rgSCHDbmInitUe(RgSchUeCb  *ueCb)
 {
    S16 ret = ROK;
    
@@ -665,15 +523,7 @@ RgSchUeCb       *ueCb;
  *  @param[in]  RgSchUeCb *ueCb
  *  @return     Void 
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitDedLcLst
-(
-RgSchUeCb       *ueCb
-)
-#else
-static Void rgSCHDbmInitDedLcLst(ueCb)
-RgSchUeCb       *ueCb;
-#endif
+static Void rgSCHDbmInitDedLcLst(RgSchUeCb *ueCb)
 {
    uint8_t idx;
    
@@ -705,15 +555,7 @@ RgSchUeCb       *ueCb;
  *  @param[in]  RgSchCellCb *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitCmnLcLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-static Void rgSCHDbmInitCmnLcLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+static Void rgSCHDbmInitCmnLcLst(RgSchCellCb *cellCb)
 {
    uint8_t idx;
    
@@ -738,17 +580,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  RgSchDlLcCb* dlLcCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsDlDedLcCb
-(
-RgSchUeCb         *ueCb, 
-RgSchDlLcCb       *dlLcCb 
-)
-#else
-Void rgSCHDbmInsDlDedLcCb(ueCb, dlLcCb)
-RgSchUeCb         *ueCb; 
-RgSchDlLcCb       *dlLcCb; 
-#endif
+Void rgSCHDbmInsDlDedLcCb(RgSchUeCb *ueCb, RgSchDlLcCb *dlLcCb )
 {
 
    ueCb->dl.lcCb[dlLcCb->lcId - 1] = dlLcCb;
@@ -766,17 +598,7 @@ RgSchDlLcCb       *dlLcCb;
  *  @param[in]  RgSchDlLcCb* dlLcCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmDelDlDedLcCb
-(
-RgSchUeCb         *ueCb, 
-RgSchDlLcCb       *dlLcCb 
-)
-#else
-Void rgSCHDbmDelDlDedLcCb(ueCb, dlLcCb)
-RgSchUeCb         *ueCb; 
-RgSchDlLcCb       *dlLcCb; 
-#endif
+Void rgSCHDbmDelDlDedLcCb(RgSchUeCb *ueCb, RgSchDlLcCb  *dlLcCb )
 {
 
 #ifdef LTE_L2_MEAS
@@ -815,17 +637,7 @@ RgSchDlLcCb       *dlLcCb;
  *  @param[in]  idx
  *  @return  RgSchDlLcCb*
  **/
-#ifdef ANSI
-RgSchDlLcCb* rgSCHDbmGetDlDedLcCb
-(
-RgSchUeCb         *ueCb, 
-CmLteLcId        idx
-)
-#else
-RgSchDlLcCb* rgSCHDbmGetDlDedLcCb(ueCb, idx)
-RgSchUeCb         *ueCb; 
-CmLteLcId        idx;
-#endif
+RgSchDlLcCb* rgSCHDbmGetDlDedLcCb(RgSchUeCb *ueCb, CmLteLcId idx)
 {
    if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID)
    {
@@ -847,15 +659,7 @@ CmLteLcId        idx;
  *  @param[in]  *ueCb
  *  @return  RgSchDlLcCb*
  **/
-#ifdef ANSI
-RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb
-(
-RgSchUeCb         *ueCb
-)
-#else
-RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(ueCb)
-RgSchUeCb         *ueCb; 
-#endif
+RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(RgSchUeCb  *ueCb)
 {
    uint8_t idx;
    
@@ -881,17 +685,7 @@ RgSchUeCb         *ueCb;
  *  @param[in]  *lcCb
  *  @return  RgSchDlLcCb*
  **/
-#ifdef ANSI
-RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb
-(
-RgSchUeCb         *ueCb,
-RgSchDlLcCb       *lcCb
-)
-#else
-RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb(ueCb, lcCb)
-RgSchUeCb         *ueCb; 
-RgSchDlLcCb       *lcCb;
-#endif
+RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb(RgSchUeCb *ueCb,RgSchDlLcCb *lcCb)
 {
    uint8_t idx;
 
@@ -923,17 +717,7 @@ RgSchDlLcCb       *lcCb;
  *  @param[in]  lcId
  *  @return  RgSchClcDlLcCb*
  **/
-#ifdef ANSI
-RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb
-(
-RgSchCellCb       *cellCb, 
-CmLteLcId         lcId
-)
-#else
-RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb(cellCb, lcId)
-RgSchCellCb       *cellCb;
-CmLteLcId         lcId;
-#endif
+RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb(RgSchCellCb *cellCb, CmLteLcId lcId)
 {
    uint8_t idx;
 
@@ -959,15 +743,7 @@ CmLteLcId         lcId;
  *  @param[in]  *cellCb
  *  @return  RgSchClcDlLcCb*
  **/
-#ifdef ANSI
-RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch
-(
-RgSchCellCb       *cellCb 
-)
-#else
-RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch(RgSchCellCb *cellCb )
 {
  
    if(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId != RGSCH_INVALID_LC_ID)
@@ -989,15 +765,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  RgSchClcDlLcCb*
  **/
-#ifdef ANSI
-RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch
-(
-RgSchCellCb       *cellCb
-)
-#else
-RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch(RgSchCellCb *cellCb)
 {
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId != RGSCH_INVALID_LC_ID)
@@ -1019,15 +787,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  RgSchClcDlLcCb*
  **/
-#ifdef ANSI
-RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch
-(
-RgSchCellCb       *cellCb
-)
-#else
-RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch(RgSchCellCb  *cellCb)
 {
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2].lcId != RGSCH_INVALID_LC_ID)
@@ -1048,15 +808,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  RgSchClcDlLcCb*
  **/
-#ifdef ANSI
-RgSchClcDlLcCb* rgSCHDbmGetPcch
-(
-RgSchCellCb       *cellCb
-)
-#else
-RgSchClcDlLcCb* rgSCHDbmGetPcch(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+RgSchClcDlLcCb* rgSCHDbmGetPcch(RgSchCellCb *cellCb)
 {
  
    if(cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId != RGSCH_INVALID_LC_ID)
@@ -1078,17 +830,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsBcchOnBch
-(
-RgSchCellCb       *cellCb, 
-RgSchClcDlLcCb   *cmnDlLcCb
-)
-#else
-Void rgSCHDbmInsBcchOnBch(cellCb, cmnDlLcCb)
-RgSchCellCb       *cellCb;
-RgSchClcDlLcCb   *cmnDlLcCb;
-#endif
+Void rgSCHDbmInsBcchOnBch(RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)
 {
 
    cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId = cmnDlLcCb->lcId;
@@ -1111,17 +853,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsBcchOnDlsch
-(
-RgSchCellCb       *cellCb, 
-RgSchClcDlLcCb   *cmnDlLcCb
-)
-#else
-Void rgSCHDbmInsBcchOnDlsch(cellCb, cmnDlLcCb)
-RgSchCellCb       *cellCb;
-RgSchClcDlLcCb   *cmnDlLcCb;
-#endif
+Void rgSCHDbmInsBcchOnDlsch(RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)
 {
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId == RGSCH_INVALID_LC_ID)   
    { 
@@ -1153,17 +885,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsPcch
-(
-RgSchCellCb       *cellCb, 
-RgSchClcDlLcCb   *cmnDlLcCb
-)
-#else
-Void rgSCHDbmInsPcch(cellCb, cmnDlLcCb)
-RgSchCellCb       *cellCb;
-RgSchClcDlLcCb   *cmnDlLcCb;
-#endif
+Void rgSCHDbmInsPcch(RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)
 {
 
    cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId = cmnDlLcCb->lcId;
@@ -1185,15 +907,7 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @param[in] *cmnDlLcCb 
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInitCmnLcBoLst
-(
-RgSchClcDlLcCb       *cmnDlLcCb
-)
-#else
-Void rgSCHDbmInitCmnLcBoLst(cmnDlLcCb)
-RgSchClcDlLcCb       *cmnDlLcCb;
-#endif
+Void rgSCHDbmInitCmnLcBoLst(RgSchClcDlLcCb *cmnDlLcCb)
 {
 
    cmLListInit(&cmnDlLcCb->boLst);
@@ -1212,17 +926,7 @@ RgSchClcDlLcCb       *cmnDlLcCb;
  *  @param[in] *boRpt 
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsCmnLcBoRpt
-(
-RgSchClcDlLcCb    *cmnDlLcCb,
-RgSchClcBoRpt     *cmnBoRpt
-)
-#else
-Void rgSCHDbmInsCmnLcBoRpt(cmnDlLcCb, cmnBoRpt)
-RgSchClcDlLcCb    *cmnDlLcCb;
-RgSchClcBoRpt     *cmnBoRpt;
-#endif
+Void rgSCHDbmInsCmnLcBoRpt(RgSchClcDlLcCb *cmnDlLcCb,RgSchClcBoRpt *cmnBoRpt)
 {
    cmnBoRpt->boLstEnt.next = NULLP;
    cmnBoRpt->boLstEnt.prev = NULLP;
@@ -1243,15 +947,7 @@ RgSchClcBoRpt     *cmnBoRpt;
  *  @param[in] *cellCb 
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitRaCbLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-static Void rgSCHDbmInitRaCbLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+static Void rgSCHDbmInitRaCbLst(RgSchCellCb  *cellCb)
 {
 
    cmLListInit(&cellCb->raInfo.raCbLst);
@@ -1271,17 +967,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  key
  *  @return  RgSchRaCb*
  **/
-#ifdef ANSI
-RgSchRaCb* rgSCHDbmGetRaCb
-(
-RgSchCellCb       *cellCb, 
-CmLteRnti      key
-)
-#else
-RgSchRaCb* rgSCHDbmGetRaCb(cellCb, key)
-RgSchCellCb       *cellCb; 
-CmLteRnti      key;
-#endif
+RgSchRaCb* rgSCHDbmGetRaCb(RgSchCellCb *cellCb, CmLteRnti key)
 {
    CmLList *tmpNode;
 
@@ -1309,15 +995,7 @@ CmLteRnti      key;
  *  @param[in]  *cellCb 
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitRaReqLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-static Void rgSCHDbmInitRaReqLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+static Void rgSCHDbmInitRaReqLst(RgSchCellCb *cellCb)
 {
    uint8_t idx;
 
@@ -1342,15 +1020,7 @@ RgSchCellCb       *cellCb;
  *  @param[in] *cellCb 
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitCrntRgrCfgLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-static Void rgSCHDbmInitCrntRgrCfgLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+static Void rgSCHDbmInitCrntRgrCfgLst(RgSchCellCb *cellCb)
 {
 
    cmLListInit(&cellCb->rgCfgInfo.crntRgrCfgLst);
@@ -1368,15 +1038,7 @@ RgSchCellCb       *cellCb;
  *  @param[in] *cellCb 
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHDbmInitPndngRgrCfgLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-static Void rgSCHDbmInitPndngRgrCfgLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+static Void rgSCHDbmInitPndngRgrCfgLst(RgSchCellCb  *cellCb)
 {
 
    cmLListInit(&cellCb->rgCfgInfo.pndngRgrCfgLst);
@@ -1395,17 +1057,7 @@ RgSchCellCb       *cellCb;
  *  @param[in] *cfgElem 
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsCrntRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-Void rgSCHDbmInsCrntRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb;
-RgSchCfgElem      *cfgElem;
-#endif
+Void rgSCHDbmInsCrntRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem *cfgElem)
 {
    cfgElem->cfgReqLstEnt.next = NULLP;
    cfgElem->cfgReqLstEnt.prev = NULLP;
@@ -1425,17 +1077,7 @@ RgSchCfgElem      *cfgElem;
  *  @param[in] *cfgElem 
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmInsPndngRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-Void rgSCHDbmInsPndngRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb;
-RgSchCfgElem      *cfgElem;
-#endif
+Void rgSCHDbmInsPndngRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem  *cfgElem)
 {
 
    cfgElem->cfgReqLstEnt.next = NULLP;
@@ -1457,17 +1099,7 @@ RgSchCfgElem      *cfgElem;
  *  @param[in]  *cfgElem
  *  @return  RgSchCfgElem*
  **/
-#ifdef ANSI
-RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb; 
-RgSchCfgElem      *cfgElem;
-#endif
+RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem *cfgElem)
 {
 
    if(!cfgElem)
@@ -1491,17 +1123,7 @@ RgSchCfgElem      *cfgElem;
  *  @param[in]  *cfgElem
  *  @return  RgSchCfgElem*
  **/
-#ifdef ANSI
-RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb; 
-RgSchCfgElem      *cfgElem;
-#endif
+RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem *cfgElem)
 {
 
    if(!cfgElem)
@@ -1525,17 +1147,7 @@ RgSchCfgElem      *cfgElem;
  *  @param[in]  key 
  *  @return  RgSchCfgElem*
  **/
-#ifdef ANSI
-RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey
-(
-RgSchCellCb          *cellCb,
-CmLteTimingInfo   key
-)
-#else
-RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey(cellCb, key)
-RgSchCellCb          *cellCb;
-CmLteTimingInfo   key;
-#endif
+RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey(RgSchCellCb *cellCb,CmLteTimingInfo  key)
 {
    CmLList  *tmpNode;
 
@@ -1564,17 +1176,7 @@ CmLteTimingInfo   key;
  *  @param[in]  *cfgElem 
  *  @return  RgSchCfgElem*
  **/
-#ifdef ANSI
-RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb;
-RgSchCfgElem      *cfgElem;
-#endif
+RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem *cfgElem)
 {
 
    if(cmLListDelFrm(&cellCb->rgCfgInfo.crntRgrCfgLst,&cfgElem->cfgReqLstEnt))
@@ -1596,17 +1198,7 @@ RgSchCfgElem      *cfgElem;
  *  @param[in]  *cfgElem 
  *  @return  RgSchCfgElem*
  **/
-#ifdef ANSI
-RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem
-(
-RgSchCellCb       *cellCb,
-RgSchCfgElem      *cfgElem
-)
-#else
-RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem(cellCb, cfgElem)
-RgSchCellCb       *cellCb;
-RgSchCfgElem      *cfgElem;
-#endif
+RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem(RgSchCellCb *cellCb,RgSchCfgElem *cfgElem)
 {
    if(cmLListDelFrm(&cellCb->rgCfgInfo.pndngRgrCfgLst,&cfgElem->cfgReqLstEnt))
    {
@@ -1630,19 +1222,7 @@ RgSchCfgElem      *cfgElem;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHDbmRntiDbInit
-(
-RgSchCellCb       *cellCb,
-uint16_t            rntiStart,
-uint16_t            maxRntis
-)
-#else
-S16 rgSCHDbmRntiDbInit(cellCb, rntiStart, maxRntis)
-RgSchCellCb       *cellCb;
-uint16_t            rntiStart;
-uint16_t            maxRntis;
-#endif
+S16 rgSCHDbmRntiDbInit(RgSchCellCb *cellCb,uint16_t rntiStart,uint16_t  maxRntis)
 {
    uint16_t rnti;
    RgSchRntiLnk   *rntiPool;
@@ -1699,15 +1279,7 @@ uint16_t            maxRntis;
  *  @param[in]  *cellCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmRntiDbDeInit
-(
-RgSchCellCb       *cellCb
-)
-#else
-Void rgSCHDbmRntiDbDeInit(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+Void rgSCHDbmRntiDbDeInit(RgSchCellCb *cellCb)
 {
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
@@ -1734,15 +1306,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  *cellCb
  *  @return  RgSchRntiLnk*
  **/
-#ifdef ANSI
-RgSchRntiLnk* rgSCHDbmGetRnti
-(
-RgSchCellCb       *cellCb
-)
-#else
-RgSchRntiLnk* rgSCHDbmGetRnti(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+RgSchRntiLnk* rgSCHDbmGetRnti(RgSchCellCb *cellCb)
 {
    RgSchRntiLnk *rntiLnk;
 
@@ -1787,17 +1351,7 @@ RgSchCellCb       *cellCb;
  *  @param[in]  rntiLnk
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHDbmRlsRnti
-(
-RgSchCellCb       *cellCb,
-RgSchRntiLnk      *rntiLnk
-)
-#else
-Void rgSCHDbmRlsRnti(cellCb, rntiLnk)
-RgSchCellCb       *cellCb;
-RgSchRntiLnk      *rntiLnk;
-#endif
+Void rgSCHDbmRlsRnti(RgSchCellCb *cellCb,RgSchRntiLnk *rntiLnk)
 {
 #ifdef EMTC_ENABLE
       if(ROK==rgSCHDbmPutEmtcRnti(cellCb,rntiLnk))
@@ -1840,17 +1394,7 @@ return;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHDbmInitUeTfuPendLst
-(
-RgSchCellCb    *cellCb,
-uint16_t            numBins
-)
-#else
-static S16 rgSCHDbmInitUeTfuPendLst(cellCb, numBins)
-RgSchCellCb    *cellCb;
-uint16_t            numBins;
-#endif
+static S16 rgSCHDbmInitUeTfuPendLst(RgSchCellCb    *cellCb,uint16_t  numBins)
 {
    RgSchUePucchRecpInfo pucchInfo;
 
@@ -1881,15 +1425,7 @@ uint16_t            numBins;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDbmDeInitUeTfuPendLst
-(
-RgSchCellCb       *cellCb
-)
-#else
-S16 rgSCHDbmDeInitUeTfuPendLst(cellCb)
-RgSchCellCb       *cellCb;
-#endif
+S16 rgSCHDbmDeInitUeTfuPendLst(RgSchCellCb *cellCb)
 {
 
    cmHashListDeinit(&cellCb->ueTfuPendLst);
index 377e6b1..2e51df9 100755 (executable)
@@ -203,15 +203,7 @@ Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP));
  *
  **/
 /*MS_WORKAROUND for ccpu00122893*/
-#ifdef ANSI
-Void rgSCHDhmHqEntReset
-(
-   RgSchDlHqEnt      *hqE
-)
-#else
-Void rgSCHDhmHqEntReset(hqE)
-   RgSchDlHqEnt      *hqE;
-#endif
+Void rgSCHDhmHqEntReset(RgSchDlHqEnt *hqE)
 {
    RgSchDlHqProcCb   *hqP;
    uint8_t                i;
@@ -274,17 +266,7 @@ Void rgSCHDhmHqEntReset(hqE)
  *  @return  Void 
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmAssgnUeHqEntFrmRaCb 
-(
-RgSchUeCb       *ue,
-RgSchRaCb       *raCb
-)
-#else
-Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
-RgSchUeCb       *ue;
-RgSchRaCb       *raCb;
-#endif
+Void rgSCHDhmAssgnUeHqEntFrmRaCb(RgSchUeCb *ue,RgSchRaCb *raCb)
 {
 
    ue->cellInfo[0]->hqEnt = raCb->dlHqE;
@@ -315,17 +297,7 @@ RgSchRaCb       *raCb;
  *  @return  Void 
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmDelHqEnt 
-(
-RgSchCellCb       *cell,
-RgSchDlHqEnt      **hqE
-)
-#else
-Void rgSCHDhmDelHqEnt(cell, hqE)
-RgSchCellCb       *cell;
-RgSchDlHqEnt      **hqE;
-#endif
+Void rgSCHDhmDelHqEnt(RgSchCellCb *cell,RgSchDlHqEnt **hqE)
 {
 
    if (!(*hqE))
@@ -341,15 +313,7 @@ RgSchDlHqEnt      **hqE;
    return;
 }
 
-#ifdef ANSI
-RgSchDlHqEnt *rgSCHDhmHqEntInit
-(
-RgSchCellCb           *cell
-)
-#else
-RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
-RgSchCellCb           *cell;
-#endif
+RgSchDlHqEnt *rgSCHDhmHqEntInit(RgSchCellCb *cell)
 {
    RgSchDlHqEnt      *hqE;
    Inst              inst = cell->instIdx;
@@ -417,23 +381,9 @@ RgSchCellCb           *cell;
  *         -#RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHDhmGetAvlHqProc
-(
-RgSchCellCb           *cell,
-RgSchUeCb               *ue,
-CmLteTimingInfo         timingInfo,
-RgSchDlHqProcCb         **hqP
-)
-#else
-S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
-RgSchCellCb           *cell;
-RgSchUeCb               *ue;
-CmLteTimingInfo         timingInfo;
-RgSchDlHqProcCb         **hqP;
-#endif
+S16 rgSCHDhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo  timingInfo,RgSchDlHqProcCb **hqP)
 {
-   RgSchDlHqEnt         *hqE = NULLP;
+   RgSchDlHqEnt      *hqE = NULLP;
    RgSchDlHqProcCb   *tmpHqProc;
    CmLList           *tmp;
 
@@ -541,21 +491,7 @@ RgSchDlHqProcCb         **hqP;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmHqTbRetx
-(
-RgSchDlHqEnt            *hqE,
-CmLteTimingInfo         timingInfo,
-RgSchDlHqProcCb         *hqP,
-uint8_t                      tbIdx
-)
-#else
-Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
-RgSchDlHqEnt            *hqE;
-CmLteTimingInfo         timingInfo;
-RgSchDlHqProcCb         *hqP;
-uint8_t                      tbIdx;
-#endif
+Void rgSCHDhmHqTbRetx(RgSchDlHqEnt *hqE,CmLteTimingInfo timingInfo,RgSchDlHqProcCb *hqP,uint8_t tbIdx)
 {
    uint8_t othrTbIdx = tbIdx ^ 1;
 
@@ -608,15 +544,7 @@ uint8_t                      tbIdx;
  *  @return  RgSchDlHqProcCb *
  *
  **/
-#ifdef ANSI
-RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
-(
-RgSchDlHqEnt            *hqE
-)
-#else
-RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
-RgSchDlHqEnt            *hqE;
-#endif
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(RgSchDlHqEnt *hqE)
 {
    /* GRPPWR_CNTRL Fix: UE context will not hold a valid hqE,
     * until RACH procedure is completed */
@@ -653,19 +581,12 @@ RgSchDlHqEnt            *hqE;
  *         -#RFAILED otherwise
  *
  **/
-#ifdef ANSI
 S16 rgSCHDhmGetCcchSduHqProc
 (
 RgSchUeCb               *ueCb,
 CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         **hqP
 )
-#else
-S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
-RgSchUeCb               *ueCb;
-CmLteTimingInfo         timingInfo;
-RgSchDlHqProcCb         **hqP;
-#endif
 {
    RgSchDlHqProcCb      *tmpHqProc;
    CmLList              *tmp;
@@ -725,17 +646,7 @@ RgSchDlHqProcCb         **hqP;
  *         -#RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHDhmGetMsg4HqProc
-(
-RgSchRaCb               *raCb,
-CmLteTimingInfo         timingInfo
-)
-#else
-S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
-RgSchRaCb               *raCb;
-CmLteTimingInfo         timingInfo;
-#endif
+S16 rgSCHDhmGetMsg4HqProc(RgSchRaCb *raCb,CmLteTimingInfo timingInfo)
 {
    RgSchDlHqProcCb      *tmpHqProc;
    CmLList              *tmp;
@@ -779,29 +690,17 @@ CmLteTimingInfo         timingInfo;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmRlsHqpTb
-(
-RgSchDlHqProcCb         *hqP,
-uint8_t                      tbIdx,
-Bool                    togNdi
-) 
-#else
-Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) 
-RgSchDlHqProcCb         *hqP;
-uint8_t                      tbIdx;
-Bool                    togNdi;
-#endif
+Void rgSCHDhmRlsHqpTb(RgSchDlHqProcCb *hqP,uint8_t tbIdx,Bool  togNdi) 
 {
    RgSchDlHqEnt         *hqE;
-   uint8_t                   othrTbIdx = tbIdx ^ 1;
+   uint8_t              othrTbIdx = tbIdx ^ 1;
 #ifdef LTEMAC_SPS
-   RgSchCmnDlHqProc        *cmnHqDl;
+   RgSchCmnDlHqProc     *cmnHqDl;
 #endif
    /* L2_COUNTERS */
 #ifdef LTE_L2_MEAS
    RgSchDlLcCb*         lcCb = NULLP;
-   uint8_t                   numLch = 0;
+   uint8_t              numLch = 0;
 #endif
 
    /* Reset all tbInfo values */
@@ -1018,15 +917,7 @@ rgEmtcsetNullSubFrm(hqP);
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmRlsHqProc
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHDhmRlsHqProc(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHDhmRlsHqProc(RgSchDlHqProcCb *hqP)
 {
 
 
@@ -1098,21 +989,7 @@ rgEmtcsetNullSubFrm(hqP);
  *         -#   RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHDhmGetHqProcFrmId
-(
-RgSchCellCb           *cell,
-RgSchUeCb               *ue,
-uint8_t                      idx,
-RgSchDlHqProcCb         **hqP
-)
-#else
-S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
-RgSchCellCb           *cell;
-RgSchUeCb               *ue;
-uint8_t                      idx;
-RgSchDlHqProcCb         **hqP;
-#endif
+S16 rgSCHDhmGetHqProcFrmId(RgSchCellCb *cell,RgSchUeCb  *ue,uint8_t idx,RgSchDlHqProcCb **hqP)
 {
    RgSchDlHqEnt         *hqE;
 
@@ -1136,24 +1013,12 @@ RgSchDlHqProcCb         **hqP;
  *  @return  RgSchDlHqProcCb control block 
  *
  **/
-#ifdef ANSI
-RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
-(
-RgSchCellCb           *cell,
-RgSchUeCb               *ue,
-CmLteTimingInfo         timingInfo
-)
-#else
-RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
-RgSchCellCb           *cell,
-RgSchUeCb               *ue;
-CmLteTimingInfo         timingInfo;
-#endif
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo)
 {
-   RgSchDlHqEnt         *hqE;
-   uint8_t                    idx;
-   RgSchDlHqProcCb       *hqProc = NULLP;
-   CmLList               *tmp = NULLP;
+   RgSchDlHqEnt       *hqE;
+   uint8_t            idx;
+   RgSchDlHqProcCb    *hqProc = NULLP;
+   CmLList            *tmp = NULLP;
 
    hqE      = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
@@ -1223,21 +1088,7 @@ CmLteTimingInfo         timingInfo;
  *  @return     Void
  *      -# None.
  **/
-#ifdef ANSI
-static Void rgSCHDhmFdbkIndHndlTa
-(
-RgSchDlHqProcCb   *hqP,
-uint8_t                tbIdx,
-uint8_t                fdbk,
-Bool              maxHqRetxReached
-)
-#else
-static Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached)
-RgSchDlHqProcCb   *hqP;
-uint8_t                tbIdx;
-uint8_t                fdbk;
-Bool              maxHqRetxReached;
-#endif
+static Void rgSCHDhmFdbkIndHndlTa(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdbk,Bool maxHqRetxReached)
 {
    RgSchUeCb      *ueCb;
    RgSchCellCb    *cell;
@@ -1314,17 +1165,7 @@ Bool              maxHqRetxReached;
  *  @return     Void
  *      -# None.
  **/
-#ifdef ANSI
-Void rgSCHDhmSchdTa
-(
-RgSchUeCb         *ueCb,
-RgSchDlHqTbCb     *tbInfo
-)
-#else
-Void rgSCHDhmSchdTa(ueCb, tbInfo)
-RgSchUeCb         *ueCb;
-RgSchDlHqTbCb     *tbInfo;
-#endif
+Void rgSCHDhmSchdTa(RgSchUeCb *ueCb,RgSchDlHqTbCb *tbInfo)
 {
 
    ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED;
@@ -1354,39 +1195,26 @@ RgSchDlHqTbCb     *tbInfo;
  *  @param[out] uint8_t                 *cntHqPrcs
  *  @return     S16
  **/
-#ifdef ANSI
 static S16 rgSCHDhmHqProcByFdbkTime
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timeInfo,
 Bool                    *isMsg4,
 RgSchDlHqProcCb         **hqPrcs,
-uint8_t                      *numTbs,
+uint8_t                 *numTbs,
 S8                      *tbStrtIdx,
-uint8_t                      *cntHqPrcs,
+uint8_t                 *cntHqPrcs,
 RgSchCellCb             *cell
 )
-#else
-static S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs,
-                                     numTbs, tbStrtIdx, cntHqPrcs)
-RgSchDlHqEnt            *hqE;
-CmLteTimingInfo         timeInfo;
-Bool                    *isMsg4;
-RgSchDlHqProcCb         **hqPrcs;
-uint8_t                      *numTbs;
-S8                      *tbStrtIdx;
-uint8_t                      *cntHqPrcs;
-RgSchCellCb             *cell;
-#endif
 {
    RgSchDlHqTbCb        *tbCb;
    RgSchDlHqProcCb      *hqP;
    CmLteTimingInfo      schdSfTime;
    RgSchTddDlAscSetIdxK ascIdx;
-   uint8_t                   noFdbks;
-   uint8_t                   i;
-   uint8_t                   idx;
-   uint8_t                   dlIdx;
+   uint8_t              noFdbks;
+   uint8_t              i;
+   uint8_t              idx;
+   uint8_t              dlIdx;
    CmLListCp            *lnk;
    CmLList              *node;
 
@@ -1497,22 +1325,7 @@ RgSchCellCb             *cell;
  *      -# RgSchDlHqProcCb* 
  *      -# NULLP 
  **/
-#ifdef ANSI
-RgSchDlHqProcCb *rgSCHDhmHqProcByTime
-(
-RgSchDlHqEnt            *hqE,
-CmLteTimingInfo         timeInfo,
-Bool                    *isMsg4,
-RgSchDlSf               *sf
-)
-#else
-RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
-                                              isMsg4,sf)
-RgSchDlHqEnt            *hqE;
-CmLteTimingInfo         timeInfo;
-Bool                    *isMsg4;
-RgSchDlSf               *sf;
-#endif
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime(RgSchDlHqEnt *hqE,CmLteTimingInfo timeInfo,Bool *isMsg4,RgSchDlSf *sf)
 {
    if (hqE->msg4Proc)
    {
@@ -1545,24 +1358,10 @@ RgSchDlSf               *sf;
  *             -#None.
  *      
  **/
-#ifdef ANSI
-Void rgSCHDhmHqTbTrnsFail
-(
-RgSchCellCb             *cell,
-RgSchDlHqProcCb         *hqP,
-uint8_t                      tbCnt,
-Bool                    *isMaxRetx
-)
-#else
-Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
-RgSchCellCb             *cell;
-RgSchDlHqProcCb         *hqP;
-uint8_t                      tbCnt;
-Bool                    *isMaxRetx;
-#endif
+Void rgSCHDhmHqTbTrnsFail(RgSchCellCb *cell,RgSchDlHqProcCb *hqP,uint8_t tbCnt,Bool  *isMaxRetx)
 {
-   RgSchDlHqEnt         *hqE;
-   uint8_t                   maxHqTx;
+   RgSchDlHqEnt   *hqE;
+   uint8_t        maxHqTx;
 
    hqE = hqP->hqE;
 
@@ -1740,25 +1539,15 @@ uint32_t rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}},
  *  @param[in]  RgSchTddANInfo       *anInfo;
  *  @return     void
  **/
-#ifdef ANSI
 static Void rgSchGetHqFdbkPosForM1
 (
- RgSchUeCb            *ue,
- RgSchDlHqProcCb      *hqP,
- uint8_t                  *isAck, 
- RgTfuHqInfo          *fdbk,
- uint8_t                   tbIdx,
- RgSchTddANInfo       *anInfo
- )
-#else
-static Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
- RgSchUeCb            *ue;
- RgSchDlHqProcCb      *hqP;
- uint8_t                   *isAck;
- RgTfuHqInfo          *fdbk;
- uint8_t                   tbIdx;
- RgSchTddANInfo       *anInfo;
-#endif
+RgSchUeCb       *ue,
+RgSchDlHqProcCb *hqP,
+uint8_t         *isAck, 
+RgTfuHqInfo     *fdbk,
+uint8_t         tbIdx,
+RgSchTddANInfo  *anInfo
+)
 {
    if((ue != NULLP))
    {
@@ -1858,34 +1647,22 @@ static Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
  *  @param[in]  CmLteTimingInfo      timeInfo;
  *  @return     void
  **/
-#ifdef ANSI
 static Void rgSchGetHqFdbkPosForM234
 (
- RgSchUeCb            *ue,
- RgSchDlHqProcCb      *hqP,
- uint8_t                   *isAck, 
- RgTfuHqInfo          *fdbk,
- uint8_t                   tbIdx,
- RgSchTddANInfo       *anInfo,
- uint8_t                   M,
- CmLteTimingInfo      timeInfo
- )
-#else
-static Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
- RgSchUeCb            *ue;
- RgSchDlHqProcCb      *hqP;
- uint8_t                  *isAck;
- RgTfuHqInfo          *fdbk;
- uint8_t                   tbIdx;
- RgSchTddANInfo       *anInfo;
- uint8_t                    M;
- CmLteTimingInfo      timeInfo;
-#endif
+RgSchUeCb       *ue,
+RgSchDlHqProcCb *hqP,
+uint8_t         *isAck, 
+RgTfuHqInfo     *fdbk,
+uint8_t         tbIdx,
+RgSchTddANInfo  *anInfo,
+uint8_t         M,
+CmLteTimingInfo timeInfo
+)
 {
-   uint8_t                   fdbkIdx;
-   Bool                 isSCell;
-   RgSchTddANInfo       *pCellAnInfo;
-   uint8_t                   incr = 0;
+   uint8_t        fdbkIdx;
+   Bool           isSCell;
+   RgSchTddANInfo *pCellAnInfo;
+   uint8_t        incr = 0;
 
    if(NULLP != ue)
    {
@@ -2032,27 +1809,16 @@ static Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb,
-uint8_t                   cbType,
+uint8_t              cbType,
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      timeInfo,
 TfuHqInfo            *fdbk,
 RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
-#else
-S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
-Void                    *cb;
-uint8_t                      cbType;
-RgSchCellCb             *cellCb;
-CmLteTimingInfo         timeInfo;
-TfuHqInfo               *fdbk;
-RgInfRlsHqInfo          *rlsHqBufs;
-RgSchErrInfo            *err;
-#endif
 {
    RgSchCellCb *sCell = NULLP;
    RgSchDlHqEnt      *hqE;
@@ -2061,7 +1827,7 @@ RgSchErrInfo            *err;
    RgSchDlSf         *sf;
    Bool              isMsg4 = FALSE;
    RgSchRaCb         *raCb = NULLP;
-   uint16_t               rnti=0;
+   uint16_t          rnti=0;
    /* Maximum possible HARQ processes in UL-DL configuration 5 that is
     * given feedback at a time */
    RgSchDlHqProcCb   *hqPrcs[(RGSCH_NUM_SUB_FRAMES-1)*5];  /*MAX 5 Cells*/
@@ -2730,35 +2496,20 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHDhmPrcFdbkForTb
 (
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-RgSchDlHqProcCb      *hqP,
-RgSchDlSf            *sf,
-Bool                 isMsg4,
-uint16_t                  rnti,
-uint8_t                   tbCnt,
-CmLteTimingInfo      timingInfo,
-uint8_t                   isAck,
-RgInfRlsHqInfo       *rlsHqBufs,
-RgSchErrInfo         *err
+RgSchCellCb     *cell,
+RgSchUeCb       *ue,
+RgSchDlHqProcCb *hqP,
+RgSchDlSf       *sf,
+Bool            isMsg4,
+uint16_t        rnti,
+uint8_t         tbCnt,
+CmLteTimingInfo timingInfo,
+uint8_t         isAck,
+RgInfRlsHqInfo  *rlsHqBufs,
+RgSchErrInfo    *err
 )
-#else
-S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
-RgSchCellCb             *cell;
-RgSchUeCb               *ue;
-RgSchDlHqProcCb         *hqP;
-RgSchDlSf               *sf;
-Bool                    isMsg4;
-uint16_t                     rnti;
-uint8_t                      tbCnt;
-CmLteTimingInfo         timingInfo;
-uint8_t                      isAck;
-RgInfRlsHqInfo          *rlsHqBufs;
-RgSchErrInfo            *err;
-#endif
 {
 #ifdef DEBUGP
    Inst    inst = cell->instIdx;
@@ -3011,25 +2762,15 @@ RgSchErrInfo            *err;
  *  @param[in]  RgTfuHqInfo          *fdbk,
  *  @return     void
  **/
-#ifdef ANSI
 Void rgSchGetHqFdbkPos
 (
- RgSchCellCb          *cell,
- RgSchUeCb            *ue,
- RgSchDlHqProcCb      *hqP,
- RgrSchFrmt1b3TypEnum uciFrmtTyp, 
- uint8_t                  *isAck, 
- RgTfuHqInfo          *fdbk
- )
-#else
-Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
- RgSchCellCb          *cell;
- RgSchUeCb            *ue;
- RgSchDlHqProcCb      *hqP;
- RgrSchFrmt1b3TypEnum uciFrmtTyp;
- uint8_t                  *isAck;
- RgTfuHqInfo          *fdbk;
-#endif
+RgSchCellCb          *cell,
+RgSchUeCb            *ue,
+RgSchDlHqProcCb      *hqP,
+RgrSchFrmt1b3TypEnum uciFrmtTyp, 
+uint8_t              *isAck, 
+RgTfuHqInfo          *fdbk
+)
 {
    if(uciFrmtTyp != RG_SCH_UCI_FORMAT1B_CS)
    {
@@ -3192,19 +2933,12 @@ Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
    return;
 }/* End of rgSchGetHqFdbkPos */
 #ifdef LTE_ADV
-#ifdef ANSI
 Void rgSchGetHqFdbkPosFormat3
 (
- RgSchDlHqProcCb      *hqP,
- uint8_t                   *isAck,
- TfuHqFdbk            *fdbk
- )
-#else
-Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
- RgSchDlHqProcCb      *hqP;
- uint8_t                  *isAck;
- TfuHqFdbk           *fdbk;
-#endif
+RgSchDlHqProcCb *hqP,
+uint8_t         *isAck,
+TfuHqFdbk       *fdbk
+)
 {
    uint8_t cellIdx = RG_SCH_CMN_GET_CELL_IDX_FROM_HQP(hqP);
    isAck[0] = (uint8_t)fdbk[cellIdx]; 
@@ -3232,7 +2966,6 @@ Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHDhm5gtfHqFdbkInd 
 (
 RgSchUeCb            *ue,
@@ -3241,25 +2974,17 @@ CmLteTimingInfo      timingInfo,
 TfuHqFdbk            fdbk,
 RgSchErrInfo         *err
 )
-#else
-S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
-RgSchUeCb            *ue;
-RgSchCellCb          *cell;
-CmLteTimingInfo      timingInfo;
-TfuHqFdbk            fdbk;
-RgSchErrInfo         *err;
-#endif
 {
-   RgSchDlHqProcCb      *hqP = NULLP;   
-   CmLList              *node = NULLP;
-   CmLListCp            *lnk; 
-   S16                  ret = ROK;
-   RgSchDlSf            *sf;
-   Bool                 isMsg4 = FALSE;
-   uint16_t                  rnti=0;
-   uint16_t                  procId=0;
-   uint8_t                   hqPCount = 0;
-   RgInfRlsHqInfo       *rlsHqBufs = NULLP;
+   RgSchDlHqProcCb  *hqP = NULLP;   
+   CmLList          *node = NULLP;
+   CmLListCp        *lnk; 
+   S16              ret = ROK;
+   RgSchDlSf        *sf;
+   Bool             isMsg4 = FALSE;
+   uint16_t         rnti=0;
+   uint16_t         procId=0;
+   uint8_t          hqPCount = 0;
+   RgInfRlsHqInfo   *rlsHqBufs = NULLP;
 
    RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); 
 
@@ -3318,27 +3043,16 @@ RgSchErrInfo         *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb, 
-uint8_t                   cbType,
+uint8_t              cbType,
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo,
 RgTfuHqInfo          *fdbk,
 RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
-#else
-S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
-Void                    *cb;
-uint8_t                      cbType;
-RgSchCellCb             *cell;
-CmLteTimingInfo         timingInfo;
-RgTfuHqInfo             *fdbk;
-RgInfRlsHqInfo          *rlsHqBufs;
-RgSchErrInfo            *err;
-#endif
 {
    RgSchDlHqTbCb        *tbCb;
    RgSchDlHqEnt         *hqE = NULLP;
@@ -3352,13 +3066,13 @@ RgSchErrInfo            *err;
    RgSchDlSf            *sf;
    Bool                 isMsg4 = FALSE;
    RgSchRaCb            *raCb = NULLP;
-   uint16_t                  rnti=0;
+   uint16_t             rnti=0;
   /* Added Insure Fixes Of UR.Initialized procId  */
-   uint16_t                  procId=0;
+   uint16_t             procId=0;
    /* DTX Change: Bool is converted into uint8_t*/
-   uint8_t                   isAck[2]={0}; /*Changed to Array of 2*/
-   uint8_t                   tbCnt;
-   uint8_t                   hqPCount = 0;
+   uint8_t              isAck[2]={0}; /*Changed to Array of 2*/
+   uint8_t              tbCnt;
+   uint8_t              hqPCount = 0;
 
 #ifdef LTEMAC_SPS
    CmLteTimingInfo      fdbkRcptTime = timingInfo;
@@ -3604,21 +3318,7 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-Void rgSCHDhmRgrUeCfg
-(
-RgSchCellCb       *cell,
-RgSchUeCb         *ueCb,
-RgrUeCfg          *ueCfg,
-RgSchErrInfo      *err
-)
-#else
-Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
-RgSchCellCb       *cell;
-RgSchUeCb         *ueCb;
-RgrUeCfg          *ueCfg;
-RgSchErrInfo      *err;
-#endif
+Void rgSCHDhmRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ueCb,RgrUeCfg *ueCfg,RgSchErrInfo *err)
 {
 
    UNUSED(err);
@@ -3671,25 +3371,13 @@ RgSchErrInfo      *err;
  *                -# ROK 
  *                -# RFAILED 
  **/
-#ifdef ANSI
-Void rgSCHDhmRgrCellCfg
-(
-RgSchCellCb    *cell,
-RgrCellCfg     *cellCfg,
-RgSchErrInfo   *err
-)
-#else
-Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
-RgSchCellCb    *cell;
-RgrCellCfg     *cellCfg;
-RgSchErrInfo   *err;
-#endif
+Void rgSCHDhmRgrCellCfg(RgSchCellCb *cell,RgrCellCfg  *cellCfg,RgSchErrInfo *err)
 {
-   RgSchDlHqEnt         *hqE;
+   RgSchDlHqEnt *hqE;
    PTR         pUeCb;/* previous UE Control block */
    PTR         nUeCb;/* next UE control block */
    S16         ret;
-   uint8_t          idx;
+   uint8_t     idx;
 
    UNUSED(err);
 
@@ -3756,19 +3444,7 @@ RgSchErrInfo   *err;
  *                -# ROK 
  *                -# RFAILED 
  **/
-#ifdef ANSI
-Void rgSCHDhmRgrCellRecfg
-(
-RgSchCellCb    *cell,
-RgrCellRecfg   *cellRecfg,
-RgSchErrInfo   *err
-)
-#else
-Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
-RgSchCellCb    *cell;
-RgrCellRecfg   *cellRecfg;
-RgSchErrInfo   *err;
-#endif
+Void rgSCHDhmRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *cellRecfg,RgSchErrInfo *err)
 {
    RgSchDlHqEnt         *hqE;
    PTR         pUeCb;/* previous UE Control block */
@@ -3817,15 +3493,7 @@ RgSchErrInfo   *err;
  *  @return     None.
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmFreeUe
-(
-RgSchUeCb          *ueCb
-)
-#else
-Void rgSCHDhmFreeUe(ueCb)
-RgSchUeCb          *ueCb;
-#endif
+Void rgSCHDhmFreeUe(RgSchUeCb *ueCb)
 {
 
    /* If TA Timer is running. Stop it */
@@ -3885,19 +3553,7 @@ RgSchUeCb          *ueCb;
  *  @return     None.
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmUpdTa
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ueCb,
-uint8_t             ta
-)
-#else
-Void rgSCHDhmUpdTa(cell, ueCb, ta)
-RgSchCellCb    *cell;
-RgSchUeCb      *ueCb;
-uint8_t             ta;
-#endif
+Void rgSCHDhmUpdTa(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t ta)
 {
 
    if (ueCb->dl.taCb.state == RGSCH_TA_IDLE)
@@ -3947,15 +3603,7 @@ uint8_t             ta;
   * @return Void
   *      -#None.
   */
-#ifdef ANSI
-Void rgSCHDhmProcTAExp 
-(
- RgSchUeCb  *ueCb
- )
-#else
-Void rgSCHDhmProcTAExp (ueCb)
- RgSchUeCb  *ueCb;
-#endif
+Void rgSCHDhmProcTAExp( RgSchUeCb  *ueCb)
 {
    /* Ask scheduler to schedule this UE */
    ueCb->dl.taCb.state     =  RGSCH_TA_TOBE_SCHEDULED;
@@ -3981,19 +3629,7 @@ Void rgSCHDhmProcTAExp (ueCb)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDhmAddLcData
-(
-Inst               inst,
-RgSchLchAllocInfo  *lchData,
-RgSchDlHqTbCb      *tbInfo
-)
-#else
-S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
-Inst               inst;
-RgSchLchAllocInfo  *lchData;
-RgSchDlHqTbCb      *tbInfo;
-#endif
+S16 rgSCHDhmAddLcData(Inst inst,RgSchLchAllocInfo  *lchData,RgSchDlHqTbCb *tbInfo)
 {
 
    if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC)
@@ -4026,22 +3662,12 @@ RgSchDlHqTbCb      *tbInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHDhmTddRlsSubFrm
-(
-RgSchCellCb          *cellCb,
-CmLteTimingInfo      uciTimingInfo
-)
-#else
-S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
-RgSchCellCb          *cellCb;
-CmLteTimingInfo      uciTimingInfo;
-#endif
+S16 rgSCHDhmTddRlsSubFrm(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo)
 {
    CmLteTimingInfo         dlSfTime;
    RgSchTddDlAscSetIdxK    ascIdx;
-   uint8_t                      noFdbks;
-   uint8_t                      i;
+   uint8_t                 noFdbks;
+   uint8_t                 i;
 
    ascIdx = 
       rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
@@ -4081,31 +3707,21 @@ uint32_t macDtx = 0;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHDhmRlsDlsfHqProc
-(
-RgSchCellCb          *cellCb,
-CmLteTimingInfo      uciTimingInfo
-)
-#else
-S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
-RgSchCellCb          *cellCb;
-CmLteTimingInfo      uciTimingInfo;
-#endif
+S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo)
 {
    RgSchDlSf               *dlSf;
    CmLteTimingInfo         dlSfTime;
    CmLteTimingInfo         nxtfrm = {0,0};
    RgSchDlHqProcCb         *tmpHqProc;
    RgSchTddDlAscSetIdxK    ascIdx;
-   uint8_t                      noFdbks;
+   uint8_t                 noFdbks;
    S16                     i;
    RgSchDlSf               *nxtDlsf = NULLP;
    CmLList                 *node;
    CmLList                 *hqPNode;
-   uint8_t                      idx;
+   uint8_t                 idx;
    /*ccpu00130018 -MOD -Initiatizing with FALSE*/ 
-   uint8_t                      maxRetx=FALSE;
+   uint8_t                 maxRetx=FALSE;
    RgSchTddANInfo          *anInfo = NULLP;
    RgSchDlHqTbCb           *tbCb;
    RgSchUeCb               *ue = NULLP;
@@ -4367,17 +3983,7 @@ CmLteTimingInfo      uciTimingInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHDhmRlsDlsfHqProc
-(
-RgSchCellCb          *cell,
-CmLteTimingInfo      timingInfo
-)
-#else
-S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
-RgSchCellCb          *cell;
-CmLteTimingInfo      timingInfo;
-#endif
+S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cell,CmLteTimingInfo timingInfo)
 {
    RgSchDlSf         *sf;
    CmLteTimingInfo   frm;
@@ -4531,17 +4137,7 @@ CmLteTimingInfo      timingInfo;
  *         -#   RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHDhmMarkSpsHqProc
-(
-RgSchUeCb               *ue,
-uint8_t                      idx
-)
-#else
-S16 rgSCHDhmMarkSpsHqProc(ue, idx)
-RgSchUeCb               *ue;
-uint8_t                      idx;
-#endif
+S16 rgSCHDhmMarkSpsHqProc(RgSchUeCb *ue,uint8_t idx)
 {
    RgSchDlHqProcCb      *hqP;
 
@@ -4572,21 +4168,7 @@ uint8_t                      idx;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHDhmProcHqFdbkAckNackRep
-(
-RgSchDlHqProcCb      *hqP,
-RgSchDlSf            *sf,
-uint8_t                   tbCnt,
-uint8_t                   *isAck
-)
-#else
-static S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck)
-RgSchDlHqProcCb      *hqP;
-RgSchDlSf            *sf;
-uint8_t                   tbCnt;
-uint8_t                   *isAck;
-#endif
+static S16 rgSCHDhmProcHqFdbkAckNackRep(RgSchDlHqProcCb *hqP,RgSchDlSf *sf,uint8_t tbCnt,uint8_t *isAck)
 {
       /* Check if this is repeating UE */
     rgSCHUtlDlHqPTbRmvFrmTx(sf, hqP, tbCnt, TRUE);
@@ -4641,17 +4223,7 @@ uint8_t                   *isAck;
  *  @return  Void 
  *
  **/
-#ifdef ANSI
-S16 rgSCHDhmDlRetxAllocFail 
-(
-RgSchUeCb               *ue,
-RgSchDlHqProcCb         *hqP
-)
-#else
-S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
-RgSchUeCb               *ue;
-RgSchDlHqProcCb         *hqP;
-#endif
+S16 rgSCHDhmDlRetxAllocFail(RgSchUeCb *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchCellCb      *cell;
    RgInfRlsHqInfo   *rlsHqInfo;
@@ -4759,23 +4331,7 @@ RgSchDlHqProcCb         *hqP;
 }
 
 #ifdef DL_LA
-#ifdef ANSI
-static S16 rgSCHDhmUpdateAckNackHistory
-(
-RgSchCellCb             *cell,
-RgSchUeCb               *ueCb,
-uint8_t                      hqfdbk,
-uint8_t                      tbCnt
-)
-#else
-static S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt)
-(
-RgSchCellCb             *cell;
-RgSchUeCb               *ueCb;
-uint8_t                      hqfdbk;
-uint8_t                      tbCnt;
-)
-#endif
+static S16 rgSCHDhmUpdateAckNackHistory(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t hqfdbk,uint8_t tbCnt)
 {
    RgSchCmnDlUe  *ueDl;
    
@@ -4804,28 +4360,14 @@ uint8_t                      tbCnt;
    return ROK;
 }
 
-#ifdef ANSI
-S16 rgSCHDhmUpdBlerBasediTbsEff
-(
-RgSchCellCb             *cell,
-RgSchUeCb               *ueCb,
-uint8_t                      tbCnt
-)
-#else
-S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
-(
-RgSchCellCb             *cell;
-RgSchUeCb               *ueCb;
-uint8_t                      tbCnt;
-)
-#endif
+S16 rgSCHDhmUpdBlerBasediTbsEff(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t tbCnt)
 {
    S32            iTbs;
    RgSchCmnDlUe  *ueDl;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t             cfi = cellSch->dl.currCfi;
-   uint8_t             maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
-   maxiTbs                = RG_SCH_DL_MAX_ITBS;
+   uint8_t       cfi = cellSch->dl.currCfi;
+   uint8_t       maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
+   maxiTbs       = RG_SCH_DL_MAX_ITBS;
 
    ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
    iTbs =  (ueDl->laCb[tbCnt].deltaiTbs + ueDl->laCb[tbCnt].cqiBasediTbs)/100; 
@@ -4887,21 +4429,7 @@ uint8_t                      tbCnt;
  *  @return  Void 
  *
  **/
-#ifdef ANSI
-static Void rgSCHDhmPrcSplBundlFdbk
-(
-RgSchCellCb  *cell,
-TfuHqInfo    *fdbk,
-uint8_t            hqCnt
-)
-#else
-static Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt)
-(
-RgSchCellCb  *cell;
-TfuHqInfo    *fdbk;
-uint8_t            hqCnt;
-)
-#endif
+static Void rgSCHDhmPrcSplBundlFdbk(RgSchCellCb *cell,TfuHqInfo *fdbk,uint8_t hqCnt)
 {
    uint8_t       numOfAcks;
    
@@ -4951,15 +4479,7 @@ uint8_t            hqCnt;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmHqPAdd2FreeLst
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHDhmHqPAdd2FreeLst(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHDhmHqPAdd2FreeLst(RgSchDlHqProcCb  *hqP)
 {
 
 #ifdef LAA_DBG
@@ -5007,15 +4527,7 @@ RgSchDlHqProcCb         *hqP;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmHqPAdd2InUseLst
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHDhmHqPAdd2InUseLst(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHDhmHqPAdd2InUseLst(RgSchDlHqProcCb  *hqP)
 {
 
 #ifdef LAA_DBG
@@ -5058,15 +4570,7 @@ RgSchDlHqProcCb         *hqP;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmHqPDelFrmFreeLst
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHDhmHqPDelFrmFreeLst(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHDhmHqPDelFrmFreeLst(RgSchDlHqProcCb *hqP)
 {
 
 #ifdef LAA_DBG
@@ -5120,15 +4624,7 @@ RgSchDlHqProcCb         *hqP;
  *  @return  Void      
  *
  **/
-#ifdef ANSI
-Void rgSCHDhmHqPDelFrmInUseLst
-(
-RgSchDlHqProcCb         *hqP
-)
-#else
-Void rgSCHDhmHqPDelFrmInUseLst(hqP)
-RgSchDlHqProcCb         *hqP;
-#endif
+Void rgSCHDhmHqPDelFrmInUseLst(RgSchDlHqProcCb *hqP)
 {
 
 #ifdef LAA_DBG
index 93d6d46..c7f0fa4 100755 (executable)
@@ -302,15 +302,7 @@ RgUeUlHqCb   *hqE
  *                            added*
  * @return 
  */
-#ifdef ANSI
-Void rgSCHDrxTtiInd 
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHDrxTtiInd (cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHDrxTtiInd(RgSchCellCb  *cell)
 {
    uint16_t dlIndex;
    uint16_t ulIndex;
@@ -382,19 +374,7 @@ RgSchCellCb  *cell;
  * @return ROK/RFAILED 
  */
 
-#ifdef ANSI
-static S16 rgSCHDrxTtiHdlOnDur
-(
-RgSchCellCb*  cell,
-uint16_t           dlIndex,
-uint16_t           ulIndex
-)
-#else
-static S16 rgSCHDrxTtiHdlOnDur(cell, dlIndex, ulIndex)
-RgSchCellCb*  cell;
-uint16_t           dlIndex;
-uint16_t           ulIndex;
-#endif
+static S16 rgSCHDrxTtiHdlOnDur(RgSchCellCb *cell,uint16_t dlIndex,uint16_t ulIndex)
 {
 
 #if ( ERRCLASS & ERRCLS_INT_PAR )
@@ -439,19 +419,7 @@ uint16_t           ulIndex;
  * @return ROK/RFAILED 
  */
 
-#ifdef ANSI
-S16 rgSCHDrxTtiHdlInActv
-(
-RgSchCellCb  *cell,
-uint16_t dlIndex,
-uint16_t ulIndex
-)
-#else
-S16 rgSCHDrxTtiHdlInActv(cell, dlIndex, ulIndex)
-RgSchCellCb  *cell;
-uint16_t dlIndex;
-uint16_t ulIndex;
-#endif
+S16 rgSCHDrxTtiHdlInActv(RgSchCellCb  *cell,uint16_t dlIndex,uint16_t ulIndex)
 {
    CmLList           *node;
    RgSchDRXCellCb    *drxCell=NULLP;
@@ -678,19 +646,7 @@ uint16_t ulIndex;
  * @return ROK/RFAILED 
  */
 
-#ifdef ANSI
-S16 rgSCHDrxTtiHdlShortCycle 
-(
-RgSchCellCb  *cell,
-uint16_t           dlIndex,
-uint16_t           ulIndex
-)
-#else
-S16 rgSCHDrxTtiHdlShortCycle (cell, dlIndex, ulIndex)
-RgSchCellCb  *cell;
-uint16_t           dlIndex;
-uint16_t           ulIndex;
-#endif
+S16 rgSCHDrxTtiHdlShortCycle(RgSchCellCb  *cell,uint16_t dlIndex,uint16_t ulIndex)
 {
    CmLList           *node;
    RgSchDRXCellCb    *drxCell=NULLP;
@@ -768,19 +724,7 @@ uint16_t           ulIndex;
   * @return ROK/RFAILED 
   */
 
-#ifdef ANSI
-static S16 rgSCHDrxTtiHdlDlHarq 
-(
-RgSchCellCb          *cell,
-uint16_t                   dlIndex,
-uint16_t                   ulIndex
-)
-#else /* ANSI */
-static S16 rgSCHDrxTtiHdlDlHarq (cell, dlIndex, ulIndex)
-RgSchCellCb          *cell;
-uint16_t                   dlIndex;
-uint16_t                   ulIndex;
-#endif /* ANSI */
+static S16 rgSCHDrxTtiHdlDlHarq(RgSchCellCb *cell,uint16_t dlIndex,uint16_t ulIndex)
 {
 
 #if ( ERRCLASS & ERRCLS_INT_PAR)
@@ -817,33 +761,21 @@ uint16_t                   ulIndex;
   * @return Void 
   */
 
-#ifdef ANSI
-Void rgSCHDrxStrtInActvTmr
-(
-RgSchCellCb  *cell,
-CmLListCp    *ueLst,
-uint8_t            direction
-)
-#else
-Void rgSCHDrxStrtInActvTmr(cell, ueLst, direction)
-RgSchCellCb  *cell;
-CmLListCp    *ueLst;
-uint8_t            direction;
-#endif
+Void rgSCHDrxStrtInActvTmr(RgSchCellCb  *cell,CmLListCp *ueLst,uint8_t direction)
 {
    CmLList         *node;
    CmLList         *delNode;
    RgSchUeCb       *ueCb;
    RgSchDrxUeCb    *ueDrxCb;
 #ifndef LTE_TDD
-   uint16_t             index1;
+   uint16_t        index1;
 #endif
-   uint16_t             inActvTmrExpIndx;
+   uint16_t        inActvTmrExpIndx;
 #ifndef LTE_TDD
-   uint16_t             curTimeInSf; /* current time in number of subframes */
+   uint16_t        curTimeInSf; /* current time in number of subframes */
 #endif
 #ifdef LTE_TDD
-   uint16_t             delta;
+   uint16_t        delta;
 #endif /*LTE_TDD*/
    CmLListCp         dlInactvLst; /* list of UE's becoming DL-inactive */
    CmLListCp         ulInactvLst; /* list of UE's becoming UL-inactive */
@@ -1012,27 +944,15 @@ uint8_t            direction;
   * @param  uint8_t                tbCnt
   * @return Void 
   */
-#ifdef ANSI
-Void rgSCHDrxStartHarqRTTTmr
-(
-RgSchCellCb            *cell,
-RgSchDlHqProcCb        *hqP,
-uint8_t                     tbCnt
-)
-#else
-Void rgSCHDrxStartHarqRTTTmr(cell, hqP, tbCnt)
-RgSchCellCb             *cell;
-RgSchDlHqProcCb         *hqP;
-uint8_t                      tbCnt;
-#endif
+Void rgSCHDrxStartHarqRTTTmr(RgSchCellCb  *cell,RgSchDlHqProcCb *hqP,uint8_t tbCnt)
 {
    RgSchDRXCellCb      *drxCell =NULLP;
    RgSchDrxDlHqProcCb  *drxHq   =NULLP;
-   uint16_t                  harqRTTExpIndx;
-   uint8_t                   fdbkDelta;
+   uint16_t            harqRTTExpIndx;
+   uint8_t             fdbkDelta;
 #ifdef LTE_TDD   
-   uint8_t                   firstDlTxOcassion;
-   uint8_t                   drxRetxTmrStartSf;
+   uint8_t             firstDlTxOcassion;
+   uint8_t             drxRetxTmrStartSf;
 #endif    
 
    drxCell = RG_SCH_DRX_GET_CELL(cell);
@@ -1139,27 +1059,15 @@ uint8_t                      tbCnt;
  * -# ROK
  * -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHDrxUeCfg 
-(
- RgSchCellCb *cell,
- RgSchUeCb   *ue,
- RgrUeCfg    *ueCfg
- )
-#else
-S16 rgSCHDrxUeCfg (cell, ue, ueCfg)
- RgSchCellCb *cell;
- RgSchUeCb   *ue;
- RgrUeCfg    *ueCfg;
-#endif
+S16 rgSCHDrxUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg)
 {
    S16               ret       = ROK;
    RgSchDrxUeCb      *ueDrxCb;
    CmLteTimingInfo   nxtOnDur;
-   uint16_t               onDurIndx;
-   uint16_t               nxtOnDurTime;
-   uint16_t               curTime;
-   uint8_t                cellIdx;
+   uint16_t          onDurIndx;
+   uint16_t          nxtOnDurTime;
+   uint16_t          curTime;
+   uint8_t           cellIdx;
 
 
 #if ( ERRCLASS & ERRCLS_INT_PAR )   
@@ -1299,27 +1207,13 @@ S16 rgSCHDrxUeCfg (cell, ue, ueCfg)
  * @param  uint8_t              delta
  * @return ROK/RFAILED 
  */
-#ifdef ANSI
-static S16 rgSCHDrxGetNxtOnDur
-(
- RgSchCellCb         *cell,
- RgSchDrxUeCb        *drxCb,
- CmLteTimingInfo     *nxtOnDur,
- uint8_t                   delta
- )
-#else
-static S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
- RgSchCellCb         *cell;
- RgSchDrxUeCb        *drxCb;
- CmLteTimingInfo     *nxtOnDur;
- uint8_t                   delta;
-#endif
+static S16 rgSCHDrxGetNxtOnDur(RgSchCellCb *cell,RgSchDrxUeCb *drxCb,CmLteTimingInfo *nxtOnDur,uint8_t delta)
 {
-   uint16_t               curTime;
-   uint16_t               curDist;
-   uint16_t               cycleLen;
-   uint32_t               numOfCycles;
-   uint32_t               nxtDist;
+   uint16_t   curTime;
+   uint16_t   curDist;
+   uint16_t   cycleLen;
+   uint32_t   numOfCycles;
+   uint32_t   nxtDist;
 
 
 #if ( ERRCLASS & ERRCLS_INT_PAR ) 
@@ -1412,17 +1306,7 @@ static S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
  * @param  RgrUeDrxCfg  *drxCfg
  * @return ROK/RFAILED 
  */
-#ifdef ANSI
-static S16 rgSCHDrxCpyUeCfg
-(
- RgSchDrxUeCb  *ueCb,
- RgrUeDrxCfg   *drxCfg
-)
-#else
-static S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg)
- RgSchDrxUeCb  *ueCb;
- RgrUeDrxCfg   *drxCfg;
-#endif
+static S16 rgSCHDrxCpyUeCfg(RgSchDrxUeCb  *ueCb,RgrUeDrxCfg   *drxCfg)
 {
 
 #if ( ERRCLASS & ERRCLS_INT_PAR ) 
@@ -1476,36 +1360,23 @@ static S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg)
  * @param   RgrUeRecfg     *ueReCfg
  * @return  ROK/RFAILED
  */
-#ifdef ANSI
-S16 rgSCHDrxUeReCfg 
-(
- RgSchCellCb *cell, 
- RgSchUeCb   *ue, 
- RgrUeRecfg  *ueReCfg
- )
-#else
-S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg)
- RgSchCellCb *cell; 
- RgSchUeCb   *ue; 
- RgrUeRecfg  *ueReCfg;
-#endif
+S16 rgSCHDrxUeReCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg  *ueReCfg)
 {
       /* DRX_INFI_LOOP */
    RgSchCmnCell      *cellSch = NULLP;
    CmLListCp         dlInactvLst; /* list of UE's becoming DL-inactive */
-
    S16               ret       = ROK;
    Inst              instIdx   = cell->instIdx;
    RgSchDrxUeCb      *ueDrxCb;
    CmLteTimingInfo   nxtOnDur;
-   uint16_t               nxtOnDurTime;
-   uint16_t               onDurIndx;
-   uint16_t               curTime;
-   uint16_t               shrtCycleExpIndx;
-   uint16_t               onDurExpTime;
-   uint16_t               cycleLen;
-   uint16_t               curIndx;
-   uint8_t                cellIdx;
+   uint16_t          nxtOnDurTime;
+   uint16_t          onDurIndx;
+   uint16_t          curTime;
+   uint16_t          shrtCycleExpIndx;
+   uint16_t          onDurExpTime;
+   uint16_t          cycleLen;
+   uint16_t          curIndx;
+   uint8_t           cellIdx;
 
 
   /* drx was disabled but now enabled for this ue */ 
@@ -1724,25 +1595,11 @@ S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg)
  * @param  RgSchCellCb  *cell
  * @return ROK/RFAILED
  */
-#ifdef ANSI
-Void rgSCHDrxUeHqReset
-(
- RgSchCellCb   *cell,
- RgSchUeCb     *ue,
- RgSchDlHqEnt  *hqE,
- uint8_t            cellIdx
- )
-#else
-Void rgSCHDrxUeHqReset(cell, ue, hqE, cellIdx)
- RgSchCellCb   *cell; 
- RgSchUeCb     *ue;
- RgSchDlHqEnt  *hqE;
- uint8_t            cellIdx;
-#endif
+Void rgSCHDrxUeHqReset(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqEnt  *hqE,uint8_t cellIdx)
 { 
    RgSchDlHqProcCb     *hqP;
    RgSchDrxDlHqProcCb  *drxHq   =NULLP;
-   uint8_t                  i;
+   uint8_t             i;
 
    for(i=0; i < hqE->numHqPrcs; i++)
    {
@@ -1794,21 +1651,11 @@ Void rgSCHDrxUeHqReset(cell, ue, hqE, cellIdx)
  * @param  RgSchUeCb    *ue
  * @return ROK/RFAILED
  */
-#ifdef ANSI
-S16 rgSCHDrxUeDel
-(
- RgSchCellCb   *cell,
- RgSchUeCb      *ue
- )
-#else
-S16 rgSCHDrxUeDel (cell, ue)
- RgSchCellCb   *cell; 
- RgSchUeCb     *ue;
-#endif
+S16 rgSCHDrxUeDel(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchDrxUeCb       *ueDrxCb;
    RgSchDlHqEnt       *hqE = NULLP;
-   uint8_t                  cellIdx;
+   uint8_t            cellIdx;
    RgSchUeCellInfo    *cellInfo = NULLP;
 #ifdef EMTC_ENABLE
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@ -1891,17 +1738,7 @@ S16 rgSCHDrxUeDel (cell, ue)
  * @param RgrCellCfg    *cellCfg
  * @return ROK/RFAILED
  */
-#ifdef ANSI
-S16 rgSCHDrxCellCfg 
-(
- RgSchCellCb   *cell,
- RgrCellCfg    *cellCfg
- )
-#else
-S16 rgSCHDrxCellCfg (cell, cellCfg)
- RgSchCellCb   *cell; 
- RgrCellCfg    *cellCfg;
-#endif
+S16 rgSCHDrxCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg)
 {
 
    S16               ret       = ROK;
@@ -1965,15 +1802,7 @@ S16 rgSCHDrxCellCfg (cell, cellCfg)
  * @param  RgSchCellCb  *cell
  * @return Void
  */
-#ifdef ANSI
-Void rgSCHDrxCellDel 
-(
- RgSchCellCb *cell
- )
-#else
-Void rgSCHDrxCellDel (cell)
- RgSchCellCb *cell;
-#endif
+Void rgSCHDrxCellDel(RgSchCellCb *cell)
 {
    Inst              instIdx      = cell->instIdx;
 
@@ -2013,17 +1842,7 @@ Void rgSCHDrxCellDel (cell)
  * @param   RgSchUeCb    *ue
  * @return  ROK/RFAILED
  */
-#ifdef ANSI
-S16 rgSCHDrxSrInd 
-(
- RgSchCellCb   *cell, 
- RgSchUeCb     *ue
- )
-#else
-S16 rgSCHDrxSrInd (cell, ue)
- RgSchCellCb   *cell; 
- RgSchUeCb     *ue;
-#endif
+S16 rgSCHDrxSrInd(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    RgSchDrxUeCb      *drxCb;
 
@@ -2079,17 +1898,7 @@ S16 rgSCHDrxSrInd (cell, ue)
  * @param  RgSchUeCb    *ueCb
  * @return Void 
  */
-#ifdef ANSI
-Void rgSCHDrxDedRa 
-(
-RgSchCellCb   *cellCb, 
-RgSchUeCb     *ueCb
- )
-#else
-Void rgSCHDrxDedRa (cellCb, ueCb)
-RgSchCellCb   *cellCb; 
-RgSchUeCb     *ueCb;
-#endif
+Void rgSCHDrxDedRa(RgSchCellCb *cellCb, RgSchUeCb *ueCb)
 {
    RgSchDrxUeCb      *drxCb;
 
@@ -2128,28 +1937,14 @@ RgSchUeCb     *ueCb;
  * @param  Bool             calcFrmOffst
  * @return Void 
  */
-#ifdef ANSI
-static Void rgSCHDrxMvToNxtOnDurOcc 
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ueCb,
-uint16_t               idx,
-Bool              calcFrmOffst
-)
-#else
-static Void rgSCHDrxMvToNxtOnDurOcc (cell, ueCb, idx, calcFrmOffst)
-RgSchCellCb      *cell;
-RgSchUeCb        *ueCb; 
-uint16_t               idx;
-Bool              calcFrmOffst;
-#endif
+static Void rgSCHDrxMvToNxtOnDurOcc(RgSchCellCb *cell,RgSchUeCb *ueCb,uint16_t idx,Bool calcFrmOffst)
 {
-   uint16_t             nxtOnDurIndex;
-   uint16_t             curTime;
+   uint16_t        nxtOnDurIndex;
+   uint16_t        curTime;
    RgSchDrxUeCb    *drxUe;
    RgSchDRXCellCb  *drxCell;
-   CmLteTimingInfo  nxtOnDur; /* to be used when calcFrmOffset is set */
-   uint16_t              nxtOnDurInSf; /* next On Duration in no of subframes */
+   CmLteTimingInfo nxtOnDur; /* to be used when calcFrmOffset is set */
+   uint16_t        nxtOnDurInSf; /* next On Duration in no of subframes */
 
    drxCell = cell->drxCb;
    drxUe   = ueCb->drxCb;
@@ -2243,24 +2038,10 @@ Bool              calcFrmOffst;
  * @param  CmLteTimingInfo *tmrExpryIdx Timer expry (SFN,sf)
  * @return ROK/RFAILED
  */
-#ifdef ANSI
-static S16 rgSCHDrxGetNxtTmrExpry 
-(
- RgSchCellCb        *cell,
- uint16_t                curTime,
- uint32_t                duration, 
- CmLteTimingInfo    *tmrExpryIdx
-)
-#else
-static S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx)
- RgSchCellCb         *cell;
- uint16_t                 curTime;
- uint32_t                 duration;
- CmLteTimingInfo     *tmrExpryIdx;
-#endif
+static S16 rgSCHDrxGetNxtTmrExpry(RgSchCellCb *cell, uint16_t curTime, uint32_t duration,CmLteTimingInfo *tmrExpryIdx)
 {
-   uint32_t             dlSfTillNxtSFN;  /*!< DL subframes till next SFN */
-   uint8_t              tddCfgMode;      /*!< tdd config mode */
+   uint32_t        dlSfTillNxtSFN;  /*!< DL subframes till next SFN */
+   uint8_t         tddCfgMode;      /*!< tdd config mode */
    Bool            isDwPtsCnted;    /*!< is DwPts counted as PDCCH sf */
    CmLteTimingInfo crntTime;        /*!< current SFN & sf */
 
@@ -2390,29 +2171,11 @@ static S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx)
  * @param  S16              *idx
  * @return ROK/RFAILED
  */
-#ifdef ANSI
-static Void rgSCHDrxCalcNxtTmrExpry
-(
- RgSchCellCb     *cell,
- RgSchUeCb       *ue,
- uint16_t              delta,
- uint32_t              tmrLen,
- S16             *distance,
- uint16_t             *idx
-)
-#else
-static Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx)
- RgSchCellCb     *cell;
- RgSchUeCb       *ue;
- uint16_t              delta;
- uint32_t              tmrLen;
- S16             *distance;
- uint16_t             *idx;
-#endif
+static Void rgSCHDrxCalcNxtTmrExpry(RgSchCellCb *cell, RgSchUeCb *ue, uint16_t delta, uint32_t tmrLen, S16 *distance, uint16_t *idx)
 {
-   uint16_t             curTimeInSf;  /*current time in no of subframes*/
+   uint16_t        curTimeInSf;  /*current time in no of subframes*/
    CmLteTimingInfo tmrExpry;
-   uint16_t             tmrExpryInSf; /*timer expry in no of subframes*/
+   uint16_t        tmrExpryInSf; /*timer expry in no of subframes*/
 
    curTimeInSf = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G +
                    cell->crntTime.slot;
@@ -2475,24 +2238,10 @@ static Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHCfgVldtTddDrxCycCfg
-(
-RgSchCellCb  *cell,
-uint16_t           drxCycle,
-uint8_t            onDurTmr, 
-uint16_t           offSet
-)
-#else
-S16 rgSCHCfgVldtTddDrxCycCfg(cell, drxCycle, onDurTmr, offSet)
-RgSchCellCb  *cell;
-uint16_t           drxCycle;
-uint8_t            onDurTmr;
-uint16_t           offSet; 
-#endif
+S16 rgSCHCfgVldtTddDrxCycCfg(RgSchCellCb *cell,uint16_t drxCycle,uint8_t onDurTmr, uint16_t offSet)
 {
-   uint16_t             startTime;
-   uint16_t             endTimeInSf;
+   uint16_t       startTime;
+   uint16_t       endTimeInSf;
    CmLteTimingInfo endTime; 
 
    startTime = offSet;
@@ -2543,17 +2292,7 @@ uint16_t           offSet;
  * @return Void 
  */
 
-#ifdef ANSI
-static Void rgSCHDrxTtiHdlOnDurUl
-(
-RgSchCellCb        *cell,
-uint16_t                ulIndex
-)
-#else
-static Void rgSCHDrxTtiHdlOnDurUl(cell, ulIndex)
-RgSchCellCb   *cell;
-uint16_t           ulIndex;
-#endif
+static Void rgSCHDrxTtiHdlOnDurUl(RgSchCellCb *cell,uint16_t ulIndex)
 {
    CmLList           *node;
    RgSchDRXCellCb    *drxCell  = NULLP;
@@ -2683,24 +2422,14 @@ uint16_t           ulIndex;
  * @return Void
  */
 
-#ifdef ANSI
-static Void rgSCHDrxTtiHdlOnDurDl
-(
-RgSchCellCb    *cell,
-uint16_t                dlIndex
-)
-#else
-static Void rgSCHDrxTtiHdlOnDurDl(cell, dlIndex)
-RgSchCellCb   *cell;
-uint16_t           dlIndex;
-#endif
+static Void rgSCHDrxTtiHdlOnDurDl(RgSchCellCb *cell,uint16_t dlIndex)
 {
    CmLList           *node;
    RgSchDRXCellCb    *drxCell  = NULLP;
    RgSchUeCb         *ue       = NULLP;
    RgSchDrxUeCb      *drxUe    = NULLP;
    RgSchCmnCell      *cellSch = NULLP;
-   uint16_t               expiryIndex;
+   uint16_t          expiryIndex;
    CmLListCp         dlInactvLst; /* list of UE's becoming DL-inactive */
    Bool              delInUlScan = FALSE;
 
@@ -2869,30 +2598,20 @@ uint16_t           dlIndex;
  * @return Void 
  */
 
-#ifdef ANSI
-static Void rgSCHDrxTtiHdlDlHarqRTT
-(
-RgSchCellCb          *cell,
-uint16_t                   dlIndex
-)
-#else /* ANSI */
-static Void rgSCHDrxTtiHdlDlHarqRTT(cell, dlIndex)
-RgSchCellCb          *cell;
-uint16_t                   dlIndex;
-#endif /* ANSI */
+static Void rgSCHDrxTtiHdlDlHarqRTT(RgSchCellCb *cell,uint16_t dlIndex)
 {
    CmLList             *node;
    RgSchDrxDlHqProcCb  *drxHq;
    RgSchDlHqProcCb     *dlHq;
    RgSchDRXCellCb      *drxCell;
    RgSchDrxUeCb        *drxUe;
-   uint16_t                 reTxExpIndx;
+   uint16_t            reTxExpIndx;
    Bool                delInUlScan;
    RgSchUeCb           *ue;
    CmLListCp           dlInactvLst; /* list of UE's becoming DL-inactive */
    RgSchCmnCell        *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t                  cellIdx;
-   uint32_t                 dlInactvMask;
+   uint8_t             cellIdx;
+   uint32_t            dlInactvMask;
 
    drxCell     = cell->drxCb;
    delInUlScan = drxCell->delInUlScan;
@@ -3056,29 +2775,19 @@ uint16_t                   dlIndex;
   * @return Void 
   */
 
-#ifdef ANSI
-static Void rgSCHDrxTtiHdlUlHarqRTT
-(
-RgSchCellCb          *cell,
-uint16_t                   ulIndex
-)
-#else /* ANSI */
-static Void rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex)
-RgSchCellCb          *cell;
-uint16_t                   ulIndex;
-#endif /* ANSI */
+static Void rgSCHDrxTtiHdlUlHarqRTT(RgSchCellCb *cell,uint16_t ulIndex)
 {
    CmLList             *node;
    RgSchDrxDlHqProcCb  *drxHq;
    RgSchDlHqProcCb     *dlHq;
    RgSchDRXCellCb      *drxCell;
    RgSchDrxUeCb        *drxUe;
-   Bool              delInUlScan;
-   RgSchUeCb          *ue;
-   CmLListCp         ulInactvLst; /* list of UE's becoming DL-inactive */
-   RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   uint8_t                cellIdx;
-   uint32_t               ulInactvMask;
+   Bool                delInUlScan;
+   RgSchUeCb           *ue;
+   CmLListCp           ulInactvLst; /* list of UE's becoming DL-inactive */
+   RgSchCmnCell        *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   uint8_t             cellIdx;
+   uint32_t            ulInactvMask;
 
 
    drxCell     = cell->drxCb;
index a6c6b63..1ce542b 100644 (file)
  * 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHCmnSpsInit
-(
-)
-#else /* ANSI */
-Void rgSCHCmnSpsInit ()
-#endif /* ANSI */
+Void rgSCHCmnSpsInit()
 {
 
    return;
@@ -81,21 +75,7 @@ Void rgSCHCmnSpsInit ()
  * 
  *  @return Void
  **/
-#ifdef ANSI
-S16 rgSCHCmnSpsUeCfg
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgrUeCfg           *ueCfg,
-RgSchErrInfo       *err
-)
-#else /* ANSI */
-S16 rgSCHCmnSpsUeCfg (cell, ue, ueCfg, err)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgrUeCfg           *ueCfg;
-RgSchErrInfo       *err;
-#endif /* ANSI */
+S16 rgSCHCmnSpsUeCfg(RgSchCellCb *cell,RgSchUeCb  *ue,RgrUeCfg *ueCfg,RgSchErrInfo *err)
 {
 
    return ROK;
@@ -111,21 +91,7 @@ RgSchErrInfo       *err;
  * 
  *  @return Void
  **/
-#ifdef ANSI
-S16 rgSCHCmnSpsUeRecfg
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgrUeRecfg         *ueRecfg,
-RgSchErrInfo       *err
-)
-#else /* ANSI */
-S16 rgSCHCmnSpsUeRecfg (cell, ue, ueCfg, err)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgrUeRecfg         *ueRecfg;
-RgSchErrInfo       *err;
-#endif /* ANSI */
+S16 rgSCHCmnSpsUeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err)
 {
 
    return ROK;
@@ -141,17 +107,7 @@ RgSchErrInfo       *err;
  * 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHCmnSpsUeDel
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue
-)
-#else /* ANSI */
-Void rgSCHCmnSpsUeDel (cell, ue)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-#endif /* ANSI */
+Void rgSCHCmnSpsUeDel(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
 
    return;
@@ -167,19 +123,7 @@ RgSchUeCb          *ue;
  * 
  *  @return Void
  **/
-#ifdef ANSI
-S16 rgSCHCmnSpsCellCfg
-(
-RgSchCellCb        *cell,
-RgrCellCfg         *cellCfg,
-RgSchErrInfo       *err
-)
-#else /* ANSI */
-S16 rgSCHCmnSpsCellCfg(cell, cellCfg, err)
-RgSchCellCb        *cell;
-RgrCellCfg         *cellCfg;
-RgSchErrInfo       *err;
-#endif /* ANSI */
+S16 rgSCHCmnSpsCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err)
 {
 
    return ROK;
@@ -195,15 +139,7 @@ RgSchErrInfo       *err;
  * 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHCmnSpsCellDel
-(
-RgSchCellCb        *cell
-)
-#else /* ANSI */
-Void rgSCHCmnSpsCellDel (cell)
-RgSchCellCb        *cell;
-#endif /* ANSI */
+Void rgSCHCmnSpsCellDel(RgSchCellCb *cell)
 {
 
    return;
@@ -219,23 +155,7 @@ RgSchCellCb        *cell;
  * 
  *  @return Void
  **/
-#ifdef ANSI
-S16 rgSCHCmnSpsDlLcCfg 
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgSchDlLcCb        *dlLc,
-RgrLchCfg          *lcCfg,
-RgSchErrInfo       *err
-)
-#else /* ANSI */
-S16 rgSCHCmnSpsDlLcCfg(cell, ue, dlLc, lcCfg, err)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgSchDlLcCb        *dlLc;
-RgrLchCfg          *lcCfg;
-RgSchErrInfo       *err
-#endif /* ANSI */
+S16 rgSCHCmnSpsDlLcCfg(RgSchCellCb  *cell,RgSchUeCb  *ue,RgSchDlLcCb  *dlLc,RgrLchCfg  *lcCfg,RgSchErrInfo  *err)
 {
 
    return ROK;
index 77139ad..a340352 100755 (executable)
@@ -73,17 +73,11 @@ registered with SSI during the LTE MAC Task initialization.
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 schActvTsk
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-S16 schActvTsk(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->srcEnt)
    {
index 7a19658..174867e 100755 (executable)
@@ -135,27 +135,13 @@ uint16_t                     idx
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHGomHndlCfg
-(
-Pst           *pst,
-RgSchCb       *instCb,
-RgrCfgTransId transId,
-RgrCfgReqInfo *cfgReqInfo
-)
-#else
-S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo)
-Pst           *pst;
-RgSchCb       *instCb;
-RgrCfgTransId transId;
-RgrCfgReqInfo *cfgReqInfo;
-#endif
+S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb  *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo)
 {
    S16           ret;
    SpId          spId = 0;
    CmLteCellId   cellId;
    RgSchCellCb   *cell = NULLP;    
-   uint8_t            cfmStatus = RGR_CFG_CFM_NOK;
+   uint8_t       cfmStatus = RGR_CFG_CFM_NOK;
 #ifdef DEBUGP
    Inst          inst = (instCb->rgSchInit.inst );
 #endif
@@ -244,26 +230,10 @@ RgrCfgReqInfo *cfgReqInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomCfgReq
-(
-Region        reg,
-Pool          pool,
-RgSchCb       *instCb,
-RgrCfgTransId transId,
-RgrCfgReqInfo *cfgReqInfo
-)
-#else
-static S16 rgSCHGomCfgReq(reg, pool, instCb, transId, cfgReqInfo)
-Region        reg;
-Pool          pool;
-RgSchCb       *instCb;
-RgrCfgTransId transId;
-RgrCfgReqInfo *cfgReqInfo;
-#endif
+static S16 rgSCHGomCfgReq(Region  reg,Pool  pool,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInfo *cfgReqInfo)
 {
-   SpId          spId = 0;
-   uint8_t              cfmStatus = RGR_CFG_CFM_OK;
+   SpId            spId = 0;
+   uint8_t         cfmStatus = RGR_CFG_CFM_OK;
    S16             ret;
    RgSchErrInfo    errInfo;
 #ifdef DEBUGP
@@ -368,26 +338,10 @@ printf("\n AT MAC RGR cfg cfm sent\n");
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomEnqCfgReq
-(
-Region        reg,
-Pool          pool,
-RgSchCellCb   *cell,
-RgrCfgTransId transId,
-RgrCfgReqInfo *rgrCfgReq
-)
-#else
-static S16 rgSCHGomEnqCfgReq(reg, pool, cell, transId, rgrCfgReq)
-Region        reg;
-Pool          pool;
-RgSchCellCb   *cell;
-RgrCfgTransId transId;
-RgrCfgReqInfo *rgrCfgReq;
-#endif
+static S16 rgSCHGomEnqCfgReq(Region reg,Pool pool,RgSchCellCb *cell,RgrCfgTransId transId,RgrCfgReqInfo *rgrCfgReq)
 {
    S16                ret;
-   uint32_t                sfDiff;
+   uint32_t           sfDiff;
    RgSchCfgElem       *rgrCfgElem  = NULLP;
    CmLteTimingInfo    actvTime; 
    Inst               inst = cell->instIdx;
@@ -485,17 +439,7 @@ RgrCfgReqInfo *rgrCfgReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHGomTtiHndlr
-(
-RgSchCellCb      *cell,
-SpId             spId
-)
-#else
-S16 rgSCHGomTtiHndlr(cell, spId)
-RgSchCellCb      *cell;
-SpId             spId;
-#endif
+S16 rgSCHGomTtiHndlr(RgSchCellCb *cell,SpId  spId)
 {
    RgSchCfgElem       *cfgElem;
    Inst               inst= cell->instIdx;
@@ -551,21 +495,7 @@ SpId             spId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomHndlCfgReq
-(
-RgSchCb        *instCb,
-SpId           spId,
-RgrCfg         *cfg,
-RgSchErrInfo   *errInfo
-)
-#else
-static S16 rgSCHGomHndlCfgReq(instCb, spId, cfg, errInfo)
-RgSchCb        *instCb;
-SpId           spId;
-RgrCfg         *cfg;
-RgSchErrInfo   *errInfo;
-#endif
+static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo *errInfo)
 {
    S16          ret;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
@@ -675,27 +605,11 @@ RgSchErrInfo   *errInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomHndlSCellActDeactReq
-(
-RgSchCb               *instCb,
-SpId                   spId,
-RgrSCellActDeactEvnt  *sCellActDeactEvnt,
-RgSchErrInfo          *errInfo,
-uint8_t                    action
-)
-#else
-static S16 rgSCHGomHndlSCellActDeactReq(instCb, spId, sCellActDeactEvnt, errInfo, action)
-RgSchCb               *instCb;
-SpId                  spId;
-RgrSCellActDeactEvnt  *sCellActDeactEvnt; 
-RgSchErrInfo          *errInfo;
-uint8_t                    action;
-#endif
+static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb  *instCb,SpId  spId,RgrSCellActDeactEvnt  *sCellActDeactEvnt,RgSchErrInf *errInfo,uint8_t action)
 {
    RgSchUeCb    *ue = NULLP;
-   uint16_t          idx = 0;
-   uint16_t          sCellIdx = 0;
+   uint16_t     idx = 0;
+   uint16_t     sCellIdx = 0;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
    Inst         inst = (instCb->rgSchInit.inst);
 
@@ -754,21 +668,7 @@ uint8_t                    action;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomHndlRecfgReq
-(
-RgSchCb       *instCb,
-SpId          spId,
-RgrRecfg      *recfg,
-RgSchErrInfo  *errInfo
-)
-#else
-static S16 rgSCHGomHndlRecfgReq(instCb, spId, recfg, errInfo)
-RgSchCb       *instCb;
-SpId          spId;
-RgrRecfg      *recfg;
-RgSchErrInfo  *errInfo;
-#endif
+static S16 rgSCHGomHndlRecfgReq(RgSchCb  *instCb,SpId  spId,RgrRecfg *recfg,RgSchErrInfo  *errInfo)
 {
    RgSchUeCb    *ue = NULLP;
    RgSchDlLcCb  *dlLc = NULLP; /* PURIFY_FIX:UMR */
@@ -866,21 +766,7 @@ RgSchErrInfo  *errInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomHndlResetReq
-(
-RgSchCb       *instCb,
-SpId          spId,
-RgrRst        *reset,
-RgSchErrInfo  *errInfo
-)
-#else
-static S16 rgSCHGomHndlResetReq(instCb, spId, reset, errInfo)
-RgSchCb       *instCb;
-SpId          spId;
-RgrRst        *reset;
-RgSchErrInfo  *errInfo;
-#endif
+static S16 rgSCHGomHndlResetReq(RgSchCb  *instCb,SpId spId,RgrRst *reset,RgSchErrInfo  *errInfo)
 {
    S16          ret; 
    RgSchCellCb  *cell= instCb->rgrSap[spId].cell;
@@ -932,21 +818,7 @@ RgSchErrInfo  *errInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static S16 rgSCHGomHndlDelReq
-(
-RgSchCb       *instCb,
-SpId          spId,
-RgrDel        *del,
-RgSchErrInfo  *errInfo
-)
-#else
-static S16 rgSCHGomHndlDelReq(instCb, spId, del, errInfo)
-RgSchCb       *instCb;
-SpId          spId;
-RgrDel        *del;
-RgSchErrInfo  *errInfo;
-#endif
+static S16 rgSCHGomHndlDelReq(RgSchCb *instCb,SpId spId,RgrDel *del,RgSchErrInfo  *errInfo)
 {
 
    S16       ret;
@@ -1038,17 +910,7 @@ RgSchErrInfo  *errInfo;
  *     File : rg_sch_gom.c 
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHGomGetCellIdFrmCfgReq
-(
-RgrCfgReqInfo *rgrCfgReq,
-CmLteCellId   *cellId
-)
-#else
-static S16 rgSCHGomGetCellIdFrmCfgReq(rgrCfgReq, cellId)
-RgrCfgReqInfo *rgrCfgReq;
-CmLteCellId   *cellId;
-#endif
+static S16 rgSCHGomGetCellIdFrmCfgReq(RgrCfgReqInfo *rgrCfgReq,CmLteCellId   *cellId)
 {
 
    /* Extract CellId depending on the action and Config Type in the Request 
@@ -1116,35 +978,17 @@ CmLteCellId   *cellId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHGomHndlSiCfg
-(
-Region        reg,
-Pool          pool,
-RgSchCb       *instCb,
-SpId          spId,
-RgrCfgTransId transId,
-RgrSiCfgReqInfo *cfgReqInfo
-)
-#else
-S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo)
-Region        reg;
-Pool          pool;
-RgSchCb       *instCb;
-SpId          spId;
-RgrCfgTransId transId;
-RgrSiCfgReqInfo *cfgReqInfo;
-#endif
+S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo *cfgReqInfo)
 {
    S16          ret;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
    Inst         inst = (instCb->rgSchInit.inst );
-   RgSchErrInfo    errInfo;
-   uint8_t           cfmStatus = RGR_CFG_CFM_NOK;
+   RgSchErrInfo errInfo;
+   uint8_t      cfmStatus = RGR_CFG_CFM_NOK;
    MsgLen       msgLen = 0, pduLen;
    S32          tbSz   = 0;
-   uint8_t           nPrb   = 0; 
-   uint8_t           mcs    = 0;
+   uint8_t      nPrb   = 0; 
+   uint8_t      mcs    = 0;
 
 
    /* check if cell does not exists */
@@ -1418,7 +1262,6 @@ RgrSiCfgReqInfo *cfgReqInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHGomHndlWarningSiCfg
 (
 Region        reg,
@@ -1428,31 +1271,21 @@ SpId          spId,
 RgrCfgTransId transId,
 RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
 )
-#else
-S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, 
-warningSiCfgReqInfo)
-Region        reg;
-Pool          pool;
-RgSchCb       *instCb;
-SpId          spId;
-RgrCfgTransId transId;
-RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
-#endif
 {
    RgSchCellCb       *cell = instCb->rgrSap[spId].cell;
-   uint8_t                 cfmStatus = RGR_CFG_CFM_NOK;
-   uint16_t                idx;
-   uint8_t                 siId = warningSiCfgReqInfo->siId; 
-   uint8_t                 j, mcs=0, nPrb=0;
-   RgSchWarningSiSeg  *warningSiMsg;
-   RgSchWarningSiPdu  *pduNode;
-   CmLList            *node;
-   MsgLen             msgLen = 0;
-   Bool               freeNodeFound = FALSE;
-   uint16_t                siWinSize = 0;
-   uint16_t                minPeriod = 0;
+   uint8_t           cfmStatus = RGR_CFG_CFM_NOK;
+   uint16_t          idx;
+   uint8_t           siId = warningSiCfgReqInfo->siId; 
+   uint8_t           j, mcs=0, nPrb=0;
+   RgSchWarningSiSeg *warningSiMsg;
+   RgSchWarningSiPdu *pduNode;
+   CmLList           *node;
+   MsgLen            msgLen = 0;
+   Bool              freeNodeFound = FALSE;
+   uint16_t          siWinSize = 0;
+   uint16_t          minPeriod = 0;
 #ifdef EMTC_ENABLE
-   uint8_t                 isEmtc = warningSiCfgReqInfo->emtcEnable;
+   uint8_t           isEmtc = warningSiCfgReqInfo->emtcEnable;
 #endif
 
 #ifdef EMTC_ENABLE
@@ -1613,28 +1446,10 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
  *  @param[in]  SpId          siId
  *  @return  void
  **/
-#ifdef ANSI
-Void rgSCHGomHndlWarningSiStopReq 
-(
-Region        reg,
-Pool          pool,
-RgSchCb       *instCb,
-uint8_t            siId,
-RgrCfgTransId transId,
-SpId          spId
-)
-#else
-Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId)
-Region        reg;
-Pool          pool;
-RgSchCb       *instCb;
-uint8_t            siId;
-RgrCfgTransId transId;
-SpId          spId;
-#endif
+Void rgSCHGomHndlWarningSiStopReq(Region reg,Pool pool,RgSchCb *instCb,uint8_t siId,RgrCfgTransId transId,SpId spId)
 {
    RgSchCellCb        *cell = instCb->rgrSap[spId].cell;
-   uint16_t                idx;
+   uint16_t           idx;
    CmLList            *node;
    RgSchWarningSiPdu  *warningSiPdu;
    Buffer             *pdu;
@@ -1685,20 +1500,7 @@ SpId          spId;
  *  @return  S16
  *
  **/
-#ifdef ANSI
-S16 rgSchUpdtRNTPInfo
-(
- RgSchCellCb             *cell,
- RgSchDlSf               *sf,
- RgrLoadInfReqInfo       *loadInfReq
- )
-#else
-static Void rgSchUpdtRNTPInfo(cell, sf)
-   RgSchCellCb             *cell;
-   RgSchDlSf               *sf;
-   RgrLoadInfReqInfo       *loadInfReq;
-
-#endif
+S16 rgSchUpdtRNTPInfo(RgSchCellCb *cell,RgSchDlSf *sf,RgrLoadInfReqInfo *loadInfReq)
 {
    /*  Initialise the variables */
    RgSchSFRPoolInfo *sfrCCPool;
@@ -1750,25 +1552,7 @@ static Void rgSchUpdtRNTPInfo(cell, sf)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHGomHndlLoadInf
-(
- Region            reg,
- Pool              pool,
- RgSchCb           *instCb,
- SpId              spId,
- RgrCfgTransId     transId,
- RgrLoadInfReqInfo *loadInfReq
- )
-#else
-S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
-   Region            reg;
-   Pool              pool;
-   RgSchCb           *instCb;
-   SpId              spId;
-   RgrCfgTransId     transId;
-   RgrLoadInfReqInfo *loadInfReq;
-#endif
+S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTransId transId,RgrLoadInfReqInfo *loadInfReq)
 {
    S16          ret;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
index 1140e3f..d1803aa 100755 (executable)
@@ -92,19 +92,7 @@ extern "C" {
  *      -# RFAILED
 */ 
 
-#ifdef ANSI
-S16 rgSCHHdFddUeCfg 
-(
-RgSchCellCb  *cellCb,
-RgSchUeCb *ueCb,
-Bool hdFddEnbl
-)
-#else /* ANSI */
-S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl)
-RgSchCellCb  *cellCb;
-RgSchUeCb *ueCb;
-Bool hdFddEnbl;
-#endif /* ANSI */
+S16 rgSCHHdFddUeCfg(RgSchCellCb  *cellCb,RgSchUeCb *ueCb,Bool hdFddEnbl)
 {
    uint8_t sfi;
 
@@ -194,17 +182,7 @@ Bool hdFddEnbl;
  *      -# ROK
 *
 */
-#ifdef ANSI
-S16 rgSCHHdFddUeDel 
-(
-RgSchCellCb *cellCb,
-RgSchUeCb   *ueCb
-)
-#else /* ANSI */
-S16 rgSCHHdFddUeDel(cellCb, ueCb)
-RgSchCellCb *cellCb;
-RgSchUeCb   *ueCb;
-#endif /* ANSI */
+S16 rgSCHHdFddUeDel(RgSchCellCb *cellCb,RgSchUeCb   *ueCb)
 {
 
    RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId,
@@ -240,30 +218,22 @@ RgSchUeCb   *ueCb;
  *  @return    None
  */
 
-#ifdef ANSI
-Void rgSCHCmnHdFddPtUlMrk 
-(
-RgSchCellCb *cellCb
-)
-#else /* ANSI */
-Void rgSCHCmnHdFddPtUlMrk (cellCb)
-RgSchCellCb *cellCb;
-#endif /* ANSI */
+Void rgSCHCmnHdFddPtUlMrk(RgSchCellCb *cellCb)
 {
-   uint16_t                    sfn; /* System Frame Number */
-   uint32_t                    pti; /* Index into Periodic table */
-   uint16_t                    sfi; /* Index into HDFDD state table */
-   CmLListCp              *cqiLst;
-   CmLListCp              *srsLst;
-   CmLListCp              *srLst;
-   CmLListCp              *riLst;
-   CmLList                *cqiNode;
-   CmLList                *srsNode;
-   CmLList                *srNode;
-   CmLList                *riNode;
-   CmLteTimingInfo        timeInfo;
-   RgSchUePCqiCb          *cqiCb = NULLP;
-   RgSchUePCqiCb          *riCb = NULLP;
+   uint16_t           sfn; /* System Frame Number */
+   uint32_t           pti; /* Index into Periodic table */
+   uint16_t           sfi; /* Index into HDFDD state table */
+   CmLListCp          *cqiLst;
+   CmLListCp          *srsLst;
+   CmLListCp          *srLst;
+   CmLListCp          *riLst;
+   CmLList            *cqiNode;
+   CmLList            *srsNode;
+   CmLList            *srNode;
+   CmLList            *riNode;
+   CmLteTimingInfo    timeInfo;
+   RgSchUePCqiCb      *cqiCb = NULLP;
+   RgSchUePCqiCb      *riCb = NULLP;
 
 
    timeInfo = cellCb->crntTime;
@@ -372,25 +342,13 @@ RgSchCellCb *cellCb;
  *  @return    None
  *
  */
-#ifdef ANSI
-Void rgSCHCmnHdFddChkUlAllow
-( 
- RgSchCellCb *cellCb,
- RgSchUeCb   *ueCb,
- uint8_t          *allow
-)
-#else /* ANSI */
-Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow)
-RgSchCellCb *cellCb;
-RgSchUeCb   *ueCb;
-uint8_t          *allow;
-#endif /* ANSI */
+Void rgSCHCmnHdFddChkUlAllow(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint8_t *allow)
 {
-   uint16_t              sfn;
-   uint16_t              sfi;
+   uint16_t         sfn;
+   uint16_t         sfi;
    CmLteTimingInfo  timeInfo;
    RgSchDlSf        *sf = NULLP; /* Dl subframe info */
-   uint8_t               ulOffset
+   uint8_t          ulOffset
 
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, 
             " rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId);
@@ -540,19 +498,12 @@ uint8_t          *allow;
  *                   Valdity of this pointer is not done in this function
  *
  */
-#ifdef ANSI
 Void rgSCHCmnHdFddChkDlAllow 
 (
 RgSchCellCb *cellCb,
 RgSchUeCb *ueCb,
 Bool *allow /* Valdity of this pointer is not done in this function */
 )
-#else /* ANSI */
-Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow)
-RgSchCellCb *cellCb;
-RgSchUeCb *ueCb;
-Bool *allow; /* Valdity of this pointer is not done in this function */
-#endif /* ANSI */
 {
    uint16_t     sfn;
    uint16_t     sfi;
@@ -698,21 +649,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */
  *
  */
 
-#ifdef ANSI
-Void rgSCHCmnHdFddChkNackAllow
-(
-RgSchCellCb *cellCb,
-RgSchUeCb   *ueCb,
-CmLteTimingInfo  timeInfo,
-Bool *sndNACK
-)
-#else /* ANSI */
-Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK)
-RgSchCellCb *cellCb;
-RgSchUeCb   *ueCb;
-CmLteTimingInfo  timeInfo;
-Bool *sndNACK;
-#endif /* ANSI */
+Void rgSCHCmnHdFddChkNackAllow(RgSchCellCb *cellCb,RgSchUeCb *ueCb,CmLteTimingInfo  timeInfo,Bool *sndNACK)
 {
    RgSchDlSf *sf;
    CmLteTimingInfo  tempTimeInfo;
@@ -773,17 +710,7 @@ Bool *sndNACK;
  *
  *  @return  None
  */
-#ifdef ANSI
-Void rgSCHCmnHdFddUpdULMark
-(
-RgSchCellCb *cellCb,
-RgSchUeCb   *ueCb
-)
-#else /* ANSI */
-Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb)
-RgSchCellCb *cellCb;
-RgSchUeCb   *ueCb;
-#endif /* ANSI */
+Void rgSCHCmnHdFddUpdULMark(RgSchCellCb *cellCb,RgSchUeCb   *ueCb)
 {
 
    uint16_t sfn;
@@ -853,17 +780,7 @@ RgSchUeCb   *ueCb;
  *  @return  None
  */
 
-#ifdef ANSI
-Void rgSCHCmnHdFddUpdDLMark
-(
-RgSchCellCb *cellCb,
-RgSchUeCb   *ueCb
-)
-#else /* ANSI */
-Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb)
-RgSchCellCb *cellCb;
-RgSchUeCb   *ueCb;
-#endif /* ANSI */
+Void rgSCHCmnHdFddUpdDLMark(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
 
    uint16_t sfn;
@@ -922,19 +839,7 @@ RgSchUeCb   *ueCb;
  *  @return  None
  */
 
-#ifdef ANSI
-Void rgSCHHdFddGetSfn
-(
- uint16_t *sfn,
- CmLteTimingInfo  timeInfo,
- S16 offset
-)
-#else /* ANSI */
-Void rgSCHHdFddGetSfn (sfn, timeInfo, offset)
- uint16_t *sfn;
- CmLteTimingInfo  timeInfo;
- S16 offset;
-#endif /* ANSI */
+Void rgSCHHdFddGetSfn(uint16_t *sfn,CmLteTimingInfo  timeInfo,S16 offset)
 {
    uint16_t tempSfn;
    S16 tempSfCount;
index f288719..e6eaa02 100755 (executable)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchUeDelInd
-(
-Pst* pst,
-RgInfUeDelInd*  ueDelInd
-)
-#else
-S16 cmPkMacSchUeDelInd(pst, ueDelInd)
-Pst* pst;
-RgInfUeDelInd*  ueDelInd;
-#endif
+S16 cmPkMacSchUeDelInd(Pst* pst,RgInfUeDelInd*  ueDelInd)
 {
    Buffer *mBuf = NULLP;
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
@@ -105,19 +95,7 @@ RgInfUeDelInd*  ueDelInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchUeDelInd
-(
-UeDelInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkMacSchUeDelInd(func, pst, mBuf)
-UeDelInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkMacSchUeDelInd(UeDelInd func,Pst *pst,Buffer *mBuf)
 {
    RgInfUeDelInd ueDelInd;
    
@@ -147,17 +125,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchDedBoUpdtReq
-(
-Pst* pst,
-RgInfDedBoRpt* boRpt
-)
-#else
-S16 cmPkMacSchDedBoUpdtReq(pst, boRpt)
-Pst* pst;
-RgInfDedBoRpt* boRpt;
-#endif
+S16 cmPkMacSchDedBoUpdtReq(Pst* pst,RgInfDedBoRpt* boRpt)
 {
    Buffer *mBuf = NULLP;
 
@@ -193,19 +161,7 @@ RgInfDedBoRpt* boRpt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchDedBoUpdtReq
-(
-DedBoUpdtReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkMacSchDedBoUpdtReq(func, pst, mBuf)
-DedBoUpdtReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkMacSchDedBoUpdtReq(DedBoUpdtReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfDedBoRpt boRpt;
    
@@ -232,17 +188,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchCmnBoUpdtReq
-(
-Pst* pst,
-RgInfCmnBoRpt* boRpt
-)
-#else
-S16 cmPkMacSchCmnBoUpdtReq(pst, boRpt)
-Pst* pst;
-RgInfCmnBoRpt* boRpt;
-#endif
+S16 cmPkMacSchCmnBoUpdtReq(Pst* pst,RgInfCmnBoRpt* boRpt)
 {
    Buffer *mBuf = NULLP;
 
@@ -278,19 +224,7 @@ RgInfCmnBoRpt* boRpt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchCmnBoUpdtReq
-(
-CmnBoUpdtReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkMacSchCmnBoUpdtReq(func, pst, mBuf)
-CmnBoUpdtReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkMacSchCmnBoUpdtReq(CmnBoUpdtReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfCmnBoRpt boRpt;
    
@@ -317,17 +251,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchSfRecpInd
-(
-Pst* pst,
-RgInfSfDatInd*  datInd
-)
-#else
-S16 cmPkMacSchSfRecpInd(pst, datInd)
-Pst* pst;
-RgInfSfDatInd*  datInd;
-#endif
+S16 cmPkMacSchSfRecpInd(Pst* pst,RgInfSfDatInd*  datInd)
 {
    Buffer *mBuf = NULLP;
 
@@ -360,19 +284,7 @@ RgInfSfDatInd*  datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchSfRecpInd
-(
-SfRecpInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkMacSchSfRecpInd(func, pst, mBuf)
-SfRecpInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkMacSchSfRecpInd(SfRecpInd func,Pst *pst,Buffer *mBuf)
 {
    RgInfSfDatInd* datInd;
    
@@ -400,17 +312,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchSpsRelInd
-(
-Pst*                 pst,
-RgInfSpsRelInfo*     relInfo
-)
-#else
-S16 cmPkMacSchSpsRelInd(pst, relInfo)
-Pst*                 pst;
-RgInfSpsRelInfo*     relInfo;
-#endif
+S16 cmPkMacSchSpsRelInd(Pst* pst,RgInfSpsRelInfo* relInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -441,19 +343,7 @@ RgInfSpsRelInfo*     relInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchSpsRelInd
-(
-SpsRelInd      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkMacSchSpsRelInd(func, pst, mBuf)
-SpsRelInd      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkMacSchSpsRelInd(SpsRelInd func,Pst *pst,Buffer *mBuf)
 {
    RgInfSpsRelInfo *relInfo;
    
@@ -484,17 +374,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacSfAllocReq
-(
-Pst* pst,
-RgInfSfAlloc*   resAllocReq
-)
-#else
-S16 cmPkSchMacSfAllocReq(pst, resAllocReq)
-Pst* pst;
-RgInfSfAlloc*   resAllocReq;
-#endif
+S16 cmPkSchMacSfAllocReq(Pst* pst,RgInfSfAlloc* resAllocReq)
 {
    Buffer *mBuf = NULLP;
 
@@ -527,19 +407,7 @@ RgInfSfAlloc*   resAllocReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacSfAllocReq
-(
-SfAllocReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkSchMacSfAllocReq(func, pst, mBuf)
-SfAllocReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkSchMacSfAllocReq(SfAllocReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfSfAlloc* resAllocReq;
    
@@ -564,17 +432,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacRstHqEntReq
-(
-Pst*                 pst,
-RgInfResetHqEnt*     hqEntInfo
-)
-#else
-S16 cmPkSchMacRstHqEntReq(pst, sfHqInfo)
-Pst*                 pst,    
-RgInfResetHqEnt*     hqEntInfo
-#endif
+S16 cmPkSchMacRstHqEntReq(Pst*  pst,RgInfResetHqEnt* hqEntInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -604,19 +462,7 @@ RgInfResetHqEnt*     hqEntInfo
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacRstHqEntReq
-(
-RstHqEntReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkSchMacRstHqEntReq(func, pst, mBuf)
-RstHqEntReq func,
-Pst *pst,
-Buffer *mBuf
-#endif
+S16 cmUnpkSchMacRstHqEntReq(RstHqEntReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfResetHqEnt* hqEntRstInfo;
    
@@ -644,17 +490,7 @@ Buffer *mBuf
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacRlsHqReq
-(
-Pst* pst,
-RgInfRlsHqInfo* sfHqInfo
-)
-#else
-S16 cmPkSchMacRlsHqReq(pst, sfHqInfo)
-Pst* pst;
-RgInfRlsHqInfo* sfHqInfo;
-#endif
+S16 cmPkSchMacRlsHqReq(Pst* pst,RgInfRlsHqInfo* sfHqInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -686,19 +522,7 @@ RgInfRlsHqInfo* sfHqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacRlsHqReq
-(
-RlsHqReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkSchMacRlsHqReq(func, pst, mBuf)
-RlsHqReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkSchMacRlsHqReq(RlsHqReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfRlsHqInfo* sfHqInfo;
    
@@ -725,17 +549,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacRlsRntiReq
-(
-Pst* pst,
-RgInfRlsRnti* rlsRnti
-)
-#else
-S16 cmPkSchMacRlsRntiReq(pst, rlsRnti)
-Pst* pst;
-RgInfRlsRnti* rlsRnti;
-#endif
+S16 cmPkSchMacRlsRntiReq(Pst* pst,RgInfRlsRnti* rlsRnti)
 {
    Buffer *mBuf = NULLP;
 
@@ -770,19 +584,7 @@ RgInfRlsRnti* rlsRnti;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacRlsRntiReq
-(
-RlsRntiReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkSchMacRlsRntiReq(func, pst, mBuf)
-RlsRntiReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkSchMacRlsRntiReq(RlsRntiReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfRlsRnti rlsRnti;
    
@@ -810,17 +612,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacCellRegReq
-(
-Pst* pst,
-RgInfCellReg* regReq
-)
-#else
-S16 cmPkSchMacCellRegReq(pst, regReq)
-Pst* pst;
-RgInfCellReg* regReq;
-#endif
+S16 cmPkSchMacCellRegReq(Pst* pst,RgInfCellReg* regReq)
 {
    Buffer *mBuf = NULLP;
 
@@ -855,19 +647,7 @@ RgInfCellReg* regReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacCellRegReq
-(
-CellRegReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkSchMacCellRegReq(func, pst, mBuf)
-CellRegReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkSchMacCellRegReq(CellRegReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfCellReg regReq;
    
@@ -893,17 +673,7 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacLcgRegReq
-(
-Pst*                 pst,
-RgInfLcgRegReq       *lcgRegReq
-)
-#else
-S16 cmPkSchMacLcgRegReq(pst, lcgRegReq)
-Pst*                 pst;
-RgInfLcgRegReq       *lcgRegReq;
-#endif
+S16 cmPkSchMacLcgRegReq(Pst* pst,RgInfLcgRegReq *lcgRegReq)
 {
    Buffer *mBuf = NULLP;
 
@@ -934,19 +704,7 @@ RgInfLcgRegReq       *lcgRegReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacLcgRegReq
-(
-LcgReg         func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacLcgRegReq(func, pst, mBuf)
-LcgReg         func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacLcgRegReq(LcgReg func,Pst *pst,Buffer *mBuf)
 {
    RgInfLcgRegReq       *lcgRegReq;
    
@@ -974,17 +732,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacSpsLcRegReq
-(
-Pst*                 pst,
-RgInfSpsLcInfo       *lcInfo
-)
-#else
-S16 cmPkSchMacSpsLcRegReq(pst, lcInfo)
-Pst*                 pst;
-RgInfSpsLcInfo       *lcInfo;
-#endif
+S16 cmPkSchMacSpsLcRegReq(Pst*  pst,RgInfSpsLcInfo *lcInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -1014,17 +762,7 @@ RgInfSpsLcInfo       *lcInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacUlSpsResetReq
-(
-Pst*                 pst,
-RgInfUlSpsReset      *ulSpsResetInfo
-)
-#else
-S16 cmPkSchMacUlSpsResetReq(pst, ulSpsResetInfo)
-Pst*                 pst;
-RgInfUlSpsReset       *ulSpsResetInfo;
-#endif
+S16 cmPkSchMacUlSpsResetReq(Pst*  pst,RgInfUlSpsReset  *ulSpsResetInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -1055,19 +793,7 @@ RgInfUlSpsReset       *ulSpsResetInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacSpsLcRegReq
-(
-SpsLcReg       func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacSpsLcRegReq(func, pst, mBuf)
-SpsLcReg       func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacSpsLcRegReq(SpsLcReg func,Pst *pst,Buffer *mBuf)
 {
    RgInfSpsLcInfo       *lcInfo;
    
@@ -1096,19 +822,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacUlSpsResetReq
-(
-UlSpsReset       func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacUlSpsResetReq(func, pst, mBuf)
-UlSpsReset       func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacUlSpsResetReq(UlSpsReset func,Pst *pst,Buffer  *mBuf)
 {
    RgInfUlSpsReset       *ulSpsResetInfo;
    
@@ -1137,19 +851,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacSpsLcDeregReq
-(
-Pst*                 pst,
-CmLteCellId          cellId,
-CmLteRnti            crnti
-)
-#else
-S16 cmPkSchMacSpsLcDeregReq(pst, cellId, crnti)
-Pst*                 pst;
-CmLteCellId          cellId;
-CmLteRnti            crnti;
-#endif
+S16 cmPkSchMacSpsLcDeregReq(Pst* pst,CmLteCellId cellId,CmLteRnti  crnti)
 {
    Buffer *mBuf = NULLP;
 
@@ -1177,19 +879,7 @@ CmLteRnti            crnti;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacSpsLcDeregReq
-(
-SpsLcDereg     func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacSpsLcDeregReq(func, pst, mBuf)
-SpsLcDereg     func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacSpsLcDeregReq(SpsLcDereg func,Pst  *pst, Buffer *mBuf)
 {
    CmLteCellId  cellId;
    CmLteRnti    crnti;
@@ -1216,17 +906,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacL2MeasReq
-(
-Pst*                 pst,
-RgInfL2MeasReq      *measInfo
-)
-#else
-S16 cmPkSchMacL2MeasReq(pst, measInfo)
-Pst*                 pst;
-RgInfL2MeasReq      *measInfo;
-#endif
+S16 cmPkSchMacL2MeasReq(Pst* pst,RgInfL2MeasReq  *measInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -1255,17 +935,7 @@ RgInfL2MeasReq      *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacL2MeasStopReq
-(
-Pst*                 pst,
-RgInfL2MeasStopReq *measInfo
-)
-#else
-S16 cmPkSchMacL2MeasStopReq(pst, measInfo)
-Pst*                 pst;
-RgInfL2MeasStopReq *measInfo;
-#endif
+S16 cmPkSchMacL2MeasStopReq(Pst*  pst,RgInfL2MeasStopReq *measInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -1293,17 +963,7 @@ RgInfL2MeasStopReq *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkSchMacL2MeasSendReq
-(
-Pst*                 pst,
-RgInfL2MeasSndReq *measInfo
-)
-#else
-S16 cmPkSchMacL2MeasSendReq(pst, measInfo)
-Pst*                 pst;
-RgInfL2MeasSndReq *measInfo;
-#endif
+S16 cmPkSchMacL2MeasSendReq(Pst* pst,RgInfL2MeasSndReq *measInfo)
 {
    Buffer *mBuf = NULLP;
 
@@ -1334,19 +994,7 @@ RgInfL2MeasSndReq *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacL2MeasReq
-(
-L2MeasReq      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacL2MeasReq(func, pst, mBuf)
-L2MeasReq      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacL2MeasReq(L2MeasReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfL2MeasReq      measInfo;
    
@@ -1373,19 +1021,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacL2MeasStopReq
-(
-L2MeasStopReq func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacL2MeasStopReq(func, pst, mBuf)
-L2MeasStopReq      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacL2MeasStopReq(L2MeasStopReq func,Pst *pst,Buffer *mBuf)
 {
    RgInfL2MeasStopReq measInfo;
 
@@ -1411,19 +1047,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkSchMacL2MeasSendReq
-(
-L2MeasSendReq      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkSchMacL2MeasSendReq(func, pst, mBuf)
-L2MeasSendReq func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkSchMacL2MeasSendReq(L2MeasSendReq  func,Pst *pst,Buffer *mBuf)
 {
    RgInfL2MeasSndReq measInfo;
 
@@ -1449,17 +1073,7 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchL2MeasCfm
-(
-Pst*                 pst,
-RgInfL2MeasCfm       *measCfm
-)
-#else
-S16 cmPkMacSchL2MeasCfm(pst, measCfm)
-Pst*                 pst;
-RgInfL2MeasCfm       *measCfm;
-#endif
+S16 cmPkMacSchL2MeasCfm(Pst*  pst,RgInfL2MeasCfm *measCfm)
 {
    Buffer *mBuf = NULLP;
 
@@ -1490,17 +1104,7 @@ RgInfL2MeasCfm       *measCfm;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmPkMacSchL2MeasStopCfm
-(
-Pst*                 pst,
-RgInfL2MeasCfm       *measCfm
-)
-#else
-S16 cmPkMacSchL2MeasStopCfm(pst, measCfm)
-Pst*                 pst;
-RgInfL2MeasCfm       *measCfm;
-#endif
+S16 cmPkMacSchL2MeasStopCfm(Pst*  pst,RgInfL2MeasCfm  *measCfm)
 {
    Buffer *mBuf = NULLP;
 
@@ -1530,19 +1134,7 @@ RgInfL2MeasCfm       *measCfm;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchL2MeasCfm
-(
-L2MeasCfm      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkMacSchL2MeasCfm(func, pst, mBuf)
-L2MeasCfm      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkMacSchL2MeasCfm(L2MeasCfm func,Pst *pst,Buffer *mBuf)
 {
    RgInfL2MeasCfm      measCfm;
    
@@ -1569,21 +1161,9 @@ Buffer         *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 cmUnpkMacSchL2MeasStopCfm
-(
-L2MeasCfm      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkMacSchL2MeasStopCfm(func, pst, mBuf)
-L2MeasCfm      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkMacSchL2MeasStopCfm(L2MeasCfm func,Pst *pst,Buffer  *mBuf)
 {
-RgInfL2MeasCfm      measCfm;
+   RgInfL2MeasCfm      measCfm;
 
    if(SRemPreMsgMult((Data *)&measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK)
    {
index 289b2af..d5668f1 100755 (executable)
@@ -86,26 +86,18 @@ static RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
  * @param  [in] measTime
  * @return  Void
  */
-#ifdef ANSI
 S16 rgSchFillL2MeasCfm
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
 LrgSchMeasCfmInfo *cfm,
-uint32_t               measTime   
+uint32_t          measTime   
 )
-#else
-S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
-RgSchCellCb       *cell;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasCfmInfo *cfm;
-uint32_t               measTime;
-#endif
 {
-   uint8_t                 idx;
+   uint8_t            idx;
    LrgSchMeasReqInfo  *measInfo;
-   uint8_t                 qciVal = 0;
-   uint32_t                 sampOc = 0;
+   uint8_t            qciVal = 0;
+   uint32_t           sampOc = 0;
 
    measInfo = &measCb->measReq;   
 
@@ -317,7 +309,6 @@ uint32_t               measTime;
  * @param  [in] Bool     isErr
  * @return  Void
  */
-#ifdef ANSI
 S16 rgSchL2mSndCfm
 (
 Pst               *pst,
@@ -325,13 +316,6 @@ RgSchL2MeasCb     *measCb,
 LrgSchMeasReqInfo *measInfo,
 Bool              isErr
 )
-#else
-S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
-Pst               *pst;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasReqInfo *measInfo;
-Bool              isErr;
-#endif
 {
    LrgSchMeasCfmInfo   cfm;
 
@@ -361,19 +345,12 @@ Bool              isErr;
  * @param  [in] LrgSchMeasReqInfo *measInfo
  * @return  Void
  */
-#ifdef ANSI
 Void rgSchL2mFillCfmPst
 (
 Pst    *pst,
 Pst    *cfmPst,
 LrgSchMeasReqInfo *measInfo 
 )
-#else
-Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
-Pst    *pst;
-Pst    *cfmPst;
-LrgSchMeasReqInfo *measInfo;
-#endif
 {
  
    cfmPst->srcEnt    = pst->dstEnt;
@@ -405,23 +382,16 @@ LrgSchMeasReqInfo *measInfo;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSchL2mInsertMeasCb
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
 LrgSchMeasReqInfo *measInfo
 )
-#else
-static S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo)
-RgSchCellCb       *cell;
-RgSchL2MeasCb     *measCb;
-LrgSchMeasReqInfo *measInfo;
-#endif
 {
    CmLList   *lnk, *node;
    RgSchL2MeasCb   *oldMeasCb;
-   uint32_t              diffTime;
+   uint32_t        diffTime;
    
    /* 
     * 1. Check if l2mList has any entries.
@@ -466,20 +436,12 @@ LrgSchMeasReqInfo *measInfo;
  *
  * @param  [in] RgSchCellCb       *cell
  */
-#ifdef ANSI
-static Void rgSchL2CalDlPrbCount
-(
-RgSchCellCb       *cell
-)
-#else
-static Void rgSchL2CalDlPrbCount(cell)
-RgSchCellCb       *cell;
-#endif
+static Void rgSchL2CalDlPrbCount(RgSchCellCb *cell)
 {
    CmLteTimingInfo    frm;
    RgSchDlSf          *sf = NULLP;
 #ifdef LTE_TDD
-   uint8_t                 idx;
+   uint8_t            idx;
 #endif
 
    frm   = cell->crntTime;
@@ -508,20 +470,12 @@ RgSchCellCb       *cell;
  *
  * @param  [in] RgSchCellCb       *cell
  */
-#ifdef ANSI
-static Void rgSchL2CalUlPrbCount
-(
-RgSchCellCb       *cell
-)
-#else
-static Void rgSchL2CalUlPrbCount(cell)
-RgSchCellCb       *cell;
-#endif
+static Void rgSchL2CalUlPrbCount(RgSchCellCb  *cell)
 {
    RgSchUlSf        *sf = NULLP;
    RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 #ifdef LTE_TDD
-   uint8_t                 idx;
+   uint8_t  idx;
 #endif
 
 #ifdef LTE_TDD
@@ -548,19 +502,12 @@ RgSchCellCb       *cell;
  * @param  [out] RgSchErrInfo      *err
  * @return  RgSchL2MeasCb *
  */
-#ifdef ANSI
 static RgSchL2MeasCb * rgSchL2mAllocMeasCb
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
-#else
-static RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err)
-RgSchCellCb       *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo      err;
-#endif
 {
    RgSchL2MeasCb       *measCb = NULLP;
    Inst                inst = cell->instIdx;
@@ -601,23 +548,16 @@ RgSchErrInfo      err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSchL2mMeasReq 
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
-#else
-S16 rgSchL2mMeasReq(cell, measInfo, err)
-RgSchCellCb       *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo      err;
-#endif    
 {
    RgSchL2MeasCb *measCb;
-   uint8_t            idx;
-   uint8_t            qciVal;
+   uint8_t       idx;
+   uint8_t       qciVal;
 
 
    qciVal = 0;
@@ -696,31 +636,25 @@ RgSchErrInfo      err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHL2Meas
 (
 RgSchCellCb  *cell,
 uint8_t isCalrCrcInd
 )
-#else
-S16 rgschL2Meas(cell,isCalrCrcInd)
-RgSchCellCb  *cell;
-uint8_t isCalrCrcInd
-#endif
 {
    CmLList           *node = NULLP;
    RgSchL2MeasCb     *measCb = NULLP;
-   uint8_t                idx;
+   uint8_t           idx;
    LrgSchMeasCfmInfo measCfm;
-   uint8_t                qciVal = 0;
-   uint32_t               sfDiff;
-   uint32_t               meas;
+   uint8_t           qciVal = 0;
+   uint32_t          sfDiff;
+   uint32_t          meas;
 #ifdef LTE_TDD
-   uint8_t                sfIdx;
+   uint8_t           sfIdx;
    Bool              isDlDataAllowed;  
-   uint8_t                rem;
-   uint32_t               numDlSf;
-   uint32_t               numUlSf;
+   uint8_t           rem;
+   uint32_t          numDlSf;
+   uint32_t          numUlSf;
 #endif
 
    node = cell->l2mList.first;
index 8f257b7..9c4e05a 100755 (executable)
@@ -118,21 +118,13 @@ void printSchCellInfo(void)
  *      -# LCM_REASON_NOT_APPL
  **/
 #ifdef UNUSE_FUN
-#ifdef ANSI
 static uint16_t rgSCHLmmSapCfg
 (
 Inst  dInst,
 RgCfg *cfg,            /* Configuaration information */
-uint8_t    sapIdx,          /* SAP index */
+uint8_t sapIdx,          /* SAP index */
 Elmnt sapType             /* SAP Type */
 )
-#else
-static uint16_t rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType)
-Inst  dInst;
-RgCfg *cfg;            /* Configuaration information */
-uint8_t    sapIdx;          /* SAP index */
-Elmnt sapType;            /* SAP Type */
-#endif
 {
    uint16_t                  ret = LCM_REASON_NOT_APPL;
    RgSchLowSapCfgInfo   *lowSapCfg = NULLP;
@@ -275,24 +267,16 @@ Elmnt sapType;            /* SAP Type */
  *     File : rg_sch_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHLmmShutdown
-(
-Inst inst
-)
-#else
-static Void rgSCHLmmShutdown(inst)
-Inst inst;
-#endif
+static Void rgSCHLmmShutdown(Inst inst)
 {
    Inst          dInst = inst + SCH_INST_START;
-   uint8_t            idx;
+   uint8_t       idx;
 #ifdef LTE_L2_MEAS
    CmLList       *lnk = NULLP;
    RgSchCb       *instCb =  &rgSchCb[inst];
    RgSchCellCb   *cell = NULLP;
    RgSchL2MeasCb *measCb;
-   uint8_t            ulAllocIdx;
+   uint8_t       ulAllocIdx;
    RgSchCmnUlCell *cellUl;
    RgSchClcBoRpt  *bo = NULL;
 #endif
@@ -434,19 +418,7 @@ Inst inst;
  *     File : rg_sch_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHLmmGenCntrl 
-(
-RgMngmt       *cntrl,
-RgMngmt       *cfm,
-Pst           *cfmPst
-)
-#else
-Void rgSCHLmmGenCntrl(cntrl, cfm, cfmPst)
-RgMngmt       *cntrl;
-RgMngmt       *cfm;
-Pst           *cfmPst;
-#endif
+Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst  *cfmPst)
 {
    Inst      inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
 
@@ -562,19 +534,12 @@ Pst           *cfmPst;
  *     File : rg_sch_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
 Void rgSCHLmmSapCntrl 
 (
 RgMngmt       *cntrl,
 RgMngmt       *cfm,
 Pst           *cfmPst
 )
-#else
-Void rgSCHLmmSapCntrl(cntrl, cfm, cfmPst)
-RgMngmt       *cntrl;
-RgMngmt       *cfm;
-Pst           *cfmPst;
-#endif
 {
    uint8_t       idx;
 
@@ -754,19 +719,12 @@ Pst           *cfmPst;
  *     File : rg_sch_lmm.c 
  *
  **********************************************************/
-#ifdef ANSI
 Void SchFillCfmPst
 (
 Pst           *reqPst,
 Pst           *cfmPst,
 RgMngmt       *cfm
 )
-#else
-Void SchFillCfmPst(reqPst, cfmPst, cfm)
-Pst           *reqPst;
-Pst           *cfmPst;
-RgMngmt       *cfm;
-#endif
 {
    Inst inst;
 
@@ -805,21 +763,13 @@ RgMngmt       *cfm;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgSCHLmmStartTmr
 (
-Inst               inst,
-S16                tmrEvnt,            /* Timer Event */
-uint32_t                tmrVal,             /* Wait Time */
-PTR                cb                  /* Entry for which Timer Expired */
+Inst       inst,
+S16        tmrEvnt,            /* Timer Event */
+uint32_t   tmrVal,             /* Wait Time */
+PTR        cb                  /* Entry for which Timer Expired */
 )
-#else
-S16 rgSCHLmmStartTmr(inst, tmrEvnt, tmrVal, cb)
-Inst               inst;             /* scheduler instance ID */
-S16                tmrEvnt;            /* Timer Event */
-uint32_t                tmrVal;             /* Wait Time */
-PTR                cb;                 /* Entry for which Timer Expired */
-#endif
 {
    CmTmrArg    arg;
 /*   Inst        dInst = inst + SCH_INST_START; */
@@ -862,22 +812,15 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 rgSCHLmmStopTmr
 (
-Inst               inst,             /* Scheduler instance */
-S16                tmrEvnt,            /* Timer Event */
-PTR                cb                  /* Entry for which Timer Expired */
+Inst inst,             /* Scheduler instance */
+S16  tmrEvnt,            /* Timer Event */
+PTR  cb                  /* Entry for which Timer Expired */
 )
-#else
-S16 rgSCHLmmStopTmr(inst, tmrEvnt, cb)
-Inst               inst;             /* Scheduler instance */
-S16                tmrEvnt;            /* Timer Event */
-PTR                cb;                 /* Entry for which Timer Expired */
-#endif
 {
    CmTmrArg   arg;
-   uint8_t         i;
+   uint8_t    i;
    S16        ret; 
 
    ret = RFAILED;
@@ -926,17 +869,11 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgSCHLmmTmrExpiry
 (
 PTR cb,               /* Pointer to timer control block */
 S16 tmrEvnt           /* Timer Event */
 )
-#else
-S16 rgSCHLmmTmrExpiry(cb,tmrEvnt)
-PTR cb;               /* Pointer to timer control block */
-S16 tmrEvnt;          /* Timer Event */
-#endif
 {
    S16           ret = ROK;
    RgSchLowSapCb *tfuSap = (RgSchLowSapCb *)cb;
@@ -1000,19 +937,12 @@ S16 tmrEvnt;          /* Timer Event */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgSCHLmmBndCfm
 (
 Pst *pst,               /* Post Structure */
 SuId suId,              /* Service user ID */
 uint8_t status               /* Status */
 )
-#else
-S16 rgSCHLmmBndCfm(pst,suId,status)
-Pst *pst;               /* Post Structure */
-SuId suId;              /* Service user Id */
-uint8_t status;              /* Status */
-#endif
 {
    S16       ret = ROK;
    RgMngmt   cntrlCfm;
@@ -1097,7 +1027,6 @@ uint8_t status;              /* Status */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgSCHLmmStaInd
 (
 Inst inst,
@@ -1106,14 +1035,6 @@ uint16_t  event,
 uint16_t  cause,
 RgUstaDgn *dgn
 )
-#else
-S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) 
-Inst inst;
-uint16_t category;
-uint16_t event;
-uint16_t cause;
-RgUstaDgn *dgn;
-#endif
 {
    RgMngmt    usta;
 
@@ -1164,17 +1085,7 @@ RgUstaDgn *dgn;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 schActvTmr
-(
-Ent ent,
-Inst inst
-)
-#else
-S16 schActvTmr(ent, inst)
-Ent ent;
-Inst inst;
-#endif
+S16 schActvTmr(Ent ent,Inst inst)
 {
    Inst schInst = (inst  - SCH_INST_START);
 
index 8b36335..b986cf7 100755 (executable)
@@ -124,19 +124,7 @@ uint8_t                *noSubfrms));
  *      -# ROK
  **/
 
-#ifdef ANSI
-S16 rgSCHMeasGapANRepUeCfg
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-RgrUeCfg    *ueCfg
-)
-#else
-S16 rgSCHMeasGapANRepUeCfg(cell, ue, ueCfg)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgrUeCfg    *ueCfg;
-#endif
+S16 rgSCHMeasGapANRepUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg)
 {
 
    ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled;
@@ -197,19 +185,7 @@ RgrUeCfg    *ueCfg;
  *      -# RFAILED
  **/
 
-#ifdef ANSI
-S16 rgSCHMeasGapANRepUeRecfg
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-RgrUeRecfg     *ueRecfg
-)
-#else
-S16 rgSCHMeasGapANRepUeRecfg(cell, ue, ueRecfg)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgrUeRecfg     *ueRecfg;
-#endif
+S16 rgSCHMeasGapANRepUeRecfg(RgSchCellCb  *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg)
 {
    RgrUeMeasGapCfg         *reCfg;
    RgSchUeMeasGapCb        *ueMeasCb;
@@ -301,19 +277,7 @@ RgrUeRecfg     *ueRecfg;
   * @param 
   * @return 
   */
-#ifdef ANSI
-static S16 rgSCHMeasGapANRepUtlAddUe 
-(
-RgSchCellCb       *cell,
-RgSchUeCb          *ue,
-RgrUeMeasGapCfg    *cfg
-)
-#else
-static S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg)
-RgSchCellCb         *cell;
-RgSchUeCb            *ue;
-RgrUeMeasGapCfg      *cfg;
-#endif
+static S16 rgSCHMeasGapANRepUtlAddUe(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeMeasGapCfg *cfg)
 {
 
    switch (cfg->gapPrd)
@@ -353,17 +317,7 @@ RgrUeMeasGapCfg      *cfg;
   * @param 
   * @return 
   */
-#ifdef ANSI
-static S16 rgSCHMeasGapANRepUtlRmvUe 
-(
-RgSchCellCb       *cell,
-RgSchUeCb          *ue
-)
-#else
-static S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue)
-RgSchCellCb       *cell;
-RgSchUeCb          *ue;
-#endif
+static S16 rgSCHMeasGapANRepUtlRmvUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
    switch (ue->measGapCb.gapPrd)
@@ -413,19 +367,7 @@ RgSchUeCb          *ue;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHMeasGapANRepUeDel
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-Bool        isUeDel
-)
-#else
-Void rgSCHMeasGapANRepUeDel(cell, ue, isUeDel)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-Bool        isUeDel;
-#endif
+Void rgSCHMeasGapANRepUeDel(RgSchCellCb *cell,RgSchUeCb *ue,Bool isUeDel)
 {
 
    if (ue->measGapCb.isMesGapEnabled)
@@ -491,26 +433,16 @@ Bool        isUeDel;
   * @param 
   * @return 
   */
-#ifdef ANSI
-static S16 rgSchAckNackRepUtlRmvUe
-(
- RgSchCellCb      *cell,
- RgSchUeCb        *ue
- )
-#else
-static S16 rgSchAckNackRepUtlRmvUe (cell, ue)
- RgSchCellCb      *cell;
- RgSchUeCb        *ue;
-#endif
+static S16 rgSchAckNackRepUtlRmvUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
 
-   uint8_t                hqIdx;
-   uint8_t                repIdx;
+   uint8_t           hqIdx;
+   uint8_t           repIdx;
    RgSchDlHqProcCb   *hqP;
-   uint8_t                tbCnt;
+   uint8_t           tbCnt;
 
-   RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
+   RgSchDlHqEnt      *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
    for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++)
    {
@@ -602,17 +534,9 @@ static S16 rgSchAckNackRepUtlRmvUe (cell, ue)
  *      -# ROK
  **/
 
-#ifdef ANSI
-S16 rgSCHMeasGapANRepTtiHndl
-(
-RgSchCellCb *cell
-)
-#else
-S16 rgSCHMeasGapANRepTtiHndl(cell)
-RgSchCellCb *cell;
-#endif
+S16 rgSCHMeasGapANRepTtiHndl(RgSchCellCb *cell)
 {
-   uint8_t               offset;
+   uint8_t          offset;
    CmLListCp        *queue;
    RgSchDlSf        *dlSf;
    CmLteTimingInfo   repTime;
@@ -682,17 +606,7 @@ RgSchCellCb *cell;
   * @param  CmLListCp   *ackNakRepQ
   * @return Void
   */
-#ifdef ANSI
-static Void rgSchAckNackRepUtlHdlTti
-(
-RgSchCellCb *cell,
-CmLListCp   *ackNackRepQ
-)
-#else
-static Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ)
-RgSchCellCb *cell;
-CmLListCp   *ackNackRepQ;
-#endif
+static Void rgSchAckNackRepUtlHdlTti(RgSchCellCb *cell,CmLListCp   *ackNackRepQ)
 {
    CmLList           *node;
    RgSchUeCb         *ue;
@@ -727,17 +641,7 @@ CmLListCp   *ackNackRepQ;
   * @param 
   * @return 
   */
-#ifdef ANSI
-static Void rgSCHMeasGapANRepUtlHdlTti
-(
-RgSchCellCb *cell,
-CmLListCp   *measGapQ
-)
-#else
-static Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ)
-RgSchCellCb *cell;
-CmLListCp   *measGapQ;
-#endif
+static Void rgSCHMeasGapANRepUtlHdlTti(RgSchCellCb *cell,CmLListCp   *measGapQ)
 {
    CmLList           *node;
    RgSchUeCb         *ue;
@@ -800,33 +704,23 @@ CmLListCp   *measGapQ;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHMeasGapANRepGetDlInactvUe
-(
-RgSchCellCb *cell,
-CmLListCp   *dlInactvUeLst
-)
-#else
-S16 rgSCHMeasGapANRepGetDlInactvUe(cell, dlInactvUeLst)
-RgSchCellCb *cell;
-CmLListCp   *dlInactvUeLst;
-#endif
+S16 rgSCHMeasGapANRepGetDlInactvUe(RgSchCellCb *cell,CmLListCp   *dlInactvUeLst)
 {
-   uint8_t                offset;
+   uint8_t           offset;
    CmLList           *node;
    CmLList           *hqNode;
    CmLListCp         *queue;
    RgSchUeCb         *ue;
    RgSchDlSf         *dlSf;
    CmLteTimingInfo   ackNakTime;
-   uint16_t               schedTime;
-   uint8_t                harqFdbkOffset;
+   uint16_t          schedTime;
+   uint8_t           harqFdbkOffset;
 #ifdef LTE_TDD
-   uint8_t                repCntr;
+   uint8_t           repCntr;
 #endif
    RgSchDlHqProcCb   *hqP;
    RgSchDlHqTbCb     *tbCb;
-   uint32_t               i;
+   uint32_t          i;
 
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA; 
 
@@ -1005,35 +899,25 @@ CmLListCp   *dlInactvUeLst;
  *      -# ROK
  **/
 
-#ifdef ANSI
-S16 rgSCHMeasGapANRepGetUlInactvUe
-(
-RgSchCellCb *cell,
-CmLListCp   *ulInactvUeLst
-)
-#else
-S16 rgSCHMeasGapANRepGetUlInactvUe(cell, ulInactvUeLst)
-RgSchCellCb *cell;
-CmLListCp   *ulInactvUeLst;
-#endif
+S16 rgSCHMeasGapANRepGetUlInactvUe(RgSchCellCb *cell,CmLListCp   *ulInactvUeLst)
 {
 
-   uint8_t                offset;
-   CmLList           *node;
-   CmLList           *hqNode;
-   CmLListCp         *queue;
-   RgSchUeCb         *ue;
-   CmLteTimingInfo   ackNakTime;
-   RgSchDlSf         *dlSf;
-   uint16_t               schedTime;
-   uint8_t                pdcchToPuschGap;
-   uint8_t                idx=0;
+   uint8_t         offset;
+   CmLList         *node;
+   CmLList         *hqNode;
+   CmLListCp       *queue;
+   RgSchUeCb       *ue;
+   CmLteTimingInfo ackNakTime;
+   RgSchDlSf       *dlSf;
+   uint16_t        schedTime;
+   uint8_t         pdcchToPuschGap;
+   uint8_t         idx=0;
 #ifdef LTE_TDD
-   uint8_t                repCntr;
+   uint8_t         repCntr;
 #endif
    RgSchDlHqProcCb   *hqP;
    RgSchDlHqTbCb     *tbCb;
-   uint32_t               i;
+   uint32_t          i;
 
    /*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
@@ -1182,17 +1066,7 @@ CmLListCp   *ulInactvUeLst;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHMeasGapANRepDlInactvTmrExpry
-(
-RgSchUeCb *ue,
-uint8_t         tmrEvnt
-)
-#else
-Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
-RgSchUeCb *ue;
-uint8_t         tmrEvnt;
-#endif
+Void rgSCHMeasGapANRepDlInactvTmrExpry(RgSchUeCb *ue,uint8_t tmrEvnt)
 {
 
    RgSchCellCb    *cell = ue->cell;
@@ -1241,17 +1115,7 @@ uint8_t         tmrEvnt;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHMeasGapANRepUlInactvTmrExpry
-(
-RgSchUeCb *ue,
-uint8_t         tmrEvnt
-)
-#else
-Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
-RgSchUeCb *ue;
-uint8_t         tmrEvnt;
-#endif
+Void rgSCHMeasGapANRepUlInactvTmrExpry(RgSchUeCb *ue,uint8_t tmrEvnt)
 {
    RgSchCellCb       *cell = ue->cell;
 
@@ -1294,15 +1158,7 @@ uint8_t         tmrEvnt;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHMeasGapANRepTmrExpry
-(
-RgSchUeCb *ue
-)
-#else
-Void rgSCHMeasGapANRepTmrExpry(ue)
-RgSchUeCb *ue;
-#endif
+Void rgSCHMeasGapANRepTmrExpry(RgSchUeCb *ue)
 {
 
    ue->measGapCb.isMeasuring = FALSE;
@@ -1333,15 +1189,7 @@ RgSchUeCb *ue;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHAckNakRepTmrExpry
-(
-RgSchUeCb *ue
-)
-#else
-Void rgSCHAckNakRepTmrExpry(ue)
-RgSchUeCb *ue;
-#endif
+Void rgSCHAckNakRepTmrExpry(RgSchUeCb *ue)
 {
 
    ue->ackNakRepCb.isAckNakRep = FALSE;
@@ -1382,17 +1230,7 @@ RgSchUeCb *ue;
  *      -# ROK
  **/
 
-#ifdef ANSI
-Void rgSCHAckNakRepAddToQ
-(
-RgSchCellCb       *cell,
-RgSchDlSf         *crntDlSf
-)
-#else
-Void rgSCHAckNakRepAddToQ(cell, crntDlSf)
-RgSchCellCb          *cell;
-RgSchDlSf            *crntDlSf;
-#endif
+Void rgSCHAckNakRepAddToQ(RgSchCellCb       *cell,RgSchDlSf         *crntDlSf)
 {
    RgSchUeCb         *ue;
    CmLList           *node;
@@ -1449,28 +1287,14 @@ RgSchDlSf            *crntDlSf;
  *      
  **/
 
-#ifdef ANSI
-static uint8_t rgSCHAckNakRepFindUlDuration
-(
-RgSchCellCb       *cell,
-RgSchDlSf         *dlSf,
-CmLteTimingInfo   repTime,
-uint8_t                repCnt
-)
-#else
-static uint8_t rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt)
-RgSchCellCb       *cell;
-RgSchDlSf         *dlSf;
-CmLteTimingInfo   repTime;
-uint8_t                repCnt;
-#endif
+static uint8_t rgSCHAckNakRepFindUlDuration(RgSchCellCb *cell,RgSchDlSf *dlSf,CmLteTimingInfo repTime,uint8_t repCnt)
 {
    CmLteTimingInfo   ulfrm;
    uint8_t    noSubfrms = 0;
    uint16_t   ulDlCfgIdx = cell->ulDlCfgIdx;
-   S16               rem = 0;
+   S16   rem = 0;
    S16   idx;
-   S8                diff;
+   S8    diff;
 
    rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms);
    RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms);
@@ -1510,20 +1334,8 @@ uint8_t                repCnt;
  *      
  **/
 
-#ifdef ANSI
-static Void rgSCHAckNakRepGetUlOffsetFrmDl 
-(
-RgSchDlSf         *dlSf,
-CmLteTimingInfo   crntDlTime,
-uint8_t                *noSubfrms 
-)
-#else
-static Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms)
-RgSchDlSf         *dlSf;
-CmLteTimingInfo   crntDlTime;
-uint8_t                *noSubfrms;
-#endif
-         {
+static Void rgSCHAckNakRepGetUlOffsetFrmDl(RgSchDlSf *dlSf,CmLteTimingInfo crntDlTime,uint8_t *noSubfrms )
+{
 
    if(dlSf->dlFdbkInfo.sfnOffset != 0)
             {
index 007cd95..967ae3f 100755 (executable)
@@ -250,17 +250,7 @@ static const L2MeasStopCfm RgMacSchL2MeasStopCfmMt[RG_MAX_SCH] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacCellReg
-(
-Pst* pst,
-RgInfCellReg*   regReq
-)
-#else
-S16 RgSchMacCellReg(pst, regReq)
-Pst* pst;
-RgInfCellReg*   regReq;
-#endif
+S16 RgSchMacCellReg(Pst* pst,RgInfCellReg* regReq)
 {
 
    return ((*RgSchMacCellRegReqMt[0])(pst, regReq));
@@ -280,17 +270,7 @@ RgInfCellReg*   regReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchDedBoUpdt
-(
-Pst* pst,
-RgInfDedBoRpt*  boRpt
-)
-#else
-S16 RgMacSchDedBoUpdt(pst, boRpt)
-Pst* pst;
-RgInfDedBoRpt*  boRpt;
-#endif
+S16 RgMacSchDedBoUpdt(Pst* pst,RgInfDedBoRpt*  boRpt)
 {
 
    return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt));
@@ -310,17 +290,7 @@ RgInfDedBoRpt*  boRpt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchCmnBoUpdt
-(
-Pst* pst,
-RgInfCmnBoRpt*  boRpt
-)
-#else
-S16 RgMacSchCmnBoUpdt(pst, boRpt)
-Pst* pst;
-RgInfCmnBoRpt*  boRpt;
-#endif
+S16 RgMacSchCmnBoUpdt(Pst* pst ,RgInfCmnBoRpt*  boRpt)
 {
 
    return ((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt));
@@ -340,17 +310,7 @@ RgInfCmnBoRpt*  boRpt;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchUeDel
-(
-Pst* pst,
-RgInfUeDelInd*  ueDelInd
-)
-#else
-S16 RgMacSchUeDel(pst, datInd)
-Pst* pst;
-RgInfUeDelInd*  ueDelInd;
-#endif
+S16 RgMacSchUeDel(Pst* pst,RgInfUeDelInd*  ueDelInd)
 {
 
    return ((*RgMacSchUeDelIndMt[0])(pst, ueDelInd));
@@ -370,17 +330,7 @@ RgInfUeDelInd*  ueDelInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchSfRecp
-(
-Pst* pst,
-RgInfSfDatInd*  datInd
-)
-#else
-S16 RgMacSchSfRecp(pst, datInd)
-Pst* pst;
-RgInfSfDatInd*  datInd;
-#endif
+S16 RgMacSchSfRecp(Pst* pst,RgInfSfDatInd*  datInd)
 {
 
    return ((*RgMacSchSfRecpIndMt[0])(pst, datInd));
@@ -400,17 +350,7 @@ RgInfSfDatInd*  datInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacSfAlloc
-(
-Pst* pst,
-RgInfSfAlloc*   resAllocReq
-)
-#else
-S16 RgSchMacSfAlloc(pst, resAllocReq)
-Pst* pst;
-RgInfSfAlloc*   resAllocReq;
-#endif
+S16 RgSchMacSfAlloc(Pst* pst,RgInfSfAlloc* resAllocReq)
 {
 
    return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq));
@@ -428,17 +368,7 @@ RgInfSfAlloc*   resAllocReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacRstHqEnt
-(
-Pst*                 pst,    
-RgInfResetHqEnt*     hqEntInfo
-)
-#else
-S16 RgSchMacRstHqEnt(pst, hqEntInfo)
-Pst*                 pst;
-RgInfResetHqEnt*     hqEntInfo;
-#endif
+S16 RgSchMacRstHqEnt(Pst* pst,RgInfResetHqEnt*  hqEntInfo)
 {
 
    return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo));
@@ -458,17 +388,7 @@ RgInfResetHqEnt*     hqEntInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacRlsHq
-(
-Pst* pst,
-RgInfRlsHqInfo* sfHqInfo
-)
-#else
-S16 RgSchMacRlsHq(pst, sfHqInfo)
-Pst* pst;
-RgInfRlsHqInfo* sfHqInfo;
-#endif
+S16 RgSchMacRlsHq(Pst* pst,RgInfRlsHqInfo* sfHqInfo)
 {
 
    return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo));
@@ -488,17 +408,7 @@ RgInfRlsHqInfo* sfHqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacRlsRnti
-(
-Pst* pst,
-RgInfRlsRnti*   rlsRnti
-)
-#else
-S16 RgSchMacRlsRnti(pst, rlsRnti)
-Pst* pst;
-RgInfRlsRnti*   rlsRnti;
-#endif
+S16 RgSchMacRlsRnti(Pst* pst,RgInfRlsRnti*   rlsRnti)
 {
 
    return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti));
@@ -516,17 +426,7 @@ RgInfRlsRnti*   rlsRnti;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacLcgReg
-(
-Pst*                pst,
-RgInfLcgRegReq      *lcgRegReq
-)
-#else
-S16 RgSchMacLcgReg(pst, lcgRegReq)
-Pst*                pst;
-RgInfLcgRegReq       *lcgRegReq;
-#endif
+S16 RgSchMacLcgReg(Pst*  pst,RgInfLcgRegReq *lcgRegReq)
 {
 
    return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq));
@@ -546,17 +446,7 @@ RgInfLcgRegReq       *lcgRegReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchSpsRel
-(
-Pst*                pst,
-RgInfSpsRelInfo*    relInfo
-)
-#else
-S16 RgMacSchSpsRel(pst, relInfo)
-Pst*                pst;
-RgInfSpsRelInfo*    relInfo;
-#endif
+S16 RgMacSchSpsRel(Pst* pst,RgInfSpsRelInfo* relInfo)
 {
 
    return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo));
@@ -574,17 +464,7 @@ RgInfSpsRelInfo*    relInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacSpsLcReg
-(
-Pst*                pst,
-RgInfSpsLcInfo      *lcInfo
-)
-#else
-S16 RgSchMacSpsLcReg(pst, lcInfo)
-Pst*                pst;
-RgInfSpsLcInfo      *lcInfo;
-#endif
+S16 RgSchMacSpsLcReg(Pst* pst,RgInfSpsLcInfo *lcInfo)
 {
 
    return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo));
@@ -604,17 +484,7 @@ RgInfSpsLcInfo      *lcInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacUlSpsReset
-(
-Pst*                pst,
-RgInfUlSpsReset      *ulSpsResetInfo
-)
-#else
-S16 RgSchMacUlSpsReset(pst, ulSpsResetInfo)
-Pst*                pst;
-RgInfUlSpsReset      *ulSpsResetInfo;
-#endif
+S16 RgSchMacUlSpsReset(Pst*  pst,RgInfUlSpsReset *ulSpsResetInfo)
 {
 
    return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo));
@@ -634,19 +504,7 @@ RgInfUlSpsReset      *ulSpsResetInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacSpsLcDereg
-(
-Pst*                pst,
-CmLteCellId         cellId,
-CmLteRnti           crnti
-)
-#else
-S16 RgSchMacSpsLcDereg(pst, cellId, crnti)
-Pst*                pst;
-CmLteCellId         cellId;
-CmLteRnti           crnti;
-#endif
+S16 RgSchMacSpsLcDereg(Pst* pst,CmLteCellId  cellId,CmLteRnti crnti)
 {
 
    return ((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti));
@@ -666,17 +524,7 @@ CmLteRnti           crnti;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacL2Meas
-(
-Pst*                pst,
-RgInfL2MeasReq      *measInfo
-)
-#else
-S16 RgSchMacL2Meas(pst, measInfo)
-Pst*                pst;
-RgInfL2MeasReq      *measInfo;
-#endif
+S16 RgSchMacL2Meas(Pst* pst,RgInfL2MeasReq  *measInfo)
 {
 
    return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo));
@@ -694,17 +542,7 @@ RgInfL2MeasReq      *measInfo;
 *  @return   S16
 *      -# ROK
 **/   
-#ifdef ANSI
-S16 RgSchMacL2MeasStop
-(       
-Pst*                pst,
-RgInfL2MeasStopReq *measInfo
-)     
-#else 
-S16 RgSchMacL2MeasStop(pst, measInfo)
-Pst*                pst;
-RgInfL2MeasStopReq *measInfo;
-#endif
+S16 RgSchMacL2MeasStop(Pst* pst,RgInfL2MeasStopReq *measInfo)     
 {  
      
    return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo));
@@ -722,17 +560,7 @@ RgInfL2MeasStopReq *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgSchMacL2MeasSend
-(
-Pst*                pst,
-RgInfL2MeasSndReq *measInfo
-)
-#else
-S16 RgSchMacL2MeasSend(pst, measInfo)
-Pst*                pst;
-RgInfL2MeasSndReq *measInfo;
-#endif
+S16 RgSchMacL2MeasSend(Pst* pst,RgInfL2MeasSndReq *measInfo)
 {
 
    return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo));
@@ -750,17 +578,7 @@ RgInfL2MeasSndReq *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchL2Meas
-(
-Pst*                pst,
-RgInfL2MeasCfm      *measInfo
-)
-#else
-S16 RgMacSchL2Meas(pst, measInfo)
-Pst*                pst;
-RgInfL2MeasCfm      *measInfo;
-#endif
+S16 RgMacSchL2Meas(Pst*  pst,RgInfL2MeasCfm *measInfo)
 {
 
    return ((*RgMacSchL2MeasCfmMt[0])(pst, measInfo));
@@ -777,17 +595,7 @@ RgInfL2MeasCfm      *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-S16 RgMacSchL2MeasStop
-(
-Pst*                pst,   
-RgInfL2MeasCfm      *measInfo
-)
-#else
-S16 RgMacSchL2MeasStop(pst, measInfo)
-Pst*                pst;
-RgInfL2MeasCfm      *measInfo;
-#endif
+S16 RgMacSchL2MeasStop(Pst*  pst,RgInfL2MeasCfm  *measInfo)
 {
     
    return ((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo));
index ba9e13a..23bcc2b 100755 (executable)
@@ -368,14 +368,7 @@ static S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
  *
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrInit
-(
-Void
-)
-#else
 Void rgSCHPwrInit()
-#endif
 {
    uint8_t             idx;
 
@@ -401,15 +394,7 @@ Void rgSCHPwrInit()
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrGetCqiPwr
-(
-uint8_t                  cqi
-)
-#else
-static S8 rgSCHPwrGetCqiPwr(cqi)
-uint8_t                  cqi;
-#endif
+static S8 rgSCHPwrGetCqiPwr(uint8_t  cqi)
 {
 
    return (rgSchPwrCqiToPwrTbl[cqi]);
@@ -429,19 +414,7 @@ uint8_t                  cqi;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrGetCqiPwrForUe
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint8_t                  cqi
-)
-#else
-static S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint8_t                  cqi;
-#endif
+static S8 rgSCHPwrGetCqiPwrForUe(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t  cqi)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -466,15 +439,7 @@ uint8_t                  cqi;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrCalcEfficncyPwr
-(
-uint32_t                 eff
-)
-#else
-static S8 rgSCHPwrCalcEfficncyPwr(eff)
-uint32_t                 eff;
-#endif
+static S8 rgSCHPwrCalcEfficncyPwr(uint32_t  eff)
 {
    F64          ks = 1.25; /* or F64 */
    F64          tmp = cmPow(2, ks*eff/1024) - 1;
@@ -507,17 +472,7 @@ uint32_t                 eff;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  uint8_t
  **/
-#ifdef ANSI
-uint8_t rgSCHPwrPuschTpcForUe
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-uint8_t rgSCHPwrPuschTpcForUe(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+uint8_t rgSCHPwrPuschTpcForUe(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue,cell);
 
@@ -549,17 +504,7 @@ RgSchUeCb   *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-uint8_t rgSCHPwrGetMaxUlRb
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-uint8_t rgSCHPwrGetMaxUlRb(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+uint8_t rgSCHPwrGetMaxUlRb(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -599,32 +544,22 @@ RgSchUeCb   *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHPwrPuschCntrl
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-static Void rgSCHPwrPuschCntrl(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+static Void rgSCHPwrPuschCntrl(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    RgSchCmnUlUe       *ueUl    = RG_SCH_CMN_GET_UL_UE(ue, cell);
    RgSchCmnUeUlPwrCb  *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
-   RgSchCmnUlCell *cellUl      = RG_SCH_CMN_GET_UL_CELL(cell);
+   RgSchCmnUlCell     *cellUl  = RG_SCH_CMN_GET_UL_CELL(cell);
    S8                  delta;
 #ifdef TFU_UPGRADE
-   uint8_t                  cqi     = ueUl->validUlCqi;
-   S32                 tmp;
+   uint8_t            cqi     = ueUl->validUlCqi;
+   S32                tmp;
 #else
-   uint8_t                  cqi     = ueUl->crntUlCqi[0];
+   uint8_t            cqi     = ueUl->crntUlCqi[0];
 #endif
-   Bool                isAcc   = uePwr->isAccumulated;
-   uint8_t                  tpc;
-   S8                  availPwr;
-   uint8_t                  maxRb;
+   Bool               isAcc   = uePwr->isAccumulated;
+   uint8_t            tpc;
+   S8                 availPwr;
+   uint8_t            maxRb;
 
    UNUSED(cell);
 
@@ -697,17 +632,7 @@ RgSchUeCb   *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  uint8_t
  **/
-#ifdef ANSI
-uint8_t rgSCHPwrPucchTpcForUe
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-uint8_t rgSCHPwrPucchTpcForUe(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+uint8_t rgSCHPwrPucchTpcForUe(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -730,22 +655,7 @@ RgSchUeCb   *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrGetDelta2FrmCqi
-(
-uint8_t                  crntCqi,
-uint8_t                  trgCqi,
-RgSchUeCb                *ue,
-RgSchCellCb              *cell
-
-)
-#else
-static S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi)
-uint8_t                  crntCqi;
-uint8_t                  trgCqi;
-RgSchUeCb                *ue;
-RgSchCellCb              *cell;
-#endif
+static S8 rgSCHPwrGetDelta2FrmCqi(uint8_t crntCqi,uint8_t trgCqi,RgSchUeCb *ue,RgSchCellCb *cell)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
  
@@ -783,23 +693,7 @@ RgSchCellCb              *cell;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetPuschTpc
-(
-uint8_t                  isAcc,
-S8                  delta,
-S8                  availPwr,
-uint8_t                 *tpc,
-S8                 *tpcDelta
-)
-#else
-static Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta)
-uint8_t                  isAcc;
-S8                  delta;
-S8                  availPwr;
-uint8_t                 *tpc;
-S8                 *tpcDelta;
-#endif
+static Void rgSCHPwrGetPuschTpc(uint8_t isAcc,S8 delta,S8 availPwr,uint8_t *tpc,S8  *tpcDelta)
 {
 
    delta = RGSCH_MIN(delta, availPwr);
@@ -832,17 +726,7 @@ S8                 *tpcDelta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static uint8_t rgSCHPwrGetMaxRb
-(
-RgSchCellCb        *cell,
-S8                  pwr
-)
-#else
-static uint8_t rgSCHPwrGetMaxRb(cell, pwr)
-RgSchCellCb        *cell;
-S8                  pwr;
-#endif
+static uint8_t rgSCHPwrGetMaxRb(RgSchCellCb *cell,S8 pwr)
 {
    RgSchCmnUlCell  *cellUl;
 
@@ -874,17 +758,7 @@ S8                  pwr;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static uint8_t rgSCHPwrRbToPwr
-(
-RgSchCellCb          *cell,
-uint8_t                  numRb
-)
-#else
-static uint8_t rgSCHPwrRbToPwr(cell,numRb)
-RgSchCellCb          *cell;
-uint8_t                  numRb;
-#endif
+static uint8_t rgSCHPwrRbToPwr(RgSchCellCb *cell,uint8_t numRb)
 {
 #ifndef NO_ERRCLS
    RgSchCmnUlCell  *cellUl;
@@ -915,17 +789,7 @@ uint8_t                  numRb;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHPwrPucchCntrl
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-static Void rgSCHPwrPucchCntrl(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+static Void rgSCHPwrPucchCntrl(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    S8                     delta;
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -983,17 +847,7 @@ RgSchUeCb   *ue;
  *  @param[in]  RgSchDlSf    *dlSf
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrGrpCntrlPucch
-(
-RgSchCellCb *cell,
-RgSchDlSf   *dlSf
-)
-#else
-Void rgSCHPwrGrpCntrlPucch(cell, dlSf)
-RgSchCellCb *cell;
-RgSchDlSf   *dlSf;
-#endif
+Void rgSCHPwrGrpCntrlPucch(RgSchCellCb *cell,RgSchDlSf   *dlSf)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
    CmLListCp             *lst;
@@ -1065,19 +919,7 @@ RgSchDlSf   *dlSf;
  *  @param[in]  RgSchDlSf    *sf
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrGrpCntrlPusch
-(
-RgSchCellCb *cell,
-RgSchDlSf   *dlSf,
-RgSchUlSf   *ulSf
-)
-#else
-Void rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf)
-RgSchCellCb *cell;
-RgSchDlSf   *dlSf;
-RgSchUlSf   *ulSf;
-#endif
+Void rgSCHPwrGrpCntrlPusch(RgSchCellCb *cell,RgSchDlSf   *dlSf,RgSchUlSf   *ulSf)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
    CmLListCp             *lst;
@@ -1116,30 +958,14 @@ RgSchUlSf   *ulSf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrSchedPucchRnti
-(
-RgSchCellCb          *cell,
-RgSchCmnTpcRntiCb    *cb,
-RgSchPdcch           *pdcch,
-RgSchDlSf            *dlSf,
-Bool                 *sched
-)
-#else
-static Void rgSCHPwrSchedPucchRnti(cell, cb, pdcch, dlSf, sched)
-RgSchCellCb          *cell;
-RgSchCmnTpcRntiCb    *cb;
-RgSchPdcch           *pdcch;
-RgSchDlSf            *dlSf;
-Bool                 *sched;
-#endif
+static Void rgSCHPwrSchedPucchRnti(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchPdcch *pdcch,RgSchDlSf *dlSf,Bool *sched)
 {
    CmLListCp         *lst;
    CmLList           *lnk;
-   uint8_t                *tpcCmds;
-   uint8_t                 tpc;
-   S8                 delta;
-   Bool               atleastOne;
+   uint8_t           *tpcCmds;
+   uint8_t           tpc;
+   S8                delta;
+   Bool              atleastOne;
 
    pdcch->rnti = cb->tpcRnti;
 
@@ -1246,30 +1072,14 @@ Bool                 *sched;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrSchedPuschRnti
-(
-RgSchCellCb          *cell,
-RgSchCmnTpcRntiCb    *cb,
-RgSchPdcch           *pdcch,
-RgSchUlSf            *ulSf,
-Bool                 *sched
-)
-#else
-static Void rgSCHPwrSchedPuschRnti(cell, cb, pdcch, ulSf, sched)
-RgSchCellCb          *cell;
-RgSchCmnTpcRntiCb    *cb;
-RgSchPdcch           *pdcch;
-RgSchUlSf            *ulSf;
-Bool                 *sched;
-#endif
+static Void rgSCHPwrSchedPuschRnti(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchPdcch *pdcch,RgSchUlSf *ulSf,Bool  *sched)
 {
    CmLListCp         *lst;
    CmLList           *lnk;
-   uint8_t                *tpcCmds;
-   uint8_t                 tpc;
-   S8                 delta;
-   Bool               atleastOne;
+   uint8_t           *tpcCmds;
+   uint8_t           tpc;
+   S8                delta;
+   Bool              atleastOne;
 
    pdcch->rnti = cb->tpcRnti;
 
@@ -1375,19 +1185,7 @@ Bool                 *sched;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetPucchFmt3TpcForUe
-(
-RgSchUeCb            *ue,
-uint8_t                   *tpc,
-S8                   *delta
-)
-#else
-static Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta)
-RgSchUeCb            *ue;
-uint8_t                   *tpc;
-S8                   *delta;
-#endif
+static Void rgSCHPwrGetPucchFmt3TpcForUe(RgSchUeCb *ue,uint8_t  *tpc,S8 *delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -1408,19 +1206,7 @@ S8                   *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetPucchFmt3aTpcForUe
-(
-RgSchUeCb            *ue,
-uint8_t                   *tpc,
-S8                   *delta
-)
-#else
-static Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta)
-RgSchUeCb            *ue;
-uint8_t                   *tpc;
-S8                   *delta;
-#endif
+static Void rgSCHPwrGetPucchFmt3aTpcForUe(RgSchUeCb *ue,uint8_t *tpc,S8 *delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -1441,19 +1227,7 @@ S8                   *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetPuschFmt3TpcForUe
-(
-RgSchUeCb            *ue,
-uint8_t                   *tpc,
-S8                   *delta
-)
-#else
-static Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta)
-RgSchUeCb            *ue;
-uint8_t                   *tpc;
-S8                   *delta;
-#endif
+static Void rgSCHPwrGetPuschFmt3TpcForUe(RgSchUeCb *ue,uint8_t *tpc,S8 *delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
    S8                     adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal);
@@ -1475,19 +1249,7 @@ S8                   *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetPuschFmt3aTpcForUe
-(
-RgSchUeCb            *ue,
-uint8_t                   *tpc,
-S8                   *delta
-)
-#else
-static Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta)
-RgSchUeCb            *ue;
-uint8_t                   *tpc;
-S8                   *delta;
-#endif
+static Void rgSCHPwrGetPuschFmt3aTpcForUe(RgSchUeCb *ue,uint8_t *tpc,S8 *delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -1510,19 +1272,7 @@ S8                   *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetAcc1bitTpc
-(
-S8                    remPwr,
-uint8_t                   *tpc,
-S8                   *delta
-)
-#else
-static Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta)
-S8                    remPwr;
-uint8_t                   *tpc;
-S8                   *delta;
-#endif
+static Void rgSCHPwrGetAcc1bitTpc(S8 remPwr,uint8_t *tpc,S8 *delta)
 {
    /*
     * TPC   delta
@@ -1555,19 +1305,7 @@ S8                   *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetAcc2bitTpc
-(
-S8                   remPwr,
-uint8_t                  *tpc,
-S8                  *delta
-)
-#else
-static Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta)
-S8                   remPwr;
-uint8_t                  *tpc;
-S8                  *delta;
-#endif
+static Void rgSCHPwrGetAcc2bitTpc(S8 remPwr,uint8_t *tpc,S8 *delta)
 {
    /*
     * TPC   delta
@@ -1609,19 +1347,7 @@ S8                  *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrGetAbsTpc
-(
-S8                   remPwr,
-uint8_t                  *tpc,
-S8                  *delta
-)
-#else
-static Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta)
-S8                   remPwr;
-uint8_t                  *tpc;
-S8                  *delta;
-#endif
+static Void rgSCHPwrGetAbsTpc(S8 remPwr,uint8_t *tpc,S8 *delta)
 {
    /*
     * TPC   delta
@@ -1674,19 +1400,7 @@ S8                  *delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrOnPucchGrpPwrForUe 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-S8                    delta
-)
-#else
-static Void rgSCHPwrOnPucchGrpPwrForUe(cell, ue, delta)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-S8                    delta;
-#endif
+static Void rgSCHPwrOnPucchGrpPwrForUe(RgSchCellCb *cell,RgSchUeCb *ue,S8  delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
    Bool                   rmvUe = FALSE;
@@ -1736,19 +1450,7 @@ S8                    delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrOnPuschGrpPwrForUe 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-S8                    delta
-)
-#else
-static Void rgSCHPwrOnPuschGrpPwrForUe(cell, ue, delta)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-S8                    delta;
-#endif
+static Void rgSCHPwrOnPuschGrpPwrForUe(RgSchCellCb *cell,RgSchUeCb *ue,S8 delta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
    Bool                   rmvUe = FALSE;
@@ -1798,19 +1500,7 @@ S8                    delta;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Bool rgSCHPwrIsDlUeSched
-(
-RgSchCellCb            *cell,
-RgSchUeCb            *ue,
-RgSchDlSf            *sf
-)
-#else
-static Bool rgSCHPwrIsDlUeSched(cell, ue, sf)
-RgSchCellCb            *cell;
-RgSchUeCb            *ue;
-RgSchDlSf            *sf;
-#endif
+static Bool rgSCHPwrIsDlUeSched(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlSf  *sf)
 {
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    RgSchDlHqProcCb      *proc    = rgSCHDhmLastSchedHqProc(hqEnt);
@@ -1863,19 +1553,7 @@ RgSchDlSf            *sf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Bool rgSCHPwrIsUlUeSched
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-RgSchUlSf            *sf
-)
-#else
-static Bool rgSCHPwrIsUlUeSched(cell, ue, sf)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-RgSchUlSf            *sf;
-#endif
+static Bool rgSCHPwrIsUlUeSched(RgSchCellCb  *cell,RgSchUeCb *ue,RgSchUlSf *sf)
 {
    RgSchCmnUlCell      *cmnCell = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlHqProcCb     *proc = rgSCHUhmGetUlHqProc(cell, ue, cmnCell->schdHqProcIdx);
@@ -1934,19 +1612,7 @@ RgSchUlSf            *sf;
  *  @param[in]  uint8_t           pwrDelta
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrPucchDeltaInd
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-S8          pwrDelta
-)
-#else
-Void rgSCHPwrPucchDeltaInd(cell, ue, pwrDelta)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-S8          pwrDelta;
-#endif
+Void rgSCHPwrPucchDeltaInd(RgSchCellCb *cell,RgSchUeCb *ue,S8 pwrDelta)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
    RgSchCmnTpcRntiCb     *cb;
@@ -2000,19 +1666,7 @@ S8          pwrDelta;
  *  @param[in]  S8                 delta
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHPwrOnSchedPucchTpc
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue,
-S8                     delta
-)
-#else
-static Void rgSCHPwrOnSchedPucchTpc(cell, ue, delta)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-S8                     delta;
-#endif
+static Void rgSCHPwrOnSchedPucchTpc(RgSchCellCb *cell,RgSchUeCb *ue,S8 delta)
 {
    /* Similar to rgSCHPwrPucchDeltaInd.. not reusing
     * that since we use the fact that UE could only have
@@ -2063,17 +1717,7 @@ S8                     delta;
  *  @param[in]  RgSchUeCb         *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHPwrOnSchedPuschTpc
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrOnSchedPuschTpc(cell, ue)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrOnSchedPuschTpc(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
    Bool                   rmvUe = FALSE;
@@ -2124,25 +1768,11 @@ RgSchUeCb             *ue;
  *  @param[in]  RgSchCmnAllocRecord  allocInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrUpdExtPhr
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue,
-RgInfExtPhrCEInfo     *extPhr,
-RgSchCmnAllocRecord   *allocInfo
-)
-#else
-Void rgSCHPwrUpdExtPhr(cell, ue, extPhr, allocInfo)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-RgInfExtPhrCEInfo     *extPhr;
-RgSchCmnAllocRecord   *allocInfo;
-#endif
+Void rgSCHPwrUpdExtPhr(RgSchCellCb  *cell,RgSchUeCb *ue,RgInfExtPhrCEInfo *extPhr,RgSchCmnAllocRecord  *allocInfo)
 {
    uint8_t idx;
    RgInfExtPhrSCellInfo  *servCellPhr;
-   S8                     pCMax;
+   S8      pCMax;
 
    for (idx = 0; idx < extPhr->numServCells; idx++)
    {
@@ -2199,27 +1829,11 @@ RgSchCmnAllocRecord   *allocInfo;
  *  @param[in]  uint8_t                   maxUePwr
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrUpdPhr
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue,
-uint8_t                     phr,
-RgSchCmnAllocRecord   *allocInfo,
-S8                     maxUePwr 
-)
-#else
-Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-uint8_t                     phr;
-RgSchCmnAllocRecord   *allocInfo;
-S8                     maxUePwr;
-#endif
+Void rgSCHPwrUpdPhr(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t phr,RgSchCmnAllocRecord   *allocInfo,S8 maxUePwr )
 {
    RgSchCmnUeUlPwrCb     *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
-   uint8_t                     rbPwr;
-   uint8_t                     effPwr;
+   uint8_t               rbPwr;
+   uint8_t               effPwr;
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
    uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr);
@@ -2275,17 +1889,7 @@ S8                     maxUePwr;
  *  @param[in]  uint8_t                   numRb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrUlCqiInd
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue
-)
-#else
-Void rgSCHPwrUlCqiInd(cell, ue)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-#endif
+Void rgSCHPwrUlCqiInd(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    RgSchCmnUlUe          *ueUl    = RG_SCH_CMN_GET_UL_UE(ue, cell);
    RgSchCmnUeUlPwrCb     *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -2355,19 +1959,7 @@ RgSchUeCb             *ue;
  *  @param[in]  uint8_t                   numRb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrRecordRbAlloc
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue,
-uint8_t                     numRb
-)
-#else
-Void rgSCHPwrRecordRbAlloc(cell, ue, numRb)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-uint8_t                     numRb;
-#endif
+Void rgSCHPwrRecordRbAlloc(RgSchCellCb *cell,RgSchUeCb  *ue,uint8_t  numRb)
 {
    RgSchCmnUeUlPwrCb     *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
    UNUSED(cell);
@@ -2408,17 +2000,7 @@ uint8_t                     numRb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHPwrCellCfg
-(
-RgSchCellCb          *cell,
-RgrCellCfg           *cfg
-)
-#else
-S16 rgSCHPwrCellCfg(cell, cfg)
-RgSchCellCb          *cell;
-RgrCellCfg           *cfg;
-#endif
+S16 rgSCHPwrCellCfg(RgSchCellCb *cell,RgrCellCfg  *cfg)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
    CmLteRnti              rnti;
@@ -2499,17 +2081,7 @@ RgrCellCfg           *cfg;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHPwrCellRecfg
-(
-RgSchCellCb          *cell,
-RgrCellRecfg         *recfg
-)
-#else
-S16 rgSCHPwrCellRecfg(cell, recfg)
-RgSchCellCb          *cell;
-RgrCellRecfg         *recfg;
-#endif
+S16 rgSCHPwrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg)
 {
    UNUSED(cell);
    UNUSED(recfg);
@@ -2532,15 +2104,7 @@ RgrCellRecfg         *recfg;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrCellDel
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHPwrCellDel(cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHPwrCellDel(RgSchCellCb *cell)
 {
    UNUSED(cell);
 
@@ -2564,19 +2128,7 @@ RgSchCellCb *cell;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHPwrUeSCellCfg
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-RgrUeSecCellCfg  *sCellInfoCfg
-)
-#else
-S16 rgSCHPwrUeSCellCfg(cell, ue, sCellInfoCfg)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgrUeSecCellCfg  *sCellInfoCfg;
-#endif
+S16 rgSCHPwrUeSCellCfg(RgSchCellCb *cell,RgSchUeCb   *ue,RgrUeSecCellCfg  *sCellInfoCfg)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -2652,19 +2204,7 @@ RgrUeSecCellCfg  *sCellInfoCfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHPwrUeCfg
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue,
-RgrUeCfg    *cfg
-)
-#else
-S16 rgSCHPwrUeCfg(cell, ue, cfg)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgrUeCfg    *cfg;
-#endif
+S16 rgSCHPwrUeCfg(RgSchCellCb *cell,RgSchUeCb   *ue,RgrUeCfg    *cfg)
 {
    S16                    ret;
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
@@ -2713,19 +2253,7 @@ RgrUeCfg    *cfg;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHPwrUeRecfg
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-RgrUeRecfg    *recfg
-)
-#else
-S16 rgSCHPwrUeRecfg(cell, ue, recfg)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-RgrUeRecfg  *recfg;
-#endif
+S16 rgSCHPwrUeRecfg(RgSchCellCb   *cell,RgSchUeCb     *ue,RgrUeRecfg    *recfg)
 {
    S16                    ret;
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -2759,27 +2287,15 @@ RgrUeRecfg  *recfg;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrApplyUePwrCfg 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-RgrUeUlPwrCfg        *pwrCfg
-)
-#else
-static S16 rgSCHPwrApplyUePwrCfg(cell, ue, pwrCfg)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-RgrUeUlPwrCfg        *pwrCfg;
-#endif
+static S16 rgSCHPwrApplyUePwrCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeUlPwrCfg *pwrCfg)
 {
    S16                    ret;
    RgSchCmnUlUe          *ueUl        = RG_SCH_CMN_GET_UL_UE(ue, cell);
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, cell);
    RgSchCmnTpcRntiCb     *pucchRntiCb = NULLP;
    RgSchCmnTpcRntiCb     *puschRntiCb = NULLP;
-   uint8_t                     pucchIdx    = 0;
-   uint8_t                     puschIdx    = 0;
+   uint8_t               pucchIdx    = 0;
+   uint8_t               puschIdx    = 0;
 
    /* Validate Pucch group power control config */
    if (pwrCfg->uePucchPwr.pres)
@@ -2921,17 +2437,7 @@ RgrUeUlPwrCfg        *pwrCfg;
  *  @param[in]  RgSchUeCb       *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrUeDel
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue
-)
-#else
-Void rgSCHPwrUeDel(cell, ue)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-#endif
+Void rgSCHPwrUeDel(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -2966,17 +2472,7 @@ RgSchUeCb             *ue;
  *  @param[in]  RgSchUeCb       *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHPwrUeReset
-(
-RgSchCellCb           *cell,
-RgSchUeCb             *ue
-)
-#else
-Void rgSCHPwrUeReset(cell, ue)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-#endif
+Void rgSCHPwrUeReset(RgSchCellCb  *cell,RgSchUeCb  *ue)
 {
 
    rgSCHPwrUeResetPucch(cell, ue);
@@ -2998,17 +2494,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrUeResetPucch 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue
-)
-#else
-static Void rgSCHPwrUeResetPucch(cell, ue)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-#endif
+static Void rgSCHPwrUeResetPucch(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -3038,17 +2524,7 @@ RgSchUeCb            *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrUeResetPusch 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue
-)
-#else
-static Void rgSCHPwrUeResetPusch(cell, ue)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-#endif
+static Void rgSCHPwrUeResetPusch(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, cell);
 
@@ -3079,17 +2555,7 @@ RgSchUeCb            *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrOnPuschPwrUpd 
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue
-)
-#else
-static Void rgSCHPwrOnPuschPwrUpd(cell, ue)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-#endif
+static Void rgSCHPwrOnPuschPwrUpd(RgSchCellCb  *cell,RgSchUeCb  *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
    RgSchCmnTpcRntiCb     *cb;
@@ -3140,19 +2606,7 @@ RgSchUeCb            *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddRntiToPucchRntiLst 
-(
-RgSchCellCb          *cell,
-CmLteRnti             rnti,
-Bool                  isFmt3a
-)
-#else
-static Void rgSCHPwrAddRntiToPucchRntiLst(cell, rnti, isFmt3a)
-RgSchCellCb          *cell;
-CmLteRnti             rnti;
-Bool                  isFmt3a;
-#endif
+static Void rgSCHPwrAddRntiToPucchRntiLst(RgSchCellCb *cell,CmLteRnti rnti,Bool  isFmt3a)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3177,19 +2631,7 @@ Bool                  isFmt3a;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddRntiToPuschRntiLst 
-(
-RgSchCellCb          *cell,
-CmLteRnti             rnti,
-Bool                  isFmt3a
-)
-#else
-static Void rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a)
-RgSchCellCb          *cell;
-CmLteRnti             rnti;
-Bool                  isFmt3a;
-#endif
+static Void rgSCHPwrAddRntiToPuschRntiLst(RgSchCellCb *cell,CmLteRnti rnti,Bool  isFmt3a)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3212,19 +2654,7 @@ Bool                  isFmt3a;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrInitTpcRntiCb 
-(
-RgSchCmnTpcRntiCb    *cb,
-CmLteRnti             rnti,
-Bool                  isFmt3a
-)
-#else
-static Void rgSCHPwrInitTpcRntiCb(cb, rnti, isFmt3a)
-RgSchCmnTpcRntiCb    *cb;
-CmLteRnti             rnti;
-Bool                  isFmt3a;
-#endif
+static Void rgSCHPwrInitTpcRntiCb(RgSchCmnTpcRntiCb *cb,CmLteRnti rnti,Bool isFmt3a)
 {
 
    memset(cb, 0, sizeof(*cb));
@@ -3250,20 +2680,10 @@ Bool                  isFmt3a;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb
-(
-RgSchCellCb *cell,
-CmLteRnti   tpcRnti
-)
-#else
-static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(cell, tpcRnti)
-RgSchCellCb *cell;
-CmLteRnti   tpcRnti;
-#endif
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(RgSchCellCb *cell,CmLteRnti   tpcRnti)
 {
-   RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
-   uint16_t                    idx;
+   RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
+   uint16_t  idx;
 
    if (!cellPwr->tpcPucchRntiCnt)
    {
@@ -3294,20 +2714,10 @@ CmLteRnti   tpcRnti;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb
-(
-RgSchCellCb *cell,
-CmLteRnti   tpcRnti
-)
-#else
-static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(cell, tpcRnti)
-RgSchCellCb *cell;
-CmLteRnti   tpcRnti;
-#endif
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(RgSchCellCb *cell,CmLteRnti   tpcRnti)
 {
-   RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
-   uint16_t                    idx;
+   RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
+   uint16_t idx;
 
    if (!cellPwr->tpcPuschRntiCnt)
    {
@@ -3338,19 +2748,7 @@ CmLteRnti   tpcRnti;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddUeToPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrAddUeToPucchTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrAddUeToPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
    UNUSED(cell);
@@ -3374,19 +2772,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrDelUeFrmPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrDelUeFrmPucchTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrDelUeFrmPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb  *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3411,19 +2797,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb  *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3455,19 +2829,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb  *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3493,17 +2855,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb
-)
-#else
-static Void rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-#endif
+static Void rgSCHPwrRmvSchdPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3530,19 +2882,7 @@ RgSchCmnTpcRntiCb     *cb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3576,17 +2916,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddSchdPucchTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb
-)
-#else
-static Void rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-#endif
+static Void rgSCHPwrAddSchdPucchTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3610,17 +2940,7 @@ RgSchCmnTpcRntiCb     *cb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddUeToPuschTpcRntiCb
-(
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrAddUeToPuschTpcRntiCb(cb, ue)
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrAddUeToPuschTpcRntiCb(RgSchCmnTpcRntiCb *cb,RgSchUeCb  *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3643,19 +2963,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3689,19 +2997,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrDelUeFrmPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrDelUeFrmPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb  *cb,RgSchUeCb  *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3725,19 +3021,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3769,19 +3053,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb,
-RgSchUeCb             *ue
-)
-#else
-static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-RgSchUeCb             *ue;
-#endif
+static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb,RgSchUeCb *ue)
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
@@ -3807,17 +3079,7 @@ RgSchUeCb             *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrAddSchdPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb
-)
-#else
-static Void rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-#endif
+static Void rgSCHPwrAddSchdPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3840,17 +3102,7 @@ RgSchCmnTpcRntiCb     *cb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHPwrRmvSchdPuschTpcRntiCb
-(
-RgSchCellCb           *cell,
-RgSchCmnTpcRntiCb     *cb
-)
-#else
-static Void rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb)
-RgSchCellCb           *cell;
-RgSchCmnTpcRntiCb     *cb;
-#endif
+static Void rgSCHPwrRmvSchdPuschTpcRntiCb(RgSchCellCb *cell,RgSchCmnTpcRntiCb *cb)
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
 
@@ -3878,17 +3130,7 @@ RgSchCmnTpcRntiCb     *cb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrChkPucchTpcRntiIdx
-(
-RgSchCmnTpcRntiCb     *cb,
-uint8_t                     idx
-)
-#else
-static S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx)
-RgSchCmnTpcRntiCb     *cb;
-uint8_t                     idx;
-#endif
+static S16 rgSCHPwrChkPucchTpcRntiIdx(RgSchCmnTpcRntiCb *cb,uint8_t idx)
 {
 
    if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
@@ -3917,17 +3159,7 @@ uint8_t                     idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrChkPuschTpcRntiIdx
-(
-RgSchCmnTpcRntiCb     *cb,
-uint8_t                     idx
-)
-#else
-static S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx)
-RgSchCmnTpcRntiCb     *cb;
-uint8_t                     idx;
-#endif
+static S16 rgSCHPwrChkPuschTpcRntiIdx(RgSchCmnTpcRntiCb *cb,uint8_t  idx)
 {
 
    if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
@@ -3954,17 +3186,7 @@ uint8_t                     idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrChkUniqPucchTpcRntiIdx
-(
-RgSchCmnTpcRntiCb     *cb,
-uint8_t                     idx
-)
-#else
-static S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx)
-RgSchCmnTpcRntiCb     *cb;
-uint8_t                     idx;
-#endif
+static S16 rgSCHPwrChkUniqPucchTpcRntiIdx(RgSchCmnTpcRntiCb *cb,uint8_t idx)
 {
    CmLList           *lnk;
 
@@ -3993,17 +3215,7 @@ uint8_t                     idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrChkUniqPuschTpcRntiIdx
-(
-RgSchCmnTpcRntiCb     *cb,
-uint8_t                     idx
-)
-#else
-static S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx)
-RgSchCmnTpcRntiCb     *cb;
-uint8_t                     idx;
-#endif
+static S16 rgSCHPwrChkUniqPuschTpcRntiIdx(RgSchCmnTpcRntiCb  *cb,uint8_t  idx)
 {
    CmLList           *lnk;
 
@@ -4032,17 +3244,7 @@ uint8_t                     idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHPwrChkTpcRntiIdx
-(
-RgSchCmnTpcRntiCb     *cb,
-uint8_t                     idx
-)
-#else
-static S16 rgSCHPwrChkTpcRntiIdx(cb, idx)
-RgSchCmnTpcRntiCb     *cb;
-uint8_t                     idx;
-#endif
+static S16 rgSCHPwrChkTpcRntiIdx(RgSchCmnTpcRntiCb *cb,uint8_t idx)
 {
    if (cb->isFmt3a)
    {
@@ -4077,15 +3279,7 @@ uint8_t                     idx;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrGetPCMaxValFromPCMax
-(
-uint8_t                    pCMax
-)
-#else
-static S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax)
-uint8_t                    pCMax;
-#endif
+static S8 rgSCHPwrGetPCMaxValFromPCMax(uint8_t pCMax)
 {
    return ((pCMax & 63) - 30);
 }
@@ -4107,15 +3301,7 @@ uint8_t                    pCMax;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S8 rgSCHPwrGetPhValFromPhr
-(
-uint8_t                    phr
-)
-#else
-static S8 rgSCHPwrGetPhValFromPhr(phr)
-uint8_t                    phr;
-#endif
+static S8 rgSCHPwrGetPhValFromPhr(uint8_t  phr)
 {
    return ((phr & 63) - 23);
 }
index a5b5f7d..2d42b57 100755 (executable)
@@ -131,17 +131,7 @@ Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHRamVldtUeCfg 
-(
-RgSchCellCb  *cell,
-RgrUeCfg     *ueCfg
-)
-#else
-S16 rgSCHRamVldtUeCfg(cell, ueCfg)
-RgSchCellCb  *cell;
-RgrUeCfg     *ueCfg;
-#endif
+S16 rgSCHRamVldtUeCfg(RgSchCellCb  *cell,RgrUeCfg     *ueCfg)
 {
    if (ueCfg->dedPreambleId.pres == PRSNT_NODEF)
    {
@@ -183,10 +173,9 @@ RgrUeCfg     *ueCfg;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHRamProcRaReq
 (
-uint8_t                raReqCnt,
+uint8_t           raReqCnt,
 RgSchCellCb       *cell,
 CmLteRnti         raRnti,
 TfuRachInfo       *raReqInd,
@@ -194,22 +183,12 @@ CmLteTimingInfo   timingInfo,
 RgSchUeCb         *ue,
 RgSchErrInfo      *err
 )
-#else
-S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
-uint8_t                raReqCnt;
-RgSchCellCb       *cell;
-CmLteRnti         raRnti;
-TfuRachInfo       *raReqInd;
-CmLteTimingInfo   timingInfo;
-RgSchUeCb         *ue;
-RgSchErrInfo      *err;
-#endif
 {
    RgSchRaReqInfo *raReqInfo;
-   uint16_t            raIndex;
+   uint16_t       raIndex;
 #ifdef LTE_TDD
-   uint8_t             fid;
-   uint8_t             tid;
+   uint8_t        fid;
+   uint8_t        tid;
 #endif
 
 
@@ -319,19 +298,12 @@ RgSchErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHRamCreateRaCb
 (
 RgSchCellCb       *cell,
 RgSchRaCb         **raCb,
 RgSchErrInfo      *err
 )
-#else
-S16 rgSCHRamCreateRaCb(cell, raCb, err)
-RgSchCellCb       *cell;
-RgSchRaCb         **raCb;
-RgSchErrInfo      *err;
-#endif
 {
    RgSchRntiLnk *rntiLnk;
    Inst         inst = cell->instIdx;
@@ -421,7 +393,6 @@ RgSchErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHRamRgrUeCfg
 (
 RgSchCellCb    *cell,
@@ -429,13 +400,6 @@ RgSchUeCb      *ue,
 RgSchRaCb      *raCb,
 RgSchErrInfo   *err
 )
-#else
-S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchRaCb      *raCb;
-RgSchErrInfo   *err;
-#endif
 {
    /* Releasing HARQ processes of old UE when ue
     *           reconfig with new crnti */
@@ -495,7 +459,6 @@ RgSchErrInfo   *err;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 static S16 rgSCHRamContResCrnti
 (
 RgSchCellCb  *cell,
@@ -503,13 +466,6 @@ RgSchUeCb    *ue,
 RgSchRaCb    *raCb,
 RgSchErrInfo *err
 )
-#else
-static S16 rgSCHRamContResCrnti(cell, ue, raCb, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchRaCb    *raCb;
-RgSchErrInfo *err;
-#endif
 {
    TfuUlCqiRpt   ulCqiRpt;
    RgSchCmnCell  *cellSch= (RgSchCmnCell *)(cell->sc.sch);
@@ -561,17 +517,11 @@ RgSchErrInfo *err;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 static S16 rgSCHRamContResCcchsdu
 (
 RgSchCellCb *cell,
 RgSchRaCb *raCb
 )
-#else
-static S16 rgSCHRamContResCcchsdu(cell, raCb)
-RgSchCellCb *cell;
-RgSchRaCb *raCb;
-#endif
 {
 #ifdef RGR_V1 
    CmLteTimingInfo expTime = {0}; 
@@ -626,7 +576,6 @@ RgSchRaCb *raCb;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 S16 rgSCHRamProcMsg3
 (
 RgSchCellCb     *cell,
@@ -635,14 +584,6 @@ RgSchRaCb       *raCb,
 RgInfUeDatInd   *pdu,
 RgSchErrInfo    *err
 )
-#else
-S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-RgSchRaCb       *raCb;
-RgInfUeDatInd   *pdu;
-RgSchErrInfo    *err;
-#endif
 {
 
 
@@ -691,19 +632,12 @@ RgSchErrInfo    *err;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
 S16 rgSCHRamUpdtBo
 (
 RgSchCellCb       *cell,
 RgSchRaCb         *raCb,
 RgInfCmnBoRpt     *staRsp
 )
-#else
-S16 rgSCHRamUpdtBo(cell, raCb, staRsp)
-RgSchCellCb       *cell;
-RgSchRaCb         *raCb;
-RgInfCmnBoRpt     *staRsp;
-#endif
 {
 
    /* Update Bo in RaCb */
@@ -734,15 +668,7 @@ RgInfCmnBoRpt     *staRsp;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamMsg3DatInd
-(
-RgSchRaCb      *raCb
-)
-#else
-S16 rgSCHRamMsg3DatInd(raCb)
-RgSchRaCb      *raCb;
-#endif
+S16 rgSCHRamMsg3DatInd(RgSchRaCb *raCb)
 {
 
    /* SR_RACH_STATS : MSG3 ACK*/
@@ -768,15 +694,7 @@ RgSchRaCb      *raCb;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamMsg3FailureInd
-(
-RgSchRaCb      *raCb
-)
-#else
-S16 rgSCHRamMsg3FailureInd(raCb)
-RgSchRaCb      *raCb;
-#endif
+S16 rgSCHRamMsg3FailureInd(RgSchRaCb *raCb)
 {
 
    /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/
@@ -800,15 +718,7 @@ RgSchRaCb      *raCb;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamMsg4FdbkInd
-(
-RgSchRaCb      *raCb
-)
-#else
-S16 rgSCHRamMsg4FdbkInd(raCb)
-RgSchRaCb      *raCb;
-#endif
+S16 rgSCHRamMsg4FdbkInd(RgSchRaCb  *raCb)
 {
 
    return ROK;
@@ -832,17 +742,7 @@ RgSchRaCb      *raCb;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamMsg4Done
-(
-RgSchCellCb    *cell,
-RgSchRaCb      *raCb
-)
-#else
-S16 rgSCHRamMsg4Done(cell, raCb)
-RgSchCellCb    *cell;
-RgSchRaCb      *raCb;
-#endif
+S16 rgSCHRamMsg4Done(RgSchCellCb *cell,RgSchRaCb *raCb)
 {
 
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,
@@ -925,22 +825,10 @@ RgSchRaCb      *raCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHRamDelRaCb
-(
-RgSchCellCb *cell,
-RgSchRaCb   *raCb,
-Bool        rlsRnti
-)
-#else
-S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti)
-RgSchCellCb *cell;
-RgSchRaCb   *raCb;
-Bool        rlsRnti;
-#endif
+S16 rgSCHRamDelRaCb(RgSchCellCb *cell,RgSchRaCb   *raCb,Bool rlsRnti)
 {
-   Inst         inst = cell->instIdx;
-   Bool         isEmtc = FALSE;
+   Inst  inst = cell->instIdx;
+   Bool  isEmtc = FALSE;
  
     /* Delete from all the lists it is enqueued */
     cmLListDelFrm(&(cell->raInfo.raCbLst),&(raCb->raCbLnk));
@@ -1052,30 +940,21 @@ Bool        rlsRnti;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamTtiHndlr
-(
-RgSchCellCb  *cell
-)
-#else
-S16 rgSCHRamTtiHndlr(cell)
-RgSchCellCb  *cell;
-#endif
+S16 rgSCHRamTtiHndlr(RgSchCellCb  *cell)
 {
    RgSchRaCb   *raCb;
-   uint16_t         raSfn;
-   uint16_t         crntSfn;
-   uint16_t         dist;       /* Number of frames between raCb's creation and crnt
-                              frame */
-   uint8_t          idx;
-   uint32_t         maxCnt;
+   uint16_t    raSfn;
+   uint16_t    crntSfn;
+   uint16_t    dist;       /* Number of frames between raCb's creation and crnt frame */
+   uint8_t     idx;
+   uint32_t    maxCnt;
 #ifndef LTE_TDD
-   uint8_t          winGap;        
-   uint8_t          raIdx;
+   uint8_t     winGap;        
+   uint8_t     raIdx;
    RgSchRaReqInfo *raReqInfo;
 #else
    CmLteTimingInfo      frm;
-   uint8_t                   raIdx;
+   uint8_t     raIdx;
 #endif
 
 
@@ -1181,25 +1060,17 @@ RgSchCellCb  *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHRamFreeCell
-(
-RgSchCellCb    *cell
-)
-#else
-S16 rgSCHRamFreeCell(cell)
-RgSchCellCb    *cell;
-#endif
+S16 rgSCHRamFreeCell(RgSchCellCb  *cell)
 {
    RgSchRaReqInfo  *raReqInfo;
    RgSchRaCb       *raCb;
-   uint8_t              idx;
-   uint8_t              raCbCnt;
+   uint8_t         idx;
+   uint8_t         raCbCnt;
    Inst            inst = cell->instIdx;
-   uint8_t              lstSz;
+   uint8_t         lstSz;
 #ifdef LTE_TDD
-   uint8_t              maxUlSubframes;
-   uint8_t              maxDlSubframes;
+   uint8_t         maxUlSubframes;
+   uint8_t         maxDlSubframes;
 #endif
 
 
@@ -1270,17 +1141,7 @@ RgSchCellCb    *cell;
    return ROK; 
 } /* rgSCHRamFreeCell */
 #ifdef RGR_V1
-#ifdef ANSI
-static Void rgSCHRamProcContResExp
-(
-RgSchCellCb *cell,
-RgSchRaCb  *raCb
-)
-#else
-static Void rgSCHRamProcContResExp (cell, raCb)
-RgSchCellCb *cell;
-RgSchRaCb  *raCb;
-#endif
+static Void rgSCHRamProcContResExp(RgSchCellCb *cell,RgSchRaCb  *raCb)
 {
    raCb->expiryTime.sfn = RGSCH_CONTRES_EXP;
    /*MSG4 Fix*/
@@ -1299,17 +1160,7 @@ RgSchRaCb  *raCb;
    return;
 }
 
-#ifdef ANSI
-static Void rgSCHRamProcContResGrdExp
-(
-RgSchCellCb *cell,
-RgSchRaCb  *raCb
-)
-#else
-static Void rgSCHRamProcContResGrdExp (cell, raCb)
-RgSchCellCb  *cell;
-RgSchRaCb  *raCb;
-#endif
+static Void rgSCHRamProcContResGrdExp(RgSchCellCb *cell,RgSchRaCb  *raCb)
 {
 
 
@@ -1348,18 +1199,10 @@ RgSchRaCb  *raCb;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static Void rgSCHChkContResTmrExp
-(
-RgSchCellCb        *cell
-)
-#else
-static Void rgSCHChkContResTmrExp(cell)
-RgSchCellCb        *cell;
-#endif
+static Void rgSCHChkContResTmrExp(RgSchCellCb *cell)
 {
-   CmLList         *chkLnk    = NULLP;
-   RgSchRaCb       *raCb = NULLP;
+   CmLList    *chkLnk    = NULLP;
+   RgSchRaCb  *raCb = NULLP;
    
       
    chkLnk = cmLListFirst(&(cell->contResTmrLst));
@@ -1394,18 +1237,10 @@ RgSchCellCb        *cell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-static Void rgSCHChkContResGrdTmrExp
-(
-RgSchCellCb        *cell
-)
-#else
-static Void rgSCHChkContResGrdTmrExp(cell)
-RgSchCellCb        *cell;
-#endif
+static Void rgSCHChkContResGrdTmrExp(RgSchCellCb  *cell)
 {
-   CmLList         *chkLnk    = NULLP;
-   RgSchRaCb       *raCb = NULLP;
+   CmLList    *chkLnk    = NULLP;
+   RgSchRaCb  *raCb = NULLP;
    
       
    chkLnk = cmLListFirst(&(cell->contResGrdTmrLst));
@@ -1445,29 +1280,22 @@ RgSchCellCb        *cell;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgSCHRamDelRaReq
 (
-RgSchCellCb          *cell,
-CmLteTimingInfo      timingInfo,
-uint8_t                   raIdx
+RgSchCellCb      *cell,
+CmLteTimingInfo  timingInfo,
+uint8_t          raIdx
 )
-#else
-S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
-RgSchCellCb          *cell;
-CmLteTimingInfo      timingInfo;
-uint8_t                   raIdx;
-#endif
 {
-   uint8_t                   subfrmIdx;
+   uint8_t              subfrmIdx;
    RgSchTddRachRspLst   *rachRsp;
-   uint16_t                   sfnIdx;
+   uint16_t             sfnIdx;
    S16                  calcSfn;
-   uint8_t                   subfrm;
+   uint8_t              subfrm;
    RgSchRaReqInfo       *raReqInfo;
-   uint8_t                   idx;
-   uint8_t                   i;
-   uint8_t                   raRntiIdx;
+   uint8_t              idx;
+   uint8_t              i;
+   uint8_t              raRntiIdx;
    CmLteRnti            raRnti;
 
 
@@ -1519,17 +1347,7 @@ uint8_t                   raIdx;
 #endif
 
 /*MSG4 Fix Start */
-#ifdef ANSI
-S16 rgSCHRamAddToRaInfoSchdLst
-(
-RgSchCellCb       *cell,
-RgSchRaCb         *raCb
-)
-#else
-S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb)
-RgSchCellCb       *cell;
-RgSchRaCb         *raCb;
-#endif
+S16 rgSCHRamAddToRaInfoSchdLst(RgSchCellCb *cell,RgSchRaCb *raCb)
 {
    CmLteTimingInfo expTime ={0};
    RgSchCmnCell    *cellSch =  RG_SCH_CMN_GET_CELL(cell);
@@ -1548,17 +1366,7 @@ RgSchRaCb         *raCb;
 
 
 
-#ifdef ANSI
-S16 rgSCHRamRmvFrmRaInfoSchdLst
-(
-RgSchCellCb       *cell,
-RgSchRaCb         *raCb
-)
-#else
-S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb)
-RgSchCellCb       *cell;
-RgSchRaCb         *raCb;
-#endif
+S16 rgSCHRamRmvFrmRaInfoSchdLst(RgSchCellCb *cell,RgSchRaCb  *raCb)
 {
 
    cmLListDelFrm(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk));
@@ -1584,22 +1392,13 @@ RgSchRaCb         *raCb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static Void rgSCHRamUlFreeAllocation
 (
 RgSchUlSf       *sf,
 RgSchUlAlloc    *alloc,
 RgSchCellCb     *cell,
 Bool            isEmtc
-
 )
-#else
-static Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc)
-RgSchUlSf       *sf;
-RgSchUlAlloc    *alloc;
-RgSchCellCb     *cell;
-Bool            isEmtc;
-#endif
 {
 
    rgSCHUhmFreeProc(alloc->hqProc, cell);
index c06896a..66c03ea 100755 (executable)
@@ -208,17 +208,7 @@ static Void rgSCHSc1DlPstSchd ARGS ((
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlUeReset 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlUeReset(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlUeReset(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
    rgSCHSc1DlSuspendUe(cell, ue);
@@ -242,24 +232,14 @@ RgSchUeCb      *ue;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlActvtUe 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlActvtUe(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlActvtUe(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    CmLListCp       *lst;
    CmLList         *node;
    RgSchDlHqProcCb *hqP;
    RgSchDlLcCb     *svc;
-   uint8_t              idx;
+   uint8_t         idx;
 
    /* Add UE's HqProcs From UERetxLst to CellRetxLst */
    lst = &ueDl->retxHqProcs;
@@ -308,17 +288,7 @@ RgSchUeCb      *ue;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlUeRefresh
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1DlUeRefresh(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1DlUeRefresh(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
                            /*cell added as part of CA dev*/
@@ -379,22 +349,11 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcRmvFrmCellRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcRmvFrmCellRetx(RgSchCellCb *cell,RgSchDlHqProcCb  *hqP)
 {
    RgSchSc1DlCell       *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchCmnDlHqProc     *hqProcDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 
-
    if (hqProcDl->retxLnk.node != NULLP)
    {
       cmLListDelFrm(&cellDl->retxLst[((RgSchSc1DlHqProc *)\
@@ -421,24 +380,11 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcRmvFrmUeRetx
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcRmvFrmUeRetx(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchSc1DlUe            *sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlHqProc     *hqProcDl = RG_GET_SC1_HQP_DL(hqP);
 
-
    if (hqProcDl->retxLnkUe.node != NULLP)
    {
       cmLListDelFrm(&sc1Ue->retxHqProcs,
@@ -466,24 +412,11 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlProcAddToUeRetx
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlHqProcCb            *hqP
-)
-#else
-static Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
+static Void rgSCHSc1DlProcAddToUeRetx(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqProcCb *hqP)
 {
    RgSchSc1DlUe            *sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlHqProc     *cmnHqDl = RG_GET_SC1_HQP_DL(hqP);
 
-
    cmLListAdd2Tail(&sc1Ue->retxHqProcs, 
                     &(cmnHqDl->retxLnkUe));
    cmnHqDl->retxLnkUe.node = (PTR)hqP;
@@ -508,17 +441,7 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlProcAddToCellRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHSc1DlProcAddToCellRetx(RgSchCellCb *cell,RgSchDlHqProcCb  *hqP)
 {
    RgSchSc1DlCell          *sc1CellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchCmnDlHqProc     *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
@@ -553,21 +476,9 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxAlloc
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHSc1DlRetxAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchCmnDlRbAllocInfo *allocInfo)
 {
-   uint8_t                   i;
+   uint8_t              i;
    CmLListCp            *retxLst;
    CmLList              *node;
    RgSchDlHqProcCb      *hqP;
@@ -577,7 +488,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
 #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD)))
    CmLteTimingInfo      schdTime;
 #endif
-   uint32_t                  effBo;
+   uint32_t             effBo;
    RgSchUeCb            *ue = NULLP;
 #ifdef LTEMAC_HDFDD
    Bool                 dlAllowed = FALSE;
@@ -691,15 +602,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1RlsHqProc
-(
-RgSchDlHqProcCb      *hqProc
-)
-#else
-static Void rgSCHSc1RlsHqProc(hqProc)
-RgSchDlHqProcCb      *hqProc;
-#endif
+static Void rgSCHSc1RlsHqProc(RgSchDlHqProcCb *hqProc)
 {
    rgSCHDhmRlsHqProc(hqProc);
    return;
@@ -724,28 +627,12 @@ RgSchDlHqProcCb      *hqProc;
  *  @return  S16 
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSc1DlDedSvcAlloc
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchDlLcCb                *svc,
-uint32_t                        bo,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchDlLcCb                *svc;
-uint32_t                        bo;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static S16 rgSCHSc1DlDedSvcAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchDlLcCb *svc,uint32_t bo,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchUeCb               *ue;
    RgSchDlHqProcCb         *proc;
-   uint16_t                     rlcHdrEstmt;
-   uint32_t                     effBo;
+   uint16_t                rlcHdrEstmt;
+   uint32_t                effBo;
    RgSchCmnDlCell          *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlSvc           *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
    RgSchSc1DlSvc           *svcSc1;
@@ -873,19 +760,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlAdd2UeSchdSvcs
-(
-RgSchCellCb                *cell,
-RgSchUeCb          *ue,
-RgSchDlLcCb        *svc
-)
-#else
-static Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb          *ue;
-RgSchDlLcCb        *svc;
-#endif
+static Void rgSCHSc1DlAdd2UeSchdSvcs(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlSvc  *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchSc1DlUe   *ueSc1 = RG_GET_SC1_UE_DL(ue, cell);
@@ -922,25 +797,13 @@ RgSchDlLcCb        *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedTx
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm,
-RgSchCmnDlRbAllocInfo      *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-RgSchCmnDlRbAllocInfo      *allocInfo;
-#endif
+static Void rgSCHSc1DlDedTx(RgSchCellCb *cell,RgSchDlSf *subFrm,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLListCp            *lst;
    CmLList              *node;
    RgSchUeCb            *ue = NULLP;
    RgSchDlLcCb          *svc;
-   uint8_t                   i;
+   uint8_t              i;
    RgSchSc1DlSvc        *svcSc1;
    RgSchSc1DlUe         *ueDl;
    RgSchSc1DlCell       *sc1CellDl = RG_GET_SC1_CELL_DL(cell);
@@ -1019,15 +882,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *  @param[in]  Inst      schInst
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlPreSchd
-(
- RgSchCellCb   *cell
-)
-#else
-Void rgSCHSc1DlPreSchd(cell)
- RgSchCellCb   *cell;
-#endif
+static Void rgSCHSc1DlPreSchd( RgSchCellCb   *cell)
 {
    
    return;
@@ -1045,15 +900,7 @@ Void rgSCHSc1DlPreSchd(cell)
  *  @param[in]  Inst      schInst
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlPstSchd
-(
- Inst       schInst
-)
-#else
-Void rgSCHSc1DlPstSchd(schInst)
- Inst       schInst
-#endif
+static Void rgSCHSc1DlPstSchd(Inst  schInst)
 {
    
    return;
@@ -1076,17 +923,7 @@ Void rgSCHSc1DlPstSchd(schInst)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedNewTx
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedNewTx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlDedNewTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlSf            *subFrm = allocInfo->dedAlloc.dedDlSf;
 #ifdef DEBUGP
@@ -1117,17 +954,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlDedRetx
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlDedRetx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlDedRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    RgSchDlSf            *subFrm = allocInfo->dedAlloc.dedDlSf;
 #ifdef DEBUGP
@@ -1159,17 +986,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAddToSchd
-(
-RgSchCellCb                *cell,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcAddToSchd(cell, svc)
-RgSchCellCb                *cell;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcAddToSchd(RgSchCellCb *cell,RgSchDlLcCb  *svc)
 {
    CmLListCp            *lst;
    CmLList              *node;
@@ -1260,17 +1077,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlUeRmvFrmSchd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHSc1DlUeRmvFrmSchd(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHSc1DlUeRmvFrmSchd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
@@ -1305,19 +1112,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1348,25 +1143,13 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAddToUeAmbrLst 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcAddToUeAmbrLst(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
-   RgSchSc1DlUe            *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   CmLList              *node;
-   RgSchDlLcCb          *lsvc;
-   RgSchSc1DlSvc           *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
-   RgSchCmnDlSvc        *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
+   RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
+   CmLList         *node;
+   RgSchDlLcCb     *lsvc;
+   RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
+   RgSchCmnDlSvc   *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
 
 
    /* If svc already present in AMBR List return */
@@ -1414,17 +1197,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcRmvFrmSchd
-(
-RgSchCellCb                *cell,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc)
-RgSchCellCb                *cell;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlSvcRmvFrmSchd(RgSchCellCb *cell,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlSvc *svcDl = RG_GET_SC1_SVC_DL(svc->ue,svc,cell);
@@ -1462,21 +1235,7 @@ RgSchDlLcCb                *svc;
  *  @return                    Void 
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcAdd
-(
-RgSchCellCb                *cell,
-RgSchUeCb               *ue,
-RgSchDlLcCb             *svc,
-RgrDlLchCfg             *cfg
-)
-#else
-static Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg)
-RgSchCellCb                *cell;
-RgSchUeCb               *ue;
-RgSchDlLcCb             *svc;
-RgrDlLchCfg             *cfg;
-#endif
+static Void rgSCHSc1DlSvcAdd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc,RgrDlLchCfg *cfg)
 {
    RgSchSc1DlUe  *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1512,19 +1271,7 @@ RgrDlLchCfg             *cfg;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlLcRmv
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSc1DlLcRmv(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSc1DlLcRmv(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlUe  *ueDl;
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1595,21 +1342,7 @@ RgSchDlLcCb                *svc;
  *  @return     Void 
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSvcMod
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc,
-RgrLchRecfg             *recfg
-)
-#else
-static Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-RgrLchRecfg             *recfg;
-#endif
+static Void rgSCHSc1DlSvcMod(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc,RgrLchRecfg  *recfg)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
@@ -1639,24 +1372,14 @@ RgrLchRecfg             *recfg;
  *  @return                    Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlUeAddToSchd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-static Void rgSCHSc1DlUeAddToSchd(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+static Void rgSCHSc1DlUeAddToSchd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchSc1DlUe   *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlUe   *lueDl;
    CmLList        *node;
    CmLListCp      *lst;
-   RgSchUeCb                  *nodeUe = NULLP;
+   RgSchUeCb      *nodeUe = NULLP;
 
    ueDl->prio = ((RgSchCmnDlSvc *)(ueDl->ambrSvc->sch))->prio;
    lst  = &cellDl->prioLst[ueDl->prio]; 
@@ -1714,19 +1437,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngAmbrSvcPosn
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngAmbrSvcPosn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlUe    *ueDl = RG_GET_SC1_UE_DL(ue, cell);
    RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
@@ -1812,19 +1523,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlLcBoUpd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSc1DlLcBoUpd(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb *svc)
 {
    RgSchSc1DlSvc   *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1864,19 +1563,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngPrio0SvcPosn
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngPrio0SvcPosn(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb  *svc)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1912,19 +1599,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngGbrSvcPosn 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngGbrSvcPosn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 { 
    RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
 
@@ -1957,19 +1632,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlMngSvcPosn 
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlMngSvcPosn(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlMngSvcPosn(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb *svc)
 { 
    RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc);
    RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell);
@@ -2002,24 +1665,11 @@ RgSchDlLcCb                *svc;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlCellCfg
-(
-RgSchCellCb   *cell,
-RgrCellCfg    *cellCfg,
-RgSchErrInfo  *err
-)
-#else
-S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *err;
-#endif
+S16 rgSCHSc1RgrDlCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err)
 {
    S16         ret;
    RgSchSc1DlCell *cellDl;
 
-
    if((ret = rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc), \
       (sizeof(RgSchSc1DlCell)))) != ROK)
@@ -2049,17 +1699,9 @@ RgSchErrInfo  *err;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlDeinitQueues
-(
-RgSchSc1DlCell *cellDl
-)
-#else
-static Void rgSCHSc1DlDeinitQueues(cellDl)
-RgSchSc1DlCell *cellDl;
-#endif
+static Void rgSCHSc1DlDeinitQueues(RgSchSc1DlCell *cellDl)
 {
-   uint8_t          i;
+   uint8_t i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
@@ -2083,15 +1725,7 @@ RgSchSc1DlCell *cellDl;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlCellDel
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHSc1DlCellDel(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHSc1DlCellDel(RgSchCellCb  *cell)
 {
 
    if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \
@@ -2128,21 +1762,7 @@ RgSchCellCb  *cell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlUeCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeCfg     *ueCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrDlUeCfg(RgSchCellCb  *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg,RgSchErrInfo *err)
 {
    RgSchCmnUe         *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell);
    Inst               inst = cell->instIdx;
@@ -2191,21 +1811,11 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlUeHqEntInit
-(
- RgSchCellCb      *cell,
- RgSchDlHqEnt     *hqEnt
- )
-#else
-S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
-   RgSchCellCb      *cell;
-   RgSchDlHqEnt     *hqEnt
-#endif
+S16 rgSCHSc1DlUeHqEntInit(RgSchCellCb *cell,RgSchDlHqEnt *hqEnt)
 {
    RgSchSc1DlHqProc   *hqSpcSch;
    RgSchDlHqProcCb    *hqP;
-   uint8_t                 cnt;
+   uint8_t            cnt;
    /* making use of hqE->sch for one shot allocation 
     * of RgSchSc1DlHqProc structures */
    if (rgSCHUtlAllocSBuf(cell->instIdx, 
@@ -2240,17 +1850,7 @@ S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
  *  @param[in]  RgSchDlHqEnt     *hqE 
  *  @return  Void
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlUeHqEntDeInit 
-(
-RgSchCellCb      *cell,
-RgSchDlHqEnt     *hqE
-)
-#else
-S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
-RgSchCellCb      *cell;
-RgSchDlHqEnt     *hqE;
-#endif
+S16 rgSCHSc1DlUeHqEntDeInit(RgSchCellCb *cell,RgSchDlHqEnt *hqE)
 {
 
    if(hqE->sch)
@@ -2283,21 +1883,7 @@ RgSchDlHqEnt     *hqE;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrDlUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrDlUeRecfg(RgSchCellCb  *cell,RgSchUeCb  *ue,RgrUeRecfg  *ueRecfg,RgSchErrInfo *err)
 {
    RgSchSc1DlUe *ueDl     = RG_GET_SC1_UE_DL(ue, cell);
    RgSchCmnDlUe *ueCmnDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -2374,21 +1960,11 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRmvUeFrmPrioQs
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlRmvUeFrmPrioQs(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1DlUe         *sc1Ue;
    RgSchDlLcCb          *svc;
-   uint32_t                  idx;
+   uint32_t             idx;
 
 
    sc1Ue = RG_GET_SC1_UE_DL(ue, cell);
@@ -2424,23 +2000,13 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlInactvtUe
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlInactvtUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlInactvtUe(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1DlCell       *cellDl = RG_GET_SC1_CELL_DL(cell);
    RgSchDlHqProcCb      *hqP;
    RgSchCmnDlHqProc     *hqProcDl;
-   uint8_t                   i;
-   RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
+   uint8_t              i;
+   RgSchDlHqEnt         *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
    /* ccpu00130170: UE related HARQ Procs are cleared only 
@@ -2490,22 +2056,12 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlSuspendUe 
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-static Void rgSCHSc1DlSuspendUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+static Void rgSCHSc1DlSuspendUe(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchDlHqProcCb      *hqP;
-   uint8_t                   i;
-   uint8_t                   j;
-   RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
+   uint8_t              i;
+   uint8_t              j;
+   RgSchDlHqEnt         *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
 
    /* remove all in use HARQ processes from the subframes.
@@ -2557,15 +2113,7 @@ RgSchUeCb    *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1DlScanUpdPdbPrio
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHSc1DlScanUpdPdbPrio (cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHSc1DlScanUpdPdbPrio(RgSchCellCb *cell)
 {
    
    return;
@@ -2591,17 +2139,7 @@ RgSchCellCb *cell;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHSc1DlFillFlowCntrlInfo
-(
-RgSchCellCb    *cell,
-RgInfSfAlloc   *sfAlloc
-)
-#else
-S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
-RgSchCellCb    *cell;
-RgInfSfAlloc   *sfAlloc;
-#endif
+S16 rgSCHSc1DlFillFlowCntrlInfo(RgSchCellCb    *cell,RgInfSfAlloc   *sfAlloc)
 {
   return ROK;
 }
@@ -2619,17 +2157,7 @@ RgInfSfAlloc   *sfAlloc;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlUeDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1DlUeDel(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1DlUeDel(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell);
@@ -2681,23 +2209,7 @@ RgSchUeCb    *ue;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchDlLcCb  *dlLc,
-RgrLchCfg *lcCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchCfg *lcCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcCfg(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchDlLcCb  *dlLc,RgrLchCfg *lcCfg,RgSchErrInfo *err)
 {
    S16      ret;
 
@@ -2739,23 +2251,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchDlLcCb  *dlLc,
-RgrLchRecfg  *lcRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchDlLcCb  *dlLc;
-RgrLchRecfg  *lcRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcRecfg(RgSchCellCb  *cell,RgSchUeCb  *ue,RgSchDlLcCb  *dlLc,RgrLchRecfg  *lcRecfg,RgSchErrInfo *err)
 {
 
    UNUSED(err);
@@ -2780,19 +2276,7 @@ RgSchErrInfo *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSc1RgrDlCellRecfg
-(
-RgSchCellCb             *cell,
-RgrCellRecfg            *recfg,
-RgSchErrInfo            *err
-)
-#else
-static S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err)
-RgSchCellCb             *cell;
-RgrCellRecfg            *recfg;
-RgSchErrInfo            *err;
-#endif
+static S16 rgSCHSc1RgrDlCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err)
 {
    return ROK;
 }
@@ -2816,23 +2300,13 @@ RgSchErrInfo            *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlTaCmd
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlTaCmd(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlTaCmd(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLListCp            *lst;
    CmLList              *node;
    RgSchDlHqProcCb      *proc;
    RgSchUeCb            *ue;
-   uint32_t                  effBo;
+   uint32_t             effBo;
    RgSchCmnDlCell       *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlUe         *cmnUeDl; 
    RgSchSc1DlUe         *ueDl;
@@ -2921,22 +2395,11 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @param[out] CmLListCp   *inactvLst
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1DlHndlInActUes
-(
-RgSchCellCb           *cell,
-CmLListCp             *inactvLst
-)
-#else
-Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
-RgSchCellCb           *cell;
-CmLListCp             *inactvLst;
-#endif
+Void rgSCHSc1DlHndlInActUes(RgSchCellCb *cell,CmLListCp *inactvLst)
 {
    CmLList   *node;
    RgSchUeCb *ue;
 
-
    node = inactvLst->first;
    while(node)
    {
@@ -2966,15 +2429,7 @@ CmLListCp             *inactvLst;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlInit
-(
-RgDlSchdApis *rgSchDlApis
-)
-#else
-Void rgSCHSc1DlInit(rgSchDlApis)
-RgDlSchdApis *rgSchDlApis;
-#endif
+Void rgSCHSc1DlInit(RgDlSchdApis *rgSchDlApis)
 {
    /* Init the function pointers */
    rgSchDlApis->rgSCHRgrDlUeCfg        = rgSCHSc1RgrDlUeCfg;
@@ -3024,17 +2479,9 @@ RgDlSchdApis *rgSchDlApis;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlInitQueues
-(
-RgSchSc1DlCell *cellDl
-)
-#else
-static Void rgSCHSc1DlInitQueues(cellDl)
-RgSchSc1DlCell *cellDl;
-#endif
+static Void rgSCHSc1DlInitQueues(RgSchSc1DlCell *cellDl)
 {
-   uint8_t            i;
+   uint8_t i;
 
    for (i = 0; i < RG_SC1_DL_NUM_Q; ++i)
    {
@@ -3085,17 +2532,7 @@ RgSchSc1DlCell *cellDl;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlRetxAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
@@ -3164,31 +2601,15 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlSprTxTbDstn
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-RgSchDlHqTbCb  *tbInfo,
-uint32_t            *effAlloc,
-CmLList        **node
-)
-#else
-static Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchDlHqTbCb  *tbInfo;
-uint32_t            *effAlloc;
-CmLList        **node;
-#endif
+static Void rgSCHSc1DlSprTxTbDstn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqTbCb  *tbInfo,uint32_t  *effAlloc,CmLList **node)
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   uint32_t                bytes;
+   uint32_t           bytes;
    RgSchLchAllocInfo  lchSchdData;
-   uint32_t                effBo;
-   uint32_t                rlcHdrEstmt;
+   uint32_t           effBo;
+   uint32_t           rlcHdrEstmt;
 
 
    while((*node) && (*effAlloc > 0))
@@ -3297,28 +2718,12 @@ CmLList        **node;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxTbDstn 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-RgSchDlHqTbCb  *tbInfo,
-uint32_t            *effAlloc,
-CmLList        **node
-)
-#else
-static Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-RgSchDlHqTbCb  *tbInfo;
-uint32_t            *effAlloc;
-CmLList        **node;
-#endif
+static Void rgSCHSc1DlNewTxTbDstn(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlHqTbCb  *tbInfo,uint32_t *effAlloc,CmLList **node)
 {
    RgSchDlLcCb        *svc;
    RgSchSc1DlSvc      *svcSc1 = NULLP;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
-   uint32_t                bytes;
+   uint32_t           bytes;
    RgSchLchAllocInfo  lchSchdData;
    CmLList            *prev = NULLP;
 
@@ -3450,19 +2855,7 @@ CmLList        **node;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxUeFnlz 
-(
-RgSchCellCb    *cell,
-RgSchCmnDlRbAllocInfo *allocInfo,
-RgSchUeCb      *ue
-)
-#else
-static Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue)
-RgSchCellCb    *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-RgSchUeCb      *ue;
-#endif
+static Void rgSCHSc1DlNewTxUeFnlz (RgSchCellCb  *cell,RgSchCmnDlRbAllocInfo *allocInfo,RgSchUeCb *ue)
 {
    CmLList            *node;
    RgSchSc1DlUe       *ueDl = RG_GET_SC1_UE_DL(ue, cell);
@@ -3470,11 +2863,11 @@ RgSchUeCb      *ue;
                                  /*cell added as part of CA dev*/
    /* 3.1 MIMO Distribute data of each TB across services */
    RgSchDlRbAlloc *dlAllocCb = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue, cell);
-   uint32_t                remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc;
-   uint32_t                remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc;
-   uint32_t                effAlloc = 0;
+   uint32_t           remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc;
+   uint32_t           remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc;
+   uint32_t           effAlloc = 0;
    /*ccpu00120365-ADD-added to code to check if second TB is utilized */
-   uint32_t                tb2Bytes = 0;
+   uint32_t           tb2Bytes = 0;
 
 
 
@@ -3553,17 +2946,7 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlNewTxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1DlNewTxAllocFnlz (RgSchCellCb  *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
@@ -3634,27 +3017,17 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRetxNewTxAllocFnlz 
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *cellAllocInfo
-)
-#else
-static Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *cellAllocInfo;
-#endif
+static Void rgSCHSc1DlRetxNewTxAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *cellAllocInfo)
 {
    CmLList          *node;
    RgSchUeCb        *ue;
    RgSchSc1DlUe     *sc1DlUe;
    RgSchDlHqProcCb  *hqP;
    RgSchDlHqTbCb    *newTxTbInfo;
-   uint32_t              effAlloc;
-   uint32_t              remTbBytes;
+   uint32_t         effAlloc;
+   uint32_t         remTbBytes;
    RgSchDlRbAlloc   *ueAllocInfo; 
-   RgSchDlRbAlloc *dlAllocCb;
+   RgSchDlRbAlloc   *dlAllocCb;
 
    
    node = cellAllocInfo->dedAlloc.schdTxRetxHqPLst.first;
@@ -3731,17 +3104,7 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnDlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnDlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1DlAllocFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo)
 {
 
    rgSCHSc1DlRetxAllocFnlz(cell, allocInfo);
@@ -3772,21 +3135,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1DlCqiInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-Bool               isPucchInfo,
-Void               *dlCqi
-)
-#else
-Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-Bool               isPucchInfo;
-Void               *dlCqi;
-#endif
+Void rgSCHSc1DlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,Bool isPucchInfo,Void *dlCqi)
 {
    return;
 }
@@ -3814,19 +3163,7 @@ Void               *dlCqi;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlAdd2UeLcsWithData
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlAdd2UeLcsWithData(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    CmLListCp            *lst;
    CmLList              *node;
@@ -3884,19 +3221,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1DlRmFrmUeLcsWithData
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-static Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+static Void rgSCHSc1DlRmFrmUeLcsWithData(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb  *svc)
 {
    RgSchSc1DlSvc        *sc1DlSvc = RG_GET_SC1_SVC_DL(ue,svc,cell);
    RgSchSc1DlUe         *sc1DlUe  = RG_GET_SC1_UE_DL(ue, cell);
@@ -3983,21 +3308,7 @@ RgSchErrInfo     *err
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHSc1UlLchDel
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue,
-CmLteLcId        lcId,
-uint8_t               lcgId
-)
-#else
-S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-CmLteLcId        lcId;
-uint8_t               lcgId;
-#endif
+S16 rgSCHSc1UlLchDel(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteLcId lcId,uint8_t lcgId)
 {
   return  (ROK);
 }
@@ -4019,15 +3330,7 @@ uint8_t               lcgId;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1UlInit
-(
-RgUlSchdApis *rgSchUlApis
-)
-#else
-Void rgSCHSc1UlInit(rgSchUlApis)
-RgUlSchdApis *rgSchUlApis;
-#endif
+Void rgSCHSc1UlInit(RgUlSchdApis *rgSchUlApis)
 {
    /* Init the function pointers */
    rgSchUlApis->rgSCHRgrUlUeCfg     = rgSCHSc1RgrUlUeCfg;
@@ -4076,21 +3379,7 @@ RgUlSchdApis *rgSchUlApis;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlUeCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeCfg     *ueCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeCfg     *ueCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrUlUeCfg(RgSchCellCb  *cell,RgSchUeCb *ue,RgrUeCfg  *ueCfg,RgSchErrInfo *err)
 {
   
    RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell);
@@ -4125,21 +3414,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrUlUeRecfg(RgSchCellCb *cell,RgSchUeCb  *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrUeRecfg */
@@ -4158,17 +3433,7 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlUeDel
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1UlUeDel(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1UlUeDel(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe   *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
@@ -4209,17 +3474,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlUeReset 
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1UlUeReset(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1UlUeReset(RgSchCellCb  *cell,RgSchUeCb    *ue)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe   *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
@@ -4259,23 +3514,10 @@ RgSchUeCb    *ue;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlCellCfg
-(
-RgSchCellCb   *cell,
-RgrCellCfg    *cellCfg,
-RgSchErrInfo  *err
-)
-#else
-S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
-RgSchCellCb   *cell;
-RgrCellCfg    *cellCfg;
-RgSchErrInfo  *err;
-#endif
+S16 rgSCHSc1RgrUlCellCfg(RgSchCellCb  *cell,RgrCellCfg  *cellCfg,RgSchErrInfo *err)
 {
    RgSchSc1UlCell     *cellUl; 
 
-
    if((rgSCHUtlAllocSBuf(cell->instIdx, 
       (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->ul.schSpfc), \
       (sizeof(RgSchSc1UlCell))) != ROK))
@@ -4308,19 +3550,7 @@ RgSchErrInfo  *err;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrUlCellRecfg
-(
-RgSchCellCb             *cell,
-RgrCellRecfg            *recfg,
-RgSchErrInfo            *err
-)
-#else
-S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
-RgSchCellCb             *cell;
-RgrCellRecfg            *recfg;
-RgSchErrInfo            *err;
-#endif
+S16 rgSCHSc1RgrUlCellRecfg(RgSchCellCb *cell,RgrCellRecfg  *recfg,RgSchErrInfo  *err)
 {
    return ROK;
 }
@@ -4338,15 +3568,7 @@ RgSchErrInfo            *err;
  *  @param[in]  RgSchCellCb  *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlCellDel
-(
-RgSchCellCb  *cell
-)
-#else
-Void rgSCHSc1UlCellDel(cell)
-RgSchCellCb  *cell;
-#endif
+Void rgSCHSc1UlCellDel(RgSchCellCb  *cell)
 {
    RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell);
 
@@ -4383,23 +3605,7 @@ RgSchCellCb  *cell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcgCfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-RgrLcgCfg    *lcgCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgCfg    *lcgCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcgCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg,RgrLcgCfg *lcgCfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrLcgCfg */
@@ -4426,23 +3632,7 @@ RgSchErrInfo *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgSCHSc1RgrLcgRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-RgrLcgRecfg  *reCfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-RgrLcgRecfg  *reCfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHSc1RgrLcgRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg,RgrLcgRecfg *reCfg,RgSchErrInfo *err)
 {
    return ROK;
 }  /* rgSCHSc1RgrLcgRecfg */
@@ -4461,19 +3651,7 @@ RgSchErrInfo *err;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1LcgDel
-(
-RgSchCellCb   *cell,
-RgSchUeCb     *ue,
-RgSchLcgCb    *lcg
-)
-#else
-Void rgSCHSc1LcgDel(cell, ue, lcg)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-RgSchLcgCb    *lcg;
-#endif
+Void rgSCHSc1LcgDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -4496,17 +3674,7 @@ RgSchLcgCb    *lcg;
  *  @param[in]  RgSchUeCb        *ue
  *  @return  Void
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdUe
-(
-RgSchUeCb         *ue,
-RgSchCellCb       *cell
-)
-#else
-static Void rgSCHSc1UlSchdUe(ue,cell)
-RgSchUeCb         *ue;
-RgSchCellCb       *cell;
-#endif
+static Void rgSCHSc1UlSchdUe(RgSchUeCb *ue,RgSchCellCb *cell)
 {
    RgSchCmnUlUe      *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue, cell);
                                 /*cell added as part of CA dev*/
@@ -4541,23 +3709,10 @@ RgSchCellCb       *cell;
  *  @param[in] uint8_t                     remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdForDataTrans
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    remUe
-)
-#else
-static Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    remUe;
-#endif
+static Void rgSCHSc1UlSchdForDataTrans(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t remUe)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
 
-
    if (remUe == 0)
    {
       return;
@@ -4591,26 +3746,12 @@ uint8_t                    remUe;
  *  @param[in] uint8_t                     *remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdUeTxLst
-(
-RgSchCellCb           *cell,
-CmLListCp             *ueTxLst,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    *remUe
-)
-#else
-static Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe)
-RgSchCellCb           *cell;
-CmLListCp             *ueTxLst;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    *remUe;
-#endif
+static Void rgSCHSc1UlSchdUeTxLst(RgSchCellCb *cell,CmLListCp *ueTxLst,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t *remUe)
 {
-   RgSchUeCb         *ue;
-   CmLList           *node;
+   RgSchUeCb *ue;
+   CmLList   *node;
 #ifdef LTEMAC_HDFDD
-   Bool              ulAllowed = FALSE;
+   Bool      ulAllowed = FALSE;
 #endif
 
 
@@ -4671,19 +3812,7 @@ uint8_t                    *remUe;
  *  @param[out] uint8_t                    *remUe 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlSchdForContRes
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo,
-uint8_t                    *remUe
-)
-#else
-static Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-uint8_t                    *remUe;
-#endif
+static Void rgSCHSc1UlSchdForContRes(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo,uint8_t *remUe)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
    RgSchUeCb         *ue;
@@ -4741,17 +3870,7 @@ uint8_t                    *remUe;
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
  *  @return Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlNewTx
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlNewTx(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlNewTx(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    uint8_t               remUe = cellUl->maxUeNewTxPerTti;
@@ -4778,17 +3897,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[out] RgSchCmnUlRbAllocInfo *allocInfo 
  *  @return Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UlSched 
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1UlSched(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1UlSched(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    rgSCHSc1UlNewTx(cell, allocInfo);
    return;
@@ -4808,19 +3917,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlInsUeInQ 
-(
-CmLListCp           *lst,
-RgSchUeCb           *ue,
-RgSchCellCb         *cell
-)
-#else
-static Void rgSCHSc1UlInsUeInQ(lst, ue, cell)
-CmLListCp           *lst;
-RgSchUeCb           *ue;
-RgSchCellCb         *cell;
-#endif
+static Void rgSCHSc1UlInsUeInQ(CmLListCp *lst,RgSchUeCb *ue,RgSchCellCb *cell)
 {
                               /*cell added as part of CA dev*/
    RgSchSc1UlUe    *ueUl    = RG_GET_SC1_UE_UL(ue, cell);
@@ -4878,17 +3975,7 @@ RgSchCellCb         *cell;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void 
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlPosnUeInQ 
-(
-RgSchCellCb         *cell,
-RgSchUeCb           *ue
-)
-#else
-static Void rgSCHSc1UlPosnUeInQ(cell, ue)
-RgSchCellCb         *cell;
-RgSchUeCb           *ue;
-#endif
+static Void rgSCHSc1UlPosnUeInQ(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
                               /*cell added as part of CA dev*/
@@ -4959,21 +4046,7 @@ RgSchUeCb           *ue;
  *  @param[in]  uint8_t           bsr
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrShort
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-uint8_t           bsr
-)
-#else
-Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-uint8_t           bsr;
-#endif
+Void rgSCHSc1UpdBsrShort(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchLcgCb   *lcg,uint8_t  bsr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -4995,21 +4068,7 @@ uint8_t           bsr;
  *  @param[in]  uint8_t           bsr
  *  @return  Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrTrunc
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchLcgCb   *lcg,
-uint8_t           bsr
-)
-#else
-Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchLcgCb   *lcg;
-uint8_t           bsr;
-#endif
+Void rgSCHSc1UpdBsrTrunc(RgSchCellCb  *cell,RgSchUeCb    *ue,RgSchLcgCb   *lcg,uint8_t bsr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5030,19 +4089,7 @@ uint8_t           bsr;
  *  @param[in]  uint8_t bsArr[]
  *  @return  Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1UpdBsrLong
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           *bsArr
-)
-#else
-Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           *bsArr;
-#endif
+Void rgSCHSc1UpdBsrLong(RgSchCellCb  *cell,RgSchUeCb *ue,uint8_t *bsArr)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5063,17 +4110,7 @@ uint8_t           *bsArr;
  *  @param[in]  RgSchUeCb    *ue
  *  @return Void 
  **/
-#ifdef ANSI
-Void rgSCHSc1ContResUlGrant
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1ContResUlGrant(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1ContResUlGrant(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ueUl   = RG_GET_SC1_UE_UL(ue, cell);
    RgSchSc1UlCell  *cellUl = RG_GET_SC1_CELL_UL(cell);
@@ -5109,17 +4146,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1SrRcvd
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHSc1SrRcvd(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHSc1SrRcvd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchSc1UlUe    *ulUe    = RG_GET_SC1_UE_UL(ue, cell);
    RgSchSc1UlCell  *ulCell  = RG_GET_SC1_CELL_UL(cell);
@@ -5158,19 +4185,7 @@ RgSchUeCb    *ue;
  *  @param[in]  TfuUlCqiRpt         *ulCqiInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlCqiInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-TfuUlCqiRpt          *ulCqiInfo
-)
-#else
-Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-TfuUlCqiRpt          *ulCqiInfo;
-#endif
+Void rgSCHSc1UlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo)
 {
 
   /* Stack Crash problem for TRACE5 changes. Added the return below */
@@ -5192,22 +4207,9 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @param[in]  RgInfUeDatInd      *datInd
  *  @return  S16
  **/
-#ifdef ANSI
-S16 rgSCHSc1UlLcgUpd
-(
-RgSchCellCb         *cell,
-RgSchUeCb           *ue,
-RgInfUeDatInd       *datInd
-)
-#else
-S16 rgSCHSc1UlLcgUpd(cell, ue)
-RgSchCellCb         *cell;
-RgSchUeCb           *ue;
-RgInfUeDatInd       *datInd;
-#endif
+S16 rgSCHSc1UlLcgUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgInfUeDatInd  *datInd)
 {
 
-
    return ROK;  
 }
 
@@ -5227,17 +4229,7 @@ RgInfUeDatInd       *datInd;
  *     File : 
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHSc1UlUeRefresh
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1UlUeRefresh(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1UlUeRefresh(RgSchCellCb *cell,RgSchUeCb  *ue)
 {
    rgSCHSc1UlPosnUeInQ(cell, ue);
    return;
@@ -5262,19 +4254,9 @@ RgSchUeCb      *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlDatTransAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlDatTransAllocFnlz(RgSchCellCb  *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
-   RgSchSc1UlUe         *ueUl;
+   RgSchSc1UlUe      *ueUl;
    RgSchUeCb         *ue;
    CmLList           *node;
    RgSchDrxUeCb      *drxUe    = NULLP;
@@ -5350,17 +4332,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSc1UlContResAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-static Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+static Void rgSCHSc1UlContResAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
    RgSchSc1UlCell    *sc1UlCell  = RG_GET_SC1_CELL_UL(cell);
    RgSchSc1UlUe      *ueUl;
@@ -5417,17 +4389,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSc1UlAllocFnlz
-(
-RgSchCellCb           *cell,
-RgSchCmnUlRbAllocInfo *allocInfo
-)
-#else
-Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
-RgSchCellCb           *cell;
-RgSchCmnUlRbAllocInfo *allocInfo;
-#endif
+Void rgSCHSc1UlAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo)
 {
 
    rgSCHSc1UlContResAllocFnlz(cell, allocInfo);
@@ -5451,17 +4413,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @param[in]  RgSchUeCb   *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlActvtUe 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Void rgSCHSc1UlActvtUe(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue;
-#endif
+Void rgSCHSc1UlActvtUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 
    rgSCHSc1UlPosnUeInQ(cell, ue);
@@ -5487,23 +4439,12 @@ RgSchUeCb      *ue;
  *  @param[out] CmLListCp   *inactvLst
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHSc1UlHndlInActUes
-(
-RgSchCellCb           *cell,
-CmLListCp             *inactvLst
-)
-#else
-Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
-RgSchCellCb           *cell;
-CmLListCp             *inactvLst;
-#endif
+Void rgSCHSc1UlHndlInActUes(RgSchCellCb *cell,CmLListCp  *inactvLst)
 {
-   RgSchUeCb    *ue;
-   RgSchSc1UlUe    *ulUe;
-   RgSchSc1UlCell  *cellUl  = RG_GET_SC1_CELL_UL(cell);
-   CmLList      *node = inactvLst->first;
-
+   RgSchUeCb      *ue;
+   RgSchSc1UlUe   *ulUe;
+   RgSchSc1UlCell *cellUl  = RG_GET_SC1_CELL_UL(cell);
+   CmLList        *node = inactvLst->first;
 
    while (node)
    {
@@ -5539,18 +4480,11 @@ CmLListCp             *inactvLst;
  *  @return  Void
  **/
 
-#ifdef ANSI
 Void rgSCHSc1DlProcRmvFrmRetx(
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 )
-#else
-Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlHqProcCb            *hqP;
-#endif
 {
   
    /* Remove the HqP from retx Queue.
index 49e5a52..773b840 100755 (executable)
@@ -132,17 +132,7 @@ uint16_t           rnti
  *  @return     Void
  *      -# None.
  **/
-#ifdef ANSI
-Void rgSCHSCellSchdActDeactCe
-(
-RgSchUeCb         *ueCb,
-RgSchDlHqTbCb     *tbInfo
-)
-#else
-Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
-RgSchUeCb         *ueCb;
-RgSchDlHqTbCb     *tbInfo;
-#endif
+Void rgSCHSCellSchdActDeactCe(RgSchUeCb  *ueCb,RgSchDlHqTbCb *tbInfo)
 {
 
    uint8_t   bitVal = 0;
@@ -219,17 +209,7 @@ RgSchDlHqTbCb     *tbInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellAddToActDeactLst
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-Void rgSCHSCellAddToActDeactLst(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+Void rgSCHSCellAddToActDeactLst(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
 
@@ -263,17 +243,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellRmvFrmActLst
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-Void rgSCHSCellRmvFrmActLst(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+Void rgSCHSCellRmvFrmActLst(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
    if (NULLP != ue->sCellActLnk.node)
@@ -302,15 +272,7 @@ RgSchUeCb                  *ue;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellActivation
-(
-RgSchUeCellInfo  *sCellInfo
-)
-#else
-Void rgSCHSCellActivation(sCellInfo)
-RgSchUeCellInfo  *sCellInfo
-#endif
+Void rgSCHSCellActivation(RgSchUeCellInfo  *sCellInfo)
 {
    RgSchCellCb  *sCell = sCellInfo->cell;
    RgSchUeCb    *ueCb = sCellInfo->ue;
@@ -510,15 +472,7 @@ RgSchUeCellInfo  *sCellInfo
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHCellClearScellLstOfCQI
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-static Void rgSCHCellClearScellLstOfCQI(sCellInfo)
-RgSchUeCellInfo *sCellInfo;
-#endif
+static Void rgSCHCellClearScellLstOfCQI(RgSchUeCellInfo *sCellInfo)
 {
 
    RgSchUePCqiCb *cqiRiCb = NULLP;
@@ -577,15 +531,7 @@ RgSchUeCellInfo *sCellInfo;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSCellDeActivation
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-static S16 rgSCHSCellDeActivation(sCellInfo)
-RgSchUeCellInfo *sCellInfo
-#endif
+static S16 rgSCHSCellDeActivation(RgSchUeCellInfo *sCellInfo)
 {
    return ROK;
    RgSchCmnCell *cellSch;
@@ -660,19 +606,7 @@ RgSchUeCellInfo *sCellInfo
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSCellTrgMacHqEReset
-(
-Inst          inst,
-uint16_t           secCellId,
-uint16_t           rnti
-)
-#else
-static S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti)
-Inst          inst;
-uint16_t           secCellId;
-uint16_t           rnti;
-#endif
+static S16 rgSCHSCellTrgMacHqEReset(Inst inst,uint16_t secCellId,uint16_  rnti)
 {
    Pst               pst;
    RgSchCellCb      *secCellCb = NULLP;
@@ -717,21 +651,7 @@ uint16_t           rnti;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellHndlFdbkInd
-(
-RgSchDlHqProcCb   *hqP,
-uint8_t                tbIdx,
-uint8_t                fdbk,
-Bool              maxHqRetxReached
-)
-#else
-Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
-RgSchDlHqProcCb   *hqP;
-uint8_t                tbIdx;
-uint8_t                fdbk;
-Bool              maxHqRetxReached;
-#endif
+Void rgSCHSCellHndlFdbkInd(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t  fdbk,Bool maxHqRetxReached)
 {
 
    RgSchUeCb      *ueCb;
@@ -825,15 +745,7 @@ Bool              maxHqRetxReached;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDeactTmrExpry
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-Void rgSCHSCellDeactTmrExpry(sCellInfo)
-RgSchUeCellInfo *sCellInfo;
-#endif
+Void rgSCHSCellDeactTmrExpry(RgSchUeCellInfo *sCellInfo)
 {
 
    if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
@@ -881,21 +793,7 @@ RgSchUeCellInfo *sCellInfo;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHSCellTrigActDeact
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ueCb,
-uint8_t            sCellIdx,
-uint8_t            action
-)
-#else
-S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
-RgSchCellCb  *cell,
-RgSchUeCb    *ueCb;
-uint8_t            sCellIdx;
-uint8_t            action;
-#endif
+S16 rgSCHSCellTrigActDeact(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t sCellIdx,uint8_t action)
 {
    Inst inst = cell->instIdx;
    S16 ret   = ROK;
@@ -1004,19 +902,7 @@ uint8_t            action;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-static S16 rgSCHSCellSelectForAct
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ueCb,
-uint8_t           *sCellIdx
-)
-#else
-static S16 rgSCHSCellSelectForAct(cell, ueCb)
-RgSchCellCb  *cell;
-RgSchUeCb    *ueCb;
-uint8_t           *sCellIdx;
-#endif
+static S16 rgSCHSCellSelectForAct(RgSchCellCb *cell,RgSchUeCb  *ueCb,uint8_t *sCellIdx)
 {
 
    for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
@@ -1047,19 +933,7 @@ uint8_t           *sCellIdx;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellSelectAndActDeAct
-(
-RgSchCellCb  *pCell,
-RgSchUeCb    *ueCb,
-uint8_t           action
-)
-#else
-Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
-RgSchCellCb  *pCell;
-RgSchUeCb    *ueCb;
-uint8_t           action;
-#endif
+Void rgSCHSCellSelectAndActDeAct(RgSchCellCb  *pCell,RgSchUeCb *ueCb,uint8_t action)
 {
    uint8_t  sCellIdx = 0;
    S16 ret = ROK;
@@ -1106,19 +980,7 @@ uint8_t           action;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDelUeSCell
-(
-RgSchCellCb  *cellCb,
-RgSchUeCb    *ueCb,
-uint8_t            sCellIdx
-)
-#else
-Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
-RgSchCellCb  *cellCb;
-RgSchUeCb    *ueCb;
-uint8_t            sCellIdx;
-#endif
+Void rgSCHSCellDelUeSCell(RgSchCellCb  *cellCb,RgSchUeCb *ueCb,uint8_t sCellIdx)
 {
    RgUeUlHqCb       *ulHqEnt;
    Inst inst = cellCb->instIdx;
@@ -1192,17 +1054,7 @@ uint8_t            sCellIdx;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHSCellDelUe
-(
-RgSchCellCb  *cellCb,
-RgSchUeCb    *ueCb
-)
-#else
-S16 rgSCHSCellDelUe(cellCb,ueCb)
-RgSchCellCb  *cellCb;
-RgSchUeCb    *ueCb;
-#endif
+S16 rgSCHSCellDelUe(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
 
 
@@ -1246,7 +1098,6 @@ RgSchUeCb    *ueCb;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
 S16 rgSCHSCellPCqiCfg
 (
 RgSchCellCb  *priCellCb,
@@ -1254,17 +1105,8 @@ RgSchCellCb  *secCellCb,
 RgSchUeCb    *ueCb,
 RgrUePrdDlCqiCfg  *cqiCfg,
 CmLteUeCategory   ueCat,
-uint8_t            sCellIdx
+uint8_t sCellIdx
 )
-#else
-S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
-RgSchCellCb       *priCellCb;
-RgSchCellCb       *secCellCb;
-RgSchUeCb         *ueCb;
-RgrUePrdDlCqiCfg  *cqiCfg;
-CmLteUeCategory    ueCat;
-uint8_t                sCellIdx;
-#endif
 {
    uint8_t     j;  /*Bandwidth Parts*/
    uint8_t     temp; 
@@ -1408,17 +1250,7 @@ uint8_t                sCellIdx;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDlUeReset
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-Void rgSCHSCellDlUeReset(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+Void rgSCHSCellDlUeReset(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    RgSchCmnCell *cellSch;
 
@@ -1452,19 +1284,7 @@ RgSchUeCb                  *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDlLcCfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSCellDlLcCfg(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSCellDlLcCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
@@ -1493,19 +1313,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDlLcDel
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSCellDlLcDel(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSCellDlLcDel(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchDlLcCb  *svc)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
@@ -1534,19 +1342,7 @@ RgSchDlLcCb                *svc;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHSCellDlDedBoUpd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHSCellDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -1585,17 +1381,7 @@ RgSchDlLcCb                *svc;
  *  @return uint8_t cqiCb cell idx which has the higher priority
  *
  **/
-#ifdef ANSI
-static uint8_t  rgSCHUtlSCellCmpCqiCfg
-(
-RgSchUePCqiCb *cqiCb1,
-RgSchUePCqiCb *cqiCb2
-)
-#else
-static uint8_t  rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2)
-RgSchUePCqiCb     *cqiCb1;
-RgSchUePCqiCb     *cqiCb2;
-#endif
+static uint8_t  rgSCHUtlSCellCmpCqiCfg(RgSchUePCqiCb *cqiCb1,RgSchUePCqiCb *cqiCb2)
 {
    RgSchUePCqiCb     *retCqiCb;
    /* Collision rules are defined in TS 36.213,7.2.2 */
@@ -1648,15 +1434,7 @@ RgSchUePCqiCb     *cqiCb2;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlSCellHndlCqiCollsn
-(
-RgSchUePCqiCb *cqiCb
-)
-#else
-S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
-RgSchUePCqiCb     *cqiCb;
-#endif
+S16 rgSCHUtlSCellHndlCqiCollsn(RgSchUePCqiCb *cqiCb)
 {
    uint32_t nPCqiServCellIdx;
    uint32_t minPCqiTrIdx;
@@ -1758,15 +1536,7 @@ RgSchUePCqiCb     *cqiCb;
  *  @return  ROK/RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlSCellHndlRiCollsn
-(
-RgSchUePCqiCb *cqiCb
-)
-#else
-S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
-RgSchUePCqiCb     *cqiCb;
-#endif
+S16 rgSCHUtlSCellHndlRiCollsn(RgSchUePCqiCb *cqiCb)
 {
    uint32_t nPRiServCellIdx;
    uint32_t minPRiTrIdx;
@@ -1876,17 +1646,7 @@ RgSchUePCqiCb     *cqiCb;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHSCellIsActive
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue
-)
-#else
-S16 rgSCHSCellIsActive(cell, ue)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-#endif
+S16 rgSCHSCellIsActive(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    S16 retVal = RFAILED;
 
@@ -1917,17 +1677,7 @@ RgSchUeCb                  *ue;
  *  @return  BOOL
  *      -#  TRUE
  **/
-#ifdef ANSI
-Bool rgSCHIsActvReqd 
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue
-)
-#else
-Bool rgSCHIsActvReqd(cell, ue)
-RgSchCellCb    *cell;
-RgSchUeCb      *ue
-#endif
+Bool rgSCHIsActvReqd(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    /* Check if remBoCnt in this UE is greater than ZERO for sufficient number of
     * Scheduling TTIs. If yes then We should activate a secondary cell to handle
index bc1c10b..068e8b1 100755 (executable)
@@ -76,21 +76,7 @@ RgSchUeCellInfo  *sCell
   *   @param[in]  uint32_t            tmrVal
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrStartTmr
-(
-RgSchCellCb *cell,
-Ptr         cb,
-S16         tmrEvnt,
-uint32_t         tmrVal
-)
-#else
-Void rgSCHTmrStartTmr (cell, cb, tmrEvnt, tmrVal)
-RgSchCellCb *cell;
-Ptr         cb;
-S16         tmrEvnt;
-uint32_t         tmrVal;
-#endif
+Void rgSCHTmrStartTmr(RgSchCellCb *cell,Ptr cb,S16 tmrEvnt,uint32_t tmrVal)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -203,19 +189,7 @@ uint32_t         tmrVal;
   *   @param[in]  Ptr            cb
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrStopTmr
-(
-RgSchCellCb   *cell,
-S16           tmrEvnt,
-Ptr           cb
-)
-#else
-Void rgSCHTmrStopTmr (cell, tmrEvnt, cb)
-RgSchCellCb   *cell;
-S16           tmrEvnt;
-Ptr           cb;
-#endif
+Void rgSCHTmrStopTmr(RgSchCellCb *cell,S16 tmrEvnt,Ptr cb)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -327,17 +301,7 @@ Ptr           cb;
   *   @param[in]  S16            tmrEvnt
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrProcTmr 
-(
-Ptr         cb,
-S16         tmrEvnt
-)
-#else
-Void rgSCHTmrProcTmr (cb, tmrEvnt)
-Ptr         cb;
-S16         tmrEvnt;
-#endif
+Void rgSCHTmrProcTmr(Ptr cb,S16 tmrEvnt)
 {
    RgSchUeCb      *ue = NULLP;
 #ifdef LTE_ADV
index ef373dc..ab8529e 100755 (executable)
@@ -753,21 +753,13 @@ S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHGetDedPrmUe 
 (
 RgSchCellCb     *cell,
-uint16_t             rapId,
+uint16_t        rapId,
 CmLteTimingInfo timingInfo,
 RgSchUeCb       **ue
 )
-#else
-S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue)
-RgSchCellCb     *cell; 
-uint16_t             rapId;
-CmLteTimingInfo timingInfo;
-RgSchUeCb       **ue;
-#endif
 {
    RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
 
@@ -812,25 +804,19 @@ RgSchUeCb       **ue;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomRaReqInd
 (
 RgSchCellCb     *cell,
 TfuRaReqIndInfo *raReqInd
 )
-#else
-S16 rgSCHTomRaReqInd(cell, raReqInd)
-RgSchCellCb     *cell; 
-TfuRaReqIndInfo *raReqInd;
-#endif
 {
-   S16             ret;
-   uint8_t              raRntiCnt;
-   uint8_t              raReqCnt;
-   RgSchErrInfo    err;
-   Bool            isEmtcUe = FALSE;
-   uint16_t             rapId;
-   RgSchUeCb       *ue = NULLP;
+   S16           ret;
+   uint8_t       raRntiCnt;
+   uint8_t       raReqCnt;
+   RgSchErrInfo  err;
+   Bool          isEmtcUe = FALSE;
+   uint16_t      rapId;
+   RgSchUeCb     *ue = NULLP;
 
    if(cell->cellId != raReqInd->cellId)
    {
@@ -910,17 +896,11 @@ TfuRaReqIndInfo *raReqInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomUlCqiInd
 ( 
 RgSchCellCb     *cell,
 TfuUlCqiIndInfo *ulCqiInd
 )
-#else
-S16 rgSCHTomUlCqiInd(cell, ulCqiInd)
-RgSchCellCb     *cell; 
-TfuUlCqiIndInfo *ulCqiInd;
-#endif
 {
    RgSchUeCb    *ue;
    CmLList      *node;
@@ -985,17 +965,11 @@ TfuUlCqiIndInfo *ulCqiInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomPucchDeltaPwrInd
 ( 
 RgSchCellCb             *cell,
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr
 )
-#else
-S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr)
-RgSchCellCb             *cell; 
-TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
-#endif
 {
    RgSchUeCb       *ue;
    CmLList         *node;
@@ -1052,17 +1026,11 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomHarqAckInd
 (
 RgSchCellCb     *cell,
 TfuHqIndInfo    *harqAckInd
 )
-#else
-S16 rgSCHTomHarqAckInd(cell, harqAckInd)
-RgSchCellCb     *cell; 
-TfuHqIndInfo    *harqAckInd;
-#endif
 {
    RgSchErrInfo    err;
    RgSchUeCb       *ue;
@@ -1243,17 +1211,11 @@ TfuHqIndInfo    *harqAckInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomSrInd
 (
 RgSchCellCb     *cell,
 TfuSrIndInfo    *srInd
 )
-#else
-S16 rgSCHTomSrInd(cell, srInd)
-RgSchCellCb     *cell; 
-TfuSrIndInfo    *srInd;
-#endif
 {
    S16          ret = RFAILED;
    RgSchErrInfo err;
@@ -1324,17 +1286,11 @@ TfuSrIndInfo    *srInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomDoaInd
 (
 RgSchCellCb     *cell,
 TfuDoaIndInfo   *doaInd
 )
-#else
-S16 rgSCHTomDoaInd(cell, doaInd )
-RgSchCellCb     *cell;
-TfuDoaIndInfo   *doaInd;
-#endif
 {
    RgSchUeCb    *ue;
    CmLList      *node;
@@ -1385,17 +1341,11 @@ TfuDoaIndInfo   *doaInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomDlCqiInd
 (
 RgSchCellCb     *cell,
 TfuDlCqiIndInfo *dlCqiInd
 )
-#else
-S16 rgSCHTomDlCqiInd(cell, dlCqiInd)
-RgSchCellCb     *cell;
-TfuDlCqiIndInfo *dlCqiInd;
-#endif
 {
    RgSchUeCb    *ue;
    CmLList      *node;
@@ -1449,19 +1399,12 @@ TfuDlCqiIndInfo *dlCqiInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgSCHTomUtlMovePcqiNxtOccasion
 (
- RgSchCellCb     *cell,
- RgSchUeCb      *ue,
- RgSchUePCqiCb   *cqiCb
- )
-#else
-static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb)
-   RgSchCellCb     *cell;
-   RgSchUeCb      *ue;
-   RgSchUePCqiCb   *cqiCb;
-#endif
+RgSchCellCb     *cell,
+RgSchUeCb      *ue,
+RgSchUePCqiCb   *cqiCb
+)
 {
    uint16_t   cqiIdx = 0;
 
@@ -1521,19 +1464,12 @@ static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgSCHTomUtlMovePriNxtOccasion
 (
- RgSchCellCb    *cell,
- RgSchUeCb      *ue, 
- RgSchUePCqiCb  *riCb
- )
-#else
-static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
- RgSchCellCb     *cell;
- RgSchUeCb       *ue;
- RgSchUePCqiCb   *riCb;
-#endif
+RgSchCellCb    *cell,
+RgSchUeCb      *ue, 
+RgSchUePCqiCb  *riCb
+)
 {
    uint16_t   riIdx;
    uint16_t   riDist=0;
@@ -1643,17 +1579,11 @@ static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgSCHTomUtlMoveSrNxtOccasion
 (
- RgSchCellCb     *cell,
- RgSchUeCb      *ue
- )
-#else
-static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue)
-   RgSchCellCb     *cell;
-   RgSchUeCb      *ue;
-#endif
+RgSchCellCb     *cell,
+RgSchUeCb      *ue
+)
 {
    uint16_t   srIdx = 0;
 
@@ -1697,17 +1627,11 @@ static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgSCHTomUtlMoveSrsNxtOccasion
 (
- RgSchCellCb     *cell,
- RgSchUeCb      *ue
- )
-#else
-static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
-   RgSchCellCb     *cell;
-   RgSchUeCb      *ue;
-#endif
+RgSchCellCb     *cell,
+RgSchUeCb      *ue
+)
 {
    uint16_t   srsIdx;
    uint16_t   srsDist;
@@ -1782,35 +1706,29 @@ static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomRawCqiInd
 (
- RgSchCellCb     *cell,
- TfuRawCqiIndInfo *rawCqiInd
+RgSchCellCb     *cell,
+TfuRawCqiIndInfo *rawCqiInd
 )
-#else
-S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
-   RgSchCellCb     *cell;
-   TfuRawCqiIndInfo *rawCqiInd;
-#endif
 {
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuRawCqiRpt* rawCqiInfo;
 
    RgSchErrInfo err;
-   uint32_t          cellIdx;
+   uint32_t     cellIdx;
    RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
    RgSchCellCb     *iterCellP;
 #if DL_LA
    RgSchCmnDlUe    *ueDl;
 #endif
-   uint8_t              cqi;
-   uint8_t              ri;
-   uint8_t              hqAck;
-   Pst             pst;
-   RgSchRaCb       *raCb;
-   TfuHqInfo       hqInfo;
+   uint8_t      cqi;
+   uint8_t      ri;
+   uint8_t      hqAck;
+   Pst          pst;
+   RgSchRaCb    *raCb;
+   TfuHqInfo    hqInfo;
 
    if(cell->cellId != rawCqiInd->cellId)
    {
@@ -2055,17 +1973,11 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomSrsInd
 (
- RgSchCellCb     *cell,
- TfuSrsIndInfo *srsInd
- )
-#else
-S16 rgSCHTomSrsInd(cell, srsInd)
-   RgSchCellCb     *cell;
-   TfuSrsIndInfo *srsInd;
-#endif
+RgSchCellCb     *cell,
+TfuSrsIndInfo *srsInd
+)
 {
    RgSchUeCb    *ue;
    CmLList      *node;
@@ -2113,23 +2025,14 @@ S16 rgSCHTomSrsInd(cell, srsInd)
 *
 */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlGenIndices
 (
- uint32_t      label,
- uint8_t        posM,
- uint8_t        valN,
- uint8_t        valK,
- TfuSubbandInfo*    sbInfo
- )
-#else
-static S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
-   uint32_t      label;
-   uint8_t        posM;
-   uint8_t        valN;
-   uint8_t        valK;
-   TfuSubbandInfo*    sbInfo;
-#endif
+uint32_t      label,
+uint8_t        posM,
+uint8_t        valN,
+uint8_t        valK,
+TfuSubbandInfo* sbInfo
+)
 {
    uint8_t idx, kval, xval, xmin;
    uint32_t binCoe;
@@ -2178,17 +2081,11 @@ static S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomCrcInd
 (
 RgSchCellCb       *cell,
 TfuCrcIndInfo *crcInd
 )
-#else
-S16 rgSCHTomCrcInd(cell, crcInd)
-RgSchCellCb       *cell;
-TfuCrcIndInfo *crcInd;
-#endif
 {
    RgSchUeCb      *ue = NULLP;
    RgSchRaCb      *raCb = NULLP;
@@ -2438,17 +2335,11 @@ TfuCrcIndInfo *crcInd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomTimingAdvInd
 (
 RgSchCellCb         *cell,
 TfuTimingAdvIndInfo *timingAdvInd
- )
-#else
-S16 rgSCHTomTimingAdvInd(cell, timingAdvInd)
-RgSchCellCb         *cell;
-TfuTimingAdvIndInfo *timingAdvInd;
-#endif
+)
 {
    RgSchUeCb        *ue;
    CmLList          *node;
@@ -2499,23 +2390,17 @@ TfuTimingAdvIndInfo *timingAdvInd;
  *  @param[in] Inst           schInst
  *  @return  Void
  **/
-#ifdef ANSI
 Void rgSCHTomTtiInd
 (
 SlotIndInfo        *slotInd,
 Inst               schInst
 )
-#else
-Void rgSCHTomTtiInd(slotInd, schInst)
-SlotIndInfo        *slotInd;
-Inst               schInst;
-#endif
 {
    RgInfSfAlloc      *subfrmAlloc;
    RgTfuCntrlReqInfo *cntrlInfo = NULLP;
    S16               ret = ROK;
-   uint8_t                i;
-   uint8_t                nCell = 0;
+   uint8_t           i;
+   uint8_t           nCell = 0;
    RgSchCellCb       *cell[CM_LTE_MAX_CELLS];
    RgSchCellCb       *cellLst[CM_LTE_MAX_CELLS];
    
@@ -2809,17 +2694,11 @@ Inst               schInst;
  *      -# RFAILED 
  */
 
-#ifdef ANSI
 static S16 rgSCHTomUtlProcUlSf 
 (
 RgSchCellCb        *cell,
 RgSchErrInfo       *err
 )
-#else
-static S16 rgSCHTomUtlProcUlSf (cell, err)
-RgSchCellCb        *cell;
-RgSchErrInfo       *err;
-#endif
 {
    S16             ret;
    TfuRecpReqInfo  *recpReqInfo;
@@ -2890,21 +2769,15 @@ RgSchErrInfo       *err;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlPrcUlTddSpclSf 
 (
-RgSchCellCb        *cell,
-RgSchErrInfo       *err
+RgSchCellCb  *cell,
+RgSchErrInfo *err
 )
-#else
-static S16 rgSCHTomUtlPrcUlTddSpclSf (cell, err)
-RgSchCellCb        *cell;
-RgSchErrInfo       *err;
-#endif
 {
    S16             ret;
    TfuRecpReqInfo  *recpReqInfo;
-   uint16_t             validIdx; /* Index computed from recreq's timing info*/
+   uint16_t        validIdx; /* Index computed from recreq's timing info*/
    Inst            inst = cell->instIdx;
 
    if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, 
@@ -2969,7 +2842,6 @@ RgSchErrInfo       *err;
  * @param  [out] RgSchErrInfo *err
  * @return S16
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlProcDlSf
 (
 RgSchDlSf            *dlSf,
@@ -2978,18 +2850,10 @@ RgSchCellCb          *cell,
 RgTfuCntrlReqInfo    *cntrlInfo,
 RgSchErrInfo         *err
 )
-#else
-static S16 rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, err)
-RgSchDlSf            *dlSf;
-RgSchDlSf            *ulSf;
-RgSchCellCb          *cell;
-RgTfuCntrlReqInfo    *cntrlInfo;
-RgSchErrInfo         *err;
-#endif
 {
-   Inst              inst = cell->instIdx;
-   S16               ret;
-   uint8_t                sfTyp = 1; /* Dl Subframe */
+   Inst    inst = cell->instIdx;
+   S16     ret;
+   uint8_t sfTyp = 1; /* Dl Subframe */
 
       cmLListInit(&cntrlInfo->phichLst);
       cmLListInit(&cntrlInfo->dlPdcchLst);
@@ -3107,21 +2971,13 @@ if(0 == cntrlInfo->dlMpdcchLst.count)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillPhich
 (
 RgSchCellCb     *cell,
 TfuCntrlReqInfo    *cntrlInfo,
 RgSchDlSf          *dlSf,
 RgSchErrInfo       *err
- )
-#else
-static S16 rgSCHTomUtlFillPhich(cell, cntrlInfo, dlSf, err)
-RgSchCellCb     *cell;
-TfuCntrlReqInfo    *cntrlInfo;
-RgSchDlSf          *dlSf;
-RgSchErrInfo       *err;
-#endif
+)
 {
    S16             ret;
    CmLList         *node;
@@ -3183,18 +3039,11 @@ RgSchErrInfo       *err;
  *   @param[in]  CmLteRnti       rnti
  *   @return  Void
  */
-#ifdef ANSI
 static Void rgSCHTmrRestartScellDeactTmr
 (
- RgSchCellCb     *cell,
- RgSchUeCb       *ueCb
- )
-#else
-static Void rgSCHTmrRestartScellDeactTmr (cell, ueCb)
-   RgSchCellCb     *cell;
-   RgSchUeCb       *ueCb;
-
-#endif
+RgSchCellCb     *cell,
+RgSchUeCb       *ueCb
+)
 {
    RgSchUeCellInfo   *sCellInfo = NULLP;
    
@@ -3239,21 +3088,13 @@ static Void rgSCHTmrRestartScellDeactTmr (cell, ueCb)
  *      -# RFAILED 
  */
 uint32_t numdlSpsRelSentToTf;
-#ifdef ANSI
 static S16 rgSCHTomUtlFillDlPdcch
 (
 RgSchCellCb     *cell,
 TfuCntrlReqInfo *cntrlInfo,
 RgSchDlSf       *dlSf,
 RgSchErrInfo    *err
- )
-#else
-static S16 rgSCHTomUtlFillDlPdcch(cell,cntrlInfo, dlSf, err)
-RgSchCellCb          *cell;
-TfuCntrlReqInfo *cntrlInfo;
-RgSchDlSf       *dlSf;
-RgSchErrInfo    *err;
-#endif
+)
 {
    S16          ret;
    CmLList      *node;
@@ -3381,21 +3222,13 @@ uint32_t rgSchSpsRelPdcchAllocd;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillUlPdcch
 (
 RgSchCellCb       *cell,
 TfuCntrlReqInfo *cntrlInfo,
 RgSchDlSf       *dlSf,
 RgSchErrInfo    *err
- )
-#else
-static S16 rgSCHTomUtlFillUlPdcch(cntrlInfo, dlSf, err)
-RgSchCellCb       *cell;
-TfuCntrlReqInfo *cntrlInfo;
-RgSchDlSf       *dlSf;
-RgSchErrInfo    *err;
-#endif
+)
 {
    S16          ret;
    CmLList      *node;
@@ -3499,15 +3332,7 @@ RgSchErrInfo    *err;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
-static S16 rgSCHTomUtlProcTA
-(
-RgSchCellCb    *cell
-)
-#else
-static S16 rgSCHTomUtlProcTA (cell)
-RgSchCellCb    *cell;
-#endif
+static S16 rgSCHTomUtlProcTA(RgSchCellCb    *cell)
 {
    CmLList     *node;
    RgSchUeCb   *ue;
@@ -3562,31 +3387,18 @@ RgSchCellCb    *cell;
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 S16 rgSCHTomUtlFillHqFdbkInfo
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                     validIdx,
- RgSchDlHqProcCb         *hqCb,
- RgSchDlSf               *nxtDlsf,
- TfuUeRecpReqInfo        *pucchRecpInfo,
- RgSchDlHqProcCb         *prvHqCb,
- RgSchErrInfo            *err
- )
-#else
-S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                     validIdx; 
-   RgSchDlHqProcCb         *hqCb;
-   RgSchDlSf               *nxtDlsf;
-   TfuUeRecpReqInfo        *pucchRecpInfo;
-   RgSchDlHqProcCb         *prvHqCb;
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo          *recpReqInfo,
+RgSchCellCb             *cell,
+uint16_t                validIdx,
+RgSchDlHqProcCb         *hqCb,
+RgSchDlSf               *nxtDlsf,
+TfuUeRecpReqInfo        *pucchRecpInfo,
+RgSchDlHqProcCb         *prvHqCb,
+RgSchErrInfo            *err
+)
 #else
-#ifdef ANSI
 S16 rgSCHTomUtlFillHqFdbkInfo
 (
 TfuRecpReqInfo          *recpReqInfo,
@@ -3597,21 +3409,11 @@ TfuUeRecpReqInfo        *pucchRecpInfo,
 RgSchDlHqProcCb         *prvHqCb,
 RgSchErrInfo            *err
 )
-#else
-S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cell;
-RgSchDlHqProcCb         *hqCb;
-RgSchDlSf               *nxtDlsf;
-TfuUeRecpReqInfo        *pucchRecpInfo;
-RgSchDlHqProcCb         *prvHqCb;
-RgSchErrInfo            *err;
-#endif
 #endif 
 { 
    S16                  ret;
    RgSchDlHqTbCb        *tbCb;
-   uint32_t                  idx;
+   uint32_t             idx;
    Bool                 isAddToLst = FALSE;
 
    for (idx = 0 ;idx < 2; idx++)
@@ -3782,27 +3584,16 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkFor5gtf
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                     validIdx,
- RgSchDlHqInfo           *dlSfHqInfo,
- RgSchDlSf               *dlSf,
- TfuUeRecpReqInfo        *pucchRecpInfo,
- RgSchErrInfo            *err
- )
-#else
-static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                     validIdx; 
-   RgSchDlHqInfo           *dlSfHqInfo;
-   RgSchDlSf               *dlSf;
-   TfuUeRecpReqInfo        *pucchRecpInfo;
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo          *recpReqInfo,
+RgSchCellCb             *cell,
+uint16_t                validIdx,
+RgSchDlHqInfo           *dlSfHqInfo,
+RgSchDlSf               *dlSf,
+TfuUeRecpReqInfo        *pucchRecpInfo,
+RgSchErrInfo            *err
+)
 { 
 #ifdef DEBUGP
    Inst                 inst = cell->instIdx;
@@ -3877,29 +3668,17 @@ static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkForFrmt1B
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                     validIdx,
- RgSchDlHqInfo           *dlSfHqInfo,
- RgSchDlSf               *dlSf,
- TfuUeRecpReqInfo        *pucchRecpInfo,
- RgSchErrInfo            *err
- )
-#else
-static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                     validIdx; 
-   RgSchDlHqInfo           *dlSfHqInfo;
-   RgSchDlSf               *dlSf;
-   TfuUeRecpReqInfo        *pucchRecpInfo;
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo          *recpReqInfo,
+RgSchCellCb             *cell,
+uint16_t                     validIdx,
+RgSchDlHqInfo           *dlSfHqInfo,
+RgSchDlSf               *dlSf,
+TfuUeRecpReqInfo        *pucchRecpInfo,
+RgSchErrInfo            *err
+)
 #else
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkForFrmt1B
 (
 TfuRecpReqInfo          *recpReqInfo,
@@ -3909,15 +3688,6 @@ RgSchDlSf               *dlSf,
 TfuUeRecpReqInfo        *pucchRecpInfo,
 RgSchErrInfo            *err
 )
-#else
-static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cell;
-RgSchDlHqInfo           *dlSfHqInfo;
-RgSchDlSf               *dlSf;
-TfuUeRecpReqInfo        *pucchRecpInfo;
-RgSchErrInfo            *err;
-#endif
 #endif 
 { 
 #ifdef DEBUGP
@@ -3929,7 +3699,7 @@ RgSchErrInfo            *err;
    RgSchUeCb            *ue;
    TfuUePucchRecpReq    *pucchReqInfo = NULLP;
    Bool                 isDatPresOnSecCell = FALSE;
-   uint8_t                   primCellTbCount = 0;
+   uint8_t              primCellTbCount = 0;
 
    hqPNode = dlSfHqInfo->hqPLst.first;
    ue = (RgSchUeCb*)dlSfHqInfo->dlSfUeLnk.node;
@@ -4207,29 +3977,17 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkForFrmt3
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                     validIdx,
- RgSchDlHqInfo           *dlSfHqInfo,
- RgSchDlSf               *dlSf,
- TfuUeRecpReqInfo        *pucchRecpInfo,
- RgSchErrInfo            *err
- )
-#else
-static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                     validIdx; 
-   RgSchDlHqInfo           *dlSfHqInfo;
-   RgSchDlSf               *dlSf;
-   TfuUeRecpReqInfo        *pucchRecpInfo;
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo          *recpReqInfo,
+RgSchCellCb             *cell,
+uint16_t                     validIdx,
+RgSchDlHqInfo           *dlSfHqInfo,
+RgSchDlSf               *dlSf,
+TfuUeRecpReqInfo        *pucchRecpInfo,
+RgSchErrInfo            *err
+)
 #else
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkForFrmt3
 (
 TfuRecpReqInfo          *recpReqInfo,
@@ -4239,15 +3997,6 @@ RgSchDlSf               *dlSf,
 TfuUeRecpReqInfo        *pucchRecpInfo,
 RgSchErrInfo            *err
 )
-#else
-static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cell;
-RgSchDlHqInfo           *dlSfHqInfo;
-RgSchDlSf               *dlSf;
-TfuUeRecpReqInfo        *pucchRecpInfo;
-RgSchErrInfo            *err;
-#endif
 #endif 
 { 
 #ifdef DEBUGP
@@ -4325,35 +4074,20 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkRecpReq
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                  validIdx,
- RgSchErrInfo            *err
- )
-#else
-static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                  validIdx; 
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo    *recpReqInfo,
+RgSchCellCb       *cell,
+uint16_t          validIdx,
+RgSchErrInfo      *err
+)
 #else
-#ifdef ANSI
 static S16 rgSCHTomUtlFillHqFdbkRecpReq
 (
-TfuRecpReqInfo          *recpReqInfo,
-RgSchCellCb             *cell,
-RgSchErrInfo            *err
+TfuRecpReqInfo    *recpReqInfo,
+RgSchCellCb       *cell,
+RgSchErrInfo      *err
 )
-#else
-static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, err)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cell;
-RgSchErrInfo            *err;
-#endif
 #endif 
 {
    CmLList              *node;
@@ -4436,21 +4170,13 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSrRecpReq
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cell,
- uint16_t                  validIdx,
- RgSchErrInfo            *err
- )
-#else
-static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cell;
-   uint16_t                  validIdx; 
-   RgSchErrInfo            *err;
-#endif
+TfuRecpReqInfo          *recpReqInfo,
+RgSchCellCb             *cell,
+uint16_t                  validIdx,
+RgSchErrInfo            *err
+)
 {
    CmLList              *node;
    TfuUeRecpReqInfo     *pucchRecpInfo;
@@ -4540,17 +4266,11 @@ static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# RFAILED 
  */
 
-#ifdef ANSI
 static S16 rgSCHTomUtlWillUeRprtCqiRi
 (
- RgSchUeCb        *ue,
- Bool             *willueRprtCqiRi
- )
-#else
-static S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
- RgSchUeCb        *ue;
- Bool             *willueRprtCqiRi;
-#endif
+RgSchUeCb        *ue,
+Bool             *willueRprtCqiRi
+)
 {
    /* Intialising Reporting probability as TRUE */ 
    *willueRprtCqiRi = TRUE; 
@@ -4599,21 +4319,13 @@ static S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  *      -# RFAILED 
  */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlFillRiRecpReq
 (
- TfuRecpReqInfo       *recpReqInfo,
- RgSchCellCb          *cell,
- uint16_t                  validIdx,
- RgSchErrInfo         *err
- )
-#else
-static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo       *recpReqInfo;
-   RgSchCellCb          *cell;
-   uint16_t                  validIdx; 
-   RgSchErrInfo         *err;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cell,
+uint16_t             validIdx,
+RgSchErrInfo         *err
+)
 {
    CmLList              *node;
    TfuUeRecpReqInfo     *pucchRecpInfo;
@@ -4722,25 +4434,17 @@ static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
  */
 
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlFillCqiRiRecpReq
 (
- TfuRecpReqInfo       *recpReqInfo,
- RgSchCellCb          *cell,
- uint16_t                  validIdx, 
- RgSchErrInfo         *err
- )
-#else
-static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo     *recpReqInfo;
-   RgSchCellCb        *cell;
-   uint16_t                validIdx; 
-   RgSchErrInfo       *err;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cell,
+uint16_t             validIdx, 
+RgSchErrInfo         *err
+)
 {
-   TfuUeRecpReqInfo     *pucchRecpInfo;
-   RgSchUeCb            *ue = NULLP;
-   uint16_t                  ret;
+   TfuUeRecpReqInfo  *pucchRecpInfo;
+   RgSchUeCb         *ue = NULLP;
+   uint16_t          ret;
 
    while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP)
    {
@@ -4791,31 +4495,21 @@ static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# RFAILED 
  */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlFillPcqiRecpReq
 (
- TfuRecpReqInfo       *recpReqInfo,
- RgSchCellCb          *cell,
- uint16_t                  validIdx, 
- RgSchErrInfo         *err
- )
-#else
-static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo     *recpReqInfo;
-   RgSchCellCb        *cell;
-   uint16_t                validIdx; 
-   RgSchErrInfo       *err;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cell,
+uint16_t             validIdx, 
+RgSchErrInfo         *err
+)
 {
    CmLList              *node;
    TfuUeRecpReqInfo     *pucchRecpInfo;
    S16                  ret;
-
    RgSchUeCb            *ue;
-   uint8_t                    ri; /*RI value*/
-   Bool                  willUeRprtCqi;   /* Flag set due to CQI Mask 
-                                        and UE Inactive state (DRX)*/
-   uint8_t                    cqiPmiSz; 
+   uint8_t              ri; /*RI value*/
+   Bool                 willUeRprtCqi;   /* Flag set due to CQI Mask   and UE Inactive state (DRX)*/
+   uint8_t              cqiPmiSz; 
    RgSchUePCqiCb        *cqiCb = NULLP;
    Bool                 isAddToLst = FALSE;
 
@@ -4903,21 +4597,13 @@ static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSrsRecpReq
 (
- TfuRecpReqInfo       *recpReqInfo,
- RgSchCellCb          *cell,
- uint16_t                  validIdx,
- RgSchErrInfo         *err
- )
-#else
-static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo       *recpReqInfo;
-   RgSchCellCb          *cell;
-   uint16_t                  validIdx; 
-   RgSchErrInfo         *err;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cell,
+uint16_t             validIdx,
+RgSchErrInfo         *err
+)
 {
    CmLList              *node;
    TfuUeRecpReqInfo     *pucchRecpInfo;
@@ -5000,19 +4686,12 @@ static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillDatRecpReq
 (
 TfuRecpReqInfo       *recpReqInfo,
 RgSchCellCb          *cell,
 RgSchErrInfo         *err
 )
-#else
-static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, err)
-TfuRecpReqInfo       *recpReqInfo;
-RgSchCellCb          *cell;
-RgSchErrInfo         *err;
-#endif
 {
    S16               ret;
    RgSchUlAlloc      *alloc;
@@ -5111,30 +4790,22 @@ RgSchErrInfo         *err;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillDatRecpReq
 (
- TfuRecpReqInfo       *recpReqInfo,
- RgSchCellCb          *cell,
- uint16_t                  validIdx,
- RgSchErrInfo         *err
- )
-#else
-static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
-   TfuRecpReqInfo       *recpReqInfo;
-   RgSchCellCb          *cell;
-   uint16_t                  validIdx;
-   RgSchErrInfo         *err;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cell,
+uint16_t             validIdx,
+RgSchErrInfo         *err
+)
 {
    CmLteTimingInfo   dci0Time;
-   uint8_t                idx;
+   uint8_t           idx;
    S16               ret;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 
    Bool              isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */
-   uint8_t                numUePerTti = 0;
+   uint8_t           numUePerTti = 0;
 
    if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot))
    {
@@ -5242,15 +4913,10 @@ static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHTomUtlFillRiBitWidthInfo
 (
- RgSchUeCb     *ueCb
- )
-#else
-S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
-   RgSchUeCb   *ueCb;
-#endif
+RgSchUeCb     *ueCb
+)
 {
    RgSchUePCqiCb *riCb = ueCb->nPRiCb;
    
@@ -5308,19 +4974,12 @@ S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 uint8_t rgSCHTomUtlFetchPcqiBitSz
 (
- RgSchUeCb    *ueCb, 
- uint8_t           numTxAnt,
- uint8_t           *ri
- )
-#else
-uint8_t rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
-   RgSchUeCb     *ueCb;
-   uint8_t            numTxAnt;
-   uint8_t            *ri;
-#endif
+RgSchUeCb  *ueCb, 
+uint8_t    numTxAnt,
+uint8_t    *ri
+)
 {
    uint8_t confRepMode;
    uint8_t pcqiSz;
@@ -5458,19 +5117,12 @@ uint8_t rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHTomUtlPcqiSbCalcBpIdx
 (
- CmLteTimingInfo    crntTimInfo,
- RgSchUeCb          *ueCb,
- RgSchUePCqiCb   *cqiCb
- )
-#else
-S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
-   CmLteTimingInfo  crntTimInfo;
-   RgSchUeCb        *ueCb;
-   RgSchUePCqiCb   *cqiCb;
-#endif
+CmLteTimingInfo   crntTimInfo,
+RgSchUeCb         *ueCb,
+RgSchUePCqiCb     *cqiCb
+)
 {
    uint16_t tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot);
    uint16_t  prdNum = tti/cqiCb->cqiPeri;
@@ -5520,19 +5172,12 @@ S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomUtlMoveNxtOccasion
 (
- RgSchCellCb    *cell,
- RgSchUeCb      *ue,
- uint16_t            validIdx
- )
-#else
-S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
-   RgSchCellCb    *cell;
-   RgSchUeCb      *ue;
-   uint16_t            validIdx;
-#endif
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+uint16_t     validIdx
+)
 {
    RgSchUePCqiCb *cqiCb = ue->nPCqiCb;
    RgSchUePCqiCb *riCb = ue->nPRiCb;
@@ -5609,21 +5254,13 @@ S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 Void rgSCHTomPrepareAcqiRecp
 (
- RgSchUeCb                        *ueCb, 
- RgSchCellCb                   *cell,
- TfuUePuschCqiRecpInfo *cqiRecpReqInfo,
- uint8_t                    ccIdx
- )
-#else
- Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
- RgSchUeCb                        *ueCb;
- RgSchCellCb              *cell;
- TfuUePuschCqiRecpInfo *cqiRecpReqInfo;
- uint8_t                    ccIdx;
-#endif
+RgSchUeCb      *ueCb, 
+RgSchCellCb    *cell,
+TfuUePuschCqiRecpInfo *cqiRecpReqInfo,
+uint8_t         ccIdx
+)
 {
    uint8_t confRepMode;
    RgSchCqiRawPuschMode12   *mode12Info;   
@@ -5631,9 +5268,9 @@ Void rgSCHTomPrepareAcqiRecp
    RgSchCqiRawPuschMode22   *mode22Info;    
    RgSchCqiRawPuschMode30   *mode30Info;   
    RgSchCqiRawPuschMode31   *mode31Info;    
-   uint8_t              numTxAnt   = cell->numTxAntPorts;
-   uint8_t            sCellIdx   = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)];
-   uint8_t            numOfCells = 0;
+   uint8_t numTxAnt   = cell->numTxAntPorts;
+   uint8_t sCellIdx   = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)];
+   uint8_t numOfCells = 0;
    RgSchUeACqiCb *acqiCb  = &ueCb->cellInfo[sCellIdx]->acqiCb;
 
    /* Fill TFU Recp */
@@ -5800,33 +5437,22 @@ Void rgSCHTomPrepareAcqiRecp
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomUtlFillDatAperRecpReq
 (
- RgSchCellCb       *cell,
- uint8_t                cqiReq,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- CmLteTimingInfo   *timeInfo,
- Bool              hqPres,
- uint16_t                validIdx
- )
-#else
-S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx)
-   RgSchCellCb       *cell;
-   uint8_t                cqiReq;
-   RgSchUlAlloc      *alloc;
-   TfuUeRecpReqInfo  *datRecpInfo;
-   CmLteTimingInfo   *timeInfo;
-   Bool              hqPres;
-   uint16_t                validIdx; 
-#endif
+RgSchCellCb       *cell,
+uint8_t           cqiReq,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo,
+CmLteTimingInfo   *timeInfo,
+Bool              hqPres,
+uint16_t          validIdx
+)
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
-   RgSchUeCb                     *ueCb = alloc->ue;
+   RgSchUeCb   *ueCb = alloc->ue;
 #ifdef LTE_ADV
-   uint8_t                     triggerSet = 0;
-   uint8_t                     sIdx = 0;
+   uint8_t      triggerSet = 0;
+   uint8_t      sIdx = 0;
 #endif
 
    /*Fill RI Reception Params*/
@@ -5911,26 +5537,15 @@ S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hq
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomUtlFillDatPriRecpReq
 (
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- CmLteTimingInfo   *timeInfo,
- Bool              hqPres,
- uint16_t               validIdx
- )
-#else
-S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, 
-hqPres, validIdx)
-   RgSchCellCb       *cell;
-   RgSchUlAlloc      *alloc;
-   TfuUeRecpReqInfo  *datRecpInfo;
-   CmLteTimingInfo   *timeInfo;
-   Bool              hqPres; 
-   uint16_t                validIdx;
-#endif
+RgSchCellCb       *cell,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo,
+CmLteTimingInfo   *timeInfo,
+Bool              hqPres,
+uint16_t          validIdx
+)
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
 
@@ -6006,30 +5621,19 @@ hqPres, validIdx)
  *      -# RFAILED 
  **/
 
-#ifdef ANSI
 S16 rgSCHTomUtlFillDatPCqiRecpReq
 (
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- CmLteTimingInfo   *timeInfo,
- Bool              hqPres, 
- uint16_t                validIdx
- )
-#else
-S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, 
-      timeInfo, hqPres, validIdx)
-   RgSchCellCb       *cell;
-   RgSchUlAlloc      *alloc;
-   TfuUeRecpReqInfo  *datRecpInfo;
-   CmLteTimingInfo   *timeInfo;
-   Bool              hqPres; 
-   uint16_t                validIdx;
-#endif
+RgSchCellCb       *cell,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo,
+CmLteTimingInfo   *timeInfo,
+Bool              hqPres, 
+uint16_t          validIdx
+)
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
-   uint8_t                 cqiPmiSz; /*Raw CQI/PMI Size*/
-   uint8_t                 ri;
+   uint8_t     cqiPmiSz; /*Raw CQI/PMI Size*/
+   uint8_t     ri;
 
    /*Fill CQI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;
@@ -6118,24 +5722,14 @@ S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomUtlFillDatSrsRecpReq
 (
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- CmLteTimingInfo   *timeInfo,
- Bool              hqPres
- )
-#else
-S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, 
-      hqPres)
-   RgSchCellCb       *cell;
-   RgSchUlAlloc      *alloc;
-   TfuUeRecpReqInfo  *datRecpInfo;
-   CmLteTimingInfo   *timeInfo;
-   Bool              hqPres; 
-#endif
+RgSchCellCb       *cell,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo,
+CmLteTimingInfo   *timeInfo,
+Bool              hqPres
+)
 {
    datRecpInfo->rnti = alloc->rnti;
    rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); 
@@ -6177,19 +5771,12 @@ S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgSCHTomFillOnlySrsRecpReq
 (
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo
- )
-#else
-S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)  
-   RgSchCellCb       *cell;
-   RgSchUlAlloc      *alloc;
-   TfuUeRecpReqInfo  *datRecpInfo;
-#endif
+RgSchCellCb       *cell,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo
+)
 {
    TfuUePuschSrsRecpInfo  *srsRecpReqInfo;
 
@@ -6238,37 +5825,25 @@ S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 static S16 rgSCHTomUtlFillCqiSrSrsWithHq
 (
- RgSchCellCb       *cell,
- TfuRecpReqInfo    *recpReqInfo,
- RgSchUeCb         *ue,
- TfuUeRecpReqInfo  *pucchRecpInfo,
- uint16_t                validIdx,
- Bool               isDatPresOnSecCell
- )
-#else
-static S16 rgSCHTomUtlFillCqiSrSrsWithHq(cell, recpReqInfo, ue, 
-      pucchRecpInfo, validIdx,isDatPresOnSecCell)
-RgSchCellCb       *cell;
-TfuRecpReqInfo    *recpReqInfo;
-RgSchUeCb         *ue;
-TfuUeRecpReqInfo  *pucchRecpInfo;
-uint16_t               validIdx;
-Bool              isDatPresOnSecCell;
-#endif
+RgSchCellCb       *cell,
+TfuRecpReqInfo    *recpReqInfo,
+RgSchUeCb         *ue,
+TfuUeRecpReqInfo  *pucchRecpInfo,
+uint16_t          validIdx,
+Bool               isDatPresOnSecCell
+)
 {
    RgSchUePCqiCb   *cqiCb;
    RgSchUePCqiCb   *riCb;
-   uint8_t                 ri; /*To fetch RI value*/
-   Bool               willUeRprtCqi;   /* Flag set due to CQI Mask and 
-                                      UE Inactive state (DRX)*/
-   Bool               willUeRprtSr = TRUE;   
-   TfuAckNackMode     hqFdbkMode;
-   uint8_t                 numCqiBit;
-   uint8_t                 totalPucchBits;
-   Bool               dropCqi = FALSE;
+   uint8_t         ri; /*To fetch RI value*/
+   Bool            willUeRprtCqi;   /* Flag set due to CQI Mask and UE Inactive state (DRX)*/
+   Bool            willUeRprtSr = TRUE;   
+   TfuAckNackMode  hqFdbkMode;
+   uint8_t         numCqiBit;
+   uint8_t         totalPucchBits;
+   Bool            dropCqi = FALSE;
 #ifdef LTEMAC_SPS
    RgSchCmnUlUeSpsInfo   *ulSpsUe = NULL;
 #endif
@@ -6559,29 +6134,19 @@ Bool              isDatPresOnSecCell;
  *      -# RFAILED 
  **/
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static S16 rgSCHTomUtlFillCqiSrsWithSr
 (
- RgSchCellCb       *cell,
- RgSchUeCb         *ue, 
- TfuRecpReqInfo    *recpReqInfo,
- TfuUeRecpReqInfo  *pucchRecpInfo,
- uint16_t               validIdx
- )
-#else
-static S16 rgSCHTomUtlFillCqiSrsWithSr(cell, ue, recpReqInfo,  
-      pucchRecpInfo, validIdx)
-RgSchCellCb       *cell;
-RgSchUeCb         *ue; 
-TfuRecpReqInfo    *recpReqInfo;
-TfuUeRecpReqInfo  *pucchRecpInfo;
-uint16_t               validIdx;
-#endif
+RgSchCellCb       *cell,
+RgSchUeCb         *ue, 
+TfuRecpReqInfo    *recpReqInfo,
+TfuUeRecpReqInfo  *pucchRecpInfo,
+uint16_t          validIdx
+)
 {
-   RgSchUePCqiCb   *cqiCb;
-   RgSchUePCqiCb   *riCb;
-   uint8_t                 ri; /*To fetch RI value*/
-   Bool               willUeRprtCqi;   /* Flag set due to CQI Mask and 
+   RgSchUePCqiCb  *cqiCb;
+   RgSchUePCqiCb  *riCb;
+   uint8_t        ri; /*To fetch RI value*/
+   Bool           willUeRprtCqi;   /* Flag set due to CQI Mask and 
                                       UE Inactive state (DRX)*/
    riCb = ue->nPRiCb;
    cqiCb = ue->nPCqiCb;
@@ -6742,57 +6307,30 @@ uint16_t               validIdx;
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfRepHqFdbk
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cellCb,
- RgSchErrInfo            *err,
- RgSchDlSf               *dlSf,
- uint8_t                      noFdbks,
- CmMemListCp             *memCp,
- uint8_t                      elemIdx,
- RgSchDlSf               *nxtDlsf,
- uint16_t                     validIdx
- )
-#else
-static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, 
-noFdbks, memCp, elemIdx, nxtDlsf, validIdx)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cellCb;
-   RgSchErrInfo            *err;
-   RgSchDlSf               *dlSf;
-   uint8_t                      noFdbks;
-   CmMemListCp             *memCp;
-   uint8_t                      elemIdx;
-   RgSchDlSf               *nxtDlsf;
-   uint16_t                     validIdx; 
-#endif
+TfuRecpReqInfo *recpReqInfo,
+RgSchCellCb    *cellCb,
+RgSchErrInfo   *err,
+RgSchDlSf      *dlSf,
+uint8_t        noFdbks,
+CmMemListCp    *memCp,
+uint8_t        elemIdx,
+RgSchDlSf      *nxtDlsf,
+uint16_t       validIdx
+)
 #else
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfRepHqFdbk
 (
-TfuRecpReqInfo          *recpReqInfo,
-RgSchCellCb             *cellCb,
-RgSchErrInfo            *err,
-RgSchDlSf               *dlSf,
-uint8_t                      noFdbks,
-CmMemListCp             *memCp,
-uint8_t                      elemIdx,
-RgSchDlSf               *nxtDlsf
+TfuRecpReqInfo  *recpReqInfo,
+RgSchCellCb     *cellCb,
+RgSchErrInfo    *err,
+RgSchDlSf       *dlSf,
+uint8_t         noFdbks,
+CmMemListCp     *memCp,
+uint8_t         elemIdx,
+RgSchDlSf       *nxtDlsf
 )
-#else
-static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, 
-noFdbks, memCp, elemIdx, nxtDlsf)
-   TfuRecpReqInfo          *recpReqInfo;
-   RgSchCellCb             *cellCb;
-   RgSchErrInfo            *err;
-   RgSchDlSf               *dlSf;
-   uint8_t                      noFdbks;
-   CmMemListCp             *memCp;
-   uint8_t                      elemIdx;
-   RgSchDlSf               *nxtDlsf;
-#endif
 #endif 
 {
    RgSchDlHqProcCb         *hqCb;
@@ -6923,73 +6461,38 @@ noFdbks, memCp, elemIdx, nxtDlsf)
  *      -# RFAILED 
  */
 #ifdef TFU_UPGRADE
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfHqFdbkInfo
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cellCb,
- RgSchErrInfo            *err,
- RgSchDlSf               *dlSf,
- uint8_t                      noFdbks,
- CmMemListCp             *memCp,
- uint8_t                      elemIdx,
- RgSchDlSf               *nxtDlsf,
- uint16_t                     validIdx,
- RgSchDlHqProcCb         *hqCb,
- RgSchUePucchRecpInfo    *pucchInfo,
- Bool                    alloc,
- RgSchDlHqProcCb         *prvHqCb
- )
-#else
-static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, 
-      noFdbks, memCp, elemIdx, nxtDlsf, validIdx, hqCb, pucchInfo, alloc, prvHqCb)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cellCb;
-RgSchErrInfo            *err;
-RgSchDlSf               *dlSf;
-uint8_t                      noFdbks;
-CmMemListCp             *memCp;
-uint8_t                      elemIdx;
-RgSchDlSf               *nxtDlsf;
-uint16_t                     validIdx; 
-RgSchDlHqProcCb         *hqCb;
-RgSchUePucchRecpInfo    *pucchInfo;
-Bool                    alloc;
-RgSchDlHqProcCb         *prvHqCb;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cellCb,
+RgSchErrInfo         *err,
+RgSchDlSf            *dlSf,
+uint8_t              noFdbks,
+CmMemListCp          *memCp,
+uint8_t              elemIdx,
+RgSchDlSf            *nxtDlsf,
+uint16_t             validIdx,
+RgSchDlHqProcCb      *hqCb,
+RgSchUePucchRecpInfo *pucchInfo,
+Bool                 alloc,
+RgSchDlHqProcCb      *prvHqCb
+)
 #else
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfHqFdbkInfo
 (
- TfuRecpReqInfo          *recpReqInfo,
- RgSchCellCb             *cellCb,
- RgSchErrInfo            *err,
- RgSchDlSf               *dlSf,
- uint8_t                      noFdbks,
- CmMemListCp             *memCp,
- uint8_t                      elemIdx,
- RgSchDlSf               *nxtDlsf,
- RgSchDlHqProcCb         *hqCb,
- RgSchUePucchRecpInfo    *pucchInfo,
- Bool                    alloc,
- RgSchDlHqProcCb         *prvHqCb
- )
-#else
-static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, 
-      noFdbks, memCp, elemIdx, nxtDlsf, hqCb, pucchInfo, alloc, prvHqCb)
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cellCb;
-RgSchErrInfo            *err;
-RgSchDlSf               *dlSf;
-uint8_t                      noFdbks;
-CmMemListCp             *memCp;
-uint8_t                      elemIdx;
-RgSchDlSf               *nxtDlsf;
-RgSchDlHqProcCb         *hqCb;
-RgSchUePucchRecpInfo    *pucchInfo;
-Bool                    alloc;
-RgSchDlHqProcCb         *prvHqCb;
-#endif
+TfuRecpReqInfo       *recpReqInfo,
+RgSchCellCb          *cellCb,
+RgSchErrInfo         *err,
+RgSchDlSf            *dlSf,
+uint8_t              noFdbks,
+CmMemListCp          *memCp,
+uint8_t              elemIdx,
+RgSchDlSf            *nxtDlsf,
+RgSchDlHqProcCb      *hqCb,
+RgSchUePucchRecpInfo *pucchInfo,
+Bool                 alloc,
+RgSchDlHqProcCb      *prvHqCb
+)
 #endif
 {
    S16                     ret;
@@ -7194,30 +6697,21 @@ RgSchDlHqProcCb         *prvHqCb;
  * @param  [out]uint16_t                     *hqRes
  * @return void
  */
-#ifdef ANSI
 static Void rgSCHTomUtlGethqRes
 (
-uint8_t                      noFdbks,
-RgSchDlSf               *dlSf,
-RgSchPdcch              *pdcch,
-RgSchCellCb             *cellCb,
-uint16_t                     *hqRes
+uint8_t       noFdbks,
+RgSchDlSf     *dlSf,
+RgSchPdcch    *pdcch,
+RgSchCellCb   *cellCb,
+uint16_t      *hqRes
 )
-#else
-static Void rgSCHTomUtlGethqRes(noFdbks,dlSf,pdcch,cellCb,hqRes)
-uint8_t                      noFdbks;
-RgSchDlSf               *dlSf;
-RgSchPdcch              *pdcch;
-RgSchCellCb             *cellCb;
-uint16_t                     *hqRes;
-#endif
 {
-   uint8_t                      M;
-   uint8_t                      P;
-   uint8_t                      m;
-   uint8_t                      nP;
-   uint8_t                      nPlusOne;
-   uint8_t                      nCce;
+   uint8_t    M;
+   uint8_t    P;
+   uint8_t    m;
+   uint8_t    nP;
+   uint8_t    nPlusOne;
+   uint8_t    nCce;
    
    M = noFdbks;
    m = dlSf->dlFdbkInfo.m;
@@ -7250,30 +6744,19 @@ uint16_t                     *hqRes;
  * @param  [in] RgSchCellCb             *cellCb
  * @return void
  */
-#ifdef ANSI
 static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1
 (
- RgSchDlHqProcCb     *hqCb,
- TfuUePucchRecpReq   *hqRecpReq,
- uint8_t                  noFdbks,
- RgSchDlSf           *dlSf,
- RgSchPdcch          *pdcch,
- RgSchCellCb         *cellCb
+RgSchDlHqProcCb     *hqCb,
+TfuUePucchRecpReq   *hqRecpReq,
+uint8_t             noFdbks,
+RgSchDlSf           *dlSf,
+RgSchPdcch          *pdcch,
+RgSchCellCb         *cellCb
 )
-#else
-static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, 
-      noFdbks,dlSf,pdcch,cellCb)
- RgSchDlHqProcCb     *hqCb;
- TfuUePucchRecpReq   *hqRecpReq;
- uint8_t                  noFdbks;
- RgSchDlSf           *dlSf;
- RgSchPdcch          *pdcch;
- RgSchCellCb         *cellCb;
-#endif
 {
-   RgSchUeCb           *ue = NULLP;
-   Bool                 isCellSec = FALSE;
-   uint16_t                  hqRes;
+   RgSchUeCb *ue = NULLP;
+   Bool      isCellSec = FALSE;
+   uint16_t  hqRes;
 
    /*ccpu00147920: UeCb is NULL for SPS activation*/
    if(pdcch && pdcch->ue)
@@ -7481,33 +6964,21 @@ static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
  * @param  [in] uint8_t                      elemIdx
  * @return void
  */
-#ifdef ANSI
 static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234
 (
- RgSchDlHqProcCb         *hqCb,
- TfuUePucchRecpReq       *hqRecpReq,
- uint8_t                      noFdbks,
- RgSchDlSf               *dlSf,
- RgSchPdcch              *pdcch,
- RgSchCellCb             *cellCb,
- uint8_t                      elemIdx
+RgSchDlHqProcCb    *hqCb,
+TfuUePucchRecpReq  *hqRecpReq,
+uint8_t            noFdbks,
+RgSchDlSf          *dlSf,
+RgSchPdcch         *pdcch,
+RgSchCellCb        *cellCb,
+uint8_t            elemIdx
 )
-#else
-static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234(
-      hqCb,hqRecpReq,noFdbks,dlSf,pdcch,cellCb,elemIdx)
- RgSchDlHqProcCb         *hqCb;
- TfuUePucchRecpReq       *hqRecpReq;
- uint8_t                      noFdbks;
- RgSchDlSf               *dlSf;
- RgSchPdcch              *pdcch;
- RgSchCellCb             *cellCb;
- uint8_t                      elemIdx;
-#endif
 {
-   RgSchUeCb            *ue;
-   Bool                 isCellSec = FALSE;
-   uint16_t                  hqRes = 0;
-   uint8_t                   servCellIdx;
+   RgSchUeCb  *ue;
+   Bool       isCellSec = FALSE;
+   uint16_t   hqRes = 0;
+   uint8_t    servCellIdx;
 
    if(pdcch)
    {/* SPS Release pdcch or dynamic data */
@@ -7642,28 +7113,16 @@ static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234(
  * @param  [out]TfuUePucchRecpReq *hqRecpReq
  * @return S16
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS
 (
- RgSchDlHqProcCb         *hqCb,
- TfuUePucchRecpReq       *hqRecpReq,
- uint8_t                      noFdbks,
- RgSchDlSf               *dlSf,
- RgSchPdcch              *pdcch,
- uint8_t                      elemIdx,
- RgSchCellCb             *cellCb
+RgSchDlHqProcCb    *hqCb,
+TfuUePucchRecpReq  *hqRecpReq,
+uint8_t            noFdbks,
+RgSchDlSf          *dlSf,
+RgSchPdcch         *pdcch,
+uint8_t            elemIdx,
+RgSchCellCb        *cellCb
 )
-#else
-static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch,
-      n1PucchTkn,elemIdx,cellCb)
- RgSchDlHqProcCb         *hqCb;
- TfuUePucchRecpReq       *hqRecpReq;
- uint8_t                      noFdbks;
- RgSchDlSf               *dlSf;
- RgSchPdcch              *pdcch;
- uint8_t                      elemIdx;
- RgSchCellCb             *cellCb;
-#endif
 {
    /* Update teh fdbk mode if something different is present
     * in L1 API file for F1BS *//* 1 --> F1BCS */
@@ -7707,7 +7166,6 @@ static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch,
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
 static S16 rgSCHTomUtlFillSfHqFdbkForOneUe
 ( 
 RgSchDlHqProcCb         *hqCb,
@@ -7715,56 +7173,35 @@ TfuRecpReqInfo          *recpReqInfo,
 RgSchCellCb             *cellCb,
 RgSchErrInfo            *err,
 RgSchDlSf               *dlSf,
-uint8_t                      noFdbks,
+uint8_t                 noFdbks,
 CmMemListCp             *memCp,
-uint8_t                      elemIdx,
+uint8_t                 elemIdx,
 RgSchDlSf               *nxtDlsf,
 CmLteRnti               rnti,
 RgrTddAckNackMode       ackNackMode,
 RgSchUePucchRecpInfo    **pucchInfoRef,
 RgSchPdcch              *pdcch,
-TknUInt16                  n1PucchTkn,
+TknUInt16               n1PucchTkn,
 Bool                    *allocRef,
-uint8_t                      hqSz  
+uint8_t                 hqSz  
 )
-#else
-static S16 rgSCHTomUtlFillSfHqFdbkForOneUe(hqCb,recpReqInfo, cellCb, err, dlSf,
-      noFdbks, memCp, elemIdx, nxtDlsf, rnti, ackNackMode, pucchInfoRef,
-      pdcch, n1PucchTkn, allocRef, hqSz)
-RgSchDlHqProcCb         *hqCb;
-TfuRecpReqInfo          *recpReqInfo;
-RgSchCellCb             *cellCb;
-RgSchErrInfo            *err;
-RgSchDlSf               *dlSf;
-uint8_t                      noFdbks;
-CmMemListCp             *memCp;
-uint8_t                      elemIdx;
-RgSchDlSf               *nxtDlsf;
-CmLteRnti               rnti;
-RgrTddAckNackMode       ackNackMode;
-RgSchUePucchRecpInfo    **pucchInfoRef;
-RgSchPdcch              *pdcch;
-TknUInt16                  n1PucchTkn;
-Bool                    *allocRef;
-uint8_t                      hqSz;
-#endif
 {
    RgSchUePucchRecpInfo    *pucchInfo = *pucchInfoRef;
    Bool                    alloc = FALSE;
    S16                     ret;
    TfuUePucchRecpReq       *hqRecpReq;
 #ifdef TFU_UPGRADE
-   uint8_t                      M;
-   uint8_t                      P;
-   uint8_t                      m;
-   uint8_t                      nP;
-   uint8_t                      nPlusOne;
-   uint16_t                     pucchRes;
-   uint8_t                      resIdx;
-   uint8_t                     nCce;
-   uint8_t                      prevHqSize;
+   uint8_t                 M;
+   uint8_t                 P;
+   uint8_t                 m;
+   uint8_t                 nP;
+   uint8_t                 nPlusOne;
+   uint16_t                pucchRes;
+   uint8_t                 resIdx;
+   uint8_t                 nCce;
+   uint8_t                 prevHqSize;
 #else
-   uint8_t                      multCnt;
+   uint8_t                 multCnt;
 #endif
 #ifdef LTEMAC_SPS
    Bool                    isFirstFdbk = FALSE;
@@ -8040,7 +7477,6 @@ uint8_t                      hqSz;
  * @param  [out] RgSchErrInfo *err
  * @return S16
  */
-#ifdef ANSI
 static S16 rgSCHTomUtlProcDlSfAtCrc
 (
 RgSchDlSf            *ulSf,
@@ -8049,14 +7485,6 @@ RgSchCellCb          *cell,
 TfuCntrlReqInfo      *cntrlInfo,
 RgSchErrInfo         *err
 )
-#else
-static S16 rgSCHTomUtlProcDlSfAtCrc (ulSf, crntUlFrm, cell, cntrlInfo, err)
-RgSchDlSf            *ulSf;
-CmLteTimingInfo      crntUlFrm;
-RgSchCellCb          *cell;
-TfuCntrlReqInfo      *cntrlInfo;
-RgSchErrInfo         *err;
-#endif
 {
    Inst              inst = cell->instIdx;
    S16               ret;
@@ -8130,15 +7558,10 @@ RgSchErrInfo         *err;
  *
  * @param  [in] RgSchCellCb   *cell
  */
-#ifdef ANSI
 static Void rgSCHTomUtlSendSfnTick
 (
 RgSchCellCb          *cell
 )
-#else
-static Void rgSCHTomUtlSendSfnTick (cell)
-RgSchCellCb          *cell;
-#endif
 {
    RgrTtiIndInfo     *rgrTtiInd;
    
@@ -8187,15 +7610,7 @@ RgSchCellCb          *cell;
  *  @return    None
  */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
-static Void rgSCHDynTDDMrkCrntSfIdx
-(
-Inst   schInst
-)
-#else /* ANSI */
-static Void rgSCHDynTDDMrkCrntSfIdx(schInst)
-Inst   schInst;
-#endif /* ANSI */
+static Void rgSCHDynTDDMrkCrntSfIdx(Inst   schInst)
 {
    RgSchDynTddCb  *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd);
 
@@ -8226,27 +7641,19 @@ Inst   schInst;
  *  
  */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
 static Void rgSchTomFillCellTtiInfo
 (
 TfuTtiIndInfo      *ttiInd,
 Inst               schInst,
-uint8_t                 *nCell,
+uint8_t            *nCell,
 RgSchCellCb        *cells[]
 )
-#else
-static Void rgSchTomFillCellTtiInfo (ttiInd, schInst, nCell, cells)
-TfuTtiIndInfo      *ttiInd;
-Inst               schInst;
-uint8_t                 *nCell;
-RgSchCellCb        *cells[];
-#endif
 {
-   uint8_t             i = 0;
-   uint8_t             strtCellId;
-   TfuTtiCellInfo *cellInfo;
-   RgSchCellCb    *cell; 
-   uint32_t            Idx1;
+   uint8_t         i = 0;
+   uint8_t         strtCellId;
+   TfuTtiCellInfo  *cellInfo;
+   RgSchCellCb     *cell; 
+   uint32_t        Idx1;
  
    CmLteTimingInfo frm;
      
@@ -8407,15 +7814,10 @@ void schFillCrntTime(
  * Returns: Void  
  *  
  */
-#ifdef ANSI
 static Void rgSchTomTtiUlAndDlCmnChSch
 (
 RgSchCellCb        *cell
 )
-#else
-static Void rgSchTomTtiUlAndDlCmnChSch (cell)
-RgSchCellCb        *cell;
-#endif
 {
 
    cell->rlsHqArr[cell->crntHqIdx].numUes = 0;
@@ -8484,15 +7886,10 @@ RgSchCellCb        *cell;
  * Returns: Void  
  *  
  */
-#ifdef ANSI
 static Void rgSchTomTtiMiscFunctions
 (
-RgSchCellCb        *cell
+RgSchCellCb *cell
 )
-#else
-static Void rgSchTomTtiMiscFunctions (cell)
-RgSchCellCb        *cell;
-#endif
 {
    uint8_t   suId = cell->tfuSap->sapCfg.suId;
     
@@ -8576,15 +7973,10 @@ RgSchCellCb        *cell;
  * Returns: Void
  *
  */
-#ifdef ANSI
 static Void rgSchTomTtiDlSch
 (
-RgSchCellCb        *cell
+RgSchCellCb *cell
 )
-#else
-static Void rgSchTomTtiDlSch (cell)
-RgSchCellCb        *cell;
-#endif
 {
 
    if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE))
@@ -8607,15 +7999,10 @@ RgSchCellCb        *cell;
  * Returns: Void
  *
  */
-#ifdef ANSI
 static Void rgSchTomTtiCnsldtSfAlloc
 (
-RgSchCellCb        *cell
+RgSchCellCb  *cell
 )
-#else
-static Void rgSchTomTtiCnsldtSfAlloc (cell)
-RgSchCellCb        *cell;
-#endif
 {
    RgSchDlSf *dlSf;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -8645,17 +8032,11 @@ RgSchCellCb        *cell;
  * Returns: Void
  *
  */
-#ifdef ANSI
 static Void rgSchTomTtiL1DlAndUlCfg
 (
 RgSchCellCb        *cell,
 RgTfuCntrlReqInfo  *cntrlInfo
 )
-#else
-static Void rgSchTomTtiL1DlAndUlCfg (cell, cntrlInfo)
-RgSchCellCb        *cell;
-RgTfuCntrlReqInfo  *cntrlInfo;
-#endif
 {
    RgSchDlSf *dlSf = rgSCHUtlSubFrmGet (cell, cell->dlDciTime);
    RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time);
@@ -8690,15 +8071,10 @@ RgTfuCntrlReqInfo  *cntrlInfo;
  * Returns: Void
  *
  */
-#ifdef ANSI
 static Void rgSchTomUtlTddRlsSfAndHarq
 (
-RgSchCellCb        *cell
+RgSchCellCb  *cell
 )
-#else
-static Void rgSchTomUtlTddRlsSfAndHarq (cell)
-RgSchCellCb        *cell;
-#endif
 {
 
    /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2).
@@ -8730,15 +8106,7 @@ RgSchCellCb        *cell;
  * Returns: Void
  *
  */
-#ifdef ANSI
-static Void rgSCHTomUtlProcTddUlSf
-(
-RgSchCellCb        *cell
-)
-#else
-static Void rgSCHTomUtlProcTddUlSf (cell)
-RgSchCellCb        *cell;
-#endif
+static Void rgSCHTomUtlProcTddUlSf(RgSchCellCb  *cell)
 {
    RgSchErrInfo    err;
    
index 0689961..397565a 100755 (executable)
@@ -106,42 +106,16 @@ RgSchUeCb        *ueCb
  *  @return  Void
  **/
 #ifndef MAC_SCH_STATS
-#ifdef ANSI
-Void rgSCHUhmProcDatInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm
-)
-#else
-Void rgSCHUhmProcDatInd(cell, ue, frm)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-#endif
+Void rgSCHUhmProcDatInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm)
 #else  /* MAC_SCH_STATS */
-#ifdef ANSI
-Void rgSCHUhmProcDatInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-uint8_t                   cqi
-)
-#else
-Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-uint8_t                   cqi;
-#endif
+Void rgSCHUhmProcDatInd(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteTimingInfo frm,uint8_t  cqi)
 #endif /* MAC_SCH_STATS */
 {
    RgSchUlHqProcCb   *hqProc;
 #ifdef UL_LA
    RgSchCmnUlUe   *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    S32            iTbs;
-   uint8_t             maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
+   uint8_t        maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
                                                  [ueUl->maxUlCqi];
 #endif
 
@@ -203,15 +177,7 @@ uint8_t                   cqi;
  *  @param[in,out] *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmProcMsg3DatInd
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-Void rgSCHUhmProcMsg3DatInd(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3DatInd(RgSchUlHqProcCb *hqProc)
 {
    hqProc->rcvdCrcInd = TRUE;
    hqProc->remTx = 0;        /*Reseting the value of rem Tx*/
@@ -234,15 +200,7 @@ RgSchUlHqProcCb *hqProc;
  *  @param[in,out] *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmProcMsg3Failure
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-Void rgSCHUhmProcMsg3Failure(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3Failure(RgSchUlHqProcCb *hqProc)
 {
 #ifdef EMTC_ENABLE
    RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
@@ -276,39 +234,9 @@ RgSchUlHqProcCb *hqProc;
  *  @return  Void
  **/
 #ifndef MAC_SCH_STATS
-#ifdef ANSI
-Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-TknUInt8                rv
-)
-#else
-Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-TknUInt8                rv;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo  frm,TknUInt8  rv)
 #else /* MAC_SCH_STATS */
-#ifdef ANSI
-Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-TknUInt8                rv,
-uint8_t                   cqi
-)
-#else
-Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-TknUInt8                rv;
-uint8_t                   cqi;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb  *cell,RgSchUeCb  *ue,CmLteTimingInfo  frm,TknUInt8  rv,uint8_t cqi)
 #endif /* MAC_SCH_STATS */
 {
    RgSchUlHqProcCb   *hqProc;
@@ -381,19 +309,7 @@ uint8_t                   cqi;
  *      -# Pointer to harq process corresponding to index
  *      -# NULL
  **/
-#ifdef ANSI
-RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue, 
-uint8_t               idx
-)
-#else
-RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue; 
-uint8_t               idx;
-#endif
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(RgSchCellCb *cell,RgSchUeCb  *ue, uint8_t idx)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
 
@@ -423,19 +339,7 @@ uint8_t               idx;
  *  @param[in]      *alloc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmNewTx
-(
-RgSchUlHqProcCb *hqProc,
-uint8_t              maxHqRetx,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
-RgSchUlHqProcCb *hqProc;
-uint8_t              maxHqRetx;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHUhmNewTx(RgSchUlHqProcCb *hqProc,uint8_t maxHqRetx,RgSchUlAlloc *alloc)
 {
 
    hqProc->ndi ^= 1;
@@ -469,17 +373,7 @@ RgSchUlAlloc    *alloc;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmFreeProc
-(
-RgSchUlHqProcCb *hqProc,
-RgSchCellCb      *cell
-)
-#else
-Void rgSCHUhmFreeProc(hqProc, cell)
-RgSchUlHqProcCb *hqProc;
-RgSchCellCb      *cell;
-#endif
+Void rgSCHUhmFreeProc(RgSchUlHqProcCb *hqProc,RgSchCellCb *cell)
 {
 #ifdef LTE_L2_MEAS
    RgSchUeCb         *ueCb;
@@ -560,17 +454,7 @@ RgSchCellCb      *cell;
  *  @param[in,out]  *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRetx
-(
-RgSchUlHqProcCb *hqProc,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHUhmRetx(hqProc, alloc) 
-RgSchUlHqProcCb *hqProc;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHUhmRetx(RgSchUlHqProcCb *hqProc,RgSchUlAlloc    *alloc)
 {
 
    hqProc->alloc = alloc;
@@ -599,19 +483,7 @@ RgSchUlAlloc    *alloc;
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRgrUeCfg
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb,
-RgrUeCfg          *ueCfg
-)
-#else
-Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-RgrUeCfg          *ueCfg;
-#endif
+Void rgSCHUhmRgrUeCfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgrUeCfg *ueCfg)
 {
    uint8_t i;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
@@ -663,19 +535,7 @@ RgrUeCfg          *ueCfg;
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRgrUeRecfg
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb,
-RgrUeRecfg        *ueRecfg
-)
-#else
-Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-RgrUeRecfg        *ueRecfg;
-#endif
+Void rgSCHUhmRgrUeRecfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgrUeRecfg  *ueRecfg)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 
@@ -703,17 +563,7 @@ RgrUeRecfg        *ueRecfg;
  *  @param[in,out]  *ueCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmFreeUe
-(
-RgSchCellCb       *cellCb,
-RgUeUlHqCb        *hqEnt
-)
-#else
-Void rgSCHUhmFreeUe(cellCb, hqEnt) 
-RgSchCellCb       *cellCb;
-RgUeUlHqCb       *hqEnt;
-#endif
+Void rgSCHUhmFreeUe(RgSchCellCb *cellCb,RgUeUlHqCb *hqEnt)
 {
 #ifdef LTE_TDD
    /* ccpu00117052 - MOD - Passing double pointer
@@ -744,24 +594,12 @@ RgUeUlHqCb       *hqEnt;
 *  @param[in] idx
 *  @return  Void
 */
-#ifdef ANSI
-S16 rgSCHUhmAppendPhich
-(
-RgSchCellCb            *cellCb,
-CmLteTimingInfo        frm,
-uint8_t                     idx
-)
-#else
-S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
-RgSchCellCb            *cellCb;
-CmLteTimingInfo        frm;
-uint8_t                     idx;
-#endif
+S16 rgSCHUhmAppendPhich(RgSchCellCb *cellCb,CmLteTimingInfo frm,uint8_t idx)
 {
-   uint8_t              nDmrs;
-   uint8_t              rbStart;
+   uint8_t         nDmrs;
+   uint8_t         rbStart;
 #ifdef LTE_TDD
-   uint8_t              iPhich;
+   uint8_t         iPhich;
 #endif
    RgSchUlAlloc    *ulAlloc;
 #ifdef LTEMAC_HDFDD
@@ -871,17 +709,7 @@ uint8_t                     idx;
  *           -# RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHUhmHqEntInit
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb           *ueCb
-)
-#else
-S16 rgSCHUhmHqEntInit(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb           *ueCb;
-#endif
+S16 rgSCHUhmHqEntInit(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 #ifdef LTE_TDD   
@@ -932,19 +760,7 @@ RgSchUeCb           *ueCb;
  *         -#RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHUhmGetAvlHqProc
-(
-RgSchCellCb           *cell,
-RgSchUeCb               *ue,
-RgSchUlHqProcCb         **hqP
-)
-#else
-S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-RgSchUlHqProcCb       **hqP;
-#endif
+S16 rgSCHUhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchUlHqProcCb  **hqP)
 {
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe      *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@ -1003,19 +819,7 @@ RgSchUlHqProcCb       **hqP;
  *      -# Pointer to harq process corresponding to index
  *      -# NULL
  **/
-#ifdef ANSI
-RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue, 
-CmLteTimingInfo  frm
-)
-#else
-RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue; 
-CmLteTimingInfo  frm;
-#endif
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(RgSchCellCb *cell,RgSchUeCb *ue, CmLteTimingInfo  frm)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    CmLListCp    *lst = &ueUl->hqEnt.inUse;
index 30a9142..73acecf 100755 (executable)
@@ -313,17 +313,7 @@ for proper NULLP assignment*/
 *       File:  rg_sch_utl.c
 *
 */
-#ifdef ANSI
-F64 rgSCHUtlPower
-(
-F64    x,
-F64    n
-)
-#else
-F64 rgSCHUtlPower(x, n)
-F64    x;
-F64    n;
-#endif
+F64 rgSCHUtlPower(F64 x,F64 n)
 {
  if( n==0 )
  {
@@ -353,21 +343,7 @@ F64    n;
 *       File:  rg_sch_utl.c
 *
 */
-#ifdef ANSI
-uint32_t rgSCHUtlParse
-(
-uint8_t     *buff,
-uint8_t     startPos,
-uint8_t     endPos,
-uint8_t     buffSize
-)
-#else
-uint32_t rgSCHUtlParse(buff, startPos, endPos, buffSize)
-uint8_t     *buff;
-uint8_t     startPos;
-uint8_t     endPos;
-uint8_t     buffSize;
-#endif
+uint32_t rgSCHUtlParse(uint8_t *buff,uint8_t startPos,uint8_t endPos,uint8_t buffSize)
 {
  uint8_t pointToChar,pointToEnd, loop;
  uint8_t size =  endPos - startPos;
@@ -399,17 +375,7 @@ uint8_t     buffSize;
 *       File:  rg_sch_utl.c
 *
 */
-#ifdef ANSI
-uint8_t rgSCHUtlFindDist
-(
-uint16_t    crntTime,
-uint16_t    tempIdx
-)
-#else
-uint8_t rgSCHUtlFindDist(crntTime, tempIdx)
-uint16_t    crntTime;
-uint16_t    tempIdx;
-#endif
+uint8_t rgSCHUtlFindDist(uint16_t crntTime,uint16_t tempIdx)
 {
  uint8_t  dist =0;
  /* ccpu00137113- Distance is not estimated properly if the periodicity is 
@@ -456,21 +422,13 @@ uint16_t    tempIdx;
  *         -#   FALSE otherwise
  *
  **/
-#ifdef ANSI
 Bool rgSCHUtlPdcchAvail
 (
-RgSchCellCb             *cell,
-RgSchPdcchInfo          *pdcchInfo,
-CmLteAggrLvl            aggrLvl,
-RgSchPdcch              **pdcch
+RgSchCellCb    *cell,
+RgSchPdcchInfo *pdcchInfo,
+CmLteAggrLvl   aggrLvl,
+RgSchPdcch     **pdcch
 )
-#else
-Bool rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, pdcch)
-RgSchCellCb             *cell;
-RgSchPdcchInfo          *pdcchInfo;
-CmLteAggrLvl            aggrLvl;
-RgSchPdcch              **pdcch;
-#endif
 {
    uint8_t            *byte;
    uint16_t            offset;
@@ -581,19 +539,7 @@ RgSchPdcch              **pdcch;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlPdcchPut
-(
-RgSchCellCb                *cell,
-RgSchPdcchInfo             *pdcchInfo,
-RgSchPdcch                 *pdcch
-)
-#else
-Void rgSCHUtlPdcchPut(cell, pdcchInfo, pdcch)
-RgSchCellCb                *cell;
-RgSchPdcchInfo             *pdcchInfo;
-RgSchPdcch                 *pdcch;
-#endif
+Void rgSCHUtlPdcchPut(RgSchCellCb *cell,RgSchPdcchInfo *pdcchInfo,RgSchPdcch *pdcch)
 {
    uint8_t              *byte;
    uint8_t              offset;
@@ -649,19 +595,7 @@ RgSchPdcch                 *pdcch;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlPdcchInit
-(
-RgSchCellCb             *cell,
-RgSchDlSf               *subFrm,
-uint16_t                nCce
-)
-#else
-Void rgSCHUtlPdcchInit(cell, subFrm, nCce)
-RgSchCellCb             *cell;
-RgSchDlSf               *subFrm;
-uint16_t                nCce;
-#endif
+Void rgSCHUtlPdcchInit(RgSchCellCb *cell,RgSchDlSf *subFrm,uint16_t nCce)
 {
    RgSchPdcchInfo       *pdcchInfo;
    RgSchPdcch           *pdcch;
@@ -732,17 +666,7 @@ uint16_t                nCce;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSchSFRTotalPoolFree
-(
- RgSchSFRTotalPoolInfo  *sfrTotalPoolInfo,
- RgSchCellCb             *cell
- )
-#else
-Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell)
-   RgSchSFRTotalPoolInfo  *sfrTotalPoolInfo;
-   RgSchCellCb             *cell;
-#endif
+Void rgSchSFRTotalPoolFree(RgSchSFRTotalPoolInfo *sfrTotalPoolInfo,RgSchCellCb *cell)
 {
    CmLListCp   *l;
    CmLList     *n;
@@ -793,17 +717,7 @@ Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSchSFRTotalPoolInit
-(
- RgSchCellCb             *cell,
- RgSchDlSf               *sf
- )
-#else
-static Void rgSchSFRTotalPoolInit(cell, sf)
-   RgSchCellCb             *cell;
-   RgSchDlSf               *sf;
-#endif
+S16 rgSchSFRTotalPoolInit(RgSchCellCb *cell,RgSchDlSf *sf)
 {      
    /*  Initialise the variables */
    RgSchSFRPoolInfo *sfrCCPool;
@@ -986,19 +900,7 @@ static Void rgSchSFRTotalPoolInit(cell, sf)
  *  @return  S16
  *
  **/
-#ifdef ANSI
-S16   rgSchDSFRRntpInfoInit 
-(
- TknStrOSXL              *rntpPtr,
- RgSchCellCb             *cell,
- uint16_t                bw
- )
-#else
-static Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw)
-   TknStrOSXL              *rntpPtr;
-   RgSchCellCb             *cell;
-   uint16_t                bw;
-#endif
+S16   rgSchDSFRRntpInfoInit(TknStrOSXL  *rntpPtr,RgSchCellCb *cell,uint16_t bw)
 {   
    Inst inst = cell->instIdx;
    uint16_t len;
@@ -1033,19 +935,7 @@ static Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw)
  *  @return  S16
  *
  **/
-#ifdef ANSI
-S16   rgSchDSFRRntpInfoFree 
-(
- TknStrOSXL              *rntpPtr,
- RgSchCellCb             *cell,
- uint16_t                bw
- )
-#else
-static Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw)
-   TknStrOSXL              *rntpPtr;
-   RgSchCellCb             *cell;
-   uint16_t                bw;
-#endif
+S16   rgSchDSFRRntpInfoFree(TknStrOSXL *rntpPtr,RgSchCellCb *cell,uint16_t bw)
 {   
    Inst inst = cell->instIdx;
    uint16_t len;
@@ -1076,17 +966,7 @@ static Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSchSFRResetPoolVariables
-(
- RgSchCellCb             *cell,
- RgSchSFRPoolInfo        *pool
- )
-#else
-static Void rgSchSFRResetPoolVariables(cell, pool)
-   RgSchCellCb             *cell;
-   RgSchSFRPoolInfo *pool;
-#endif
+static Void rgSchSFRResetPoolVariables(RgSchCellCb *cell,RgSchSFRPoolInfo *pool)
 {
 
    pool->bwAlloced  = 0;
@@ -1116,17 +996,7 @@ static Void rgSchSFRResetPoolVariables(cell, pool)
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHSFRUtlTotalPoolReset
-(
- RgSchCellCb             *cell,
- RgSchDlSf               *subFrm
- )
-#else
-static Void rgSCHSFRUtlTotalPoolReset(cell, subFrm)
-   RgSchCellCb             *cell;
-   RgSchDlSf               *subFrm;
-#endif
+static Void rgSCHSFRUtlTotalPoolReset(RgSchCellCb *cell,RgSchDlSf *subFrm)
 {
    RgSchSFRTotalPoolInfo *totalPoolInfo = &subFrm->sfrTotalPoolInfo;
    CmLListCp    *ccPool = &totalPoolInfo->ccPool;
@@ -1188,45 +1058,25 @@ static Void rgSCHSFRUtlTotalPoolReset(cell, subFrm)
  *      -# RFAILED
  **/
 #ifdef LTE_TDD
-#ifdef ANSI
 S16 rgSCHUtlAddPhich
 (
-RgSchCellCb             *cell,
-CmLteTimingInfo         frm,
-uint8_t                      hqFeedBack,
-uint8_t                      nDmrs,
-uint8_t                      rbStart,
-uint8_t                      iPhich
+RgSchCellCb     *cell,
+CmLteTimingInfo frm,
+uint8_t         hqFeedBack,
+uint8_t         nDmrs,
+uint8_t         rbStart,
+uint8_t         iPhich
 )
 #else
-S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, iPhich)
-RgSchCellCb             *cell;
-CmLteTimingInfo         frm;
-uint8_t                      hqFeedBack;
-uint8_t                      nDmrs;
-uint8_t                      rbStart;
-uint8_t                      iPhich;
-#endif
-#else
-#ifdef ANSI
 S16 rgSCHUtlAddPhich
 (
-RgSchCellCb             *cell,
-CmLteTimingInfo         frm,
-uint8_t                 hqFeedBack,
-uint8_t                 nDmrs,
-uint8_t                 rbStart,
-Bool                    isForMsg3
+RgSchCellCb     *cell,
+CmLteTimingInfo frm,
+uint8_t         hqFeedBack,
+uint8_t         nDmrs,
+uint8_t         rbStart,
+Bool            isForMsg3
 )
-#else
-S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, isForMsg3)
-RgSchCellCb             *cell;
-CmLteTimingInfo         frm;
-uint8_t                 hqFeedBack;
-uint8_t                 nDmrs;
-uint8_t                 rbStart;
-Bool                    isForMsg3;
-#endif
 #endif
 {
    S16                ret;
@@ -1269,17 +1119,7 @@ Bool                    isForMsg3;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHUtlPhichReset
-(
-RgSchCellCb                *cell,
-RgSchDlSf                  *subFrm
-)
-#else
-static Void rgSCHUtlPhichReset(cell, subFrm)
-RgSchCellCb                *cell;
-RgSchDlSf                  *subFrm;
-#endif
+static Void rgSCHUtlPhichReset(RgSchCellCb *cell,RgSchDlSf *subFrm)
 {
    RgSchPhichInfo          *phichInfo;
    RgSchPhich              *phich;
@@ -1313,17 +1153,7 @@ RgSchDlSf                  *subFrm;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-RgSchDlSf* rgSCHUtlSubFrmGet
-(
-RgSchCellCb            *cell,
-CmLteTimingInfo        frm
-)
-#else
-RgSchDlSf* rgSCHUtlSubFrmGet(cell, frm)
-RgSchCellCb            *cell;
-CmLteTimingInfo        frm;
-#endif
+RgSchDlSf* rgSCHUtlSubFrmGet(RgSchCellCb *cell,CmLteTimingInfo frm)
 {
    RgSchDlSf            *sf;
    uint8_t               dlIdx;
@@ -1361,17 +1191,7 @@ CmLteTimingInfo        frm;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlSubFrmPut
-(
-RgSchCellCb            *cell,
-RgSchDlSf              *sf
-)
-#else
-Void rgSCHUtlSubFrmPut(cell, sf)
-RgSchCellCb            *cell;
-RgSchDlSf              *sf;
-#endif
+Void rgSCHUtlSubFrmPut(RgSchCellCb *cell,RgSchDlSf *sf)
 {
    uint8_t                  i;
    uint8_t                  noRaRsps;
@@ -1483,20 +1303,12 @@ RgSchDlSf              *sf;
  *  @return  uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t rgSCHUtlLog32bitNbase2
-(
-uint32_t               n
-)
-#else
-uint8_t rgSCHUtlLog32bitNbase2(n)
-uint32_t               n;
-#endif
+uint8_t rgSCHUtlLog32bitNbase2(uint32_t n)
 {
-   uint32_t            b[] = {0x2, 0xc, 0xf0, 0xff00, 0xffff0000};
-   uint32_t            s[] = {1, 2, 4, 8, 16};
-   S16                 i;
-   uint8_t             ret = 0;
+   uint32_t  b[] = {0x2, 0xc, 0xf0, 0xff00, 0xffff0000};
+   uint32_t  s[] = {1, 2, 4, 8, 16};
+   S16       i;
+   uint8_t   ret = 0;
 
    for (i=4; i >= 0; i--)
    {
@@ -1528,19 +1340,7 @@ uint32_t               n;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlRelPdcchFbk
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-uint8_t               isAck
-)
-#else
-Void rgSCHUtlDlRelPdcchFbk(cell, ue, isAck)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-uint8_t               isAck;
-#endif
+Void rgSCHUtlDlRelPdcchFbk(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t isAck)
 {
    cell->sc.apis->rgSCHDlRelPdcchFbk(cell, ue, isAck);
    return;
@@ -1564,17 +1364,7 @@ uint8_t               isAck;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlProcAck
-(
-RgSchCellCb        *cell,
-RgSchDlHqProcCb    *hqP
-)
-#else
-Void rgSCHUtlDlProcAck(cell, hqP)
-RgSchCellCb        *cell;
-RgSchDlHqProcCb    *hqP;
-#endif
+Void rgSCHUtlDlProcAck(RgSchCellCb *cell,RgSchDlHqProcCb *hqP)
 {
    cell->sc.apis->rgSCHDlProcAck(cell, hqP);
    return;
@@ -1595,17 +1385,7 @@ RgSchDlHqProcCb    *hqP;
  *  @param[out] RgSchErrInfo  *err
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlHdlCrntiCE
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHUtlHdlCrntiCE(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHUtlHdlCrntiCE(RgSchCellCb  *cell,RgSchUeCb *ue)
 {
 
    cell->sc.apis->rgSCHHdlCrntiCE(cell, ue);
@@ -1631,21 +1411,7 @@ RgSchUeCb    *ue;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static uint16_t rgSCHUtlCalcTotalRegs
-(
-uint8_t    bw,
-uint8_t    cfi,
-uint8_t    numAntna,
-Bool  isEcp
-)
-#else
-static uint16_t rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp)
-uint8_t    bw;
-uint8_t    cfi;
-uint8_t    numAntna;
-Bool  isEcp;
-#endif
+static uint16_t rgSCHUtlCalcTotalRegs(uint8_t bw,uint8_t cfi,uint8_t numAntna,Bool  isEcp)
 {
    uint16_t regs = 0;
 
@@ -1697,17 +1463,7 @@ Bool  isEcp;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static uint16_t rgSCHUtlCalcPhichRegs
-(
-uint8_t bw,
-uint8_t ng6
-)
-#else
-static uint16_t rgSCHUtlCalcPhichRegs(bw, ng6)
-uint8_t bw;
-uint8_t ng6;
-#endif
+static uint16_t rgSCHUtlCalcPhichRegs(uint8_t bw,uint8_t ng6)
 {
    /* ccpu00115330: Corrected the calculation for number of PHICH groups*/
    return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP);
@@ -1736,30 +1492,12 @@ uint8_t ng6;
  *  @return     N_cce (uint8_t)
  *
  **/
-#ifdef ANSI
-uint8_t rgSCHUtlCalcNCce
-(
-uint8_t            bw,
-RgrPhichNg    ng,
-uint8_t            cfi,
-uint8_t            mPhich,
-uint8_t            numAntna,
-Bool          isEcp
-)
-#else
-uint8_t rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp)
-uint8_t             bw;
-RgrPhichNg     ng;
-uint8_t             cfi;
-uint8_t             mPhich;
-uint8_t             numAntna;
-Bool           isEcp;
-#endif
+uint8_t rgSCHUtlCalcNCce(uint8_t bw,RgrPhichNg ng,uint8_t cfi,uint8_t mPhich,uint8_t numAntna,Bool isEcp)
 {
-   uint16_t         totalRegs;
-   uint16_t         phichRegs;
-   uint16_t         cceRegs;
-   uint8_t          ng6;
+   uint16_t totalRegs;
+   uint16_t phichRegs;
+   uint16_t cceRegs;
+   uint8_t  ng6;
 
    /*ccpu00116757-  removed check for (ERRCLASS & ERRCLS_DEBUG)*/
 
@@ -1808,28 +1546,12 @@ Bool           isEcp;
  *  @return     N_cce (uint8_t)
  *
  **/
-#ifdef ANSI
-uint8_t rgSCHUtlCalcNCce
-(
-uint8_t       bw,
-RgrPhichNg    ng,
-uint8_t       cfi,
-uint8_t       numAntna,
-Bool          isEcp
-)
-#else
-uint8_t rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp)
-uint8_t        bw;
-RgrPhichNg     ng;
-uint8_t        cfi;
-uint8_t        numAntna;
-Bool           isEcp;
-#endif
+uint8_t rgSCHUtlCalcNCce(uint8_t bw,RgrPhichNg ng,uint8_t cfi,uint8_t numAntna,Bool isEcp)
 {
-   uint16_t         totalRegs;
-   uint16_t         phichRegs;
-   uint16_t         cceRegs;
-   uint8_t          ng6;
+   uint16_t totalRegs;
+   uint16_t phichRegs;
+   uint16_t cceRegs;
+   uint8_t  ng6;
 
    /*ccpu00116757-  removed check for (ERRCLASS & ERRCLS_DEBUG)*/
 
@@ -1875,35 +1597,9 @@ Bool           isEcp;
  *  @return  S16
  **/
 #ifdef LTE_TDD
-#ifdef ANSI
-S16 rgSCHUtlGetPhichInfo
-(
-RgSchUlHqProcCb   *hqProc,
-uint8_t           *rbStartRef,
-uint8_t           *nDmrsRef,
-uint8_t           *iPhich
-)
-#else
-S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef, iPhich)
-RgSchUlHqProcCb   *hqProc;
-uint8_t           *rbStartRef;
-uint8_t           *nDmrsRef;
-uint8_t           *iPhich;
-#endif
-#else
-#ifdef ANSI
-S16 rgSCHUtlGetPhichInfo
-(
-RgSchUlHqProcCb   *hqProc,
-uint8_t           *rbStartRef,
-uint8_t           *nDmrsRef
-)
+S16 rgSCHUtlGetPhichInfo(RgSchUlHqProcCb *hqProc,uint8_t *rbStartRef,uint8_t *nDmrsRef,uint8_t *iPhich)
 #else
-S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef)
-RgSchUlHqProcCb   *hqProc;
-uint8_t           *rbStartRef;
-uint8_t           *nDmrsRef;
-#endif
+S16 rgSCHUtlGetPhichInfo(RgSchUlHqProcCb *hqProc,uint8_t *rbStartRef,uint8_t *nDmrsRef)
 #endif
 {
 /* ACC-TDD */
@@ -1947,7 +1643,6 @@ uint8_t           *nDmrsRef;
  *  @param[out] uint8_t             *hqPId
  *  @return  S16
  **/
-#ifdef ANSI
 S16 rgSCHUtlAllocRcptInfo
 (
 RgSchUlAlloc   *alloc,
@@ -1963,23 +1658,6 @@ uint8_t        *nDmrs,
 Bool           *ndi,
 uint8_t        *hqPId
 )
-#else
-S16 rgSCHUtlAllocRcptInfo(alloc, rnti, iMcsRef, rbStartRef, numRbRef,
-                                 rvRef, size, modType, isRtx, nDmrs, ndi,
-                                 hqPId)
-RgSchUlAlloc   *alloc;
-CmLteRnti      *rnti;
-uint8_t        *iMcsRef;
-uint8_t        *rbStartRef;
-uint8_t        *numRbRef;
-uint8_t        *rvRef;
-uint16_t       *size;
-TfuModScheme   *modType;
-Bool           *isRtx;
-uint8_t        *nDmrs;
-Bool           *ndi;
-uint8_t        *hqPId;
-#endif
 {
    /* Modulation order for 16qam UEs would be
     * min(4,modulation order in grant). Please refer to 36.213-8.6.1*/
@@ -2044,21 +1722,7 @@ uint8_t        *hqPId;
  *  @param[out] TfuModScheme   *modType
  *  @return  S16
  **/
-#ifdef ANSI
-S16 rgSCHUtlAllocRcptInfo
-(
-RgSchCellCb             *cell,
-RgSchUlAlloc            *alloc,
-CmLteTimingInfo         *timeInfo,
-TfuUeUlSchRecpInfo      *recpReq
-)
-#else
-S16 rgSCHUtlAllocRcptInfo(cell, alloc, timeInfo, recpReq)
-RgSchCellCb             *cell;
-RgSchUlAlloc            *alloc;
-CmLteTimingInfo         *timeInfo;
-TfuUeUlSchRecpInfo      *recpReq;
-#endif
+S16 rgSCHUtlAllocRcptInfo(RgSchCellCb *cell,RgSchUlAlloc *alloc,CmLteTimingInfo *timeInfo,TfuUeUlSchRecpInfo *recpReq)
 {
 #if (ERRCLASS & ERRCLS_DEBUG)
    if ((alloc == NULLP) || (alloc->hqProc == NULLP))
@@ -2157,17 +1821,7 @@ TfuUeUlSchRecpInfo      *recpReq;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-static Void rgSCHUtlUpdPrachOcc
-(
-RgSchCellCb       *cell,
-RgrTddPrachInfo   *cellCfg
-)
-#else
-static Void rgSCHUtlUpdPrachOcc(cell, cellCfg)
-RgSchCellCb       *cell;
-RgrTddPrachInfo   *cellCfg;
-#endif
+static Void rgSCHUtlUpdPrachOcc(RgSchCellCb *cell,RgrTddPrachInfo *cellCfg)
 {
    uint8_t    idx;
    uint8_t    count = 0;
@@ -2221,17 +1875,7 @@ RgrTddPrachInfo   *cellCfg;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlPrachCfgInit
-(
-RgSchCellCb       *cell,
-RgrCellCfg        *cellCfg
-)
-#else
-Void rgSCHUtlPrachCfgInit(cell, cellCfg)
-RgSchCellCb       *cell;
-RgrCellCfg        *cellCfg;
-#endif
+Void rgSCHUtlPrachCfgInit(RgSchCellCb *cell,RgrCellCfg *cellCfg)
 {
    uint8_t idx;
    uint8_t subfrmIdx;
@@ -2297,19 +1941,7 @@ RgrCellCfg        *cellCfg;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrCellCfg
-(
-RgSchCellCb       *cell,
-RgrCellCfg        *cellCfg,
-RgSchErrInfo      *errInfo
-)
-#else
-S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo)
-RgSchCellCb       *cell;
-RgrCellCfg        *cellCfg;
-RgSchErrInfo      *errInfo;
-#endif
+S16 rgSCHUtlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *errInfo)
 {
    uint8_t         i;
    uint8_t         sfn=0;
@@ -2477,19 +2109,7 @@ RgSchErrInfo      *errInfo;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrCellCfg
-(
-RgSchCellCb       *cell,
-RgrCellCfg        *cellCfg,
-RgSchErrInfo      *errInfo
-)
-#else
-S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo)
-RgSchCellCb       *cell;
-RgrCellCfg        *cellCfg;
-RgSchErrInfo      *errInfo;
-#endif
+S16 rgSCHUtlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *errInfo)
 {
    uint8_t         i;
    RgSchDlSf       *sf;
@@ -2664,19 +2284,7 @@ RgSchErrInfo      *errInfo;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrCellRecfg
-(
-RgSchCellCb       *cell,
-RgrCellRecfg      *recfg,
-RgSchErrInfo      *err
-)
-#else
-S16 rgSCHUtlRgrCellRecfg(cell, recfg, err)
-RgSchCellCb       *cell;
-RgrCellRecfg      *recfg;
-RgSchErrInfo      *err;
-#endif
+S16 rgSCHUtlRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err));
 }
@@ -2699,15 +2307,7 @@ RgSchErrInfo      *err;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlFreeCell
-(
-RgSchCellCb          *cell
-)
-#else
-S16 rgSCHUtlFreeCell(cell)
-RgSchCellCb          *cell;
-#endif
+S16 rgSCHUtlFreeCell(RgSchCellCb  *cell)
 {
    uint8_t          i;
    CmLListCp        *lst;
@@ -2848,21 +2448,7 @@ RgSchCellCb          *cell;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrUeCfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgrUeCfg                   *cfg,
-RgSchErrInfo               *err
-)
-#else
-S16 rgSCHUtlRgrUeCfg(cell, ue, cfg, err)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgrUeCfg                   *cfg;
-RgSchErrInfo               *err;
-#endif
+S16 rgSCHUtlRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *cfg,RgSchErrInfo *err)
 {
 
    /* Assign TM 1 as UE's default TM */
@@ -2923,23 +2509,7 @@ RgSchErrInfo               *err;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLcCfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *dlLc,
-RgrLchCfg               *cfg,
-RgSchErrInfo               *errInfo
-)
-#else
-S16 rgSCHUtlRgrLcCfg(cell, ue, dlLc, cfg, errInfo)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *dlLc;
-RgrLchCfg               *cfg;
-RgSchErrInfo               *errInfo;
-#endif
+S16 rgSCHUtlRgrLcCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *dlLc,RgrLchCfg *cfg,RgSchErrInfo *errInfo)
 {
    return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo));
 }
@@ -2965,23 +2535,7 @@ RgSchErrInfo               *errInfo;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLcRecfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *dlLc,
-RgrLchRecfg                *recfg,
-RgSchErrInfo               *err
-)
-#else
-S16 rgSCHUtlRgrLcRecfg(cell, ue, dlLc, recfg, err)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *dlLc;
-RgrLchRecfg                *recfg;
-RgSchErrInfo               *err;
-#endif
+S16 rgSCHUtlRgrLcRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *dlLc,RgrLchRecfg *recfg,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err));
 }
@@ -3003,21 +2557,7 @@ RgSchErrInfo               *err;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLcDel
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-CmLteLcId                  lcId,
-uint8_t                    lcgId
-)
-#else
-S16 rgSCHUtlRgrLcDel(cell, ue, lcId, lcgId)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-CmLteLcId                  lcId;
-uint8_t                    lcgId;
-#endif
+S16 rgSCHUtlRgrLcDel(RgSchCellCb *cell,RgSchUeCb *ue,CmLteLcId lcId,uint8_t lcgId)
 {
    cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId);
 
@@ -3043,21 +2583,7 @@ uint8_t                    lcgId;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLcgCfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgrLcgCfg               *cfg,
-RgSchErrInfo               *errInfo
-)
-#else
-S16 rgSCHUtlRgrLcgCfg(cell, ue, cfg, errInfo)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgrLcgCfg               *cfg;
-RgSchErrInfo               *errInfo;
-#endif
+S16 rgSCHUtlRgrLcgCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrLcgCfg *cfg,RgSchErrInfo *errInfo)
 {
    return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo));
 }
@@ -3082,21 +2608,7 @@ RgSchErrInfo               *errInfo;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLcgRecfg
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgrLcgRecfg                *recfg,
-RgSchErrInfo               *err
-)
-#else
-S16 rgSCHUtlRgrLcgRecfg(cell, ue, recfg, err)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgrLcgRecfg                *recfg;
-RgSchErrInfo               *err;
-#endif
+S16 rgSCHUtlRgrLcgRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrLcgRecfg *recfg,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err));
 } /* rgSCHUtlRgrLcRecfg */
@@ -3119,19 +2631,7 @@ RgSchErrInfo               *err;
  *  @return     S16
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlRgrLcgDel
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-uint8_t                    lcgId
-)
-#else
-Void rgSCHUtlRgrLcgDel(cell, ue, lcgId)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-uint8_t                    lcgId;
-#endif
+Void rgSCHUtlRgrLcgDel(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t lcgId)
 {
    cell->sc.apis->rgSCHFreeLcg(cell, ue, &ue->ul.lcgArr[lcgId]);
 
@@ -3159,19 +2659,7 @@ uint8_t                    lcgId;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void  rgSCHUtlDoaInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-TfuDoaRpt          *doaRpt
-)
-#else
-Void rgSCHUtlDoaInd(cell, ue, doaRpt)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-TfuDoaRpt          *doaRpt;
-#endif
+Void  rgSCHUtlDoaInd(RgSchCellCb  *cell,RgSchUeCb *ue,TfuDoaRpt *doaRpt)
 {
    ue->mimoInfo.doa.pres = PRSNT_NODEF;
    ue->mimoInfo.doa.val = doaRpt->doa;
@@ -3195,21 +2683,7 @@ TfuDoaRpt          *doaRpt;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlCqiInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-TfuDlCqiRpt        *dlCqiRpt,
-CmLteTimingInfo    timingInfo
-)
-#else
-Void rgSCHUtlDlCqiInd(cell, ue, dlCqiRpt, timingInfo)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-TfuDlCqiRpt        *dlCqiRpt;
-CmLteTimingInfo    timingInfo;
-#endif
+Void rgSCHUtlDlCqiInd(RgSchCellCb *cell,RgSchUeCb  *ue,TfuDlCqiRpt *dlCqiRpt,CmLteTimingInfo timingInfo)
 {
    RgSchCellCb        *sCellCb = NULLP;
    if (dlCqiRpt->isPucchInfo)
@@ -3250,21 +2724,7 @@ CmLteTimingInfo    timingInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlSrsInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-TfuSrsRpt          *srsRpt,
-CmLteTimingInfo    timingInfo
-)
-#else
-Void rgSCHUtlSrsInd(cell, ue, srsRpt, timingInfo)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-TfuSrsRpt        *srsRpt;
-CmLteTimingInfo    timingInfo;
-#endif
+Void rgSCHUtlSrsInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuSrsRpt *srsRpt,CmLteTimingInfo timingInfo)
 {
    cell->sc.apis->rgSCHSrsInd(cell, ue, srsRpt, timingInfo);
    return;
@@ -3286,17 +2746,7 @@ CmLteTimingInfo    timingInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlTARpt
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue
-)
-#else
-Void rgSCHUtlDlTARpt(cell, ue)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-#endif
+Void rgSCHUtlDlTARpt(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    cell->sc.apis->rgSCHDlTARpt(cell, ue);
    return;
@@ -3318,17 +2768,7 @@ RgSchUeCb          *ue;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlRlsSubFrm
-(
-RgSchCellCb        *cell,
-CmLteTimingInfo    subFrm
-)
-#else
-Void rgSCHUtlDlRlsSubFrm(cell, subFrm)
-RgSchCellCb        *cell;
-CmLteTimingInfo    subFrm;
-#endif
+Void rgSCHUtlDlRlsSubFrm(RgSchCellCb *cell,CmLteTimingInfo subFrm)
 {
    cell->sc.apis->rgSCHDlRlsSubFrm(cell, subFrm);
    return;
@@ -3354,19 +2794,7 @@ CmLteTimingInfo    subFrm;
  *
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHUtlUpdACqiTrigWt
-(
-RgSchUeCb       *ue,
-RgSchUeCellInfo *cellInfo,
-uint8_t         isAck 
-)
-#else
-Void rgSCHUtlUpdACqiTrigWt(ue,cellInfo, isAck)
-RgSchUeCb       *ue;
-RgSchUeCellInfo *cellInfo;
-uint8_t          isAck; 
-#endif
+Void rgSCHUtlUpdACqiTrigWt(RgSchUeCb *ue,RgSchUeCellInfo *cellInfo,uint8_t isAck )
 {
 #ifdef LTE_ADV
    uint8_t triggerSet  = 0;
@@ -3435,19 +2863,7 @@ uint8_t          isAck;
  *
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHUtlHdlUlTransInd
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-CmLteTimingInfo timingInfo
-)
-#else
-Void rgSCHUtlHdlUlTransInd(cell, ue, timingInfo)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-CmLteTimingInfo timingInfo;
-#endif
+Void rgSCHUtlHdlUlTransInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo)
 {
    cell->sc.apis->rgSCHHdlUlTransInd(cell, ue, timingInfo);
    return;
@@ -3467,19 +2883,7 @@ CmLteTimingInfo timingInfo;
  *
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHUtlHdlCrcInd
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-CmLteTimingInfo timingInfo
-)
-#else
-Void rgSCHUtlHdlCrcInd(cell, ue, timingInfo)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-CmLteTimingInfo timingInfo;
-#endif
+Void rgSCHUtlHdlCrcInd(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteTimingInfo timingInfo)
 {
    cell->sc.apis->rgSCHUlCrcInd(cell, ue, timingInfo);
    return;
@@ -3499,19 +2903,7 @@ CmLteTimingInfo timingInfo;
  *
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSCHUtlHdlCrcFailInd
-(
-RgSchCellCb     *cell,
-RgSchUeCb       *ue,
-CmLteTimingInfo timingInfo
-)
-#else
-Void rgSCHUtlHdlCrcFailInd(cell, ue, timingInfo)
-RgSchCellCb     *cell;
-RgSchUeCb       *ue;
-CmLteTimingInfo timingInfo;
-#endif
+Void rgSCHUtlHdlCrcFailInd(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteTimingInfo timingInfo)
 {
    cell->sc.apis->rgSCHUlCrcFailInd(cell, ue, timingInfo);
    return;
@@ -3536,17 +2928,7 @@ CmLteTimingInfo timingInfo;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlProcAddToRetx
-(
-RgSchCellCb                *cell,
-RgSchDlHqProcCb            *hqP
-)
-#else
-Void rgSCHUtlDlProcAddToRetx(cell, hqP)
-RgSchCellCb                *cell;
-RgSchDlHqProcCb            *hqP;
-#endif
+Void rgSCHUtlDlProcAddToRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP)
 {
    cell->sc.apis->rgSCHDlProcAddToRetx(cell, hqP);
    return;
@@ -3570,19 +2952,7 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlHqPTbAddToTx
-(
-RgSchDlSf                  *subFrm,
-RgSchDlHqProcCb            *hqP,
-uint8_t                    tbIdx
-)
-#else
-Void rgSCHUtlDlHqPTbAddToTx(subFrm, hqP, tbIdx)
-RgSchDlSf                  *subFrm;
-RgSchDlHqProcCb            *hqP;
-uint8_t                    tbIdx;
-#endif
+Void rgSCHUtlDlHqPTbAddToTx(RgSchDlSf *subFrm,RgSchDlHqProcCb *hqP,uint8_t tbIdx)
 {
    RgSchUeCb *ue = NULLP;
    RgSchCellCb *cell = hqP->hqE->cell;
@@ -3664,21 +3034,7 @@ uint8_t                    tbIdx;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlDlHqPTbRmvFrmTx
-(
-RgSchDlSf                  *subFrm,
-RgSchDlHqProcCb            *hqP,
-uint8_t                    tbIdx,
-Bool                       isRepeting
-)
-#else
-Void rgSCHUtlDlHqPTbRmvFrmTx(subFrm, hqP, tbIdx, isRepeting)
-RgSchDlSf                  *subFrm;
-RgSchDlHqProcCb            *hqP;
-uint8_t                    tbIdx;
-Bool                       isRepeting;
-#endif
+Void rgSCHUtlDlHqPTbRmvFrmTx(RgSchDlSf *subFrm,RgSchDlHqProcCb  *hqP,uint8_t tbIdx,Bool isRepeting)
 {
    RgSchCellCb *cell = NULLP;
    /* Check with TDD */
@@ -3735,21 +3091,10 @@ Bool                       isRepeting;
  *  @param[in]  ueId
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-RgSchCellCb* rgSchUtlGetCellCb
-(
- Inst         inst,
- uint16_t     cellId
-)
-#else
-RgSchCellCb* rgSchUtlGetCellCb(inst, cellId)
- Inst          inst;
- uint16_t      cellId;
-#endif
+RgSchCellCb* rgSchUtlGetCellCb(Inst inst,uint16_t cellId)
 {
-   RgSchCellCb    *cellCb = NULLP; 
-   uint8_t        strtCellId;
-
+   RgSchCellCb  *cellCb = NULLP; 
+   uint8_t      strtCellId;
    strtCellId = rgSchCb[inst].genCfg.startCellId;
    cellCb     = rgSchCb[inst].cells[cellId - strtCellId];
 
@@ -3769,27 +3114,13 @@ RgSchCellCb* rgSchUtlGetCellCb(inst, cellId)
  *  @param[in]  RgSchUeCb *ue
  *  @return   uint8_t servCellIdx
  **/
-#ifdef ANSI
-uint8_t rgSchUtlGetServCellIdx
-(
- Inst         inst,
- uint16_t     cellId,
- RgSchUeCb    *ue
-)
-#else
-uint8_t rgSchUtlGetServCellIdx(inst,cellId,ue)
- Inst         inst;
- uint16_t     cellId;
- RgSchUeCb    *ue;
-#endif
+uint8_t rgSchUtlGetServCellIdx(Inst inst, uint16_t cellId, RgSchUeCb *ue)
 {
    uint8_t servCellIdx;
    uint16_t strtCellId;
 
    strtCellId = rgSchCb[inst].genCfg.startCellId;
-
    servCellIdx = ue->cellIdToCellIdxMap[cellId - strtCellId];
-
    return (servCellIdx);
 
 }  /* rgSchUtlGetCellCb */
@@ -3806,17 +3137,7 @@ uint8_t rgSchUtlGetServCellIdx(inst,cellId,ue)
  *  @param[in]  ueId
  *  @return  RgSchUeCb*
  **/
-#ifdef ANSI
-S16 rgSchUtlVldtCellId
-(
- Inst         inst,
- uint16_t          cellId
-)
-#else
-S16 rgSchUtlVldtCellId(inst, cellId)
- Inst          inst;
- uint16_t           cellId;
-#endif
+S16 rgSchUtlVldtCellId(Inst inst,uint16_t cellId)
 {
    uint8_t              strtCellId;
 
@@ -3847,21 +3168,7 @@ S16 rgSchUtlVldtCellId(inst, cellId)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrUeRecfg
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgrUeRecfg   *ueRecfg,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHUtlRgrUeRecfg(cell, ue, ueRecfg, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgrUeRecfg   *ueRecfg;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHUtlRgrUeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err)
 {
 /* Changes for UE Category Reconfiguration feature addition */
    RgSchCmnUe    *ueSch = RG_SCH_CMN_GET_UE(ue, cell);
@@ -3943,19 +3250,7 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchDlLcCb*  svc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlFreeDlLc
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *svc
-)
-#else
-Void rgSCHUtlFreeDlLc(cell, ue, svc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *svc;
-#endif
+Void rgSCHUtlFreeDlLc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb  *svc)
 {
    cell->sc.apis->rgSCHFreeDlLc(cell, ue, svc);
 
@@ -3978,17 +3273,7 @@ RgSchDlLcCb                *svc;
  *  @param[in]  RgSchUeCb    *ue
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlFreeUe
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue
-)
-#else
-Void rgSCHUtlFreeUe(cell, ue)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-#endif
+Void rgSCHUtlFreeUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
 #ifdef LTE_TDD
    rgSCHUtlDelUeANFdbkInfo(ue,RGSCH_PCELL_INDEX);
@@ -4016,19 +3301,7 @@ RgSchUeCb    *ue;
  *  @param[in]  RgSchDlLcCb*  lc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlDlDedBoUpd
-(
-RgSchCellCb                *cell,
-RgSchUeCb                  *ue,
-RgSchDlLcCb                *lc
-)
-#else
-Void rgSCHUtlDlDedBoUpd(cell, ue, lc)
-RgSchCellCb                *cell;
-RgSchUeCb                  *ue;
-RgSchDlLcCb                *lc;
-#endif
+Void rgSCHUtlDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *lc)
 {
    cell->sc.apis->rgSCHDlDedBoUpd(cell, ue, lc);
    return;
@@ -4048,19 +3321,7 @@ RgSchDlLcCb                *lc;
  *  @param[in] RgSchRaCb       *raCb
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlRecMsg3Alloc
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue,
-RgSchRaCb        *raCb
-)
-#else
-Void rgSCHUtlRecMsg3Alloc(cell, ue, raCb)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue;
-RgSchRaCb        *raCb;
-#endif
+Void rgSCHUtlRecMsg3Alloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchRaCb *raCb)
 {
    cell->sc.apis->rgSCHUlRecMsg3Alloc(cell, ue, raCb);
    return;
@@ -4086,19 +3347,7 @@ RgSchRaCb        *raCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlUpdUlHqProc
-(
-RgSchCellCb      *cell,
-RgSchUlHqProcCb  *curProc,
-RgSchUlHqProcCb  *oldProc
-)
-#else
-S16 rgSCHUtlUpdUlHqProc(cell, curProc, oldProc)
-RgSchCellCb      *cell;
-RgSchUlHqProcCb  *curProc;
-RgSchUlHqProcCb  *oldProc;
-#endif
+S16 rgSCHUtlUpdUlHqProc(RgSchCellCb *cell,RgSchUlHqProcCb  *curProc,RgSchUlHqProcCb  *oldProc)
 {
    return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc));
 }  /* rgSCHUtlUpdUlHqProc */
@@ -4120,23 +3369,10 @@ RgSchUlHqProcCb  *oldProc;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlContResUlGrant
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHUtlContResUlGrant(cell, ue, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHUtlContResUlGrant(RgSchCellCb *cell,RgSchUeCb *ue,RgSchErrInfo *err)
 {
 
    ue->isMsg4PdcchWithCrnti = TRUE; 
-
    return (cell->sc.apis->rgSCHContResUlGrant(cell, ue, err));
 }  /* rgSCHUtlContResUlGrant */
 
@@ -4156,21 +3392,7 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlSrRcvd
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-CmLteTimingInfo frm,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHUtlSrRcvd(cell, ue, frm, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-CmLteTimingInfo frm;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHUtlSrRcvd(RgSchCellCb  *cell,RgSchUeCb *ue,CmLteTimingInfo frm,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err));
 }  /* rgSCHUtlSrRcvd */
@@ -4193,23 +3415,7 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHUtlUpdBsrShort
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           lcgId,
-uint8_t           bsr,
-RgSchErrInfo *err
-)
-#else
-Void rgSCHUtlUpdBsrShort(cell, ue, lcgId, bsr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           lcgId;
-uint8_t           bsr;
-RgSchErrInfo *err;
-#endif
+Void rgSCHUtlUpdBsrShort(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t lcgId,uint8_t bsr,RgSchErrInfo *err)
 {
    cell->sc.apis->rgSCHUpdBsrShort(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err);
    return;
@@ -4235,23 +3441,7 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHUtlUpdBsrTrunc
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           lcgId,
-uint8_t           bsr,
-RgSchErrInfo *err
-)
-#else
-Void rgSCHUtlUpdBsrTrunc(cell, ue, lcgId, bsr, err)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-uint8_t            lcgId;
-uint8_t            bsr;
-RgSchErrInfo *err;
-#endif
+Void rgSCHUtlUpdBsrTrunc(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t  lcgId,uint8_t bsr,RgSchErrInfo *err)
 {
    cell->sc.apis->rgSCHUpdBsrTrunc(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err);
    return; 
@@ -4281,30 +3471,9 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-Void rgSCHUtlUpdBsrLong
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           bsr0,
-uint8_t           bsr1,
-uint8_t           bsr2,
-uint8_t           bsr3,
-RgSchErrInfo *err
-)
-#else
-Void rgSCHUtlUpdBsrLong(cell, ue, bsr0, bsr1, bsr2, bsr3, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           bsr0;
-uint8_t           bsr1;
-uint8_t           bsr2;
-uint8_t           bsr3;
-RgSchErrInfo *err;
-#endif
+Void rgSCHUtlUpdBsrLong(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t bsr0,uint8_t bsr1,uint8_t bsr2,uint8_t bsr3,RgSchErrInfo *err)
 {
    uint8_t bsArr[4];
-
    bsArr[0] = bsr0;
    bsArr[1] = bsr1;
    bsArr[2] = bsr2;
@@ -4330,21 +3499,7 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlUpdExtPhr
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-RgInfExtPhrCEInfo * extPhr,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHUtlUpdExtPhr(cell, ue, extPhr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-RgInfExtPhrCEInfo * extPhr;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHUtlUpdExtPhr(RgSchCellCb *cell,RgSchUeCb *ue,RgInfExtPhrCEInfo *extPhr,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err));
 }  /* rgSCHUtlUpdExtPhr */
@@ -4368,21 +3523,7 @@ RgSchErrInfo *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlUpdPhr
-(
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-uint8_t           phr,
-RgSchErrInfo *err
-)
-#else
-S16 rgSCHUtlUpdPhr(cell, ue, phr, err)
-RgSchCellCb  *cell;
-RgSchUeCb    *ue;
-uint8_t           phr;
-RgSchErrInfo *err;
-#endif
+S16 rgSCHUtlUpdPhr(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t phr,RgSchErrInfo *err)
 {
    return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err));
 }  /* rgSCHUtlUpdPhr */
@@ -4403,19 +3544,7 @@ RgSchErrInfo *err;
  *  @param[in]  TfuUlCqiRpt         *ulCqiInfo
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlUlCqiInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-TfuUlCqiRpt          *ulCqiInfo
-)
-#else
-Void rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-TfuUlCqiRpt          *ulCqiInfo;
-#endif
+Void rgSCHUtlUlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo)
 {
    cell->sc.apis->rgSCHUlCqiInd(cell, ue, ulCqiInfo);
    return;
@@ -4436,19 +3565,7 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @param[in]  uint8_t                  delta
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlPucchDeltaPwrInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-S8                   delta
-)
-#else
-Void rgSCHUtlPucchDeltaPwrInd(cell, ue, delta)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-S8                   delta;
-#endif
+Void rgSCHUtlPucchDeltaPwrInd(RgSchCellCb *cell,RgSchUeCb *ue,S8 delta)
 {
    cell->sc.apis->rgSCHPucchDeltaPwrInd(cell, ue, delta);
    return;
@@ -4467,17 +3584,7 @@ S8                   delta;
  *  @param[in]  RgSchUeCb           *ue
  *  @return  S16
  **/
-#ifdef ANSI
-Void rgSCHUtlUeReset
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue
-)
-#else
-Void rgSCHUtlUeReset(cell, ue)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-#endif
+Void rgSCHUtlUeReset(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    ue->remBoCnt = 0;
    cell->sc.apis->rgSCHUeReset(cell, ue);
@@ -4504,21 +3611,7 @@ RgSchUeCb            *ue;
  *  @param[out] RgSchUlHqProcCb     **procRef
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUtlUlHqProcForUe
-(
-RgSchCellCb         *cell,
-CmLteTimingInfo     frm,
-RgSchUeCb           *ue,
-RgSchUlHqProcCb     **procRef
-)
-#else
-Void rgSCHUtlUlHqProcForUe(cell, frm, ue, procRef)
-RgSchCellCb         *cell;
-CmLteTimingInfo     frm;
-RgSchUeCb           *ue;
-RgSchUlHqProcCb     **procRef;
-#endif
+Void rgSCHUtlUlHqProcForUe(RgSchCellCb *cell,CmLteTimingInfo frm,RgSchUeCb *ue,RgSchUlHqProcCb **procRef)
 {
    cell->sc.apis->rgSCHUlHqProcForUe(cell, frm, ue, procRef);
 
@@ -4544,15 +3637,7 @@ RgSchUlHqProcCb     **procRef;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlFirstRcptnReq
-(
-RgSchCellCb      *cell
-)
-#else
-RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell)
-RgSchCellCb      *cell;
-#endif
+RgSchUlAlloc *rgSCHUtlFirstRcptnReq(RgSchCellCb *cell)
 {
    return (cell->sc.apis->rgSCHFirstRcptnReq(cell));
 }
@@ -4574,17 +3659,7 @@ RgSchCellCb      *cell;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlNextRcptnReq
-(
-RgSchCellCb      *cell,
-RgSchUlAlloc     *alloc
-)
-#else
-RgSchUlAlloc *rgSCHUtlNextRcptnReq(cell, alloc)
-RgSchCellCb      *cell;
-RgSchUlAlloc     *alloc;
-#endif
+RgSchUlAlloc *rgSCHUtlNextRcptnReq(RgSchCellCb *cell,RgSchUlAlloc *alloc)
 {
    return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc));
 }
@@ -4607,17 +3682,7 @@ RgSchUlAlloc     *alloc;
  *  @param[in]  uint8_t                idx  
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc
-(
-RgSchCellCb      *cell,
-uint8_t               idx
-)
-#else
-RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(cell, idx)
-RgSchCellCb      *cell;
-uint8_t               idx;
-#endif
+RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(RgSchCellCb *cell,uint8_t idx)
 {
    return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx));
 }
@@ -4638,19 +3703,7 @@ uint8_t               idx;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc
-(
-RgSchCellCb      *cell,
-RgSchUlAlloc     *alloc,
-uint8_t               idx 
-)
-#else
-RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(cell, alloc, idx)
-RgSchCellCb      *cell;
-RgSchUlAlloc     *alloc;
-uint8_t               idx; 
-#endif
+RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc,uint8_t idx)
 {
    return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx));
 }
@@ -4669,19 +3722,7 @@ uint8_t               idx;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlResetSfAlloc
-(
-RgInfSfAlloc *sfAlloc,
-Bool         resetCmnLcInfo,
-Bool         restAlloc
-)
-#else
-S16 rgSCHUtlResetSfAlloc(sfAlloc,resetCmnLcInfo,restAlloc)
-RgInfSfAlloc *sfAlloc;
-Bool         resetCmnLcInfo;
-Bool         restAlloc;
-#endif
+S16 rgSCHUtlResetSfAlloc(RgInfSfAlloc *sfAlloc,Bool resetCmnLcInfo,Bool restAlloc)
 {
    if(TRUE == restAlloc)
    {
@@ -4715,15 +3756,7 @@ Bool         restAlloc;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlGetRlsHqAlloc
-(
-RgSchCellCb *cell
-)
-#else
-S16 rgSCHUtlGetRlsHqAlloc(cell)
-RgSchCellCb *cell;
-#endif
+S16 rgSCHUtlGetRlsHqAlloc(RgSchCellCb *cell)
 {
    uint8_t    idx = 0;
    Inst  inst = cell->instIdx;
@@ -4763,15 +3796,7 @@ RgSchCellCb *cell;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlPutRlsHqAlloc
-(
-RgSchCellCb *cell
-)
-#else
-S16 rgSCHUtlPutRlsHqAlloc(cell)
-RgSchCellCb *cell;
-#endif
+S16 rgSCHUtlPutRlsHqAlloc(RgSchCellCb *cell)
 {
    uint8_t    idx = 0;
    Inst  inst = cell->instIdx;
@@ -4810,15 +3835,7 @@ RgSchCellCb *cell;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlGetSfAlloc
-(
-RgSchCellCb *cell
-)
-#else
-S16 rgSCHUtlGetSfAlloc(cell)
-RgSchCellCb *cell;
-#endif
+S16 rgSCHUtlGetSfAlloc(RgSchCellCb *cell)
 {
    uint8_t    idx;
    uint8_t    indx;
@@ -4891,15 +3908,7 @@ RgSchCellCb *cell;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlPutSfAlloc
-(
-RgSchCellCb *cell
-)
-#else
-S16 rgSCHUtlPutSfAlloc(cell)
-RgSchCellCb *cell;
-#endif
+S16 rgSCHUtlPutSfAlloc(RgSchCellCb *cell)
 {
    uint8_t    idx;
    uint8_t    indx;
@@ -4968,19 +3977,12 @@ RgSchCellCb *cell;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHUtlAllocSBuf
 (
 Inst    inst,               /* Instance of the invoking scheduler */
 Data    **pData,            /* Pointer of the data to be returned */
 Size    size                /* size */
 )
-#else
-S16 rgSCHUtlAllocSBuf(inst, pData, size)
-Inst    inst;              /* Instance of the invoking scheduler */
-Data    **pData;            /* Pointer of the data to be returned */
-Size    size;               /* size */
-#endif
 {
    /* Moving alarm diagnostics to available scope */
 
@@ -5036,19 +4038,12 @@ Size    size;               /* size */
 *       Notes: None
 *       File:  rg_utl.c
 */
-#ifdef ANSI
 Void rgSCHUtlFreeSBuf
 (
 Inst inst,          /* Instance of the invoking scheduler */
 Data **data,         /* pointer to data */
 Size size           /* size */
 )
-#else
-Void rgSCHUtlFreeSBuf(inst, data, size)
-Inst inst;          /* Instance of the invoking scheduler */
-Data **data;         /* pointer to data */
-Size size;          /* size */
-#endif
 {
 
    S16 ret;
@@ -5094,32 +4089,20 @@ Size size;          /* size */
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
-Void rgSCHUtlFreeWarningSiSeg
-(
-Region        reg,
-Pool          pool,
-CmLListCp     *siPduLst          
-)
-#else
-Void rgSCHUtlFreeWarningSiSeg(reg, pool, siPduLst)
-Region        reg;
-Pool          pool;
-CmLListCp     *siPduLst;          
-#endif
+Void rgSCHUtlFreeWarningSiSeg(Region reg,Pool pool,CmLListCp *siPduLst)
 {
    CmLList      *node;
    Buffer       *pdu;
 
-      while (siPduLst->first != NULLP)
-      {
-         node = siPduLst->first;
-         pdu = (Buffer *)node->node;
-         cmLListDelFrm(siPduLst, node);
-         RGSCH_FREE_MSG(pdu);
-         SPutSBuf(reg, pool, (Data *)node,sizeof(CmLList));
-         node = NULLP;
-      }
+   while (siPduLst->first != NULLP)
+   {
+      node = siPduLst->first;
+      pdu = (Buffer *)node->node;
+      cmLListDelFrm(siPduLst, node);
+      RGSCH_FREE_MSG(pdu);
+      SPutSBuf(reg, pool, (Data *)node,sizeof(CmLList));
+      node = NULLP;
+   }
 
    return;
 } /* end of rgSCHUtlFreeWarningSiSeg */         
@@ -5137,15 +4120,7 @@ CmLListCp     *siPduLst;
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
-Void rgSCHUtlFreeWarningSiPdu
-(
-RgSchCellCb       *cell
-)
-#else
-Void rgSCHUtlFreeWarningSiPdu(cell)
-RgSchCellCb       *cell;
-#endif
+Void rgSCHUtlFreeWarningSiPdu(RgSchCellCb  *cell)
 {
    CmLList            *node;
    Buffer             *pdu;
@@ -5193,15 +4168,7 @@ RgSchCellCb       *cell;
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
-Buffer *rgSCHUtlGetWarningSiPdu
-(
-RgSchCellCb             *cell
-)
-#else
-Buffer *rgSCHUtlGetWarningSiPdu(cell)
-RgSchCellCb             *cell;
-#endif
+Buffer *rgSCHUtlGetWarningSiPdu(RgSchCellCb *cell)
 {
    RgSchWarningSiInfo  *warningSi;
    RgSchWarningSiPdu  *warningSiPdu; 
@@ -5237,21 +4204,7 @@ RgSchCellCb             *cell;
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
-S16 rgSCHUtlGetMcsAndNPrb
-(
-RgSchCellCb         *cell,
-uint8_t                  *nPrb,
-uint8_t                  *mcs,
-MsgLen              *msgLen
-)
-#else
-S16 rgSCHUtlGetMcsAndNPrb(cell, nPrb, mcs, msgLen)
-RgSchCellCb         *cell;
-uint8_t                  *nPrb;
-uint8_t                  *mcs;
-MsgLen              *msgLen;
-#endif
+S16 rgSCHUtlGetMcsAndNPrb(RgSchCellCb *cell,uint8_t *nPrb,uint8_t *mcs,MsgLen  *msgLen)
 {
    RgSchWarningSiInfo  *warningSi;
    RgSchWarningSiPdu  *warningSiPdu; 
@@ -5296,21 +4249,7 @@ MsgLen              *msgLen;
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
-S16 rgSCHUtlCalMcsAndNPrb
-(
-RgSchCellCb         *cell,
-uint8_t                  cfgType,
-MsgLen              msgLen,
-uint8_t                  siId
-)
-#else
-S16 rgSCHUtlCalMcsAndNPrb(cell, nPrb, mcs, msgLen)
-RgSchCellCb         *cell;
-uint8_t                  cfgType;
-MsgLen              msgLen;
-uint8_t                  siId;
-#endif
+S16 rgSCHUtlCalMcsAndNPrb(RgSchCellCb *cell,uint8_t cfgType,MsgLen msgLen,uint8_t siId)
 {
    uint8_t mcs = 0;
    uint8_t nPrb = 0;
@@ -5383,19 +4322,7 @@ uint8_t                  siId;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlFillDgnParams
-(
-Inst        inst,
-RgUstaDgn   *dgn,
-uint8_t          dgnType
-)
-#else
-Void rgSCHUtlFillDgnParams(inst, dgn, dgnType)
-Inst        inst;
-RgUstaDgn   *dgn;
-uint8_t          dgnType;
-#endif
+Void rgSCHUtlFillDgnParams(Inst inst,RgUstaDgn *dgn,uint8_t dgnType)
 {
 
    switch(dgnType)
@@ -5429,19 +4356,7 @@ uint8_t          dgnType;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlGetPstToLyr
-(
-Pst     *pst,
-RgSchCb *schCb,
-Inst    macInst
-)
-#else
-Void rgSCHUtlGetPstToLyr (pst, schCb, macInst)
-Pst     *pst;
-RgSchCb *schCb;
-Inst    macInst;
-#endif
+Void rgSCHUtlGetPstToLyr(Pst  *pst,RgSchCb *schCb,Inst macInst)
 {
 
    /* Only the needed params are filled */
@@ -5476,21 +4391,7 @@ Inst    macInst;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlFillRgInfCmnLcInfo
-(
-RgSchDlSf       *sf,
-RgInfSfAlloc    *sfAlloc,
-CmLteLcId       lcId,
-Bool            sendInd
-)
-#else
-S16 rgSCHUtlFillRgInfCmnLcInfo(sf, sfAlloc, lcId, sendInd)
-RgSchDlSf       *sf;
-RgInfSfAlloc    *sfAlloc;
-CmLteLcId       lcId;
-Bool            sendInd;
-#endif
+S16 rgSCHUtlFillRgInfCmnLcInfo(RgSchDlSf  *sf,RgInfSfAlloc *sfAlloc,CmLteLcId lcId,Bool sendInd)
 {
 
    if((sf->bch.tbSize)&&
@@ -5538,27 +4439,15 @@ Bool            sendInd;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlFillRgInfRarInfo
-(
-RgSchDlSf       *sf,
-RgInfSfAlloc    *sfAlloc,
-RgSchCellCb     *cell
-)
-#else
-S16 rgSCHUtlFillRgInfRarInfo(sf, sfAlloc, cell)
-RgSchDlSf       *sf;
-RgInfSfAlloc    *sfAlloc;
-RgSchCellCb     *cell;
-#endif 
+S16 rgSCHUtlFillRgInfRarInfo(RgSchDlSf *sf,RgInfSfAlloc *sfAlloc,RgSchCellCb *cell)
 {
-   uint8_t               idx;
+   uint8_t          idx;
    CmLListCp        *lnkLst;
    CmLList          *tmp;
    RgSchRaCb        *raCb;
    RgSchUeCb        *ue;
    RgInfRaRntiInfo  *raRntiAlloc;
-   uint8_t               noRaRsps;
+   uint8_t          noRaRsps;
    RgSchCmnDlCell   *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
 
 #ifdef LTE_TDD
@@ -5677,17 +4566,7 @@ RgSchCellCb     *cell;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlFillPdschDciInfo
-(
-TfuPdschDciInfo *pdsch,
-TfuDciInfo      *pdcchDci
-)
-#else
-S16 rgSCHUtlFillPdschDciInfo(pdsch, pdcchDci)
-TfuPdschDciInfo *pdsch;
-TfuDciInfo      *pdcchDci;
-#endif
+S16 rgSCHUtlFillPdschDciInfo(TfuPdschDciInfo *pdsch,TfuDciInfo *pdcchDci)
 {
 
 #ifdef EMTC_ENABLE
@@ -5756,18 +4635,7 @@ TfuDciInfo      *pdcchDci;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-Void rgSchDSFRPwrCheck
-(
- RgSchDlSf               *sf,
- Bool                    *isAllUePwrHigh
- )
-#else
-static Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh)
-   RgSchDlSf               *sf;
-   Bool                    *isAllUePwrHigh;
-
-#endif
+Void rgSchDSFRPwrCheck(RgSchDlSf *sf,Bool *isAllUePwrHigh)
 {     
    RgSchSFRPoolInfo *sfrCCPool;
 
@@ -5811,36 +4679,24 @@ static Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh)
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHUtlFillRgInfTbInfo
-(
-RgSchDlHqProcCb *hqP,
-RgInfUeAlloc    *allocInfo,
-RgSchCellCb     *cell
-)
-#else
-static Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell)
-RgSchDlHqProcCb *hqP;
-RgInfUeAlloc    *allocInfo;
-RgSchCellCb     *cell;
-#endif
+static Void rgSCHUtlFillRgInfTbInfo(RgSchDlHqProcCb *hqP,RgInfUeAlloc *allocInfo,RgSchCellCb *cell)
 {
    RgSchDlSf       *sf;
-   uint8_t              idx;
+   uint8_t         idx;
    RgInfUeTbInfo   *tbInfo;
-   uint8_t              tbCnt;
+   uint8_t         tbCnt;
    /* LTE_ADV_FLAG_REMOVED_START */
 #ifdef TFU_UPGRADE
-   static         uint32_t  tmpCnt = 0;
+   static          uint32_t  tmpCnt = 0;
    Bool            isAllUePwrHigh = FALSE;
 #endif 
    /* LTE_ADV_FLAG_REMOVED_END */
    RgSchDlLcCb    *dlLcCb = NULLP;
-   uint16_t             rlcHdrEstmt;
-   uint8_t              lcId;
+   uint16_t       rlcHdrEstmt;
+   uint8_t        lcId;
    /* RRM_RBC_X */
 #ifdef LTE_L2_MEAS
-   uint8_t              prbUsed = 0;
+   uint8_t        prbUsed = 0;
 #endif
    /* RRM_RBC_Y */
 
@@ -6188,24 +5044,7 @@ RgSchCellCb     *cell;
  *
  **********************************************************/
   /* CA dev Start */
-#ifdef ANSI
-Void rgSCHUtlFillRgInfUeInfo
-(
-RgSchDlSf       *sf,
-RgSchCellCb     *cell,
-CmLListCp       *dlDrxInactvTmrLst,
-CmLListCp       *dlInActvLst,
-CmLListCp       *ulInActvLst
-)
-#else
-Void rgSCHUtlFillRgInfUeInfo (sf,cell, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst)
-{
-RgSchDlSf       *sf;
-RgSchCellCb     *cell;
-CmLListCp       *dlDrxInactvTmrLst;
-CmLListCp       *dlInActvLst;
-CmLListCp       *ulInActvLst;
-#endif
+Void rgSCHUtlFillRgInfUeInfo(RgSchDlSf *sf,RgSchCellCb *cell,CmLListCp *dlDrxInactvTmrLst,CmLListCp *dlInActvLst,CmLListCp  *ulInActvLst)
 {
    RgInfSfAlloc    *sfAlloc;
    CmLListCp       *lnkLst;   /* lnkLst assignment */
@@ -6324,27 +5163,10 @@ CmLListCp       *ulInActvLst;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlUpdSch
-(
-RgInfSfDatInd    *subfrmInfo,
-RgSchCellCb      *cellCb,
-RgSchUeCb        *ueCb,
-RgInfUeDatInd    *pdu,
-RgSchErrInfo     *err
-)
-#else
-S16 rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err)
-RgInfSfDatInd    *subfrmInfo;
-RgSchCellCb      *cellCb;
-RgSchUeCb        *ueCb;
-RgInfUeDatInd    *pdu;
-RgSchErrInfo     *err;
-#endif
+S16 rgSCHUtlUpdSch(RgInfSfDatInd *subfrmInfo,RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgInfUeDatInd  *pdu,RgSchErrInfo *err)
 {
 
    S16               ret;
-
 #ifdef LTEMAC_SPS
    if (RGSCH_UL_SPS_ACT_PRSENT & pdu->ceInfo.bitMask)
    {
@@ -6429,17 +5251,7 @@ RgSchErrInfo     *err;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHUtlAddUeToCcchSduLst
-(
-RgSchCellCb       *cell,
-RgSchUeCb         *ueCb
-)
-#else
-S16 rgSCHUtlAddUeToCcchSduLst(cell, ueCb)
-RgSchCellCb       *cell;
-RgSchUeCb         *ueCb;
-#endif
+S16 rgSCHUtlAddUeToCcchSduLst(RgSchCellCb  *cell,RgSchUeCb *ueCb)
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb, cell);
    RgSchDlHqProcCb *hqP  = (RgSchDlHqProcCb *)ueDl->proc;
@@ -6474,17 +5286,7 @@ RgSchUeCb         *ueCb;
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
-S16 rgSCHUtlUpdtBo
-(
-RgSchCellCb       *cell,
-RgInfCmnBoRpt     *staRsp
-)
-#else
-S16 rgSCHUtlUpdtBo(cell, staRsp)
-RgSchCellCb       *cell;
-RgInfCmnBoRpt     *staRsp;
-#endif
+S16 rgSCHUtlUpdtBo(RgSchCellCb  *cell,RgInfCmnBoRpt *staRsp)
 {
    RgSchUeCb *ueCb;
 
@@ -6526,17 +5328,7 @@ RgInfCmnBoRpt     *staRsp;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlHndlCcchBoUpdt
-(
-RgSchCellCb    *cell,
-RgInfCmnBoRpt  *boRpt
-)
-#else
-S16 rgSCHUtlHndlCcchBoUpdt(cell, boRpt)
-RgSchCellCb    *cell;
-RgInfCmnBoRpt  *boRpt;
-#endif
+S16 rgSCHUtlHndlCcchBoUpdt(RgSchCellCb *cell,RgInfCmnBoRpt *boRpt)
 {
    RgSchRaCb       *raCb;
    RgSchUeCb *ueCb;
@@ -6618,19 +5410,7 @@ RgInfCmnBoRpt  *boRpt;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S32 rgSCHUtlGetAllwdCchTbSz
-(
-uint32_t bo,
-uint8_t  *nPrb,
-uint8_t  *mcs
-)
-#else
-S32 rgSCHUtlGetAllwdCchTbSz(bo, nPrb, mcs)
-uint32_t bo;
-uint8_t  *nPrb;
-uint8_t  *mcs;
-#endif
+S32 rgSCHUtlGetAllwdCchTbSz(uint32_t bo,uint8_t  *nPrb,uint8_t  *mcs)
 {
    S32 lt;
    S32 cn;
@@ -6675,17 +5455,7 @@ uint8_t  *mcs;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlHndlBcchPcchBoUpdt
-(
-RgSchCellCb    *cell,
-RgInfCmnBoRpt  *boUpdt
-)
-#else
-S16 rgSCHUtlHndlBcchPcchBoUpdt(cell, boUpdt)
-RgSchCellCb    *cell;
-RgInfCmnBoRpt  *boUpdt;
-#endif
+S16 rgSCHUtlHndlBcchPcchBoUpdt(RgSchCellCb *cell,RgInfCmnBoRpt *boUpdt)
 {
    RgSchClcDlLcCb *dlLc;
    RgSchClcBoRpt  *boRpt;
@@ -6777,19 +5547,7 @@ RgInfCmnBoRpt  *boUpdt;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrBndCfm
-(
-Inst          instId,
-SuId          suId,
-uint8_t            status
-)
-#else
-S16 rgSCHUtlRgrBndCfm(instId, suId, status)
-Inst          instId;
-SuId          suId;
-uint8_t            status;
-#endif
+S16 rgSCHUtlRgrBndCfm(Inst instId,SuId suId,uint8_t status)
 {
    S16  ret = ROK;
 
@@ -6819,19 +5577,7 @@ uint8_t            status;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgmBndCfm
-(
-Inst          instId,
-SuId          suId,
-uint8_t            status
-)
-#else
-S16 rgSCHUtlRgmBndCfm(instId, suId, status)
-Inst          instId;
-SuId          suId;
-uint8_t            status;
-#endif
+S16 rgSCHUtlRgmBndCfm(Inst instId,SuId suId,uint8_t status)
 {
    S16  ret = ROK;
 
@@ -6863,21 +5609,7 @@ uint8_t            status;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 schSendCfgCfm
-(
-Region        reg,
-Pool          pool,
-RgrCfgTransId transId,
-uint8_t            status
-)
-#else
-S16 schSendCfgCfm(reg, pool, transId, status)
-Region        reg;
-Pool          pool;
-RgrCfgTransId transId;
-uint8_t            status;
-#endif
+S16 schSendCfgCfm(Region reg,Pool pool,RgrCfgTransId transId,uint8_t status)
 {
    Pst cfmPst;
    Inst inst = 0;
@@ -6919,17 +5651,7 @@ uint8_t            status;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrTtiInd
-(
-RgSchCellCb          *cell,
-RgrTtiIndInfo        *rgrTti
-)
-#else
-S16 rgSCHUtlRgrTtiInd(cell, rgrTti)
-RgSchCellCb          *cell;
-RgrTtiIndInfo        *rgrTti;
-#endif
+S16 rgSCHUtlRgrTtiInd(RgSchCellCb *cell,RgrTtiIndInfo *rgrTti)
 {
    S16           ret = ROK;
    RgSchUpSapCb  *rgrSap;                    /*!< RGR SAP Control Block */
@@ -6981,7 +5703,6 @@ RgrTtiIndInfo        *rgrTti;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 rgSCHUtlProcMsg3
 (
 RgInfSfDatInd    *subfrmInfo,
@@ -6990,16 +5711,7 @@ RgSchUeCb        *ueCb,
 CmLteRnti        rnti,
 RgInfUeDatInd    *pdu,
 RgSchErrInfo     *err
- )
-#else
-S16 rgSCHUtlProcMsg3 (subfrmInfo, cellCb, ueCb, rnti, pdu, err)
-RgInfSfDatInd    *subfrmInfo;
-RgSchCellCb      *cellCb;
-RgSchUeCb        *ueCb;
-CmLteRnti        rnti;
-RgInfUeDatInd    *pdu;
-RgSchErrInfo     *err;
-#endif
+)
 {
    S16               ret;
    RgSchRaCb         *raCb;
@@ -7049,19 +5761,7 @@ RgSchErrInfo     *err;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlSpsRelInd
-(
-RgSchCellCb        *cellCb,
-RgSchUeCb          *ueCb,
-Bool               isExplRel
-)
-#else
-S16 rgSCHUtlSpsRelInd (cellCb, ueCb, isExplRel)
-RgSchCellCb        *cellCb;
-RgSchUeCb          *ueCb;
-Bool               isExplRel;
-#endif
+S16 rgSCHUtlSpsRelInd(RgSchCellCb *cellCb,RgSchUeCb *ueCb,Bool isExplRel)
 {
    cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel);
    return ROK;
@@ -7086,19 +5786,7 @@ Bool               isExplRel;
  *      -# ROK
  *      -# RFAILED
  */
-#ifdef ANSI
-S16 rgSCHUtlSpsActInd
-(
-RgSchCellCb        *cellCb,
-RgSchUeCb          *ueCb,
-uint16_t                spsSduSize
-)
-#else
-S16 rgSCHUtlSpsActInd (cellCb, ueCb, spsSduSize)
-RgSchCellCb        *cellCb;
-RgSchUeCb          *ueCb;
-uint16_t                spsSduSize;
-#endif
+S16 rgSCHUtlSpsActInd(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint16_t spsSduSize)
 {
    cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize);
    return ROK;
@@ -7124,25 +5812,12 @@ uint16_t                spsSduSize;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlTfuGrpPwrCntrlReq
-(
-Inst                  inst,
-S16                   sapId,
-TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq
-)
-#else
-S16 rgSCHUtlTfuGrpPwrCntrlReq(inst, sapId, grpPwrCntrlReq)
-Inst                  inst;
-S16                   sapId;
-TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq;
-#endif
+S16 rgSCHUtlTfuGrpPwrCntrlReq(Inst inst,S16 sapId,TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq)
 {
    S16             ret;
    RgSchLowSapCb  *tfuSap;
    Pst             pst;
 
-
    /* Get the lower SAP control block from the layer control block. */
    tfuSap = &(rgSchCb[inst].tfuSap[sapId]);
    if (tfuSap->sapSta.sapState != LRG_BND)
@@ -7180,17 +5855,7 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlDlActvtUe
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-S16 rgSCHUtlDlActvtUe(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+S16 rgSCHUtlDlActvtUe(RgSchCellCb *cell,RgSchUeCb   *ue)
 {
    cell->sc.apis->rgSCHActvtDlUe(cell, ue);
    return ROK;
@@ -7213,17 +5878,7 @@ RgSchUeCb   *ue;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlUlActvtUe
-(
-RgSchCellCb *cell,
-RgSchUeCb   *ue
-)
-#else
-S16 rgSCHUtlUlActvtUe(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb   *ue;
-#endif
+S16 rgSCHUtlUlActvtUe(RgSchCellCb *cell,RgSchUeCb *ue)
 {
    cell->sc.apis->rgSCHActvtUlUe(cell, ue);
    return ROK;
@@ -7240,17 +5895,7 @@ RgSchUeCb   *ue;
   *   -# ROK
   *   -# RFAILED
   */
-#ifdef ANSI
-S16 rgSCHUtlValidateTfuSap
-(
-Inst  inst,
-SuId  suId
-)
-#else
-S16 rgSCHUtlValidateTfuSap(inst, suId)
-Inst  inst;
-SuId  suId;
-#endif
+S16 rgSCHUtlValidateTfuSap(Inst  inst,SuId  suId)
 {
    RgSchLowSapCb  *tfuSap;
 
@@ -7291,22 +5936,10 @@ SuId  suId;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
-S16 rgSCHUtlAllocEventMem
-(
-Inst      inst,
-Ptr       *memPtr,
-Size      memSize
-)
-#else
-S16 rgSCHUtlAllocEventMem(inst, memPtr, memSize)
-Inst      inst;
-Ptr       *memPtr;
-Size      memSize;
-#endif
+S16 rgSCHUtlAllocEventMem(Inst inst,Ptr *memPtr,Size memSize)
 {
-   Mem              sMem;
-   volatile uint32_t     startTime=0;
+   Mem  sMem;
+   volatile uint32_t  startTime=0;
 
 
    sMem.region = rgSchCb[inst].rgSchInit.region;
@@ -7354,19 +5987,7 @@ Size      memSize;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
-S16 rgSCHUtlGetEventMem
-(
-Ptr       *ptr,
-Size      len,
-Ptr       memCp
-)
-#else
-S16 rgSCHUtlGetEventMem(ptr, len, memCp)
-Ptr       *ptr;
-Size      len;
-Ptr       memCp;
-#endif
+S16 rgSCHUtlGetEventMem(Ptr *ptr,Size len,Ptr memCp)
 {
    S16   ret;
 
@@ -7393,23 +6014,13 @@ Ptr       memCp;
  *  @param[in]  RgSchUeCb           *ue
  *  @return     S16
  **/
-#ifdef ANSI
-S16 rgSCHUtlAllocUeANFdbkInfo
-(
-RgSchUeCb            *ue,
-uint8_t                   servCellIdx
-)
-#else
-S16 rgSCHUtlAllocUeANFdbkInfo(ue,servCellIdx)
-RgSchUeCb            *ue;
-uint8_t                   servCellIdx;
-#endif
+S16 rgSCHUtlAllocUeANFdbkInfo(RgSchUeCb *ue,uint8_t servCellIdx)
 {
    uint8_t idx;
 
    if (rgSCHUtlAllocSBuf(ue->cell->instIdx,
                (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \
-               ue->cell->ackNackFdbkArrSize) != ROK)
+   ue->cell->ackNackFdbkArrSize) != ROK)
    {
       return RFAILED;
    }
@@ -7436,17 +6047,7 @@ uint8_t                   servCellIdx;
  *  @param[in]  RgSchUeCb           *ue
  *  @return     Void
  **/
-#ifdef ANSI
-Void rgSCHUtlDelUeANFdbkInfo
-(
-RgSchUeCb            *ue,
-uint8_t                   servCellIdx
-)
-#else
-Void rgSCHUtlDelUeANFdbkInfo(ue,servCellIdx)
-RgSchUeCb            *ue;
-uint8_t                   servCellIdx;
-#endif
+Void rgSCHUtlDelUeANFdbkInfo(RgSchUeCb *ue,uint8_t servCellIdx)
 {
 
    /* ccpu00117052 - MOD - Passing double pointer
@@ -7470,15 +6071,7 @@ uint8_t                   servCellIdx;
  *  @param[in]  RgSchTddANInfo   *anFdInfo
  *  @return     S16
  **/
-#ifdef ANSI
-S16 rgSCHUtlInitUeANFdbkInfo
-(
-RgSchTddANInfo       *anFdInfo
-)
-#else
-S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo)
-RgSchTddANInfo       *anFdInfo;
-#endif
+S16 rgSCHUtlInitUeANFdbkInfo(RgSchTddANInfo *anFdInfo)
 {
 
    anFdInfo->sfn = RGSCH_MAX_SFN+1; /* defensively setting invalid sfn */
@@ -7504,19 +6097,7 @@ RgSchTddANInfo       *anFdInfo;
  *  @param[in]  CmLteTimingInfo  *time
  *  @return     RgSchTddANInfo*
  **/
-#ifdef ANSI
-RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo
-(
-RgSchUeCb         *ueCb,
-CmLteTimingInfo   *timeInfo,
-uint8_t                servCellIdx
-)
-#else
-RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(ueCb, timeInfo,servCellIdx)
-RgSchUeCb         *ueCb;
-CmLteTimingInfo   *timeInfo;
-uint8_t                servCellIdx;
-#endif
+RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(RgSchUeCb *ueCb,CmLteTimingInfo *timeInfo,uint8_t servCellIdx)
 {
    uint8_t idx;
 
@@ -7545,17 +6126,7 @@ uint8_t                servCellIdx;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-uint8_t  rgSCHUtlGetDlSfIdx
-(
-RgSchCellCb        *cell,
-CmLteTimingInfo *timeInfo
-)
-#else
-uint8_t  rgSCHUtlGetDlSfIdx(cell, timeInfo)
-RgSchCellCb        *cell;
-CmLteTimingInfo *timeInfo;
-#endif
+uint8_t  rgSCHUtlGetDlSfIdx(RgSchCellCb  *cell,CmLteTimingInfo *timeInfo)
 {
    uint16_t       idx = 0;
 
@@ -7584,23 +6155,7 @@ CmLteTimingInfo *timeInfo;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlGetNxtDlSfInfo
-(
-CmLteTimingInfo   curDlTime,
-RgSchCellCb       *cell,
-RgSchDlSf         *dlSf,
-RgSchDlSf         **nxtDlsf,
-CmLteTimingInfo   *nxtDlTime
-)
-#else
-Void rgSCHUtlGetNxtDlSfInfo(curDlTime, cell, dlSf, nxtDlsf, nxtDlTime)
-CmLteTimingInfo   curDlTime;
-RgSchCellCb       *cell;
-RgSchDlSf         *dlSf;
-RgSchDlSf         **nxtDlsf;
-CmLteTimingInfo   *nxtDlTime;
-#endif
+Void rgSCHUtlGetNxtDlSfInfo(CmLteTimingInfo curDlTime,RgSchCellCb  *cell,RgSchDlSf *dlSf,RgSchDlSf **nxtDlsf,CmLteTimingInfo *nxtDlTime)
 {
    uint16_t  idx = curDlTime.slot;
    uint8_t   count = 0;
@@ -7638,21 +6193,7 @@ CmLteTimingInfo   *nxtDlTime;
  *  @return uint8_t
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlGetPrevDlSfInfo
-(
-RgSchCellCb       *cell,
-CmLteTimingInfo   curDlTime,
-CmLteTimingInfo   *prevDlTime,
-uint8_t                *numSubfrm
-)
-#else
-Void rgSCHUtlGetPrevDlSfInfo(cell, curDlTime, prevDlTime, numSubfrm)
-RgSchCellCb       *cell;
-CmLteTimingInfo   curDlTime;
-CmLteTimingInfo   *prevDlTime;
-uint8_t                *numSubfrm;
-#endif
+Void rgSCHUtlGetPrevDlSfInfo(RgSchCellCb *cell,CmLteTimingInfo curDlTime,CmLteTimingInfo *prevDlTime,uint8_t *numSubfrm)
 {
    S16 idx = curDlTime.slot;
    uint8_t  count = 0;
@@ -7688,21 +6229,7 @@ uint8_t                *numSubfrm;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlUlSfInit
-(
-RgSchCellCb  *cell,
-RgSchUlSf    *sf,
-uint8_t           idx,
-uint8_t           maxUePerSf
-)
-#else
-S16 rgSCHUtlUlSfInit(cell, sf, idx, maxUePerSf)
-RgSchCellCb  *cell;
-RgSchUlSf    *sf;
-uint8_t           idx;
-uint8_t           maxUePerSf;
-#endif
+S16 rgSCHUtlUlSfInit(RgSchCellCb  *cell,RgSchUlSf *sf,uint8_t idx,uint8_t maxUePerSf)
 {
    S16             ret=ROK;
 
@@ -7794,17 +6321,7 @@ uint8_t           maxUePerSf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlSfDeinit
-(
-RgSchCellCb  *cell,
-RgSchUlSf    *sf
-)
-#else
-Void rgSCHUtlUlSfDeinit(cell, sf)
-RgSchCellCb  *cell;
-RgSchUlSf    *sf;
-#endif
+Void rgSCHUtlUlSfDeinit(RgSchCellCb  *cell,RgSchUlSf  *sf)
 {
    if (sf->allocDb)
    {
@@ -7840,19 +6357,7 @@ RgSchUlSf    *sf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHUtlUlAllocDbInit
-(
-RgSchCellCb    *cell,
-RgSchUlAllocDb *allocDb,
-uint8_t             maxAllocs
-)
-#else
-static S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs)
-RgSchCellCb    *cell;
-RgSchUlAllocDb *allocDb;
-uint8_t             maxAllocs;
-#endif
+static S16 rgSCHUtlUlAllocDbInit(RgSchCellCb *cell,RgSchUlAllocDb *allocDb,uint8_t maxAllocs)
 {
    S16 ret = rgSCHUtlUlAllocMemInit(cell, &allocDb->mem, maxAllocs);
    if (ret != ROK)
@@ -7878,17 +6383,7 @@ uint8_t             maxAllocs;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHUtlUlAllocDbDeinit
-(
-RgSchCellCb     *cell,
-RgSchUlAllocDb *allocDb
-)
-#else
-static Void rgSCHUtlUlAllocDbDeinit(cell, allocDb)
-RgSchCellCb     *cell;
-RgSchUlAllocDb *allocDb;
-#endif
+static Void rgSCHUtlUlAllocDbDeinit(RgSchCellCb *cell,RgSchUlAllocDb *allocDb)
 {
    rgSCHUtlUlAllocMemDeinit(cell, &allocDb->mem);
    allocDb->count = 0;
@@ -7909,23 +6404,7 @@ RgSchUlAllocDb *allocDb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static S16 rgSCHUtlUlHoleDbInit
-(
-RgSchCellCb   *cell,
-RgSchUlHoleDb *holeDb,
-uint8_t            maxHoles,
-uint8_t            start,
-uint8_t            num
-)
-#else
-static S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num)
-RgSchCellCb   *cell;
-RgSchUlHoleDb *holeDb;
-uint8_t            maxHoles;
-uint8_t            start;
-uint8_t            num;
-#endif
+static S16 rgSCHUtlUlHoleDbInit(RgSchCellCb *cell,RgSchUlHoleDb *holeDb,uint8_t maxHoles,uint8_t start,uint8_t num)
 {
    S16 ret;
    RgSchUlHole *hole = NULLP;
@@ -7956,17 +6435,7 @@ uint8_t            num;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static Void rgSCHUtlUlHoleDbDeinit
-(
-RgSchCellCb   *cell,
-RgSchUlHoleDb *holeDb
-)
-#else
-static Void rgSCHUtlUlHoleDbDeinit(cell, holeDb)
-RgSchCellCb   *cell;
-RgSchUlHoleDb *holeDb;
-#endif
+static Void rgSCHUtlUlHoleDbDeinit(RgSchCellCb   *cell,RgSchUlHoleDb *holeDb)
 {
    rgSCHUtlUlHoleMemDeinit(cell, &holeDb->mem);
    holeDb->count = 0;
@@ -7988,19 +6457,7 @@ RgSchUlHoleDb *holeDb;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocGetHole
-(
-RgSchUlSf   *sf,
-uint8_t       numSb,
-RgSchUlHole *hole
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocGetHole(sf, numSb, hole)
-RgSchUlSf   *sf;
-uint8_t       numSb;
-RgSchUlHole *hole;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocGetHole(RgSchUlSf *sf,uint8_t numSb,RgSchUlHole *hole)
 {
    if (numSb < hole->num)
    {
@@ -8026,17 +6483,7 @@ RgSchUlHole *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole
-(
-RgSchUlSf   *sf,
-RgSchUlHole *hole
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(sf, hole)
-RgSchUlSf   *sf;
-RgSchUlHole *hole;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(RgSchUlSf   *sf,RgSchUlHole *hole)
 {
    RgSchUlAlloc *alloc;
       /* alloc = rgSCHUtlUlAllocGetAndIns(sf->allocDb, hole->prvAlloc, hole->nxtAlloc); */
@@ -8093,19 +6540,7 @@ RgSchUlHole *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole
-(
-RgSchUlSf   *sf,
-uint8_t       numSb,
-RgSchUlHole *hole
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)
-RgSchUlSf   *sf;
-uint8_t       numSb;
-RgSchUlHole *hole;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(RgSchUlSf *sf,uint8_t numSb,RgSchUlHole *hole)
 {
    RgSchUlAlloc *alloc;
       /* alloc = rgSCHUtlUlAllocGetAndIns(sf->allocDb, hole->prvAlloc, hole->nxtAlloc); */
@@ -8158,15 +6593,7 @@ RgSchUlHole *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocFirst
-(
-RgSchUlSf *sf
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf)
-RgSchUlSf *sf;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocFirst(RgSchUlSf *sf)
 {
    return (sf->allocDb->first);
 }
@@ -8184,17 +6611,7 @@ RgSchUlSf *sf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocNxt
-(
-RgSchUlSf    *sf,
-RgSchUlAlloc *alloc
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocNxt(sf, alloc)
-RgSchUlSf    *sf;
-RgSchUlAlloc *alloc;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocNxt(RgSchUlSf    *sf,RgSchUlAlloc *alloc)
 {
    UNUSED(sf);
    return (alloc->nxt);
@@ -8219,17 +6636,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt
-(
-RgSchUlAllocDb *db,
-RgSchUlAlloc   *prv
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(db, prv)
-RgSchUlAllocDb *db;
-RgSchUlAlloc   *prv;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(RgSchUlAllocDb *db,RgSchUlAlloc   *prv)
 {
    RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem);
    RgSchUlAlloc *nxt = prv->nxt;
@@ -8271,15 +6678,7 @@ RgSchUlAlloc   *prv;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocGetFirst
-(
-RgSchUlAllocDb *db
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(db)
-RgSchUlAllocDb *db;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(RgSchUlAllocDb *db)
 {
    RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem);
    RgSchUlAlloc *nxt = db->first;
@@ -8317,16 +6716,8 @@ RgSchUlAllocDb *db;
  *
  *     File :
  *
- **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleAddAllocation
-(
-RgSchUlAlloc *alloc
-)
-#else
-Void rgSCHUtlUlHoleAddAllocation(alloc)
-RgSchUlAlloc *alloc;
-#endif
+ **********************************************************/
+Void rgSCHUtlUlHoleAddAllocation(RgSchUlAlloc *alloc)
 {
    /* Note: rgSchCmnUlHoleUpdAllocLnks function that is used should not exist as
     * one, if such excessive branching is done (AllocNone, AllocNoPrv etc).
@@ -8373,15 +6764,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlAllocRelease
-(
-RgSchUlAlloc *alloc
-)
-#else
-Void rgSCHUtlUlAllocRelease(alloc)
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHUtlUlAllocRelease(RgSchUlAlloc *alloc)
 {
    RgSchUlAllocDb *allocDb = alloc->allocDbRef;
    RgSchUlAlloc   *prv = alloc->prv;
@@ -8428,17 +6811,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlAllocRls
-(
-RgSchUlSf    *sf,
-RgSchUlAlloc *alloc
-)
-#else
-Void rgSCHUtlUlAllocRls(sf, alloc)
-RgSchUlSf    *sf;
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHUtlUlAllocRls(RgSchUlSf *sf,RgSchUlAlloc *alloc)
 {
    RgSchUlAllocDb *allocDb = sf->allocDb;
    RgSchUlAlloc   *prv = alloc->prv;
@@ -8494,15 +6867,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlHole *rgSCHUtlUlHoleFirst
-(
-RgSchUlSf *sf
-)
-#else
-RgSchUlHole *rgSCHUtlUlHoleFirst(sf)
-RgSchUlSf *sf;
-#endif
+RgSchUlHole *rgSCHUtlUlHoleFirst(RgSchUlSf *sf)
 {
    return (sf->holeDb->first);
 }
@@ -8520,17 +6885,7 @@ RgSchUlSf *sf;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlHole *rgSCHUtlUlHoleNxt
-(
-RgSchUlSf   *sf,
-RgSchUlHole *hole
-)
-#else
-RgSchUlHole *rgSCHUtlUlHoleNxt(sf, hole)
-RgSchUlSf   *sf;
-RgSchUlHole *hole;
-#endif
+RgSchUlHole *rgSCHUtlUlHoleNxt(RgSchUlSf   *sf,RgSchUlHole *hole)
 {
    UNUSED(sf);
    return (hole->nxt);
@@ -8549,17 +6904,7 @@ RgSchUlHole *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleAddAlloc
-(
-RgSchUlSf    *sf,
-RgSchUlAlloc *alloc
-)
-#else
-Void rgSCHUtlUlHoleAddAlloc(sf, alloc)
-RgSchUlSf    *sf;
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHUtlUlHoleAddAlloc(RgSchUlSf *sf,RgSchUlAlloc *alloc)
 {
    /* Note: rgSchCmnUlHoleUpdAllocLnks function that is used should not exist as
     * one, if such excessive branching is done (AllocNone, AllocNoPrv etc).
@@ -8609,21 +6954,7 @@ RgSchUlAlloc *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleJoin
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *prv,
-RgSchUlHole   *nxt,
-RgSchUlAlloc  *alloc
-)
-#else
-Void rgSCHUtlUlHoleJoin(db, prv, nxt, alloc)
-RgSchUlHoleDb *db;
-RgSchUlHole   *prv;
-RgSchUlHole   *nxt;
-RgSchUlAlloc  *alloc;
-#endif
+Void rgSCHUtlUlHoleJoin(RgSchUlHoleDb *db,RgSchUlHole *prv,RgSchUlHole *nxt,RgSchUlAlloc *alloc)
 {
    prv->num += alloc->numSb + nxt->num;
    rgSCHUtlUlHoleRls(db, nxt);
@@ -8647,19 +6978,7 @@ RgSchUlAlloc  *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleExtndRight
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *prv,
-RgSchUlAlloc  *alloc
-)
-#else
-Void rgSCHUtlUlHoleExtndRight(db, prv, alloc)
-RgSchUlHoleDb *db;
-RgSchUlHole   *prv;
-RgSchUlAlloc  *alloc;
-#endif
+Void rgSCHUtlUlHoleExtndRight(RgSchUlHoleDb *db,RgSchUlHole *prv,RgSchUlAlloc *alloc)
 {
    prv->num += alloc->numSb;
    rgSCHUtlUlHoleIncr(db, prv);
@@ -8681,19 +7000,7 @@ RgSchUlAlloc  *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleExtndLeft
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *nxt,
-RgSchUlAlloc  *alloc
-)
-#else
-Void rgSCHUtlUlHoleExtndLeft(db, nxt, alloc)
-RgSchUlHoleDb *db;
-RgSchUlHole   *nxt;
-RgSchUlAlloc  *alloc;
-#endif
+Void rgSCHUtlUlHoleExtndLeft(RgSchUlHoleDb *db,RgSchUlHole   *nxt,RgSchUlAlloc  *alloc)
 {
    nxt->num += alloc->numSb;
    nxt->start = alloc->sbStart;
@@ -8715,17 +7022,7 @@ RgSchUlAlloc  *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleNew
-(
-RgSchUlHoleDb *db,
-RgSchUlAlloc  *alloc
-)
-#else
-Void rgSCHUtlUlHoleNew(db, alloc)
-RgSchUlHoleDb *db;
-RgSchUlAlloc  *alloc;
-#endif
+Void rgSCHUtlUlHoleNew(RgSchUlHoleDb *db,RgSchUlAlloc  *alloc)
 {
    RgSchUlHole *hole = rgSCHUtlUlHoleMemGet(&db->mem);
 #if (ERRCLASS & ERRCLS_DEBUG)
@@ -8755,19 +7052,7 @@ RgSchUlAlloc  *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleUpdAllocLnks
-(
-RgSchUlHole  *hole,
-RgSchUlAlloc *prvAlloc,
-RgSchUlAlloc *nxtAlloc
-)
-#else
-Void rgSCHUtlUlHoleUpdAllocLnks(hole, prvAlloc, nxtAlloc)
-RgSchUlHole  *hole;
-RgSchUlAlloc *prvAlloc;
-RgSchUlAlloc *nxtAlloc;
-#endif
+Void rgSCHUtlUlHoleUpdAllocLnks(RgSchUlHole  *hole,RgSchUlAlloc *prvAlloc,RgSchUlAlloc *nxtAlloc)
 {
    if (prvAlloc)
    {
@@ -8797,17 +7082,7 @@ RgSchUlAlloc *nxtAlloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleIns
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *hole
-)
-#else
-Void rgSCHUtlUlHoleIns(db, hole)
-RgSchUlHoleDb *db;
-RgSchUlHole   *hole;
-#endif
+Void rgSCHUtlUlHoleIns(RgSchUlHoleDb *db,RgSchUlHole   *hole)
 {
    RgSchUlHole *cur;
 
@@ -8866,17 +7141,7 @@ RgSchUlHole   *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleIncr
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *hole
-)
-#else
-Void rgSCHUtlUlHoleIncr(db, hole)
-RgSchUlHoleDb *db;
-RgSchUlHole   *hole;
-#endif
+Void rgSCHUtlUlHoleIncr(RgSchUlHoleDb *db,RgSchUlHole   *hole)
 {
    RgSchUlHole *cur;
 
@@ -8933,17 +7198,7 @@ RgSchUlHole   *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleDecr
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *hole
-)
-#else
-Void rgSCHUtlUlHoleDecr(db, hole)
-RgSchUlHoleDb *db;
-RgSchUlHole   *hole;
-#endif
+Void rgSCHUtlUlHoleDecr(RgSchUlHoleDb *db,RgSchUlHole   *hole)
 {
    RgSchUlHole *cur;
 
@@ -9005,17 +7260,7 @@ RgSchUlHole   *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleRls
-(
-RgSchUlHoleDb *db,
-RgSchUlHole   *hole
-)
-#else
-Void rgSCHUtlUlHoleRls(db, hole)
-RgSchUlHoleDb *db;
-RgSchUlHole   *hole;
-#endif
+Void rgSCHUtlUlHoleRls(RgSchUlHoleDb *db,RgSchUlHole   *hole)
 {
    RgSchUlHole *prv = hole->prv;
    RgSchUlHole *nxt = hole->nxt;
@@ -9056,19 +7301,7 @@ RgSchUlHole   *hole;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlUlAllocMemInit
-(
-RgSchCellCb     *cell,
-RgSchUlAllocMem *mem,
-uint8_t           maxAllocs
-)
-#else
-S16 rgSCHUtlUlAllocMemInit(cell, mem, maxAllocs)
-RgSchCellCb     *cell;
-RgSchUlAllocMem *mem;
-uint8_t           maxAllocs;
-#endif
+S16 rgSCHUtlUlAllocMemInit(RgSchCellCb *cell,RgSchUlAllocMem *mem,uint8_t maxAllocs)
 {
    S16 ret;
    RgSchUlAlloc *allocs;
@@ -9116,17 +7349,7 @@ uint8_t           maxAllocs;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlAllocMemDeinit
-(
-RgSchCellCb     *cell,
-RgSchUlAllocMem *mem
-)
-#else
-Void rgSCHUtlUlAllocMemDeinit(cell, mem)
-RgSchCellCb     *cell;
-RgSchUlAllocMem *mem;
-#endif
+Void rgSCHUtlUlAllocMemDeinit(RgSchCellCb     *cell,RgSchUlAllocMem *mem)
 {
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
@@ -9151,21 +7374,7 @@ RgSchUlAllocMem *mem;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-S16 rgSCHUtlUlHoleMemInit
-(
-RgSchCellCb    *cell,
-RgSchUlHoleMem *mem,
-uint8_t          maxHoles,
-RgSchUlHole    **holeRef
-)
-#else
-S16 rgSCHUtlUlHoleMemInit(cell, mem, maxHoles, holeRef)
-RgSchCellCb     *cell;
-RgSchUlHoleMem *mem;
-uint8_t          maxHoles;
-RgSchUlHole    **holeRef;
-#endif
+S16 rgSCHUtlUlHoleMemInit(RgSchCellCb  *cell,RgSchUlHoleMem *mem,uint8_t  maxHoles,RgSchUlHole **holeRef)
 {
    S16 ret;
    RgSchUlHole *holes;
@@ -9221,17 +7430,7 @@ RgSchUlHole    **holeRef;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleMemDeinit
-(
-RgSchCellCb    *cell,
-RgSchUlHoleMem *mem
-)
-#else
-Void rgSCHUtlUlHoleMemDeinit(cell, mem)
-RgSchCellCb    *cell;
-RgSchUlHoleMem *mem;
-#endif
+Void rgSCHUtlUlHoleMemDeinit(RgSchCellCb  *cell,RgSchUlHoleMem *mem)
 {
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
@@ -9255,15 +7454,7 @@ RgSchUlHoleMem *mem;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlAllocMemGet
-(
-RgSchUlAllocMem *mem
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlAllocMemGet(mem)
-RgSchUlAllocMem *mem;
-#endif
+RgSchUlAlloc *rgSCHUtlUlAllocMemGet(RgSchUlAllocMem *mem)
 {
    RgSchUlAlloc *alloc;
 
@@ -9295,17 +7486,7 @@ RgSchUlAllocMem *mem;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlAllocMemRls
-(
-RgSchUlAllocMem *mem,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHUtlUlAllocMemRls(mem, alloc)
-RgSchUlAllocMem *mem;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHUtlUlAllocMemRls(RgSchUlAllocMem *mem,RgSchUlAlloc  *alloc)
 {
    alloc->prv = NULLP;
 
@@ -9331,15 +7512,7 @@ RgSchUlAlloc    *alloc;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-RgSchUlHole *rgSCHUtlUlHoleMemGet
-(
-RgSchUlHoleMem *mem
-)
-#else
-RgSchUlHole *rgSCHUtlUlHoleMemGet(mem)
-RgSchUlHoleMem *mem;
-#endif
+RgSchUlHole *rgSCHUtlUlHoleMemGet(RgSchUlHoleMem *mem)
 {
    RgSchUlHole *hole;
 
@@ -9372,17 +7545,7 @@ RgSchUlHoleMem *mem;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlUlHoleMemRls
-(
-RgSchUlHoleMem *mem,
-RgSchUlHole    *hole
-)
-#else
-Void rgSCHUtlUlHoleMemRls(mem, hole)
-RgSchUlHoleMem *mem;
-RgSchUlHole    *hole;
-#endif
+Void rgSCHUtlUlHoleMemRls(RgSchUlHoleMem *mem,RgSchUlHole    *hole)
 {
    hole->prv = NULLP;
 
@@ -9414,19 +7577,7 @@ RgSchUlHole    *hole;
  *  @param[in]  uint8_t            numSb
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc
-(
-RgSchUlSf       *sf,
-uint8_t              startSb,
-uint8_t              numSb
-)
-#else
-RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(sf, startSb, numSb)
-RgSchUlSf       *sf;
-uint8_t              startSb;
-uint8_t              numSb;
-#endif
+RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(RgSchUlSf *sf,uint8_t startSb,uint8_t  numSb)
 {
    RgSchUlHole     *hole, *nxtHole;
    RgSchUlAlloc    *alloc = NULLP;
@@ -9507,24 +7658,11 @@ uint8_t              numSb;
  *           ROK
  *           RFAILED
  **/
-#ifdef ANSI
-static S16 rgSCHUtlValidateQci
-(
-RgSchCellCb  *cellCb,
-uint8_t           numQci,
-uint8_t           *qci
-)
-#else
-static S16 rgSCHUtlValidateQci(cellCb, numQci, qci)
-RgSchCellCb  *cellCb;
-uint8_t           numQci;
-uint8_t           *qci;
-#endif
+static S16 rgSCHUtlValidateQci(RgSchCellCb  *cellCb,uint8_t numQci,uint8_t *qci)
 {
    uint8_t        qciIdx;
    uint8_t        qciVal;
 
-
    for(qciIdx = 0; qciIdx < numQci; qciIdx++)
    {
       qciVal = qci[qciIdx];
@@ -9552,26 +7690,12 @@ uint8_t           *qci;
  *  @param[out] RgSchErrInfo       *err
  *  @return  RgSchUlAlloc*
  **/
-#ifdef ANSI
-S16 rgSCHUtlValidateMeasReq
-(
-RgSchCellCb       *cellCb, 
-LrgSchMeasReqInfo *schL2MeasInfo,
-RgSchErrInfo      *err
-)
-#else
-S16 rgSCHUtlValidateMeasReq(cellCb, schL2MeasInfo, err)
-RgSchCellCb       *cellCb;
-LrgSchMeasReqInfo *schL2MeasInfo;
-RgSchErrInfo      *err;
-#endif
+S16 rgSCHUtlValidateMeasReq(RgSchCellCb *cellCb, LrgSchMeasReqInfo *schL2MeasInfo,RgSchErrInfo *err)
 {
    uint16_t    measType;
    S16   ret;
 
-
    measType = schL2MeasInfo->measType;
-
    if((measType == 0) ||
        measType > 2047)
    {
@@ -9655,29 +7779,12 @@ RgSchErrInfo      *err;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrSiCfgCfm
-(
-Inst          instId,
-SpId          spId,
-RgrCfgTransId transId,
-uint8_t            status
-)
-#else
-S16 rgSCHUtlRgrSiCfgCfm(instId, spId, transId, status)
-Inst          instId;
-SpId          spId;
-RgrCfgTransId transId;
-uint8_t            status;
-#endif
+S16 rgSCHUtlRgrSiCfgCfm(Inst instId,SpId  spId,RgrCfgTransId transId,uint8_t status)
 {
    uint8_t        prntTrans[RGR_CFG_TRANSID_SIZE+1];
 
-
    memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
-
-
    if(RgUiRgrSiCfgCfm(&rgSchCb[instId].rgrSap[spId].sapCfg.sapPst,
                     rgSchCb[instId].rgrSap[spId].sapCfg.suId,
                     transId, status) != ROK)
@@ -9709,31 +7816,13 @@ uint8_t            status;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrWarningSiCfgCfm
-(
-Inst          instId,
-SpId          spId,
-uint8_t            siId,
-RgrCfgTransId transId,
-uint8_t            status
-)
-#else
-S16 rgSCHUtlRgrWarningSiCfgCfm(instId, spId, siId, transId, status)
-Inst          instId;
-SpId          spId;
-uint8_t            siId;
-RgrCfgTransId transId;
-uint8_t            status;
-#endif
+S16 rgSCHUtlRgrWarningSiCfgCfm(Inst instId,SpId spId,uint8_t siId,RgrCfgTransId transId,uint8_t  status)
 {
    uint8_t        prntTrans[RGR_CFG_TRANSID_SIZE+1];
 
-
    memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
-
-
+   
    if(RgUiRgrWarningSiCfgCfm(&rgSchCb[instId].rgrSap[spId].sapCfg.sapPst,
                     rgSchCb[instId].rgrSap[spId].sapCfg.suId, 
                     transId, siId, status) != ROK)
@@ -9759,15 +7848,7 @@ uint8_t            status;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgSCHUtlPutSiInfo
-(
-RgSchCellCb *cell
-)
-#else
-Void rgSCHUtlPutSiInfo(cell)
-RgSchCellCb *cell;
-#endif
+Void rgSCHUtlPutSiInfo(RgSchCellCb *cell)
 {
    uint8_t    idx = 0;
    uint32_t   sizeOfSiInfo = 0;
@@ -9815,7 +7896,6 @@ RgSchCellCb *cell;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgSCHUtlGetDrxSchdUesInDl
 (
 RgSchCellCb     *cellCb,
@@ -9826,16 +7906,6 @@ CmLListCp       *dlDrxInactvTmrLst,
 CmLListCp       *dlInActvLst,
 CmLListCp       *ulInActvLst
 )
-#else
-S16 rgSCHUtlGetDrxSchdUesInDl(cellCb, ueCb, dlHq, allocInfo, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst)
-RgSchCellCb     *cellCb;
-RgSchUeCb       *ueCb;
-RgSchDlHqProcCb *dlHq;
-RgInfUeAlloc    *allocInfo;
-CmLListCp       *dlDrxInactvTmrLst;
-CmLListCp       *dlInActvLst;
-CmLListCp       *ulInActvLst;
-#endif
 {
    Bool                  isNewTx = FALSE;
    uint8_t                    idx;
@@ -9972,21 +8042,7 @@ CmLListCp       *ulInActvLst;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlFillSndStaInd
-(
-RgSchCellCb        *cell,
-RgSchUeCb          *ue,
-RgrStaIndInfo      *staInfo,
-uint8_t                 numCqiRept
-)
-#else
-S16 rgSCHUtlFillSndStaInd(cell, ue, staInfo, numCqiRept)
-RgSchCellCb        *cell;
-RgSchUeCb          *ue;
-RgrStaIndInfo      *staInfo;
-uint8_t                 numCqiRept;
-#endif
+S16 rgSCHUtlFillSndStaInd(RgSchCellCb *cell,RgSchUeCb *ue,RgrStaIndInfo *staInfo,uint8_t numCqiRept)
 {
    uint8_t idxStart;
 
@@ -10040,23 +8096,11 @@ uint8_t                 numCqiRept;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrStaInd
-(
-RgSchCellCb          *cell,
-RgrStaIndInfo        *rgrSta
-)
-#else
-S16 rgSCHUtlRgrStaInd(cell, rgrSta)
-RgSchCellCb          *cell;
-RgrStaIndInfo        *rgrSta;
-#endif
+S16 rgSCHUtlRgrStaInd(RgSchCellCb *cell,RgrStaIndInfo *rgrSta)
 {
    S16           ret = ROK;
    RgSchUpSapCb  *rgrSap;                    /*!< RGR SAP Control Block */
-
-
-
+   
    rgrSap = cell->rgrSap;
    if (rgrSap->sapSta.sapState != LRG_BND)
    {
@@ -10091,21 +8135,7 @@ RgrStaIndInfo        *rgrSta;
  *  @return  Void
  *      -# ROK 
  **/
-#ifdef ANSI
-Void rgSCHUtlIndRntiRls2Mac 
-(
-RgSchCellCb    *cell,
-CmLteRnti      rnti,
-Bool           ueIdChng,
-CmLteRnti      newRnti
-)
-#else
-Void rgSCHUtlIndRntiRls2Mac(cell, rnti, ueIdChng, newRnti)
-RgSchCellCb    *cell;
-CmLteRnti      rnti;
-Bool           ueIdChng;
-CmLteRnti      newRnti;
-#endif
+Void rgSCHUtlIndRntiRls2Mac(RgSchCellCb *cell,CmLteRnti  rnti,Bool ueIdChng,CmLteRnti newRnti)
 {
    Pst          pst;
    Inst         inst = cell->instIdx;
@@ -10146,17 +8176,7 @@ CmLteRnti      newRnti;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrLoadInfInd
-(
- RgSchCellCb           *cell,
- RgrLoadInfIndInfo     *rgrLoadInf
- )
-#else
-S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf)
-   RgSchCellCb           *cell;
-   RgrLoadInfIndInfo     *rgrLoadInf;
-#endif
+S16 rgSCHUtlRgrLoadInfInd(RgSchCellCb *cell,RgrLoadInfIndInfo *rgrLoadInf)
 {
    S16           ret = ROK;
    RgSchUpSapCb  *rgrSap;                    /*!< RGR SAP Control Block */
@@ -10196,21 +8216,7 @@ S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf)
  *  @return  Void
  **/
 
-#ifdef ANSI
-Void rgSCHUtlRlsRnti
-(
-RgSchCellCb    *cell,
-RgSchRntiLnk   *rntiLnk,
-Bool           ueIdChngd,
-CmLteRnti      newRnti
-)
-#else
-Void rgSCHUtlRlsRnti(cell, rntiLnk, ueIdChngd, newRnti)
-RgSchCellCb    *cell;
-RgSchRntiLnk   *rntiLnk;
-Bool           ueIdChngd;
-CmLteRnti      newRnti;
-#endif
+Void rgSCHUtlRlsRnti(RgSchCellCb *cell,RgSchRntiLnk  *rntiLnk,Bool ueIdChngd,CmLteRnti newRnti)
 {
 
    uint8_t isLegacy = 0;
@@ -10248,19 +8254,7 @@ CmLteRnti      newRnti;
  *  @return  Void
  *
  **/
-#ifdef ANSI
-S16 rgSCHUtlFillSndUeStaInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-RgrUeStaIndInfo      *ueStaInfo
-)
-#else
-S16 rgSCHUtlFillSndUeStaInd(cell, ue, ueStaInfo)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-RgrUeStaIndInfo      *ueStaInfo;
-#endif
+S16 rgSCHUtlFillSndUeStaInd(RgSchCellCb *cell,RgSchUeCb  *ue,RgrUeStaIndInfo  *ueStaInfo)
 {
 
    ueStaInfo->cellId = cell->cellId;
@@ -10297,17 +8291,7 @@ RgrUeStaIndInfo      *ueStaInfo;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlRgrUeStaInd
-(
-RgSchCellCb          *cell,
-RgrUeStaIndInfo      *rgrUeSta
-)
-#else
-S16 rgSCHUtlRgrUeStaInd(cell, rgrUeSta)
-RgSchCellCb          *cell;
-RgrUeStaIndInfo      *rgrUeSta;
-#endif
+S16 rgSCHUtlRgrUeStaInd(RgSchCellCb *cell,RgrUeStaIndInfo *rgrUeSta)
 {
    S16           ret = ROK;
    RgSchUpSapCb  *rgrSap;                    /*!< RGR SAP Control Block */
@@ -10339,15 +8323,7 @@ RgrUeStaIndInfo      *rgrUeSta;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlUpdAvgPrbUsage
-(
-RgSchCellCb          *cell
-)
-#else
-S16 rgSCHUtlUpdAvgPrbUsage(cell)
-RgSchCellCb       *cell;
-#endif
+S16 rgSCHUtlUpdAvgPrbUsage(RgSchCellCb  *cell)
 {
    CmLteTimingInfo  frm;
    RgmPrbRprtInd    *prbRprtInd;
@@ -10466,17 +8442,7 @@ RgSchCellCb       *cell;
  *  @return  Void 
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlReTxTa 
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb
-)
-#else
-Void rgSCHUtlReTxTa(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-#endif
+Void rgSCHUtlReTxTa(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
 
    /* If TA Timer is running. Stop it */
@@ -10516,17 +8482,7 @@ RgSchUeCb         *ueCb;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-static S16 rgSCHChkBoUpdate
-(
-RgSchCellCb    *cell,
-RgInfCmnBoRpt  *boUpdt
-)
-#else
-static S16 rgSCHChkBoUpdate (cell, boUpdt)
-RgSchCellCb    *cell;
-RgInfCmnBoRpt  *boUpdt;
-#endif
+static S16 rgSCHChkBoUpdate(RgSchCellCb *cell,RgInfCmnBoRpt  *boUpdt)
 {
 
    uint32_t crntTimeInSubFrms = 0;
@@ -10568,19 +8524,7 @@ RgInfCmnBoRpt  *boUpdt;
  *  @param[in]  uint8_t               hqFdbkIdx
  *  @return     uint8_t
  **/
-#ifdef ANSI
-uint8_t rgSchUtlCfg0ReTxIdx
-(
-RgSchCellCb    *cell,
-CmLteTimingInfo phichTime,
-uint8_t              hqFdbkIdx
-)
-#else
-uint8_t rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx)
-RgSchCellCb    *cell;
-CmLteTimingInfo phichTime;
-uint8_t              hqFdbkIdx;
-#endif
+uint8_t rgSchUtlCfg0ReTxIdx(RgSchCellCb    *cell,CmLteTimingInfo phichTime,uint8_t hqFdbkIdx)
 {
    uint8_t reTxIdx = RGSCH_INVALID_INFO;
    uint8_t iPhich = 0; 
@@ -10641,28 +8585,14 @@ uint8_t              hqFdbkIdx;
  *  @param[out] uint32_t             *prbReqrd 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSchUtlDlCalc1CwPrb
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-uint32_t             bo,
-uint32_t            *prbReqrd
-)
-#else
-Void rgSchUtlDlCalc1CwPrb(cell, ue, bo, prbReqrd)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-uint32_t            bo;
-uint32_t           *prbReqrd;
-#endif
+Void rgSchUtlDlCalc1CwPrb(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t  *prbReqrd)
 {
    RgSchCmnDlCell *dlCell  = RG_SCH_CMN_GET_DL_CELL(cell); 
    RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ue, cell); 
-   uint32_t            eff;
-   uint32_t            noRes;
-   uint8_t             iTbs;
-   uint8_t             cfi = dlCell->currCfi;               
+   uint32_t       eff;
+   uint32_t       noRes;
+   uint8_t        iTbs;
+   uint8_t        cfi = dlCell->currCfi;               
 
    iTbs  = dlUe->mimoInfo.cwInfo[0].iTbs[0];
    eff   = (*(RgSchCmnTbSzEff *)(dlCell->cqiToEffTbl[0][cfi]))[iTbs];
@@ -10697,21 +8627,7 @@ uint32_t           *prbReqrd;
  *  @param[out] uint32_t             *prbReqrd 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSchUtlDlCalc2CwPrb
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-uint32_t             bo,
-uint32_t            *prbReqrd
-)
-#else
-Void rgSchUtlDlCalc2CwPrb(cell, ue, bo, prbReqrd)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-uint32_t            bo;
-uint32_t           *prbReqrd;
-#endif
+Void rgSchUtlDlCalc2CwPrb(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t *prbReqrd)
 {
    RgSchCmnDlCell *dlCell  = RG_SCH_CMN_GET_DL_CELL(cell); 
    RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ue, cell); 
@@ -10770,21 +8686,7 @@ uint32_t           *prbReqrd;
  *  @param[out] uint32_t             *prbReqrd 
  *  @return Void
  **/
-#ifdef ANSI
-Void rgSchUtlCalcTotalPrbReq
-(
-RgSchCellCb    *cell,
-RgSchUeCb      *ue,
-uint32_t             bo,
-uint32_t            *prbReqrd
-)
-#else
-Void rgSchUtlCalcTotalPrbReq(cell, ue, bo, prbReqrd)
-RgSchCellCb   *cell;
-RgSchUeCb     *ue;
-uint32_t            bo;
-uint32_t           *prbReqrd;
-#endif
+Void rgSchUtlCalcTotalPrbReq(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t *prbReqrd)
 {
    /* Call TM specific Prb calculation routine */
    (dlCalcPrbFunc[ue->mimoInfo.txMode - 1])(cell, ue, bo, prbReqrd);
@@ -10808,19 +8710,7 @@ uint32_t           *prbReqrd;
  *     File :
  *
  **********************************************************/
-#ifdef ANSI
-static uint8_t rgSCHUtlFetchPcqiBitSz
-(
- RgSchCellCb    *cell,
- RgSchUeCb    *ueCb, 
- uint8_t           numTxAnt
- )
-#else
-static uint8_t rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt)
-RgSchCellCb   *cell;
-RgSchUeCb     *ueCb;
-uint8_t            numTxAnt;
-#endif
+static uint8_t rgSCHUtlFetchPcqiBitSz(RgSchCellCb *cell, RgSchUeCb *ueCb,uint8_t numTxAnt)
 {
    uint8_t   confRepMode;
    uint8_t   pcqiSz;
@@ -10965,21 +8855,9 @@ uint8_t            numTxAnt;
  *  @param[in]  uint32_t          *numSbs
  *  @return     uint8_t
  **/
-#ifdef ANSI
-uint8_t rgSchUtlGetNumSbs
-(
-RgSchCellCb                  *cell,
-RgSchUeCb                    *ue,
-uint32_t                     *numSbs
-)
-#else
-uint8_t rgSchUtlGetNumSbs (cell, ue, numSbs)
-RgSchCellCb                  *cell;
-RgSchUeCb                    *ue;
-uint32_t                     *numSbs;
-#endif
+uint8_t rgSchUtlGetNumSbs(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t *numSbs)
 {
-   uint32_t                       nPrb;
+   uint32_t  nPrb;
    //Currently hardcoding MAX prb for each UE
    nPrb = ue->ue5gtfCb.maxPrb;
    (*numSbs) = RGSCH_CEIL(nPrb, MAX_5GTF_VRBG_SIZE);
@@ -11002,21 +8880,7 @@ uint32_t                     *numSbs;
  *  @param[in]  RgSchUeCb    *ue
  *  @return     uint8_t
  **/
-#ifdef ANSI
-uint8_t rgSchUtlSortInsUeLst
-(
-RgSchCellCb  *cell,
-CmLListCp    *ueLst,
-CmLList      *node,
-uint8_t      vrbgRequired
-)
-#else
-uint8_t rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired)
-RgSchCellCb  *cell;
-CmLListCp    *ueLst;
-CmLList      *node;
-uint8_t      vrbgRequired;
-#endif
+uint8_t rgSchUtlSortInsUeLst(RgSchCellCb *cell,CmLListCp *ueLst,CmLList *node,uint8_t vrbgRequired)
 {
    CmLList      *ueInLst;
    CmLList      *firstUeInLst;
@@ -11095,21 +8959,7 @@ uint8_t      vrbgRequired;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgSCHUtlBuildNSendLcgReg
-(
-RgSchCellCb    *cell,
-CmLteRnti      crnti,
-uint8_t        lcgId,
-Bool           isGbr
-)
-#else
-S16 rgSCHUtlBuildNSendLcgReg(cell, crnti, lcgId, isGbr)
-RgSchCellCb    *cell;
-CmLteRnti      crnti;
-uint8_t        lcgId;
-Bool           isGbr;
-#endif
+S16 rgSCHUtlBuildNSendLcgReg(RgSchCellCb  *cell,CmLteRnti  crnti,uint8_t lcgId,Bool isGbr)
 {
    Pst            pst;
    RgInfLcgRegReq lcgRegReq;
@@ -11146,15 +8996,7 @@ Bool           isGbr;
  *  @return  TfuAckNackMode
  *      -# ROK 
  **/
-#ifdef ANSI
-TfuAckNackMode rgSchUtlGetFdbkMode
-(
-RgrSchFrmt1b3TypEnum fdbkType
-)
-#else
-TfuAckNackMode rgSchUtlGetFdbkMode(fdbkType)
-RgrSchFrmt1b3TypEnum fdbkType;
-#endif
+TfuAckNackMode rgSchUtlGetFdbkMode(RgrSchFrmt1b3TypEnum fdbkType)
 {
 
    TfuAckNackMode mode = TFU_UCI_FORMAT_1A_1B;
@@ -11202,17 +9044,7 @@ RgrSchFrmt1b3TypEnum fdbkType;
  *  @return  Void
  *      -# ROK 
  **/
-#ifdef ANSI
-Void rgSCHUtlSndUeSCellDel2Mac 
-(
-RgSchCellCb    *cell,
-CmLteRnti      rnti
-)
-#else
-Void rgSCHUtlSndUeSCellDel2Mac(cell, rnti)
-RgSchCellCb    *cell;
-CmLteRnti      rnti;
-#endif
+Void rgSCHUtlSndUeSCellDel2Mac(RgSchCellCb *cell,CmLteRnti rnti)
 {
    Pst          pst;
    Inst         inst = cell->instIdx;
@@ -11248,15 +9080,7 @@ CmLteRnti      rnti;
  *  @return        uint8_t maxTbCount; 
  *      -# ROK 
  **/
-#ifdef ANSI
-uint8_t rgSCHUtlGetMaxTbSupp
-(
-RgrTxMode txMode
-)
-#else
-uint8_t rgSCHUtlGetMaxTbSupp(txMode)
-RgrTxMode txMode
-#endif
+uint8_t rgSCHUtlGetMaxTbSupp(RgrTxMode txMode)
 {
    uint8_t maxTbCount;
 
@@ -11301,21 +9125,7 @@ RgrTxMode txMode
  *  @return  Void
  *      -# ROK 
  **/
-#ifdef ANSI
-Void rgSCHTomUtlGetTrigSet
-(
-   RgSchCellCb       *cell,
-   RgSchUeCb        *ueCb,
-   uint8_t           cqiReq,
-   uint8_t           *triggerSet
- )
-#else
-static S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet)
-   RgSchCellCb       *cell;
-   RgSchUeCb        *ueCb;
-   uint8_t           cqiReq;
-   uint8_t           *triggerSet;
-#endif
+Void rgSCHTomUtlGetTrigSet(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t cqiReq,uint8_t *triggerSet)
 {
    RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ueCb);
    switch(cqiReq)
@@ -11362,19 +9172,7 @@ static S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet)
  *  @return     Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlUpdUeDciSize
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ueCb,
-Bool             isCsi2Bit
-)
-#else
-Void rgSCHUtlUpdUeDciSize(cell, ueCb, isCsi2Bit)
-RgSchCellCb      *cell;
-RgSchUeCb        *ueCb;
-Bool             isCsi2Bit;
-#endif
+Void rgSCHUtlUpdUeDciSize(RgSchCellCb *cell,RgSchUeCb *ueCb,Bool isCsi2Bit)
 {
    uint8_t dci01aCmnSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0];
    uint8_t dci01aDedSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0];
@@ -11479,15 +9277,7 @@ Bool             isCsi2Bit;
  *  @return     Void
  *
  **/
-#ifdef ANSI
-Void rgSCHUtlCalcDciSizes
-(
-RgSchCellCb       *cell
-)
-#else
-Void rgSCHUtlCalcDciSizes(cell)
-RgSchCellCb       *cell;
-#endif
+Void rgSCHUtlCalcDciSizes(RgSchCellCb *cell)
 {
    uint8_t dciSize = 0;
    uint8_t dci01aSize = 0;
@@ -11751,15 +9541,7 @@ RgSchCellCb       *cell;
  *  @param[in]  RgSchCellCb *cell
  *  @return  Void 
  **/
-#ifdef ANSI
-Void rgSCHUtlCpuOvrLdAdjItbsCap
-(
- RgSchCellCb *cell
-)
-#else
-Void rgSCHUtlCpuOvrLdAdjItbsCap(cell)
- RgSchCellCb *cell
-#endif
+Void rgSCHUtlCpuOvrLdAdjItbsCap( RgSchCellCb *cell)
 {
    uint32_t tptDelta;
 
@@ -11837,17 +9619,7 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell)
  *  @param[in]  uint8_t          cnrtCpuOvrLdIns 
  *  @return     Void
  **/
-#ifdef ANSI
-static Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr
-(
- RgSchCellCb *cell, 
- uint8_t      crntCpuOvrLdIns
-)
-#else
-static S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns)
- RgSchCellCb *cell; 
- uint8_t     crntCpuOvrLdIns;
-#endif
+static Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(RgSchCellCb *cell,uint8_t crntCpuOvrLdIns)
 {
    RgSchCpuOvrLdCntrlCb    *cpuInstr = &(cell->cpuOvrLdCntrl);
    RgSchCmnCell            *cellSch;
@@ -12006,21 +9778,11 @@ static S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns)
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
-S16 rgSCHUtlResetCpuOvrLdState
-(
- RgSchCellCb *cell, 
- uint8_t     crntCpuOvrLdIns
-)
-#else
-S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns)
- RgSchCellCb *cell; 
- uint8_t     crntCpuOvrLdIns;
-#endif
+S16 rgSCHUtlResetCpuOvrLdState(RgSchCellCb *cell,uint8_t crntCpuOvrLdIns)
 {
-   uint8_t         crntDlCpuOL=0;
-   uint8_t         crntUlCpuOL=0;
-   RgSchCmnCell    *schCmnCell = (RgSchCmnCell *)(cell->sc.sch);
+   uint8_t      crntDlCpuOL=0;
+   uint8_t      crntUlCpuOL=0;
+   RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch);
    uint8_t idx;
 
 #ifdef CPU_OL_DBG_PRINTS
index 101f6b9..9a73cb1 100755 (executable)
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
 Void rgSCHRrCListInit
 (
 RgSchRrCListCp *lCp                /* list control point */
 )
-#else 
-Void rgSCHRrCListInit(lCp)
-RgSchRrCListCp *lCp;               /* list control point */
-#endif
 {
    
    lCp->first = (RgSchRrCList *)NULLP;
@@ -81,17 +76,11 @@ RgSchRrCListCp *lCp;               /* list control point */
  * 
  *        File:  rr_clist.c
  */
-#ifdef ANSI
 Void rgSCHRrCListAdd2Crnt
 (
- RgSchRrCListCp *lCp,               /* list control point */
- RgSchRrCList   *node               /* node to be added */
- )
-#else
-Void rgSCHRrCListAdd2Crnt(lCp, node)
-   RgSchRrCListCp *lCp;               /* list control point */
-   RgSchRrCList   *node;              /* node to be added */
-#endif
+RgSchRrCListCp *lCp,               /* list control point */
+RgSchRrCList   *node               /* node to be added */
+)
 {
 #ifdef ERRCHK
    if (lCp == (RgSchRrCListCp *)NULLP)
@@ -133,17 +122,11 @@ Void rgSCHRrCListAdd2Crnt(lCp, node)
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
 Void rgSCHRrCListAdd2Tail
 (
 RgSchRrCListCp *lCp,               /* list control point */
 RgSchRrCList   *node               /* node to be added */
 )
-#else 
-Void rgSCHRrCListAdd2Tail(lCp, node)
-RgSchRrCListCp *lCp;               /* list control point */
-RgSchRrCList   *node;              /* node to be added */
-#endif
 {
 
 #ifdef ERRCHK
@@ -187,17 +170,11 @@ RgSchRrCList   *node;              /* node to be added */
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
 RgSchRrCList *rgSCHRrCListDelFrm
 (
 RgSchRrCListCp *lCp,                /* list control pointer */
 RgSchRrCList *node                  /* node to be removed */
 )
-#else 
-RgSchRrCList *rgSCHRrCListDelFrm(lCp, node)
-RgSchRrCListCp *lCp;               /* list control pointer */
-RgSchRrCList *node;                /* node to be removed */
-#endif
 {
   
 #ifdef ERRCHK
@@ -265,17 +242,11 @@ RgSchRrCList *node;                /* node to be removed */
 *       File:  rr_clist.c
 *
 */
-#ifdef ANSI
 Void rgSCHRrCListInsrtAtCrnt
 (
 RgSchRrCListCp *lCp,                /* list control pointer */
 RgSchRrCList *node                  /* node to be removed */
 )
-#else 
-Void rgSCHRrCListInsrtAtCrnt(lCp, node)
-RgSchRrCListCp *lCp;               /* list control pointer */
-RgSchRrCList *node;                /* node to be inserted */
-#endif
 {
    RgSchRrCList *crnt;
 
index e4612af..bb76ede 100644 (file)
@@ -58,8 +58,6 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\
 {
    Pst rspPst;
 
-   DU_LOG("\nSCH: Sending UE Create response to MAC");
-
    cfgRsp->cellId = ueCfg->cellId;
    cfgRsp->crnti = ueCfg->crnti;
    GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx);
@@ -68,18 +66,21 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\
    /* Filling response post */
    memset(&rspPst, 0, sizeof(Pst));
    FILL_PST_SCH_TO_MAC(rspPst, inst);
-   if(event == EVENT_UE_CREATE_REQ_TO_SCH)
+   if(event == EVENT_ADD_UE_CONFIG_REQ_TO_SCH)
    {
-      rspPst.event = EVENT_UE_CREATE_RSP_TO_MAC;
+      rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC;
+      DU_LOG("\nSCH: Sending UE Config response to MAC");
    }
-   else if(event == EVENT_UE_RECONFIG_REQ_TO_SCH)
+   else if(event == EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH)
    {
       rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC;
+      DU_LOG("\nSCH: Sending UE Reconfig response to MAC");
    }
    SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp);
 }
 
 /*******************************************************************
  *
  * @brief Function to fill Dl Lc Context in SCH Ue Cb
  *
@@ -293,20 +294,20 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg)
 
 /*******************************************************************
  *
- * @brief Hanles Ue create request from MAC
+ * @brief Function to Add Ue Config Request from MAC
  *
  * @details
  *
- *    Function : MacSchUeCreateReq
+ *    Function : MacSchAddUeConfigReq
  *
- *    Functionality: Hanles Ue create request from MAC
+ *    Functionality: Function to Add Ue config request from MAC
  *
  * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
+uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg)
 {
    uint8_t ueIdx, lcIdx, ret = ROK;
    SchCellCb    *cellCb = NULLP;
@@ -317,10 +318,10 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
 
    if(!ueCfg)
    {
-      DU_LOG("\nSCH : UE create request failed at MacSchUeCreateReq()");
+      DU_LOG("\nSCH : Adding UE Config Request failed at MacSchAddUeConfigReq()");
       return RFAILED;
    }
-   DU_LOG("\nSCH : UE Create Request for CRNTI[%d]", ueCfg->crnti);
+   DU_LOG("\nSCH : Adding UE Config Request for CRNTI[%d]", ueCfg->crnti);
    cellCb = getSchCellCb(pst->event, inst, ueCfg);
 
    /* Search if UE already configured */
@@ -337,7 +338,7 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
    }
    else
    {
-      DU_LOG("\n SCH : SchUeCb not found at MacSchUeCreateReq() ");
+      DU_LOG("\n SCH : SchUeCb not found at MacSchAddUeConfigReq() ");
       SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
       return RFAILED;
    }
@@ -521,20 +522,20 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo)
 
 /*******************************************************************
  *
- * @brief Hanles Ue Reconfig request from MAC
+ * @brief Function to Modify Ue Config request from MAC
  *
  * @details
  *
- *    Function : MacSchUeReconfigReq
+ *    Function : MacSchModUeConfigReq
  *
- *    Functionality: Hanles Ue Reconfig request from MAC
+ *    Functionality: Function to modify Ue Config request from MAC
  *
  * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg)
+uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg)
 {
    uint8_t ueIdx, lcIdx, ret = ROK;
    SchCellCb    *cellCb = NULLP;
@@ -545,10 +546,10 @@ uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg)
 
    if(!ueCfg)
    {
-      DU_LOG("\nSCH : Reconfig request failed at MacSchUeReconfigReq()");
+      DU_LOG("\nSCH : Modifying Ue Config request failed at MacSchModUeConfigReq()");
       return RFAILED;
    }
-   DU_LOG("\nSCH : Reconfig Request for CRNTI[%d]", ueCfg->crnti);
+   DU_LOG("\nSCH : Modifying Ue Config Request for CRNTI[%d]", ueCfg->crnti);
    cellCb = getSchCellCb(pst->event, inst, ueCfg);
 
    /* Search if UE already configured */
@@ -557,7 +558,7 @@ uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg)
    
    if(!ueCb)
    {
-      DU_LOG("\n SCH : SchUeCb not found at MacSchUeReconfigReq() ");
+      DU_LOG("\n SCH : SchUeCb not found at MacSchModUeConfigReq() ");
       SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
       return RFAILED;
    }
index 9a8ff41..83a6372 100755 (executable)
@@ -54,19 +54,12 @@ extern "C" {
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwBndReq
 (
 Pst *pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkCkwBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
 {
     S16 ret1;
     Buffer *mBuf;
@@ -104,19 +97,12 @@ SpId spId;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwUbndReq
 (
 Pst *pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkCkwUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
 {
     S16 ret1;
     Buffer *mBuf;
@@ -154,19 +140,12 @@ Reason reason;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwBndCfm
 (
 Pst *pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkCkwBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-uint8_t status;
-#endif
 {
     S16 ret1;
     Buffer *mBuf;
@@ -206,17 +185,11 @@ uint8_t status;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcTmInfo
 (
 RlcTmInfo      *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcTmInfo(param, mBuf)
-RlcTmInfo      *param;
-Buffer         *mBuf;
-#endif
 {
 
     CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
@@ -238,17 +211,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcUmInfo
 (
 RlcEntCfgInfo  *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo  *param;
-Buffer         *mBuf;
-#endif
 {
 
     switch(param->dir)
@@ -291,17 +258,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcAmInfo
 (
 RlcAmInfo      *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcAmInfo(param, mBuf)
-RlcAmInfo      *param;
-Buffer         *mBuf;
-#endif
 {
 
     /* UP LINK */
@@ -333,17 +294,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwLChInfo
 (
 CkwLChInfo     *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkCkwLChInfo(param, mBuf)
-CkwLChInfo     *param;
-Buffer         *mBuf;
-#endif
 {
 
     CMCHKPK(oduUnpackUInt8, param->type, mBuf);
@@ -366,17 +321,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcEntCfgInfo
 (
 RlcEntCfgInfo  *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo  *param;
-Buffer         *mBuf;
-#endif
 {
 
     switch(param->entMode)
@@ -444,23 +393,15 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcCfgInfo
 (
 RlcCfgInfo     *param,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo     *param;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
    S16 idx;
 
-
     for (idx = param->numEnt-1; idx >= 0; idx--)
     {
        CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf);
@@ -488,17 +429,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcEntCfgCfmInfo
 (
 RlcEntCfgCfmInfo  *param,
 Buffer            *mBuf
 )
-#else
-S16 cmPkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo  *param;
-Buffer            *mBuf;
-#endif
 {
 
     CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
@@ -522,23 +457,15 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcCfgCfmInfo
 (
 RlcCfgCfmInfo  *param,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmPkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo  *param;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
     S16         idx;
 
-
     for (idx = param->numEnt-1; idx >= 0; idx--)
     {
        CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(uint8_t)idx]), mBuf);
@@ -566,19 +493,12 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkRlcCfgCfm
 (
 Pst               *pst,
 SuId              suId,
 RlcCfgCfmInfo     *cfgCfmInfo
 )
-#else
-S16 cmPkRlcCfgCfm(pst, suId, cfgCfmInfo)
-Pst               *pst;
-SuId              suId;
-RlcCfgCfmInfo     *cfgCfmInfo;
-#endif
 {
     S16 ret1;
     Buffer *mBuf;
@@ -644,17 +564,11 @@ RlcCfgCfmInfo     *cfgCfmInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwUeInfo
 (
 CkwUeInfo *param,
 Buffer    *mBuf
 )
-#else
-S16 cmPkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer    *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -676,23 +590,14 @@ Buffer    *mBuf;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwUeIdChgReq
 (
-Pst               *pst,
-SpId              spId,
-uint32_t               transId,
-CkwUeInfo         *ueInfo,
-CkwUeInfo         *newUeInfo
+Pst       *pst,
+SpId      spId,
+uint32_t  transId,
+CkwUeInfo *ueInfo,
+CkwUeInfo *newUeInfo
 )
-#else
-S16 cmPkCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst               *pst;
-SpId              spId;
-uint32_t               transId;
-CkwUeInfo         *ueInfo;
-CkwUeInfo         *newUeInfo;
-#endif
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -747,23 +652,14 @@ CkwUeInfo         *newUeInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
 S16 cmPkCkwUeIdChgCfm
 (
-Pst               *pst,
-SuId              suId,
-uint32_t               transId,
-CkwUeInfo         *ueInfo,
-CmStatus          status
+Pst         *pst,
+SuId        suId,
+uint32_t    transId,
+CkwUeInfo   *ueInfo,
+CmStatus    status
 )
-#else
-S16 cmPkCkwUeIdChgCfm(pst, suId, transId, ueInfo, status)
-Pst               *pst;
-SuId              suId;
-uint32_t               transId;
-CkwUeInfo         *ueInfo;
-CmStatus          status;
-#endif
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
@@ -817,19 +713,12 @@ CmStatus          status;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwBndReq
 (
 CkwBndReq      func,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkCkwBndReq(func, pst, mBuf)
-CkwBndReq      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
     SuId       suId = 0;
     SpId       spId = 0;
@@ -855,19 +744,12 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwUbndReq
 (
 CkwUbndReq     func,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkCkwUbndReq(func, pst, mBuf)
-CkwUbndReq     func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
     SpId       spId = 0;
     Reason     reason = 0;
@@ -892,22 +774,15 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwBndCfm
 (
 CkwBndCfm      func,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkCkwBndCfm(func, pst, mBuf)
-CkwBndCfm      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
-    SuId       suId = 0;
-    uint8_t         status = 0;
+    SuId    suId = 0;
+    uint8_t status = 0;
     
 
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
@@ -931,17 +806,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcTmInfo
 (
 RlcTmInfo      *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcTmInfo(param, mBuf)
-RlcTmInfo      *param;
-Buffer         *mBuf;
-#endif
 {
 
     CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
@@ -963,17 +832,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcUmInfo
 (
 RlcEntCfgInfo  *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo  *param;
-Buffer         *mBuf;
-#endif
 {
 
     switch(param->dir)
@@ -1016,17 +879,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcAmInfo
 (
 RlcAmInfo      *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcAmInfo(param, mBuf)
-RlcAmInfo      *param;
-Buffer         *mBuf;
-#endif
 {
 
     /* DOWN LINK */
@@ -1058,17 +915,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwLChInfo
 (
 CkwLChInfo     *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkCkwLChInfo(param, mBuf)
-CkwLChInfo     *param;
-Buffer         *mBuf;
-#endif
 {
 
     CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
@@ -1091,17 +942,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcEntCfgCfmInfo
 (
 RlcEntCfgCfmInfo  *param,
 Buffer            *mBuf
 )
-#else
-S16 cmUnpkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo  *param;
-Buffer            *mBuf;
-#endif
 {
 
     CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
@@ -1125,23 +970,15 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcCfgCfmInfo
 (
 RlcCfgCfmInfo  *param,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo  *param;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
     uint8_t         idx;
 
-
     CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
     CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
@@ -1169,17 +1006,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcEntCfgInfo
 (
 RlcEntCfgInfo  *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo  *param;
-Buffer         *mBuf;
-#endif
 {
 
     CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
@@ -1248,22 +1079,14 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcCfgInfo
 (
 RlcCfgInfo     *param,
 Pst            *pst,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo     *param;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
 {
-    uint8_t         idx;
-
+    uint8_t  idx;
 
     CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
@@ -1292,23 +1115,16 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkRlcCfgCfm
 (
 RlcCfgCfm         func,
 Pst               *pst,
 Buffer            *mBuf
 )
-#else
-S16 cmUnpkRlcCfgCfm(func, pst, mBuf)
-RlcCfgCfm         func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
 {
     S16 ret1;
-    SuId             suId = 0;
-    RlcCfgCfmInfo    *cfgCfmInfo = NULLP;
+    SuId  suId = 0;
+    RlcCfgCfmInfo  *cfgCfmInfo = NULLP;
     
 
     if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
@@ -1367,17 +1183,11 @@ Buffer            *mBuf;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwUeInfo
 (
 CkwUeInfo *param,
 Buffer    *mBuf
 )
-#else
-S16 cmUnpkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer    *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
@@ -1399,23 +1209,16 @@ Buffer    *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwUeIdChgReq
 (
 CkwUeIdChgReq     func,
 Pst               *pst,
 Buffer            *mBuf
 )
-#else
-S16 cmUnpkCkwUeIdChgReq(func, pst, mBuf)
-CkwUeIdChgReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
 {
     S16       ret1;
     SpId      spId = 0;
-    uint32_t       transId = 0;
+    uint32_t  transId = 0;
     CkwUeInfo *ueInfo = NULLP;
     CkwUeInfo *newUeInfo = NULLP;
     
@@ -1497,23 +1300,16 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCkwUeIdChgCfm
 (
 CkwUeIdChgCfm     func,
 Pst               *pst,
 Buffer            *mBuf
 )
-#else
-S16 cmUnpkCkwUeIdChgCfm(func, pst, mBuf)
-CkwUeIdChgCfm     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
 {
     S16       ret1;
     SuId      suId = 0;
-    uint32_t       transId = 0;
+    uint32_t  transId = 0;
     CkwUeInfo *ueInfo = NULLP;
     CmStatus  status;
     
index 59ade35..f9e153a 100644 (file)
 */
  
 #ifdef SS_FAP
-#ifdef ANSI
 Void cmPrcTmr
 (
 CmTqCp   *tqCp,          /* timing que control point */
 CmTqType *tq,            /* timing queue */
 PFV      func            /* function */
 )
-#else
-Void cmPrcTmr(tqCp, tq, func)
-CmTqCp   *tqCp;          /* connection control block */
-CmTqType *tq;            /* message buffer */
-PFV      func;           /* function */
-#endif
 {
 /**/
    uint32_t expire;
@@ -164,19 +157,12 @@ PFV      func;           /* function */
 
 #else /* not defined SS_FAP */
 
-#ifdef ANSI
 Void cmPrcTmr
 (
 CmTqCp   *tqCp,          /* timing que control point */
 CmTqType *tq,            /* timing queue */
 PFV      func            /* function */
 )
-#else
-Void cmPrcTmr(tqCp, tq, func)
-CmTqCp   *tqCp;          /* connection control block */
-CmTqType *tq;            /* message buffer */
-PFV      func;           /* function */
-#endif
 {
 /**/
    uint32_t expire;
@@ -266,17 +252,11 @@ PFV      func;           /* function */
 *       File:  cm_bdy5.c
 *
 */
-#ifdef ANSI
 Void cmInitTimers
 (
 CmTimer *timers,     /* timer list */
 uint8_t max               /* maximum tmrs */
 )
-#else
-Void cmInitTimers(timers, max)
-CmTimer *timers;     /* timer list */
-uint8_t max;              /* maximum tmrs */
-#endif
 {
    CmTimer *tPtr;
    REG1 uint8_t i;
@@ -308,15 +288,7 @@ uint8_t max;              /* maximum tmrs */
 *
 */
   
-#ifdef ANSI
-Void cmPlcCbTq
-(
-CmTmrArg *arg
-)
-#else
-Void cmPlcCbTq(arg)
-CmTmrArg *arg;
-#endif
+Void cmPlcCbTq(CmTmrArg *arg)
 {
 /*added FAP modifications*/
 #ifdef SS_FAP
@@ -396,15 +368,7 @@ CmTmrArg *arg;
 *
 */
   
-#ifdef ANSI
-Void cmRstCbTq
-(
-CmTmrArg *arg
-)
-#else
-Void cmRstCbTq(arg)
-CmTmrArg *arg;
-#endif
+Void cmRstCbTq(CmTmrArg *arg)
 {
  
    arg->timers[arg->tNum].tqExpire = arg->tqCp->nxtEnt + arg->wait;
@@ -427,15 +391,7 @@ CmTmrArg *arg;
 *
 */
   
-#ifdef ANSI
-Void cmRmvCbTq
-(
-CmTmrArg *arg
-)
-#else
-Void cmRmvCbTq(arg)
-CmTmrArg *arg;
-#endif
+Void cmRmvCbTq(CmTmrArg *arg)
 {
 /*Added FAP modifications*/
 #ifdef SS_FAP
index fc9864d..cb7c069 100644 (file)
@@ -97,17 +97,11 @@ uint16_t gTransId = 0;
 *
 */
   
-#ifdef ANSI
 S16 cmPkDateTime
 (
 DateTime *dateTime,       /* date and time */
 Buffer *mBuf              /* message buffer */
 )
-#else
-S16 cmPkDateTime(dateTime, mBuf)
-DateTime *dateTime;       /* date and time */
-Buffer *mBuf;             /* message buffer */
-#endif
 {
 
    /*-- cm_gen_c_001.main_36 - added for micro seconds --*/
@@ -140,17 +134,11 @@ Buffer *mBuf;             /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkDuration
 (
 Duration *duration,        /* duration */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 cmPkDuration(duration, mBuf)
-Duration *duration;        /* duration */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf);
@@ -176,17 +164,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
  
-#ifdef ANSI
 S16 oduPackPointer
 (
 PTR      ptr,              /* pointer */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 oduPackPointer(ptr, mBuf)
-PTR      ptr;              /* pointer */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
    Data pkArray[PTRSIZE];   /* array for packing */
    S16 ret;                 /* return code */
@@ -289,17 +271,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkEntityId
 (
 EntityId *entityId,        /* entity id */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 cmPkEntityId(entityId, mBuf)
-EntityId *entityId;        /* entity id */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkInst, entityId->inst, mBuf);
@@ -323,17 +299,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkElmntId
 (
 ElmntId *elmntId,         /* element id */
 Buffer  *mBuf             /* message buffer */
 )
-#else
-S16 cmPkElmntId(elmntId, mBuf)
-ElmntId *elmntId;         /* element id */
-Buffer  *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); 
@@ -359,17 +329,11 @@ Buffer  *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkMemoryId
 (
 MemoryId *memoryId,        /* memoryId */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 cmPkMemoryId(memoryId, mBuf)
-MemoryId *memoryId;        /* memoryId */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkPool, memoryId->pool, mBuf); 
@@ -393,17 +357,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkSystemId
 (
 SystemId *systemId,         /* system id */
 Buffer   *mBuf              /* message buffer */
 )
-#else
-S16 cmPkSystemId(systemId, mBuf)
-SystemId *systemId;         /* system id */
-Buffer   *mBuf;             /* message buffer */
-#endif
 {
    Txt *p;                  /* part number string */
 
@@ -441,17 +399,11 @@ Buffer   *mBuf;             /* message buffer */
  *
  */
 
-#ifdef ANSI
 S16 cmPkProtAddr
 (
 ProtAddr     *pAddr,     /* protocol address */
 Buffer       *mBuf       /* buffer */
 )
-#else
-S16 cmPkProtAddr(pAddr, mBuf)
-ProtAddr     *pAddr;      /* protocol address */
-Buffer       *mBuf;          /* buffer */
-#endif
 {
    uint8_t              j;                  /* Index */
 
@@ -489,17 +441,11 @@ Buffer       *mBuf;          /* buffer */
  *
  */
 
-#ifdef ANSI
 S16 cmPkProtAddrTbl
 (
 ProtAddrTbl  *protAddr,      /* protocol address table */
 Buffer       *mBuf          /* buffer */
 )
-#else
-S16 cmPkProtAddrTbl(protAddr, mBuf)
-ProtAddrTbl  *protAddr;      /* protocol address table */
-Buffer       *mBuf;          /* buffer */
-#endif
 {
    uint8_t              i;                  /* index */
    uint8_t              j;                  /* Index */
@@ -547,17 +493,11 @@ Buffer       *mBuf;          /* buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkAddrs
 (
 Addrs *addrs,           /* address */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmPkAddrs(addrs, mBuf)
-Addrs *addrs;           /* address */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
    uint8_t i;                /* loop counter */
 
@@ -591,17 +531,11 @@ Buffer *mBuf;           /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkShrtAddrs
 (
 ShrtAddrs *addrs,          /* address */
 Buffer    *mBuf            /* message buffer */
 )
-#else
-S16 cmPkShrtAddrs(addrs, mBuf)
-ShrtAddrs *addrs;          /* address */
-Buffer    *mBuf;           /* message buffer */
-#endif 
 {
    uint8_t i;                /* loop counter */
 
@@ -634,17 +568,11 @@ Buffer    *mBuf;           /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkAddrMask
 (
 uint8_t *mask,             /* pointer to address mask array */
 Buffer  *mBuf         /* message buffer */
 )
-#else
-S16 cmPkAddrMask(mask, mBuf)
-uint8_t *mask;             /* pointer to address mask array */
-Buffer  *mBuf;        /* message buffer */
-#endif
 {
    S16 i;             /* counter */
 
@@ -673,17 +601,11 @@ Buffer  *mBuf;        /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkBndCfg
 (
 BndCfg *bndCfg,         /* bndCfg */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmPkBndCfg(bndCfg, mBuf)
-BndCfg *bndCfg;         /* bndCfg */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
    Txt *p;              /* temporary */
 
@@ -721,17 +643,11 @@ Buffer *mBuf;           /* message buffer */
 *       File:  cm_gen.c
 *
 */
-#ifdef ANSI
 S16 cmPkPst
 (
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmPkPst(pst, mBuf)
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    
    CMCHKPK(cmPkEvent, pst->event, mBuf);
@@ -767,17 +683,11 @@ Buffer *mBuf;
  *
  */
   
-#ifdef ANSI
 S16 cmPkElmtHdr
 (
 ElmtHdr *m,                  /* element header */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmPkElmtHdr(m, mBuf)
-ElmtHdr *m;                  /* element header */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
  
 #if (LCAMT || ATM_BISUP)
@@ -813,17 +723,11 @@ Buffer  *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknUInt8
 (
 TknUInt8  *tknUInt8,              /* token uint8_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknUInt8(tknUInt8, mBuf)
-TknUInt8  *tknUInt8;              /* token uint8_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    if (tknUInt8->pres)
@@ -853,17 +757,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknS8
 (
 TknS8  *tknS8,              /* token S8 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknS8(tknS8, mBuf)
-TknS8  *tknS8;              /* token S8 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
  
    if (tknS8->pres)
@@ -893,17 +791,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknUInt16
 (
 TknUInt16 *tknUInt16,             /* token uint16_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknUInt16(tknUInt16, mBuf)
-TknUInt16 *tknUInt16;             /* token uint16_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    if (tknUInt16->pres)
@@ -933,17 +825,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknUInt32
 (
 TknUInt32 *tknUInt32,             /* token uint32_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknUInt32(tknUInt32, mBuf)
-TknUInt32 *tknUInt32;             /* token uint32_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    if (tknUInt32->pres)
@@ -973,17 +859,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr
 (
 TknStr *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr(tknStr, mBuf)
-TknStr *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                    /* counter */
 
@@ -1021,17 +901,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrM
 (
 TknStrM *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrM(tknStr, mBuf)
-TknStrM *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                    /* counter */
 
@@ -1069,17 +943,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrS
 (
 TknStrS *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrS(tknStr, mBuf)
-TknStrS *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                    /* counter */
 
@@ -1117,17 +985,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrE
 (
 TknStrE *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrE(tknStr, mBuf)
-TknStrE *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                    /* counter */
 
@@ -1167,17 +1029,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkPnNodeId
 (
 PnNodeId  *src,     /* source PNNI Node Id */
 Buffer *mBuf        /* message buffer */
 )
-#else
-S16 cmPkPnNodeId (src, mBuf)
-PnNodeId  *src;     /* source PNNI Node Id */
-Buffer *mBuf;       /* message buffer */
-#endif
 {
    S16 i;
    
@@ -1207,17 +1063,11 @@ Buffer *mBuf;       /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr4
 (
 TknStr4 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr4(tknStr, mBuf)
-TknStr4 *tknStr;             /* token string */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1242,17 +1092,11 @@ Buffer  *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr12
 (
 TknStr12 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr12(tknStr, mBuf)
-TknStr12 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1276,17 +1120,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr32
 (
 TknStr32 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr32(tknStr, mBuf)
-TknStr32 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1310,17 +1148,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr64
 (
 TknStr64 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr64(tknStr, mBuf)
-TknStr64 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1344,17 +1176,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr132
 (
 TknStr132 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr132(tknStr, mBuf)
-TknStr132 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1378,17 +1204,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr256
 (
 TknStr256 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr256(tknStr, mBuf)
-TknStr256 *tknStr;             /* token string */
-Buffer    *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -1412,17 +1232,11 @@ Buffer    *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknOid
 (
 TknOid   *tknOid,             /* Object Identifier token */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknOid(tknOid, mBuf)
-TknOid   *tknOid;             /* Object Identifier token */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
    uint16_t    i;
 
@@ -1464,17 +1278,11 @@ Buffer   *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkTknS32
 (
 TknS32 *tknS32,             /* token S32 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknS32(tknS32, mBuf)
-TknS32 *tknS32;             /* token S32 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    if (tknS32->pres)
@@ -1504,17 +1312,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkHeader
 (
 Header *header,             /* header */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkHeader(header, mBuf)
-Header *header;             /* header */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
 #ifdef LMINT3
@@ -1549,17 +1351,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkCmStatus
 (
 CmStatus *sta,              /* status structure */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkCmStatus(sta, mBuf)
-CmStatus *sta;              /* status structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, sta->reason, mBuf);
@@ -1583,17 +1379,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkCmAlarm
 (
 CmAlarm *alarm,            /* alarm structure */
 Buffer  *mBuf              /* message buffer */
 )
-#else
-S16 cmPkCmAlarm(alarm, mBuf)
-CmAlarm *alarm;             /* alarm structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf);
@@ -1619,17 +1409,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkSmCfg
 (
 SmCfg *smCfg,           /* stack manager */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmPkSmCfg(smCfg, mBuf)
-SmCfg *smCfg;           /* stack manager */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkSelector, smCfg->selector, mBuf); 
@@ -1658,17 +1442,11 @@ Buffer *mBuf;           /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkTmrCfg
 (
 TmrCfg *tmrCfg,         /* timer configuration */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmPkTmrCfg(tmrCfg, mBuf)
-TmrCfg *tmrCfg;         /* timer configuration */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf);
@@ -1692,17 +1470,11 @@ Buffer *mBuf;           /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknBuf
 (
 TknBuf *tknBuf,                /* token string */
 Buffer    *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknBuf(tknBuf, mBuf)
-TknBuf *tknBuf;                /* token string */
-Buffer    *mBuf;               /* message buffer */
-#endif
 {
 
    if(tknBuf->pres)
@@ -1739,17 +1511,11 @@ Buffer    *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmPkIntf
 (
 CmIntf *intf,           /* interface info */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmPkIntf(intf, mBuf)
-CmIntf *intf;           /* interface info */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkIntfId,  intf->intfId,  mBuf); 
@@ -1779,17 +1545,11 @@ Buffer *mBuf;           /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkDateTime
 (
 DateTime *dateTime,  /* date/time structure */
 Buffer *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkDateTime(dateTime, mBuf)
-DateTime *dateTime;  /* date/time structure */
-Buffer *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); 
@@ -1823,17 +1583,11 @@ Buffer *mBuf;        /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkDuration
 (
 Duration *duration,  /* duration structure */
 Buffer *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkDuration(duration, mBuf)
-Duration *duration;  /* duration structure */
-Buffer *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); 
@@ -1859,17 +1613,11 @@ Buffer *mBuf;        /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduUnpackPointer
 (
 PTR *ptr,  /* duration structure */
 Buffer *mBuf    /* message buffer */
 )
-#else
-S16 oduUnpackPointer(ptr, mBuf)
-PTR *ptr;  /* duration structure */
-Buffer *mBuf;   /* message buffer */
-#endif
 {
    uint16_t tmp16;               /* temporary value */
    uint32_t tmp32;               /* temporary value */
@@ -1990,17 +1738,11 @@ Buffer *mBuf;   /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkEntityId
 (
 EntityId *entityId,        /* entity id */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 cmUnpkEntityId(entityId, mBuf)
-EntityId *entityId;        /* entity id */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); 
@@ -2024,17 +1766,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkElmntId
 (
 ElmntId *elmntId,         /* element id */
 Buffer  *mBuf             /* message buffer */
 )
-#else
-S16 cmUnpkElmntId(elmntId, mBuf)
-ElmntId *elmntId;         /* element id */
-Buffer  *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); 
@@ -2060,17 +1796,11 @@ Buffer  *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkMemoryId
 (
 MemoryId *memoryId,        /* memoryId */
 Buffer   *mBuf             /* message buffer */
 )
-#else
-S16 cmUnpkMemoryId(memoryId, mBuf)
-MemoryId *memoryId;        /* memoryId */
-Buffer   *mBuf;            /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkRegion, &memoryId->region,   mBuf); 
@@ -2094,17 +1824,11 @@ Buffer   *mBuf;            /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkSystemId
 (
 SystemId *systemId,         /* system id */
 Buffer   *mBuf              /* message buffer */
 )
-#else
-S16 cmUnpkSystemId(systemId, mBuf)
-SystemId *systemId;         /* system id */
-Buffer   *mBuf;             /* message buffer */
-#endif
 {
    S16 i;               /* loop counter */
    MsgLen len;
@@ -2142,17 +1866,11 @@ Buffer   *mBuf;             /* message buffer */
  *
  */
 
-#ifdef ANSI
 S16 cmUnpkProtAddr
 (
 ProtAddr     *pAddr,         /* protocol address */
 Buffer       *mBuf           /* buffer */
 )
-#else
-S16 cmUnpkProtAddr(pAddr, mBuf)
-ProtAddr     *pAddr;         /* protocol address table */
-Buffer       *mBuf;          /* buffer */
-#endif
 {
    uint8_t               j;                  /* Index */
 
@@ -2188,17 +1906,11 @@ Buffer       *mBuf;          /* buffer */
  *
  */
 
-#ifdef ANSI
 S16 cmUnpkProtAddrTbl
 (
 ProtAddrTbl  *protAddr,      /* protocol address table */
 Buffer       *mBuf           /* buffer */
 )
-#else
-S16 cmUnpkProtAddrTbl(protAddr, mBuf)
-ProtAddrTbl  *protAddr;      /* protocol address table */
-Buffer       *mBuf;          /* buffer */
-#endif
 {
    uint8_t               i;                  /* index */
    uint8_t               j;                  /* Index */
@@ -2241,17 +1953,11 @@ Buffer       *mBuf;          /* buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkAddrs
 (
 Addrs *addrs,     /* address */
 Buffer *mBuf      /* message buffer */
 )
-#else
-S16 cmUnpkAddrs(addrs, mBuf)
-Addrs *addrs;     /* address */
-Buffer *mBuf;     /* message buffer */
-#endif
 {
    uint8_t i;          /* loop counter */
 
@@ -2283,17 +1989,11 @@ Buffer *mBuf;     /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkShrtAddrs
 (
 ShrtAddrs *addrs,    /* address */
 Buffer    *mBuf      /* message buffer */
 )
-#else
-S16 cmUnpkShrtAddrs(addrs, mBuf)
-ShrtAddrs *addrs;    /* address */
-Buffer    *mBuf;     /* message buffer */
-#endif
 {
    uint8_t i;          /* loop counter */
 
@@ -2325,17 +2025,11 @@ Buffer    *mBuf;     /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkAddrMask
 (
 uint8_t *mask,             /* pointer to address mask */
 Buffer  *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkAddrMask(mask, mBuf)
-uint8_t *mask;             /* pointer to address mask */
-Buffer  *mBuf;        /* message buffer */
-#endif
 {
    S16 i;             /* counter */
 
@@ -2363,17 +2057,11 @@ Buffer  *mBuf;        /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkBndCfg
 (
 BndCfg *bndCfg,         /* bndCfg */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmUnpkBndCfg(bndCfg, mBuf)
-BndCfg *bndCfg;         /* bndCfg */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
    S16 i;               /* loop counter */
 
@@ -2410,17 +2098,11 @@ Buffer *mBuf;           /* message buffer */
 *       File:  cm_gen.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkPst
 (
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkPst(pst, mBuf)
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef TDS_ROLL_UPGRADE_SUPPORT
@@ -2456,17 +2138,11 @@ Buffer *mBuf;
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkElmtHdr
 (
 ElmtHdr *m,                  /* element header */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkElmtHdr(m, mBuf)
-ElmtHdr *m;                  /* element header */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
  
    /* Present */
@@ -2502,17 +2178,11 @@ Buffer  *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknUInt8
 (
 TknUInt8 *tknUInt8,               /* token uint8_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknUInt8(tknUInt8, mBuf)
-TknUInt8 *tknUInt8;               /* token uint8_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    /* Token Header */
@@ -2542,17 +2212,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknS8
 (
 TknS8 *tknS8,               /* token S8 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknS8(tknS8, mBuf)
-TknS8 *tknS8;               /* token S8 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
  
    /* Token Header */
@@ -2582,17 +2246,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknUInt16
 (
 TknUInt16 *tknUInt16,             /* token uint16_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknUInt16(tknUInt16, mBuf)
-TknUInt16 *tknUInt16;             /* token uint16_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    /* Token Header */
@@ -2622,17 +2280,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknUInt32
 (
 TknUInt32 *tknUInt32,             /* token uint32_t */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknUInt32(tknUInt32, mBuf)
-TknUInt32 *tknUInt32;             /* token uint32_t */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    /* Token Header */
@@ -2661,17 +2313,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknStr
 (
 TknStr *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr(tknStr, mBuf)
-TknStr *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                     /* counter */
 
@@ -2710,17 +2356,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknStrM
 (
 TknStrM *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrM(tknStr, mBuf)
-TknStrM *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                     /* counter */
 
@@ -2760,17 +2400,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknStrS
 (
 TknStrS *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrS(tknStr, mBuf)
-TknStrS *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                     /* counter */
 
@@ -2810,17 +2444,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknStrE
 (
 TknStrE *tknStr,             /* token string */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrE(tknStr, mBuf)
-TknStrE *tknStr;             /* token string */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Cntr i;                     /* counter */
 
@@ -2862,17 +2490,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkPnNodeId
 (
 PnNodeId  *dst,     /* source PNNI Node Id */
 Buffer *mBuf        /* message buffer */
 )
-#else
-S16 cmUnpkPnNodeId (dst, mBuf)
-PnNodeId  *dst;     /* source PNNI Node Id */
-Buffer *mBuf;       /* message buffer */
-#endif
 {
    S16 i;
    
@@ -2902,17 +2524,11 @@ Buffer *mBuf;       /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr4
 (
 TknStr4 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr4(tknStr, mBuf)
-TknStr4 *tknStr;             /* token string */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -2937,17 +2553,11 @@ Buffer  *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr12
 (
 TknStr12 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr12(tknStr, mBuf)
-TknStr12 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -2971,17 +2581,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr32
 (
 TknStr32 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr32(tknStr, mBuf)
-TknStr32 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -3005,17 +2609,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr64
 (
 TknStr64 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr64(tknStr, mBuf)
-TknStr64 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -3039,17 +2637,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr132
 (
 TknStr132 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr132(tknStr, mBuf)
-TknStr132 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -3073,17 +2665,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr256
 (
 TknStr256 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr256(tknStr, mBuf)
-TknStr256 *tknStr;             /* token string */
-Buffer    *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -3107,17 +2693,11 @@ Buffer    *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknOid
 (
 TknOid   *tknOid,             /* Object Identifier token */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknOid(tknOid, mBuf)
-TknOid   *tknOid;             /* Object Identifier token */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
    uint16_t    i;
 
@@ -3161,17 +2741,11 @@ Buffer   *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTknS32
 (
 TknS32 *tknS32,             /* token S32 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknS32(tknS32, mBuf)
-TknS32 *tknS32;             /* token S32 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    /* Token Header */
@@ -3201,17 +2775,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkHeader
 (
 Header *header,   /* header structure */
 Buffer *mBuf      /* message buffer */
 )
-#else
-S16 cmUnpkHeader(header, mBuf)
-Header *header;   /* header structure */
-Buffer *mBuf;     /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); 
@@ -3246,17 +2814,11 @@ Buffer *mBuf;     /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkCmStatus
 (
 CmStatus *sta,              /* status structure */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkCmStatus(sta, mBuf)
-CmStatus *sta;              /* status structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &sta->status, mBuf);
@@ -3280,17 +2842,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkCmAlarm
 (
 CmAlarm *alarm,             /* alarm structure */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkCmAlarm(alarm, mBuf)
-CmAlarm *alarm;             /* alarm structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf);
@@ -3316,17 +2872,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkSmCfg
 (
 SmCfg *smCfg,           /* stack manager */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmUnpkSmCfg(smCfg, mBuf)
-SmCfg *smCfg;           /* stack manager */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); 
@@ -3355,17 +2905,11 @@ Buffer *mBuf;           /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkTmrCfg
 (
 TmrCfg *tmrCfg,         /* timer configuration */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmUnpkTmrCfg(tmrCfg, mBuf)
-TmrCfg *tmrCfg;         /* timer configuration */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); 
@@ -3388,17 +2932,11 @@ Buffer *mBuf;           /* message buffer */
  *
  */
 
-#ifdef ANSI
 S16 cmUnpkTknBuf
 (
 TknBuf *tknBuf,                /* token string */
 Buffer    **tBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknBuf(tknBuf, tBuf)
-TknBuf *tknBuf;                /* token string */
-Buffer    **tBuf;               /* message buffer */
-#endif
 {
    Buffer *mBuf;
 
@@ -3456,17 +2994,11 @@ Buffer    **tBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 cmUnpkIntf
 (
 CmIntf *intf,           /* interface info */
 Buffer *mBuf            /* message buffer */
 )
-#else
-S16 cmUnpkIntf(intf, mBuf)
-CmIntf *intf;           /* interface info */
-Buffer *mBuf;           /* message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); 
index 5793bc3..61074e5 100644 (file)
@@ -171,26 +171,18 @@ static S16 cmHashFuncDirIdx ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncAnyKey
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* idx to return */
+CmHashListCp  *hashListCp,        /* hash list control point */
+uint8_t       *key,               /* key string */
+uint16_t      keyLen,             /* length of key string */
+uint16_t      *idx                /* idx to return */
 ) 
-#else
-static S16 cmHashFuncAnyKey (hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* idx to return */
-#endif
 {
-   uint32_t             a;                 /* hash variables */
-   uint32_t             b;                 /* hash variables */         
-   uint32_t             c;                 /* hash variables */
-   uint32_t             len;               /* length */
+   uint32_t   a;                 /* hash variables */
+   uint32_t   b;                 /* hash variables */         
+   uint32_t   c;                 /* hash variables */
+   uint32_t   len;               /* length */
 
    /*cm_hash_c_001.main_23 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
    /* Set up the internal state */
@@ -257,23 +249,15 @@ uint16_t                *idx;               /* idx to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncU32Mod
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* idx to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* idx to return */
 ) 
-#else
-static S16 cmHashFuncU32Mod (hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* idx to return */
-#endif
 {
-   uint32_t             sum;                /* Sum of octets for hash function */
+   uint32_t  sum;                /* Sum of octets for hash function */
 
 
    /* keyLen is marked Unused to remove compilation 
@@ -317,26 +301,18 @@ uint16_t                *idx;               /* idx to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncBCD8
 (
 CmHashListCp  *hashListCp,        /* hash list control point */
-uint8_t            *key,               /* key string */
-uint16_t           keyLen,             /* length of key string */
-uint16_t           *idx                /* idx to return */
+uint8_t       *key,               /* key string */
+uint16_t      keyLen,             /* length of key string */
+uint16_t      *idx                /* idx to return */
 ) 
-#else
-static S16 cmHashFuncBCD8 (hashListCp, key, keyLen, idx)
-CmHashListCp  *hashListCp;        /* hash list control point */
-uint8_t            *key;               /* key string */
-uint16_t           keyLen;             /* length of key string */
-uint16_t           *idx;               /* idx to return */
-#endif
 {
-   uint16_t      tmp16 = 0;
-   uint32_t      firstUInt32 = 0;    /* First  uint32_t prepared for lower 4 octets */
-   uint32_t      secondUInt32 = 0;   /* Second uint32_t prepared for higher 4 octets */
-   uint32_t      sum;             /* Sum of the above 2 octets to get the index */
+   uint16_t  tmp16 = 0;
+   uint32_t  firstUInt32 = 0;    /* First  uint32_t prepared for lower 4 octets */
+   uint32_t  secondUInt32 = 0;   /* Second uint32_t prepared for higher 4 octets */
+   uint32_t  sum;             /* Sum of the above 2 octets to get the index */
 
 
    /* keyLen is marked Unused to remove compilation 
@@ -391,24 +367,16 @@ uint16_t           *idx;               /* idx to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncString
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* idx to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* idx to return */
 ) 
-#else
-static S16 cmHashFuncString (hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* idx to return */
-#endif
 {
-   uint16_t             cntr;               /* Index */
-   uint32_t             sum;                /* Sum of octets for hash function */
+   uint16_t  cntr;               /* Index */
+   uint32_t  sum;                /* Sum of octets for hash function */
 
 
    sum = 0;
@@ -448,23 +416,15 @@ uint16_t                *idx;               /* idx to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncDefault
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* index to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* index to return */
 ) 
-#else
-static S16 cmHashFuncDefault(hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* index to return */
-#endif
 {
-   uint32_t             sum;                /* sum of key string octets */
+   uint32_t  sum;                /* sum of key string octets */
 
 
    /* add all bytes of the key */
@@ -516,24 +476,16 @@ uint16_t                *idx;               /* index to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncMult24
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* index to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* index to return */
 ) 
-#else
-static S16 cmHashFuncMult24(hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* index to return */
-#endif
 {
-   uint32_t             prod;               /* (constant multiplier * key) */
-   uint8_t              shift;              /* Bits to be shifted to get index */
+   uint32_t  prod;               /* (constant multiplier * key) */
+   uint8_t   shift;              /* Bits to be shifted to get index */
 
 
    UNUSED(keyLen);
@@ -578,21 +530,13 @@ uint16_t                *idx;               /* index to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncConId
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* index to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* index to return */
 ) 
-#else
-static S16 cmHashFuncConId(hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* index to return */
-#endif
 {
 
 
@@ -646,21 +590,13 @@ uint16_t                *idx;               /* index to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashFuncDirIdx
 (
-CmHashListCp       *hashListCp,        /* hash list control point */
-uint8_t                 *key,               /* key string */
-uint16_t                keyLen,             /* length of key string */
-uint16_t                *idx                /* index to return */
+CmHashListCp *hashListCp,        /* hash list control point */
+uint8_t      *key,               /* key string */
+uint16_t     keyLen,             /* length of key string */
+uint16_t     *idx                /* index to return */
 ) 
-#else
-static S16 cmHashFuncDirIdx(hashListCp, key, keyLen, idx)
-CmHashListCp       *hashListCp;        /* hash list control point */
-uint8_t                 *key;               /* key string */
-uint16_t                keyLen;             /* length of key string */
-uint16_t                *idx;               /* index to return */
-#endif
 {
 
    UNUSED(hashListCp);
@@ -687,7 +623,6 @@ uint16_t                *idx;               /* index to return */
 *
 */
 
-#ifdef ANSI
 static S16 cmHashMatchKey
 (
 uint8_t *key1,                         /* first key string */
@@ -695,13 +630,6 @@ uint16_t keyLen1,                      /* length of first key string */
 uint8_t *key2,                         /* second key string */
 uint16_t keyLen2                       /* length of second key string */
 ) 
-#else
-static S16 cmHashMatchKey(key1, keyLen1, key2, keyLen2)
-uint8_t *key1;                         /* first key string */
-uint16_t keyLen1;                      /* length of first key string */
-uint8_t *key2;                         /* second key string */
-uint16_t keyLen2;                      /* length of second key string */
-#endif
 {
 
    /* compare key lengths */
@@ -727,17 +655,11 @@ uint16_t keyLen2;                      /* length of second key string */
 *
 */
 
-#ifdef ANSI
 static S16 cmListInsert
 (
 CmListEnt *oldEntry,                    /* add new entry after this entry */
 CmListEnt *newEntry                     /* new entry to add */
 ) 
-#else
-static S16 cmListInsert(oldEntry, newEntry) 
-CmListEnt *oldEntry;                    /* add new entry after this entry */
-CmListEnt *newEntry;                    /* new entry to add */
-#endif
 {
 
    newEntry->next         = oldEntry->next;
@@ -763,15 +685,10 @@ CmListEnt *newEntry;                    /* new entry to add */
 *
 */
 
-#ifdef ANSI
 static S16 cmListDelete
 (
 CmListEnt *entry                        /* entry to delete */
 ) 
-#else
-static S16 cmListDelete(entry) 
-CmListEnt *entry;                       /* entry to delete */
-#endif
 {
 
    if (entry == NULLP) 
@@ -824,27 +741,16 @@ CmListEnt *entry;                       /* entry to delete */
 *       File:  cm_hash.c
 *
 */
-#ifdef ANSI
 S16 cmHashListInit
 (
 CmHashListCp *hashListCp,  /* hash list to initialize */
-uint16_t          nmbBins,      /* number of hash list bins */
-uint16_t          offset,       /* offset of CmHashListEnt in entries */
+uint16_t     nmbBins,      /* number of hash list bins */
+uint16_t     offset,       /* offset of CmHashListEnt in entries */
 Bool         dupFlg,       /* allow duplicate keys */
-uint16_t          keyType,      /* key type for selecting hash fn */
+uint16_t     keyType,      /* key type for selecting hash fn */
 Region       region,       /* memory region to allocate bins */
 Pool         pool          /* memory pool to allocate bins */
 )
-#else
-S16 cmHashListInit(hashListCp, nmbBins, offset, dupFlg, keyType, region, pool)
-CmHashListCp *hashListCp;  /* hash list to initialize */
-uint16_t          nmbBins;      /* number of hash list bins */
-uint16_t          offset;       /* offset of CmHashListEnt in entries */
-Bool         dupFlg;       /* allow duplicate keys */
-uint16_t          keyType;      /* key type for selecting hash fn */
-Region       region;       /* memory region to allocate bins */
-Pool         pool;         /* memory pool to allocate bins */
-#endif
 {
    uint16_t i;
 #ifndef CM_MT_HASH_BIN
@@ -982,15 +888,10 @@ Pool         pool;         /* memory pool to allocate bins */
 *       File:  cm_hash.c
 *
 */
-#ifdef ANSI
 S16 cmHashListDeinit
 (
 CmHashListCp *hashListCp   /* hash list to deinitialize */
 )
-#else
-S16 cmHashListDeinit(hashListCp)
-CmHashListCp *hashListCp;  /* hash list to deinitialize */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_DEBUG)
@@ -1050,21 +951,13 @@ CmHashListCp *hashListCp;  /* hash list to deinitialize */
 *
 */
 
-#ifdef ANSI
 S16 cmHashListInsert
 (
 CmHashListCp *hashListCp,  /* hash list to add to */
 PTR          entry,        /* entry to add */
-uint8_t           *key,         /* pointer to key */
-uint16_t          keyLen        /* length of key */
+uint8_t      *key,         /* pointer to key */
+uint16_t     keyLen        /* length of key */
 )
-#else
-S16 cmHashListInsert(hashListCp, entry, key, keyLen)
-CmHashListCp *hashListCp;  /* hash list to add to */
-PTR          entry;        /* entry to add */
-uint8_t           *key;         /* pointer to key */
-uint16_t          keyLen;       /* length of key */
-#endif
 {
    CmHashListEnt *hashListEnt;    /* pointer to hash list entry header */
    PTR dupEntry;                  /* pointer to entry with duplicate key */
@@ -1133,17 +1026,11 @@ uint16_t          keyLen;       /* length of key */
 *
 */
 
-#ifdef ANSI
 S16 cmHashListDelete
 (
 CmHashListCp *hashListCp,  /* hash list to delete from */
 PTR          entry         /* entry to delete */
 )
-#else
-S16 cmHashListDelete(hashListCp, entry)
-CmHashListCp *hashListCp;  /* hash list to delete from */
-PTR          entry;        /* entry to delete */
-#endif
 {
    CmHashListEnt *hashListEnt;    /* pointer to hash list entry header */
 #ifdef CM_MT_HASH_BIN
@@ -1216,23 +1103,14 @@ PTR          entry;        /* entry to delete */
 *
 */
 
-#ifdef ANSI
 S16 cmHashListFind
 (
 CmHashListCp *hashListCp,  /* hash list to search */
-uint8_t           *key,         /* pointer to key */
-uint16_t          keyLen,       /* length of key */
-uint16_t          seqNmb,       /* used in case of duplicate keys */
+uint8_t      *key,         /* pointer to key */
+uint16_t     keyLen,       /* length of key */
+uint16_t     seqNmb,       /* used in case of duplicate keys */
 PTR          *entry        /* entry to be returned */
 )
-#else
-S16 cmHashListFind(hashListCp, key, keyLen, seqNmb, entry)
-CmHashListCp *hashListCp;  /* hash list to search */
-uint8_t           *key;         /* pointer to key */
-uint16_t          keyLen;       /* length of key */
-uint16_t          seqNmb;       /* used in case of duplicate keys */
-PTR          *entry;       /* entry to be returned */
-#endif
 {
    CmHashListEnt *hashListEnt;    /* pointer to hash list entry header */
 #ifndef CM_MT_HASH_BIN
@@ -1321,19 +1199,12 @@ PTR          *entry;       /* entry to be returned */
 *       File:  cm_hash.c
 *
 */
-#ifdef ANSI
 S16 cmHashListGetNext
 (
 CmHashListCp *hashListCp,    /* hash list to get from */
 PTR          prevEnt,        /* previous entry */
 PTR          *entry          /* entry to be returned */
 )
-#else
-S16 cmHashListGetNext(hashListCp, prevEnt, entry)
-CmHashListCp *hashListCp;    /* hash list to get from */
-PTR          prevEnt;        /* previous entry */
-PTR          *entry;         /* entry to be returned */
-#endif
 {
 #ifndef CM_MT_HASH_BIN
    CmListEnt     *hashListBin;   /* temporary hash list bin pointer */
@@ -1438,21 +1309,13 @@ PTR          *entry;         /* entry to be returned */
 *       File:  cm_hash.c
 *
 */
-#ifdef ANSI
 S16 cmHashListBinGetNextEntry
 (
 CmHashListCp *hashListCp,    /* hash list to get from */
-uint16_t          binIdx,         /* Bin Index to retreive the entry */
+uint16_t     binIdx,         /* Bin Index to retreive the entry */
 PTR          prevEnt,        /* previous entry */
 PTR          *entry          /* entry to be returned */
 )
-#else
-S16 cmHashListBinGetNextEntry(hashListCp, binIdx, prevEnt, entry)
-CmHashListCp *hashListCp;    /* hash list to get from */
-uint16_t          binIdx;         /* Bin Index to retreive the entry */
-PTR          prevEnt;        /* previous entry */
-PTR          *entry;         /* entry to be returned */
-#endif
 {
    CmListBinEnt  *hashListBin;   /* temporary hash list bin pointer */
    CmHashListEnt *hashListEnt;   /* temporary hash list entry pointer */
@@ -1528,19 +1391,12 @@ PTR          *entry;         /* entry to be returned */
 *       File:  cm_hash.c
 *
 */
-#ifdef ANSI
 S16 cmHashListQuery
 (
 CmHashListCp *hashListCp,    /* hash list to query */
-uint8_t           queryType,      /* type of query */
-uint16_t          *result         /* result of query */
+uint8_t      queryType,      /* type of query */
+uint16_t     *result         /* result of query */
 )
-#else
-S16 cmHashListQuery(hashListCp, queryType, result)
-CmHashListCp *hashListCp;    /* hash list to query */
-uint8_t           queryType;      /* type of query */
-uint16_t          *result;        /* result of query */
-#endif
 {
 #ifdef CM_MT_HASH_BIN
    uint8_t       i;
@@ -1638,21 +1494,13 @@ uint16_t          *result;        /* result of query */
 *
 */
 
-#ifdef ANSI
 S16 cmHashListOAInsert
 (
 CmHashListCp *hashListCp,  /* hash table to add to */
 PTR          entry,        /* entry to add */
-uint8_t           *key,         /* pointer to key */
-uint16_t          keyLen        /* length of key */
+uint8_t      *key,         /* pointer to key */
+uint16_t     keyLen        /* length of key */
 )
-#else
-S16 cmHashListOAInsert(hashListCp, entry, key, keyLen)
-CmHashListCp *hashListCp;  /* hash table to add to */
-PTR          entry;        /* entry to add */
-uint8_t           *key;         /* pointer to key */
-uint16_t          keyLen;       /* length of key */
-#endif
 {
 /* cm_hash_c_001.main_21. Modify. Compilation Issue resolved. */
 #ifndef CM_MT_HASH_BIN
index 8aead4b..78c7640 100644 (file)
@@ -320,7 +320,6 @@ Txt   prntBuf[CMINET_PRNT_BUF_SIZE];
 *
 */
 
-#ifdef ANSI
 S16 cmInetPoll
 (
 CmInetPollFd  *pollFdArr,               /* poll FD Array */
@@ -328,13 +327,6 @@ uint32_t               numFds,               /* Number of Fds to be monitored */
 S16              *numRdyFds,            /* number of ready descriptors */
 uint32_t              timeout                /* timeout value for Poll */
 )
-#else
-S16 cmInetPoll(pollFdArr,numFds,numRdyFds,timeout)
-CmInetPollFd  *pollFdArr;               /* poll FD Array */
-uint32_t               numFds;               /* Number of Fds to be monitored */
-S16              *numRdyFds;            /* number of ready descriptors */
-uint32_t               timeout;              /* timeout value for Poll */
-#endif
 {
    S32  ret;
 
@@ -413,7 +405,6 @@ uint32_t               timeout;              /* timeout value for Poll */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollSetFd
 (
 CmInetFd         *sockFd,               /* socket file descriptor */
@@ -421,13 +412,6 @@ CmInetPollFd  *pollFdArr,               /* poll FD Array */
 S16               idx,                  /* poll Fd Array Index */
 uint16_t               eventMask             /* Event Mask to be set */
 )
-#else
-S16 cmInetPollSetFd(sockFd,pollFdArr,idx,eventMask)
-CmInetFd         *sockFd;               /* socket file descriptor */
-CmInetPollFd  *pollFdArr;               /* poll FD Array */
-S16              idx;                   /* poll Fd Array Index */
-uint16_t              eventMask;             /* Event Mask to be set */
-#endif
 {
    
 
@@ -509,19 +493,12 @@ uint16_t              eventMask;             /* Event Mask to be set */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollFdIsSet
 (
 CmInetPollFd  *pollFdArr,            /* poll FD Array */
 S16               idx,               /* poll Fd Array Index */
 uint16_t               eventMask          /* Event Mask to be set */
 )
-#else
-S16 cmInetPollFdIsSet(pollFdArr,idx,eventMask)
-CmInetPollFd  *pollFdArr;            /* poll FD Array */
-S16               idx;               /* poll Fd Array Index */
-uint16_t               eventMask;         /* Event Mask to be set */
-#endif
 {
    S16  ret;
 
@@ -568,19 +545,12 @@ uint16_t               eventMask;         /* Event Mask to be set */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollClearFdREvent
 (
 CmInetPollFd  *pollFdArr,            /* poll FD Array */
 S16               idx,               /* poll Fd Array Index */
 uint16_t               eventMask          /* Event Mask to be set */
 )
-#else
-S16 cmInetPollClearFdREvent(sockFd,pollFdArr,eventMask)
-CmInetPollFd  *pollFdArr;            /* poll FD Array */
-S16               idx;               /* poll Fd Array Index */
-uint16_t               eventMask;         /* Event Mask to be set */
-#endif
 {
 
 
@@ -659,19 +629,12 @@ uint16_t               eventMask;         /* Event Mask to be set */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollClearFdEvent
 (
 CmInetPollFd  *pollFdArr,            /* poll FD Array */
 S16               idx,               /* poll Fd Array Index */
 uint16_t               eventMask          /* Event Mask to be set */
 )
-#else
-S16 cmInetPollClearFdEvent(sockFd,pollFdArr,eventMask)
-CmInetPollFd   *pollFdArr;            /* poll FD Array */
-S16             idx;                  /* poll Fd Array Index */
-uint16_t             eventMask;            /* Event Mask to be set */
-#endif
 {
 
 
@@ -757,19 +720,12 @@ uint16_t             eventMask;            /* Event Mask to be set */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollDelFd
 (
 CmInetPollFd  *pollFdArr,             /* poll FD Array */
 S16               delIdx,             /* poll Fd Array Index for which fd has to be deleted*/
 S16               lastIdx             /* Last index of poll Fd Array */
 )
-#else
-S16 cmInetPollDelFd(pollFdArr, delIdx, lastIdx)
-CmInetPollFd  *pollFdArr;            /* poll FD Array */
-S16               delIdx;            /* poll Fd Array Index for which fd has to be deleted*/
-S16               lastIdx;           /* Last index of poll Fd Array */
-#endif
 {
 
 
@@ -839,15 +795,10 @@ S16               lastIdx;           /* Last index of poll Fd Array */
 *
 */
 
-#ifdef ANSI
 S16 cmInetPollInitFdArr
 (
 CmInetPollFd  *pollFdArr             /* poll FD Array */
 )
-#else
-S16 cmInetPollInitFdArr(pollFdArr)
-CmInetPollFd  *pollFdArr;            /* poll FD Array */
-#endif
 {
    S16 idx;
 
@@ -895,31 +846,20 @@ CmInetPollFd  *pollFdArr;            /* poll FD Array */
 *
 */
 
-#ifdef ANSI
 static S16 buildRecvBuf
 (
 CmInetMemInfo  *info,           /* buffer allocation info */
 MsgLen          len,            /* message length */
 CmInetIovec     rxArr[],        /* gather array */
 Buffer         *dBuf[],         /* allocated dBufs */
-uint16_t             maxSize,        /* size of rxArr/dBuf array */       
+uint16_t       maxSize,        /* size of rxArr/dBuf array */       
 struct msghdr  *msg,            /* message header for recvmsg() */           
 Bool           isStrmMsg        /* Is a TCP message */
 )
-#else
-static S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg)
-   CmInetMemInfo   *info;          /* buffer allocation info */
-   MsgLen           len;           /* message length */        
-   CmInetIovec      rxArr[];       /* gather array */         
-   Buffer          *dBuf[];        /* allocated dBufs */
-   uint16_t              maxSize;       /* size of rxArr/dBuf array */       
-   struct msghdr   *msg;           /* message header for recvmsg() */        
-   Bool            isStrmMsg;      /* Is a TCP message */
-#endif
 {
    S16     ret;                 /* temporary return value */
-   uint16_t     numBuf;              /* number of dBufs */
-   uint16_t     i;                   /* dBuf index counter */
+   uint16_t numBuf;              /* number of dBufs */
+   uint16_t i;                   /* dBuf index counter */
    Data   *dPtr;                /* data pointer */
    /* cm_inet_c_001.main_47: 102069 Changed from S32 to MsgLen for bufLen*/
    MsgLen  bufLen;              /* entire receive buffer length, if S16 
@@ -1058,7 +998,6 @@ cleanup:
 *
 */
 
-#ifdef ANSI
 static S16 buildRecvMsg
 (
 CmInetMemInfo  *info,           /* buffer allocation info */
@@ -1068,15 +1007,6 @@ MsgLen          msgLen,         /* message length */
 Buffer         *dBufs[],        /* dBufs */
 Buffer        **mPtr            /* message built from dBufs */     
 )
-#else
-static S16 buildRecvMsg(info, rxArr, numBuf, msgLen, dBufs, mPtr)
-CmInetMemInfo  *info;           /* buffer allocation info */   
-CmInetIovec     rxArr[];        /* scatter array */            
-S16             numBuf;         /* number of allocated dBufs */
-MsgLen          msgLen;         /* length of one particular dBuf */          
-Buffer         *dBufs[];        /* dBufs */
-Buffer        **mPtr;           /* message built from dBufs */   
-#endif
 {
    S16      ret;                 /* return value */ 
    S16      i;                   /* dBuf index counter */
@@ -1157,7 +1087,6 @@ cleanup:
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 static S16 buildSendIovec
 (
 Buffer         *mBuf,           /* Message buffer */
@@ -1165,20 +1094,9 @@ MsgLen         msgLen,          /* Length of mBuf */
 CmInetIovec    txArr[],         /* transmit scatter vector array */ 
 S16            numDBufs,        /* Maximum number of dBufs to use */
 S16            *numIovElems,    /* Number of iov elements in array */
-uint32_t            *strtEndDBufNum, /* dBuf number to start and end */
+uint32_t       *strtEndDBufNum, /* dBuf number to start and end */
 MsgLen         *ioLen           /* cm_inet_c_001.main_50 - Len of dbuf packed into IO-vector */ 
 )
-#else
-static S16 buildSendIovec(mBuf, msgLen, txArr, numDBufs, numIovElems, 
-                           strtEndDBufNum,ioLen) 
-Buffer         *mBuf;           /* Message buffer */
-MsgLen         msgLen;          /* Length of mBuf */
-CmInetIovec    txArr[];         /* transmit scatter vector array */ 
-S16            numDBufs;        /* Maximum number of dBufs to use */
-S16            *numIovElems;    /* Number of iov elements in array */
-uint32_t            *strtEndDBufNum; /* dBuf number to start and end */
-MsgLen         *ioLen;          /* cm_inet_c_001.main_50 - Len of dbuf packed into IO-vector */ 
-#endif
 {
    S16         ret;
    MsgLen      dLen;
@@ -1292,7 +1210,6 @@ MsgLen         *ioLen;          /* cm_inet_c_001.main_50 - Len of dbuf packed in
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 #ifdef CM_INET2  
 #ifdef IPV6_SUPPORTED
 S16 cmInetSocket
@@ -1317,26 +1234,6 @@ uint8_t        type,                 /* socket type */
 CmInetFd *sockFd                /* socket file descriptor */
 )
 #endif /* CM_INET2 */ 
-#else
-#ifdef CM_INET2  
-#ifdef IPV6_SUPPORTED
-S16 cmInetSocket(type, sockFd, protocol, domain)
-uint8_t        type;                 /* socket type */
-CmInetFd *sockFd;               /* socket file descriptor */
-uint8_t        protocol;             /* protocol value */
-uint8_t        domain;               /* domain */
-#else
-S16 cmInetSocket(type, sockFd, protocol)
-uint8_t        type;                 /* socket type */
-CmInetFd *sockFd;               /* socket file descriptor */
-uint8_t        protocol;             /* protocol value */
-#endif /* IPV6_SUPPORTED */
-#else /* CM_INET2 */ 
-S16 cmInetSocket(type, sockFd)
-uint8_t        type;                 /* socket type */
-CmInetFd *sockFd;               /* socket file descriptor */
-#endif /* CM_INET2 */ 
-#endif /* ANSI */
 {
    S32 ret;                     /* temporary return value */
 
@@ -1484,17 +1381,11 @@ CmInetFd *sockFd;               /* socket file descriptor */
 *
 */
 
-#ifdef ANSI
 S16 cmInetBind
 (
 CmInetFd   *sockFd,             /* socket file descriptor */ 
 CmInetAddr *myAddr              /* locale Internet address/port */
 )
-#else
-S16 cmInetBind(sockFd, myAddr)
-CmInetFd   *sockFd;             /* socket file descriptor */ 
-CmInetAddr *myAddr;             /* locale Internet address/port */
-#endif
 {
    S32 ret;                     /* temporary return value */
    struct sockaddr_in srcAddr;  /* local Internet address/port */
@@ -1609,19 +1500,12 @@ CmInetAddr *myAddr;             /* locale Internet address/port */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpBindx
 (
 CmInetFd          *sockFd,       /* socket file descriptor */ 
 CmInetNetAddrLst  *addrLst,      /* local Internet address list */
 uint16_t                port          /* port number */
 )
-#else
-S16 cmInetSctpBindx(sockFd, addrLst, port)
-CmInetFd          *sockFd;       /* socket file descriptor */ 
-CmInetNetAddrLst  *addrLst;      /* locale Internet address list */
-uint16_t                port;         /* port number */
-#endif
 {
    S32    ret;                     /* temporary return value */
    S32    idx;
@@ -1888,21 +1772,13 @@ uint16_t                port;         /* port number */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpConnectx
 (
 CmInetFd          *sockFd,       /* socket file descriptor */ 
 CmInetNetAddr     *primAddr,     /* primary destination Internet address */
 CmInetNetAddrLst  *addrLst,      /* destination Internet address list */
-uint16_t                port          /* port number */
+uint16_t          port          /* port number */
 )
-#else
-S16 cmInetSctpConnectx(sockFd, primAddr, addrLst, port)
-CmInetFd          *sockFd;       /* socket file descriptor */ 
-CmInetNetAddr     *primAddr;     /* primary destination Internet address */
-CmInetNetAddrLst  *addrLst;      /* destination Internet address list */
-uint16_t                port;         /* port number */
-#endif
 {
    S32   ret;   
    uint32_t   cnt;
@@ -2352,19 +2228,12 @@ uint16_t                port;         /* port number */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpPeelOff
 (
 CmInetFd          *sockFd,       /* socket file descriptor */ 
-uint32_t                assocId,      /* association id */
+uint32_t          assocId,      /* association id */
 CmInetFdType      *assocFd       /* association fd */
 )
-#else
-S16 cmInetSctpPeelOff(sockFd, assocId, assocFd)
-CmInetFd          *sockFd;       /* socket file descriptor */ 
-uint32_t                assocId;      /* association id */
-CmInetFdType      *assocFd;      /* association fd */
-#endif
 {
    S32 ret;
 
@@ -2418,36 +2287,20 @@ CmInetFdType      *assocFd;      /* association fd */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpSendMsg
 (
 CmInetFd        *sockFd,       /* socket file descriptor */ 
 CmInetNetAddr   *dstAddr,      /* destination Internet address/port */
-uint16_t              port,         /* destination port no. */
+uint16_t        port,         /* destination port no. */
 CmInetMemInfo   *info,         /* buffer allocation info */
 Buffer          *mBuf,         /* buffer structure to send */
 MsgLen          *len,          /* number of actually sent octets */
-uint16_t              strmId,       /* sctp stream identifier */
-Bool             unorderFlg,   /* flag to enable the unordered delivery */
-uint16_t              ttl,          /* time to live */
-uint32_t              ppId,         /* opaque value passed along with the message */
-uint32_t              context       /* value to be passed back, if error occurs */
+uint16_t        strmId,       /* sctp stream identifier */
+Bool            unorderFlg,   /* flag to enable the unordered delivery */
+uint16_t        ttl,          /* time to live */
+uint32_t        ppId,         /* opaque value passed along with the message */
+uint32_t        context       /* value to be passed back, if error occurs */
 )
-#else
-S16 cmInetSctpSendMsg(sockFd, dstAddr, port, info, mBuf, len, strmId, 
-                             unorderFlg, ttl, ppId, context)
-CmInetFd        *sockFd;       /* socket file descriptor */ 
-CmInetNetAddr   *dstAddr;      /* destination Internet address/port */
-uint16_t              port;         /* destination port no. */
-CmInetMemInfo   *info;         /* buffer allocation info */
-Buffer          *mBuf;         /* buffer structure to send */
-MsgLen          *len;          /* number of actually sent octets */
-uint16_t              strmId;       /* sctp stream identifier */
-Bool             unorderFlg;   /* flag to enable the unordered delivery */
-uint16_t              ttl;          /* time to live */
-uint32_t              ppId;         /* opaque value passed along with the message */
-uint32_t              context;      /* value to be passed back, if error occurs */
-#endif
 {
    S32     ret;   
  /* cm_inet_c_001.main_58 : Fix for klockwork issue */
@@ -2674,32 +2527,18 @@ uint32_t              context;      /* value to be passed back, if error occurs
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpRecvMsg
 (
 CmInetFd               *sockFd,       /* socket file descriptor */ 
 CmInetNetAddr          *srcAddr,      /* source Internet address/port */
-uint16_t                    *port,         /* source port no. */
+uint16_t               *port,         /* source port no. */
 CmInetMemInfo          *meminfo,      /* buffer allocation info */
 Buffer                 **mBuf,         /* buffer structure received */
 MsgLen                 *len,          /* number of octets received */
 CmInetSctpSndRcvInfo   *sinfo,        /* sctp send-receive info */ 
-uint32_t                    *flag,         /* flags */
+uint32_t               *flag,         /* flags */
 CmInetSctpNotification *ntfy        /* notification parameters */
 )
-#else
-S16 cmInetSctpRecvMsg(sockFd, srcAddr, port, meminfo, mBuf, len, 
-                             sinfo, flag, ntfy)
-CmInetFd               *sockFd;       /* socket file descriptor */ 
-CmInetNetAddr          *srcAddr;      /* source Internet address/port */
-uint16_t                    *port;         /* source port no. */
-CmInetMemInfo          *meminfo;      /* buffer allocation info */
-Buffer                 **mBuf;        /* buffer structure received */
-MsgLen                 *len;          /* number of octets received */
-CmInetSctpSndRcvInfo   *sinfo;        /* sctp send-receive info */ 
-uint32_t                    *flag;         /* flags */
-CmInetSctpNotification *ntfy;         /* notification parameters */
-#endif
 {
    S32                        ret;   
    S32                        msgFlags;
@@ -3044,19 +2883,12 @@ CmInetSctpNotification *ntfy;         /* notification parameters */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSctpGetPAddrs
 (
 CmInetFd             *sockFd,       /* socket file descriptor */ 
-uint32_t                   assocId,      /* association id */
+uint32_t             assocId,      /* association id */
 CmInetNetAddrLst     *addrlst       /* peer address list */
 )
-#else
-S16 cmInetSctpGetPAddrs(sockFd, assocId, addrlst)
-CmInetFd             *sockFd;       /* socket file descriptor */ 
-uint32_t                   assocId;      /* association id */
-CmInetNetAddrLst     *addrlst;      /* peer address list */
-#endif
 {
    /* cm_inet_c_001.main_58 : Fix for Klockwork issue */
    S32   cnt;
@@ -3164,21 +2996,13 @@ CmInetNetAddrLst     *addrlst;      /* peer address list */
 *      File:   cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetGetOpt
 (
 CmInetFd *sockFd,               /* socket file descriptor */ 
-uint32_t       level,                /* option level */
-uint32_t       type,                 /* option type */
-Ptr       value                 /* option value */ 
+uint32_t level,                /* option level */
+uint32_t type,                 /* option type */
+Ptr      value                 /* option value */ 
 ) 
-#else
-S16 cmInetGetOpt(sockFd, level, type, value)
-CmInetFd *sockFd;               /* socket file descriptor */ 
-uint32_t       level;                /* option level */
-uint32_t       type;                 /* option type */
-Ptr       value;                /* option value */
-#endif
 {
    socklen_t                len;
    struct sctp_status       status;
@@ -3614,15 +3438,10 @@ Ptr       value;                /* option value */
  *      File:  cm_inet.c
  *
  */
-#ifdef ANSI
 S16 cmInetShutDownSctp
 (
- CmInetFd          *sockFd       /* socket file descriptor */ 
- )
-#else
-S16 cmInetShutDownSctp(sockFd)
-   CmInetFd          *sockFd;       /* socket file descriptor */ 
-#endif
+CmInetFd *sockFd       /* socket file descriptor */ 
+)
 {
    /*cm_inet_c_001.main_58  : fix for klockwork issue */
    S32                    ret;
@@ -3678,19 +3497,13 @@ S16 cmInetShutDownSctp(sockFd)
  *      File:  cm_inet.c
  *
  */
-#ifdef ANSI
 S16 cmInetAbortSctpAssoc
 (
- CmInetFd          *sockFd,       /* socket file descriptor */
- UConnId           assocId          /* Association ID */
- )
-#else
-S16 cmInetAbortSctpAssoc(sockFd, assocId)
-   CmInetFd          *sockFd;       /* socket file descriptor */
-   UConnId           assocId;          /* Association ID */
-#endif
+CmInetFd          *sockFd,       /* socket file descriptor */
+UConnId           assocId          /* Association ID */
+)
 {
-   S32                    ret;
+   S32    ret;
    struct sctp_sndrcvinfo sndRcvInfo;
 
 
@@ -3752,17 +3565,11 @@ S16 cmInetAbortSctpAssoc(sockFd, assocId)
 *
 */
 
-#ifdef ANSI
 S16 cmInetConnect
 (
 CmInetFd   *sockFd,             /* socket file descriptor */
 CmInetAddr *servAddr            /* foreign Internet address/port */  
 )
-#else
-S16 cmInetConnect(sockFd, servAddr)
-   CmInetFd   *sockFd;             /* socket file descriptor */
-   CmInetAddr *servAddr;           /* foreign Internet address/port */  
-#endif
 {
    S32 ret;                     /* temporary return value */
    struct sockaddr_in dstAddr;  /* foreign Internet address/port */
@@ -3915,17 +3722,11 @@ S16 cmInetConnect(sockFd, servAddr)
 *
 */
 
-#ifdef ANSI
 S16 cmInetListen
 (
 CmInetFd *sockFd,               /* socket file descriptor */ 
 S16       backLog               /* max. number of outstandig connections 0..5 */
 )
-#else
-S16 cmInetListen(sockFd, backLog)
-CmInetFd *sockFd;               /* socket file descriptor */ 
-S16       backLog;              /* max. number of outstandig connections 0..5 */
-#endif
 {
    S32 ret;                     /* temporary return value */
 
@@ -3982,19 +3783,12 @@ S16       backLog;              /* max. number of outstandig connections 0..5 */
 *
 */
 
-#ifdef ANSI
 S16 cmInetAccept
 (
 CmInetFd   *sockFd,     /* socket file descriptor */ 
 CmInetAddr *fromAddr,   /* calling Internet address/port */
 CmInetFd   *newSockFd   /* socket file descriptor for new connection*/
 )
-#else
-S16 cmInetAccept(sockFd, fromAddr, newSockFd)
-CmInetFd   *sockFd;     /* socket file descriptor */ 
-CmInetAddr *fromAddr;   /* calling Internet address/port */
-CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
-#endif
 {
    S32 ret;                         /* temporary return value */
    S32 addrLen;                     /* address structure length */
@@ -4139,19 +3933,12 @@ CmInetFd   *newSockFd;  /* socket file descriptor for new connection*/
 *
 */
 
-#ifdef ANSI
 static S16 cmInet4FillTos
 (
 uint8_t  tos,        /* tos value to be filled in ipheader */
 uint8_t  *cmsgBuf,   /* flat buffer where to build ext hdrs */
 uint32_t *curMsgIdx  /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 )
-#else
-static S16 cmInet4FillTos(tos, cmsgBuf, curMsgIdx, protType)
-uint8_t   tos;       /* tos value to be filled in ipheader */
-uint8_t  *cmsgBuf;   /* flat buffer where to build ext hdrs */
-uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
-#endif /* ANSI */
 {
    struct cmsghdr *tempHdr;
    uint8_t     len;
@@ -4210,7 +3997,6 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 *
 */
 
-#ifdef ANSI
 S16 cmInetSendDscpMsg
 (
 CmInetFd       *sockFd,         /* socket file descriptor */
@@ -4222,17 +4008,6 @@ MsgLen         *len,            /* number of actually sent octets */
 CmInetIpHdrParm *ipHdrParams,   /* IPv6 extensions headers */
 S16             flags           /* additional control flags, unused */
 )
-#else
-/* added for IPv6 ext hdr */
-S16 cmInetSendDscpMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags)
-CmInetFd       *sockFd;         /* socket file descriptor */
-CmInetAddr     *dstAddr;        /* destination Internet address/port */
-CmInetMemInfo  *info;           /* buffer allocation info */
-Buffer         *mBuf;           /* buffer structure to send */
-MsgLen         *len;            /* number of actually sent octets */
-CmInetIpHdrParm *ipHdrParams;   /* IPv6 extensions headers */
-S16             flags;          /* additional control flags, unused */
-#endif /* ANSI */
 {
 #if (defined(WIN32) || defined(CMINETFLATBUF))
    S32     ret;                 /* temporary return value */
@@ -4708,7 +4483,6 @@ S16             flags;          /* additional control flags, unused */
 *
 */
 
-#ifdef ANSI
 S16 cmInetSendMsg
 (
 CmInetFd       *sockFd,         /* socket file descriptor */
@@ -4722,27 +4496,6 @@ CmInetIpHdrParm *ipHdrParams,   /* IPv6 extensions headers */
 #endif /* IPV6_OPTS_SUPPORTED */
 S16             flags           /* additional control flags, unused */
 )
-#else
-/* added for IPv6 ext hdr */
-#ifdef IPV6_OPTS_SUPPORTED
-S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags)
-CmInetFd       *sockFd;         /* socket file descriptor */
-CmInetAddr     *dstAddr;        /* destination Internet address/port */
-CmInetMemInfo  *info;           /* buffer allocation info */
-Buffer         *mBuf;           /* buffer structure to send */
-MsgLen         *len;            /* number of actually sent octets */
-CmInetIpHdrParm *ipHdrParams;   /* IPv6 extensions headers */
-S16             flags;          /* additional control flags, unused */
-#else
-S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, flags)
-CmInetFd       *sockFd;         /* socket file descriptor */
-CmInetAddr     *dstAddr;        /* destination Internet address/port */
-CmInetMemInfo  *info;           /* buffer allocation info */
-Buffer         *mBuf;           /* buffer structure to send */
-MsgLen         *len;            /* number of actually sent octets */
-S16             flags;          /* additional control flags, unused */
-#endif /* IPV6_OPTS_SUPPORTED */
-#endif /* ANSI */
 {
 #if (defined(WIN32) || defined(CMINETFLATBUF))
    S32     ret;                 /* temporary return value */
@@ -5203,7 +4956,6 @@ S16             flags;          /* additional control flags, unused */
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6BuildSendPktinfo
 (
 CmInetIpAddr6 *srcAddr, /* src ip addr to set on outgoing packet */
@@ -5211,13 +4963,6 @@ uint8_t  *cmsgBuf,   /* flat buffer where to build ext hdrs */
 uint32_t *curMsgIdx, /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 uint8_t   protType   /* whether IPv4/IPv6 socket */
 )
-#else
-static S16 cmInet6BuildSendPktinfo(srcAddr, cmsgBuf, curMsgIdx, protType)
-CmInetIpAddr6 *srcAddr; /* src ip addr to set on outgoing packet */
-uint8_t  *cmsgBuf;   /* flat buffer where to build ext hdrs */
-uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
-uint8_t   protType;  /* whether IPv4/IPv6 socket */
-#endif /* ANSI */
 {
    struct cmsghdr *tempHdr;
    struct in6_pktinfo *ipv6Pktinfo;
@@ -5320,19 +5065,12 @@ uint8_t   protType;  /* whether IPv4/IPv6 socket */
 *
 */
 
-#ifdef ANSI
 static S16 cmInetBuildSendHoplimit
 (
 uint32_t   hoplimit,  /* the hoplimit value to be set on outgoing packet */
 uint8_t  *cmsgBuf,   /* flat buffer where to build ext hdrs */
 uint32_t *curMsgIdx  /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 )
-#else
-static S16 cmInetBuildSendHoplimit(hoplimit, cmsgBuf, curMsgIdx)
-uint32_t  hoplimit;  /* the hoplimit value to be sent on outgoing packet */
-uint8_t  *cmsgBuf;   /* flat buffer where to build ext hdrs */
-uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
-#endif /* ANSI */
 {
    struct cmsghdr *tempHdr; 
    uint8_t    len;
@@ -5390,7 +5128,6 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6BuildSendHBHOpts
 (
 CmInetIpv6HBHHdrArr *hbhOptsArr,/* IPv6 extensions headers HBH/Dest opts */
@@ -5398,13 +5135,6 @@ uint8_t *cmsgBuf,                    /* flat buffer where to build ext hdrs */
 uint32_t *curMsgIdx,                 /* idx in cmsgBuf where HBH/Dest ext hdr ends */
 uint8_t hdrId                        /* 0: HBH hdr, 1:Dest Hdr */
 )
-#else
-static S16 cmInet6BuildSendHBHOpts(hbhOptsArr, cmsgBuf, curMsgIdx, hdrId)
-CmInetIpv6HBHHdrArr *hbhOptsArr;/* IPv6 extensions headers HBH/Dest opts */
-uint8_t *cmsgBuf;                    /* flat buffer where to build ext hdrs */
-uint32_t *curMsgIdx;                 /* idx in cmsgBuf where HBH/Dest ext hdr ends */
-uint8_t hdrId;                       /* 0: HBH hdr, 1:Dest Hdr */
-#endif
 {
    struct cmsghdr *tempHdr; 
    uint8_t    len;
@@ -5512,19 +5242,12 @@ uint8_t hdrId;                       /* 0: HBH hdr, 1:Dest Hdr */
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6BuildSendRouteOpts
 (
 CmInetIpv6RtHdr *rtOptsArr,  /* IPv6 destination options array */
 uint8_t *cmsgBuf,                 /* flat buffer where to build ext hdrs */
 uint32_t *curMsgIdx               /* idx in cmsgBuf where to start building RT hdr */
 )
-#else
-static S16 cmInet6BuildSendRouteOpts(rtOptsArr, cmsgBuf, curMsgIdx)
-CmInetIpv6RtHdr *rtOptsArr;  /* IPv6 destination options array */
-uint8_t *cmsgBuf;                 /* flat buffer where to build ext hdrs */
-uint32_t *curMsgIdx;              /* idx in cmsgBuf where to start building RT hd */
-#endif /* ANSI */
 {
    struct cmsghdr *tempHdr;
    CmInetIpv6RtHdr0 *tempRtHdr;
@@ -5607,7 +5330,6 @@ uint32_t *curMsgIdx;              /* idx in cmsgBuf where to start building RT h
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6BuildRecvHopOptsArr
 (
 uint8_t *cmsgData,                    /* flat buffer where to build ext hdrs */
@@ -5616,15 +5338,6 @@ CmInetIpv6HBHHdrArr *hbhOptsArr, /* IPv6 extensions headers */
 uint8_t hdrId,                        /* 0: HBH, 1: DEST */
 CmInetMemInfo   *info            /* Memory information */
 )
-#else
-static S16 cmInet6BuildRecvHopOptsArr(cmsgData, hbhDataLen, hbhOptsArr, hdrId, 
-                                      info)
-uint8_t *cmsgData;                    /* flat buffer where to build ext hdrs  */
-uint32_t hbhDataLen;                  /* byte len of cmsghdr + hbh ancil data */
-CmInetIpv6HBHHdrArr *hbhOptsArr; /* IPv6 extensions headers */
-uint8_t hdrId;                        /* 0: HBH, 1: DEST */
-CmInetMemInfo   *info;           /* Memory information */
-#endif /* ANSI */
 {
    uint32_t curDataIdx;       /* to keep track where we are in the hbh Data */
    uint8_t  optsIdx;          /* how many hbh opts present in data */
@@ -5821,7 +5534,6 @@ CmInetMemInfo   *info;           /* Memory information */
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6BuildRecvRtHdr
 (
 uint8_t *cmsgData,              /* flat buffer where to build Route hdr */ 
@@ -5830,14 +5542,6 @@ CmInetIpv6RtHdr0 *rtHdr0,  /* rtHeader0 struct that precedes IPV6 addrss */
 CmInetIpv6RtHdr *rtOptsArr,/* IPv6 extensions headers */
 CmInetMemInfo   *info      /* Memory information */
 )
-#else
-static S16 cmInet6BuildRecvRtHdr(cmsgData, rtDataLen, rtHdr0, rtOptsArr, info)
-uint8_t *cmsgData;              /* flat buffer where to build Route hdr */
-uint32_t rtDataLen;             /* byte len of cmsghdr struc+rtHdr ancil data */
-CmInetIpv6RtHdr0 *rtHdr0;  /* rtHeader0 struct that precedes IPV6 addrss */
-CmInetIpv6RtHdr *rtOptsArr;/* IPv6 extensions headers */
-CmInetMemInfo   *info;     /* Memory information */
-#endif /* ANSI */
 {
    uint32_t curDataIdx;         /* to keep track where we are in hbh Data */
    uint8_t i;                   /* loop counter */
@@ -5919,19 +5623,12 @@ CmInetMemInfo   *info;     /* Memory information */
 *
 */
 
-#ifdef ANSI
 static S16 cmInet6GetHopLimitValue
 (
 uint8_t *cmsgData,        /* flat buffer where to build ext hdrs */
 uint32_t hopLimitDataLen, /* byte len of cmsghdr + hbh ancil data */
 CmInetIpv6HdrParm *ipv6HdrParam /* ipv6 header parameters */ 
 )
-#else
-static S16 cmInet6GetHopLimitValue(cmsgData, hopLimitDataLen, ipv6HdrParam)
-uint8_t *cmsgData;         /* flat buffer where to build ext hdrs */
-uint32_t hopLimitDataLen;  /* byte len of cmsghdr + hbh ancil data */
-CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */
-#endif /* ANSI */
 {
    uint16_t curDataIdx;       /* to keep track where we are in the ancillary Data */
    uint32_t *hopLimitValue;   /* ttl/hoplimit value */
@@ -5985,7 +5682,6 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetRecvMsg
 (
 CmInetFd        *sockFd,        /* socket file descriptor */ 
@@ -6002,51 +5698,6 @@ CmInetLocalInf  *localIf,       /* local interface on which pkt was recvd */
 #endif /* LOCAL_INTF */ 
 S32              flags          /* additional control flags */
 )
-#else
-/*  added for IPv6 */
-#ifdef IPV6_OPTS_SUPPORTED
-#ifdef LOCAL_INTF
-S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len,
-      ipHdrParams, localIf, flags)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-CmInetMemInfo   *info;          /* buffer allocation info */
-Buffer         **mPtr;          /* received buffer structure */
-MsgLen          *len;           /* number of octets to read */ 
-CmInetIpHdrParm *ipHdrParams;   /* IPv6 extensions headers */
-CmInetLocalInf  *localIf;       /* local interface on which pkt was recvd */
-S32              flags;         /* additional control flags */
-#else
-S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, ipHdrParams, flags)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-CmInetMemInfo   *info;          /* buffer allocation info */
-Buffer         **mPtr;          /* received buffer structure */
-MsgLen          *len;           /* number of octets to read */ 
-CmInetIpHdrParm *ipHdrParams;   /* IPv6 extensions headers */
-S32              flags;         /* additional control flags */
-#endif /* LOCAL_INTF */
-#else
-#ifdef LOCAL_INTF
-S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, localIf, flags)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-CmInetMemInfo   *info;          /* buffer allocation info */
-Buffer         **mPtr;          /* received buffer structure */
-MsgLen          *len;           /* number of octets to read */ 
-CmInetLocalInf  *localIf;       /* local interface on which pkt was recvd */
-S32              flags;         /* additional control flags */
-#else
-S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, flags)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-CmInetMemInfo   *info;          /* buffer allocation info */
-Buffer         **mPtr;          /* received buffer structure */
-MsgLen          *len;           /* number of octets to read */ 
-S32              flags;         /* additional control flags */
-#endif /* LOCAL_INTF */
-#endif /* IPV6_OPTS_SUPPORTED */
-#endif /* ANSI */
 {
 #if (defined(WIN32) || defined(CMINETFLATBUF))
    S32           ret;            /* temporary return value */
@@ -7063,25 +6714,15 @@ S32              flags;         /* additional control flags */
  *      File:  cm_inet.c
  */
 
-#ifdef ANSI
 S16 cmInetPeekNew
 (
- CmInetFd        *sockFd,        /* socket file descriptor */ 
- CmInetAddr      *fromAddr,      /* sender Internet address/port */ 
- CmInetMemInfo   *info,          /* buffer allocation info */
- MsgLen           dataPos,       /* position of data */
- MsgLen           dataLen,       /* length of read data */
- Data            *data           /* read data */
- )
-#else
-S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
-   CmInetFd        *sockFd;        /* socket file descriptor */ 
-   CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-   CmInetMemInfo   *info;          /* buffer allocation info */
-   MsgLen           dataPos;       /* position of data */
-   MsgLen           dataLen;       /* length of read data */
-   Data            *data;          /* read data */
-#endif
+CmInetFd        *sockFd,        /* socket file descriptor */ 
+CmInetAddr      *fromAddr,      /* sender Internet address/port */ 
+CmInetMemInfo   *info,          /* buffer allocation info */
+MsgLen           dataPos,       /* position of data */
+MsgLen           dataLen,       /* length of read data */
+Data            *data           /* read data */
+)
 {
    /* cm_inet_c_001.main_57 - Fix for validation and compilation warning */
    S32          recvLen;           /* number of received octets */
@@ -7244,7 +6885,6 @@ S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data)
 *
 */
 
-#ifdef ANSI
 S16 cmInetPeek
 (
 CmInetFd        *sockFd,        /* socket file descriptor */ 
@@ -7254,15 +6894,6 @@ MsgLen           dataPos,       /* position of data */
 MsgLen           dataLen,       /* length of read data */
 Data            *data           /* read data */
 )
-#else
-S16 cmInetPeek(sockFd, fromAddr, info, dataPos, dataLen, data)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-CmInetAddr      *fromAddr;      /* sender Internet address/port */ 
-CmInetMemInfo   *info;          /* buffer allocation info */
-MsgLen           dataPos;       /* position of data */
-MsgLen           dataLen;       /* length of read data */
-Data            *data;          /* read data */
-#endif
 {
    /* cm_inet_c_001.main_54: Fix for Klockworks issue */
    Data        *recvBuf = NULLP;   /* plain receive buffer */
@@ -7534,15 +7165,10 @@ Data            *data;          /* read data */
 *
 */
 
-#ifdef ANSI
 S16 cmInetClose
 (
 CmInetFd *sockFd                /* socket file descriptor */
 )
-#else
-S16 cmInetClose(sockFd)
-CmInetFd *sockFd;               /* socket file descriptor */
-#endif
 {
    S32 ret;                     /* temporary return value */
 
@@ -7607,17 +7233,11 @@ CmInetFd *sockFd;               /* socket file descriptor */
 *
 */
 
-#ifdef ANSI
 S16 cmInetShutdown
 (
 CmInetFd *sockFd,               /* socket file descriptor */
 S32       howTo                 /* operation flag */
 )
-#else
-S16 cmInetShutdown(sockFd, howTo)
-CmInetFd *sockFd;               /* socket file descriptor */
-S32       howTo;                /* operation flag */
-#endif
 {
    S32 ret;                     /* temporary return value */
 
@@ -7684,21 +7304,13 @@ S32       howTo;                /* operation flag */
 *
 */
 
-#ifdef ANSI
 S16 cmInetSelect
 (
 CmInetFdSet *readFdS,           /* read socket descriptor file set */  
 CmInetFdSet *writeFdS,          /* write socket descriptor file set */
-uint32_t         *mSecTimeout,       /* timeout in msecs */
+uint32_t    *mSecTimeout,       /* timeout in msecs */
 S16         *numFdS             /* number of ready descriptors */
 )
-#else
-S16 cmInetSelect(readFdS, writeFdS, mSecTimeout, numFdS)
-CmInetFdSet *readFdS;           /* read socket descriptor file set */  
-CmInetFdSet *writeFdS;          /* write socket descriptor file set */
-uint32_t         *mSecTimeout;       /* timeout in msecs */
-S16         *numFdS;            /* number of ready descriptors */
-#endif
 {
    S32 ret;                     /* temporary return value */
    struct timeval  timeout;     /* timeout structure */
@@ -7936,21 +7548,13 @@ S16         *numFdS;            /* number of ready descriptors */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetSetOpt
 (
 CmInetFd *sockFd,               /* socket file descriptor */ 
-uint32_t       level,                /* option level */
-uint32_t       type,                 /* option type */
-Ptr       value                 /* option value */ 
+uint32_t level,                /* option level */
+uint32_t type,                 /* option type */
+Ptr      value                 /* option value */ 
 ) 
-#else
-S16 cmInetSetOpt(sockFd, level, type, value)
-CmInetFd *sockFd;               /* socket file descriptor */ 
-uint32_t       level;                /* option level */
-uint32_t       type;                 /* option type */
-Ptr       value;                /* option value */
-#endif
 {
    S32  ret = ROK;              /* temporary return value */
    uint32_t  disable = 0;            /* disable option */
@@ -8912,19 +8516,12 @@ Ptr       value;                /* option value */
 *
 */
 
-#ifdef ANSI
 S16 cmInetGetNumRead
 (
 CmInetFd *sockFd,               /* socket file descriptor */
 uint32_t      *dataLen               /* number of pending octets */
 /* removed 3rd argument memInfo */
 )
-#else
-S16 cmInetGetNumRead(sockFd, dataLen)
-CmInetFd *sockFd;               /* socket file descriptor */
-uint32_t      *dataLen;              /* number of pending octets */
-/* removed 3rd argument memInfo */
-#endif
 {
    S32 ret;                     /* temporary return value */
 
@@ -9042,17 +8639,11 @@ uint32_t      *dataLen;              /* number of pending octets */
 *
 */
  
-#ifdef ANSI
 S16 cmInetGetHostByName
 (
 S8              *hostName,         /* host name */  
 CmInetIpAddrTbl *addrTbl           /* Address Table of IPV4 Addresses */
 )
-#else
-S16 cmInetGetHostByName (hostName, addrTbl)
-S8              *hostName;         /* host name */  
-CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
-#endif
 {
 #ifndef SS_VW
    uint8_t            numAddrs;       /* Number of Addresses */
@@ -9200,17 +8791,11 @@ CmInetIpAddrTbl *addrTbl;          /* Address Table of IPV4 Addresses */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetGetIpNodeByName
 (
 S8              *hostName,         /* host name */  
 CmInetIpAddrArr *addrArr           /* Array of addressed filled in */
 )
-#else
-S16 cmInetGetIpNodeByName(hostName, addrArr)
-S8              *hostName;         /* host name */  
-CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
-#endif
 {
    /* for return value from cmInetGetHostByName */
 #ifndef IPV6_SUPPORTED   
@@ -9342,16 +8927,10 @@ CmInetIpAddrArr *addrArr;          /* Array of addressed filled in */
 *
 */
 
-#ifdef ANSI
 S16 cmInetAddr(
 S8           *asciiAddr,        /* ascii address representation */
 CmInetIpAddr *address           /* 4 byte interent address */
 )
-#else
-S16 cmInetAddr(asciiAddr, address)
-S8           *asciiAddr;        /* ascii address representation */
-CmInetIpAddr *address;          /* 4 byte interent address */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -9392,16 +8971,10 @@ CmInetIpAddr *address;          /* 4 byte interent address */
 *
 */
 
-#ifdef ANSI
 S16 cmInetNtoa(
 CmInetIpAddr   address,         /* 4 byte interent address */
 S8           **asciiAddr        /* ascii address representation */
 )
-#else
-S16 cmInetNtoa(address, asciiAddr)
-CmInetIpAddr   address;         /* 4 byte interent address */
-S8           **asciiAddr;       /* ascii address representation */
-#endif
 {
    struct in_addr inetAddr;     /* internet address structure */
 
@@ -9442,20 +9015,12 @@ S8           **asciiAddr;       /* ascii address representation */
 *
 */
 
-#ifdef ANSI
 S16 cmInetNtop(
 uint8_t             type,              /* ip address type */
 Void           *address,         /* 4/16 byte interent address */
 S8             *asciiAddr,      /* ascii adress representation */
 uint32_t            len
 )
-#else
-S16 cmInetNtop(type,address, asciiAddr,len)
-uint8_t             type;              /* ip address type */  
-Void           *address;         /* 4/16 byte interent address */
-S8             *asciiAddr;      /* ascii adress representation */
-uint32_t            len;
-#endif
 {
                              
    S32  domain = 0;
@@ -9508,16 +9073,10 @@ uint32_t            len;
 *
 */
 
-#ifdef ANSI
 S16 cmInetPton(
 CmInetIpAddr  *address,         /* 4 byte interent address */
 S8           *asciiAddr         /* ascii address representation */
 )
-#else
-S16 cmInetPton(address, asciiAddr)
-CmInetIpAddr  *address;         /* 4 byte interent address */
-S8            *asciiAddr;       /* ascii address representation */
-#endif
 {
    S16    ret;
 
@@ -9558,16 +9117,10 @@ S8            *asciiAddr;       /* ascii address representation */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetPton6(
 CmInetIpAddr6  *address6,       /* 16 byte interent address */
 S8             *asciiAddr       /* ascii address representation */
 )
-#else 
-S16 cmInetPton6(address6, asciiAddr)
-CmInetIpAddr6 *address6;        /* 16 byte interent address */
-S8            *asciiAddr;       /* ascii address representation */
-#endif
 {
    S16    ret;
 
@@ -9618,14 +9171,9 @@ S8            *asciiAddr;       /* ascii address representation */
 *
 */
 
-#ifdef ANSI
 S16 cmInetGetMemSize(
 S32 *size                       /* max used memory size */
 )
-#else
-S16 cmInetGetMemSize(size)
-S32 *size;                      /* max used memory size */
-#endif
 {
 #ifdef WIN32
    /* max static memory size depends on max flat buffer size */
@@ -9654,13 +9202,7 @@ S32 *size;                      /* max used memory size */
 *
 */
  
-#ifdef ANSI
-S16 cmInetInit(
-Void
-)
-#else
 S16 cmInetInit(Void)
-#endif
 {
 #ifdef WIN32
    uint16_t     version;
@@ -9696,13 +9238,7 @@ S16 cmInetInit(Void)
 *
 */
  
-#ifdef ANSI
-S16 cmInetDeInit(
-Void
-)
-#else
 S16 cmInetDeInit(Void)
-#endif
 {
 #ifdef WIN32
    S32     err;
@@ -9737,17 +9273,11 @@ S16 cmInetDeInit(Void)
 *
 */
 \f
-#ifdef ANSI
 S16 cmInetGetSockName
 (
 CmInetFd *sockFd,               /* socket file descriptor */ 
 CmInetAddr *locAddr
 ) 
-#else
-S16 cmInetGetSockName(sockFd, locAddr)
-CmInetFd *sockFd;               /* socket file descriptor */ 
-CmInetAddr *locAddr;
-#endif
 {
    struct sockaddr_in *sockAddr; 
 #ifdef IPV6_SUPPORTED
@@ -9868,15 +9398,10 @@ CmInetAddr *locAddr;
 *
 */
 \f
-#ifdef ANSI
 S16 cmInetFdSetInfoInit
 (
 CmInetFdSetInfo *fdSetInfo
 ) 
-#else
-S16 cmInetFdSetInfoInit(fdSetInfo)
-CmInetFdSetInfo *fdSetInfo;
-#endif
 {
 #if (defined(SUNOS) || defined(SS_LINUX) || defined(SS_VW) || defined(HPOS))
    uint16_t   arIdx;
@@ -9963,19 +9488,12 @@ CmInetFdSetInfo *fdSetInfo;
 *
 */
 \f
-#ifdef ANSI
 S16 cmInetGetFd
 (
 CmInetFdSetInfo *fdSetInfo,
 CmInetFdSet     *fdSet,
 CmInetFdType    *sockFd
 ) 
-#else
-S16 cmInetGetFd(fdSetInfo, fdSet, sockFd)
-CmInetFdSetInfo *fdSetInfo;
-CmInetFdSet     *fdSet;
-CmInetFdType    *sockFd;
-#endif
 {
   /*cm_inet_c_001.main_58 : Fix for klockwork issue */
 #if (!defined (WIN32))
@@ -10100,19 +9618,12 @@ CmInetFdType    *sockFd;
 *
 */
 
-#ifdef ANSI
 S16 cmInetConvertStrToIpAddr
 (
 uint16_t                len,                /* Length of IP address */
 uint8_t                 *val,               /* Domain Name String */
 CmInetNetAddr      *address            /* IP Address */
 )
-#else
-S16 cmInetConvertStrToIpAddr(len, val, address)
-uint16_t                len;                /* Length of IP address */
-uint8_t                 *val;               /* Domain Name String */
-CmInetNetAddr      *address;           /* IP Address */
-#endif
 {
    uint8_t              idx;                /* Index for string*/
    uint8_t              ipv4[CM_INET_IPV4ADDR_SIZE]; /* IPV4 Address bytes */
@@ -10322,24 +9833,16 @@ CmInetNetAddr      *address;           /* IP Address */
 *       File:  cm_inet.c
 *
 */
-#ifdef ANSI 
 S16  cmInetAsciiToIpv4
 (
-uint8_t                 numBytes,           /* number of Byte to convert */
-uint8_t                 *ipv4Addr,          /* IPV4 Address */
-uint16_t                len,                /* Length of IP address */
-uint8_t                 *val                /* Domain Name String */
+uint8_t   numBytes,           /* number of Byte to convert */
+uint8_t   *ipv4Addr,          /* IPV4 Address */
+uint16_t  len,                /* Length of IP address */
+uint8_t   *val                /* Domain Name String */
 )
-#else
-S16 cmInetAsciiToIpv4(numBytes, ipv4Addr, len, val)
-uint8_t                 numBytes;           /* number of Byte to convert */
-uint8_t                 *ipv4Addr;          /* IPV4 Address */
-uint16_t                len;                /* Length of IP address */
-uint8_t                 *val;               /* Domain Name String */
-#endif
 {
-   uint8_t              byteCount;          /* Byte Count */
-   uint8_t              idx;                /* Index for string*/
+   uint8_t byteCount;          /* Byte Count */
+   uint8_t idx;                /* Index for string*/
 
 
       idx = 0;
@@ -10385,7 +9888,6 @@ uint8_t                 *val;               /* Domain Name String */
 *
 */
 
-#ifdef ANSI
 S32 cmInetGetAddrInfo
 (
 const S8              *node,          /* Network addr which has to be resolved */
@@ -10393,13 +9895,6 @@ const S8              *service,       /* Sets the port number in network addr */
 const CmInetAddrInfo  *hints,         /* Specifies preferred socket type or protocol */
 CmInetAddrInfo           **res           /* Link list of addrInfo structure */
 )
-#else
-S32 cmInetGetAddrInfo(node,service,hints,res)
-const S8              *node;          /* Network addr which has to be resolved */
-const S8              *service;       /* Sets the port number in network addr */
-const CmInetAddrInfo  *hints;         /* Specifies preferred socket type or protocol */
-CmInetAddrInfo           **res;          /* Link list of addrInfo structure */
-#endif
 {
    S32 ret;
    ret = ROK;
@@ -10449,15 +9944,10 @@ CmInetAddrInfo           **res;          /* Link list of addrInfo structure */
 *
 */
 
-#ifdef ANSI
 Void cmInetFreeAddrInfo
 (
-CmInetAddrInfo           *res           /* Link list of addrInfo structure */
+CmInetAddrInfo *res           /* Link list of addrInfo structure */
 )
-#else
-Void cmInetFreeAddrInfo(res)
-CmInetAddrInfo           *res;          /* Link list of addrInfo structure */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -10493,19 +9983,12 @@ CmInetAddrInfo           *res;          /* Link list of addrInfo structure */
 *      File:  cm_inet.c
 *
 */
-#ifdef ANSI
 S16 cmInetFlushRecvBuf
 (
 CmInetFd        *sockFd,        /* socket file descriptor */ 
 MsgLen          *len,           /* number of octects to be flushed */
 S32              flags          /* additional control flags */
 )
-#else
-S16 cmInetFlushRecvBuf(sockFd, len, flags)
-CmInetFd        *sockFd;        /* socket file descriptor */ 
-MsgLen          *len;           /* number of octects to be flushed */
-S32              flags;         /* additional control flags */
-#endif /* ANSI */
 {
 
    Data recvTempBuf[CM_INET_MAX_BYTES_READ];
index 8503d85..2dd3256 100644 (file)
@@ -196,19 +196,7 @@ Size regMemSize;
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
-uint8_t *cmMemcpy
-(
-uint8_t           *tgt,
-const uint8_t  *src,
-PTR          len
-)
-#else
-uint8_t *cmMemcpy(tgt, src, len)
-uint8_t           *tgt;
-const uint8_t  *src;
-PTR          len;
-#endif
+uint8_t *cmMemcpy(uint8_t *tgt,const uint8_t *src,PTR len)
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 
@@ -261,19 +249,7 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
-S16 cmMemcmp
-(
-const uint8_t     *s1,
-const uint8_t     *s2,
-PTR             len
-)
-#else
-S16 cmMemcmp (s1, s2, len)
-const uint8_t     *s1;
-const uint8_t     *s2;
-PTR             len;
-#endif
+S16 cmMemcmp(const uint8_t *s1,const uint8_t *s2,PTR len)
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #if MEMCMP_AVAIL /* memcmp is available */
@@ -309,19 +285,7 @@ PTR             len;
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
-uint8_t *cmMemset
-(
-uint8_t           *str,
-uint8_t           val,
-PTR          len
-)
-#else
-uint8_t *cmMemset(str, val, len)
-uint8_t           *str;
-uint8_t           val;
-PTR          len;
-#endif
+uint8_t *cmMemset(uint8_t *str,uint8_t val,PTR len)
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #if MS_MBUF_CORRUPTION /* checking for valid memory address */
@@ -387,17 +351,7 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
-S16 cmStrcmp
-(
-const uint8_t *s1,
-const uint8_t *s2
-)
-#else
-S16 cmStrcmp (s1, s2)
-const uint8_t *s1;
-const uint8_t *s2;
-#endif
+S16 cmStrcmp(const uint8_t *s1,const uint8_t *s2)
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #if (STRCMP_AVAIL)
@@ -451,19 +405,12 @@ const uint8_t *s2;
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
 S16 cmStrncmp
 (
 const uint8_t  *s1,
 const uint8_t  *s2,
 MsgLen       len /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
 )
-#else
-S16 cmStrncmp (s1, s2, len)
-const uint8_t  *s1;
-const uint8_t  *s2;
-MsgLen       len;
-#endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #if (STRNCMP_AVAIL)
@@ -505,16 +452,7 @@ MsgLen       len;
 *       File:  cm_lib.c
 *
 */
-#ifdef ANSI
-MsgLen cmStrlen
-(
-const uint8_t *s
-)
-#else
-/* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
-MsgLen cmStrlen (s)
-const uint8_t *s;
-#endif
+MsgLen cmStrlen(const uint8_t *s)
 {
 #if (STRLEN_AVAIL)
    /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/
index e9f070d..1cc4092 100644 (file)
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 Void cmLListInit
 (
 CmLListCp *lCp                /* list control point */
 )
-#else 
-Void cmLListInit(lCp)
-CmLListCp *lCp;               /* list control point */
-#endif
 {
    
    lCp->first = (CmLList *)NULLP;
@@ -95,17 +90,11 @@ CmLListCp *lCp;               /* list control point */
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 Void cmLListAdd2Head
 (
 CmLListCp *lCp,               /* list control point */
 CmLList   *node               /* node to be added */
 )
-#else 
-Void cmLListAdd2Head(lCp, node)
-CmLListCp *lCp;               /* list control point */
-CmLList   *node;              /* node to be added */
-#endif
 {
 
 #ifdef ERRCHK
@@ -143,17 +132,11 @@ CmLList   *node;              /* node to be added */
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 Void cmLListAdd2Tail
 (
 CmLListCp *lCp,               /* list control point */
 CmLList   *node               /* node to be added */
 )
-#else 
-Void cmLListAdd2Tail(lCp, node)
-CmLListCp *lCp;               /* list control point */
-CmLList   *node;              /* node to be added */
-#endif
 {
 
 #ifdef ERRCHK
@@ -191,17 +174,11 @@ CmLList   *node;              /* node to be added */
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 Void cmLListInsCrnt
 (
 CmLListCp *lCp,               /* list control point */
 CmLList   *node               /* node to be added */
 )
-#else 
-Void cmLListInsCrnt(lCp, node)
-CmLListCp *lCp;               /* list control point */
-CmLList   *node;              /* node to be added */
-#endif
 {
 
 #ifdef ERRCHK
@@ -245,17 +222,11 @@ CmLList   *node;              /* node to be added */
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 Void cmLListInsAfterCrnt
 (
 CmLListCp *lCp,               /* list control point */
 CmLList   *node               /* node to be added */
 )
-#else 
-Void cmLListInsAfterCrnt(lCp, node)
-CmLListCp *lCp;               /* list control point */
-CmLList   *node;              /* node to be added */
-#endif
 {
 
 #ifdef ERRCHK
@@ -301,17 +272,11 @@ CmLList   *node;              /* node to be added */
 *       File:  cm_llist.c
 *
 */
-#ifdef ANSI
 CmLList *cmLListDelFrm
 (
 CmLListCp *lCp,                /* list control pointer */
 CmLList *node                  /* node to be removed */
 )
-#else 
-CmLList *cmLListDelFrm(lCp, node)
-CmLListCp *lCp;               /* list control pointer */
-CmLList *node;                /* node to be removed */
-#endif
 {
   
 #ifdef ERRCHK
@@ -370,17 +335,11 @@ CmLList *node;                /* node to be removed */
   *       File:  cm_llist.c
   *
   --*/
-#ifdef ANSI
 Void cmLListCatLList
 (
- CmLListCp *list1,              /*-- list control point --*/
- CmLListCp *list2               /*-- node to be added --*/
- )
-#else 
-Void cmLListCatLList(list1, list2)
-   CmLListCp *list1;              /*-- list control point --*/
-   CmLListCp *list2;              /*-- node to be added --*/
-#endif
+CmLListCp *list1,              /*-- list control point --*/
+CmLListCp *list2               /*-- node to be added --*/
+)
 {
 
    /*-- if the second list is empty nothing to do --*/
index 8a08904..3c8e706 100755 (executable)
@@ -88,17 +88,7 @@ uint32_t cmLteTime;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
 
@@ -126,17 +116,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLteRlcId
-(
-CmLteRlcId *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLteRlcId(param, mBuf)
-CmLteRlcId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 {
 
 
@@ -164,17 +144,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
@@ -201,17 +171,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLteTimingInfo
-(
-CmLteTimingInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLteTimingInfo(param, mBuf)
-CmLteTimingInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
@@ -238,17 +198,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmPkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
 
@@ -276,17 +226,7 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkLtePdcpId
-(
-CmLtePdcpId *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkLtePdcpId(param, mBuf)
-CmLtePdcpId *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
 
@@ -297,15 +237,7 @@ Buffer *mBuf;
    return ROK;
 }
 #ifdef LTE_L2_MEAS 
-#ifdef ANSI
-S16 cmUpdateSsiMemInfo
-(
-CmLteMemInfo *mInfo
-)
-#else
-S16 cmUpdateSsiMemInfo(mInfo)
-CmLteMemInfo *mInfo;
-#endif
+S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo)
 {
    uint8_t   numReg = 0;
    uint8_t   numPool = 0;
@@ -349,17 +281,7 @@ CmLteMemInfo *mInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmFillMemUtilizationMeas
-(
- CmLteMemInfo *memoryInfo,
-CmLteMemInfo *memInfo
-)
-#else
-S16 cmFillMemUtilizationMeas(memoryInfo,memInfo)
-CmLteMemInfo *memoryInfo;
-CmLteMemInfo *memInfo;
-#endif
+S16 cmFillMemUtilizationMeas( CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo)
 {
    uint8_t idxReg = 0;
    uint8_t idxPool = 0;
@@ -384,15 +306,7 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearMemUtilizationCounter
-(
-CmLteMemInfo *memInfo
-)
-#else
-S16 cmClearMemUtilizationCounter(memInfo)
-CmLteMemInfo *memInfo;
-#endif
+S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo)
 {
    uint8_t idxReg = 0;
    uint8_t idxPool = 0;
@@ -416,15 +330,7 @@ CmLteMemInfo *memInfo;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmClearCpuUtilizationCounter
-(
-CmCpuStatsInfo *cpuInfo
-)
-#else
-S16 cmClearCpuUtilizationCounter(cpuInfo)
-CmCpuStatsInfo *cpuInfo
-#endif
+S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo)
 {
    uint8_t idx= 0;
    for(idx=0; idx < cpuInfo->numCores; idx++)
@@ -437,17 +343,7 @@ CmCpuStatsInfo *cpuInfo
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmFillCpuUtilizationMeas
-(
-CmLteCpuInfo *cpuMeasInfo,
-CmCpuStatsInfo *cpuInfo
-)
-#else
-S16 cmFillCpuUtilizationMeas(cpuMeasInfo,cpuInfo)
-CmLteCpuInfo *cpuMeasInfo;
-CmCpuStatsInfo *cpuInfo;
-#endif
+S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo)
 {
    uint8_t idx= 0;
    cpuMeasInfo->numCores = cpuInfo->numCores;
index 052043c..3a2e272 100755 (executable)
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-uint32_t cmAbs
-(
-F64          val
-)
-#else
-uint32_t cmAbs(val)
-F64          val;
-#endif
+uint32_t cmAbs(F64  val)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
    return ((uint32_t) abs((int) val));/* G++ */
@@ -92,17 +84,7 @@ F64          val;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-F64 cmPow
-(
-F64          x,
-F64          y
-)
-#else
-F64 cmPow(x, y)
-F64           x;
-F64           y;
-#endif
+F64 cmPow(F64 x,F64 y)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
    return ((F64) pow((F64)x, (F64)y));
@@ -125,15 +107,7 @@ F64           y;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-F64 cmFloor
-(
-F64          x
-)
-#else
-F64 cmFloor(x)
-F64           x;
-#endif
+F64 cmFloor(F64  x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
    return ((F64) floor((F64)x));
@@ -156,15 +130,7 @@ F64           x;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-F64 cmLog
-(
-F64          x
-)
-#else
-F64 cmLog(x)
-F64           x;
-#endif
+F64 cmLog(F64 x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
    return ((F64) log((F64)x));
@@ -187,15 +153,7 @@ F64           x;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-F64 cmLog10
-(
-F64          x
-)
-#else
-F64 cmLog10(x)
-F64           x;
-#endif
+F64 cmLog10(F64 x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
    return ((F64) log10((F64)x));
index fe78a73..630c62c 100644 (file)
@@ -83,7 +83,6 @@ static Void cmAddMemNode ARGS((CmMemListCp *lCp,CmMemList *node));
 *
 */
   
-#ifdef ANSI
 S16 cmAllocEvnt
 (
 Size            evntSize,    /* Size of the Event structure */
@@ -91,13 +90,6 @@ Size            maxBlkSize,  /* Chunk Memory size */
 Mem             *sMem,       /* Static memory region and pool */
 Ptr             *ptr         /* Location to place allocated event ptr */
 )
-#else
-S16 cmAllocEvnt (evntSize,maxBlkSize,sMem,ptr)
-Size            evntSize;   /* Size of the Event structure */
-Size            maxBlkSize; /* Memory size requested */
-Mem             *sMem;      /* Static Memory region and pool */
-Ptr             *ptr;       /* Location to place allocated event ptr */
-#endif
 {
 
   Data          *allocPtr;  /* Allocated Memory Pointer */
@@ -199,22 +191,14 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
 *
 */
   
-#ifdef ANSI
 Void cmInitMemCp
 (
 CmMemListCp     *memCp,     /* Memory control pointer */
 Size            maxBlkSize, /* Chunk Memory size */
 Mem             *sMem       /* Static memory region and pool */
 )
-#else
-Void cmInitMemCp (memCp,maxBlkSize,sMem)
-CmMemListCp     *memCp;     /* Memory control pointer */
-Size            maxBlkSize; /* Memory size requested */
-Mem             *sMem;      /* Static Memory region and pool */
-#endif
 {
 
-
   /* Intialise Memory Control Point */
   CM_INIT_MEMCP(memCp,maxBlkSize,sMem);
 
@@ -238,19 +222,12 @@ Mem             *sMem;      /* Static Memory region and pool */
 *
 */
   
-#ifdef ANSI
 S16 cmGetMem
 (
 Ptr           memPtr,    /* Pointer to memCp */
 Size          size,      /* Memory size requested */
 Ptr           *allocPtr  /* location to place pointer */
 )
-#else
-S16 cmGetMem (memPtr,size,allocPtr)
-Ptr          memPtr;    /* Pointer to memCp */
-Size         size;      /* Memory size requested */
-Ptr          *allocPtr; /* location to place pointer */
-#endif
 {
  
   CmMemCb   *cb;       /* Pointer to Memory Control Block */
@@ -356,7 +333,6 @@ Ptr          *allocPtr; /* location to place pointer */
 *
 */
   
-#ifdef ANSI
 S16 cmAllocEvntNoInit
 (
 Size            evntSize,    /* Size of the Event structure */
@@ -364,13 +340,6 @@ Size            maxBlkSize,  /* Chunk Memory size */
 Mem             *sMem,       /* Static memory region and pool */
 Ptr             *ptr         /* Location to place allocated event ptr */
 )
-#else
-S16 cmAllocEvntNoInit (evntSize,maxBlkSize,sMem,ptr)
-Size            evntSize;   /* Size of the Event structure */
-Size            maxBlkSize; /* Memory size requested */
-Mem             *sMem;      /* Static Memory region and pool */
-Ptr             *ptr;       /* Location to place allocated event ptr */
-#endif
 {
 
   Data          *allocPtr;  /* Allocated Memory Pointer */
@@ -459,19 +428,12 @@ Ptr             *ptr;       /* Location to place allocated event ptr */
 *
 */
   
-#ifdef ANSI
 S16 cmGetMemNoInit
 (
 Ptr           memPtr,    /* Pointer to memCp */
 Size          size,      /* Memory size requested */
 Ptr           *allocPtr  /* location to place pointer */
 )
-#else
-S16 cmGetMemNoInit (memPtr,size,allocPtr)
-Ptr          memPtr;    /* Pointer to memCp */
-Size         size;      /* Memory size requested */
-Ptr          *allocPtr; /* location to place pointer */
-#endif
 {
  
   CmMemCb   *cb;       /* Pointer to Memory Control Block */
@@ -578,15 +540,10 @@ Ptr          *allocPtr; /* location to place pointer */
 *
 */
   
-#ifdef ANSI
 Void cmFreeMem
 (
 Ptr    memPtr      /* Link List CP */
 )
-#else
-Void cmFreeMem (memPtr)
-Ptr    memPtr;     /* Link List CP */
-#endif
 {
   Mem         sMem;      /* Static Memory region and pool */
   S32         count;     /* Count of linked blocks */ 
@@ -650,17 +607,11 @@ Ptr    memPtr;     /* Link List CP */
 *       File:  cm_mblk.c
 *
 */
-#ifdef ANSI
 static Void cmAddMemNode
 (
 CmMemListCp *lCp,               /* list control point */
 CmMemList   *node               /* node to be added */
 )
-#else 
-static Void cmAddMemNode (lCp, node)
-CmMemListCp *lCp;               /* list control point */
-CmMemList   *node;              /* node to be added */
-#endif
 {
 
    lCp->count++;
@@ -697,17 +648,11 @@ CmMemList   *node;              /* node to be added */
 *
 */
   
-#ifdef ANSI
 Void cmGetMemStatus
 (
 Ptr             memPtr,    /* Memory control pointer */
 CmMemStatus     *status    /* memory region,pool and status */
 )
-#else
-Void cmGetMemStatus (memPtr,status)
-Ptr             memPtr;   /* Memory control pointer */
-CmMemStatus     *status;  /* memory region,pool and status */
-#endif
 {
 
   CmMemListCp *memCp;    /* Memory Link List */
index 6bda4fb..4ef65d6 100755 (executable)
@@ -461,23 +461,11 @@ uint32_t cmDblFreeAttempts = 0;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-S16 cmMmRegInit
-(
-Region       region,
-CmMmRegCb   *regCb,
-CmMmRegCfg  *cfg
-)
-#else
-S16 cmMmRegInit(region, regCb, cfg)
-Region       region;
-CmMmRegCb   *regCb;
-CmMmRegCfg  *cfg;
-#endif
+S16 cmMmRegInit(Region region,CmMmRegCb *regCb,CmMmRegCfg  *cfg)
 {
    Data *memAddr;
-   uint16_t   bktIdx;
-   uint16_t   lstMapIdx;
+   uint16_t bktIdx;
+   uint16_t lstMapIdx;
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    Size  lstQnSize;
@@ -797,15 +785,7 @@ CmMmRegCfg  *cfg;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-S16 cmMmRegDeInit
-(
-CmMmRegCb   *regCb
-)
-#else
-S16 cmMmRegDeInit(regCb)
-CmMmRegCb   *regCb;
-#endif
+S16 cmMmRegDeInit(CmMmRegCb   *regCb)
 {
    uint16_t  bktIdx; 
 
@@ -927,144 +907,82 @@ int regFreeBktSts[10][2][6]={{0}};
 /* cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size         *size,
 uint32_t     flags,
-Data  **ptr,
+Data         **ptr,
 uint32_t     memType,
 uint32_t     line,
 uint8_t     *fileName,
 uint8_t      entId,
-Bool    hstReg
+Bool         hstReg
 )
 #else
-static S16  cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size         *size,
 uint32_t     flags,
-Data  **ptr,
+Data         **ptr,
 uint32_t     line,
-uint8_t     *fileName,
+uint8_t      *fileName,
 uint8_t      entId,
-Bool    hstReg
+Bool         hstReg
 )
-#else
-static S16  cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 #else
 #ifdef SS_LIGHT_MEM_LEAK_STS
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size         *size,
 uint32_t     flags,
-Data  **ptr,
+Data         **ptr,
 uint32_t     memType,
 uint32_t     lineNo,
-uint8_t     *funcName
+uint8_t      *funcName
 )
-#else
-static S16  cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-uint32_t     lineNo;
-uint8_t     *funcName;
-#endif
 #else /*SS_LIGHT_MEM_LEAK_STS */
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size                *size,
 uint32_t     flags,
-Data  **ptr,
+Data         **ptr,
 uint32_t     memType
 )
 #else
-static S16  cmAlloc(regionCb, size, flags, ptr, memType)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-#endif
-#else
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size         *size,
 uint32_t     flags,
-Data  **ptr,
+Data         **ptr,
 uint32_t     memType
 )
 #else
-static S16  cmAlloc(regionCb, size, flags, ptr, memType)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-#endif
-#else
 #ifdef T2K_MEM_LEAK_DBG
 static S16  cmAlloc
 (
- Void   *regionCb,
- Size   *size,
+ Void         *regionCb,
+ Size         *size,
  uint32_t     flags,
- Data   **ptr ,
- char*  file,
- uint32_t    line
+ Data         **ptr,
+ char*        file,
+ uint32_t     line
  )
 #else
-#ifdef ANSI
 static S16  cmAlloc
 (
-Void   *regionCb,
-Size   *size,
+Void         *regionCb,
+Size         *size,
 uint32_t     flags,
-Data  **ptr 
+Data         **ptr 
 )
-#else
-static S16  cmAlloc(regionCb, size, flags, ptr)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-#endif
 #endif
 #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */
 #endif /* SSI_DEBUG_LEVEL1 */
@@ -1075,7 +993,7 @@ Data  **ptr;
 {
 /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */
 #ifndef USE_PURE
-   uint16_t        idx;
+   uint16_t  idx;
    CmMmBkt   *bkt;
 #endif
    CmMmRegCb *regCb;
@@ -1609,71 +1527,44 @@ Data  **prevptr;
 
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_LIGHT_MEM_LEAK_STS
-#ifdef ANSI
 static S16  cmFree
 (
-Void   *regionCb,
-Data   *ptr, 
-Size    size,
-uint32_t     lineNo,
-uint8_t      *funcName
+Void     *regionCb,
+Data     *ptr, 
+Size     size,
+uint32_t lineNo,
+uint8_t  *funcName
 )
-#else
-static S16  cmFree(regionCb, ptr, size, lineNo, funcName)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-uint32_t     lineNo;
-uint8_t      *funcName;
-#endif
 #else /*SS_LIGHT_MEM_LEAK_STS */
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 static S16  cmFree
 (
-Void   *regionCb,
-Data   *ptr,
-Size    size,
-uint32_t     line,
-uint8_t     *fileName,
-uint8_t      entId,
-Bool    hstReg
+Void     *regionCb,
+Data     *ptr,
+Size     size,
+uint32_t line,
+uint8_t  *fileName,
+uint8_t  entId,
+Bool     hstReg
 )
-#else
-static S16  cmFree(regionCb, ptr, size, line, fileName, entId, hstReg)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 
 #else
 #ifdef T2K_MEM_LEAK_DBG
 static S16  cmFree
 (
- Void   *regionCb,
- Data   *ptr,
- Size   size,
- char*  file,
- uint32_t    line
+Void   *regionCb,
+Data   *ptr,
+Size   size,
+char*  file,
+uint32_t line
  )
 #else /* T2K_MEM_LEAK_DBG */
-#ifdef ANSI
 static S16  cmFree
 (
 Void   *regionCb,
 Data   *ptr, 
 Size    size
 )
-#else
-static S16  cmFree(regionCb, ptr, size)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-#endif
 #endif
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
@@ -2245,62 +2136,34 @@ Size    size;
 /* cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
-uint32_t     flags,
+uint32_t flags,
 Data  **ptr,
-uint32_t     memType,
-uint32_t     line,
-uint8_t     *fileName,
-uint8_t      entId,
+uint32_t memType,
+uint32_t line,
+uint8_t  *fileName,
+uint8_t  entId,
 Bool    hstReg
 )
 #else
-S16  cmAllocNL(regionCb, size, flags, ptr, memType, 
-      line, fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
-uint32_t     flags,
+uint32_t flags,
 Data  **ptr,
-uint32_t     line,
-uint8_t     *fileName,
-uint8_t      entId,
+uint32_t line,
+uint8_t  *fileName,
+uint8_t  entId,
 Bool    hstReg
 )
-#else
-S16  cmAllocNL(regionCb, size, flags, ptr, line, 
-      fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 
 #else
 #ifdef SS_LIGHT_MEM_LEAK_STS
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
@@ -2311,38 +2174,18 @@ uint32_t     memType,
 uint32_t     lineNo,
 uint8_t     *funcName
 )
-#else
-S16  cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-uint32_t     lineNo;
-uint8_t     *funcName;
-#endif
 #else /*SS_LIGHT_MEM_LEAK_STS */
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
 Size   *size,
-uint32_t     flags,
+uint32_t flags,
 Data  **ptr,
-uint32_t     memType
+uint32_t memType
 )
 #else
-S16  cmAllocNL(regionCb, size, flags, ptr, memType)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-#endif
-#else
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
@@ -2352,15 +2195,6 @@ Data  **ptr,
 uint32_t     memType
 )
 #else
-S16  cmAllocNL(regionCb, size, flags, ptr, memType)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-#endif
-#else
-#ifdef ANSI
 S16  cmAllocNL
 (
 Void   *regionCb,
@@ -2368,13 +2202,6 @@ Size   *size,
 uint32_t     flags,
 Data  **ptr 
 )
-#else
-S16  cmAllocNL(regionCb, size, flags, ptr)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-#endif
 #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */
 #endif /* SSI_DEBUG_LEVEL1 */
    /* cm_mem_c_001.main_15: Additions */
@@ -2812,7 +2639,6 @@ Data  **ptr;
 
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_LIGHT_MEM_LEAK_STS
-#ifdef ANSI
 S16  cmFreeNL
 (
 Void   *regionCb,
@@ -2821,18 +2647,9 @@ Size    size,
 uint32_t     lineNo,
 uint8_t      *funcName
 )
-#else
-S16  cmFreeNL(regionCb, ptr, size, lineNo, funcName)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-uint32_t     lineNo;
-uint8_t      *funcName;
-#endif
 #else /*SS_LIGHT_MEM_LEAK_STS */
 
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 S16  cmFreeNL
 (
 Void   *regionCb,
@@ -2843,32 +2660,14 @@ uint8_t     *fileName,
 uint8_t      entId,
 Bool    hstReg
 )
-#else
-S16  cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-
 #else
 
-#ifdef ANSI
 S16  cmFreeNL
 (
 Void   *regionCb,
 Data   *ptr, 
 Size    size
 )
-#else
-S16  cmFreeNL(regionCb, ptr, size)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-#endif
    /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
 #endif /*SS_LIGHT_MEM_LEAK_STS */
@@ -3219,23 +3018,15 @@ Size    size;
 /*cm_mem_c_001.main_21-added new function*/
 /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
 #ifdef SS_FAP
-#ifdef ANSI
 static S16  cmAllocWL
 (
 Void   *regionCb,
 Size   *size,
-uint32_t     flags,
+uint32_t flags,
 Data  **ptr 
 )
-#else
-static S16  cmAllocWL(regionCb, size, flags, ptr)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-#endif
 {
-   uint16_t        idx;
+   uint16_t  idx;
    CmMmBkt   *bkt;
    CmMmRegCb *regCb;
    /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
@@ -3342,21 +3133,9 @@ Data  **ptr;
 *
 */
 
-#ifdef ANSI
-static S16  cmFreeWL
-(
-Void   *regionCb,
-Data   *ptr, 
-Size    size
-)
-#else
-static S16  cmFreeWL(regionCb, ptr, size)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-#endif
+static S16  cmFreeWL(Void *regionCb,Data *ptr, Size size)
 {
-   uint16_t        idx;
+   uint16_t  idx;
    CmMmBkt   *bkt;
    CmMmRegCb *regCb;
    /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/
@@ -3470,19 +3249,7 @@ Size    size;
 *
 */
 
-#ifdef ANSI
-static S16  cmCtl
-(
-Void    *regionCb,
-Event    event, 
-SMemCtl *memCtl
-)
-#else
-static S16  cmCtl(regionCb, event, memCtl)
-Void    *regionCb;
-Event    event;
-SMemCtl *memCtl;
-#endif
+static S16  cmCtl(Void *regionCb,Event event, SMemCtl *memCtl)
 {
    CmMmRegCb *regCb;
 
@@ -3602,23 +3369,14 @@ SMemCtl *memCtl;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static Void cmMmBktInit
 (
-Data      **memAddr,
+Data       **memAddr,
 CmMmRegCb  *regCb,
 CmMmRegCfg *cfg,
-uint16_t         bktIdx,
-uint16_t        *lstMapIdx
+uint16_t   bktIdx,
+uint16_t   *lstMapIdx
 )
-#else
-static Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx)
-Data      **memAddr;
-CmMmRegCb  *regCb;
-CmMmRegCfg *cfg;
-uint16_t         bktIdx;
-uint16_t        *lstMapIdx;
-#endif
 {
    uint32_t   cnt;
    uint16_t   idx;
@@ -3857,19 +3615,7 @@ uint16_t        *lstMapIdx;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-static Void  cmMmHeapInit 
-(
-Data        *memAddr,
-CmMmHeapCb  *heapCb,
-Size         size 
-)
-#else
-static Void  cmMmHeapInit (memAddr, heapCb, size)
-Data        *memAddr;
-CmMmHeapCb  *heapCb;
-Size         size;
-#endif
+static Void  cmMmHeapInit(Data *memAddr,CmMmHeapCb  *heapCb,Size size)
 {
 /* cm_mem_c_001.main_12 - addition for ssi enhancements */
 #ifdef SSI_DEBUG_LEVEL1
@@ -3948,7 +3694,6 @@ uint8_t ysCellConfigDone;
 #endif
 #ifdef SS_HISTOGRAM_SUPPORT 
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmHeapAlloc
 (
 CmMmHeapCb  *heapCb,
@@ -3961,18 +3706,6 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t        memType;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapAlloc 
 (
 CmMmHeapCb  *heapCb,
@@ -3983,20 +3716,9 @@ uint8_t     *fileName,
 uint8_t      entId,
 Bool    hstReg
 )
-#else
-static S16  cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 #else
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmHeapAlloc
 (
 CmMmHeapCb  *heapCb,
@@ -4005,26 +3727,12 @@ Size        *size,
 uint32_t        memType
 )
 #else
-static S16  cmHeapAlloc (heapCb, ptr, size, memType)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t        memType;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapAlloc 
 (
 CmMmHeapCb  *heapCb,
 Data       **ptr,
 Size        *size 
 )
-#else
-static S16  cmHeapAlloc (heapCb, ptr, size)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
@@ -4315,7 +4023,6 @@ Size        *size;
 */
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT  
-#ifdef ANSI
 static S16  cmHeapFree 
 (
 CmMmHeapCb  *heapCb,
@@ -4327,29 +4034,12 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data        *ptr;
-Size         size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapFree 
 (
 CmMmHeapCb  *heapCb,
 Data        *ptr,
 Size         size 
 )
-#else
-static S16  cmHeapFree (heapCb, ptr, size)
-CmMmHeapCb  *heapCb;
-Data        *ptr;
-Size         size;
-#endif
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
 {
@@ -4724,14 +4414,7 @@ Size         size;
 } /* end of cmHeapFree */
 #endif/*USE_PURE*/
 #ifdef SS_LIGHT_MEM_LEAK_STS
-#ifdef ANSI
-uint32_t cmGetFreeIndx
-(
-Void
-)
-#else
 uint32_t cmGetFreeIndx(Void)
-#endif
 {
 
     if(gmemLkCb.head == gmemLkCb.tail)
@@ -4747,16 +4430,7 @@ uint32_t cmGetFreeIndx(Void)
     }
  
 }
-#ifdef ANSI
-uint32_t cmPutFreeIndx
-(
-uint32_t   allocQIndx
-)
-#else
-uint32_t cmPutFreeIndx(allocQIndx)
-uint32_t   allocQIndx;
-#endif
-
+uint32_t cmPutFreeIndx(uint32_t allocQIndx)
 {
     uint32_t tmpTail = (gmemLkCb.tail+1)% CM_MAX_ALLOC_ENTERIES;
     if(tmpTail == gmemLkCb.head)
@@ -4786,14 +4460,7 @@ uint32_t   allocQIndx;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmInitMemLeak
-(
-Void
-)
-#else
 Void cmInitMemLeak (Void)
-#endif
 {
    uint32_t   indx;  
 
@@ -4825,14 +4492,7 @@ Void cmInitMemLeak (Void)
  * File:  cm_mem.c
  * 
  **/
-#ifdef ANSI
-Void cmDeinitMemLeak
-(
-Void
-)
-#else
-Void cmDeinitMemLeak (Void)
-#endif
+Void cmDeinitMemLeak(Void)
 {
    uint32_t   indx;  
 
@@ -4862,16 +4522,7 @@ Void cmDeinitMemLeak (Void)
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-uint32_t cmStorAllocBlk
-(
-Void    *addr
-)
-#else
-uint32_t cmStorAllocBlk (addr)
-Void    *addr;
-#endif /* ANSI */
-
+uint32_t cmStorAllocBlk(Void  *addr)
 {
    uint32_t allocQIndx;
 
@@ -4904,15 +4555,7 @@ Void    *addr;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmRlsAllocBlk
-(
-uint32_t    allocQIndx
-)
-#else
-Void cmRlsAllocBlk(allocQIndx)
-uint32_t    allocQIndx;
-#endif
+Void cmRlsAllocBlk(uint32_t allocQIndx)
 {
    
    if(allocQIndx < CM_MAX_ALLOC_ENTERIES)
@@ -4940,14 +4583,7 @@ uint32_t    allocQIndx;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmStartStopLeakLog
-(
-Void
-)
-#else
 Void cmStartStopLeakLog(Void)
-#endif
 {
    if (FALSE == gmemLkCb.isStarted)
    {
@@ -4976,14 +4612,7 @@ Void cmStartStopLeakLog(Void)
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmPrintLeakLog
-(
-Void
-)
-#else
 Void cmPrintLeakLog(Void)
-#endif
 {
  
    uint32_t   indx;  
@@ -5036,19 +4665,12 @@ Void cmPrintLeakLog(Void)
 *
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
-#ifdef ANSI
 Void cmRlsAllocBlk
 (
 CmMmBlkHdr  *ptrHdr,
 CmMmRegCb *regCb
 )
 #else
-Void cmRlsAllocBlk(ptrHdr, regCb)
-CmMmBlkHdr  *ptrHdr;
-CmMmRegCb *regCb;
-#endif
-#else
-#ifdef ANSI
 Void cmRlsAllocBlk
 (
 #ifdef BIT_64
@@ -5057,20 +4679,12 @@ uint64_t    addr
 uint32_t    addr
 #endif
 )
-#else
-Void cmRlsAllocBlk(addr)
-#ifdef BIT_64
-uint64_t    addr;
-#else
-uint32_t    addr;
-#endif
-#endif
 #endif
 {
     Ptr           trace[CM_MAX_STACK_TRACE];
     S8            **funcNm;
-    uint8_t            idx;
-    uint8_t            i;
+    uint8_t       idx;
+    uint8_t       i;
     S16           retVal;
     S32           traceSize;
 #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
@@ -5216,7 +4830,6 @@ uint32_t    addr;
 *
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
-#ifdef ANSI
 Void cmStorAllocBlk
 (
 CmMmBlkHdr    *ptrHdr, 
@@ -5226,15 +4839,6 @@ uint16_t           bktIdx,
 CmMmRegCb     *regCb
 )
 #else
-Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb)
-CmMmBlkHdr    *ptrHdr;
-Size          reqSz;
-Size          allocSz;
-uint16_t           bktIdx;
-CmMmRegCb     *regCb;
-#endif
-#else
-#ifdef ANSI
 Void cmStorAllocBlk
 (
 #ifdef BIT_64
@@ -5246,17 +4850,6 @@ Size   reqSz,
 Size   allocSz,
 uint16_t    bktIdx
 )
-#else
-Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx)
-#ifdef BIT_64
-uint64_t    addr;
-#else
-uint32_t    addr;
-#endif
-Size   reqSz;
-Size   allocSz;
-uint16_t    bktIdx;
-#endif /* ANSI */
 #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */
 {
 #ifndef SS_MEM_LEAK_SOL
@@ -5361,14 +4954,7 @@ uint16_t    bktIdx;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void SLogLkInfo
-(
-Void
-)
-#else
 Void SLogLkInfo (Void)
-#endif
 {
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2
    uint8_t                 idx;
@@ -5518,17 +5104,10 @@ Void SLogLkInfo (Void)
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmInitMemLeakMdl
-(
-Void
-)
-#else
 Void cmInitMemLeakMdl (Void)
-#endif
 {
    uint8_t   memMdl;
-       uint8_t   hashIdx;
+   uint8_t   hashIdx;
 
 
    memLkCb.memLkMdlInit = FALSE;
@@ -5566,14 +5145,7 @@ Void cmInitMemLeakMdl (Void)
  * File:  cm_mem.c
  * 
  **/
-#ifdef ANSI
-Void cmDeinitMemLeakMdl
-(
-Void
-)
-#else
 Void cmDeinitMemLeakMdl (Void)
-#endif
 {
   uint8_t   memMdl;
   uint8_t   hashIdx;
@@ -5606,15 +5178,7 @@ Void cmDeinitMemLeakMdl (Void)
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void cmMemOpenMemLkFile
-(
-S8 *arg
-)
-#else
-Void cmMemOpenMemLkFile (arg)
-S8 *msOptArg;
-#endif
+Void cmMemOpenMemLkFile(S8 *arg)
 {
    memLkCb.fileLkLog = NULLP;
    memLkCb.fileLkLog = fopen(arg, "w");
@@ -5635,19 +5199,12 @@ S8 *msOptArg;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-Void SFlushLkInfo
-(
-Void
-)
-#else
 Void SFlushLkInfo (Void)
-#endif
 {
-   MemAllocInfo      *newMemInfo;
-   uint8_t                 memMdl;
-   uint8_t                 hashIdx;
-   S8                 **funcNm;
+   MemAllocInfo *newMemInfo;
+   uint8_t      memMdl;
+   uint8_t      hashIdx;
+   S8           **funcNm;
 #ifdef SS_MEM_LEAK_SOL
    uint8_t                 i;
 #endif /* SS_MEM_LEAK_SOL */
@@ -5712,21 +5269,11 @@ Void SFlushLkInfo (Void)
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-uint8_t cmMemGetModuleId
-(
-S8     **funNm,
-S32    traceSize
-)
-#else
-uint8_t cmMemGetModuleId (funNm, traceSize)
-S8     **funNm;
-S32    traceSize;
-#endif /* ANSI */
+uint8_t cmMemGetModuleId(S8 **funNm,S32 traceSize)
 {
-   uint8_t    idx;
-   uint8_t    memStrIdx;
-   uint32_t   len;
+   uint8_t  idx;
+   uint8_t  memStrIdx;
+   uint32_t len;
    S32   retVal;
    S16   memReqIdx;
    S16   mdlFunStrIdx;
@@ -5788,7 +5335,6 @@ S32    traceSize;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 S16 cmMemGetStrMtchIdx  
 (
 uint8_t strtIdx, 
@@ -5796,13 +5342,6 @@ uint8_t endIdx,
 S8 *str, 
 S8 **strLst
 )
-#else
-S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst)
-uint8_t strtIdx;
-uint8_t endIdx;
-S8 *str;
-S8 **strLst;
-#endif
 {
 
    S8   cmpStr[255];
@@ -5861,19 +5400,7 @@ S8 **strLst;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-S32 cmAddrToSymStr
-(
-Void   *pc, 
-S8     *buffer, 
-S32    size
-)
-#else
-S32 cmAddrToSymStr(pc, buffer, size)
-Void   *pc;
-S8     *buffer;
-S32    size;
-#endif
+S32 cmAddrToSymStr(Void *pc, S8 *buffer, S32 size)
 {
 
    Dl_info info;
@@ -5917,19 +5444,7 @@ S32    size;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-S32 cmLeakCallBack
-(
-uintptr_t pc,
-S32       sigNo, 
-Void      *arg
-)
-#else
-S32 cmLeakCallBack(pc, sigNo, arg)
-uintptr_t pc;
-S32       sigNo;
-Void      *arg;
-#endif
+S32 cmLeakCallBack(uintptr_t pc,S32  sigNo, Void *arg)
 {
     S8   *buffer;
 
@@ -5972,27 +5487,9 @@ Void      *arg;
 *
 */
 #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1
-#ifdef ANSI
-S16 cmMmRegIsBlkSane
-(
-CmMmBlkHdr *blkPtr,
-Size       size
-)
-#else
-S16 cmMmRegIsBlkSane(blkPtr, size)
-CmMmBlkHdr *blkPtr;
-Size       size;
-#endif
+S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr,Size  size)
 #else
-#ifdef ANSI
-S16 cmMmRegIsBlkSane
-(
-CmMmBlkHdr *blkPtr
-)
-#else
-S16 cmMmRegIsBlkSane(blkPtr)
-CmMmBlkHdr *blkPtr;
-#endif
+S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr)
 #endif
 {
    uint32_t sigCnt;
@@ -6041,15 +5538,7 @@ CmMmBlkHdr *blkPtr;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-static S16  cmMmBktSanityChk
-(
-CmMmBkt  *bkt
-)
-#else
-static S16  cmMmBktSanityChk(bkt)
-CmMmBkt  *bkt;
-#endif
+static S16  cmMmBktSanityChk(CmMmBkt *bkt)
 {
    CmMmBlkHdr *ptrBlk;
    uint32_t blkCnt;
@@ -6101,18 +5590,9 @@ CmMmBkt  *bkt;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-static S16  cmMmHeapSanityChk
-(
-CmMmHeapCb  *heapCb
-)
-#else
-static S16  cmMmHeapSanityChk(heapCb)
-CmMmHeapCb  *heapCb;
-#endif
+static S16  cmMmHeapSanityChk(CmMmHeapCb *heapCb)
 {
 
-
    /* increment the trample count */
    heapCb->trampleCount++;
 
@@ -6139,19 +5619,7 @@ CmMmHeapCb  *heapCb;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
-static S16 cmMmHashFunc
-(
-CmMmHashListCp *hashListCp,
-uint32_t key,
-uint16_t *idx
-)
-#else
-static S16 cmMmHashFunc (hashListCp, key, idx)
-CmMmHashListCp *hashListCp; /* hash list control point */
-uint32_t key; /* key string */
-uint16_t *idx; /* idx to return */
-#endif
+static S16 cmMmHashFunc(CmMmHashListCp *hashListCp,uint32_t key,uint16_t *idx)
 {
 
    *idx = (uint16_t)(key % hashListCp->numOfbins);
@@ -6181,21 +5649,13 @@ uint16_t *idx; /* idx to return */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListInit
 (
 CmMmHashListCp *hashListCp,  /* hash list to initialize */
-uint16_t          nmbBins,      /* number of hash list bins */
+uint16_t     nmbBins,      /* number of hash list bins */
 Region       region,       /* memory region to allocate bins */
 Pool         pool          /* memory pool to allocate bins */
 )
-#else
-static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool)
-CmMmHashListCp *hashListCp;  /* hash list to initialize */
-uint16_t          nmbBins;      /* number of hash list bins */
-Region       region;       /* memory region to allocate bins */
-Pool         pool;         /* memory pool to allocate bins */
-#endif
 {
    uint16_t i;
    CmMmHashListEnt *hl;
@@ -6246,19 +5706,12 @@ Pool         pool;         /* memory pool to allocate bins */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListDeinit
 (
 CmMmHashListCp *hashListCp,   /* hash list to deinitialize */
-Region       region,       /* memory region to allocate bins */
-Pool         pool          /* memory pool to allocate bins */
+Region region,       /* memory region to allocate bins */
+Pool   pool          /* memory pool to allocate bins */
 )
-#else
-static S16 cmMmHashListDeinit(hashListCp, region, pool)
-CmMmHashListCp *hashListCp;  /* hash list to deinitialize */
-Region       region;       /* memory region to allocate bins */
-Pool         pool;         /* memory pool to allocate bins */
-#endif
 {
 
    /* deallocate memory for bins */
@@ -6292,17 +5745,11 @@ Pool         pool;         /* memory pool to allocate bins */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListInsert
 (
 CmMmHashListCp *hashListCp,  /* hash list to add to */
-uint32_t           key         /* pointer to key */
+uint32_t key         /* pointer to key */
 )
-#else
-static S16 cmMmHashListInsert(hashListCp, key)
-CmMmHashListCp *hashListCp;  /* hash list to add to */
-uint32_t           key;         /* pointer to key */
-#endif
 {
    CmMmHashListEnt *hashListEnt;    /* pointer to hash list entry header */
    uint16_t idx;                       /* index for insertion into hash list */
@@ -6376,15 +5823,10 @@ uint32_t           key;         /* pointer to key */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmHashListInit
 (
 CmHstGrmHashListCp *hashListCp  /* hash list to initialize */
 )
-#else
-static S16 cmHstGrmHashListInit(hashListCp)
-CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
-#endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #ifdef  DEBUGP
@@ -6416,15 +5858,10 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmHashListDeInit
 (
 CmHstGrmHashListCp *hashListCp  /* hash list to initialize */
 )
-#else
-static S16 cmHstGrmHashListDeInit(hashListCp)
-CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
-#endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #ifdef  DEBUGP
@@ -6460,28 +5897,19 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFreeInsert
 (
 CmHstGrmHashListCp* hashListCp, /* hash list cp */
-uint32_t        blkSz, /* size of the block freed */
-uint32_t       line, /* Line number */
-uint8_t        *fileName, /* file name */
-uint8_t        entId    /* Tapa task which free the memory */
+uint32_t  blkSz, /* size of the block freed */
+uint32_t  line, /* Line number */
+uint8_t   *fileName, /* file name */
+uint8_t   entId    /* Tapa task which free the memory */
 )
-#else
-static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId)
-CmHstGrmHashListCp* hashListCp; /* hash list cp */
-uint32_t        blkSz; /* size of the block freed */
-uint32_t       line; /* line number */
-uint8_t        *fileName; /* file Name */
-uint8_t        entId; /* Tapa task which frees the memory */
-#endif
 {
-   uint32_t                    binIdx = 0; /* Bin index to insert the entry into the hash list */
-   uint32_t                    key = 0; /* Key to fine the bin index */
-   uint32_t                    ret = 0; /* Return value */
-   CmMemEntries           *entry = NULLP; /* Entry which contains the information */
+   uint32_t      binIdx = 0; /* Bin index to insert the entry into the hash list */
+   uint32_t      key = 0; /* Key to fine the bin index */
+   uint32_t      ret = 0; /* Return value */
+   CmMemEntries  *entry = NULLP; /* Entry which contains the information */
 
 
 
@@ -6542,30 +5970,20 @@ uint8_t        entId; /* Tapa task which frees the memory */
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmAllocInsert
 (
 CmHstGrmHashListCp     *hashListCp,
-uint32_t       blkSz,
-uint32_t       *reqSz,
-uint32_t       line,
-uint8_t        *fileName,
-uint8_t        entId
+uint32_t   blkSz,
+uint32_t   *reqSz,
+uint32_t   line,
+uint8_t    *fileName,
+uint8_t    entId
 )
-#else
-static  S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId)
-CmHstGrmHashListCp     *hashListCp;
-uint32_t       blkSz;
-uint32_t       *reqSz;
-uint32_t       line;
-uint8_t        *fileName;
-uint8_t        entId;
-#endif
 {
-   uint32_t                    binIdx = 0;
-   uint32_t                    key = 0;
-   uint32_t                    ret = 0;
-   CmMemEntries           *entry = NULLP;
+   uint32_t    binIdx = 0;
+   uint32_t    key = 0;
+   uint32_t    ret = 0;
+   CmMemEntries *entry = NULLP;
 
 
    /* check for the total number of entries in the hash list. *
@@ -6629,21 +6047,13 @@ uint8_t        entId;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmGetHashIdxAndKey
 (
-uint8_t                 *fileName,
-uint32_t                line,
-uint32_t                *binIdx,
-uint32_t                *key
+uint8_t   *fileName,
+uint32_t  line,
+uint32_t  *binIdx,
+uint32_t  *key
 )
-#else
-static  S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key)
-uint8_t                 *fileName;
-uint32_t                line;
-uint32_t                *binIdx;
-uint32_t                *key;
-#endif
 {
 
    uint32_t  i = 0;
@@ -6678,23 +6088,14 @@ uint32_t                *key;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFillEntry
 (
-CmMemEntries       *entry,
-uint32_t                key,
-uint32_t                line,
-uint8_t                 *fileName,
-uint8_t                 entId
+CmMemEntries *entry,
+uint32_t     key,
+uint32_t     line,
+uint8_t      *fileName,
+uint8_t      entId
 )
-#else
-static  S16 cmHstGrmFillEntry(entry, key, line, fileName, entId)
-CmMemEntries       *entry;
-uint32_t                key;
-uint32_t                line;
-uint8_t                 *fileName;
-uint8_t                 entId;
-#endif
 {
 
    uint32_t       idx = 0;
@@ -6726,25 +6127,17 @@ uint8_t                 entId;
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFindEntry
 (
 CmHstGrmHashListCp  *hashListCp,
-uint32_t                 key,
-uint32_t                 *binIdx,
-CmMemEntries        **entry
+uint32_t      key,
+uint32_t      *binIdx,
+CmMemEntries  **entry
 )
-#else
-static  S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry)
-CmHstGrmHashListCp  *hashListCp;
-uint32_t                 key;
-uint32_t                 *binIdx;
-CmMemEntries        **entry;
-#endif
 {
 
-   uint32_t                  numEnt = 0;
-   uint32_t                  numBin = 0;
+   uint32_t   numEnt = 0;
+   uint32_t   numBin = 0;
    CmHstGrmHashListEnt  *tmpBin = NULLP;
 
    for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++)
index 7c60b2a..31c073b 100755 (executable)
@@ -388,7 +388,6 @@ void DumpLayersDebugInformation()
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static Void cmMmStatBktInit
 (
 Data      **memAddr,
@@ -397,14 +396,6 @@ CmMmRegCfg *cfg,
 uint16_t         bktIdx,
 uint16_t        *lstMapIdx
 )
-#else
-static Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx)
-Data      **memAddr;
-CmMmRegCb  *regCb;
-CmMmRegCfg *cfg;
-uint16_t         bktIdx;
-uint16_t        *lstMapIdx;
-#endif
 {
    uint32_t   cnt;
    uint16_t   idx;
@@ -553,19 +544,12 @@ uint16_t        *lstMapIdx;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S16 cmMmStatRegInit
 (
 Region       region,
 CmMmRegCb   *regCb,
 CmMmRegCfg  *cfg
 )
-#else
-S16 cmMmStatRegInit(region, regCb, cfg)
-Region       region;
-CmMmRegCb   *regCb;
-CmMmRegCfg  *cfg;
-#endif
 {
    Data *memAddr;
    uint16_t   bktIdx;
@@ -807,15 +791,10 @@ CmMmRegCfg  *cfg;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S16 cmMmGlobRegInit
 (
 CmMmGlobRegCb   *regCb
 )
-#else
-S16 cmMmGlobRegInit(regCb)
-CmMmGlobRegCb   *regCb;
-#endif
 {
    Data **memAddr;
    Data **next;
@@ -899,7 +878,6 @@ CmMmGlobRegCb   *regCb;
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-#ifdef ANSI
 static S16  cmIccAllocWithLock
 (
 Void   *regionCb,    /* Pointer to a region */
@@ -909,9 +887,7 @@ Data  **ptr,          /* Reference to pointer for which need to be allocate */
 char *file,
 uint32_t line
 )
-#endif
 #else
-#ifdef ANSI
 static S16  cmIccAllocWithLock
 (
 Void   *regionCb,    /* Pointer to a region */
@@ -919,13 +895,6 @@ Size   *size,        /* size needs to be allocated */
 uint32_t     flags,       /* Flags used */
 Data  **ptr          /* Reference to pointer for which need to be allocate */
 )
-#else
-static S16  cmIccAllocWithLock(regionCb, size, flags, ptr)
-Void   *regionCb;    /* Pointer to a region */
-Size   *size;        /* size needs to be allocated */
-uint32_t     flags;       /* Flags used */
-Data  **ptr;         /* Reference to pointer for which need to be allocate */
-#endif
 #endif
 {
    CmMmDynRegCb        *regCb;
@@ -991,7 +960,6 @@ Data  **ptr;         /* Reference to pointer for which need to be allocate */
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-#ifdef ANSI
 static S16  cmIccFreeWithLock
 (
 Void   *regionCb,   /* Pointer to region cb */
@@ -1000,21 +968,13 @@ Size    size,        /* Size of the block */
 char *file,
 uint32_t line
 )
-#endif
 #else
-#ifdef ANSI
 static S16  cmIccFreeWithLock
 (
 Void   *regionCb,   /* Pointer to region cb */
 Data   *ptr,        /* Memory block needs to be freed */
 Size    size        /* Size of the block */
 )
-#else
-static S16  cmIccFreeWithLock(regionCb, ptr, size)
-Void   *regionCb;   /* Pointer to region cb */
-Data   *ptr;        /* Memory block needs to be freed */
-Size    size;       /* Size of the block */
-#endif
 #endif
 {
    CmMmDynRegCb       *regCb;
@@ -1059,7 +1019,6 @@ Size    size;       /* Size of the block */
 *
 */
 #ifdef T2K_MEM_LEAK_DBG
-#ifdef ANSI
 static S16  cmIccAlloc
 (
 Void   *regionCb,    /* Pointer to a region */
@@ -1070,9 +1029,6 @@ char *file,
 uint32_t line
 )
 #else
-#endif
-#else
-#ifdef ANSI
 static S16  cmIccAlloc
 (
 Void   *regionCb,    /* Pointer to a region */
@@ -1080,13 +1036,6 @@ Size   *size,        /* size needs to be allocated */
 uint32_t     flags,       /* Flags used */
 Data  **ptr          /* Reference to pointer for which need to be allocate */
 )
-#else
-static S16  cmIccAlloc(regionCb, size, flags, ptr)
-Void   *regionCb;    /* Pointer to a region */
-Size   *size;        /* size needs to be allocated */
-uint32_t     flags;       /* Flags used */
-Data  **ptr;         /* Reference to pointer for which need to be allocate */
-#endif
 
 #endif
 {
@@ -1150,19 +1099,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 static S16  cmIccFree
 (
 Void   *regionCb,   /* Pointer to region cb */
 Data   *ptr,        /* Memory block needs to be freed */
 Size    size        /* Size of the block */
 )
-#else
-static S16  cmIccFree(regionCb, ptr, size)
-Void   *regionCb;   /* Pointer to region cb */
-Data   *ptr;        /* Memory block needs to be freed */
-Size    size;       /* Size of the block */
-#endif
 #endif
 {
    CmMmDynRegCb       *regCb;
@@ -1214,15 +1156,10 @@ Size    size;       /* Size of the block */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S16 cmMmDynRegInit
 (
 CmMmDynRegCb   *regCb
 )
-#else
-S16 cmMmDynRegInit(regCb)
-CmMmDynRegCb   *regCb;
-#endif
 {
    SRegInfo regInfo;
 #ifdef T2200_2GB_DDR_CHANGES
@@ -1323,15 +1260,10 @@ CmMmDynRegCb   *regCb;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S16 cmMmDynRegInit
 (
 CmMmDynRegCb   *regCb
 )
-#else
-S16 cmMmDynRegInit(regCb)
-CmMmDynRegCb   *regCb;
-#endif
 {
    Region region;
    uint16_t    lstMapIdx;
@@ -1454,15 +1386,7 @@ CmMmDynRegCb   *regCb;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-S16 cmMmRegDeInit
-(
-CmMmRegCb   *regCb
-)
-#else
-S16 cmMmRegDeInit(regCb)
-CmMmRegCb   *regCb;
-#endif
+S16 cmMmRegDeInit(CmMmRegCb   *regCb)
 {
    uint16_t  bktIdx; 
 
@@ -1553,17 +1477,11 @@ CmMmRegCb   *regCb;
 *
 */
 
-#ifdef ANSI
 static CmMmBlkSetElement* cmGetMemBlkSetForAlloc
 (
-uint8_t             bucketIndex, /* Index to the bucket list */
+uint8_t       bucketIndex, /* Index to the bucket list */
 CmMmDynBktCb  *bkt        /* Bucket list control block */
 )
-#else
-static CmMmBlkSetElement*  cmGetMemBlkSetForAlloc(bucketIndex, bkt)
-uint8_t             bucketIndex; /* Index to the bucket list */
-CmMmDynBktCb  *bkt;        /* Bucket list control block */
-#endif
 {
    CmMmBlkSetElement  *memBlkSetElem;
    CmMmBlkSetElement  *nextMemBlkSetElem;
@@ -1677,17 +1595,11 @@ CmMmDynBktCb  *bkt;        /* Bucket list control block */
 *
 */
 
-#ifdef ANSI
 static CmMmBlkSetElement* cmGetMemBlkSetForFree
 (
-uint8_t             bucketIndex, /* Index to the bucket list */
+uint8_t       bucketIndex, /* Index to the bucket list */
 CmMmDynBktCb  *bkt        /* Bucket list control block */
 )
-#else
-static CmMmBlkSetElement*  cmGetMemBlkSetForFree(bucketIndex, bkt)
-uint8_t             bucketIndex; /* Index to the bucket list */
-CmMmDynBktCb  *bkt;        /* Bucket list control block */
-#endif
 {
    CmMmBlkSetElement  *memBlkSetElem;
    CmMmBlkSetElement  *nextMemBlkSetElem;
@@ -1793,17 +1705,11 @@ CmMmDynBktCb  *bkt;        /* Bucket list control block */
 *
 */
 
-#ifdef ANSI
 static S16  cmRemoveAllocPtrFromList
 (
 CmMmDynRegCb    *regionCb,    /* Pointer to a region */
 PTR              ptr
 )
-#else
-static S16  cmRemoveAllocPtrFromList(regionCb, ptr)
-CmMmDynRegCb    *regionCb;    /* Pointer to a region */
-PTR              ptr;
-#endif
 {
 
    CmMemDoubleFree   *memNode = NULLP;
@@ -1859,17 +1765,11 @@ PTR              ptr;
 *
 */
 
-#ifdef ANSI
 static S16  cmInsertAllocPtrToList
 (
 CmMmDynRegCb    *regionCb,    /* Pointer to a region */
 PTR              ptr
 )
-#else
-static S16  cmInsertAllocPtrToList(regionCb, ptr)
-CmMmDynRegCb    *regionCb;    /* Pointer to a region */
-PTR              ptr;
-#endif
 {
 
    CmMemDoubleFree   *memNode;
@@ -1913,7 +1813,6 @@ PTR              ptr;
 */
 /* cm_mem_c_001.main_15 : Additions */
 
-#ifdef ANSI
 static S16  cmDynAllocWithLock
 (
 Void   *regionCb,    /* Pointer to a region */
@@ -1921,13 +1820,6 @@ Size   *size,        /* size needs to be allocated */
 uint32_t     flags,       /* Flags used */
 Data  **ptr          /* Reference to pointer for which need to be allocate */
 )
-#else
-static S16  cmDynAllocWithLock(regionCb, size, flags, ptr)
-Void   *regionCb;    /* Pointer to a region */
-Size   *size;        /* size needs to be allocated */
-uint32_t     flags;       /* Flags used */
-Data  **ptr;         /* Reference to pointer for which need to be allocate */
-#endif
 {
    S16 ret;
 
@@ -1966,21 +1858,13 @@ Data  **ptr;         /* Reference to pointer for which need to be allocate */
 */
 /* cm_mem_c_001.main_15 : Additions */
 
-#ifdef ANSI
 static S16  cmDynAlloc
 (
 Void   *regionCb,    /* Pointer to a region */
 Size   *size,        /* size needs to be allocated */
-uint32_t     flags,       /* Flags used */
+uint32_t flags,       /* Flags used */
 Data  **ptr          /* Reference to pointer for which need to be allocate */
 )
-#else
-static S16  cmDynAlloc(regionCb, size, flags, ptr)
-Void   *regionCb;    /* Pointer to a region */
-Size   *size;        /* size needs to be allocated */
-uint32_t     flags;       /* Flags used */
-Data  **ptr;         /* Reference to pointer for which need to be allocate */
-#endif
 {
    CmMmDynRegCb        *regCb;
 
@@ -2195,7 +2079,6 @@ static S16  cmAlloc
 #else
 #ifdef SS_HISTOGRAM_SUPPORT
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmAlloc
 (
 Void   *regionCb,
@@ -2209,19 +2092,6 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmAlloc
 (
 Void   *regionCb,
@@ -2233,23 +2103,11 @@ uint8_t     *fileName,
 uint8_t      entId,
 Bool    hstReg
 )
-#else
-static S16  cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 
 #else
 
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmAlloc
 (
 Void   *regionCb,
@@ -2259,15 +2117,6 @@ Data  **ptr,
 uint32_t     memType
 )
 #else
-static S16  cmAlloc(regionCb, size, flags, ptr, memType)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-uint32_t     memType;
-#endif
-#else
-#ifdef ANSI
 static S16  cmAlloc
 (
 Void   *regionCb,
@@ -2275,13 +2124,6 @@ Size   *size,
 uint32_t     flags,
 Data  **ptr 
 )
-#else
-static S16  cmAlloc(regionCb, size, flags, ptr)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-#endif
 
 #endif
 #endif /* SSI_DEBUG_LEVEL1 */
@@ -2700,19 +2542,11 @@ Data  **ptr;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-S16  cmInitDoubleFreeList
-(
-Void
-)
-#else
-S16  cmInitDoubleFreeList()
-#endif
+S16  cmInitDoubleFreeList(void)
 {
-    uint16_t              offset;
+    uint16_t offset;
     CmMemDoubleFree  memNode;
 
-
     offset = (uint16_t)((PTR)(&memNode.tmpListEnt) - (PTR)&memNode);
 
     if((cmHashListInit(&(memDoubleFree), 1000, offset, 0,
@@ -2742,13 +2576,7 @@ S16  cmInitDoubleFreeList()
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-static S16  cmInitBtInfo
-(
-)
-#else
-static S16  cmInitBtInfo (Void)
-#endif
+static S16  cmInitBtInfo()
 {
    regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo));
    if (regBtInfo == NULLP)
@@ -2780,17 +2608,11 @@ static S16  cmInitBtInfo (Void)
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 Void  cmAnalyseBtInfo
 (
 PTR   ptr,       /* Memory block needs to be freed */
 uint32_t   idx
 )
-#else
-Void  cmAnalyseBtInfo (ptr,idx)
-PTR   ptr;        /* Memory block needs to be freed */
-uint32_t   idx;
-#endif
 {
    uint32_t  tmpCnt;
    uint32_t  btIdx;
@@ -2851,19 +2673,12 @@ uint32_t   idx;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16  cmDynFreeWithLock
 (
 Void   *regionCb,   /* Pointer to region cb */
 Data   *ptr,        /* Memory block needs to be freed */
 Size    size        /* Size of the block */
 )
-#else
-static S16  cmDynFreeWithLock(regionCb, ptr, size)
-Void   *regionCb;   /* Pointer to region cb */
-Data   *ptr;        /* Memory block needs to be freed */
-Size    size;       /* Size of the block */
-#endif
 {
    S16 ret;
 
@@ -2901,19 +2716,12 @@ Size    size;       /* Size of the block */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16  cmDynFree
 (
 Void   *regionCb,   /* Pointer to region cb */
 Data   *ptr,        /* Memory block needs to be freed */
 Size    size        /* Size of the block */
 )
-#else
-static S16  cmDynFree(regionCb, ptr, size)
-Void   *regionCb;   /* Pointer to region cb */
-Data   *ptr;        /* Memory block needs to be freed */
-Size    size;       /* Size of the block */
-#endif
 {
    CmMmDynRegCb       *regCb;
 #ifndef USE_PURE
@@ -3110,7 +2918,6 @@ static S16  cmFree
 )
 #else
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 static S16  cmFree
 (
 Void   *regionCb,
@@ -3122,31 +2929,12 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmFree(regionCb, ptr, size, line, fileName, entId, hstReg)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-
-#else
-
-#ifdef ANSI
 static S16  cmFree
 (
 Void   *regionCb,
 Data   *ptr, 
 Size    size
 )
-#else
-static S16  cmFree(regionCb, ptr, size)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-#endif
 #endif
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
@@ -3492,7 +3280,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 static S16  cmAllocWL
 (
 Void   *regionCb,
@@ -3500,13 +3287,6 @@ Size   *size,
 uint32_t     flags,
 Data  **ptr 
 )
-#else
-static S16  cmAllocWL(regionCb, size, flags, ptr)
-Void   *regionCb;
-Size   *size;
-uint32_t     flags;
-Data  **ptr;
-#endif
 #endif
 {
 #ifndef USE_PURE
@@ -3653,19 +3433,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 static S16  cmFreeWL
 (
 Void   *regionCb,
 Data   *ptr, 
 Size    size
 )
-#else
-static S16  cmFreeWL(regionCb, ptr, size)
-Void   *regionCb;
-Data   *ptr;
-Size    size;
-#endif
 #endif
 {
 #ifndef USE_PURE
@@ -3803,19 +3576,12 @@ Size    size;
 *
 */
 
-#ifdef ANSI
 static S16  cmCtl
 (
 Void    *regionCb,
 Event    event, 
 SMemCtl *memCtl
 )
-#else
-static S16  cmCtl(regionCb, event, memCtl)
-Void    *regionCb;
-Event    event;
-SMemCtl *memCtl;
-#endif
 {
    CmMmRegCb *regCb;
 
@@ -3935,19 +3701,12 @@ SMemCtl *memCtl;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static Void  cmMmHeapInit 
 (
 Data        *memAddr,
 CmMmHeapCb  *heapCb,
 Size         size 
 )
-#else
-static Void  cmMmHeapInit (memAddr, heapCb, size)
-Data        *memAddr;
-CmMmHeapCb  *heapCb;
-Size         size;
-#endif
 {
 /* cm_mem_c_001.main_12 - addition for ssi enhancements */
 #ifdef SSI_DEBUG_LEVEL1
@@ -4024,7 +3783,6 @@ Size         size;
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmHeapAlloc
 (
 CmMmHeapCb  *heapCb,
@@ -4037,18 +3795,6 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t        memType;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapAlloc 
 (
 CmMmHeapCb  *heapCb,
@@ -4059,20 +3805,9 @@ uint8_t     *fileName,
 uint8_t      entId,
 Bool    hstReg
 )
-#else
-static S16  cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 #else
 #ifdef SSI_DEBUG_LEVEL1
-#ifdef ANSI
 static S16  cmHeapAlloc
 (
 CmMmHeapCb  *heapCb,
@@ -4081,26 +3816,12 @@ Size        *size,
 uint32_t        memType
 )
 #else
-static S16  cmHeapAlloc (heapCb, ptr, size, memType)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-uint32_t        memType;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapAlloc 
 (
 CmMmHeapCb  *heapCb,
 Data       **ptr,
 Size        *size 
 )
-#else
-static S16  cmHeapAlloc (heapCb, ptr, size)
-CmMmHeapCb  *heapCb;
-Data       **ptr;
-Size        *size;
-#endif
 #endif /* SSI_DEBUG_LEVEL1 */
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
@@ -4379,7 +4100,6 @@ Size        *size;
 */
 /*  cm_mem_c_001.main_15 : Additions */
 #ifdef SS_HISTOGRAM_SUPPORT  
-#ifdef ANSI
 static S16  cmHeapFree 
 (
 CmMmHeapCb  *heapCb,
@@ -4391,29 +4111,12 @@ uint8_t      entId,
 Bool    hstReg
 )
 #else
-static S16  cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg)
-CmMmHeapCb  *heapCb;
-Data        *ptr;
-Size         size;
-uint32_t     line;
-uint8_t     *fileName;
-uint8_t      entId;
-Bool    hstReg;
-#endif
-#else
-#ifdef ANSI
 static S16  cmHeapFree 
 (
 CmMmHeapCb  *heapCb,
 Data        *ptr,
 Size         size 
 )
-#else
-static S16  cmHeapFree (heapCb, ptr, size)
-CmMmHeapCb  *heapCb;
-Data        *ptr;
-Size         size;
-#endif
 /*  cm_mem_c_001.main_15 : Additions */
 #endif /* SS_HISTOGRAM_SUPPORT */ 
 {
@@ -4804,17 +4507,10 @@ Size         size;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-Void cmInitMemLeakMdl
-(
-Void
-)
-#else
-Void cmInitMemLeakMdl (Void)
-#endif
+Void cmInitMemLeakMdl(Void)
 {
    uint8_t   memMdl;
-       uint8_t   hashIdx;
+   uint8_t   hashIdx;
 
 
    memLkCb.memLkMdlInit = FALSE;
@@ -4852,14 +4548,7 @@ Void cmInitMemLeakMdl (Void)
  * File:  cm_mem_wl.c
  * 
  **/
-#ifdef ANSI
-Void cmDeinitMemLeakMdl
-(
-Void
-)
-#else
 Void cmDeinitMemLeakMdl (Void)
-#endif
 {
   uint8_t   memMdl;
   uint8_t   hashIdx;
@@ -4892,15 +4581,7 @@ Void cmDeinitMemLeakMdl (Void)
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-Void cmMemOpenMemLkFile
-(
-S8 *arg
-)
-#else
-Void cmMemOpenMemLkFile (arg)
-S8 *msOptArg;
-#endif
+Void cmMemOpenMemLkFile(S8 *arg)
 {
    memLkCb.fileLkLog = NULLP;
    memLkCb.fileLkLog = fopen(arg, "w");
@@ -4922,23 +4603,16 @@ S8 *msOptArg;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-Void SLogLkInfo
-(
-Void
-)
-#else
 Void SLogLkInfo (Void)
-#endif
 {
 
-   MemAllocInfo      *oldMemInfo;
-   MemAllocInfo      *newMemInfo;
-   uint8_t                 memMdl;  
-   uint8_t                 hashIdx;  
-   uint8_t                 idx;
-   Txt                prntBuf[255];
-   S8                 **funcNm;
+   MemAllocInfo  *oldMemInfo;
+   MemAllocInfo  *newMemInfo;
+   uint8_t       memMdl;  
+   uint8_t       hashIdx;  
+   uint8_t       idx;
+   Txt           prntBuf[255];
+   S8            **funcNm;
    if( memLkCb.memLkMdlInit == FALSE)
    {
      return;
@@ -5015,21 +4689,14 @@ Void SLogLkInfo (Void)
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-Void SFlushLkInfo
-(
-Void
-)
-#else
 Void SFlushLkInfo (Void)
-#endif
 {
-   MemAllocInfo      *newMemInfo;
-   uint8_t                 memMdl;
-   uint8_t                 hashIdx;
-   S8                 **funcNm;
+   MemAllocInfo *newMemInfo;
+   uint8_t      memMdl;
+   uint8_t      hashIdx;
+   S8           **funcNm;
 #ifdef SS_MEM_LEAK_SOL
-   uint8_t                 i;
+   uint8_t      i;
 #endif /* SS_MEM_LEAK_SOL */
 
    if( memLkCb.memLkMdlInit == FALSE)
@@ -5093,7 +4760,6 @@ Void SFlushLkInfo (Void)
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 Void cmStorAllocBlk
 (
 uint32_t    addr,
@@ -5101,13 +4767,6 @@ Size   reqSz,
 Size   allocSz,
 uint16_t    bktIdx
 )
-#else
-Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx)
-uint32_t    addr;
-Size   reqSz;
-Size   allocSz;
-uint16_t    bktIdx;
-#endif /* ANSI */
 {
 #ifndef SS_MEM_LEAK_SOL
    Ptr           trace[CM_MAX_STACK_TRACE];
@@ -5183,17 +4842,11 @@ uint16_t    bktIdx;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 uint8_t cmMemGetModuleId
 (
 S8     **funNm,
 S32    traceSize
 )
-#else
-uint8_t cmMemGetModuleId (funNm, traceSize)
-S8     **funNm;
-S32    traceSize;
-#endif /* ANSI */
 {
    uint8_t    idx;
    uint8_t    memStrIdx;
@@ -5259,7 +4912,6 @@ S32    traceSize;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S16 cmMemGetStrMtchIdx  
 (
 uint8_t strtIdx, 
@@ -5267,13 +4919,6 @@ uint8_t endIdx,
 S8 *str, 
 S8 **strLst
 )
-#else
-S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst)
-uint8_t strtIdx;
-uint8_t endIdx;
-S8 *str;
-S8 **strLst;
-#endif
 {
 
    S8   cmpStr[255];
@@ -5332,20 +4977,15 @@ S8 **strLst;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 Void cmRlsAllocBlk
 (
 uint32_t    addr
 )
-#else
-Void cmRlsAllocBlk(addr)
-uint32_t    addr;
-#endif
 {
     Ptr           trace[CM_MAX_STACK_TRACE];
     S8            **funcNm;
-    uint8_t            idx;
-    uint8_t            i;
+    uint8_t       idx;
+    uint8_t       i;
     S16           retVal;
     S32           traceSize;
     MemAllocInfo  *memAllocInfo;
@@ -5471,19 +5111,12 @@ uint32_t    addr;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S32 cmAddrToSymStr
 (
 Void   *pc, 
 S8     *buffer, 
 S32    size
 )
-#else
-S32 cmAddrToSymStr(pc, buffer, size)
-Void   *pc;
-S8     *buffer;
-S32    size;
-#endif
 {
 
    Dl_info info;
@@ -5527,19 +5160,12 @@ S32    size;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S32 cmLeakCallBack
 (
 uintptr_t pc,
 S32       sigNo, 
 Void      *arg
 )
-#else
-S32 cmLeakCallBack(pc, sigNo, arg)
-uintptr_t pc;
-S32       sigNo;
-Void      *arg;
-#endif
 {
     S8   *buffer;
 
@@ -5575,17 +5201,11 @@ Void      *arg;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 S32 backtrace
 (
-Void      **buffer,
-S32       count
+Void  **buffer,
+S32   count
 )
-#else
-S32 backtrace(buffer, count)
-Void      **buffer;
-S32       count;
-#endif
 {
 
     Backtrace_t  bt;
@@ -5630,15 +5250,7 @@ S32       count;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-static S16  cmMmBktSanityChk
-(
-CmMmBkt  *bkt
-)
-#else
-static S16  cmMmBktSanityChk(bkt)
-CmMmBkt  *bkt;
-#endif
+static S16  cmMmBktSanityChk(CmMmBkt  *bkt)
 {
    CmMmBlkHdr *ptrBlk;
    uint32_t blkCnt;
@@ -5691,18 +5303,9 @@ CmMmBkt  *bkt;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-static S16  cmMmHeapSanityChk
-(
-CmMmHeapCb  *heapCb
-)
-#else
-static S16  cmMmHeapSanityChk(heapCb)
-CmMmHeapCb  *heapCb;
-#endif
+static S16  cmMmHeapSanityChk(CmMmHeapCb  *heapCb)
 {
 
-
    /* increment the trample count */
    heapCb->trampleCount++;
 
@@ -5728,15 +5331,7 @@ CmMmHeapCb  *heapCb;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
-S16 cmMmRegIsBlkSane
-(
-CmMmBlkHdr *blkPtr
-)
-#else
-S16 cmMmRegIsBlkSane(blkPtr)
-CmMmBlkHdr *blkPtr;
-#endif
+S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr)
 {
    uint32_t sigCnt;
 
@@ -5768,19 +5363,12 @@ CmMmBlkHdr *blkPtr;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashFunc
 (
 CmMmHashListCp *hashListCp,
 uint32_t key,
 uint16_t *idx
 )
-#else
-static S16 cmMmHashFunc (hashListCp, key, idx)
-CmMmHashListCp *hashListCp; /* hash list control point */
-uint32_t key; /* key string */
-uint16_t *idx; /* idx to return */
-#endif
 {
 
    *idx = (uint16_t)(key % hashListCp->numOfbins);
@@ -5810,21 +5398,13 @@ uint16_t *idx; /* idx to return */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListInit
 (
 CmMmHashListCp *hashListCp,  /* hash list to initialize */
-uint16_t          nmbBins,      /* number of hash list bins */
+uint16_t     nmbBins,      /* number of hash list bins */
 Region       region,       /* memory region to allocate bins */
 Pool         pool          /* memory pool to allocate bins */
 )
-#else
-static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool)
-CmMmHashListCp *hashListCp;  /* hash list to initialize */
-uint16_t          nmbBins;      /* number of hash list bins */
-Region       region;       /* memory region to allocate bins */
-Pool         pool;         /* memory pool to allocate bins */
-#endif
 {
    uint16_t i;
    CmMmHashListEnt *hl;
@@ -5875,19 +5455,12 @@ Pool         pool;         /* memory pool to allocate bins */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListDeinit
 (
 CmMmHashListCp *hashListCp,   /* hash list to deinitialize */
 Region       region,       /* memory region to allocate bins */
 Pool         pool          /* memory pool to allocate bins */
 )
-#else
-static S16 cmMmHashListDeinit(hashListCp, region, pool)
-CmMmHashListCp *hashListCp;  /* hash list to deinitialize */
-Region       region;       /* memory region to allocate bins */
-Pool         pool;         /* memory pool to allocate bins */
-#endif
 {
 
    /* deallocate memory for bins */
@@ -5921,17 +5494,11 @@ Pool         pool;         /* memory pool to allocate bins */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmMmHashListInsert
 (
 CmMmHashListCp *hashListCp,  /* hash list to add to */
-uint32_t           key         /* pointer to key */
+uint32_t       key         /* pointer to key */
 )
-#else
-static S16 cmMmHashListInsert(hashListCp, key)
-CmMmHashListCp *hashListCp;  /* hash list to add to */
-uint32_t           key;         /* pointer to key */
-#endif
 {
    CmMmHashListEnt *hashListEnt;    /* pointer to hash list entry header */
    uint16_t idx;                       /* index for insertion into hash list */
@@ -6005,15 +5572,10 @@ uint32_t           key;         /* pointer to key */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmHashListInit
 (
 CmHstGrmHashListCp *hashListCp  /* hash list to initialize */
 )
-#else
-static S16 cmHstGrmHashListInit(hashListCp)
-CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
-#endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #ifdef  DEBUGP
@@ -6045,15 +5607,10 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmHashListDeInit
 (
 CmHstGrmHashListCp *hashListCp  /* hash list to initialize */
 )
-#else
-static S16 cmHstGrmHashListDeInit(hashListCp)
-CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
-#endif
 {
    /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
 #ifdef  DEBUGP
@@ -6089,28 +5646,19 @@ CmHstGrmHashListCp *hashListCp;  /* hash list to initialize */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFreeInsert
 (
 CmHstGrmHashListCp* hashListCp, /* hash list cp */
-uint32_t        blkSz, /* size of the block freed */
-uint32_t       line, /* Line number */
-uint8_t        *fileName, /* file name */
-uint8_t        entId    /* Tapa task which free the memory */
+uint32_t blkSz, /* size of the block freed */
+uint32_t line, /* Line number */
+uint8_t  *fileName, /* file name */
+uint8_t  entId    /* Tapa task which free the memory */
 )
-#else
-static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId)
-CmHstGrmHashListCp* hashListCp; /* hash list cp */
-uint32_t        blkSz; /* size of the block freed */
-uint32_t       line; /* line number */
-uint8_t        *fileName; /* file Name */
-uint8_t        entId; /* Tapa task which frees the memory */
-#endif
 {
-   uint32_t                    binIdx = 0; /* Bin index to insert the entry into the hash list */
-   uint32_t                    key = 0; /* Key to fine the bin index */
-   uint32_t                    ret = 0; /* Return value */
-   CmMemEntries           *entry = NULLP; /* Entry which contains the information */
+   uint32_t      binIdx = 0; /* Bin index to insert the entry into the hash list */
+   uint32_t      key = 0; /* Key to fine the bin index */
+   uint32_t      ret = 0; /* Return value */
+   CmMemEntries  *entry = NULLP; /* Entry which contains the information */
 
 
 
@@ -6171,30 +5719,20 @@ uint8_t        entId; /* Tapa task which frees the memory */
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmAllocInsert
 (
 CmHstGrmHashListCp     *hashListCp,
-uint32_t       blkSz,
-uint32_t       *reqSz,
-uint32_t       line,
-uint8_t        *fileName,
-uint8_t        entId
+uint32_t blkSz,
+uint32_t *reqSz,
+uint32_t line,
+uint8_t  *fileName,
+uint8_t  entId
 )
-#else
-static  S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId)
-CmHstGrmHashListCp     *hashListCp;
-uint32_t       blkSz;
-uint32_t       *reqSz;
-uint32_t       line;
-uint8_t        *fileName;
-uint8_t        entId;
-#endif
 {
-   uint32_t                    binIdx = 0;
-   uint32_t                    key = 0;
-   uint32_t                    ret = 0;
-   CmMemEntries           *entry = NULLP;
+   uint32_t      binIdx = 0;
+   uint32_t      key = 0;
+   uint32_t      ret = 0;
+   CmMemEntries  *entry = NULLP;
 
 
    /* check for the total number of entries in the hash list. *
@@ -6258,21 +5796,13 @@ uint8_t        entId;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmGetHashIdxAndKey
 (
-uint8_t                 *fileName,
-uint32_t                line,
-uint32_t                *binIdx,
-uint32_t                *key
+uint8_t   *fileName,
+uint32_t  line,
+uint32_t  *binIdx,
+uint32_t  *key
 )
-#else
-static  S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key)
-uint8_t                 *fileName;
-uint32_t                line;
-uint32_t                *binIdx;
-uint32_t                *key;
-#endif
 {
 
    uint32_t  i = 0;
@@ -6307,23 +5837,14 @@ uint32_t                *key;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFillEntry
 (
 CmMemEntries       *entry,
-uint32_t                key,
-uint32_t                line,
-uint8_t                 *fileName,
-uint8_t                 entId
+uint32_t key,
+uint32_t line,
+uint8_t  *fileName,
+uint8_t  entId
 )
-#else
-static  S16 cmHstGrmFillEntry(entry, key, line, fileName, entId)
-CmMemEntries       *entry;
-uint32_t                key;
-uint32_t                line;
-uint8_t                 *fileName;
-uint8_t                 entId;
-#endif
 {
 
    uint32_t       idx = 0;
@@ -6355,29 +5876,20 @@ uint8_t                 entId;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static S16 cmHstGrmFindEntry
 (
 CmHstGrmHashListCp  *hashListCp,
-uint32_t                 key,
-uint32_t                 *binIdx,
+uint32_t            key,
+uint32_t            *binIdx,
 CmMemEntries        **entry
 )
-#else
-static  S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry)
-CmHstGrmHashListCp  *hashListCp;
-uint32_t                 key;
-uint32_t                 *binIdx;
-CmMemEntries        **entry;
-#endif
 {
 
-   uint32_t                  numEnt = 0;
-   uint32_t                  numBin = 0;
+   uint32_t             numEnt = 0;
+   uint32_t             numBin = 0;
    CmHstGrmHashListEnt  *tmpBin = NULLP;
 
 
-
    for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++)
    {
       /* find for the entry in the bin */
@@ -6550,17 +6062,11 @@ void DumpT2kMemLeakInfoToFile()
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
 
 /* For Updating SOC Specific Memory Information */
-#ifdef ANSI
 S16 UpdateSocMemInfo
 (
 uint8_t areaIndex,
 CmLteMemInfo *mInfo
 )
-#else
-S16 UpdateSocMemInfo(areaIndex,mInfo)
-uint8_t areaIndex;
-CmLteMemInfo *mInfo;
-#endif
 {
    uint8_t  idxReg;
    uint8_t  idxPool;
@@ -6636,14 +6142,9 @@ CmLteMemInfo *mInfo;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 uint32_t isL2MemUsageBelowLowerThreshold(
 Region region
 )
-#else
-uint32_t isL2MemUsageBelowLowerThreshold(region)
-Region region;
-#endif
 {
    void * iccHdl = ssGetIccHdl(region);
 
@@ -6680,14 +6181,9 @@ Region region;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 uint32_t isMemUsageBelowLowerThreshold(
 Region region
 )
-#else
-uint32_t isMemUsageBelowLowerThreshold(region)
-Region region;
-#endif
 {
    void * iccHdl = ssGetIccHdl(region);
 
@@ -6729,14 +6225,9 @@ Region region;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 static uint32_t isMemUsageAboveUpperThreshold(
 Region region
 )
-#else
-static uint32_t isMemUsageAboveUpperThreshold(region)
-Region region;
-#endif
 {
    void * iccHdl = ssGetIccHdl(region);
 
@@ -6792,14 +6283,9 @@ Region region;
 *       File:  cm_mem_wl.c
 *
 */
-#ifdef ANSI
 uint32_t isMemThreshReached(
 Region reg
 )
-#else
-uint32_t isMemThreshReached(reg)
-Region reg;
-#endif
 {
    if(gMemoryAlarm)
    {
index b0ca7f7..2c4b8c3 100755 (executable)
@@ -100,17 +100,7 @@ static Buffer* TSInfUtlAllocMsg ARGS((
 *
 *
 */
-#ifdef ANSI
-static Void TSInfTrigL2Stats
-(
- Region    region,
- Pool      pool
-)
-#else
-static Void TSInfTrigL2Stats(region, pool)
- Region    region;
- Pool      pool;
-#endif
+static Void TSInfTrigL2Stats(Region region,Pool pool)
 {
    Buffer* pBuf;
    Pst pst = {0};
@@ -143,17 +133,7 @@ static Void TSInfTrigL2Stats(region, pool)
 *
 *
 */
-#ifdef ANSI
-Void TSInfTrigStats
-(
- Region    region,
- Pool      pool
-)
-#else
-Void TSInfTrigStats(region, pool)
- Region    region;
- Pool      pool;
-#endif
+Void TSInfTrigStats(Region region,Pool pool)
 {
 //TODO
    TSInfTrigL2Stats(region, pool);
@@ -162,15 +142,7 @@ Void TSInfTrigStats(region, pool)
 }
 
          
-#ifdef ANSI
-static Buffer* TSInfUtlAllocMsg
-(
- Pst   *pst
-)
-#else
-static Buffer* TSInfUtlAllocMsg(pst)
- Pst   *pst;
-#endif
+static Buffer* TSInfUtlAllocMsg(Pst   *pst)
 {
    Buffer *mBuf; 
 
@@ -181,17 +153,7 @@ static Buffer* TSInfUtlAllocMsg(pst)
    return (mBuf);
 }
 
-#ifdef ANSI
-static Void TSInfUtlPackUeInfo
-(
- Buffer            *mBuf,
- TSInfL2UeStats     *stats
-)
-#else
-static Void TSInfUtlPackUeInfo(mBuf, stats)
- Buffer            *mBuf;
- TSInfL2UeStats     *stats; 
-#endif
+static Void TSInfUtlPackUeInfo(Buffer *mBuf,TSInfL2UeStats *stats)
 {
    S32 i;
    uint32_t k;
@@ -262,17 +224,7 @@ static Void TSInfUtlPackUeInfo(mBuf, stats)
    return;
 }
 
-#ifdef ANSI
-static Void TSInfUtlPackCellInfo
-(
- Buffer              *mBuf,
- TSInfL2CellStats     *stats  
-)
-#else
-static Void TSInfUtlPackCellInfo(mBuf, stats)
- Buffer              *mBuf;
- TSInfL2CellStats     *stats; 
-#endif
+static Void TSInfUtlPackCellInfo(Buffer *mBuf,TSInfL2CellStats *stats  )
 {
    S32 i,j;
 
@@ -378,17 +330,7 @@ static Void TSInfUtlPackCellInfo(mBuf, stats)
    return;
 }
 
-#ifdef ANSI
-static Void TSInfUtlUnpkUeInfo
-(
- Buffer            *mBuf,
- TSInfL2UeStats     *stats 
-)
-#else
-static Void TSInfUtlUnpkUeInfo(mBuf, stats)
- Buffer            *mBuf;
- TSInfL2UeStats     *stats; 
-#endif
+static Void TSInfUtlUnpkUeInfo(Buffer *mBuf, TSInfL2UeStats *stats )
 {
    S32 i;
    uint32_t k;
@@ -460,17 +402,7 @@ static Void TSInfUtlUnpkUeInfo(mBuf, stats)
    return;
 }
 
-#ifdef ANSI
-static Void TSInfUtlUnpkCellInfo
-(
- Buffer              *mBuf,
- TSInfL2CellStats     *stats 
-)
-#else
-static Void TSInfUtlUnpkCellInfo(mBuf, stats)
- Buffer              *mBuf;
- TSInfL2CellStats     *stats; 
-#endif
+static Void TSInfUtlUnpkCellInfo(Buffer *mBuf,TSInfL2CellStats *stats )
 {
    S32 i,j;
 
@@ -576,19 +508,7 @@ static Void TSInfUtlUnpkCellInfo(mBuf, stats)
    return;
 }
 
-#ifdef ANSI
-Void TSInfPkSndL2UeStats
-(
- Pst               *pst,
- SuId              suId,
- TSInfL2UeStats     *stats  
-)
-#else
-Void TSInfPkSndL2UeStats(pst, suId, stats)
- Pst               *pst;
- SuId              suId;
- TSInfL2UeStats     *stats;
-#endif
+Void TSInfPkSndL2UeStats(Pst  *pst,SuId suId,TSInfL2UeStats *stats)
 {
    Buffer *mBuf;
 
@@ -601,24 +521,11 @@ Void TSInfPkSndL2UeStats(pst, suId, stats)
    return;
 }
 
-#ifdef ANSI
-Void TSInfUnpkL2UeStats
-(
- TSInfL2UeStatsInd   func,
- Pst                *pst,
- Buffer             *mBuf
-)
-#else
-Void TSInfUnpkL2UeStats(func, pst, mBuf)
- TSInfL2UeStatsInd   func;
- Pst                *pst;
- Buffer             *mBuf;
-#endif
+Void TSInfUnpkL2UeStats(TSInfL2UeStatsInd func, Pst  *pst,Buffer *mBuf)
 {
    SuId              suId;
    TSInfL2UeStats     stats; 
 
-
    SUnpkS16(&suId, mBuf);
    TSInfUtlUnpkUeInfo(mBuf, &stats);
    SPutMsg(mBuf);
@@ -626,23 +533,10 @@ Void TSInfUnpkL2UeStats(func, pst, mBuf)
    return;
 }
 
-#ifdef ANSI
-Void TSInfPkSndL2CellStats
-(
- Pst                 *pst,
- SuId                suId,
- TSInfL2CellStats   *stats 
-)
-#else
-Void TSInfPkSndL2CellStats(pst, suId, stats)
- Pst                 *pst;
- SuId                suId;
- TSInfL2Cellstats   *stats;
-#endif
+Void TSInfPkSndL2CellStats(Pst *pst,SuId suId,TSInfL2CellStats   *stats )
 {
    Buffer *mBuf;
 
-
    mBuf = TSInfUtlAllocMsg(pst);
    TSInfUtlPackCellInfo(mBuf, stats);
    SPkS16(suId, mBuf);
@@ -651,19 +545,7 @@ Void TSInfPkSndL2CellStats(pst, suId, stats)
    return;
 }
 
-#ifdef ANSI
-Void TSInfUnpkL2CellStats
-(
- TSInfL2CellStatsInd   func,
- Pst                *pst,
- Buffer             *mBuf
-)
-#else
-Void TSInfUnpkL2CellStats(func, pst, mBuf)
- TSInfL2CellStatsInd   func;
- Pst                *pst;
- Buffer             *mBuf;
-#endif
+Void TSInfUnpkL2CellStats(TSInfL2CellStatsInd func,Pst  *pst,Buffer *mBuf)
 {
    SuId                suId;
    TSInfL2CellStats    stats; 
index 3020f74..165ea0a 100644 (file)
         File:  cm_tkns.c
  *
  */
-#ifdef ANSI
 S16 cmPkTknS16
 (
 TknS16 *tknS16,             /* token S16 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknS16(tknS16, mBuf)
-TknS16 *tknS16;             /* token S16 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    if (tknS16->pres)
@@ -106,17 +100,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknBStr32
 (
 TknBStr32 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknBStr32(tknStr, mBuf)
-TknBStr32 *tknStr;             /* token string */
-Buffer    *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNBSTR(tknStr, mBuf);
@@ -139,17 +127,11 @@ Buffer    *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr8
 (
 TknStr8 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr8(tknStr, mBuf)
-TknStr8 *tknStr;             /* token string */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -173,17 +155,11 @@ Buffer  *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStr16
 (
 TknStr16 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStr16(tknStr, mBuf)
-TknStr16 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMPKTKNSTR(tknStr, mBuf);
@@ -207,17 +183,11 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrOSXL
 (
 TknStrOSXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrOSXL(tknStr, mBuf)
-TknStrOSXL *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint16_t ndx;
 
@@ -255,17 +225,11 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrBSXL
 (
 TknStrBSXL *tknStr,             /* token string */
 Buffer     *mBuf              /* message buffer */
 )
-#else
-S16 cmPkTknStrBSXL(tknStr, mBuf)
-TknStrBSXL *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint16_t ndx;
    uint16_t len;
@@ -308,17 +272,11 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrBMP4
 (
 TknStrBMP4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrBMP4(tknStr, mBuf)
-TknStrBMP4 *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint8_t ndx;
 
@@ -356,17 +314,11 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrBMPXL
 (
 TknStrBMPXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrBMPXL(tknStr, mBuf)
-TknStrBMPXL *tknStr;             /* token string */
-Buffer      *mBuf;               /* message buffer */
-#endif
 {
    uint16_t ndx;
 
@@ -402,17 +354,11 @@ Buffer      *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrUNI4
 (
 TknStrUNI4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrUNI4(tknStr, mBuf)
-TknStrUNI4 *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint8_t ndx;
 
@@ -450,17 +396,11 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmPkTknStrUNIXL
 (
 TknStrUNIXL *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmPkTknStrUNIXL(tknStr, mBuf)
-TknStrUNIXL *tknStr;             /* token string */
-Buffer      *mBuf;               /* message buffer */
-#endif
 {
    uint16_t ndx;
 
@@ -499,17 +439,11 @@ Buffer      *mBuf;               /* message buffer */
         File:  cm_tkns.c
  *
  */
-#ifdef ANSI
 S16 cmUnpkTknS16
 (
 TknS16 *tknS16,             /* token S16 */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknS16(tknS16, mBuf)
-TknS16 *tknS16;             /* token S16 */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    /* Token Header */
@@ -539,17 +473,11 @@ Buffer *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknBStr32
 (
 TknBStr32 *tknStr,             /* token string */
 Buffer    *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknBStr32(tknStr, mBuf)
-TknBStr32 *tknStr;             /* token string */
-Buffer    *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNBSTR(tknStr, mBuf);
@@ -573,17 +501,11 @@ Buffer    *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr8
 (
 TknStr8 *tknStr,             /* token string */
 Buffer  *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr8(tknStr, mBuf)
-TknStr8 *tknStr;             /* token string */
-Buffer  *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -607,17 +529,11 @@ Buffer  *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStr16
 (
 TknStr16 *tknStr,             /* token string */
 Buffer   *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStr16(tknStr, mBuf)
-TknStr16 *tknStr;             /* token string */
-Buffer   *mBuf;               /* message buffer */
-#endif
 {
 
    CMUNPKTKNSTR(tknStr, mBuf);
@@ -641,19 +557,12 @@ Buffer   *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrOSXL
 (
 TknStrOSXL *tknStr,             /* token string */
 Buffer     *mBuf,               /* message buffer */
 Ptr         ptr                 /* pointer to memory control block */
 )
-#else
-S16 cmUnpkTknStrOSXL(tknStr, mBuf, ptr)
-TknStrOSXL *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-Ptr         ptr;                /* pointer to control memory block */
-#endif
 {
    uint16_t ndx;
 
@@ -695,19 +604,12 @@ Ptr         ptr;                /* pointer to control memory block */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrBSXL
 (
 TknStrBSXL *tknStr,             /* token string */
 Ptr         ptr,                /* pointer to memory control block */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrBSXL(tknStr, ptr, mBuf)
-TknStrBSXL *tknStr;             /* token string */
-Ptr         ptr;                /* pointer to control memory block */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint16_t ndx;
    uint16_t len;
@@ -755,17 +657,11 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrBMP4
 (
 TknStrBMP4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrBMP4(tknStr, mBuf)
-TknStrBMP4 *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint8_t ndx;
 
@@ -803,19 +699,12 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrBMPXL
 (
 TknStrBMPXL *tknStr,             /* token string */
 Buffer      *mBuf,               /* message buffer */
 Ptr          ptr                 /* pointer to memory control block */
 )
-#else
-S16 cmUnpkTknStrBMPXL(tknStr, mBuf, ptr)
-TknStrBMPXL *tknStr;             /* token string */
-Buffer      *mBuf;               /* message buffer */
-Ptr          ptr;                /* pointer to control memory block */
-#endif
 {
    uint16_t ndx;
 
@@ -858,17 +747,11 @@ Ptr          ptr;                /* pointer to control memory block */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrUNI4
 (
 TknStrUNI4 *tknStr,             /* token string */
 Buffer     *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkTknStrUNI4(tknStr, mBuf)
-TknStrUNI4 *tknStr;             /* token string */
-Buffer     *mBuf;               /* message buffer */
-#endif
 {
    uint8_t ndx;
 
@@ -906,19 +789,12 @@ Buffer     *mBuf;               /* message buffer */
  *
  */
   
-#ifdef ANSI
 S16 cmUnpkTknStrUNIXL
 (
 TknStrUNIXL *tknStr,             /* token string */
 Buffer      *mBuf,               /* message buffer */
 Ptr          ptr                 /* pointer to memory control block */
 )
-#else
-S16 cmUnpkTknStrUNIXL(tknStr, mBuf, ptr)
-TknStrUNIXL *tknStr;             /* token string */
-Buffer      *mBuf;               /* message buffer */
-Ptr          ptr;                /* pointer to control memory block */
-#endif
 {
    uint16_t ndx;
 
index e22afae..2fb4170 100755 (executable)
@@ -114,17 +114,11 @@ extern "C" {
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv4TptAddr
 (
 CmIpv4TptAddr            *pkParam,  /* IPv4 Address structure */
 Buffer                   *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv4TptAddr (pkParam, mBuf)
-CmIpv4TptAddr            *pkParam;  /* IPv4 Address structure */
-Buffer                   *mBuf;     /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf);
@@ -146,17 +140,11 @@ Buffer                   *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmPkCmIpv6NetAddr
 (
-CmIpv6NetAddr            *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmIpv6NetAddr  *pkParam,     
+Buffer         *mBuf         /* message buffer */
 )
-#else
-static S16 cmPkCmIpv6NetAddr (pkParam, mBuf)
-CmIpv6NetAddr            *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint8_t num;
    uint8_t *ptr = (uint8_t*)pkParam;
@@ -184,17 +172,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmPkCmIpv6TptAddr
 (
-CmIpv6TptAddr            *pkParam,     /* IPv6 transport address */
-Buffer                   *mBuf         /* message buffer */
+CmIpv6TptAddr  *pkParam,     /* IPv6 transport address */
+Buffer         *mBuf         /* message buffer */
 )
-#else
-static S16 cmPkCmIpv6TptAddr (pkParam, mBuf)
-CmIpv6TptAddr            *pkParam;     /* IPv6 transport address */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf);
@@ -217,20 +199,14 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmNetAddrTbl
 (
-CmNetAddrTbl            *pkParam,      /* Network Address Table */
-Buffer                  *mBuf          /* message buffer */
+CmNetAddrTbl   *pkParam,      /* Network Address Table */
+Buffer         *mBuf          /* message buffer */
 )
-#else
-S16 cmPkCmNetAddrTbl (pkParam, mBuf)
-CmNetAddrTbl            *pkParam;      /* Network Address Table */
-Buffer                  *mBuf;         /* message buffer */
-#endif
 {
-   uint16_t                  idx;           /* Loop Index */
-   CmNetAddr            *netAddr;      /* Network Address */
+   uint16_t    idx;           /* Loop Index */
+   CmNetAddr   *netAddr;      /* Network Address */
 
 
    if (pkParam->count > CM_MAX_NET_ADDR)
@@ -265,17 +241,11 @@ Buffer                  *mBuf;         /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmNetAddr
 (
-CmNetAddr                *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmNetAddr  *pkParam,     
+Buffer     *mBuf         /* message buffer */
 )
-#else
-S16 cmPkCmNetAddr (pkParam, mBuf)
-CmNetAddr                *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    switch (pkParam->type)
@@ -313,17 +283,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmTptAddr
 (
-CmTptAddr                *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmTptAddr  *pkParam,     
+Buffer     *mBuf         /* message buffer */
 )
-#else
-S16 cmPkCmTptAddr (pkParam, mBuf)
-CmTptAddr                *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    switch (pkParam->type)
@@ -363,17 +327,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmTptLocalInf
 (
-CmTptLocalInf           *pkParam,   /* local interface info */
-Buffer                  *mBuf       /* message buffer */
+CmTptLocalInf  *pkParam,   /* local interface info */
+Buffer         *mBuf       /* message buffer */
 )
-#else
-S16 cmPkCmTptLocalInf (pkParam, mBuf)
-CmTptLocalInf           *pkParam;   /* local interface info */
-Buffer                  *mBuf;      /* message buffer */
-#endif
 {
 
    if (pkParam->intfPrsnt == TRUE)
@@ -404,17 +362,11 @@ Buffer                  *mBuf;      /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmNetMCastInf6
 (
-CmNetMCastInf6            *pkParam,     /* IPv6 multicast information */
-Buffer                    *mBuf         /* message buffer */
+CmNetMCastInf6  *pkParam,     /* IPv6 multicast information */
+Buffer          *mBuf         /* message buffer */
 )
-#else
-S16 cmPkCmNetMCastInf6(pkParam, mBuf)
-CmNetMCastInf6            *pkParam;     /* IPv6 multicast information */
-Buffer                    *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf);
@@ -438,17 +390,11 @@ Buffer                    *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmPkCmSockOpts
 (
-CmSockOpts               *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmSockOpts *pkParam,     
+Buffer     *mBuf         /* message buffer */
 )
-#else
-static S16 cmPkCmSockOpts (pkParam, mBuf)
-CmSockOpts               *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    switch (pkParam->option)
@@ -503,17 +449,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmPkCmSockParam
 (
-CmSockParam              *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmSockParam *pkParam,     
+Buffer      *mBuf         /* message buffer */
 )
-#else
-static S16 cmPkCmSockParam (pkParam, mBuf)
-CmSockParam              *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint32_t num;
 
@@ -547,17 +487,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmPkTlsTptParam
 (
-TlsTptParam              *pkParam,     /**/
-Buffer                   *mBuf         /* message buffer */
+TlsTptParam *pkParam,     /**/
+Buffer      *mBuf         /* message buffer */
 )
-#else
-static S16 cmPkTlsTptParam(pkParam, mBuf)
-TlsTptParam              *pkParam;     /**/
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint32_t num;
 
@@ -593,17 +527,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmTptParam
 (
-CmTptParam               *pkParam,     
-Buffer                   *mBuf         /* message buffer */
+CmTptParam *pkParam,     
+Buffer     *mBuf         /* message buffer */
 )
-#else
-S16 cmPkCmTptParam (pkParam, mBuf)
-CmTptParam               *pkParam;     
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    switch (pkParam->type)
@@ -656,17 +584,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv4TptAddr 
 (
-CmIpv4TptAddr            *unpkParam,     /* IPv4 Address */
-Buffer                   *mBuf           /* message buffer */
+CmIpv4TptAddr *unpkParam,     /* IPv4 Address */
+Buffer        *mBuf           /* message buffer */
 )
-#else
-S16 cmUnpkCmIpv4TptAddr (unpkParam, mBuf)
-CmIpv4TptAddr            *unpkParam;     /* IPv4 Address */
-Buffer                   *mBuf;          /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
@@ -689,17 +611,11 @@ Buffer                   *mBuf;          /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmUnpkCmIpv6NetAddr
 (
-CmIpv6NetAddr            *unpkParam,   /* IPv6 address */
-Buffer                   *mBuf         /* message buffer */
+CmIpv6NetAddr  *unpkParam,   /* IPv6 address */
+Buffer         *mBuf         /* message buffer */
 )
-#else
-static S16 cmUnpkCmIpv6NetAddr (unpkParam, mBuf)
-CmIpv6NetAddr            *unpkParam;   /* IPv6 address */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint32_t num;
    uint8_t *ptr = (uint8_t*)unpkParam;
@@ -729,17 +645,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmUnpkCmIpv6TptAddr
 (
-CmIpv6TptAddr            *unpkParam,   /* IPv6 transport address */
-Buffer                   *mBuf         /* message buffer */
+CmIpv6TptAddr  *unpkParam,   /* IPv6 transport address */
+Buffer         *mBuf         /* message buffer */
 )
-#else
-static S16 cmUnpkCmIpv6TptAddr (unpkParam, mBuf)
-CmIpv6TptAddr            *unpkParam;   /* IPv6 transport address */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
@@ -762,22 +672,15 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmNetAddrTbl
 (
-CmNetAddrTbl            *unpkParam,    /* Network Address Table */
-Buffer                  *mBuf          /* message buffer */
+CmNetAddrTbl  *unpkParam,    /* Network Address Table */
+Buffer        *mBuf          /* message buffer */
 )
-#else
-S16 cmUnpkCmNetAddrTbl (unpkParam, mBuf )
-CmNetAddrTbl            *unpkParam;    /* Network Address Table */
-Buffer                  *mBuf;         /* message buffer */
-#endif
 {
-   uint16_t                  idx;           /* Loop Index */
-   CmNetAddr            *netAddr;      /* Network Address */
+   uint16_t   idx;           /* Loop Index */
+   CmNetAddr  *netAddr;      /* Network Address */
    
-
    /* Unpack the count */
    CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf);
 
@@ -808,17 +711,11 @@ Buffer                  *mBuf;         /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmNetAddr
 (
-CmNetAddr                *unpkParam,   
-Buffer                   *mBuf         /* message buffer */
+CmNetAddr *unpkParam,   
+Buffer    *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkCmNetAddr (unpkParam, mBuf )
-CmNetAddr                *unpkParam;   
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
@@ -857,17 +754,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmTptAddr
 (
-CmTptAddr                *unpkParam,   
-Buffer                   *mBuf         /* message buffer */
+CmTptAddr *unpkParam,   
+Buffer    *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkCmTptAddr (unpkParam, mBuf)
-CmTptAddr                *unpkParam;   
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
@@ -908,17 +799,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmNetMCastInf6
 (
-CmNetMCastInf6            *unpkParam,   /* IPv6 multicast information */
-Buffer                    *mBuf         /* message buffer */
+CmNetMCastInf6 *unpkParam,   /* IPv6 multicast information */
+Buffer         *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkCmNetMCastInf6(unpkParam, mBuf)
-CmNetMCastInf6            *unpkParam;   /* IPv6 multicast information */
-Buffer                    *mBuf;        /* message buffer */
-#endif
 {
 
     CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf);
@@ -942,17 +827,11 @@ Buffer                    *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmUnpkCmSockOpts
 (
-CmSockOpts               *unpkParam,   /* socket options */
-Buffer                   *mBuf         /* message buffer */
+CmSockOpts *unpkParam,   /* socket options */
+Buffer     *mBuf         /* message buffer */
 )
-#else
-static S16 cmUnpkCmSockOpts (unpkParam, mBuf)
-CmSockOpts               *unpkParam;   /* socket options */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf);
@@ -1009,17 +888,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmUnpkCmSockParam
 (
-CmSockParam              *unpkParam,   /* socket parameters */
-Buffer                   *mBuf         /* message buffer */
+CmSockParam *unpkParam,   /* socket parameters */
+Buffer      *mBuf         /* message buffer */
 )
-#else
-static S16 cmUnpkCmSockParam (unpkParam, mBuf)
-CmSockParam              *unpkParam;   /* socket parameters */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint32_t num;
 
@@ -1055,17 +928,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 static S16 cmUnpkTlsTptParam
 (
-TlsTptParam              *unpkParam,   /* TLS parameters */
-Buffer                   *mBuf         /* message buffer */
+TlsTptParam *unpkParam,   /* TLS parameters */
+Buffer      *mBuf         /* message buffer */
 )
-#else
-static S16 cmUnpkTlsTptParam (unpkParam, mBuf)
-TlsTptParam              *unpkParam;   /* TLS parameters */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    uint32_t num;
 
@@ -1103,17 +970,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmTptParam
 (
-CmTptParam               *unpkParam,   /* transport parameters */
-Buffer                   *mBuf         /* message buffer */
+CmTptParam  *unpkParam,   /* transport parameters */
+Buffer      *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkCmTptParam (unpkParam, mBuf)
-CmTptParam               *unpkParam;   /* transport parameters */
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
@@ -1163,17 +1024,11 @@ Buffer                   *mBuf;        /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpHdrParm
 (
-CmIpHdrParm             *pkParam,   /* IP hdr parameters */ 
-Buffer                  *mBuf       /* message buffer */
+CmIpHdrParm *pkParam,   /* IP hdr parameters */ 
+Buffer      *mBuf       /* message buffer */
 )
-#else
-S16 cmPkCmIpHdrParm (pkParam, mBuf)
-CmIpHdrParm             *pkParam;   /* IP hdr parameters */
-Buffer                  *mBuf;      /* message buffer */
-#endif
 {
 
    switch (pkParam->type)
@@ -1233,17 +1088,11 @@ Buffer                  *mBuf;      /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmTptLocalInf
 (
-CmTptLocalInf           *unpkParam, /* local interface info */
-Buffer                  *mBuf       /* message buffer */
+CmTptLocalInf *unpkParam, /* local interface info */
+Buffer        *mBuf       /* message buffer */
 )
-#else
-S16 cmUnpkCmTptLocalInf (unpkParam, mBuf)
-CmTptLocalInf           *unpkParam; /* local interface info */
-Buffer                  *mBuf;      /* message buffer */
-#endif
 {
 
    /* first unpack the bool intfPrsnt value which is always packed */
@@ -1275,17 +1124,11 @@ Buffer                  *mBuf;      /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6ExtHdr
 (
-CmIpv6ExtHdr             *pkParam,   /* IPV6 extension hdrs */
-Buffer                   *mBuf       /* message buffer */
+CmIpv6ExtHdr *pkParam,   /* IPV6 extension hdrs */
+Buffer       *mBuf       /* message buffer */
 )
-#else
-S16 cmPkCmIpv6ExtHdr (pkParam, mBuf)
-CmIpv6ExtHdr             *pkParam;   /*IPV6 extension hdrs */
-Buffer                   *mBuf;      /* message buffer */
-#endif
 {
 
    /* pack first Route hdr */   
@@ -1320,17 +1163,11 @@ Buffer                   *mBuf;      /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6RtHdr
 (
-CmIpv6RtHdr             *pkParam,   /* IPV6 Route hdr */
-Buffer                   *mBuf      /* message buffer */
+CmIpv6RtHdr *pkParam,   /* IPV6 Route hdr */
+Buffer      *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv6RtHdr (pkParam, mBuf)
-CmIpv6RtHdr             *pkParam;   /* IPV6 Route hdr */
-Buffer                   *mBuf;     /* message buffer */
-#endif
 {
    uint8_t idx;
    
@@ -1362,19 +1199,12 @@ Buffer                   *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6RtHdr
 (
-CmIpv6RtHdr             *unpkParam,  /* IPV6 Route hdr */
-Buffer                  *mBuf,       /* message buffer */
-Mem                     *memInfo     /* meminfo to allocate for Route hdr */
+CmIpv6RtHdr *unpkParam,  /* IPV6 Route hdr */
+Buffer      *mBuf,       /* message buffer */
+Mem         *memInfo     /* meminfo to allocate for Route hdr */
 )
-#else
-S16 cmUnpkCmIpv6RtHdr (unpkParam, mBuf, memInfo)
-CmIpv6RtHdr             *unpkParam;  /* IPV6 Route hdr */
-Buffer                  *mBuf;       /* message buffer */
-Mem                     *memInfo;    /* meminfo to allocate for Route hdr */
-#endif
 {
    uint8_t idx;  /* array index */
    S32 retVal; /* temporary return value */
@@ -1418,19 +1248,12 @@ Mem                     *memInfo;    /* meminfo to allocate for Route hdr */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6ExtHdr
 (
-CmIpv6ExtHdr             *unpkParam,  /* IPV6 extension hdrs */
-Buffer                   *mBuf,       /* message buffer */
-Mem                      *memInfo     /* meminfo to allocate for IPV6 ext hdr */
+CmIpv6ExtHdr *unpkParam,  /* IPV6 extension hdrs */
+Buffer       *mBuf,       /* message buffer */
+Mem          *memInfo     /* meminfo to allocate for IPV6 ext hdr */
 )
-#else
-S16 cmUnpkCmIpv6ExtHdr (unpkParam, mBuf, memInfo)
-CmIpv6ExtHdr             *unpkParam; /* IPV6 extension hdrs */
-Buffer                   *mBuf;      /* message buffer */
-Mem                      *memInfo;   /* meminfo to allocate for IPV6 ext hdr */
-#endif
 {
       
    /* unpack HBH hdr first */
@@ -1465,17 +1288,11 @@ Mem                      *memInfo;   /* meminfo to allocate for IPV6 ext hdr */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6DestOptsArr
 (
-CmIpv6DestOptsArr       *pkParam,  /* IPV6 Dest hdr array */
-Buffer                  *mBuf      /* message buffer */
+CmIpv6DestOptsArr *pkParam,  /* IPV6 Dest hdr array */
+Buffer            *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv6DestOptsArr (pkParam, mBuf)
-CmIpv6DestOptsArr       *pkParam;  /* IPV6 Dest hdr array */
-Buffer                  *mBuf;     /* message buffer */
-#endif
 {
 
    uint8_t numOptions;
@@ -1503,17 +1320,11 @@ Buffer                  *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6DestOptsHdr
 (
-CmIpv6DestOptsHdr       *pkParam,  /* IPV6 Dest opt */
-Buffer                  *mBuf      /* message buffer */
+CmIpv6DestOptsHdr *pkParam,  /* IPV6 Dest opt */
+Buffer            *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv6DestOptsHdr (pkParam, mBuf)
-CmIpv6DestOptsHdr       *pkParam;  /* IPV6 Dest opt */
-Buffer                  *mBuf;     /* message buffer */
-#endif
 {
    uint8_t optLen;
    
@@ -1542,19 +1353,12 @@ Buffer                  *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6DestOptsHdr
 (
-CmIpv6DestOptsHdr       *unpkParam,/* IPV6 Dest Option */
-Buffer                  *mBuf,     /* message buffer */
-Mem                     *memInfo   /* meminfo to allocate mem for dest opt */
+CmIpv6DestOptsHdr *unpkParam,/* IPV6 Dest Option */
+Buffer            *mBuf,     /* message buffer */
+Mem               *memInfo   /* meminfo to allocate mem for dest opt */
 )
-#else
-S16 cmUnpkCmIpv6DestOptsHdr (unpkParam, mBuf, memInfo)
-CmIpv6DestOptsHdr       *unpkParam;/* IPV6 Dest Option */
-Buffer                  *mBuf;     /* message buffer */
-Mem                     *memInfo;  /* meminfo to allocate mem for dest opt */
-#endif
 {
    S32 retVal;                        /* temporary return value */
    uint8_t optLen;                      /* length of value field */
@@ -1596,19 +1400,12 @@ Mem                     *memInfo;  /* meminfo to allocate mem for dest opt */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6DestOptsArr
 (
-CmIpv6DestOptsArr       *unpkParam, /* all IPV6 Destination Options */
-Buffer                  *mBuf,      /* message buffer */
-Mem                     *memInfo    /* meminfo to allocate mem for dest opts */
+CmIpv6DestOptsArr *unpkParam, /* all IPV6 Destination Options */
+Buffer            *mBuf,      /* message buffer */
+Mem               *memInfo    /* meminfo to allocate mem for dest opts */
 )
-#else
-S16 cmUnpkCmIpv6DestOptsArr (unpkParam, mBuf, memInfo)
-CmIpv6DestOptsArr       *unpkParam; /* all IPV6 Destination Options */
-Buffer                  *mBuf;      /* message buffer */
-Mem                     *memInfo;   /* meminfo to allocate mem for dest opts */
-#endif
 {
    uint8_t numOptions;
    S16 retVal;
@@ -1652,17 +1449,11 @@ Mem                     *memInfo;   /* meminfo to allocate mem for dest opts */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6HBHHdrArr
 (
-CmIpv6HBHHdrArr         *pkParam,  /* all IPV6 HopByHop options */
-Buffer                  *mBuf      /* message buffer */
+CmIpv6HBHHdrArr *pkParam,  /* all IPV6 HopByHop options */
+Buffer          *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv6HBHHdrArr (pkParam, mBuf)
-CmIpv6HBHHdrArr         *pkParam;  /* IPV6 HopByHop options */
-Buffer                  *mBuf;     /* message buffer */
-#endif
 {
    uint8_t numOptions;
    
@@ -1689,17 +1480,11 @@ Buffer                  *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIpv6HBHHdr
 (
-CmIpv6HBHHdr            *pkParam,  /* individual IPV6 HBH options */
-Buffer                  *mBuf      /* message buffer */
+CmIpv6HBHHdr *pkParam,  /* individual IPV6 HBH options */
+Buffer       *mBuf      /* message buffer */
 )
-#else
-S16 cmPkCmIpv6HBHHdr (pkParam, mBuf)
-CmIpv6HBHHdr            *pkParam;  /* individual IPV6 HBH options */
-Buffer                  *mBuf;     /* message buffer */
-#endif
 {
    uint8_t optLen;
 
@@ -1731,23 +1516,15 @@ Buffer                  *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6HBHHdr
 (
-CmIpv6HBHHdr            *unpkParam,/* individual IPV6 HBH Option */
-Buffer                  *mBuf,     /* message buffer */
-Mem                     *memInfo   /* meminfo to allocate mem for HBH opt */
+CmIpv6HBHHdr *unpkParam,/* individual IPV6 HBH Option */
+Buffer       *mBuf,     /* message buffer */
+Mem          *memInfo   /* meminfo to allocate mem for HBH opt */
 )
-#else
-S16 cmUnpkCmIpv6HBHHdr (unpkParam, mBuf, memInfo)
-CmIpv6HBHHdr            *unpkParam;/* individual IPV6 HBH Option */
-Buffer                  *mBuf;     /* message buffer */
-Mem                     *memInfo;  /* meminfo to allocate mem for HBH opt */
-#endif
 {
    S32 retVal;                     /* temporary return value */
    uint8_t optLen;                      /* length of value field */
-  
    
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);   
    CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
@@ -1784,19 +1561,12 @@ Mem                     *memInfo;  /* meminfo to allocate mem for HBH opt */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIpv6HBHHdrArr
 (
-CmIpv6HBHHdrArr       *unpkParam,  /* all HBH options */
-Buffer                *mBuf,       /* message buffer */
-Mem                   *memInfo     /* meminfo to allocate space for HBH opt */
+CmIpv6HBHHdrArr *unpkParam,  /* all HBH options */
+Buffer          *mBuf,       /* message buffer */
+Mem             *memInfo     /* meminfo to allocate space for HBH opt */
 )
-#else
-S16 cmUnpkCmIpv6HBHHdrArr (unpkParam, mBuf, memInfo)
-CmIpv6HBHHdrArr       *unpkParam;  /*  all HBH options */
-Buffer                *mBuf;       /* message buffer */
-Mem                   *memInfo;    /* meminfo to allocate space for HBH opt */
-#endif
 {
    uint8_t numOptions; 
    S16 retVal;
@@ -1837,7 +1607,6 @@ Mem                   *memInfo;    /* meminfo to allocate space for HBH opt */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 /* added */
 #ifdef IPV6_OPTS_SUPPORTED
 S16 cmUnpkCmIpHdrParm
@@ -1853,19 +1622,6 @@ CmIpHdrParm              *unpkParam,/* ip hdr parameters */
 Buffer                   *mBuf     /* message buffer */
 )
 #endif /* IPV6_OPTS_SUPPORTED */
-#else
-/* added */
-#ifdef IPV6_OPTS_SUPPORTED
-S16 cmUnpkCmIpHdrParm (unpkParam, mBuf, memInfo)
-CmIpHdrParm              *unpkParam;/* ip hdr parameters */
-Buffer                   *mBuf;     /* message buffer */
-Mem                      *memInfo;  /* meminfo to allocate mem for ipHdrParam */
-#else
-S16 cmUnpkCmIpHdrParm (unpkParam, mBuf)
-CmIpHdrParm              *unpkParam;/* ip hdr parameters */
-Buffer                   *mBuf;     /* message buffer */
-#endif /* IPV6_OPTS_SUPPORTED */
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
@@ -1923,17 +1679,11 @@ Buffer                   *mBuf;     /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmPkCmIcmpFilter
 (
-CmIcmpFilter             *pkParam,   
-Buffer                   *mBuf       /* message buffer */
+CmIcmpFilter *pkParam,   
+Buffer       *mBuf       /* message buffer */
 )
-#else
-S16 cmPkCmIcmpFilter (pkParam, mBuf)
-CmIcmpFilter             *pkParam;   
-Buffer                   *mBuf;      /* message buffer */
-#endif
 {
    /* Variable declaration */
    S16   idx;
@@ -1997,17 +1747,11 @@ Buffer                   *mBuf;      /* message buffer */
 *       File:  cm_tpt.c
 *
 */
-#ifdef ANSI
 S16 cmUnpkCmIcmpFilter
 (
-CmIcmpFilter             *unpkParam,   
-Buffer                   *mBuf         /* message buffer */
+CmIcmpFilter *unpkParam,   
+Buffer       *mBuf         /* message buffer */
 )
-#else
-S16 cmUnpkCmIcmpFilter (unpkParam, mBuf)
-CmIcmpFilter             *unpkParam;   
-Buffer                   *mBuf;        /* message buffer */
-#endif
 {
    /* Variable declaration */ 
    S16     idx;
index 2acd045..1e221cd 100755 (executable)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCrgBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkCrgBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -115,19 +108,12 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCrgBndReq
 (
 CrgBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgBndReq(func, pst, mBuf)
-CrgBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
@@ -170,19 +156,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCrgBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -231,19 +210,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCrgBndCfm
 (
 CrgBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgBndCfm(func, pst, mBuf)
-CrgBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    uint8_t status;
@@ -285,19 +257,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCrgUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkCrgUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -345,19 +310,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCrgUbndReq
 (
 CrgUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUbndReq(func, pst, mBuf)
-CrgUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
@@ -401,7 +359,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCrgCfgReq
 (
 Pst* pst,
@@ -409,13 +366,6 @@ SpId spId,
 CrgCfgTransId transId,
 CrgCfgReqInfo  * cfgReqInfo
 )
-#else
-S16 cmPkCrgCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CrgCfgTransId transId;
-CrgCfgReqInfo  * cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -488,19 +438,12 @@ CrgCfgReqInfo  * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCrgCfgReq
 (
 CrgCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCfgReq(func, pst, mBuf)
-CrgCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    CrgCfgTransId transId;
@@ -564,7 +507,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCrgCfgCfm
 (
 Pst* pst,
@@ -572,13 +514,6 @@ SuId suId,
 CrgCfgTransId transId,
 uint8_t status
 )
-#else
-S16 cmPkCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -637,19 +572,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCrgCfgCfm
 (
 CrgCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCfgCfm(func, pst, mBuf)
-CrgCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    CrgCfgTransId transId;
@@ -703,17 +631,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgCfgTransId(param, mBuf)
-CrgCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -741,17 +663,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCfgTransId(param, mBuf)
-CrgCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -779,17 +695,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -815,17 +725,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -851,17 +755,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -886,17 +784,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -921,20 +813,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf);
 #endif
@@ -965,17 +850,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1009,17 +888,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1043,17 +916,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkCrgUeSCellCfg
 (
 CrgUeSCellInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkCrgUeSCellCfg(param, mBuf)
-CrgUeSCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
    CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
@@ -1077,17 +944,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnpkCrgUeSCellCfg
 (
 CrgUeSCellInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkCrgUeSCellCfg(param, mBuf)
-CrgUeSCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->macInst, mBuf);
@@ -1110,17 +971,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgUeSecCellInfo
 (
 CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgUeSecCellInfo(param, mBuf)
-CrgUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
@@ -1149,17 +1004,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgUeSecCellInfo
 (
 CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUeSecCellInfo(param, mBuf)
-CrgUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -1195,17 +1044,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1230,17 +1073,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgUeCfg
 (
 CrgUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgUeCfg(param, mBuf)
-CrgUeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef TENB_MULT_CELL_SUPPRT
@@ -1272,17 +1109,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgUeCfg
 (
 CrgUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUeCfg(param, mBuf)
-CrgUeCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
    
@@ -1317,17 +1148,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1352,17 +1177,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1387,20 +1206,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
    return ROK;
@@ -1423,17 +1235,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1459,17 +1265,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgLchCfg
 (
 CrgLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgLchCfg(param, mBuf)
-CrgLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */
@@ -1503,17 +1303,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgLchCfg
 (
 CrgLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgLchCfg(param, mBuf)
-CrgLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1548,17 +1342,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgCfg
 (
 CrgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgCfg(param, mBuf)
-CrgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1596,17 +1384,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgCfg
 (
 CrgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCfg(param, mBuf)
-CrgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1644,17 +1426,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgCellRecfg
 (
 CrgCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgCellRecfg(param, mBuf)
-CrgCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1680,17 +1456,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgCellRecfg
 (
 CrgCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCellRecfg(param, mBuf)
-CrgCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1716,17 +1486,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgUeRecfg
 (
 CrgUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgUeRecfg(param, mBuf)
-CrgUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef LTE_ADV
@@ -1765,17 +1529,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgUeRecfg
 (
 CrgUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgUeRecfg(param, mBuf)
-CrgUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1808,17 +1566,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgLchRecfg
 (
 CrgLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgLchRecfg(param, mBuf)
-CrgLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1846,17 +1598,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgLchRecfg
 (
 CrgLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgLchRecfg(param, mBuf)
-CrgLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1884,17 +1630,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgRecfg
 (
 CrgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgRecfg(param, mBuf)
-CrgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1932,17 +1672,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgRecfg
 (
 CrgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgRecfg(param, mBuf)
-CrgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1980,17 +1714,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgDel
 (
 CrgDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgDel(param, mBuf)
-CrgDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2032,17 +1760,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgDel
 (
 CrgDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgDel(param, mBuf)
-CrgDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2084,17 +1806,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgRst
 (
 CrgRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgRst(param, mBuf)
-CrgRst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2120,17 +1836,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgRst
 (
 CrgRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgRst(param, mBuf)
-CrgRst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2156,17 +1866,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCrgCfgReqInfo
 (
 CrgCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCrgCfgReqInfo(param, mBuf)
-CrgCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2207,17 +1911,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCrgCfgReqInfo
 (
 CrgCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCrgCfgReqInfo(param, mBuf)
-CrgCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
index 08e00ea..4a943f2 100755 (executable)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkCtfBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -126,19 +119,12 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndReq
 (
 CtfBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndReq(func, pst, mBuf)
-CtfBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    SpId spId = 0;
@@ -183,19 +169,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkCtfBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -247,19 +226,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndCfm
 (
 CtfBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndCfm(func, pst, mBuf)
-CtfBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    uint8_t status;
@@ -303,19 +275,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkCtfUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -366,19 +331,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUbndReq
 (
 CtfUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUbndReq(func, pst, mBuf)
-CtfUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    Reason reason = 0;
@@ -423,17 +381,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmRelCtfCfgReq
 (
 Pst  *pst,
 CtfCfgReqInfo *cfgReqInfo
 )
-#else
-static S16 cmRelCtfCfgReq(pst,cfgReqInfo)
-Pst  *pst;
-CtfCfgReqInfo *param;
-#endif
 {
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
@@ -468,17 +420,11 @@ CtfCfgReqInfo *param;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -514,17 +460,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -561,22 +501,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyInfo(param, mBuf)
-CtfAsKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    S16  idx;
-
-
          
    for(idx=31;idx>=0;idx--)
    {
@@ -608,17 +539,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
 
@@ -656,7 +581,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfKdfReq
 (
 Pst* pst,
@@ -664,18 +588,9 @@ SpId spId,
 CtfCfgTransId transId,
 CtfKdfReqInfo* kdfReqInfo
 )
-#else
-S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfKdfReqInfo* kdfReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-
-   
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -743,16 +658,11 @@ CtfKdfReqInfo* kdfReqInfo;
 /********************************************************************************************************************************/
                               /*START OF CNM PACK & UNPACK FUNCTIONS*/
 /********************************************************************************************************************************/
-#ifdef ANSI
 S16 cmPkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
    if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS)
@@ -766,17 +676,11 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
@@ -790,17 +694,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -819,17 +717,11 @@ Buffer *mBuf;
    return ROK;
 
 }
-#ifdef ANSI
 S16 cmUnpkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf)
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -841,20 +733,13 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->nbrSpecSfCfg, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->nbrCellNRb, mBuf);
@@ -866,17 +751,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfsyncReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfsyncReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -907,7 +786,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncReq
 (
 Pst* pst,
@@ -915,18 +793,10 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncReq * cfgReqInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
 
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1008,19 +878,12 @@ CtfCnmCellSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf)
-CtfCnmCellSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1099,7 +962,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncReq
 (
 Pst* pst,
@@ -1107,13 +969,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncReq * cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1201,19 +1056,12 @@ CtfCnmInitSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncReq
 (
 CtfCnmInitSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf)
-CtfCnmInitSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1275,17 +1123,11 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
@@ -1297,17 +1139,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
@@ -1320,21 +1156,14 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgRspInfo
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgRspInfo(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
    if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH)
@@ -1364,7 +1193,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncRsp
 (
 Pst* pst,
@@ -1372,13 +1200,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncRsp * cfgRspInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1451,20 +1272,13 @@ CtfCnmInitSyncRsp * cfgRspInfo;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->phichResource, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->phichDuration, mBuf);
@@ -1474,17 +1288,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -1497,21 +1305,14 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRspMsg
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
     S32 i;
 
-
     CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
     for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
     {
@@ -1536,19 +1337,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRsp
 (
 CtfCnmInitSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf)
-CtfCnmInitSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1611,20 +1405,13 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfCellSyncRsp 
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellSyncRsp(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    return ROK;
 
@@ -1644,7 +1431,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncRsp
 (
 Pst* pst,
@@ -1652,13 +1438,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncRsp * cfgRspInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
@@ -1733,20 +1512,13 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 }
 /*------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncRspMsg
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
 
@@ -1765,19 +1537,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncRsp
 (
 CtfCnmCellSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf)
-CtfCnmCellSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1840,20 +1605,13 @@ Buffer *mBuf;
 }
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfcfgIndInfo
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgIndInfo(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
@@ -1874,7 +1632,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncInd
 (
 Pst* pst,
@@ -1882,13 +1639,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncInd * cfgIndInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncInd * cfgIndInfo;
-#endif
 {
    
    Buffer *mBuf = NULLP;
@@ -1963,20 +1713,13 @@ CtfCnmCellSyncInd * cfgIndInfo;
 
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncIndMsg
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
@@ -1996,19 +1739,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncInd
 (
 CtfCnmCellSyncIndMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf)
-CtfCnmCellSyncIndMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -2092,7 +1828,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCfgReq
 (
 Pst* pst,
@@ -2100,13 +1835,6 @@ SpId spId,
 CtfCfgTransId transId,
 CtfCfgReqInfo* cfgReqInfo
 )
-#else
-S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfCfgReqInfo* cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2194,22 +1922,15 @@ CtfCfgReqInfo* cfgReqInfo;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
-
-         
+        
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2237,22 +1958,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
 
-         
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2281,22 +1995,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyInfo(param, mBuf)
-CtfAskeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    uint8_t  idx;
 
-
    CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2324,20 +2030,13 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
     {
@@ -2371,19 +2070,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReq
 (
 CtfKdfReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKdfReq(func, pst, mBuf)
-CtfKdfReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -2466,19 +2158,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReq
 (
 CtfCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReq(func, pst, mBuf)
-CtfCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -2558,21 +2243,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
-
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2599,17 +2277,11 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -2641,22 +2313,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-
    for(idx=15;idx>=0;idx--)
    {
       CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf);
@@ -2690,22 +2355,15 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-
    switch (param->keyDerType)
-    {
+   {
          case CTF_KDF_TYPE1:
              CMCHKPK(cmPkCtfAskeyCfmInfo, &param->u.kEnbInf, mBuf);
              break;
@@ -2736,7 +2394,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfKdfCfm
 (
 Pst* pst,
@@ -2745,13 +2402,6 @@ CtfCfgTransId transId,
 CtfKdfCfmInfo *kdfCfmInfo,
 uint8_t status
 )
-#else
-S16 cmPkCtfKdfCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2845,7 +2495,6 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCfgCfm
 (
 Pst* pst,
@@ -2853,13 +2502,6 @@ SuId suId,
 CtfCfgTransId transId,
 uint8_t status
 )
-#else
-S16 cmPkCtfCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2919,19 +2561,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfEnbStopInd
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId
 )
-#else
-S16 cmPkCtfEnbStopInd(pst, suId, transId)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2987,22 +2622,15 @@ CtfCfgTransId transId;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
 
-         
    for(idx=0;idx<32;idx++)
    {
       CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
@@ -3028,21 +2656,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
-
          
    for(idx=0;idx<32;idx++)
    {
@@ -3070,17 +2691,11 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
@@ -3119,17 +2734,11 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
 
@@ -3165,19 +2774,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfKdfCfm
 (
 CtfKdfCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfKdfCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
@@ -3246,19 +2848,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCfgCfm
 (
 CtfCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
@@ -3312,23 +2907,15 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfEnbStopInd
 (
 CtfEnbStopInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfEnbStopInd(func, pst, mBuf)
-CtfEnbStopInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3370,7 +2957,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUeIdChgReq
 (
 Pst* pst,
@@ -3379,14 +2965,6 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CtfUeInfo * newUeInfo
 )
-#else
-S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CtfUeInfo * newUeInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3523,19 +3101,12 @@ CtfUeInfo * newUeInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUeIdChgReq
 (
 CtfUeIdChgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf)
-CtfUeIdChgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -3645,7 +3216,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUeIdChgCfm
 (
 Pst* pst,
@@ -3654,14 +3224,6 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CmStatus status
 )
-#else
-S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CmStatus status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3766,19 +3328,12 @@ CmStatus status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUeIdChgCfm
 (
 CtfUeIdChgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf)
-CtfUeIdChgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
@@ -3867,21 +3422,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
    }
@@ -3905,17 +3453,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3943,20 +3485,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -3979,20 +3514,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    return ROK;
@@ -4017,17 +3545,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4057,17 +3579,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint32_t tmpEnum;
@@ -4099,20 +3615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
    CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
    CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf);
@@ -4138,17 +3647,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4182,20 +3685,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
    return ROK;
 }
@@ -4219,17 +3715,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4263,20 +3753,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4315,20 +3798,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4361,17 +3837,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 /*ctf_c_001.main_1*/
@@ -4403,20 +3873,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4446,20 +3909,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
    CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
    CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf);
@@ -4486,21 +3942,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
-
    CMCHKUNPK(oduPackUInt8, &param->noOfsubBands, mBuf);
    CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->hoppingMode = (CtfPuschHoppingMode)tmpEnum;
@@ -4528,20 +3977,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
    CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
    CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf);
@@ -4568,17 +4010,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4608,20 +4044,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4651,20 +4080,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4694,20 +4116,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4737,21 +4152,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4783,17 +4191,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4828,21 +4230,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4875,20 +4270,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4921,20 +4309,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4967,20 +4348,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5010,17 +4384,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfVendorSpecParams
 (
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfVendorSpecParams(param, mBuf)
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
    if( param->buffLen != 0) {
@@ -5048,22 +4416,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfVendorSpecParams
 (
 Pst *pst,
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf)
-Pst *pst;
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
 
    if(param->buffLen != 0) {
@@ -5102,20 +4462,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5140,17 +4493,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t  idx;
 
@@ -5193,17 +4540,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
@@ -5317,21 +4658,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnpkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t  idx;
 
-
    CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
 
    for(idx = 0; idx < param->numFreq; idx++)
@@ -5371,17 +4705,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
@@ -5504,17 +4832,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5610,17 +4932,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint32_t tmpEnum;
@@ -5719,20 +5035,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
       CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
@@ -5759,17 +5068,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -5802,17 +5105,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5865,17 +5162,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5928,20 +5219,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5972,20 +5256,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6017,17 +5294,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 
 /* ctf_c_001.main_2: added packning for cqiMask*/
@@ -6065,17 +5336,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER1    
    uint32_t tmpEnum;
@@ -6117,20 +5382,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6196,17 +5454,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #if defined (CTF_VER1) || defined (CTF_VER2)
    uint32_t tmpEnum;
@@ -6279,20 +5531,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6328,20 +5573,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6377,20 +5615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
   {
@@ -6421,17 +5652,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6466,17 +5691,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    
 #ifdef CTF_VER2
@@ -6567,17 +5786,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER2
    S16  idx;
@@ -6671,17 +5884,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -6704,17 +5911,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSecCellCfgInfo(*param, mBuf)
-CtfSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
 
@@ -6744,17 +5945,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -6779,17 +5974,11 @@ Buffer *mBuf;
 *
 **********************************************************/
 
-#ifdef ANSI
 S16 cmUnpkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf)
-CtfSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -6821,17 +6010,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6861,17 +6044,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6901,17 +6078,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef EMTC_ENABLE
@@ -6951,20 +6122,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfUeCatCfgInfo, &param->ueCatCfg, mBuf);
@@ -7002,20 +6166,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    /*ctf_c_001.main_1*/
    CMCHKPK(cmPkCtfDedAntCfgInfo, &param->antInfo, mBuf);
@@ -7058,20 +6215,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    /* ctf_c_001.main_4: ReEst Fix */
@@ -7116,20 +6266,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -7153,20 +6296,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
 }
@@ -7190,17 +6326,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
@@ -7228,20 +6358,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
@@ -7267,20 +6390,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(param->cfgElem) {
          case CTF_UE_CFG:
             CMCHKPK(cmPkCtfDedCfgInfo, &param->u.dedCfg, mBuf);
@@ -7314,17 +6430,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7361,17 +6471,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7417,17 +6521,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7472,17 +6570,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7519,17 +6611,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7569,20 +6655,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgReqInfo
 (
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgReqInfo(param, mBuf)
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
    CMCHKPK(cmPkCtfVendorSpecParams, &param->vendorParams, mBuf);
@@ -7628,19 +6707,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReqInfo
 (
 Pst  *pst,
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReqInfo(param, mBuf)
-Pst  *pst;
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef CTF_VER3
@@ -7687,20 +6759,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* Added the pack for newly added reference signal Power*/
    CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
@@ -7731,19 +6796,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -7774,20 +6832,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* Added the pack for newly added reference signal Power*/
    CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
@@ -7816,19 +6867,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -7858,17 +6902,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
@@ -7895,17 +6933,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPeriodicCellSearchRsp
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
 
@@ -7933,7 +6965,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfPeriodicRemCellSearchRsp
 (
 Pst* pst,
@@ -7941,13 +6972,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfPeriodicRemCellSearchRsp *CellCfgRsp
 )
-#else
-S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfPeriodicRemCellSearchRsp *CellCfgRsp;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -8024,17 +7048,11 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
@@ -8044,17 +7062,11 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemCellSrch
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemCellSrch(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
 
@@ -8080,19 +7092,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkPerRemCellSrchRsp
 (
 CtfPerRemCellSrchRsp func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf)
-CtfPerRemCellSrchRsp func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
index 8a927fa..c785ec2 100644 (file)
@@ -944,11 +944,11 @@ typedef struct spCellCfg
    ServCellCfgInfo   servCellCfg;
 }SpCellCfg;
 
-typedef struct maxAggrBitRate
+typedef struct ambrCfg
 {
-   uint32_t ulBits;
-   uint32_t dlBits;
-}MaxAggrBitRate;
+   uint32_t ulBr;   /* UL Bit rate */
+   uint32_t dlBr;   /* DL Bit rate */
+}AmbrCfg;
 
 /* Single Network Slice Selection assistance Info */
 typedef struct snssai
@@ -1039,7 +1039,7 @@ typedef struct macUeCfg
    MacCellGrpCfg macCellGrpCfg;
    PhyCellGrpCfg phyCellGrpCfg;
    SpCellCfg spCellCfg;
-   MaxAggrBitRate *maxAggrBitRate;
+   AmbrCfg   *ambrCfg;
    uint8_t numLcs;
    LcCfg lcCfgList[MAX_NUM_LC];
    UeCfgState macUeCfgState; /* InActive / Completed */
index 19391a8..520c9de 100644 (file)
@@ -482,6 +482,79 @@ uint8_t unpackRlcUeReconfigReq(DuRlcUeReconfigReq func, Pst *pst, Buffer *mBuf)
    return RFAILED;
 }
 
+/*******************************************************************
+ *
+ * @brief Pack and send DL RRC message Response from RLC to DU APP
+ *
+ * @details
+ *
+ *    Function : packRlcDlRrcMsgRspToDu
+ *
+ *    Functionality:
+ *       Pack and send DL RRC message Response from RLC to DU APP
+ *
+ * @params[in] Post structure
+ *             DL RRC Msg Response 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t packRlcDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsgRsp)
+{
+   Buffer *mBuf = NULLP;
+
+   if(pst->selector == ODU_SELECTOR_LWLC)
+   {
+      if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK)
+      {
+         DU_LOG("\nRLC : Memory allocation failed at packRlcDlRrcMsgRspToDu");
+         return RFAILED;
+      }
+      /* pack the address of the structure */
+      CMCHKPK(oduPackPointer,(PTR)dlRrcMsgRsp, mBuf);
+      return ODU_POST_TASK(pst,mBuf);
+   }
+   else
+   {
+      DU_LOG("\nRLC: Only LWLC supported for packRlcDlRrcMsgRspToDu");
+   }
+   return RFAILED;
+}
+
+/*******************************************************************
+ *
+ * @brief Unpack DL RRC Msg Response received at DU APP from RLC
+ *
+ * @details
+ *
+ *    Function : unpackRlcDlRrcMsgRspToDu
+ *
+ *    Functionality:
+ *      Unpack DL RRC Msg Response received at DU APP from RLC
+ *
+ * @params[in]
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t unpackRlcDlRrcMsgRspToDu(RlcDlRrcMsgRspToDuFunc func, Pst *pst, Buffer *mBuf)
+{
+   if(pst->selector == ODU_SELECTOR_LWLC)
+   {
+      RlcDlRrcMsgRsp *dlRrcMsgRsp;
+      /* unpack the address of the structure */
+      CMCHKUNPK(oduUnpackPointer, (PTR *)&dlRrcMsgRsp, mBuf);
+      ODU_PUT_MSG_BUF(mBuf);
+      return (*func)(pst, dlRrcMsgRsp);
+   }
+   else
+   {
+      /* Nothing to do for other selectors */
+      DU_LOG("\nRLC: Only LWLC supported for DL RRC Message transfer ");
+      ODU_PUT_MSG_BUF(mBuf);
+   }
+   return RFAILED;
+}
 /**********************************************************************
          End of file
 ***********************************************************************/
index 761e163..d9ffa0d 100644 (file)
@@ -28,6 +28,7 @@
 #define EVENT_RRC_DELIVERY_MSG_TRANS_TO_DU 214
 #define EVENT_RLC_UE_RECONFIG_REQ  215
 #define EVENT_RLC_UE_RECONFIG_RSP  216
+#define EVENT_DL_RRC_MSG_RSP_TO_DU 217
 
 #define RB_ID_SRB 0
 #define RB_ID_DRB 1
 #define LCH_DTCH      4      /*!< DTCH Logical Channel */
 #define LCH_DCCH      5      /*!< DCCH Logical Channel */
 
+typedef enum
+{
+   TRANSMISSION_IN_PROGRESS,
+   TRANSMISSION_COMPLETE,
+   TRANSMISSION_FAILED
+}DlMsgState;
 
 typedef enum
 {
@@ -520,6 +527,14 @@ typedef struct dlRrcMsgInfo
    uint8_t    *rrcMsg;        /* RRC Message (DL-DCCH Message) */
 }RlcDlRrcMsgInfo;
 
+/* DL RRC Message Rsp From RLC to DU APP */
+typedef struct dlRrcMsgRsp
+{
+   uint16_t   cellId;         /* Cell Id */
+   uint16_t   crnti;          /* UE index */
+   DlMsgState state;         /* Dl RRC Msg State */
+}RlcDlRrcMsgRsp;
+
 /* RRC delivery message from RLC to DU APP */
 typedef struct rrcDeliveryStatus
 {
@@ -565,6 +580,11 @@ typedef uint8_t (*DuRlcUeReconfigReq) ARGS((
    Pst           *pst,
    RlcUeCfg      *ueCfg ));
 
+/* DL RRC Message from RLC to DU APP */
+typedef uint8_t (*RlcDlRrcMsgRspToDuFunc) ARGS((
+   Pst           *pst,
+   RlcDlRrcMsgRsp *dlRrcMsgRsp));
+
 /* Pack/Unpack function declarations */
 uint8_t packDuRlcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg);
 uint8_t unpackRlcUeCreateReq(DuRlcUeCreateReq func, Pst *pst, Buffer *mBuf);
@@ -578,6 +598,9 @@ uint8_t packRrcDeliveryReportToDu(Pst *pst, RrcDeliveryReport *rrcDeliveryReport
 uint8_t unpackRrcDeliveryReportToDu(RlcRrcDeliveryReportToDuFunc func,Pst *pst, Buffer *mBuf);
 uint8_t packDuRlcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg);
 uint8_t unpackRlcUeReconfigReq(DuRlcUeReconfigReq func, Pst *pst, Buffer *mBuf);
+uint8_t packRlcDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsgRsp);
+uint8_t unpackRlcDlRrcMsgRspToDu(RlcDlRrcMsgRspToDuFunc func, Pst *pst, Buffer *mBuf);
+
 
 /* Event Handler function declarations */
 uint8_t RlcProcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg);
@@ -586,6 +609,7 @@ uint8_t DuProcRlcUlRrcMsgTrans(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo);
 uint8_t RlcProcDlRrcMsgTransfer(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo);
 uint8_t DuProcRlcRrcDeliveryReport(Pst *pst, RrcDeliveryReport *rrcDeliveryReport);
 uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg);
+uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg);
 
 #endif /* RLC_INF_H */
 
index 0689900..81e3176 100755 (executable)
 /****************************************************************************
  *                      Packing Functions
  ***************************************************************************/
-#ifdef ANSI
-S16 cmPkKwuBndReq
-(
-Pst * pst,
-SuId suId,
-SpId spId
-)
-#else
-S16 cmPkKwuBndReq(pst, suId, spId)
-Pst * pst;
-SuId suId;
-SpId spId;
-#endif
+S16 cmPkKwuBndReq(Pst * pst,SuId suId,SpId spId)
 {
    S16    ret1;
    Buffer *mBuf;
 
-
    mBuf = NULLP;
 
    if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
@@ -94,19 +81,7 @@ SpId spId;
 }
 
 \f
-#ifdef ANSI
-S16 cmPkKwuBndCfm
-(
-Pst * pst,
-SuId suId,
-uint8_t status
-)
-#else
-S16 cmPkKwuBndCfm(pst, suId, status)
-Pst * pst;
-SuId suId;
-uint8_t status;
-#endif
+S16 cmPkKwuBndCfm(Pst * pst,SuId suId,uint8_t status)
 {
    S16    ret1;
    Buffer *mBuf;
@@ -134,19 +109,7 @@ uint8_t status;
 }
 
 \f
-#ifdef ANSI
-S16 cmPkKwuUbndReq
-(
-Pst * pst,
-SuId suId,
-Reason reason
-)
-#else
-S16 cmPkKwuUbndReq(pst, suId, reason)
-Pst * pst;
-SuId suId;
-Reason reason;
-#endif
+S16 cmPkKwuUbndReq(Pst * pst,SuId suId,Reason reason)
 {
    S16 ret1;
    Buffer *mBuf;
@@ -173,20 +136,8 @@ Reason reason;
    return (SPstTsk(pst,mBuf));
 } /* cmPkKwuUbndReq */
 
-#ifdef ANSI
-uint8_t cmPkKwuDatReqInfo
-(
-KwuDatReqInfo *param,
-Buffer *mBuf
-)
-#else
-uint8_t cmPkKwuDatReqInfo(param, mBuf)
-KwuDatReqInfo *param;
-Buffer *mBuf;
-#endif
+uint8_t cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
 {
-
-
 #ifdef CCPU_OPT
    switch(param->lcType) {
       case CM_LTE_LCH_CCCH:
@@ -215,19 +166,7 @@ Buffer *mBuf;
 } /* cmPkKwuDatReqInfo */
 
 \f
-#ifdef ANSI
-uint8_t cmPkKwuDatReq
-(
-Pst * pst,
-KwuDatReqInfo* datReq,
-Buffer * mBuf
-)
-#else
-uint8_t cmPkKwuDatReq(pst, datReq, mBuf)
-Pst * pst;
-KwuDatReqInfo* datReq;
-Buffer * mBuf;
-#endif
+uint8_t cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf)
 {
 #ifdef LCKWU
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -390,17 +329,7 @@ Buffer * mBuf;
 } /* cmPkKwuDatReq */
 
 \f
-#ifdef ANSI
-uint8_t cmPkKwuDatIndInfo
-(
-KwuDatIndInfo *param,
-Buffer *mBuf
-)
-#else
-uint8_t cmPkKwuDatIndInfo(param, mBuf)
-KwuDatIndInfo *param;
-Buffer *mBuf;
-#endif
+uint8_t cmPkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 {
 
    CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf);
@@ -412,19 +341,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-uint8_t cmPkKwuDatInd
-(
-Pst * pst,
-KwuDatIndInfo* datInd,
-Buffer * mBuf
-)
-#else
-uint8_t cmPkKwuDatInd(pst, datInd, mBuf)
-Pst * pst;
-KwuDatIndInfo* datInd;
-Buffer * mBuf;
-#endif
+uint8_t cmPkKwuDatInd(Pst * pst,KwuDatIndInfo* datInd,Buffer * mBuf)
 {
 #ifdef LCKWU
     S16 ret1 = ROK;
@@ -504,17 +421,7 @@ Buffer * mBuf;
 } /* cmPkKwuDatInd */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuDatCfmInfo
-(
-KwuDatCfmInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkKwuDatCfmInfo(param, mBuf)
-KwuDatCfmInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 {
    register uint32_t iter;
 
@@ -528,19 +435,7 @@ Buffer *mBuf;
 } /* cmPkKwuDatCfmInfo */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuDatCfm
-(
-Pst * pst,
-SuId suId,
-KwuDatCfmInfo* datCfm
-)
-#else
-S16 cmPkKwuDatCfm(pst, suId, datCfm)
-Pst * pst;
-SuId suId;
-KwuDatCfmInfo* datCfm;
-#endif
+S16 cmPkKwuDatCfm(Pst * pst,SuId suId,KwuDatCfmInfo* datCfm)
 {
 #if (ERRCLASS & ERRCLS_ADD_RES)
    S16 ret1= ROK;
@@ -601,19 +496,7 @@ KwuDatCfmInfo* datCfm;
 } /* cmPkKwuDatCfm */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuDiscSduReq
-(
-Pst * pst,
-SpId spId,
-KwuDiscSduInfo* discSdu
-)
-#else
-S16 cmPkKwuDiscSduReq(pst, spId, discSdu)
-Pst * pst;
-SpId spId;
-KwuDiscSduInfo* discSdu;
-#endif
+S16 cmPkKwuDiscSduReq(Pst * pst,SpId spId,KwuDiscSduInfo* discSdu)
 {
 #ifdef LCKWU
    S16 ret1;
@@ -679,17 +562,7 @@ KwuDiscSduInfo* discSdu;
 } /* cmPkKwuDiscSduReq */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuStaIndInfo
-(
-KwuStaIndInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkKwuStaIndInfo(param, mBuf)
-KwuStaIndInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 {
    S16 i;
 
@@ -703,17 +576,7 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmPkKwuFlowCntrlIndInfo
-(
-KwuFlowCntrlIndInfo *param,
-Buffer              *mBuf
-)
-#else
-S16 cmPkKwuFlowCntrlIndInfo(param, mBuf)
-KwuFlowCntrlIndInfo  *param;
-Buffer               *mBuf;
-#endif
+S16 cmPkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
 
    CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);   
@@ -722,17 +585,7 @@ Buffer               *mBuf;
    return ROK;
 } /* cmPkKwuFlowCntrlIndInfo */
 
-#ifdef ANSI
-S16 cmUnpkKwuFlowCntrlIndInfo
-(
-KwuFlowCntrlIndInfo *param,
-Buffer              *mBuf
-)
-#else
-S16 cmUnpkKwuFlowCntrlIndInfo(param, mBuf)
-KwuFlowCntrlIndInfo  *param;
-Buffer               *mBuf;
-#endif
+S16 cmUnpkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
    
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
@@ -742,19 +595,7 @@ Buffer               *mBuf;
 } /* cmUnpkKwuFlowCntrlIndInfo */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuStaInd
-(
-Pst * pst,
-SuId suId,
-KwuStaIndInfo* staInd
-)
-#else
-S16 cmPkKwuStaInd(pst, suId, staInd)
-Pst * pst;
-SuId suId;
-KwuStaIndInfo* staInd;
-#endif
+S16 cmPkKwuStaInd(Pst * pst,SuId suId,KwuStaIndInfo* staInd)
 {
 #ifdef LCKWU
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -817,19 +658,7 @@ KwuStaIndInfo* staInd;
 } /* cmPkKwuStaInd */
 
 \f
-#ifdef ANSI
-S16 cmPkKwuReEstCmpInd
-(
-Pst * pst,
-SuId suId,
-CmLteRlcId rlcId
-)
-#else
-S16 cmPkKwuReEstCmpInd(pst, suId, rlcId)
-Pst * pst;
-SuId suId;
-CmLteRlcId rlcId;
-#endif
+S16 cmPkKwuReEstCmpInd(Pst * pst,SuId suId,CmLteRlcId rlcId)
 {
 #ifdef LCKWU
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -875,19 +704,7 @@ CmLteRlcId rlcId;
 } /* cmPkKwuReEstCmpInd */
 
 /* kwu_c_001.main_3 added support for L2 Measurement */
-#ifdef ANSI
-S16 cmPkKwuDiscSduCfm
-(
-Pst            *pst,
-SpId           spId,
-KwuDiscSduInfo *discCfmSdu
-)
-#else
-S16 cmPkKwuDiscSduCfm(pst, spId, discCfmSdu)
-Pst            *pst;
-SpId           spId;
-KwuDiscSduInfo *discCfmSdu;
-#endif
+S16 cmPkKwuDiscSduCfm(Pst *pst,SpId spId,KwuDiscSduInfo *discCfmSdu)
 {
 #if (ERRCLASS & ERRCLS_ADD_RES)
    S16 ret1 = ROK;
@@ -947,19 +764,7 @@ KwuDiscSduInfo *discCfmSdu;
    return (SPstTsk(pst,mBuf));
 } /* cmPkKwuDiscSduCfm */
 \f
-#ifdef ANSI
-S16 cmPkKwuFlowCntrlInd
-(
-Pst            *pst,
-SuId           suId,
-KwuFlowCntrlIndInfo *flowCntrlIndInfo
-)
-#else
-S16 cmPkKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo)
-Pst            *pst;
-SuId           suId;
-KwuFlowCntrlIndInfo *flowCntrlIndInfo;
-#endif
+S16 cmPkKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo)
 {
    Buffer *mBuf;
 
@@ -1007,17 +812,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo;
 } /* cmPkKwuFlowCntrlInd */
 
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
-S16 cmPkKwuDatAckInfo
-(
-KwuDatAckInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkKwuDatAckInfo(param, mBuf)
-KwuDatAckInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmPkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
@@ -1025,19 +820,7 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmPkKwuDatAckInd
-(
-Pst * pst,
-SuId suId,
-KwuDatAckInfo* datInd
-)
-#else
-S16 cmPkKwuDatAckInd(pst, suId, datInd)
-Pst * pst;
-SuId suId;
-KwuDatAckInfo* datInd;
-#endif
+S16 cmPkKwuDatAckInd(Pst * pst,SuId suId,KwuDatAckInfo* datInd)
 {
     S16 ret1;
 
@@ -1076,19 +859,7 @@ KwuDatAckInfo* datInd;
 #endif /* LTE_L2_MEAS */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuBndReq
-(
-KwuBndReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuBndReq(func, pst, mBuf)
-KwuBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuBndReq(KwuBndReq func,Pst *pst,Buffer *mBuf)
 {
    SuId suId = 0;
    SpId spId = 0;
@@ -1101,19 +872,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuBndCfm
-(
-KwuBndCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuBndCfm(func, pst, mBuf)
-KwuBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuBndCfm(KwuBndCfm func,Pst *pst,Buffer *mBuf)
 {
    SuId suId = 0;
    uint8_t status = 0;
@@ -1127,19 +886,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuUbndReq
-(
-KwuUbndReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuUbndReq(func, pst, mBuf)
-KwuUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuUbndReq(KwuUbndReq func,Pst *pst,Buffer *mBuf)
 {
    SpId spId = 0;
    Reason reason = 0;
@@ -1153,17 +900,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuUbndReq */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDatReqInfo
-(
-KwuDatReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatReqInfo(param, mBuf)
-KwuDatReqInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf)
 {
 
 
@@ -1196,19 +933,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDatReq
-(
-KwuDatReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatReq(func, pst, mBuf)
-KwuDatReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf)
 {
 #if(ERRCLASS & ERRCLS_DEBUG)
    S16 ret1 = ROK; 
@@ -1268,17 +993,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuDatReq */
 
 \f
-#ifdef ANSI
-uint8_t cmUnpkKwuDatIndInfo
-(
-KwuDatIndInfo *param,
-Buffer *mBuf
-)
-#else
-uint8_t cmUnpkKwuDatIndInfo(param, mBuf)
-KwuDatIndInfo *param;
-Buffer *mBuf;
-#endif
+uint8_t cmUnpkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 {
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
@@ -1291,19 +1006,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-uint8_t cmUnpkKwuDatInd
-(
-KwuDatInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-uint8_t cmUnpkKwuDatInd(func, pst, mBuf)
-KwuDatInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst,Buffer *mBuf)
 {
     S16 ret1 = ROK, retVal;
     KwuDatIndInfo *datInd = NULLP;
@@ -1374,17 +1077,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuDatInd */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDatCfmInfo
-(
-KwuDatCfmInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatCfmInfo(param, mBuf)
-KwuDatCfmInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 {
    register S32 iter;
 
@@ -1402,19 +1095,7 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
-S16 cmUnpkKwuDatCfm
-(
-KwuDatCfm func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatCfm(func, pst, mBuf)
-KwuDatCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatCfm(KwuDatCfm func,Pst *pst,Buffer *mBuf)
 {
    S16 ret1 = ROK;
    SuId          suId = 0;
@@ -1476,19 +1157,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuDatCfm */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDiscSduReq
-(
-KwuDiscSduReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDiscSduReq(func, pst, mBuf)
-KwuDiscSduReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDiscSduReq(KwuDiscSduReq func,Pst *pst,Buffer *mBuf)
 {
    S16 ret1 = ROK;
    SpId          spId = 0;
@@ -1547,21 +1216,10 @@ Buffer *mBuf;
 } /* cmUnpkKwuDiscSduReq */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuStaIndInfo
-(
-KwuStaIndInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuStaIndInfo(param, mBuf)
-KwuStaIndInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 {
    uint32_t i;
 
-
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
    CMCHKUNPK(oduPackUInt32, &param->numSdu, mBuf);
    for (i = 0; i < param->numSdu; i++)
@@ -1573,19 +1231,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuStaIndInfo */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuStaInd
-(
-KwuStaInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuStaInd(func, pst, mBuf)
-KwuStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuStaInd(KwuStaInd func,Pst *pst,Buffer *mBuf)
 {
    S16 ret1 = ROK;
    SuId          suId = 0;
@@ -1647,19 +1293,7 @@ Buffer *mBuf;
 } /* cmUnpkKwuStaInd */
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuReEstCmpInd
-(
-KwuReEstCmpInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuReEstCmpInd(func, pst, mBuf)
-KwuReEstCmpInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuReEstCmpInd(KwuReEstCmpInd func,Pst *pst,Buffer *mBuf)
 {
 #if(ERRCLASS & ERRCLS_DEBUG)
    S16 ret1;
@@ -1697,22 +1331,10 @@ Buffer *mBuf;
 } /* cmUnpkKwuReEstCmpInd */
 
 /* kwu_c_001.main_3 added support for L2 Measurement */
-#ifdef ANSI
-S16 cmUnpkKwuDiscSduCfm
-(
-KwuDiscSduCfm  func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkKwuDiscSduCfm(func, pst, mBuf)
-KwuDiscSduCfm  func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkKwuDiscSduCfm(KwuDiscSduCfm  func,Pst *pst,Buffer *mBuf)
 {
    S16 ret1 = ROK;
-   SpId          spId = 0;
+   SpId  spId = 0;
    KwuDiscSduInfo *discSdu = NULLP;
 
 
@@ -1767,23 +1389,10 @@ Buffer         *mBuf;
 
    return ((*func)(pst, spId, discSdu));
 } /* cmUnpkKwuDiscSduCfm */
-#ifdef ANSI
-S16 cmUnpkKwuFlowCntrlInd
-(
-KwuFlowCntrlInd  func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-S16 cmUnpkKwuFlowCntrlInd(func, pst, mBuf)
-KwuFlowCntrlInd  func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkKwuFlowCntrlInd(KwuFlowCntrlInd func,Pst *pst,Buffer *mBuf)
 {
    SuId   suId;
    KwuFlowCntrlIndInfo *flowCntrlInfo = NULLP;
-
    
    CMCHKUNPK(SUnpkS16, &(suId), mBuf);
    switch(pst->selector)
@@ -1818,17 +1427,7 @@ Buffer         *mBuf;
 } /* cmUnpkKwuFlowCntrlInd */
 #ifdef LTE_L2_MEAS
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDatAckInfo
-(
-KwuDatAckInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatAckInfo(param, mBuf)
-KwuDatAckInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
    CMCHKUNPK(oduPackUInt32, &param->sduId, mBuf);
@@ -1838,19 +1437,7 @@ Buffer *mBuf;
 }
 
 \f
-#ifdef ANSI
-S16 cmUnpkKwuDatAckInd
-(
-KwuDatAckInd func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatAckInd(func, pst, mBuf)
-KwuDatAckInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatAckInd(KwuDatAckInd func,Pst *pst,Buffer *mBuf)
 {
     S16 ret1;
     SuId          suId = 0;
index 66f2ec3..5ea39ab 100755 (executable)
@@ -111,17 +111,11 @@ static S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
  *      -# Failure : RFAILED 
  */
 
-#ifdef ANSI
 S16 packRlcConfigReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfg                 /* RLC LM structure */
 )
-#else
-S16 packRlcConfigReq(pst, cfg)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfg;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -174,19 +168,12 @@ RlcMngmt *cfg;                /* RLC LM structure */
  *      -# Failure : RFAILED
  */
  
-#ifdef ANSI
 uint8_t unpackRlcConfigReq
 (
 RlcConfigReq func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-uint8_t unpackRlcConfigReq(func, pst, mBuf)
-RlcConfigReq func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* Return value */
    RlcMngmt cfg;              /* RLC LM structure */
@@ -227,17 +214,11 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwCntrlReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cntrl               /* RLC LM structure */  
 )
-#else
-S16 cmPkLkwCntrlReq(pst,cntrl)
-Pst *pst;                    /* post structure */
-RlcMngmt *cntrl;              /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -290,19 +271,12 @@ RlcMngmt *cntrl;              /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwCntrlReq
 (
 LkwCntrlReq func,            /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwCntrlReq(func, pst, mBuf)
-LkwCntrlReq func;            /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt cfm;              /* Confirmation */
@@ -338,17 +312,11 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 uint8_t cmPkLkwCntrlCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* RLC LM structure */
 )
-#else
-uint8_t cmPkLkwCntrlCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -402,19 +370,12 @@ RlcMngmt *cfm;                /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwCntrlCfm
 (
 LkwCntrlCfm func,            /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwCntrlCfm(func, pst, mBuf)
-LkwCntrlCfm func;            /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
@@ -452,19 +413,12 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStsCfm
 (
 LkwStsCfm func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStsCfm(func, pst, mBuf)
-LkwStsCfm func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
@@ -503,17 +457,11 @@ Buffer *mBuf;                /* message buffer */
  */
 
 
-#ifdef ANSI
 uint8_t packRlcConfigCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* RLC LM structure */
 )
-#else
-uint8_t packRlcConfigCfm(pst,cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -566,19 +514,12 @@ RlcMngmt *cfm;                /* RLC LM structure */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 uint8_t unpackRlcConfigCfm
 (
 RlcConfigCfm func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-uint8_t unpackRlcConfigCfm(func, pst, mBuf)
-RlcConfigCfm func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt cfm;              /* RLC LM structure */
@@ -617,17 +558,11 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwStaInd
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *usta                /* RLC LM structure */
 )
-#else
-S16 cmPkLkwStaInd(pst,usta)
-Pst *pst;                    /* post structure */
-RlcMngmt *usta;               /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -681,19 +616,12 @@ RlcMngmt *usta;               /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwStaInd
 (
 LkwStaInd func,             /* primitive pointer */
 Pst *pst,                   /* post structure */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaInd(func, pst, mBuf)
-LkwStaInd func;             /* primitive pointer */
-Pst *pst;                   /* post structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    RlcMngmt usta;            /* RLC LM structure */
    S16 ret1;                /* return value */
@@ -730,17 +658,11 @@ Buffer *mBuf;               /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwStaReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *sta                 /* status */
 )
-#else
-S16 cmPkLkwStaReq(pst,sta)
-Pst *pst;                    /* post structure */
-RlcMngmt *sta;                /* status */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -792,19 +714,12 @@ RlcMngmt *sta;                /* status */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStaCfm
 (
 LkwStaReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaCfm(func, pst, mBuf)
-LkwStaReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
@@ -842,19 +757,12 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStsReq
 (
 LkwStsReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStsReq(func, pst, mBuf)
-LkwStsReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt sts;              /* RLC LM structure */
    S16 ret1;                 /* return value */
@@ -895,19 +803,12 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStaReq
 (
 LkwStaReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaReq(func, pst, mBuf)
-LkwStaReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt sta;              /* RLC LM structure */
    S16 ret1;                 /* return value */
@@ -946,19 +847,12 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwTrcInd
 (
 LkwTrcInd func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwTrcInd(func, pst, mBuf)
-LkwTrcInd func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt trc;              /* RLC LM structure */
@@ -997,17 +891,11 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 static S16 cmPkCkwSapSta 
 ( 
 RlcCkwCntSapSta *rcSap,         /* SAP statistics */      
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmPkCkwSapSta(rcSap, mBuf)
-RlcCkwCntSapSta *rcSap;         /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKPK(cmPkState, rcSap->state, mBuf);
@@ -1027,17 +915,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkCkwSapSta 
 (
 RlcCkwCntSapSta *rcSap,         /* SAP statistics */ 
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmUnpkCkwSapSta(rcSap, mBuf)
-RlcCkwCntSapSta *rcSap;         /* SAP statistics */ 
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf);
@@ -1056,17 +938,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkKwuSapSta
 (
 RlcKwuSapSta *rlSap,           /* SAP statistics */       
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmPkKwuSapSta(rlSap, mBuf)
-RlcKwuSapSta *rlSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKPK(cmPkState, rlSap->state, mBuf);
@@ -1086,17 +962,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkKwuSapSta
 (
 RlcKwuSapSta *rlSap,           /* SAP statistics */                   
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmUnpkKwuSapSta(rlSap, mBuf)
-RlcKwuSapSta *rlSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf);
@@ -1116,17 +986,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRguSapSta
 (
 RlcRguSapSta *mkSap,           /* SAP statistics */             
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmPkRguSapSta(mkSap, mBuf)
-RlcRguSapSta *mkSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKPK(cmPkState, mkSap->state, mBuf);
@@ -1146,17 +1010,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRguSapSta
 (
 RlcRguSapSta *mkSap,           /* SAP statistics */              
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-static S16 cmUnpkRguSapSta(mkSap, mBuf)
-RlcRguSapSta *mkSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
 
    CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf);
@@ -1176,17 +1034,11 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStaCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* solicited status confirm */
 )
-#else
-S16 cmPkLkwStaCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* solicited status confirm */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -1237,19 +1089,12 @@ RlcMngmt *cfm;                /* solicited status confirm */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwTrcInd
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *trc,                /* trace */
 Buffer *trcBuf                 /* trace buffer */
 )
-#else
-S16 cmPkLkwTrcInd(pst, trc, trcBuf)
-Pst *pst;                     /* post structure */
-RlcMngmt *trc;                 /* trace */
-Buffer *trcBuf;               /* trace buffer */
-#endif
 {
    S16      ret1 = ROK;       /* return value */
    Buffer   *mBuf = NULLP;    /* Buffer to trace */
@@ -1322,19 +1167,12 @@ Buffer *trcBuf;               /* trace buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStsReq
 (
 Pst *pst,                    /* post structure */
 Action action,               /* action */
 RlcMngmt *sts                 /* statistics request */
 )
-#else
-S16 cmPkLkwStsReq(pst, action, sts)
-Pst *pst;                    /* post structure */
-Action action;               /* action */
-RlcMngmt *sts;                /* statistics request */
-#endif
 {
 
    Buffer *mBuf;             /* message buffer */
@@ -1388,19 +1226,12 @@ RlcMngmt *sts;                /* statistics request */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStsCfm
 (
 Pst *pst,                    /* post structure */
 Action action,               /* action */
 RlcMngmt *cfm                 /* statistics confirmation */
 )
-#else
-S16 cmPkLkwStsCfm(pst, action, cfm)
-Pst *pst;                    /* post structure */
-Action action;               /* action */
-RlcMngmt *cfm;                /* statistics confirmation */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
@@ -1453,19 +1284,12 @@ RlcMngmt *cfm;                /* statistics confirmation */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 static S16 cmPkRlcMngmt
 (
 RlcMngmt *param,              /* Managment */             
 Event eventType,             /* Event type */
 Buffer *mBuf                 /* Message Buffer */
 )
-#else
-static S16 cmPkRlcMngmt(param ,eventType, mBuf)
-RlcMngmt *param;              /* Managment */
-Event eventType;             /* Event type */
-Buffer *mBuf;                /* Message Buffer */
-#endif
 {
     S16 ret1;                /* return value */
 
@@ -1542,19 +1366,12 @@ Buffer *mBuf;                /* Message Buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRlcCfg
 (
 RlcMngmt *cfg,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRlcCfg(cfg, elmnt, mBuf)
-RlcMngmt *cfg;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
 
     switch( elmnt )
@@ -1606,19 +1423,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRlcCntrl
 (
 RlcMngmt *cntrl,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRlcCntrl(cntrl, elmnt, mBuf)
-RlcMngmt *cntrl;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
     uint8_t subAction;            /* sub action */     
 
@@ -1685,19 +1495,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRlcUsta
 (
 RlcMngmt *usta,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRlcUsta(usta, elmnt, mBuf)
-RlcMngmt *usta;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
 
    /* lkw_c_001.main_2 removed warning */
@@ -1726,7 +1529,6 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRlcSsta
 (
 RlcMngmt *ssta,
@@ -1734,13 +1536,6 @@ Elmnt elmnt,
 Event eventType,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRlcSsta(ssta, elmnt, eventType, mBuf)
-RlcMngmt *ssta;
-Elmnt elmnt;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;
 
@@ -1790,17 +1585,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkRlcTrc
 (
 RlcMngmt *trc,                /* trace */                 
 Buffer *mBuf                 /* data buffer */
 )
-#else
-static S16 cmPkRlcTrc(trc, mBuf)
-RlcMngmt *trc;                /* trace */
-Buffer *mBuf;                /* data buffer */
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf); 
@@ -1821,19 +1610,12 @@ Buffer *mBuf;                /* data buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 static S16 cmPkRlcSts
 (
 RlcMngmt *sts,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRlcSts(sts, elmnt, mBuf)
-RlcMngmt *sts;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;
 
@@ -1879,17 +1661,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkGenSts
 (
 RlcGenSts *gen,
 Buffer *mBuf
 )
-#else
-static S16 cmPkGenSts(gen, mBuf)
-RlcGenSts *gen;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf);
@@ -1918,17 +1694,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkCkwSapSts
 (
 RlcCkwCntSts *rcSap,
 Buffer *mBuf
 )
-#else
-static S16 cmPkCkwSapSts(rcSap, mBuf)
-RlcCkwCntSts *rcSap;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf);
@@ -1946,17 +1716,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmPkKwuSapSts
 (
 RlcKwuSapSts *ruSap,
 Buffer *mBuf
 )
-#else
-static S16 cmPkKwuSapSts(ruSap, mBuf)
-RlcKwuSapSts *ruSap;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf);
@@ -1982,19 +1746,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcMngmt
 (
 RlcMngmt *param,
 Event eventType,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcMngmt(param ,eventType, mBuf)
-RlcMngmt *param;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
     S16 ret1;
 
@@ -2075,19 +1832,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcCfg
 (
 RlcMngmt *cfg,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcCfg(cfg ,elmnt, mBuf)
-RlcMngmt *cfg;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
 
    switch(elmnt)
@@ -2139,19 +1889,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcCntrl
 (
 RlcMngmt *cfm,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcCntrl(cfm, elmnt, mBuf)
-RlcMngmt *cfm;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
    uint8_t subAction;
    RlcDbgCntrl *dbgCntrl;
@@ -2225,19 +1968,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcUsta
 (
 RlcMngmt *usta,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcUsta(usta ,elmnt, mBuf)
-RlcMngmt *usta;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
 
    /* lkw_c_001.main_2 removed warning */
@@ -2265,7 +2001,6 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcSsta
 (
 RlcMngmt *ssta,
@@ -2273,13 +2008,6 @@ Elmnt elmnt,
 Event eventType,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcSsta(ssta ,elmnt, eventType, mBuf)
-RlcMngmt *ssta;
-Elmnt elmnt;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;           /* return value */
 
@@ -2329,17 +2057,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcTrc
 (
 RlcMngmt *trc,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcTrc(trc, mBuf)
-RlcMngmt *trc;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf);
@@ -2360,19 +2082,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkRlcSts
 (
 RlcMngmt *sts,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRlcSts(sts ,elmnt, mBuf)
-RlcMngmt *sts;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;           /* return value */
 
@@ -2416,17 +2131,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkGenSts
 (
 RlcGenSts *gen,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkGenSts(gen, mBuf)
-RlcGenSts *gen;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf);
@@ -2454,17 +2163,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkCkwSapSts
 (
 RlcCkwCntSts *rcSap,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkCkwSapSts(rcSap ,mBuf)
-RlcCkwCntSts *rcSap;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2484,17 +2187,11 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 static S16 cmUnpkKwuSapSts
 (
 RlcKwuSapSts *ruSap,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkKwuSapSts(ruSap, mBuf)
-RlcKwuSapSts *ruSap;
-Buffer *mBuf;
-#endif
 {
 
    /* lkw_c_001.main_2 changed from suId to spId */
@@ -2508,17 +2205,11 @@ Buffer *mBuf;
 
 /* lkw_c_001.main_2 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 S16 cmPkLkwL2MeasReq
 (
 Pst * pst,
 RlcL2MeasReqEvt *measReqEvt
 )
-#else
-S16 cmPkLkwL2MeasReq(pst, measReqEvt)
-Pst * pst;
-RlcL2MeasReqEvt *measReqEvt;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2566,17 +2257,11 @@ RlcL2MeasReqEvt *measReqEvt;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkRlcL2MeasReqInfo
 (
 RlcL2MeasReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRlcL2MeasReqInfo(param, mBuf)
-RlcL2MeasReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
    uint16_t idx1;
@@ -2613,17 +2298,11 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasStopReq
 (
 Pst *pst,
 uint8_t  measType
 )
-#else
-S16 cmPkLkwL2MeasStopReq(pst, measType)
-Pst *pst;
-uint8_t measType;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2640,17 +2319,11 @@ uint8_t measType;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasSendReq
 (
 Pst *pst,
 uint8_t  measType
 )
-#else
-S16 cmPkLkwL2MeasSendReq(pst, measType)
-Pst *pst;
-uint8_t measType;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2667,19 +2340,12 @@ uint8_t measType;
    return (SPstTsk(pst,mBuf));
 }
 #ifdef TENB_SPLIT_ARCH
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasReq
 (
 LkwL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasReq(func, pst, mBuf)
-LkwL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RlcL2MeasReqEvt measReqEvt;
    
@@ -2717,19 +2383,12 @@ Buffer *mBuf;
    return ((*func)(pst, &measReqEvt));
 }
 #else
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasReq
 (
 LkwL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasReq(func, pst, mBuf)
-LkwL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S16   ret;
    RlcL2MeasReqEvt *measReqEvt;
@@ -2781,17 +2440,11 @@ Buffer *mBuf;
 }
 #endif
 
-#ifdef ANSI
 S16 cmUnpkRlcL2MeasReqInfo
 (
 RlcL2MeasReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRlcL2MeasReqInfo(param, mBuf)
-RlcL2MeasReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
    uint16_t idx1; 
@@ -2830,19 +2483,12 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasStopReq
 (
 LkwL2MeasStopReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasStopReq(func, pst, mBuf)
-LkwL2MeasStopReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    uint8_t measType;
 
@@ -2851,19 +2497,12 @@ Buffer *mBuf;
    return ((*func)(pst, measType));
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasSendReq
 (
 LkwL2MeasSendReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasSendReq(func, pst, mBuf)
-LkwL2MeasSendReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    uint8_t    measType;
 
@@ -2873,17 +2512,11 @@ Buffer *mBuf;
    return ((*func)(pst, measType));
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasCfm
 (
 Pst * pst,
 RlcL2MeasCfmEvt *measCfmEvt
 )
-#else
-S16 cmPkLkwL2MeasCfm(pst, measCfmEvt)
-Pst * pst;
-RlcL2MeasCfmEvt *measCfmEvt;
-#endif
 {
    Buffer *mBuf = NULLP;
    uint8_t idx;
@@ -2979,19 +2612,12 @@ RlcL2MeasCfmEvt *measCfmEvt;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkRlcL2MeasCfmInfo
 (
 RlcL2MeasCfmInfo *param,
 Buffer *mBuf,
 uint8_t measType
 )
-#else
-S16 cmPkRlcL2MeasCfmInfo(param, mBuf, measType)
-RlcL2MeasCfmInfo *param;
-Buffer *mBuf;
-uint8_t measType;
-#endif
 {
 
    if((measType & LKW_L2MEAS_DL_IP) ||
@@ -3013,19 +2639,12 @@ uint8_t measType;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasCfm
 (
 LkwL2MeasCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasCfm(func, pst, mBuf)
-LkwL2MeasCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
    uint16_t idx1;
@@ -3107,19 +2726,12 @@ Buffer *mBuf;
    return ((*func)(pst, &measCfmEvt));
 }
 
-#ifdef ANSI
 S16 cmUnpkRlcL2MeasCfmInfo
 (
 RlcL2MeasCfmInfo *param,
 Buffer *mBuf,
 uint8_t measType
 )
-#else
-S16 cmUnpkRlcL2MeasCfmInfo(param, mBuf, measType)
-RlcL2MeasCfmInfo *param;
-Buffer *mBuf;
-uint8_t measType;
-#endif
 {
 
    if((measType & LKW_L2MEAS_DL_IP) ||
@@ -3142,19 +2754,12 @@ uint8_t measType;
 }
 
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasStopCfm
 (
 Pst * pst,
 uint8_t measType,
 uint8_t status
 )
-#else
-S16 cmPkLkwL2MeasStopCfm(pst, measType,status)
-Pst * pst;
-uint8_t  measType;
-uint8_t  status
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3172,19 +2777,13 @@ uint8_t  status
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
+
 S16 cmUnpkLkwL2MeasStopCfm
 (
 LkwL2MeasStopCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasStopCfm(func, pst, mBuf)
-LkwL2MeasStopCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    uint8_t measType;
    uint8_t status;
index 7a0f38e..38642db 100755 (executable)
@@ -56,17 +56,11 @@ Configuration Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgCfgReq
 (
 Pst * pst,
 RgMngmt * cfg
 )
-#else
-S16 cmPkLrgCfgReq(pst, cfg)
-Pst * pst;
-RgMngmt * cfg;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -107,19 +101,12 @@ Configuration Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgCfgReq
 (
 LrgCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgCfgReq(func, pst, mBuf)
-LrgCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    /* lrg_c_001.main_2: Changed Pointer across Interface */
    RgMngmt cfg;
@@ -152,17 +139,11 @@ Configuration Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchCfgReq
 (
 Pst * pst,
 RgMngmt * cfg
 )
-#else
-S16 cmPkLrgSchCfgReq(pst, cfg)
-Pst * pst;
-RgMngmt * cfg;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -203,19 +184,12 @@ Configuration Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchCfgReq
 (
 LrgSchCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchCfgReq(func, pst, mBuf)
-LrgSchCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    /* lrg_c_001.main_2: Changed Pointer across Interface */
    RgMngmt cfg;
@@ -248,17 +222,11 @@ Configuration Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 uint8_t cmPkLrgCfgCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
-#else
-uint8_t cmPkLrgCfgCfm(pst, cfm)
-Pst * pst;
-RgMngmt * cfm;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -300,19 +268,12 @@ Configuration Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgCfgCfm
 (
 LrgCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgCfgCfm(func, pst, mBuf)
-LrgCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cfm;
    
@@ -344,17 +305,11 @@ Configuration Confirm from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 uint8_t cmPkLrgSchCfgCfm
 (
 Pst * pst,
 RgMngmt * cfg
 )
-#else
-uint8_t cmPkLrgSchCfgCfm(pst, cfg)
-Pst * pst;
-RgMngmt * cfg;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -396,19 +351,12 @@ Configuration Confirm from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchCfgCfm
 (
 LrgSchCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchCfgCfm(func, pst, mBuf)
-LrgSchCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cfg;
    
@@ -439,17 +387,11 @@ Statistics Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgStsReq
 (
 Pst * pst,
 RgMngmt * sts
 )
-#else
-S16 cmPkLrgStsReq(pst, sts)
-Pst * pst;
-RgMngmt * sts;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -491,19 +433,12 @@ Statistics Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgStsReq
 (
 LrgStsReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgStsReq(func, pst, mBuf)
-LrgStsReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt sts;
    
@@ -535,17 +470,11 @@ Statistics Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgStsCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
-#else
-S16 cmPkLrgStsCfm(pst, cfm)
-Pst * pst;
-RgMngmt * cfm;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -587,19 +516,12 @@ Statistics Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgStsCfm
 (
 LrgStsCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgStsCfm(func, pst, mBuf)
-LrgStsCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cfm;
    
@@ -631,17 +553,11 @@ Status Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgStaReq
 (
 Pst * pst,
 RgMngmt * sta
 )
-#else
-S16 cmPkLrgStaReq(pst, sta)
-Pst * pst;
-RgMngmt * sta;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -681,19 +597,12 @@ Status Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgStaReq
 (
 LrgStaReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgStaReq(func, pst, mBuf)
-LrgStaReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt sta;
    
@@ -726,17 +635,11 @@ Status Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgStaCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
-#else
-S16 cmPkLrgStaCfm(pst, cfm)
-Pst * pst;
-RgMngmt * cfm;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -776,19 +679,12 @@ Status Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgStaCfm
 (
 LrgStaCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgStaCfm(func, pst, mBuf)
-LrgStaCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cfm;
    
@@ -821,17 +717,11 @@ Status Indication from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgStaInd
 (
 Pst * pst,
 RgMngmt * usta
 )
-#else
-S16 cmPkLrgStaInd(pst, usta)
-Pst * pst;
-RgMngmt * usta;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -873,19 +763,12 @@ Status Indication from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgStaInd
 (
 LrgStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgStaInd(func, pst, mBuf)
-LrgStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt usta;
    
@@ -917,17 +800,11 @@ Status Indication from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchStaInd
 (
 Pst * pst,
 RgMngmt * sta
 )
-#else
-S16 cmPkLrgSchStaInd(pst, sta)
-Pst * pst;
-RgMngmt * sta;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -969,19 +846,12 @@ Status Indication from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchStaInd
 (
 LrgSchStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchStaInd(func, pst, mBuf)
-LrgSchStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt sta;
    
@@ -1013,17 +883,11 @@ Control Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgCntrlReq
 (
 Pst * pst,
 RgMngmt * cntrl
 )
-#else
-S16 cmPkLrgCntrlReq(pst, cntrl)
-Pst * pst;
-RgMngmt * cntrl;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1065,19 +929,12 @@ Control Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgCntrlReq
 (
 LrgCntrlReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgCntrlReq(func, pst, mBuf)
-LrgCntrlReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cntrl;
    
@@ -1109,17 +966,11 @@ Control Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchCntrlReq
 (
 Pst * pst,
 RgMngmt * cntrl
 )
-#else
-S16 cmPkLrgSchCntrlReq(pst, cntrl)
-Pst * pst;
-RgMngmt * cntrl;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1161,19 +1012,12 @@ Control Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchCntrlReq
 (
 LrgSchCntrlReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchCntrlReq(func, pst, mBuf)
-LrgSchCntrlReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cntrl;
    
@@ -1205,17 +1049,11 @@ Control Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgCntrlCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
-#else
-S16 cmPkLrgCntrlCfm(pst, cfm)
-Pst * pst;
-RgMngmt * cfm;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1257,19 +1095,12 @@ Control Confirm from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgCntrlCfm
 (
 LrgCntrlCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgCntrlCfm(func, pst, mBuf)
-LrgCntrlCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cfm;
    
@@ -1301,17 +1132,11 @@ Control Confirm from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchCntrlCfm
 (
 Pst * pst,
 RgMngmt * cntrl
 )
-#else
-S16 cmPkLrgSchCntrlCfm(pst, cntrl)
-Pst * pst;
-RgMngmt * cntrl;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1353,19 +1178,12 @@ Control Confirm from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchCntrlCfm
 (
 LrgSchCntrlCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchCntrlCfm(func, pst, mBuf)
-LrgSchCntrlCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt cntrl;
    
@@ -1398,19 +1216,12 @@ Trace Indication from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgTrcInd
 (
 Pst * pst,
 RgMngmt * trc,
 Buffer * trcBuf
 )
-#else
-S16 cmPkLrgTrcInd(pst, trc, trcBuf)
-Pst * pst;
-RgMngmt * trc;
-Buffer * trcBuf;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1476,19 +1287,12 @@ Trace Indication from MAC to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgTrcInd
 (
 LrgTrcInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgTrcInd(func, pst, mBuf)
-LrgTrcInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgMngmt trc;
   /* lrg_c_001.main_3 - MODIFY -  Modified trcBuf to have it initialized to NULLP */
@@ -1532,17 +1336,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgGenCfg
 (
 RgGenCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgGenCfg(param, mBuf)
-RgGenCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1575,17 +1373,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgGenCfg
 (
 RgGenCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgGenCfg(param, mBuf)
-RgGenCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1618,17 +1410,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgUpSapCfg
 (
 RgUpSapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgUpSapCfg(param, mBuf)
-RgUpSapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1661,17 +1447,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgUpSapCfg
 (
 RgUpSapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgUpSapCfg(param, mBuf)
-RgUpSapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1704,17 +1484,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgLowSapCfg
 (
 RgLowSapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgLowSapCfg(param, mBuf)
-RgLowSapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1748,17 +1522,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgLowSapCfg
 (
 RgLowSapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgLowSapCfg(param, mBuf)
-RgLowSapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1793,17 +1561,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgAckNack
 (
 RgAckNack *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgAckNack (param, mBuf)
-RgAckNack *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1830,17 +1592,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSchNackAckStats
 (
 RgSchNackAckStats *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSchNackAckStats (param, mBuf)
-RgSchNackAckStats *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1872,17 +1628,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgHqNumRetx
 (
 RgSchHqNumRetx *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgHqNumRetx (param, mBuf)
-RgSchHqNumRetx *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf);
@@ -1911,17 +1661,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSchHqRetxStats
 (
 RgSchHqRetxStats *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSchHqRetxStats (param, mBuf)
-RgSchHqRetxStats *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1954,17 +1698,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgAckNack
 (
 RgAckNack *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgAckNack (param, mBuf)
-RgAckNack *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1991,17 +1729,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSchNackAckStats
 (
 RgSchNackAckStats *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSchNackAckStats (param, mBuf)
-RgSchNackAckStats *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -2032,17 +1764,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgHqNumRetx
 (
 RgSchHqNumRetx *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgHqNumRetx (param, mBuf)
-RgSchHqNumRetx *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
@@ -2071,17 +1797,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSchHqRetxStats
 (
 RgSchHqRetxStats *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSchHqRetxStats (param, mBuf)
-RgSchHqRetxStats *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -2114,20 +1834,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgGenSts
 (
 RgGenSts *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgGenSts(param, mBuf)
-RgGenSts *param;
-Buffer *mBuf;
-#endif
 {
 
-
 #ifdef MAC_SCH_STATS
    CMCHKPK(cmPkRgSchHqRetxStats, &param->hqRetxStats, mBuf);
    CMCHKPK(cmPkRgSchNackAckStats, &param->nackAckStats, mBuf);
@@ -2155,20 +1868,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgGenSts
 (
 RgGenSts *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgGenSts(param, mBuf)
-RgGenSts *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt32, &param->numHarqFail, mBuf);
    CMCHKUNPK(oduPackUInt32, &param->numUeCfg, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->numCellCfg, mBuf);
@@ -2196,20 +1902,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSapSts
 (
 RgSapSts *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSapSts(param, mBuf)
-RgSapSts *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf);
    CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf);
    CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf);
@@ -2233,20 +1932,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSapSts
 (
 RgSapSts *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSapSts(param, mBuf)
-RgSapSts *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt32, &param->numPduRcvd, mBuf);
    CMCHKUNPK(oduPackUInt32, &param->numPduTxmit, mBuf);
    CMCHKUNPK(oduPackUInt32, &param->numPduDrop, mBuf);
@@ -2270,17 +1962,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSchInstCfg
 (
 RgSchInstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSchInstCfg(param, mBuf)
-RgSchInstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2317,17 +2003,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSchInstCfg
 (
 RgSchInstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSchInstCfg(param, mBuf)
-RgSchInstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2364,22 +2044,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgCfg
 (
 RgCfg *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgCfg(param, elmnt, mBuf)
-RgCfg *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(elmnt) {
          case STSCHINST:
             CMCHKPK(cmPkRgSchInstCfg, &param->s.schInstCfg, mBuf);
@@ -2419,22 +2091,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgCfg
 (
 RgCfg *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgCfg(param, elmnt, mBuf)
-RgCfg *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(elmnt) {
          case STGEN:
             CMCHKUNPK(cmUnpkRgGenCfg, &param->s.genCfg, mBuf);
@@ -2474,20 +2138,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSapSta
 (
 RgSapSta *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSapSta(param, mBuf)
-RgSapSta *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->sapState, mBuf);
    return ROK;
 }
@@ -2509,20 +2166,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSapSta
 (
 RgSapSta *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSapSta(param, mBuf)
-RgSapSta *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->sapState, mBuf);
    return ROK;
 }
@@ -2544,22 +2194,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSts
 (
 RgSts *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSts(param, elmnt, mBuf)
-RgSts *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(elmnt) {
          case STTFUSAP:
             CMCHKPK(cmPkRgSapSts, &param->s.tfuSts, mBuf);
@@ -2602,22 +2244,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSts
 (
 RgSts *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSts(param, elmnt, mBuf)
-RgSts *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->sapInst, mBuf);
    CMCHKUNPK(cmUnpkAction, &param->action, mBuf);
@@ -2660,7 +2294,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSsta
 (
 Pst *pst,
@@ -2671,20 +2304,8 @@ uint8_t eventType,
 #endif
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSsta(pst, param, elmnt, eventType, mBuf)
-Pst *pst;
-RgSsta *param;
-S16 elmnt;
-/* lrg_c_001.main_3 - ADD -  Added the extra parameter eventType  to the function  */
-#ifdef LRG_V1
-uint8_t eventType;
-#endif
-Buffer *mBuf;
-#endif
 {
 
-
       switch(elmnt) {
          case STTFUSAP:
             CMCHKPK(cmPkRgSapSta, &param->s.tfuSapSta, mBuf);
@@ -2744,7 +2365,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSsta
 (
 Pst    *pst,
@@ -2752,13 +2372,6 @@ RgSsta *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSsta(pst, param, elmnt, mBuf)
-Pst    *pst;
-RgSsta *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2823,20 +2436,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgUstaDgn
 (
 RgUstaDgn *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgUstaDgn(param, mBuf)
-RgUstaDgn *param;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(param->type) {
          case LRG_USTA_DGNVAL_MEM:
             CMCHKPK(cmPkMemoryId, &param->u.mem, mBuf);
@@ -2865,27 +2471,22 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgUstaDgn
 (
 RgUstaDgn *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgUstaDgn(param, mBuf)
-RgUstaDgn *param;
-Buffer *mBuf;
-#endif
 {
 
 
    CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
-      switch(param->type) {
-         case LRG_USTA_DGNVAL_MEM:
-            CMCHKUNPK(cmUnpkMemoryId, &param->u.mem, mBuf);
-            break;
-         default :
-            break;
+   switch(param->type) 
+   {
+      case LRG_USTA_DGNVAL_MEM:
+        CMCHKUNPK(cmUnpkMemoryId, &param->u.mem, mBuf);
+        break;
+      default :
+        break;
       }
    return ROK;
 }
@@ -2907,20 +2508,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgUsta
 (
 RgUsta *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgUsta(param, mBuf)
-RgUsta *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkRgUstaDgn, &param->dgn, mBuf);
    CMCHKPK(cmPkCmAlarm, &param->cmAlarm, mBuf);
    return ROK;
@@ -2943,20 +2537,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgUsta
 (
 RgUsta *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgUsta(param, mBuf)
-RgUsta *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkCmAlarm, &param->cmAlarm, mBuf);
    CMCHKUNPK(cmUnpkRgUstaDgn, &param->dgn, mBuf);
    return ROK;
@@ -2979,20 +2566,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgTrc
 (
 RgTrc *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgTrc(param, mBuf)
-RgTrc *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->evnt, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
    return ROK;
@@ -3015,20 +2595,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgTrc
 (
 RgTrc *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgTrc(param, mBuf)
-RgTrc *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->evnt, mBuf);
    return ROK;
@@ -3051,20 +2624,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgDbgCntrl
 (
 RgDbgCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgDbgCntrl(param, mBuf)
-RgDbgCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf);
    return ROK;
 }
@@ -3085,17 +2651,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSchUlAllocCntrl
 (
 RgSchUlAllocCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSchUlAllocCntrl(param, mBuf)
-RgSchUlAllocCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
@@ -3123,17 +2683,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSchUlAllocCntrl
 (
 RgSchUlAllocCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSchUlAllocCntrl(param, mBuf)
-RgSchUlAllocCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->logTime, mBuf);
@@ -3164,20 +2718,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgDbgCntrl
 (
 RgDbgCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgDbgCntrl(param, mBuf)
-RgDbgCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt32, &param->dbgMask, mBuf);
    return ROK;
 }
@@ -3199,20 +2746,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgSapCntrl
 (
 RgSapCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgSapCntrl(param, mBuf)
-RgSapCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(SPkS16, param->spId, mBuf);
    CMCHKPK(SPkS16, param->suId, mBuf);
    return ROK;
@@ -3235,20 +2775,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgSapCntrl
 (
 RgSapCntrl *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgSapCntrl(param, mBuf)
-RgSapCntrl *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
    return ROK;
@@ -3271,19 +2804,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgCntrl
 (
 RgCntrl *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgCntrl(param, elmnt, mBuf)
-RgCntrl *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3348,62 +2874,55 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgCntrl
 (
 RgCntrl *param,
 S16 elmnt,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgCntrl(param, elmnt, mBuf)
-RgCntrl *param;
-S16 elmnt;
-Buffer *mBuf;
-#endif
 {
 
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->subAction, mBuf);
-      switch(elmnt) {
-         case STGEN:
-            switch(param->subAction) {
-               case SADBG:
-                  CMCHKUNPK(cmUnpkRgDbgCntrl, &param->s.rgDbgCntrl, mBuf);
-                  break;
-               case SATRC:
-                  CMCHKUNPK(SUnpkS16, &param->s.trcLen, mBuf);
-                  break;
-               case SAUSTA:
-                  break;
+   switch(elmnt) {
+      case STGEN:
+        switch(param->subAction) {
+           case SADBG:
+              CMCHKUNPK(cmUnpkRgDbgCntrl, &param->s.rgDbgCntrl, mBuf);
+              break;
+           case SATRC:
+              CMCHKUNPK(SUnpkS16, &param->s.trcLen, mBuf);
+              break;
+           case SAUSTA:
+              break;
 #ifdef SS_DIAG
-               case SALOG:
-                  CMCHKUNPK(oduPackUInt32, &param->s.logMask, mBuf);
-                  break;
+           case SALOG:
+              CMCHKUNPK(oduPackUInt32, &param->s.logMask, mBuf);
+              break;
 #endif
 #ifdef PHY_ERROR_LOGING
-               case SAELMNT:
-                             CMCHKUNPK(cmUnpkRgSchUlAllocCntrl, &param->s.rgSchUlAllocCntrl, mBuf);
-                             break;
+           case SAELMNT:
+              CMCHKUNPK(cmUnpkRgSchUlAllocCntrl, &param->s.rgSchUlAllocCntrl, mBuf);
+              break;
 #endif                    
-               default :
-                  break;
-            }
-         break;
-         case STTFUSAP:
-         case STRGUSAP:
-         case STRGRSAP:
-         case STCRGSAP:
-            switch(param->subAction) {
-               default :
-                  CMCHKUNPK(cmUnpkRgSapCntrl, &param->s.rgSapCntrl, mBuf);
-                  break;
-            }
-            break;
-         default :
-            break;
+           default :
+              break;
+        }
+        break;
+      case STTFUSAP:
+      case STRGUSAP:
+      case STRGRSAP:
+      case STCRGSAP:
+        switch(param->subAction) {
+           default :
+              CMCHKUNPK(cmUnpkRgSapCntrl, &param->s.rgSapCntrl, mBuf);
+              break;
+        }
+        break;
+      default :
+        break;
       }
    return ROK;
 }
@@ -3425,7 +2944,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgMngmt
 (
 Pst *pst,
@@ -3433,13 +2951,6 @@ RgMngmt *param,
 uint8_t eventType,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgMngmt(pst, param, eventType, mBuf)
-Pst *pst;
-RgMngmt *param;
-uint8_t eventType;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3510,7 +3021,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgMngmt
 (
 Pst *pst,
@@ -3518,52 +3028,45 @@ RgMngmt *param,
 uint8_t eventType,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgMngmt(pst, param, eventType, mBuf)
-Pst *pst;
-RgMngmt *param;
-uint8_t eventType;
-Buffer *mBuf;
-#endif
 {
 
 
    CMCHKUNPK(cmUnpkHeader, &param->hdr, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &param->cfm, mBuf);
-      switch(eventType) {
-         case EVTLRGCFGREQ:
-         case  EVTLRGCFGCFM:
-         case EVTMACSCHGENCFGREQ:
-         case  EVTMACSCHGENCFGCFM:
-            if(cmUnpkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
-               return RFAILED;
-            break;
-         case EVTLRGSTSREQ:
-         case  EVTLRGSTSCFM:
-            if(cmUnpkRgSts(&param->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK)
-               return RFAILED;
-            break;
-         case EVTLRGSSTAREQ:
-         case  EVTLRGSSTACFM:
-            if(cmUnpkRgSsta(pst, &param->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK)
-               return RFAILED;
-            break;
-         case EVTLRGUSTAIND:
-         case EVTLRGSCHSTAIND:
-            CMCHKUNPK(cmUnpkRgUsta, &param->t.usta, mBuf);
-            break;
-         case EVTLRGTRCIND:
-            CMCHKUNPK(cmUnpkRgTrc, &param->t.trc, mBuf);
-            break;
-         case EVTLRGCNTRLREQ:
-         case  EVTLRGCNTRLCFM:
-         case EVTLRGSCHCNTRLREQ:
-         case  EVTLRGSCHCNTRLCFM:
-            if(cmUnpkRgCntrl(&param->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK)
-               return RFAILED;
-            break;
-         default :
-            return RFAILED;
+   switch(eventType) {
+      case EVTLRGCFGREQ:
+      case  EVTLRGCFGCFM:
+      case EVTMACSCHGENCFGREQ:
+      case  EVTMACSCHGENCFGCFM:
+        if(cmUnpkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
+           return RFAILED;
+        break;
+      case EVTLRGSTSREQ:
+      case  EVTLRGSTSCFM:
+        if(cmUnpkRgSts(&param->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK)
+           return RFAILED;
+        break;
+      case EVTLRGSSTAREQ:
+      case  EVTLRGSSTACFM:
+        if(cmUnpkRgSsta(pst, &param->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK)
+           return RFAILED;
+        break;
+      case EVTLRGUSTAIND:
+      case EVTLRGSCHSTAIND:
+        CMCHKUNPK(cmUnpkRgUsta, &param->t.usta, mBuf);
+        break;
+      case EVTLRGTRCIND:
+        CMCHKUNPK(cmUnpkRgTrc, &param->t.trc, mBuf);
+        break;
+      case EVTLRGCNTRLREQ:
+      case  EVTLRGCNTRLCFM:
+      case EVTLRGSCHCNTRLREQ:
+      case  EVTLRGSCHCNTRLCFM:
+        if(cmUnpkRgCntrl(&param->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK)
+           return RFAILED;
+        break;
+      default :
+        return RFAILED;
       }
    return ROK;
 }
@@ -3584,17 +3087,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16  cmPkNmbActvUeQciReq
 (
 LrgNmbActvUeQCI   *nmbActvUeQci, 
 Buffer        *mBuf
 )
-#else
-static S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf)
-LrgNmbActvUeQCI   *nmbActvUeQci;
-Buffer        *mBuf;
-#endif
 {
    uint8_t      idx;
 
@@ -3621,17 +3118,11 @@ Buffer        *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16  cmPkAvgPrbQciReq
 (
 LrgAvgPrbQCI  *avgPrbQciReq,
 Buffer        *mBuf
 )
-#else
-static S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf)
-LrgAvgPrbQCI  *avgPrbQciReq;
-Buffer        *mBuf;
-#endif
 {
    uint8_t      idx;
 
@@ -3657,17 +3148,11 @@ L2 Measurement Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchL2MeasReq
 (
 Pst * pst,
 LrgSchMeasReqInfo  *measInfo
 )
-#else
-S16 cmPkLrgSchL2MeasReq(pst, measInfo)
-Pst * pst;
-LrgSchMeasReqInfo  *measInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3716,17 +3201,11 @@ L2 Measurement Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchL2MeasStopReq
 (
 Pst * pst,
 LrgSchMeasStopReqInfo *measInfo
 )
-#else
-S16 cmPkLrgSchL2MeasStopReq(pst, measInfo)
-Pst * pst;
-LrgSchMeasStopReqInfo *measInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3759,20 +3238,14 @@ L2 Measurement Request from LM to MAC.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchL2MeasSendReq
 (
 Pst * pst,
 LrgSchMeasSndReqInfo *measInfo
 )
-#else
-S16 cmPkLrgSchL2MeasSendReq(pst, measInfo)
-Pst * pst;
-LrgSchMeasSndReqInfo *measInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
  if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -3800,17 +3273,11 @@ LrgSchMeasSndReqInfo *measInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkNmbActvUeQciReq
 (
 LrgNmbActvUeQCI  *param,
 Buffer           *mBuf
 )
-#else
-static S16 cmUnpkNmbActvUeQciReq(param, mBuf)
-LrgNmbActvUeQCI  *param;
-Buffer           *mBuf;
-#endif
 {
    uint8_t     idx;
 
@@ -3836,17 +3303,11 @@ Buffer           *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkAvgPrbQciReq
 (
 LrgAvgPrbQCI     *param,
 Buffer           *mBuf
 )
-#else
-static S16 cmUnpkAvgPrbQciReq (param, mBuf)
-LrgAvgPrbQCI     *param;
-Buffer           *mBuf;
-#endif
 {
    uint8_t     idx;
 
@@ -3874,19 +3335,12 @@ Measurement  Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchL2MeasReq
 (
 LrgSchL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchL2MeasReq(func, pst, mBuf)
-LrgSchL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    LrgSchMeasReqInfo  measInfo;
 
@@ -3929,19 +3383,12 @@ Measurement  Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchL2MeasStopReq
 (
 LrgSchL2MeasStopReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchL2MeasStopReq(func, pst, mBuf)
-LrgSchL2MeasStopReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    LrgSchMeasStopReqInfo measInfo;
 
@@ -3967,19 +3414,12 @@ Measurement  Request from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchL2MeasSendReq
 (
 LrgSchL2MeasSendReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchL2MeasSendReq(func, pst, mBuf)
-LrgSchL2MeasSendReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    LrgSchMeasSndReqInfo measInfo;
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
@@ -4003,21 +3443,15 @@ L2 Measurement confirm from MAC to LM
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchL2MeasStopCfm
 (
 Pst * pst,
 LrgSchMeasCfmInfo  *measInfo
 )
-#else
-S16 cmPkLrgSchL2MeasStopCfm(pst, measInfo)
-Pst * pst;
-LrgSchMeasCfmInfo  *measInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
  if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -4045,19 +3479,12 @@ Measurement  Confirm from SCH to LM.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchL2MeasStopCfm
 (
 LrgSchL2MeasStopCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchL2MeasStopCfm(func, pst, mBuf)
-LrgSchL2MeasStopCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    LrgSchMeasCfmInfo  measInfo;
 
@@ -4083,17 +3510,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmPkNumUeQciCfm
 (
 LrgNumActvUeQCICfm  *param,
 Buffer              *mBuf
 )
-#else
-static S16 cmPkNumUeQciCfm(param, mBuf)
-LrgNumActvUeQCICfm *param;
-Buffer             *mBuf;
-#endif
 {
    uint8_t         idx;
 
@@ -4121,17 +3542,11 @@ Buffer             *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmPkAvgPrbQciCfm
 (
 LrgAvgPrbQCICfm    *param,
 Buffer             *mBuf
 )
-#else
-static S16  cmPkAvgPrbQciCfm(param, mBuf)
-LrgAvgPrbQCICfm    *param;
-Buffer             *mBuf;
-#endif
 {
    uint8_t         idx;
 
@@ -4158,17 +3573,11 @@ Buffer             *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmPkRaPrmbsCfm
 (
 LrgRaPreamblesCfm  *param,
 Buffer             *mBuf
 )
-#else
-static S16 cmPkRaPrmbsCfm(param, mBuf)
-LrgRaPreamblesCfm  *param;
-Buffer             *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf);
@@ -4189,17 +3598,11 @@ Buffer             *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmPkAvgPrbCfm 
 (
 LrgAvgPrbCfm  *param,
 Buffer        *mBuf
 )
-#else
-static S16 cmPkAvgPrbCfm(param, mBuf)
-LrgAvgPrbCfm  *param;
-Buffer        *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf);
@@ -4219,17 +3622,11 @@ L2 Measurement confirm from MAC to LM
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLrgSchL2MeasCfm
 (
 Pst * pst,
 LrgSchMeasCfmInfo  *measInfo
 )
-#else
-S16 cmPkLrgSchL2MeasCfm(pst, measInfo)
-Pst * pst;
-LrgSchMeasCfmInfo  *measInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -4306,17 +3703,11 @@ LrgSchMeasCfmInfo  *measInfo;
 *  @return   Void
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkNumUeQciCfm
 (
 LrgNumActvUeQCICfm *param,
 Buffer          *mBuf
 )
-#else
-static S16 cmUnpkNumUeQciCfm(param, mBuf)
-LrgNumActvUeQCICfm *param; 
-Buffer          *mBuf;
-#endif
 {
    uint8_t          idx;
 
@@ -4343,17 +3734,11 @@ Buffer          *mBuf;
 *  @return  Void 
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkAvgPrbQciCfm
 (
 LrgAvgPrbQCICfm *param,
 Buffer          *mBuf
 )
-#else
-static S16 cmUnpkAvgPrbQciCfm(param, mBuf)
-LrgAvgPrbQCICfm *param; 
-Buffer          *mBuf;
-#endif
 {
    uint8_t          idx;
 
@@ -4381,17 +3766,11 @@ Buffer          *mBuf;
 *  @return   Void
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkRaPrmbsCfm
 (
 LrgRaPreamblesCfm *param,
 Buffer         *mBuf
 )
-#else
-static S16 cmUnpkRaPrmbsCfm(param, mBuf)
-LrgRaPreamblesCfm *param; 
-Buffer         *mBuf;
-#endif
 {
 
 
@@ -4413,17 +3792,11 @@ Buffer         *mBuf;
 *  @return   Void
 *      -# ROK
 **/
-#ifdef ANSI
 static S16 cmUnpkAvgPrbCfm
 (
 LrgAvgPrbCfm   *param, 
 Buffer         *mBuf
 )
-#else
-static S16  cmUnpkAvgPrbCfm(param, mBuf)
-LrgAvgPrbCfm   *param; 
-Buffer         *mBuf;
-#endif
 {
 
 
@@ -4444,19 +3817,12 @@ Measurement  Confirm from LM to SCH.
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLrgSchL2MeasCfm
 (
 LrgSchL2MeasCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLrgSchL2MeasCfm(func, pst, mBuf)
-LrgSchL2MeasCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    LrgSchMeasCfmInfo  measInfo;
 
index 14417cd..a021724 100644 (file)
@@ -219,11 +219,11 @@ uint8_t packSchCellCfgCfm(Pst *pst, SchCellCfgCfm *schCellCfgCfm)
 
 /*******************************************************************
  *
- * @brief Pack and Send UE Create Request from MAC to SCH
+ * @brief Pack and Send UE Config Request from MAC to SCH
  *
  * @details
  *
- *    Function : packMacSchUeCreateReq
+ *    Function : packMacSchAddUeConfigReq
  *
  *    Functionality:
  *       Pack and Send UE Create Request from MAC to SCH
@@ -233,7 +233,7 @@ uint8_t packSchCellCfgCfm(Pst *pst, SchCellCfgCfm *schCellCfgCfm)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t packMacSchUeCreateReq(Pst *pst, SchUeCfg  *ueCfg)
+uint8_t packMacSchAddUeConfigReq(Pst *pst, SchUeCfg  *ueCfg)
 {
    if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LC))
    {
@@ -329,21 +329,21 @@ uint8_t packMacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd)
 
 /*******************************************************************
  *
- * @brief Pack and Send UE Reconfig Request from MAC to SCH
+ * @brief Pack and Send Modify UE Config Request from MAC to SCH
  *
  * @details
  *
- *    Function : packMacSchUeReconfigReq
+ *    Function : packMacSchModUeConfigReq
  *
  *    Functionality:
- *       Pack and Send UE Reconfig Request from MAC to SCH
+ *       Pack and Send Modify UE Config Request from MAC to SCH
  *
  * @params[in]
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t packMacSchUeReconfigReq(Pst *pst, SchUeCfg  *ueCfg)
+uint8_t packMacSchModUeConfigReq(Pst *pst, SchUeCfg  *ueCfg)
 {
    if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LC))
    {
index 95801bb..83e9eb5 100644 (file)
 #define EVENT_RACH_IND_TO_SCH        5
 #define EVENT_CRC_IND_TO_SCH         6
 #define EVENT_DL_RLC_BO_INFO_TO_SCH  7
-#define EVENT_UE_CREATE_REQ_TO_SCH   8
-#define EVENT_UE_CREATE_RSP_TO_MAC   9
+#define EVENT_ADD_UE_CONFIG_REQ_TO_SCH   8
+#define EVENT_UE_CONFIG_RSP_TO_MAC   9
 #define EVENT_SLOT_IND_TO_SCH        10
 #define EVENT_SHORT_BSR              11
 #define EVENT_UCI_IND_TO_SCH         12
-#define EVENT_UE_RECONFIG_REQ_TO_SCH 13
+#define EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH 13
 #define EVENT_UE_RECONFIG_RSP_TO_MAC 14
 
 
@@ -1223,11 +1223,11 @@ typedef struct schLcCfg
 }SchLcCfg;
 
 /* Aggregate max bit rate */
-typedef struct aggrMaxBitRate
+typedef struct schAmbrCfg
 {
-   uint32_t   ulBitRate;
-   uint32_t   dlBitRate;
-}SchAggrMaxBitRate;
+   uint32_t   ulBr;   /* Ul BitRate */
+   uint32_t   dlBr;   /* Dl BitRate */
+}SchAmbrCfg;
 
 /* UE configuration */
 typedef struct schUeCfg
@@ -1237,7 +1237,7 @@ typedef struct schUeCfg
    SchMacCellGrpCfg   macCellGrpCfg;
    SchPhyCellGrpCfg   phyCellGrpCfg;
    SchSpCellCfg       spCellCfg;
-   SchAggrMaxBitRate  *aggrMaxBitRate;
+   SchAmbrCfg         *ambrCfg;
    uint8_t            numLcs;
    SchLcCfg           schLcCfg[MAX_NUM_LC];
 }SchUeCfg;
@@ -1309,7 +1309,7 @@ typedef uint8_t (*MacSchDlRlcBoInfoFunc) ARGS((
         Pst         *pst,         /* Post structure */
         DlRlcBoInfo *dlBoInfo));   /* DL BO Info */
 
-typedef uint8_t (*MacSchUeCreateReqFunc) ARGS((
+typedef uint8_t (*MacSchAddUeConfigReqFunc) ARGS((
         Pst         *pst,           /* Post structure */
         SchUeCfg    *ueCfgToSch));   /* Scheduler UE Cfg */
 
@@ -1330,7 +1330,7 @@ typedef uint8_t (*MacSchSrUciIndFunc) ARGS((
         Pst         *pst,         /* Post structure */
         SrUciIndInfo  *uciInd));    /* UCI IND Info */
 
-typedef uint8_t (*MacSchUeReconfigReqFunc) ARGS((
+typedef uint8_t (*MacSchModUeConfigReqFunc) ARGS((
         Pst         *pst,           /* Post structure */
         SchUeCfg    *ueCfgToSch));   /* Scheduler UE Cfg */
 
@@ -1357,8 +1357,8 @@ uint8_t packMacSchCrcInd(Pst *pst, CrcIndInfo *crcInd);
 uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd);
 uint8_t packMacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo);
 uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo);
-uint8_t packMacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfgToSch);
-uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t packMacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
 uint8_t packSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
 uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
 uint8_t MacSchSlotInd ARGS((Pst * pst, SlotIndInfo * slotInd));
@@ -1368,8 +1368,8 @@ uint8_t packMacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd);
 uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd);
 uint8_t packMacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd);
 uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd);
-uint8_t packMacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
-uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t packMacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
 uint8_t packSchUeReconfigRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
 uint8_t MacProcSchUeReconfigRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
 
index 0dd9f68..0471a67 100755 (executable)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLwLcRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkLwLcRgmBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -108,19 +101,12 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLwLcRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLwLcRgmBndReq(func, pst, mBuf)
-RgmBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
@@ -159,19 +145,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLwLcRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkLwLcRgmUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -208,19 +187,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLwLcRgmBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkLwLcRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -260,19 +232,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLwLcRgmBndCfm
 (
 RgmBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLwLcRgmBndCfm(func, pst, mBuf)
-RgmBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    uint8_t status;
@@ -307,19 +272,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLwLcRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
-#else
-S16 cmPkLwLcRgmCfgPrbRprt(pst, spId, prbRprtCfg)
-Pst* pst;
-SpId spId;
-RgmPrbRprtCfg  * prbRprtCfg;
-#endif
 {
    Buffer *mBuf = NULLP;
    uint32_t len = sizeof(RgmPrbRprtCfg);
@@ -362,19 +320,12 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLwLcRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLwLcRgmCfgPrbRprt(func, pst, mBuf)
-RgmCfgPrbRprtFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S16 ret;
    SpId spId;
@@ -414,19 +365,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkLwLcRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
-#else
-S16 cmPkLwLcRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd  * prbRprtInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -468,19 +412,12 @@ RgmPrbRprtInd  * prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkLwLcRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLwLcRgmPrbRprtInd(func, pst, mBuf)
-RgmPrbRprtIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmPrbRprtInd *prbRprtInd;
@@ -523,19 +460,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkRgmBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -574,19 +504,12 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmBndReq(func, pst, mBuf)
-RgmBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
@@ -625,19 +548,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkRgmUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -675,19 +591,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmUbndReq
 (
 RgmUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmUbndReq(func, pst, mBuf)
-RgmUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
@@ -722,19 +631,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -774,19 +676,12 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmBndCfm
 (
 RgmBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmBndCfm(func, pst, mBuf)
-RgmBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    uint8_t status;
@@ -822,17 +717,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
-#else
-S16 cmPkCfgPrbRprt(prbRprtCfg, mBuf)
-RgmPrbRprtCfg  * prbRprtCfg;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, prbRprtCfg->usPrbAvgPeriodicty, mBuf);
    CMCHKPK(oduUnpackUInt8, prbRprtCfg->bConfigType, mBuf);
@@ -851,17 +740,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
-#else
-S16 cmUnPkCfgPrbRprt(prbRprtCfg, mBuf)
-RgmPrbRprtCfg  * prbRprtCfg;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bCellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bConfigType, mBuf);
@@ -885,19 +768,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
-#else
-S16 cmPkRgmCfgPrbRprt(pst, spId, prbRprtCfg)
-Pst* pst;
-SpId spId;
-RgmPrbRprtCfg  * prbRprtCfg;
-#endif
 {
    Buffer *mBuf = NULLP;
    uint32_t len = sizeof(RgmPrbRprtCfg);
@@ -943,19 +819,12 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmCfgPrbRprt(func, pst, mBuf)
-RgmCfgPrbRprtFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RgmPrbRprtCfg *prbRprtCfg;
@@ -996,17 +865,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmPrbQciRpt 
 (
- RgmPrbRptPerQci *qciPrbRprt,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgmPrbQciRpt(qciPrbRprt, mBuf)
-RgmPrbRptPerQci *qciPrbRprt;
-Buffer *mBuf = NULLP;
-#endif
+RgmPrbRptPerQci *qciPrbRprt,
+Buffer *mBuf
+)
 {
    CMCHKPK(oduUnpackUInt8, qciPrbRprt->bQci, mBuf);
    CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf);
@@ -1027,17 +890,11 @@ Buffer *mBuf = NULLP;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmPrbQciRpt 
 (
- RgmPrbRptPerQci *qciPrbRprt,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgmPrbQciRpt(qciPrbRprt, mBuf)
-RgmPrbRptPerQci *qciPrbRprt;
-Buffer *mBuf = NULLP;
-#endif
+RgmPrbRptPerQci *qciPrbRprt,
+Buffer *mBuf
+)
 {
    CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf);
    CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf);
@@ -1059,17 +916,11 @@ Buffer *mBuf = NULLP;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkPrbRprtInd
 (
- RgmPrbRprtInd  * prbRprtInd,
- Buffer *mBuf
- )
-#else
-S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
-   RgmPrbRprtInd  * prbRprtInd;
-   Buffer *mBuf = NULLP;
-#endif
+RgmPrbRprtInd  * prbRprtInd,
+Buffer *mBuf
+)
 {
    S32 idx = 0;
 
@@ -1097,17 +948,11 @@ S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkPrbRprtInd
 (
- RgmPrbRprtInd  * prbRprtInd,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
-   RgmPrbRprtInd  * prbRprtInd;
-   Buffer *mBuf;
-#endif
+RgmPrbRprtInd  * prbRprtInd,
+Buffer *mBuf
+)
 {
    uint32_t idx = 0;
 
@@ -1139,19 +984,12 @@ S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
-#else
-S16 cmPkRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd  * prbRprtInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1193,19 +1031,12 @@ RgmPrbRprtInd  * prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmPrbRprtInd(func, pst, mBuf)
-RgmPrbRprtIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmPrbRprtInd prbRprtInd;
@@ -1239,17 +1070,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkTransModeInd
 (
- RgmTransModeInd *transModeInd,
- Buffer *mBuf
- )
-#else
-S16 cmPkTransModeInd(transModeInd, mBuf)
-   RgmTransModeInd *transModeInd;
-   Buffer *mBuf;
-#endif
+RgmTransModeInd *transModeInd,
+Buffer *mBuf
+)
 {
    CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf);
    CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf);
@@ -1269,17 +1094,11 @@ S16 cmPkTransModeInd(transModeInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkTransModeInd
 (
- RgmTransModeInd *transModeInd,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkTransModeInd(transModeInd, mBuf)
-   RgmTransModeInd *transModeInd;
-   Buffer *mBuf;
-#endif
+RgmTransModeInd *transModeInd,
+Buffer *mBuf
+)
 {
    uint32_t tmpModeEnum;
    CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf);
@@ -1301,19 +1120,13 @@ S16 cmUnpkTransModeInd(transModeInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
+
 S16 cmPkRgmTransModeInd 
 (
 Pst* pst,
 SuId suId,
 RgmTransModeInd *transModeInd
 )
-#else
-S16 cmPkRgmTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1355,19 +1168,12 @@ RgmTransModeInd *transModeInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRgmTransModeInd
 (
 RgmTransModeIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgmTransModeInd(func, pst, mBuf)
-RgmTransModeIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmTransModeInd transModeInd;
index 743f07c..c3c6cd1 100755 (executable)
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkRgrBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -119,19 +112,12 @@ SpId spId;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrBndReq
 (
 RgrBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBndReq(func, pst, mBuf)
-RgrBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
@@ -176,19 +162,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -239,19 +218,12 @@ uint8_t status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrBndCfm
 (
 RgrBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBndCfm(func, pst, mBuf)
-RgrBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    uint8_t status;
@@ -295,19 +267,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkRgrUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -357,19 +322,12 @@ Reason reason;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUbndReq
 (
 RgrUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUbndReq(func, pst, mBuf)
-RgrUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
@@ -414,19 +372,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfgReq
 (
 RgrCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgReq(func, pst, mBuf)
-RgrCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgrCfgTransId transId;
    RgrCfgReqInfo *cfgReqInfo;
@@ -494,17 +445,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTtiIndInfo
 (
 RgrTtiIndInfo *param,
 Buffer        *mBuf
 )
-#else
-S16 cmPkRgrTtiIndInfo(param, mBuf)
-RgrTtiIndInfo *param;
-Buffer        *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -525,17 +470,11 @@ Buffer        *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTtiIndInfo
 (
 RgrTtiIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTtiIndInfo(param, mBuf)
-RgrTtiIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -559,19 +498,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTtiInd
 (
 Pst* pst,
 SuId suId,
 RgrTtiIndInfo *ttiInd
 )
-#else
-S16 cmPkRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -624,19 +556,12 @@ RgrTtiIndInfo *ttiInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTtiInd
 (
 RgrTtiInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTtiInd(func, pst, mBuf)
-RgrTtiInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrTtiIndInfo *ttiInd;
@@ -695,19 +620,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfgCfm
 (
 Pst* pst,
 RgrCfgTransId transId,
 uint8_t status
 )
-#else
-S16 cmPkRgrCfgCfm(pst, transId, status)
-Pst* pst;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -757,19 +675,12 @@ uint8_t status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfgCfm
 (
 RgrCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgCfm(func, pst, mBuf)
-RgrCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RgrCfgTransId transId;
    uint8_t status;
@@ -814,7 +725,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSiCfgCfm
 (
 Pst* pst,
@@ -822,13 +732,6 @@ SuId suId,
 RgrCfgTransId transId,
 uint8_t status
 )
-#else
-S16 cmPkRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -889,19 +792,12 @@ uint8_t status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSiCfgCfm
 (
 RgrSiCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf)
-RgrSiCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrCfgTransId transId;
@@ -956,17 +852,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfgTransId
 (
 RgrCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfgTransId(param, mBuf)
-RgrCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -994,17 +884,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfgTransId
 (
 RgrCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgTransId(param, mBuf)
-RgrCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1032,17 +916,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlHqCfg
 (
 RgrDlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlHqCfg(param, mBuf)
-RgrDlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1068,17 +946,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlHqCfg
 (
 RgrDlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlHqCfg(param, mBuf)
-RgrDlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1104,20 +976,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRntiCfg
 (
 RgrRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRntiCfg(param, mBuf)
-RgrRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt16, param->size, mBuf);
    CMCHKPK(cmPkLteRnti, param->startRnti, mBuf);
    return ROK;
@@ -1140,17 +1005,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRntiCfg
 (
 RgrRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRntiCfg(param, mBuf)
-RgrRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1175,17 +1034,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrEmtcRntiCfg
 (
 RgrEmtcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcRntiCfg(param, mBuf)
-RgrEmtcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1214,17 +1067,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrEmtcRntiCfg
 (
 RgrEmtcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcRntiCfg(param, mBuf)
-RgrEmtcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1254,17 +1101,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlCmnCodeRateCfg
 (
 RgrDlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf)
-RgrDlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
@@ -1290,17 +1131,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlCmnCodeRateCfg
 (
 RgrDlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf)
-RgrDlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->bcchPchRaCodeRate, mBuf);
@@ -1326,19 +1161,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfiCfg
 (
 RgrCfiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfiCfg(param, mBuf)
-RgrCfiCfg *param;
-Buffer *mBuf;
-#endif
 {
-
    CMCHKPK(oduUnpackUInt8, param->cfi, mBuf);
    return ROK;
 }
@@ -1360,17 +1188,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfiCfg
 (
 RgrCfiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfiCfg(param, mBuf)
-RgrCfiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->cfi, mBuf);
@@ -1394,17 +1216,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPuschSubBandCfg
 (
 RgrPuschSubBandCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPuschSubBandCfg(param, mBuf)
-RgrPuschSubBandCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1435,21 +1251,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPuschSubBandCfg
 (
 RgrPuschSubBandCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPuschSubBandCfg(param, mBuf)
-RgrPuschSubBandCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-
    CMCHKUNPK(oduPackUInt8, &param->subbandStart, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->numSubbands, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->size, mBuf);
@@ -1476,19 +1285,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlCmnCodeRateCfg
 (
 RgrUlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf)
-RgrUlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
-
    CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
    return ROK;
 }
@@ -1510,17 +1312,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlCmnCodeRateCfg
 (
 RgrUlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf)
-RgrUlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
@@ -1544,19 +1340,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlTrgCqiCfg
 (
 RgrUlTrgCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlTrgCqiCfg(param, mBuf)
-RgrUlTrgCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
-
    CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf);
    return ROK;
 }
@@ -1578,17 +1367,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlTrgCqiCfg
 (
 RgrUlTrgCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf)
-RgrUlTrgCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->trgCqi, mBuf);
@@ -1612,17 +1395,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrBwCfg
 (
 RgrBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrBwCfg(param, mBuf)
-RgrBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
@@ -1634,17 +1411,11 @@ Buffer *mBuf;
 #ifdef EMTC_ENABLE 
 /* EMTC related pack changes start*/
 
-#ifdef ANSI
 S16 cmPkRgrEmtcSiCfg
 (
 RgrEmtcSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcSiCfg(param, mBuf)
-RgrEmtcSiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1690,17 +1461,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcRachCfg
 (
 RgrEmtcRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcRachCfg(param, mBuf)
-RgrEmtcRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1720,17 +1485,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPdschCfg
 (
 RgrEmtcPdschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPdschCfg(param, mBuf)
-RgrEmtcPdschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
@@ -1739,17 +1498,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPuschCfg
 (
 RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPuschCfg(param, mBuf)
-RgrEmtcPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf);
@@ -1759,24 +1512,18 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPucchCfg
 (
 RgrEmtcPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPucchCfg(param, mBuf)
-RgrEmtcPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-
-   for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) {
+   for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) 
+   {
          CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf);
-       }
+   }
 
        CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf);
        CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
@@ -1787,17 +1534,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPrachCeParamCfg
 (
 RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf)
-RgrEmtcPrachCEParamLst *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf);
    CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf);
@@ -1814,17 +1555,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPrachCfg
 (
 RgrEmtcPrachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPrachCfg(param, mBuf)
-RgrEmtcPrachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1841,17 +1576,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcCfg
 (
 RgrEmtcCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcCfg(param, mBuf)
-RgrEmtcCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
    CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf);
@@ -1874,17 +1603,11 @@ Buffer *mBuf;
 
 /* EMTC related unpack changes start*/
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcSiCfg
 (
 RgrEmtcSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcSiCfg(param, mBuf)
-RgrEmtcSiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
      S32 i;
@@ -1930,17 +1653,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcRachCfg
 (
 RgrEmtcRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcRachCfg(param, mBuf)
-RgrEmtcRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1957,17 +1674,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPdschCfg
 (
 RgrEmtcPdschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPdschCfg(param, mBuf)
-RgrEmtcPdschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
@@ -1975,17 +1686,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPuschCfg
 (
 RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPuschCfg(param, mBuf)
-RgrEmtcPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8,  &param->emtcHoppingOffset, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
@@ -1995,17 +1700,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPucchCfg
 (
 RgrEmtcPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPucchCfg(param, mBuf)
-RgrEmtcPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2023,17 +1722,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPrachCeParamCfg
 (
 RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf)
-RgrEmtcPrachCEParamLst *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8,  &param->emtcPrachHoppingCfg, mBuf);  
    CMCHKUNPK(oduPackUInt16, &param->emtcMpdcchNumRep, mBuf);
@@ -2050,17 +1743,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPrachCfg
 (
 RgrEmtcPrachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPrachCfg(param, mBuf)
-RgrEmtcPrachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2074,17 +1761,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcCfg
 (
 RgrEmtcCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcCfg(param, mBuf)
-RgrEmtcCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->emtcPuschNbIdx, mBuf);
@@ -2129,17 +1810,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrBwCfg
 (
 RgrBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBwCfg(param, mBuf)
-RgrBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->dlTotalBw, mBuf);
@@ -2164,17 +1839,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPhichCfg
 (
 RgrPhichCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPhichCfg(param, mBuf)
-RgrPhichCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf);
@@ -2199,17 +1868,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPhichCfg
 (
 RgrPhichCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPhichCfg(param, mBuf)
-RgrPhichCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -2237,17 +1900,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPucchCfg
 (
 RgrPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPucchCfg(param, mBuf)
-RgrPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf);
@@ -2276,20 +1933,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPucchCfg
 (
 RgrPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPucchCfg(param, mBuf)
-RgrPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->resourceSize, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->n1PucchAn, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->deltaShift, mBuf);
@@ -2316,17 +1966,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSrsCfg
 (
 RgrSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSrsCfg(param, mBuf)
-RgrSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2354,21 +1998,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSrsCfg
 (
 RgrSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSrsCfg(param, mBuf)
-RgrSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
-
    CMCHKUNPK(oduPackUInt8, &param->isSrsCfgSetup, mBuf);
    CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum;
@@ -2395,17 +2032,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRachCfg
 (
 RgrRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRachCfg(param, mBuf)
-RgrRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2447,17 +2078,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRachCfg
 (
 RgrRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRachCfg(param, mBuf)
-RgrRachCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -2500,17 +2125,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSiCfg
 (
 RgrSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSiCfg(param, mBuf)
-RgrSiCfg *param;
-Buffer *mBuf;
-#endif
 {
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
 #ifdef RGR_SI_SCH
@@ -2554,17 +2173,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSiCfg
 (
 RgrSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfg(param, mBuf)
-RgrSiCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
@@ -2613,17 +2226,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTpcRntiCfg
 (
 RgrTpcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTpcRntiCfg(param, mBuf)
-RgrTpcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2649,17 +2256,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTpcRntiCfg
 (
 RgrTpcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTpcRntiCfg(param, mBuf)
-RgrTpcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2685,20 +2286,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlPwrCfg
 (
 RgrUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlPwrCfg(param, mBuf)
-RgrUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->puschPwrFmt3a, mBuf);
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->puschPwrFmt3, mBuf);
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->pucchPwrFmt3a, mBuf);
@@ -2727,17 +2321,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlPwrCfg
 (
 RgrUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlPwrCfg(param, mBuf)
-RgrUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -2771,17 +2359,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPuschCfg
 (
 RgrPuschCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPuschCfg(param, mBuf)
-RgrPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2808,17 +2390,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPuschCfg
 (
 RgrPuschCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPuschCfg(param, mBuf)
-RgrPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2845,17 +2421,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCodeBookRstCfg
 (
 RgrCodeBookRstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCodeBookRstCfg(param, mBuf)
-RgrCodeBookRstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2884,17 +2454,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCodeBookRstCfg
 (
 RgrCodeBookRstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCodeBookRstCfg(param, mBuf)
-RgrCodeBookRstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2923,17 +2487,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPreambleSetCfg
 (
 RgrPreambleSetCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPreambleSetCfg(param, mBuf)
-RgrPreambleSetCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2960,17 +2518,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPreambleSetCfg
 (
 RgrPreambleSetCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPreambleSetCfg(param, mBuf)
-RgrPreambleSetCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2997,20 +2549,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCmnLchCfg
 (
 RgrCmnLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCmnLchCfg(param, mBuf)
-RgrCmnLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dir, mBuf);
@@ -3036,17 +2581,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCmnLchCfg
 (
 RgrCmnLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCmnLchCfg(param, mBuf)
-RgrCmnLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3075,17 +2614,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlfsCfg
 (
 RgrDlfsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlfsCfg(param, mBuf)
-RgrDlfsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3111,17 +2644,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlfsCfg
 (
 RgrDlfsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlfsCfg(param, mBuf)
-RgrDlfsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3151,17 +2678,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTddPrachInfo
 (
 RgrTddPrachInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTddPrachInfo(param, mBuf)
-RgrTddPrachInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3189,17 +2710,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTddPrachInfo
 (
 RgrTddPrachInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTddPrachInfo(param, mBuf)
-RgrTddPrachInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -3229,17 +2744,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTddPrachRscInfo
 (
 RgrTddPrachRscInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTddPrachRscInfo(param, mBuf)
-RgrTddPrachRscInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3268,17 +2777,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTddPrachRscInfo
 (
 RgrTddPrachRscInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTddPrachRscInfo(param, mBuf)
-RgrTddPrachRscInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3311,17 +2814,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrEnbPfs
 (
 RgrEnbPfs  *param,
 Buffer    *mBuf
 )
-#else
-S16 cmPkRgrEnbPfs(param, mBuf)
-RgrEnbPfs  *param;
-Buffer    *mBuf;
-#endif
 {
    S32 idx;
    for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--)
@@ -3351,17 +2848,11 @@ Buffer    *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrEnbPfs
 (
 RgrEnbPfs *param,
 Buffer   *mBuf
 )
-#else
-S16 cmUnpkRgrEnbPfs(param, mBuf)
-RgrEnbPfs *param;
-Buffer *mBuf;
-#endif
 {
    S32 idx;
 
@@ -3392,17 +2883,11 @@ TODO: Check if this is to be added to re-configuration as well
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSpsCellCfg
 (
 RgrSpsCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSpsCellCfg(param, mBuf)
-RgrSpsCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf);
@@ -3430,17 +2915,11 @@ TODO: Check if this is to be added to re-configuration as well
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSpsDlCellCfg
 (
 RgrSpsCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSpsDlCellCfg(param, mBuf)
-RgrSpsCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3513,17 +2992,11 @@ Buffer           *mBuf
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkRgrLteUCellCfg
 (
 RgrLteUCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRgrLteUCellCfg(param, mBuf)
-RgrLteUCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf);
@@ -3546,17 +3019,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnpkRgrLteUCellCfg
 (
 RgrLteUCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRgrLteUCellCfg(param, mBuf)
-RgrLteUCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3581,17 +3048,11 @@ Buffer *mBuf;
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLteAdvancedUeConfig
 (
- RgrLteAdvancedUeConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrLteAdvancedUeConfig(param, mBuf)
-   RgrLteAdvancedUeConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedUeConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf);
@@ -3615,17 +3076,11 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLteAdvancedUeConfig
 (
- RgrLteAdvancedUeConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf)
-   RgrLteAdvancedUeConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedUeConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKUNPK(oduPackUInt32, &param->pres, mBuf);
@@ -3649,17 +3104,11 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrAbsConfig
 (
- RgrAbsConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrAbsConfig(param, mBuf)
-   RgrAbsConfig *param;
-   Buffer *mBuf;
-#endif
+RgrAbsConfig *param,
+Buffer *mBuf
+)
 {
    S8   indx = 0;
 
@@ -3690,17 +3139,11 @@ S16 cmPkRgrAbsConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSfrConfig
 (
- RgrSfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrSfrConfig(param, mBuf)
-   RgrSfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrSfrConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
@@ -3731,17 +3174,11 @@ S16 cmPkRgrSfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDsfrConfig
 (
- RgrDsfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrDsfrConfig(param, mBuf)
-   RgrDsfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrDsfrConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
@@ -3766,17 +3203,11 @@ S16 cmPkRgrDsfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDsfrConfig
 (
- RgrDsfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrDsfrConfig(param, mBuf)
-   RgrDsfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrDsfrConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->status, mBuf);
@@ -3800,17 +3231,12 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
+
 S16 cmPkRgrCellLteAdvancedFeatureCfg
 (
- RgrLteAdvancedCellConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf)
-   RgrLteAdvancedCellConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedCellConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt32, param->pres, mBuf);
@@ -3838,17 +3264,11 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrAbsConfig
 (
- RgrAbsConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrAbsConfig(param, mBuf)
-   RgrAbsConfig *param;
-   Buffer *mBuf;
-#endif
+RgrAbsConfig *param,
+Buffer *mBuf
+)
 {
 
    S8 indx = 0;
@@ -3880,17 +3300,11 @@ S16 cmUnpkRgrAbsConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSfrConfig
 (
- RgrSfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrSfrConfig(param, mBuf)
-   RgrSfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrSfrConfig *param,
+Buffer *mBuf
+)
 {
 
 
@@ -3920,17 +3334,11 @@ S16 cmUnpkRgrSfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellLteAdvancedFeatureCfg
 (
- RgrLteAdvancedCellConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
-   RgrLteAdvancedCellConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedCellConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKUNPK(cmUnpkRgrAbsConfig, &param->absCfg, mBuf);
@@ -3956,17 +3364,11 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkMacSchedGnbCfg
 (
 MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkMacSchedGnbCfg(param, mBuf)
-RgrSchedEnbCfg *param;
-Buffer         *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf);
@@ -3993,17 +3395,11 @@ Buffer         *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkMacSchedGnbCfg
 (
 MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkMacSchedGnbCfg(param, mBuf)
-MacSchedGnbCfg *param;
-Buffer         *mBuf;
-#endif
 {
 
 
@@ -4032,17 +3428,11 @@ Buffer         *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCfg
 (
 RgrCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCfg(param, mBuf)
-RgrCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -4156,17 +3546,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCfg
 (
 RgrCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCfg(param, mBuf)
-RgrCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -4271,17 +3655,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeAprdDlCqiCfg
 (
 RgrUeAprdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf)
-RgrUeAprdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    /*Pack Aperiodic Trigger List only for Pcell */
@@ -4312,17 +3690,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeAprdDlCqiCfg
 (
 RgrUeAprdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf)
-RgrUeAprdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4359,17 +3731,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4400,17 +3766,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4447,17 +3807,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlPCqiSetup
 (
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDlPCqiSetup(param, mBuf)
-RgrUeDlPCqiSetup *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4490,17 +3844,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlPCqiSetup
 (
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf)
-RgrUeDlPCqiSetup *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4535,17 +3883,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4571,17 +3913,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4608,17 +3944,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlSrsSetupCfg
 (
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf)
-RgrUeUlSrsSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4652,17 +3982,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlSrsSetupCfg
 (
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf)
-RgrUeUlSrsSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -4699,17 +4023,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSrSetupCfg
 (
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSrSetupCfg(param, mBuf)
-RgrUeSrSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4737,17 +4055,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSrSetupCfg
 (
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSrSetupCfg(param, mBuf)
-RgrUeSrSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->srResIdx, mBuf);
@@ -4774,17 +4086,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSrCfg
 (
 RgrUeSrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSrCfg(param, mBuf)
-RgrUeSrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4810,17 +4116,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSrCfg
 (
 RgrUeSrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSrCfg(param, mBuf)
-RgrUeSrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4847,17 +4147,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlSrsCfg
 (
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlSrsCfg(param, mBuf)
-RgrUeUlSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4885,17 +4179,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlSrsCfg
 (
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlSrsCfg(param, mBuf)
-RgrUeUlSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4924,17 +4212,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlCqiCfg
 (
 RgrUeDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDlCqiCfg(param, mBuf)
-RgrUeDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4969,17 +4251,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlCqiCfg
 (
 RgrUeDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDlCqiCfg(param, mBuf)
-RgrUeDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5005,17 +4281,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeMeasGapCfg
 (
 RgrUeMeasGapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeMeasGapCfg(param, mBuf)
-RgrUeMeasGapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5042,17 +4312,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeMeasGapCfg
 (
 RgrUeMeasGapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeMeasGapCfg(param, mBuf)
-RgrUeMeasGapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5079,17 +4343,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDrxLongCycleOffst
 (
 RgrDrxLongCycleOffst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDrxLongCycleOffst(param, mBuf)
-RgrDrxLongCycleOffst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5115,17 +4373,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDrxLongCycleOffst
 (
 RgrDrxLongCycleOffst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf)
-RgrDrxLongCycleOffst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5151,17 +4403,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDrxShortDrx
 (
 RgrDrxShortDrx *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDrxShortDrx(param, mBuf)
-RgrDrxShortDrx *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5188,17 +4434,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDrxShortDrx
 (
 RgrDrxShortDrx *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDrxShortDrx(param, mBuf)
-RgrDrxShortDrx *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5223,17 +4463,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDrxCfg
 (
 RgrUeDrxCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDrxCfg(param, mBuf)
-RgrUeDrxCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5272,17 +4506,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDrxCfg
 (
 RgrUeDrxCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDrxCfg(param, mBuf)
-RgrUeDrxCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5321,17 +4549,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCapCfg
 (
 RgrUeCapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCapCfg(param, mBuf)
-RgrUeCapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5360,17 +4582,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCapCfg
 (
 RgrUeCapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCapCfg(param, mBuf)
-RgrUeCapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5399,17 +4615,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeAckNackRepCfg
 (
 RgrUeAckNackRepCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeAckNackRepCfg(param, mBuf)
-RgrUeAckNackRepCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5436,17 +4646,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeAckNackRepCfg
 (
 RgrUeAckNackRepCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf)
-RgrUeAckNackRepCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -5475,17 +4679,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTxModeCfg
 (
 RgrUeTxModeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTxModeCfg(param, mBuf)
-RgrUeTxModeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5513,17 +4711,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTxModeCfg
 (
 RgrUeTxModeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTxModeCfg(param, mBuf)
-RgrUeTxModeCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -5554,17 +4746,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlHqCfg
 (
 RgrUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlHqCfg(param, mBuf)
-RgrUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5590,17 +4776,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlHqCfg
 (
 RgrUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlHqCfg(param, mBuf)
-RgrUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5626,17 +4806,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeGrpPwrCfg
 (
 RgrUeGrpPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeGrpPwrCfg(param, mBuf)
-RgrUeGrpPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5663,17 +4837,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeGrpPwrCfg
 (
 RgrUeGrpPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf)
-RgrUeGrpPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5701,17 +4869,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsDlCfg
 (
 RgrUeSpsDlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsDlCfg(param, mBuf)
-RgrUeSpsDlCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -5743,17 +4905,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsDlCfg
 (
 RgrUeSpsDlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsDlCfg(param, mBuf)
-RgrUeSpsDlCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -5788,17 +4944,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsUlCfg
 (
 RgrUeSpsUlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsUlCfg(param, mBuf)
-RgrUeSpsUlCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -5842,17 +4992,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsUlCfg
 (
 RgrUeSpsUlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsUlCfg(param, mBuf)
-RgrUeSpsUlCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -5897,17 +5041,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsCfg
 (
 RgrUeSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsCfg(param, mBuf)
-RgrUeSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5934,17 +5072,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsCfg
 (
 RgrUeSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsCfg(param, mBuf)
-RgrUeSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5970,17 +5102,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlPwrCfg
 (
 RgrUeUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlPwrCfg(param, mBuf)
-RgrUeUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6012,17 +5138,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlPwrCfg
 (
 RgrUeUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlPwrCfg(param, mBuf)
-RgrUeUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6054,17 +5174,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeQosCfg
 (
 RgrUeQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeQosCfg(param, mBuf)
-RgrUeQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6091,17 +5205,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeQosCfg
 (
 RgrUeQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeQosCfg(param, mBuf)
-RgrUeQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6126,17 +5234,11 @@ Buffer *mBuf;
 *     File  :  
 * 
 **********************************************************/ 
-#ifdef ANSI 
 S16 cmPkRgrUePuschDedCfg 
 ( 
 RgrUePuschDedCfg *param, 
 Buffer *mBuf 
 ) 
-#else 
-S16 cmPkRgrUePuschDedCfg(param, mBuf) 
-RgrUePuschDedCfg *param; 
-Buffer *mBuf; 
-#endif 
 { 
  
  
@@ -6164,17 +5266,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePuschDedCfg
 (
 RgrUePuschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePuschDedCfg(param, mBuf)
-RgrUePuschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6200,17 +5296,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTxAntSelCfg
 (
 RgrUeTxAntSelCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTxAntSelCfg(param, mBuf)
-RgrUeTxAntSelCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6236,17 +5326,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTxAntSelCfg
 (
 RgrUeTxAntSelCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf)
-RgrUeTxAntSelCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -6273,17 +5357,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTaTmrCfg
 (
 RgrUeTaTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTaTmrCfg(param, mBuf)
-RgrUeTaTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6309,17 +5387,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTaTmrCfg
 (
 RgrUeTaTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTaTmrCfg(param, mBuf)
-RgrUeTaTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6330,17 +5402,11 @@ Buffer *mBuf;
 
 
 #ifdef EMTC_ENABLE
-#ifdef ANSI
 S16 cmUnpkRgrEmtcUeCfg
 (
 RgrUeEmtcCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcUeCfg(param, mBuf)
-RgrUeEmtcCfg *param;
-Buffer *mBuf;
-#endif
 {
    S32 indx=0;
    S32 idx=0;
@@ -6572,17 +5638,11 @@ S16 cmPkRgr5gtfUeCfg
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCfg
 (
 RgrUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCfg(param, mBuf)
-RgrUeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef RG_5GTF
@@ -6678,17 +5738,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCfg
 (
 RgrUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCfg(param, mBuf)
-RgrUeCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -6784,17 +5838,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchQosCfg
 (
 RgrLchQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchQosCfg(param, mBuf)
-RgrLchQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6821,17 +5869,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchQosCfg
 (
 RgrLchQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchQosCfg(param, mBuf)
-RgrLchQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6858,17 +5900,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchSpsCfg
 (
 RgrLchSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchSpsCfg(param, mBuf)
-RgrLchSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6894,17 +5930,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchSpsCfg
 (
 RgrLchSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchSpsCfg(param, mBuf)
-RgrLchSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6929,17 +5959,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlLchCfg
 (
 RgrDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlLchCfg(param, mBuf)
-RgrDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_7 - Added support for SPS*/
@@ -6968,17 +5992,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlLchCfg
 (
 RgrDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlLchCfg(param, mBuf)
-RgrDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7011,17 +6029,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlLchCfg
 (
 RgrUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLchCfg(param, mBuf)
-RgrUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7048,17 +6060,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlLchCfg
 (
 RgrUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLchCfg(param, mBuf)
-RgrUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7085,17 +6091,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlLcgCfg
 (
 RgrUlLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLcgCfg(param, mBuf)
-RgrUlLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
@@ -7134,17 +6134,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlLcgCfg
 (
 RgrUlLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLcgCfg(param, mBuf)
-RgrUlLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
@@ -7167,34 +6161,22 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRgrUlLchQciCfg
 (
 RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLchQciCfg (param, mBuf)
-RgrUlLchQciCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->lcId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
    return ROK;
 }
-#ifdef ANSI
 S16 cmUnpkRgrUlLchQciCfg
 (
 RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLchQciCfg (param, mBuf)
-RgrUlLchQciCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->qci, mBuf);
@@ -7218,17 +6200,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchCfg
 (
 RgrLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchCfg(param, mBuf)
-RgrLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
@@ -7258,17 +6234,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchCfg
 (
 RgrLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchCfg(param, mBuf)
-RgrLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7283,17 +6253,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrLcgCfg
 (
 RgrLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLcgCfg(param, mBuf)
-RgrLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7304,17 +6268,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrLcgCfg
 (
 RgrLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLcgCfg(param, mBuf)
-RgrLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7341,17 +6299,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfg
 (
 RgrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfg(param, mBuf)
-RgrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7395,17 +6347,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfg
 (
 RgrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfg(param, mBuf)
-RgrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7449,17 +6395,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrActvTime
 (
 RgrActvTime *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrActvTime(param, mBuf)
-RgrActvTime *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7485,17 +6425,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrActvTime
 (
 RgrActvTime *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrActvTime(param, mBuf)
-RgrActvTime *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7521,17 +6455,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellRecfg
 (
 RgrCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellRecfg(param, mBuf)
-RgrCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkRgrCellCntrlCmdCfg, &param->cntrlCmdCfg, mBuf);
@@ -7579,17 +6507,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellRecfg
 (
 RgrCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellRecfg(param, mBuf)
-RgrCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7639,17 +6561,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeRecfg
 (
 RgrUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeRecfg(param, mBuf)
-RgrUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef EMTC_ENABLE
@@ -7759,17 +6675,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeRecfg
 (
 RgrUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeRecfg(param, mBuf)
-RgrUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -7879,17 +6789,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchRecfg
 (
 RgrLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchRecfg(param, mBuf)
-RgrLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_7 - Added support for SPS*/
@@ -7922,17 +6826,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchRecfg
 (
 RgrLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchRecfg(param, mBuf)
-RgrLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7949,17 +6847,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrLcgRecfg
 (
 RgrLcgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLcgRecfg(param, mBuf)
-RgrLcgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef RG_UNUSED
    S32 i;
@@ -7981,17 +6873,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrLcgRecfg
 (
 RgrLcgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLcgRecfg(param, mBuf)
-RgrLcgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef RG_UNUSED
    S32 i;
@@ -8031,17 +6917,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRecfg
 (
 RgrRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRecfg(param, mBuf)
-RgrRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8082,17 +6962,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRecfg
 (
 RgrRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRecfg(param, mBuf)
-RgrRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8132,17 +7006,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlSecCellRelInfo
 (
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf)
-RgrUeDlSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -8164,17 +7032,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSecCellRelInfo
 (
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSecCellRelInfo(param, mBuf)
-RgrUeSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
@@ -8203,17 +7065,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDel
 (
 RgrDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDel(param, mBuf)
-RgrDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8269,17 +7125,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlSecCellRelInfo
 (
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf)
-RgrUeDlSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -8302,17 +7152,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSecCellRelInfo
 (
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf)
-RgrUeSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -8341,17 +7185,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDel
 (
 RgrDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDel(param, mBuf)
-RgrDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8403,17 +7241,11 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSonPrbCfg
 (
 RgrPrbCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSonPrbCfg(param, mBuf)
-RgrPrbCfg *param;
-Buffer *mBuf;
-#endif
 {
    S32 count;
    for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --)
@@ -8449,17 +7281,11 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSonPrbCfg
 (
 RgrPrbCfg   *param,
 Buffer      *mBuf
 )
-#else
-S16 cmUnpkRgrSonPrbCfg(param, mBuf)
-RgrPrbCfg   *param;
-Buffer      *mBuf;
-#endif
 {
    S32   count;
    CMCHKUNPK(oduPackUInt8, &param->isSonIcicEnable, mBuf);
@@ -8494,17 +7320,11 @@ Buffer      *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSonCfg
 (
 RgrSonCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSonCfg(param, mBuf)
-RgrSonCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    switch(param->cfgType)
@@ -8534,17 +7354,11 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSonCfg
 (
 RgrSonCfg   *param,
 Buffer      *mBuf
 )
-#else
-S16 cmUnpkRgrSonCfg(param, mBuf)
-RgrSonCfg   *param;
-Buffer      *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->cfgType, mBuf);
@@ -8577,17 +7391,11 @@ Buffer      *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRst
 (
 RgrRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRst(param, mBuf)
-RgrRst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8613,17 +7421,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRst
 (
 RgrRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRst(param, mBuf)
-RgrRst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8647,17 +7449,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnPkRgrSCellActDeactInfo
 (
 RgrSCellActDeactInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnPkRgrSCellActInfo(param, mBuf)
-RgrSCellActDeactInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
@@ -8679,17 +7475,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnPkRgrSCellActDeactEvnt
 (
 RgrSCellActDeactEvnt *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf)
-RgrSCellActDeactEvnt *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t idx;
@@ -8721,17 +7511,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkRgrSCellActDeactInfo
 (
 RgrSCellActDeactInfo *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRgrSCellActDeactInfo(param, mBuf)
-RgrSCellActDeactInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -8754,17 +7538,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSCellActDeactEvnt
 (
 RgrSCellActDeactEvnt *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSCellActDeactEvnt(param, mBuf)
-RgrSCellActDeactEvnt *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8798,17 +7576,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfgReqInfo
 (
 RgrCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfgReqInfo(param, mBuf)
-RgrCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8859,17 +7631,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfgReqInfo
 (
 RgrCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgReqInfo(param, mBuf)
-RgrCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8920,17 +7686,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeBsrTmrCfg
 (
 RgrUeBsrTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeBsrTmrCfg(param, mBuf)
-RgrUeBsrTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8955,17 +7715,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeBsrTmrCfg
 (
 RgrUeBsrTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf)
-RgrUeBsrTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8993,7 +7747,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSiCfgReq
 (
 Pst* pst,
@@ -9001,13 +7754,6 @@ SpId spId,
 RgrCfgTransId transId,
 RgrSiCfgReqInfo * cfgReqInfo
 )
-#else
-S16 cmPkRgrSiCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrSiCfgReqInfo * cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -9087,19 +7833,12 @@ RgrSiCfgReqInfo * cfgReqInfo;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSiCfgReq
 (
 RgrSiCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfgReq(func, pst, mBuf)
-RgrSiCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RgrCfgTransId transId;
@@ -9167,17 +7906,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSiCfgReqInfo
 (
 RgrSiCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSiCfgReqInfo(param, mBuf)
-RgrSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
   /* ccpu00111328: S16 is renamed as MsgLen */
    MsgLen msgLen;
@@ -9220,17 +7953,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSiCfgReqInfo
 (
 RgrSiCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfgReqInfo(param, mBuf)
-RgrSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen  msgLen, totalMsgLen;
    /*Merge from Mohit Changes*/
@@ -9283,7 +8010,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrWarningSiCfgReq
 (
 Pst* pst,
@@ -9291,13 +8017,6 @@ SpId spId,
 RgrCfgTransId transId,
 RgrWarningSiCfgReqInfo * warningSiCfgReqInfo
 )
-#else
-S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrWarningSiCfgReqInfo * warningSiCfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -9388,19 +8107,12 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrWarningSiCfgReq
 (
 RgrWarningSiCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf)
-RgrWarningSiCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RgrCfgTransId transId;
@@ -9479,19 +8191,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrWarningSiCfgReqInfo
 (
 Pst *pst,
 RgrWarningSiCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf)
-Pst *pst;
-RgrWarningSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen   msgLen;
    uint32_t      count;
@@ -9545,19 +8250,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrWarningSiCfgReqInfo
 (
 Pst *pst,
 RgrWarningSiCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf)
-Pst *pst;
-RgrWarningSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen   msgLen, totalMsgLen;
    uint32_t      count, loopCnt;
@@ -9617,7 +8315,6 @@ Buffer *mBuf;
 *
 *     File  : 
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrWarningSiStopReq
 (
 Pst           *pst,
@@ -9625,13 +8322,6 @@ SpId          spId,
 RgrCfgTransId transId,
 uint8_t            siId
 )
-#else
-S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId)
-Pst           *pst;
-SpId          spId;
-RgrCfgTransId transId;
-uint8_t            siId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -9689,19 +8379,12 @@ uint8_t            siId;
 *
 *     File  : 
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrWarningSiStopReq
 (
 RgrWarningSiStopReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiStopReq(param, mBuf)
-RgrWarningSiStopReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId          spId;
    uint8_t            siId;
@@ -9753,7 +8436,6 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrWarningSiCfgCfm
 (
 Pst*          pst,
@@ -9762,14 +8444,6 @@ RgrCfgTransId transId,
 uint8_t            siId,
 uint8_t            status
 )
-#else
-S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
-Pst*          pst;
-SuId          suId;
-RgrCfgTransId transId;
-uint8_t            siId;
-uint8_t            status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -9848,19 +8522,12 @@ uint8_t            status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrWarningSiCfgCfm
 (
 RgrWarningSiCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf)
-RgrWarningSiCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId          suId;
    uint8_t            siId;
@@ -9933,7 +8600,6 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfReq
 (
 Pst* pst,
@@ -9941,13 +8607,6 @@ SpId spId,
 RgrCfgTransId transId,
 RgrLoadInfReqInfo * loadInfReq
 )
-#else
-S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrLoadInfReqInfo * loadInfReq;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -10027,19 +8686,12 @@ RgrLoadInfReqInfo * loadInfReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfReq
 (
 RgrLoadInfReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfReq(func, pst, mBuf)
-RgrLoadInfReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RgrCfgTransId transId;
@@ -10111,17 +8763,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfReqInfo
 (
 RgrLoadInfReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLoadInfReqInfo(param, mBuf)
-RgrLoadInfReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -10146,17 +8792,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfReqInfo
 (
 RgrLoadInfReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfReqInfo(param, mBuf)
-RgrLoadInfReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->rgrCcPHighEndRb, mBuf);
@@ -10186,17 +8826,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiReptCfg
 (
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiReptCfg(param, mBuf)
-RgrUeCqiReptCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf);
@@ -10221,17 +8855,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiReptCfg
 (
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiReptCfg(param, mBuf)
-RgrUeCqiReptCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->numColltdCqiRept, mBuf);
@@ -10256,19 +8884,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrStaInd
 (
 Pst* pst,
 SuId suId,
 RgrStaIndInfo* staInd
 )
-#else
-S16 cmPkRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo* staInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -10340,19 +8961,12 @@ RgrStaIndInfo* staInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrStaInd
 (
 RgrStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrStaInd(func, pst, mBuf)
-RgrStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrStaIndInfo *staInd;
@@ -10413,17 +9027,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrStaIndInfo
 (
 RgrStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrStaIndInfo(param, mBuf)
-RgrStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10448,17 +9056,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrStaIndInfo
 (
 RgrStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrStaIndInfo(param, mBuf)
-RgrStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10483,17 +9085,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiInfo
 (
 RgrUeCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiInfo(param, mBuf)
-RgrUeCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16 idx;
@@ -10522,17 +9118,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiInfo
 (
 RgrUeCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiInfo(param, mBuf)
-RgrUeCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    uint8_t  idx;
@@ -10560,17 +9150,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSubBandCqiInfo 
 (
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSubBandCqiInfo(param, mBuf)
-RgrSubBandCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10596,17 +9180,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiRept
 (
 RgrUeCqiRept *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiRept(param, mBuf)
-RgrUeCqiRept *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    uint8_t count;
@@ -10638,17 +9216,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSubBandCqiInfo 
 (
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSubBandCqiInfo(param, mBuf)
-RgrSubBandCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10674,17 +9246,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiRept
 (
 RgrUeCqiRept *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiRept(param, mBuf)
-RgrUeCqiRept *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -10717,19 +9283,12 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfInd
 (
 Pst* pst,
 SuId suId,
 RgrLoadInfIndInfo* loadInfInd
 )
-#else
-S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd)
-Pst* pst;
-SuId suId;
-RgrLoadInfIndInfo* loadInfInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -10802,19 +9361,12 @@ RgrLoadInfIndInfo* loadInfInd;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfInd
 (
 RgrLoadInfInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfInd(func, pst, mBuf)
-RgrLoadInfInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
@@ -10876,17 +9428,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfIndInfo
 (
 RgrLoadInfIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLoadInfIndInfo(param, mBuf)
-RgrLoadInfIndInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t                     idx;
 
@@ -10923,19 +9469,12 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfIndInfo
 (
 RgrLoadInfIndInfo *param,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfIndInfo(param, pst, mBuf)
-RgrLoadInfIndInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S8          idx;
 
@@ -11010,17 +9549,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUepACfg
 (
 RgrUepACfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUepACfg(param, mBuf)
-RgrUepACfg *param;
-Buffer *mBuf;
-#endif
 {
 
    if(param->pAPrsnt)
@@ -11049,17 +9582,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUepACfg
 (
 RgrUepACfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUepACfg(param, mBuf)
-RgrUepACfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
@@ -11089,17 +9616,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePdschDedCfg
 (
 RgrUePdschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePdschDedCfg(param, mBuf)
-RgrUePdschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkRgrUepACfg, &param->uepACfg, mBuf);
@@ -11124,17 +9645,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePdschDedCfg
 (
 RgrUePdschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePdschDedCfg(param, mBuf)
-RgrUePdschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkRgrUepACfg, &param->uepACfg, mBuf);
@@ -11161,17 +9676,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkRgrUeUlPwrDedSCellCfg
 (
 RgrUeUlPwrDedSCellCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf)
-RgrUeUlPwrDedSCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf);
    CMCHKPK(SPkS8, param->p0UePusch, mBuf);
@@ -11196,17 +9705,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnpkRgrUeUlPwrDedSCellCfg
 (
 RgrUeUlPwrDedSCellCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf)
-RgrUeUlPwrDedSCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11235,17 +9738,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmPkRgrUeSecCellCfg
 (
 RgrUeSecCellCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmPkRgrUeSecCellCfg(param, mBuf)
-RgrUeSecCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,&param->ueSCellUlDedPwrCfg, mBuf);
    CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf);
@@ -11279,17 +9776,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSecCellInfo
 (
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSecCellInfo(param, mBuf)
-RgrUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
@@ -11320,17 +9811,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 static S16 cmUnpkRgrUeSecCellCfg
 (
 RgrUeSecCellCfg *param,
 Buffer *mBuf
 )
-#else
-static S16 cmUnpkRgrUeSecCellCfg(param, mBuf)
-RgrUeSecCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -11364,17 +9849,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSecCellInfo
 (
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSecCellInfo(param, mBuf)
-RgrUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -11404,17 +9883,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSCellAckPucchCfg
 (
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf)
-RgrUeSCellAckPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
 
@@ -11470,17 +9943,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSCellAckPucchCfg
 (
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf)
-RgrUeSCellAckPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t idx;
 
@@ -11544,19 +10011,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeStaInd
 (
 Pst* pst,
 SuId suId,
 RgrUeStaIndInfo* ueStaInd
 )
-#else
-S16 cmPkRgrUeStaInd(pst, suId, ueStaInd)
-Pst* pst;
-SuId suId;
-RgrUeStaIndInfo* ueStaInd;
-#endif
 {
    Buffer *mBuf = NULLP;
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
@@ -11628,19 +10088,12 @@ RgrUeStaIndInfo* ueStaInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeStaInd
 (
 RgrUeStaInd  func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeStaInd(func, pst, mBuf)
-RgrUeStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrUeStaIndInfo *ueStaInd;
@@ -11700,17 +10153,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeStaIndInfo
 (
 RgrUeStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeStaIndInfo(param, mBuf)
-RgrUeStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11734,17 +10181,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeStaIndInfo
 (
 RgrUeStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeStaIndInfo(param, mBuf)
-RgrUeStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11771,17 +10212,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCsgParamCfg 
 (
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCsgParamCfg(param, mBuf)
-RgrCellCsgParamCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11805,17 +10240,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCsgParamCfg
 (
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCsgParamCfg(param, mBuf)
-RgrCellCsgParamCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11839,17 +10268,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCntrlCmdCfg
 (
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCntrlCmdCfg(param, mBuf)
-RgrCellCntrlCmdCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    switch(param->cmdType)
@@ -11882,17 +10305,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCntrlCmdCfg
 (
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf)
-RgrCellCntrlCmdCfg *param;
-Buffer *mBuf;
-#endif
 {
    uint32_t tmpEnum;
 
index f9bfe69..604f955 100755 (executable)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkRguBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -122,23 +115,15 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguBndReq
 (
 RguBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguBndReq(func, pst, mBuf)
-RguBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
-   
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -176,19 +161,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkRguUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -236,19 +214,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguUbndReq
 (
 RguUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguUbndReq(func, pst, mBuf)
-RguUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
@@ -291,19 +262,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguBndCfm
 (
 Pst* pst,
 SuId suId,
 uint8_t status
 )
-#else
-S16 cmPkRguBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-uint8_t status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -352,23 +316,15 @@ uint8_t status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguBndCfm
 (
 RguBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguBndCfm(func, pst, mBuf)
-RguBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    uint8_t status;
-   
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -411,17 +367,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguL2MUlThrpMeasReqInfo 
 (
 RguL2MUlThrpMeasReqInfo* param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguL2MUlThrpMeasReqInfo(param, mBuf)
-RguL2MUlThrpMeasReqInfo* param;
-Buffer *mBuf;
-#endif
 {
    S32 loop;
 
@@ -454,17 +404,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguL2MUlThrpMeasReqInfo 
 (
 RguL2MUlThrpMeasReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguL2MUlThrpMeasReqInfo(param, mBuf)
-RguL2MUlThrpMeasReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    uint8_t loop;
 
@@ -494,19 +438,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguL2MUlThrpMeasReq 
 (
 Pst* pst,
 SpId spId,
 RguL2MUlThrpMeasReqInfo* measReq
 )
-#else
-S16 cmPkRguL2MUlThrpMeasReq(pst, spId, measReq)
-Pst* pst;
-SpId spId;
-RguL2MUlThrpMeasReqInfo* measReq;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -584,19 +521,12 @@ RguL2MUlThrpMeasReqInfo* measReq;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguL2MUlThrpMeasReq 
 (
 RguL2MUlThrpMeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguL2MUlThrpMeasReq(func, pst, mBuf)
-RguL2MUlThrpMeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RguL2MUlThrpMeasReqInfo* measReq;
@@ -662,23 +592,16 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguHqStaInd
 (
 Pst* pst,
 SuId suId,
 RguHarqStatusInd  *harqStatusInd
 )
-#else
-S16 cmPkRguHqStaInd(pst, suId, harqStatusInd)
-Pst* pst;
-SuId suId;
-RguHarqStatusInd  *harqStatusInd;
-#endif
 {
 
    Buffer   *mBuf;
-   uint8_t       idx;
+   uint8_t  idx;
    RguHarqStatusInd *harqStaInd = NULL;
 
 #ifdef XEON_SPECIFIC_CHANGES
@@ -785,24 +708,16 @@ RguHarqStatusInd  *harqStatusInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguHqStaInd
 (
 RguHqStaInd  func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguHqStaInd(func, pst, mBuf)
-RguHqStaInd   func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RguHarqStatusInd    *hqStaInd;  
-   SuId                suId;
-   uint8_t                  idx;
-
+   SuId    suId;
+   uint8_t idx;
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -860,17 +775,11 @@ Buffer *mBuf;
 }
 #endif /* LTE_L2_MEAS */
 
-#ifdef ANSI
 S16 cmPkRguLcFlowCntrlInfo
 (
 RguLcFlowCntrlInfo *param,
 Buffer             *mBuf
 )
-#else
-S16 cmPkRguLcFlowCntrlInfo (param,mBuf)
-RguLcFlowCntrlInfo *param;
-Buffer             *mBuf;
-#endif
 {
   CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf);
   CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);
@@ -879,17 +788,11 @@ Buffer             *mBuf;
   return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRguUeFlowCntrlInfo
 (
 RguUeFlowCntrlInfo *param,
 Buffer             *mBuf
 )
-#else
-S16 cmPkRguUeFlowCntrlInfo (param,mBuf)
-RguUeFlowCntrlInfo *param;
-Buffer             *mBuf;
-#endif
 {
   uint32_t idx;
 
@@ -903,21 +806,14 @@ Buffer             *mBuf;
   return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRguFlowCntrlInfo
 (
 RguFlowCntrlInd *param, 
 Buffer          *mBuf
 )
-#else
-S16 cmPkRguFlowCntrlInfo(flowCntrlInd, mBuf)
-RguFlowCntrlInd *param;
-Buffer          *mBuf;
-#endif
 {
   uint32_t idx;
 
-
   for (idx=(param->numUes - 1); idx >= 0; idx--)
   {
     cmPkRguUeFlowCntrlInfo(&param->ueFlowCntrlInfo[idx],mBuf);
@@ -942,19 +838,12 @@ Buffer          *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkRguFlowCntrlInd
 (
 Pst* pst,
 SuId suId,
 RguFlowCntrlInd  *flowCntrlInd
 )
-#else
-S16 cmPkRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst* pst;
-SuId suId;
-RguFlowCntrlInd   *flowCntrlInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -996,17 +885,11 @@ RguFlowCntrlInd   *flowCntrlInd;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmUnpkRguLcFlowCntrlInfo
 (
 RguLcFlowCntrlInfo *param,
 Buffer           *mBuf
 )
-#else
-S16 cmUnpkRguLcFlowCntrlInfo (param,mBuf)
-RguLcFlowCntrlInfo *param;
-Buffer           *mBuf;
-#endif
 {
 
   CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
@@ -1015,17 +898,11 @@ Buffer           *mBuf;
   
   return ROK;
 }
-#ifdef ANSI
 S16 cmUnpkRguUeFlowCntrlInfo
 (
 RguUeFlowCntrlInfo *param,
 Buffer           *mBuf
 )
-#else
-S16 cmUnpkRguUeFlowCntrlInfo (param,mBuf)
-RguUeFlowCntrlInfo *param;
-Buffer           *mBuf;
-#endif
 {
   uint32_t idx;
   CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -1037,17 +914,11 @@ Buffer           *mBuf;
   return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkRguFlowCntrlInfo
 (
 RguFlowCntrlInd *param, 
 Buffer           *mBuf
 )
-#else
-S16 cmUnpkRguFlowCntrlInfo(flowCntrlInfo, mBuf)
-RguFlowCntrlInd *param;
-Buffer           *mBuf;
-#endif
 {
   uint32_t idx; 
   
@@ -1076,23 +947,15 @@ Buffer           *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkRguFlowCntrlInd
 (
 RguFlowCntrlIndInfo func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguFlowCntrlInd(func, pst, mBuf)
-RguFlowCntrlIndInfo func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RguFlowCntrlInd *flowCntrlInd;
-   
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -1149,21 +1012,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguPduInfo
 (
 RguPduInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguPduInfo(param, mBuf)
-RguPduInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
-
    for (i=param->numPdu-1; i >= 0; i--) {
      /* rgu_c_001.main_3: ccpu00111328: S16 is renamed as MsgLen */
       MsgLen msgLen = 0;
@@ -1196,17 +1052,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguPduInfo
 (
 RguPduInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguPduInfo(param, mBuf)
-RguPduInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -1241,20 +1091,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguDBoReport
 (
 RguDBoReport *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguDBoReport(param, mBuf)
-RguDBoReport *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf);
    CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf);
 #ifdef CCPU_OPT
@@ -1283,17 +1126,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguDBoReport
 (
 RguDBoReport *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguDBoReport(param, mBuf)
-RguDBoReport *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -1325,21 +1162,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguCDatReqInfo
 (
 RguCDatReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguCDatReqInfo(param, mBuf)
-RguCDatReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen msgLen;
 
-
    if (param->pdu != NULLP)
    {
       if (SFndLenMsg(param->pdu, &msgLen) != ROK)
@@ -1388,17 +1218,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguCDatReqInfo
 (
 RguCDatReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguCDatReqInfo(param, mBuf)
-RguCDatReqInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen msgLen, totalMsgLen;
 
@@ -1451,20 +1275,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguLchDatReq
 (
 RguLchDatReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguLchDatReq(param, mBuf)
-RguLchDatReq *param;
-Buffer *mBuf;
-#endif
 {
 
-
 #ifdef L2_OPTMZ
    CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf);
 #endif
@@ -1493,20 +1310,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguLchDatReq
 (
 RguLchDatReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguLchDatReq(param, mBuf)
-RguLchDatReq *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
    CMCHKUNPK(cmUnpkRguDBoReport, &param->boReport, mBuf);
    CMCHKUNPK(cmUnpkRguPduInfo, &param->pdu, mBuf);
@@ -1534,17 +1344,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguDatReqTb
 (
 RguDatReqTb *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguDatReqTb(param, mBuf)
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -1578,7 +1382,6 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 S16 cmUnpkRguDatReqTb
 (
 Pst         *pst, 
@@ -1586,23 +1389,11 @@ RguDatReqTb *param,
 Buffer *mBuf
 )
 #else
-S16 cmUnpkRguDatReqTb(pst, param, mBuf)
-Pst         *pst;   
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
 S16 cmUnpkRguDatReqTb
 (
 RguDatReqTb *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguDatReqTb(param, mBuf)
-RguDatReqTb *param;
-Buffer *mBuf;
-#endif
 #endif
 {
    S32 i;
@@ -1638,7 +1429,6 @@ Buffer *mBuf;
 **********************************************************/
    /*rgu_c_001.main_5 - ADD - L2M Support */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 S16 cmPkRguDDatReqInfo
 (
 Pst            *pst,
@@ -1646,23 +1436,11 @@ RguDDatReqInfo *param,
 Buffer *mBuf
 )
 #else
-S16 cmPkRguDDatReqInfo(pst, param, mBuf)
-Pst            *pst;
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
 S16 cmPkRguDDatReqInfo
 (
 RguDDatReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguDDatReqInfo(param, mBuf)
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
 #endif
 {
    S32 i;
@@ -1704,7 +1482,6 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 S16 cmUnpkRguDDatReqInfo
 (
 Pst            *pst, 
@@ -1712,23 +1489,11 @@ RguDDatReqInfo *param,
 Buffer *mBuf
 )
 #else
-S16 cmUnpkRguDDatReqInfo(pst, param, mBuf)
-Pst            *pst;
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
-#else
-#ifdef ANSI
 S16 cmUnpkRguDDatReqInfo
 (
 RguDDatReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguDDatReqInfo(param, mBuf)
-RguDDatReqInfo *param;
-Buffer *mBuf;
-#endif
 #endif
 {
    S32 i;
@@ -1790,21 +1555,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguCDatIndInfo
 (
 RguCDatIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguCDatIndInfo(param, mBuf)
-RguCDatIndInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen msgLen;
 
-
    if (SFndLenMsg(param->pdu, &msgLen) != ROK)
       return RFAILED;
    if (SCatMsg(mBuf, param->pdu, M1M2) != ROK)
@@ -1835,17 +1593,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguCDatIndInfo
 (
 RguCDatIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguCDatIndInfo(param, mBuf)
-RguCDatIndInfo *param;
-Buffer *mBuf;
-#endif
 {
    MsgLen msgLen, totalMsgLen;
 
@@ -1879,20 +1631,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguLchDatInd
 (
 RguLchDatInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguLchDatInd(param, mBuf)
-RguLchDatInd *param;
-Buffer *mBuf;
-#endif
 {
 
-      CMCHKPK(cmPkRguPduInfo, &param->pdu, mBuf);
+   CMCHKPK(cmPkRguPduInfo, &param->pdu, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
    return ROK;
 }
@@ -1915,17 +1661,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguLchDatInd
 (
 RguLchDatInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguLchDatInd(param, mBuf)
-RguLchDatInd *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
@@ -1950,17 +1690,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguCStaRspInfo
 (
 RguCStaRspInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguCStaRspInfo(param, mBuf)
-RguCStaRspInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2004,17 +1738,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguCStaRspInfo
 (
 RguCStaRspInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguCStaRspInfo(param, mBuf)
-RguCStaRspInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2057,17 +1785,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguLchStaInd
 (
 RguLchStaInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguLchStaInd(param, mBuf)
-RguLchStaInd *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2094,20 +1816,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguLchStaInd
 (
 RguLchStaInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguLchStaInd(param, mBuf)
-RguLchStaInd *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->totBufSize, mBuf);
    return ROK;
@@ -2130,17 +1845,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRguStaIndTb
 (
 RguStaIndTb *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRguStaIndTb(param, mBuf)
-RguStaIndTb *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -2174,17 +1883,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRguStaIndTb
 (
 RguStaIndTb *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRguStaIndTb(param, mBuf)
-RguStaIndTb *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
index 1a61b7d..5c46055 100644 (file)
@@ -68,14 +68,14 @@ typedef struct rlcPduInfo
    uint8_t    *pduBuf;  /*!< RLC PDU buffer */
 }RlcPduInfo;
  
-typedef struct rlcMacData
+typedef struct rlcData
 {
    // add slot info
-   uint16_t     cellId;       /*!< CELL ID */
-   uint16_t     rnti;         /*!< Temporary CRNTI */
-   SlotIndInfo  slotInfo;     /*!< Timing info */
-   uint8_t      numPdu;       /*!< Number of RLC PDUs */
-   RlcPduInfo   pduInfo[MAX_NUM_PDU];
+   uint16_t      cellId;       /*!< CELL ID */
+   uint16_t      rnti;         /*!< Temporary CRNTI */
+   SlotIndInfo   slotInfo;     /*!< Timing info */
+   uint8_t       numPdu;       /*!< Number of RLC PDUs */
+   RlcPduInfo    pduInfo[MAX_NUM_PDU];
 }RlcData;
 
 /* Function pointers */
index 0cfc141..e8b0290 100644 (file)
@@ -1512,20 +1512,55 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
 
 uint8_t        BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
 {
-   uint8_t ret = ROK;
-
+   uint8_t ret, bufLen;
+   
+   ret =ROK;
    if(rrcMsgType == RRC_SETUP)
    { 
       ret = fillDlCcchRrcMsg(rrcContainer);
       if(ret == RFAILED)
-         DU_LOG("\n F1AP: Failed to fill DL-CCCH Msg at BuildDLRRCContainer()");
+          DU_LOG("\n F1AP: Failed to fill DL-CCCH Msg at RRC SETUP");
+   }
+   else if(rrcMsgType == REGISTRATION_ACCEPT)
+   {
+      /*Hardcoded RRC Container from reference logs*/
+      char buf[14] ={0x00, 0x03, 0x2a, 0x80, 0xaf, 0xc0, 0x08, 0x40, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00};
+      bufLen =14;
+      rrcContainer->size = bufLen;
+      CU_ALLOC(rrcContainer->buf, rrcContainer->size);
+      if(rrcContainer->buf != NULLP)
+      {
+         memset(rrcContainer->buf, 0, bufLen);
+        memcpy(rrcContainer->buf, buf, bufLen);
+      }
    }
    else if(rrcMsgType == RRC_RECONFIG)
    {
-      ret = fillDlDcchRrcMsg(rrcContainer);
-      if(ret == RFAILED)
-         DU_LOG("\n F1AP: Failed at fill DL-DCCH Msg at BuildDLRRCContainer()");
+      /*Hardcoded RRC Container from reference logs*/
+      char buf[196]= { 
+      0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00,
+      0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84,
+      0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41,
+      0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10,
+      0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00,
+      0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04,
+      0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42,
+      0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5,
+      0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22,
+      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80,
+      0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca,
+      0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00,
+      0x00, 0x00, 0x00, 0x00};
+      bufLen =196;
+      rrcContainer->size = bufLen;
+      CU_ALLOC(rrcContainer->buf, rrcContainer->size);
+      if(rrcContainer->buf != NULLP)
+      {
+         memset(rrcContainer->buf, 0, bufLen);
+        memcpy(rrcContainer->buf, buf, bufLen);
+      }
    }
+   
    return ret;
 }
 
@@ -1546,7 +1581,7 @@ uint8_t   BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t rrcMsgType)
+uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
 {
    uint8_t   elementCnt = 0;
    uint8_t  ieId;
@@ -1635,7 +1670,7 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t rrcMsgType)
    dlRRCMsg->protocolIEs.list.array[idx]->criticality  =   Criticality_reject;
    dlRRCMsg->protocolIEs.list.array[idx]->value.present = \
                                                          DLRRCMessageTransferIEs__value_PR_SRBID;
-   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.SRBID = SRB0;
+   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.SRBID = srbId;
 
    /* RRCContainer */
    idx++;
@@ -1704,8 +1739,14 @@ uint8_t setDlRRCMsgType()
       case RRC_SETUP:
         rrcMsgType = RRC_SETUP;
         break;
-      case RRC_SECURITY_MODE_COMMAND:
-        rrcMsgType = RRC_SECURITY_MODE_COMMAND;
+      case REGISTRATION_ACCEPT:
+        rrcMsgType = REGISTRATION_ACCEPT;
+        break;
+      case UE_CONTEXT_SETUP_REQ:
+        rrcMsgType = UE_CONTEXT_SETUP_REQ;
+        break;
+      case SECURITY_MODE_COMPLETE:
+        rrcMsgType = SECURITY_MODE_COMPLETE;
         break;
       case RRC_RECONFIG:
         rrcMsgType = RRC_RECONFIG;
@@ -1788,7 +1829,7 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg)
    {
       f1apMsgDb.dlRrcMsgCount++;
       rrcMsgType = setDlRRCMsgType();
-      ret = BuildAndSendDLRRCMessageTransfer(rrcMsgType);
+      ret = BuildAndSendDLRRCMessageTransfer(SRB0, rrcMsgType);
    }
    return ret;
 }
@@ -5700,7 +5741,7 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
    uint8_t   SplCellListret;
    uint8_t   SrbSetupret;
    uint8_t   elementCnt;
-   uint8_t   idx;
+   uint8_t   idx, bufLen;
    uint8_t   idx1;
    F1AP_PDU_t          *f1apMsg = NULLP;
    UEContextSetupRequest_t *ueSetReq = NULLP;
@@ -5735,7 +5776,7 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       ueSetReq =
         &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
 
-      elementCnt = 11;
+      elementCnt = 12;
       ueSetReq->protocolIEs.list.count = elementCnt;
       ueSetReq->protocolIEs.list.size = \
                                        elementCnt * sizeof(UEContextSetupRequestIEs_t *);
@@ -5858,14 +5899,15 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       {        
         break;
       }
-      
-      /* RRC Container */
+      /* RRC Container for security mode */
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCContainer;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = \
          UEContextSetupRequestIEs__value_PR_RRCContainer;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size = rrcContLen;
+      char secModeBuf[9]={0x00, 0x02, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00};
+      bufLen =9;
+      ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size = bufLen;
       CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,
           ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
       if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf)
@@ -5873,8 +5915,8 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
          DU_LOG(" F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed");
          break;
       }
-      memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \
-         rrcContainer, ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size); 
+      memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, 0, bufLen);
+      memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
 
       /* RRC delivery status request */
       idx++;
@@ -5885,7 +5927,27 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
          UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = \
          RRCDeliveryStatusRequest_true;
-      
+
+      /* Bit Rate hardcoded as in reference logs */
+      idx++;
+      ueSetReq->protocolIEs.list.array[idx]->id = \
+         ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL;
+      ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
+      ueSetReq->protocolIEs.list.array[idx]->value.present = \
+         UEContextSetupRequestIEs__value_PR_BitRate;
+      char bitRateBuf[4]= {0x3B, 0x37, 0xF4, 0xCD};
+      bufLen = 4;
+      ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size = bufLen;
+      CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf,\
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size);
+      if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf)
+      {
+         DU_LOG(" F1AP : Failed to allocate memory for Bit Rate in BuildAndSendUeContextSetupReq()");
+         break;
+      }
+      memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, 0, bufLen);
+      memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, bitRateBuf, bufLen);
+
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
       /* Encode the F1SetupRequest type as APER */
@@ -5990,13 +6052,27 @@ uint8_t procUlRrcMsg(F1AP_PDU_t *f1apMsg)
    {
       f1apMsgDb.dlRrcMsgCount++;
       rrcMsgType = setDlRRCMsgType();
-      if(rrcMsgType == RRC_SECURITY_MODE_COMMAND)
+      if(rrcMsgType == REGISTRATION_ACCEPT)
       {
-         ret = BuildAndSendUeContextSetupReq(cuUeF1apId, duUeF1apId, rrcContLen, rrcContainer);
+         DU_LOG("\nF1AP: Sending DL RRC MSG for RRC Registration Accept"); 
+         ret = BuildAndSendDLRRCMessageTransfer(srbId, rrcMsgType);
       }
-      if(rrcMsgType == RRC_RECONFIG)
+      if(rrcMsgType == UE_CONTEXT_SETUP_REQ)
       {
-         ret = BuildAndSendDLRRCMessageTransfer(rrcMsgType);
+         DU_LOG("\nF1AP: Sending Ue Context Setup Req"); 
+         ret = BuildAndSendUeContextSetupReq(cuUeF1apId, duUeF1apId,\
+           rrcContLen, rrcContainer);
+      }
+      if(rrcMsgType == SECURITY_MODE_COMPLETE)
+      {
+         /* To trigger the DL RRC Msg for RRC Reconfig */
+         f1apMsgDb.dlRrcMsgCount++;
+         rrcMsgType = setDlRRCMsgType();
+        if(rrcMsgType == RRC_RECONFIG)
+        {
+            DU_LOG("\nF1AP: Sending DL RRC MSG for RRC Reconfig");
+            BuildAndSendDLRRCMessageTransfer(srbId, rrcMsgType);
+        }
       }
    }
    return ret;
@@ -6291,6 +6367,7 @@ void F1APMsgHdlr(Buffer *mBuf)
             case SuccessfulOutcome__value_PR_UEContextSetupResponse:
            {
                DU_LOG("\nF1AP : UE ContextSetupResponse received");
+               f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */
                break;
            }
             default:
index d20e756..0e0e13a 100644 (file)
 #define CU_TO_DU_RRC_INF 4
 
 #define RRC_SETUP 1
-#define RRC_SECURITY_MODE_COMMAND 2
-#define RRC_RECONFIG 3
+#define REGISTRATION_ACCEPT 2
+#define UE_CONTEXT_SETUP_REQ 3
+#define UE_CONTEXT_SETUP_RSP 4
+#define SECURITY_MODE_COMPLETE 5
+#define RRC_RECONFIG 6
 typedef struct f1apDb
 {
    uint8_t dlRrcMsgCount;
index 9eda4f3..fe34308 100644 (file)
@@ -5531,9 +5531,10 @@ void freeDuUeCfg(DuUeCfg *ueCfg)
       DU_FREE(ueCfg->cellGrpCfg, sizeof(CellGroupConfigRrc_t));
       ueCfg->cellGrpCfg = NULLP;
    }
-   if(ueCfg->maxAggrBitRate)
+   if(ueCfg->ambrCfg)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCfg->maxAggrBitRate, sizeof(MaxAggrBitRate));
+      memset(ueCfg->ambrCfg, 0, sizeof(AmbrCfg));
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCfg->ambrCfg, sizeof(AmbrCfg));
    }
    for(lcIdx = 0; lcIdx < ueCfg->numRlcLcs; lcIdx++)
    {
@@ -5574,6 +5575,7 @@ void freeF1UeDb(F1UeContextSetupDb *f1UeDb)
    }
    freeDuUeCfg(&f1UeDb->duUeCfg);
    memset(f1UeDb, 0, sizeof(F1UeContextSetupDb));
+   DU_FREE(f1UeDb, sizeof(F1UeContextSetupDb));
 }
 
 /*******************************************************************
@@ -7250,7 +7252,7 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
 {
    uint8_t    ret, ieIdx, ueIdx, lcId, cellIdx;
    bool ueCbFound = false;
-   uint32_t gnbCuUeF1apId, gnbDuUeF1apId;
+   uint32_t gnbCuUeF1apId, gnbDuUeF1apId, bitRateSize;
    DuUeCb   *duUeCb = NULLP;
    UEContextSetupRequest_t   *ueSetReq = NULLP;
     
@@ -7377,35 +7379,39 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
            }
         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
            {
-              duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+              if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+              {
+                 duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+              }
+              else
+              {
+                 DU_LOG("\nIgnoring delivery report, since rrcContainer is not present");
+              }
               break;
            }
-        //TODO: To handle maxAggrBitRate case,
-        // Dependency: The protocolIE is not specified in ASN
-#if 0
-        case ProtocolIE_ID_id_ULPDUSessionAggregateMaximumBitRate:            {
+        case ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL:            {
                /* MaximumBitRate Uplink */
               bitRateSize = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.BitRate.size;
               if(bitRateSize > 0)
               {
-                  DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->duUeCfg.maxAggrBitRate, bitRateSize);
-                 if(!duUeCb->f1UeDb->duUeCfg.maxAggrBitRate)
+                  DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->duUeCfg.ambrCfg, bitRateSize);
+                 if(!duUeCb->f1UeDb->duUeCfg.ambrCfg)
                  {
                     DU_LOG("\nDU APP : Memory allocation failed for bitRate in procUeCtxtSetupReq");
                     ret = RFAILED;
                  }
                  else
                  {
-                     duUeCb->f1UeDb->duUeCfg.maxAggrBitRate->ulBits =\
-                    *ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.BitRate.buf;
-                     duUeCb->f1UeDb->duUeCfg.maxAggrBitRate->dlBits = 0;
+                    memset(duUeCb->f1UeDb->duUeCfg.ambrCfg, 0, sizeof(AmbrCfg)); 
+                     memcpy(&duUeCb->f1UeDb->duUeCfg.ambrCfg->ulBr,
+                    ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.BitRate.buf, bitRateSize);
+                     duUeCb->f1UeDb->duUeCfg.ambrCfg->dlBr = 0;
                  }
               }
               else
                  ret = RFAILED;
               break;
            }
-#endif
         default:
            {
               break;
@@ -7667,6 +7673,7 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
                     choice.DUtoCURRCInformation.cellGroupConfig, cellGrpCfg);
            /* Free UeContext Db created during Ue context Req */
            freeF1UeDb(ueCb->f1UeDb);
+           ueCb->f1UeDb = NULLP;
          }
       }
       else
index c9f402e..971ee09 100644 (file)
@@ -104,7 +104,7 @@ typedef struct duUeCfg
    RlcBearerCfg rlcLcCfg[MAX_NUM_LC];
    uint8_t numMacLcs;        /* Mac Ue Cfg */
    LcCfg   macLcCfg[MAX_NUM_LC];
-   MaxAggrBitRate *maxAggrBitRate;
+   AmbrCfg *ambrCfg;
 }DuUeCfg;
 
 typedef struct f1UeContextSetup
index c834d2b..4028122 100644 (file)
@@ -188,6 +188,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                     ret = unpackRrcDeliveryReportToDu(DuProcRlcRrcDeliveryReport, pst, mBuf);
                     break;
                  }
+              case EVENT_DL_RRC_MSG_RSP_TO_DU:
+                  {
+                    ret = unpackRlcDlRrcMsgRspToDu(DuProcRlcDlRrcMsgRsp, pst, mBuf);
+                    break;
+                  }
               default:
                  {
                     DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTRLC", \
index e29be40..6fb4026 100644 (file)
 #include "du_utils.h"
 #include "du_cell_mgr.h" 
 
+#ifdef O1_ENABLE
+
+#include "GlobalDefs.h"
+#include "AlarmInterface.h"
+
+#endif 
+
 uint8_t rlcDlCfg = 0;
 uint8_t numRlcDlSaps = 0;
 uint8_t rlcUlCfg = 0;
@@ -1636,7 +1643,7 @@ uint8_t duHandleSlotInd(Pst *pst, SlotIndInfo *slotInfo)
 
    if(slotInfo->cellId <=0 || slotInfo->cellId > MAX_NUM_CELL)
    {
-      DU_LOG("\nDU APP : Invalid Cell Id %d", slotInfo->cellId);
+      DU_LOG("\nDU APP : Invalid Cell Id %d in duHandleSlotInd()", slotInfo->cellId);
       return RFAILED;
    }
 
@@ -1651,6 +1658,11 @@ uint8_t duHandleSlotInd(Pst *pst, SlotIndInfo *slotInfo)
       {
         DU_LOG("\nDU APP : 5G-NR Cell %d is UP", slotInfo->cellId);
          cellCb->cellStatus = ACTIVATED;
+
+#ifdef O1_ENABLE
+    DU_LOG("\nDU APP : Raise cell UP alarm for cell id=%d", slotInfo->cellId);
+    raiseCellAlrm(CELL_UP_ALARM_ID, slotInfo->cellId);
+#endif
       }
    }
 
@@ -1772,7 +1784,7 @@ uint8_t duHandleStopInd(Pst *pst, MacCellStopInfo *cellStopId)
  
    if(cellStopId->cellId <=0 || cellStopId->cellId > MAX_NUM_CELL)
    {
-      DU_LOG("\nDU APP : Invalid Cell Id %d", cellStopId->cellId);
+      DU_LOG("\nDU APP : Invalid Cell Id %d in duHandleStopInd()", cellStopId->cellId);
    }
 
    if(duGetCellCb(cellStopId->cellId, &cellCb) != ROK)
@@ -1785,6 +1797,11 @@ uint8_t duHandleStopInd(Pst *pst, MacCellStopInfo *cellStopId)
       {
         DU_LOG("\nDU APP : 5G-NR Cell %d is DOWN", cellStopId->cellId);
         cellCb->cellStatus = DELETION_IN_PROGRESS;
+
+#ifdef O1_ENABLE
+       DU_LOG("\nDU APP : Raise cell down alarm for cell id=%d", cellStopId->cellId);
+       raiseCellAlrm(CELL_DOWN_ALARM_ID, cellStopId->cellId);
+#endif
       }
    }
    if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))
index 219c2c5..1f08803 100644 (file)
@@ -856,33 +856,35 @@ uint8_t fillMacLcCfgToAddMod(LcCfg *lcCfg, LcCfg *ueSetReqDb)
  *
  * @details
  *
- *    Function : getMaxAggrBitRate
+ *    Function : fillAmbr
  *
  *    Functionality: Function to copy bit Rate from ueSetupReqDb
  *
- * @params[in]  MaxAggrBitRate *macBitRate, MaxAggrBitRate *ueDbBitRate
+ * @params[in]  AmbrCfg **macAmbr, AmbrCfg  *ueDbAmbr
  * @return ROK/RFAILED
  *
  *****************************************************************/
 
-uint8_t getMaxAggrBitRate(MaxAggrBitRate *macBitRate, MaxAggrBitRate *ueDbBitRate)
+uint8_t fillAmbr(AmbrCfg **macAmbr, AmbrCfg *ueDbAmbr)
 {
-   if(ueDbBitRate)
+   if(ueDbAmbr)
    {
-      if(!macBitRate)
+      if(*macAmbr == NULLP)
       {
-         DU_ALLOC_SHRABL_BUF(macBitRate, sizeof(MaxAggrBitRate));
-         if(!macBitRate)
+         DU_ALLOC_SHRABL_BUF(*macAmbr, sizeof(AmbrCfg));
+         if(*macAmbr == NULLP)
          {
-            DU_LOG("\nDUAPP: Memory Alloc Failed at getMaxAggrBitRate()");
+            DU_LOG("\nDUAPP: Memory Alloc Failed at fillAmbr()");
             return RFAILED;
          }
       }
-      memcpy(macBitRate, ueDbBitRate, sizeof(MaxAggrBitRate));
+      memset(*macAmbr, 0, sizeof(AmbrCfg));
+      (*macAmbr)->ulBr = ueDbAmbr->ulBr;
+      (*macAmbr)->dlBr = ueDbAmbr->dlBr;
    }
    else
    {
-      macBitRate = NULLP;
+      *macAmbr = NULLP;
    }
    return ROK;
 }
@@ -914,7 +916,7 @@ uint8_t sendUeReCfgReqToMac(MacUeCfg *macUeCfg)
    if(macUeCfg)
    {
       /* Processing one Ue at a time to MAC */
-      DU_LOG("\nDU_APP: Sending Reconfig Request to MAC");
+      DU_LOG("\nDU_APP: Sending Ue Reconfig Request to MAC");
       ret = (*packMacUeReconfigReqOpts[pst.selector])(&pst, macUeCfg);
       if(ret == RFAILED)
       {
@@ -998,7 +1000,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \
       fillDefaultMacCellGrpInfo(&macUeCfg->macCellGrpCfg);
       fillDefaultPhyCellGrpInfo(&macUeCfg->phyCellGrpCfg);
       fillDefaultSpCellGrpInfo(&macUeCfg->spCellCfg);
-      macUeCfg->maxAggrBitRate = NULLP;
+      macUeCfg->ambrCfg = NULLP;
       fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]);
       macUeCfg->numLcs++;
    }
@@ -1024,7 +1026,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \
             fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
               NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
          }
-        ret = getMaxAggrBitRate(macUeCfg->maxAggrBitRate, ueCfgDb->maxAggrBitRate);
+        ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg);
       }
 
       /* Filling LC Context */
@@ -1314,7 +1316,7 @@ uint8_t sendUeReCfgReqToRlc(RlcUeCfg *rlcUeCfg)
    if(rlcUeCfg)
    {
       /* Processing one Ue at a time to RLC */
-      DU_LOG("\nDU_APP: Sending Reconfig Request to RLC UL");
+      DU_LOG("\nDU_APP: Sending Ue Reconfig Request to RLC UL");
       ret = (*packRlcUeReconfigReqOpts[pst.selector])(&pst, rlcUeCfg);
       if(ret == RFAILED)
       {
@@ -1556,7 +1558,7 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb)
          fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
               NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
       }
-      ret = getMaxAggrBitRate(macUeCfg->maxAggrBitRate, f1UeDb->duUeCfg.maxAggrBitRate);
+      ret = fillAmbr(&macUeCfg->ambrCfg, f1UeDb->duUeCfg.ambrCfg);
    }
    /* Filling LC Context */
    for(dbIdx = 0; (dbIdx < f1UeDb->duUeCfg.numMacLcs && ret == ROK); dbIdx++)
@@ -1964,7 +1966,6 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
               rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
            if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
                BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId);
-             
         }
       }
       else
@@ -1987,6 +1988,8 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
    return ret;
 }
 
+
+
 /*******************************************************************
  *
  * @brief Builds and Send Ue Reconfig Req to RLC
@@ -2073,6 +2076,82 @@ uint8_t duBuildAndSendUeReCfgReqToMac(uint8_t cellId, uint8_t crnti, DuUeCfg *ue
    return ret;
 }
 
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context setup request
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeContextSetupReq
+ *
+ *    Functionality: 
+ *     Build and Send Ue context setup request
+ * 
+ *  @params[in]  cellId, crnti, DuUeCfg pointer
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, uint16_t crnti, DuUeCfg *duUeCfg)
+{
+   uint8_t ret = ROK;
+
+   DU_LOG("\nDU_APP: Processing Ue Context Setup Request for cellId [%d]", cellId);
+   /* Filling RLC Ue Reconfig */ 
+   ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nDU_APP: Failed to build ctxt setup req for RLC at duBuildAndSendUeContextSetupReq()");
+   
+   /* Filling MAC Ue Reconfig */
+   ret = duBuildAndSendUeReCfgReqToMac(cellId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nDU_APP: Failed at build ctxt setup req for MAC at duBuildAndSendUeContextSetupReq()");
+
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Processes DL Rsp received from RLC DL
+ *
+ * @details
+ *
+ *    Function : DuProcRlcDlRrcMsgRsp
+ *
+ *    Functionality: 
+ *     Processes UE Rsp received from RLC DL
+ * 
+ *  @params[in]  Post structure
+ *               Pointer to RlcCfgCfm
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
+{
+   uint8_t ret = ROK, ueIdx = 0;
+   DuUeCb *ueCb = NULLP;
+
+   if(dlRrcMsg->state == TRANSMISSION_COMPLETE)
+   {
+      GET_UE_IDX(dlRrcMsg->crnti, ueIdx);
+      ueCb = &duCb.actvCellLst[dlRrcMsg->cellId -1]->ueCb[ueIdx -1];
+      if(ueCb->f1UeDb)
+      {
+        ret = duBuildAndSendUeContextSetupReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
+       if(ret == RFAILED)
+          DU_LOG("\nDUAPP: Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()");
+      }
+   }
+   else
+      DU_LOG("\nDUAPP: Failed to transmit DL RRC Msg");
+
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsg, sizeof(RlcDlRrcMsgRsp));
+   return ret;
+}
 /*******************************************************************
  *
  * @brief Process UE context setup request from CU
@@ -2097,36 +2176,30 @@ uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
    if(ueCb)
    {
       cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
+      /* Send DL RRC msg for security Mode */
       if(ueCb->f1UeDb->dlRrcMsg)
       {
          if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
-        {
+         {
             /* Sending DL RRC Message to RLC */
             ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
             if(ret == RFAILED)
             {
                DU_LOG("\nDU APP : Failed to send DL RRC msg in duProcUeContextSetupRequest()");
                DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
-              ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
-              DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+                  ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
             }
-        }
+         }
       }
-
-      if(ret == ROK)
+      else
       {
-         DU_LOG("\nDU_APP: Processing Ue Context Setup Request for cellId [%d]", cellId);
-         /* Filling RLC Ue Reconfig */ 
-         ret = duBuildAndSendUeReCfgReqToRlc(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
-         if(ret == RFAILED)
-            DU_LOG("\nDU_APP: Failed to build ctxt setup req for RLC at duBuildAndSendUeReCfgReqToRlc()");
-         
-        /* Filling MAC Ue Reconfig */
-         ret = duBuildAndSendUeReCfgReqToMac(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
-         if(ret == RFAILED)
-            DU_LOG("\nDU_APP: Failed at build ctxt setup req for MAC at duBuildAndSendUeReCfgReqToMac()");
+         ret = duBuildAndSendUeContextSetupReq(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
+        if(ret == RFAILED)
+        {
+            DU_LOG("\nDU APP : Failed to build ue context setup Req in duProcUeContextSetupRequest()");
+        }
       }
-      
    }
    else
    {
index d909e4b..877dd56 100644 (file)
@@ -204,14 +204,7 @@ Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func));
 
 void            dump_external(void);
 
-#ifdef ANSI
-static Void mtDelSigals
-(
-Void
-)
-#else
-static Void mtDelSignals()
-#endif
+static Void mtDelSigals(Void)
 {
    struct sigaction sa;
 
@@ -874,17 +867,11 @@ static int SOpenWlsIntf()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 int main
 (
 int argc,                       /* argument count */
 char **argv                     /* argument vector */
 )
-#else
-int main(argc, argv)
-int argc;                       /* argument count */
-char **argv;                    /* argument vector */
-#endif
 {
 
 #ifdef XEON_MULTIPLE_CELL_CHANGES
@@ -934,17 +921,11 @@ char **argv;                    /* argument vector */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 int ssMain
 (
 int argc,                       /* argument count */
 char **argv                     /* argument vector */
 )
-#else
-int ssMain(argc, argv)
-int argc;                       /* argument count */
-char **argv;                    /* argument vector */
-#endif
 {
 
 
@@ -976,14 +957,7 @@ char **argv;                    /* argument vector */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitGen
-(
-void
-)
-#else
-S16 ssdInitGen()
-#endif
+S16 ssdInitGen(void)
 {
    struct sigaction act;
    sigset_t set;
@@ -1135,14 +1109,7 @@ S16 ssdInitGen()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdDeinitGen
-(
-void
-)
-#else
-Void ssdDeinitGen()
-#endif
+Void ssdDeinitGen(void)
 {
 
 
@@ -1168,19 +1135,12 @@ Void ssdDeinitGen()
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 S16 ssPutDynMemBlkSet
 (
 uint8_t                    bktIdx,        /* Index to bucket list */
 CmMmBlkSetElement    *dynMemSetElem  /* Memory set element which is needs to be 
                                         added to global region */
 )
-#else
-S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem)
-uint8_t                    bktIdx;        /* Index to bucket list */
-CmMmBlkSetElement    *dynMemSetElem; /* Memory set element which is needs to be 
-                                        added to global region */
-#endif
 {
    CmMmGlobRegCb        *globReg;
    CmMmGlobalBktCb      *bktCb;
@@ -1226,19 +1186,12 @@ CmMmBlkSetElement    *dynMemSetElem; /* Memory set element which is needs to be
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 S16 ssGetDynMemBlkSet
 (
 uint8_t               bktIdx,        /* Index to bucket list */
 CmMmBlkSetElement     *dynMemSetElem  /* Memory set element which is updated 
                                       with new set values */
 )
-#else
-S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem)
-uint8_t               bktIdx;        /* Index to bucket list */
-CmMmBlkSetElement     *dynMemSetElem; /* Memory set element which is updated 
-                                      with new set values */
-#endif
 {
 
    CmMmGlobRegCb        *globReg;
@@ -1288,21 +1241,13 @@ CmMmBlkSetElement     *dynMemSetElem; /* Memory set element which is updated
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 S16 ssPutDynMemBlkSet
 (
-uint8_t                    bktIdx,               /* Index to bucket list */
+uint8_t              bktIdx,               /* Index to bucket list */
 CmMmBlkSetElement    *dynMemSetElem,        /* Memory set element which is needs to be 
                                                added to global region */
-uint32_t                    doNotBlockForLock    /* Boolean whether to block for lock or not */
+uint32_t             doNotBlockForLock    /* Boolean whether to block for lock or not */
 )
-#else
-S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem)
-uint8_t                    bktIdx;               /* Index to bucket list */
-CmMmBlkSetElement    *dynMemSetElem;        /* Memory set element which is needs to be 
-                                               added to global region */
-uint32_t                    doNotBlockForLock;   /* Boolean whether to block for lock or not */
-#endif
 {
    CmMmGlobRegCb       *globReg;
    CmMmGlobalBktCb     *bktCb;
@@ -1375,7 +1320,6 @@ uint32_t                    doNotBlockForLock;   /* Boolean whether to block for
 *       File:  cm_mem.c
 *
 */
-#ifdef ANSI
 S16 ssGetDynMemBlkSet
 (
 uint8_t                     bktIdx,              /* Index to bucket list */
@@ -1383,13 +1327,6 @@ CmMmBlkSetElement     *dynMemSetElem,       /* Memory set element which is updat
                                                with new set values */
 uint32_t                    doNotBlockForLock    /* Boolean whether to block for lock or not */
 )
-#else
-S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem)
-uint8_t                     bktIdx;              /* Index to bucket list */
-CmMmBlkSetElement     *dynMemSetElem;       /* Memory set element which is updated 
-                                               with new set values */
-uint32_t                    doNotBlockForLock;   /* Boolean whether to block for lock or not */
-#endif
 {
    CmMmGlobRegCb        *globReg;
    CmMmGlobalBktCb      *bktCb;
@@ -1448,14 +1385,7 @@ uint32_t                    doNotBlockForLock;   /* Boolean whether to block for
 uint32_t gDynMemAlrm[4];
 static uint32_t memoryCheckCounter;
 
-#ifdef ANSI
-uint32_t isMemThreshReached(
-Region reg
-)
-#else
-uint32_t isMemThreshReached(reg)
-Region reg;
-#endif
+uint32_t isMemThreshReached(Region reg)
 {
    CmMmGlobRegCb        *globReg;
    CmMmGlobalBktCb      *bktCb;
@@ -1519,15 +1449,7 @@ Region reg;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void * ssGetIccHdl  
-(
-Region region
-)
-#else
-Void * ssGetIccHdl()
-Region region;
-#endif
+Void * ssGetIccHdl(Region region)
 {
    CmMmDynRegCb *dynRegCb;
 
@@ -1766,14 +1688,7 @@ S16 SAllocateStaticMem()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitMem
-(
-void
-)
-#else
-S16 ssdInitMem()
-#endif
+S16 ssdInitMem(void)
 {
    /* mt018.201 - added local variable */
    uint8_t              i;
@@ -2083,14 +1998,7 @@ S16 ssdInitMem()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdDeinitMem
-(
-void
-)
-#else
-Void ssdDeinitMem()
-#endif
+Void ssdDeinitMem(void)
 {
    /* mt018.201 - added local variables */
    uint8_t     i;
@@ -2126,14 +2034,7 @@ Void ssdDeinitMem()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitTsk
-(
-void
-)
-#else
-S16 ssdInitTsk()
-#endif
+S16 ssdInitTsk(void)
 {
 /* mt001.301 : Additions */
 /*mt013.301 :Added SS_AFFINITY_SUPPORT  */
@@ -2169,14 +2070,7 @@ S16 ssdInitTsk()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdDeinitTsk
-(
-void
-)
-#else
-Void ssdDeinitTsk()
-#endif
+Void ssdDeinitTsk(void)
 {
 
    return;
@@ -2198,14 +2092,7 @@ Void ssdDeinitTsk()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitDrvr
-(
-void
-)
-#else
-S16 ssdInitDrvr()
-#endif
+S16 ssdInitDrvr(void)
 {
    S16 i;
 #ifndef L2_L3_SPLIT
@@ -2276,14 +2163,7 @@ S16 ssdInitDrvr()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdDeinitDrvr
-(
-void
-)
-#else
-Void ssdDeinitDrvr()
-#endif
+Void ssdDeinitDrvr(void)
 {
   /* mt008.301: Terminate the Driver Task on exit */
   while(pthread_cancel(osCp.dep.isTskHdlrTID));
@@ -2315,14 +2195,7 @@ Void ssdDeinitDrvr()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitTmr
-(
-void
-)
-#else
-S16 ssdInitTmr()
-#endif
+S16 ssdInitTmr(void)
 {
    pthread_attr_t attr;
    struct sched_param param_sched;
@@ -2412,14 +2285,7 @@ S16 ssdInitTmr()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdDeinitTmr
-(
-void
-)
-#else
-Void ssdDeinitTmr()
-#endif
+Void ssdDeinitTmr(void)
 {
 #ifdef SS_MULTICORE_SUPPORT
    SsSTskEntry *sTsk;
@@ -2477,14 +2343,7 @@ Void ssdDeinitTmr()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitLog
-(
-void
-)
-#else
-S16 ssdInitLog()
-#endif
+S16 ssdInitLog(void)
 {
 /* mt027.201 - Modification to fix warnings with no STDIN and STDOUT */
 #ifdef CONAVL
@@ -2583,14 +2442,7 @@ S16 ssdInitLog()
 *
 */
 /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */
-#ifdef ANSI
-Void ssdDeinitLog
-(
-void
-)
-#else
-Void ssdDeinitLog()
-#endif
+Void ssdDeinitLog(void)
 {
 /* mt008.301: ssdDeinitFinal changed to ssdDeinitLog */
 #ifdef CONAVL
@@ -2606,15 +2458,7 @@ Void ssdDeinitLog()
 #ifdef SS_WATCHDOG
 
 
-#ifdef ANSI
-S16 ssdInitWatchDog
-(
-uint16_t port
-)
-#else
-S16 ssdInitWatchDog(port)
-uint16_t port;
-#endif
+S16 ssdInitWatchDog(uint16_t port)
 {
    uint8_t idx;
    Txt prntBuf[PRNTSZE];
@@ -2729,15 +2573,7 @@ uint16_t port;
    return ROK;
 }
 
-#ifdef ANSI
-S16 ssdInitWatchDgPst
-(
-Pst *pst
-)
-#else
-S16 ssdInitWatchDgPst(pst)
-Pst *pst;
-#endif
+S16 ssdInitWatchDgPst(Pst *pst)
 {
 
    pst->selector  = SS_LOOSE_COUPLING;
@@ -2757,7 +2593,6 @@ Pst *pst;
 }
 
 #ifdef SS_MULTIPLE_PROCS
-#ifdef ANSI
 S16 ssdWatchDgActvTmr
 (
 ProcId proc,
@@ -2765,17 +2600,7 @@ Ent ent,
 Inst inst
 )
 #else
-S16 ssdWatchDgActvTmr(proc, ent, inst)
-#endif
-#else
-#ifdef ANSI
-S16 ssdWatchDgActvTmr
-(
-Void
-)
-#else
-S16 ssdWatchDgActvTmr()
-#endif
+S16 ssdWatchDgActvTmr(Void)
 #endif /* SS_MULTIPLE_PROCS */
 {
 
@@ -2784,17 +2609,11 @@ S16 ssdWatchDgActvTmr()
    return ROK;
 }
 
-#ifdef ANSI
 Void ssdWatchDgTmrEvt
 (
 PTR       cb,        /* control block */
 S16       event      /* timer number */
 )
-#else
-Void ssdWatchDgTmrEvt(cb, event)
-PTR       cb;        /* control block */
-S16       event;     /* timer number */
-#endif
 {
 /* mt003.301 Fixed warings */
 #ifdef DEBUGP
@@ -2844,19 +2663,12 @@ S16       event;     /* timer number */
 
 }
 
-#ifdef ANSI
 Void ssdStartWatchDgTmr
 (
-void             *cb,
-S16              event,
-uint16_t              wait
+void     *cb,
+S16      event,
+uint16_t wait
 )
-#else
-Void ssdStartWatchDgTmr(cb, event, wait)
-void             *cb;
-S16              event;
-uint16_t              wait;
-#endif
 {
    CmTmrArg    arg;
    int i;
@@ -2899,17 +2711,11 @@ uint16_t              wait;
    return;
 }
 
-#ifdef ANSI
 Void ssdStopWatchDgTmr
 (
-void             *cb,
-S16              event
+void *cb,
+S16  event
 )
-#else
-Void ssdStopWatchDgTmr(cb, event)
-void             *cb;
-S16              event;
-#endif
 {
    CmTmrArg    arg;
 #ifdef DEBUGP
@@ -2949,17 +2755,11 @@ S16              event;
    return;
 }
 
-#ifdef ANSI
 S16 ssdSndHrtBtMsg
 (
-Bool             restart,
-uint32_t              type
+Bool      restart,
+uint32_t  type
 )
-#else
-S16 ssdSndHrtBtMsg(restart, type)
-Bool             restart;
-uint32_t              type;
-#endif
 {
    S16     ret = ROK;
 #ifdef DEBUGP
@@ -3043,14 +2843,7 @@ uint32_t              type;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-static Void mtGetOpts
-(
-void
-)
-#else
-static Void mtGetOpts()
-#endif
+static Void mtGetOpts(void)
 {
    S32 argc;
    S8 **argv;
@@ -3427,19 +3220,12 @@ static Void mtGetOpts()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetOpt
 (
 int argc,                   /* argument count */
 char **argv,                /* argument value */
 char *opts                  /* options */
 )
-#else
-S16 SGetOpt(argc, argv, opts)
-int argc;                   /* argument count */
-char **argv;                /* argument value */
-char *opts;                 /* options */
-#endif
 {
    /* mt020.201 - Removed for no command line */
 #ifndef NOCMDLINE
@@ -3541,14 +3327,7 @@ char *opts;                 /* options */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void ssdStart
-(
-void
-)
-#else
-Void ssdStart()
-#endif
+Void ssdStart(void)
 {
    S16 i;
 
@@ -3585,15 +3364,10 @@ Void ssdStart()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdAttachTTsk
 (
 SsTTskEntry *tTsk           /* pointer to TAPA task entry */
 )
-#else
-S16 ssdAttachTTsk(tTsk)
-SsTTskEntry *tTsk;          /* pointer to TAPA task entry */
-#endif
 {
    Buffer *mBuf;
    SsMsgInfo *mInfo;
@@ -3669,15 +3443,10 @@ SsTTskEntry *tTsk;          /* pointer to TAPA task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdDetachTTsk
 (
 SsTTskEntry *tTsk           /* pointer to TAPA task entry */
 )
-#else
-S16 ssdDetachTTsk(tTsk)
-SsTTskEntry *tTsk;          /* pointer to TAPA task entry */
-#endif
 {
 
    return ROK;
@@ -3698,15 +3467,10 @@ SsTTskEntry *tTsk;          /* pointer to TAPA task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdCreateSTsk
 (
 SsSTskEntry *sTsk           /* pointer to system task entry */
 )
-#else
-S16 ssdCreateSTsk(sTsk)
-SsSTskEntry *sTsk;          /* pointer to system task entry */
-#endif
 {
    S16  ret;
    pthread_attr_t attr;
@@ -3832,7 +3596,6 @@ SsSTskEntry *sTsk;          /* pointer to system task entry */
 }
 
 
-#ifdef ANSI
 int SCreatePThread
 (
 pthread_t* tid,
@@ -3840,13 +3603,6 @@ pthread_attr_t* attr,
 void *(*start_routine) (void *),
 void* arg
 )
-#else
-int SCreatePThread(tid, attr, start_routine, arg)
-pthread_t* tid;
-pthread_attr_t* attr;
-void *(*start_routine) (void *);
-void* arg;
-#endif
 {
    int retVal = 0;
 #ifdef SS_THR_REG_MAP
@@ -3906,17 +3662,11 @@ void* arg;
 *
 */
 
-#ifdef ANSI
 static S16 ssdSetPthreadAttr
 (
 S32              tskPrior,
 pthread_attr_t  *attr
 )
-#else
-static S16 ssdSetPthreadAttr(sTsk, attr)
-S32               tskPrior,
-pthread_attr_t   *attr
-#endif
 {
    struct sched_param    param;
 
@@ -3984,17 +3734,11 @@ pthread_attr_t   *attr
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 ssdGetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
 uint32_t *coreId                      /* the core/processor id to which the affinity is set */
 )
-#else
-S16 ssdGetAffinity(tskId, coreId)
-SSTskId *tskId;                 /* filled in with system task ID */
-uint32_t *coreId;                    /* the core/processor id to which the affinity is set */
-#endif
 {
 
    uint32_t tskInd;
@@ -4100,17 +3844,11 @@ uint32_t *coreId;                    /* the core/processor id to which the affin
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 ssdSetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
 uint32_t coreId                       /* the core/processor id to which the affinity has to be set */
 )
-#else
-S16 ssdSetAffinity(tskId, coreId)
-SSTskId *tskId;                 /* filled in with system task ID */
-uint32_t coreId;                     /* the core/processor id to which the affinity has to be set */
-#endif
 {
 
    uint32_t tskInd = 0;
@@ -4212,15 +3950,10 @@ uint32_t coreId;                     /* the core/processor id to which the affin
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdDestroySTsk
 (
 SsSTskEntry *sTsk           /* pointer to system task entry */
 )
-#else
-S16 ssdDestroySTsk(sTsk)
-SsSTskEntry *sTsk;          /* pointer to system task entry */
-#endif
 {
    Buffer *mBuf;
    SsMsgInfo *mInfo;
@@ -4273,14 +4006,7 @@ SsSTskEntry *sTsk;          /* pointer to system task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SThreadYield
-(
-void
-)
-#else
-S16 SThreadYield()
-#endif
+S16 SThreadYield(void)
 {
 
 
@@ -4324,15 +4050,10 @@ S16 SThreadYield()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdRegTmr
 (
 SsTmrEntry *tmr             /* pointer to timer entry */
 )
-#else
-S16 ssdRegTmr(tmr)
-SsTmrEntry *tmr;            /* pointer to timer entry */
-#endif
 {
    CmTmrArg arg;
 
@@ -4373,15 +4094,10 @@ SsTmrEntry *tmr;            /* pointer to timer entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdDeregTmr
 (
 SsTmrEntry *tmr             /* pointer to timer entry */
 )
-#else
-S16 ssdDeregTmr(tmr)
-SsTmrEntry *tmr;            /* pointer to timer entry */
-#endif
 {
    CmTmrArg arg;
 
@@ -4418,17 +4134,11 @@ SsTmrEntry *tmr;            /* pointer to timer entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdError
 (
 Seq seq,                    /* sequence number */
 Reason reason               /* reset reason */
 )
-#else
-S16 ssdError(seq, reason)
-Seq seq;                    /* sequence number */
-Reason reason;              /* reset reason */
-#endif
 {
    S16 i;
    pthread_t tId;
@@ -4480,7 +4190,6 @@ Reason reason;              /* reset reason */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 Void ssdLogError
 (
 Ent ent,                    /* Calling layer's entity id */
@@ -4493,19 +4202,6 @@ ErrCode errCode,            /* layer unique error code */
 ErrVal errVal,              /* error value */
 Txt *errDesc                /* description of error */
 )
-#else
-Void ssdLogError(ent, inst, procId, file, line,
-                        errCls, errCode, errVal, errDesc)
-Ent ent;                    /* Calling layer's entity id */
-Inst inst;                  /* Calling layer's instance id */
-ProcId procId;              /* Calling layer's processor id */
-Txt *file;                  /* file name where error occured */
-S32 line;                   /* line in file where error occured */
-ErrCls errCls;              /* error class */
-ErrCode errCode;            /* layer unique error code */
-ErrVal errVal;              /* error value */
-Txt *errDesc;               /* description of error */
-#endif
 {
 #ifndef DEBUGNOEXIT
    S16 i;
@@ -4613,15 +4309,10 @@ Txt *errDesc;               /* description of error */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdRegDrvrTsk
 (
 SsDrvrTskEntry *drvrTsk         /* driver task entry */
 )
-#else
-S16 ssdRegDrvrTsk(drvrTsk)
-SsDrvrTskEntry *drvrTsk;        /* driver task entry */
-#endif
 {
 
 
@@ -4642,15 +4333,10 @@ SsDrvrTskEntry *drvrTsk;        /* driver task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 ssdDeregDrvrTsk
 (
 SsDrvrTskEntry *drvrTsk         /* driver task entry */
 )
-#else
-S16 ssdDeregDrvrTsk(drvrTsk)
-SsDrvrTskEntry *drvrTsk;        /* driver task entry */
-#endif
 {
 
 
@@ -4665,31 +4351,18 @@ SsDrvrTskEntry *drvrTsk;        /* driver task entry */
  * mt003.301 Additions - SDeRegTTsk fix
  */
 #ifdef SS_MULTIPLE_PROCS
-#ifdef ANSI
 S16 ssdProcTTskTerm
 (
 ProcId procIdx,
 SsTTskEntry *tTsk,
 SsIdx idx
 )
-#else
-S16 ssdProcTTskTerm(procIdx, tTsk, idx)
-ProcId procIdx;
-SsTTskEntry *tTsk;
-SsIdx idx;
-#endif
 #else /*SS_MULTIPLE_PROCS*/
-#ifdef ANSI
 S16 ssdProcTTskTerm
 (
 SsTTskEntry *tTsk,
 SsIdx idx
 )
-#else
-S16 ssdProcTTskTerm(tTsk, idx)
-SsTTskEntry *tTsk;
-SsIdx idx;
-#endif
 #endif /*SS_MULTIPLE_PROCS*/
 {
 #ifdef SS_MULTIPLE_PROCS
@@ -4820,15 +4493,10 @@ SsIdx idx;
 Void ysMtTskHdlr(Void);
 Void ysMtPollPhyMsg(uint8_t region);
 Void ysMtRcvPhyMsg(Void);
-#ifdef ANSI
 Void *mtTskHdlrT2kL2
 (
 Ptr tskPtr                      /* pointer to task entry */
 )
-#else
-Void *mtTskHdlrT2kL2(tskPtr)
-Ptr tskPtr;                     /* pointer to task entry */
-#endif
 {
    S16 ret;
 
@@ -4856,15 +4524,10 @@ Ptr tskPtr;                     /* pointer to task entry */
 #else
 Void ysMtTskHdlr(Void);
 Void YsPhyRecvMsg();
-#ifdef ANSI
 Void *mtTskHdlrT2kL2
 (
 Ptr tskPtr                      /* pointer to task entry */
 )
-#else
-Void *mtTskHdlrT2kL2(tskPtr)
-Ptr tskPtr;                     /* pointer to task entry */
-#endif
 {
    S16 ret;
    SsSTskEntry *sTsk;
@@ -4916,15 +4579,7 @@ Ptr tskPtr;                     /* pointer to task entry */
 #endif /* TENB_T2K3K_SPECIFIC_CHANGES */
 #endif
 
-#ifdef ANSI
-void *pthreadCreateHdlr
-(
-void * arg
-)
-#else
-void *pthreadCreateHdlr(pthreadCreateArg)
-void *arg;
-#endif
+void *pthreadCreateHdlr(void * arg)
 {
    S16 ret;
    SPThreadCreateArg*  pthreadCreateArg = (SPThreadCreateArg*)arg;
@@ -4955,15 +4610,10 @@ void *arg;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 Void *mtTskHdlr
 (
 Ptr tskPtr                      /* pointer to task entry */
 )
-#else
-Void *mtTskHdlr(tskPtr)
-Ptr tskPtr;                     /* pointer to task entry */
-#endif
 {
    S16 ret;
    SsSTskEntry *sTsk;
@@ -5021,15 +4671,10 @@ Ptr tskPtr;                     /* pointer to task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 mtTskHdlMsg
 (
 SsSTskEntry *sTsk
 )
-#else
-S16 mtTskHdlMsg(sTsk)
-SsSTskEntry *sTsk
-#endif
 {
    S16 i;
    S16 ret;
@@ -5427,13 +5072,7 @@ Bool g_usettitmr;
 /*
 *       Fun:   mtTmrHdlrPublic
 */
-#ifdef ANSI
-Void mtTmrHdlrPublic
-(
-)
-#else
 Void mtTmrHdlrPublic()
-#endif
 {
    if (SLock(&osCp.tmrTblLock) != ROK)
    {
@@ -5464,16 +5103,10 @@ Void mtTmrHdlrPublic()
 *
 */
 /*mt041.201 Modified SSI tick handling in mtTmrHdlr() */
-#ifdef ANSI
 static Void *mtTmrHdlr
 (
 void *parm                        /* unused */
 )
-#else
-   /* mt009.21: addition */
-static Void *mtTmrHdlr(parm)
-void *parm;                       /* unused */
-#endif
 {
 /*mt004.301-addede new region*/
 /* mt010.301 Removed SS_FAP portion and
@@ -5627,17 +5260,11 @@ void *parm;                       /* unused */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 Void mtTimeout
 (
 PTR tCb,                        /* control block */
 S16 evnt                        /* event */
 )
-#else
-Void mtTimeout(tCb, evnt)
-PTR tCb;                        /* control block */
-S16 evnt;                       /* event */
-#endif
 {
    Buffer *mBuf;
    SsMsgInfo *mInfo;
@@ -5863,16 +5490,10 @@ S16 evnt;                       /* event */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 static Void *mtConHdlr
 (
 Ptr parm                        /* unused */
 )
-#else
-  /* mt009.21: addition */
-static Void *mtConHdlr(parm)
-Ptr parm;                       /* unused */
-#endif
 {
    int fd;
    Data data;
@@ -5931,17 +5552,11 @@ Ptr parm;                       /* unused */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
   /* mt009.21: addition */
 static Void *mtIsTskHdlr
 (
 Ptr tskPtr                      /* pointer to task entry */
 )
-#else
-  /* mt009.21: addition */
-static Void *mtIsTskHdlr(tskPtr)
-Ptr tskPtr;                     /* pointer to task entry */
-#endif
 {
 #if (ERRCLASS & ERRCLS_DEBUG)
    int ret;
@@ -6036,15 +5651,7 @@ Ptr tskPtr;                     /* pointer to task entry */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void mtIntSigHndlr
-(
-int arg
-)
-#else
-Void mtIntSigHndlr(arg)
-int arg;
-#endif
+Void mtIntSigHndlr(int arg)
 {
 
    osCp.dep.sigEvnt=TRUE;
@@ -6072,14 +5679,7 @@ int arg;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-Void mtExitClnup
-(
-void
-)
-#else
-Void mtExitClnup()
-#endif
+Void mtExitClnup(void)
 {
    Ticks ticks;
    S8 buf[128];
@@ -6134,17 +5734,11 @@ Ticks SGetTtiCount(Void)
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SDisplay
 (
 S16 chan,                   /* channel */
 Txt *buf                    /* buffer */
 )
-#else
-S16 SDisplay(chan, buf)
-S16 chan;                   /* channel */
-Txt *buf;                   /* buffer */
-#endif
 {
 
 /* mt020.201 - Fixed typo */
@@ -6204,14 +5798,7 @@ Txt *buf;                   /* buffer */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SFini
-(
-void
-)
-#else
-S16 SFini()
-#endif
+S16 SFini(void)
 {
 
    /* mt030.201 added under compilet time flag SS_LINUX and SLES9_PLUS
@@ -6248,15 +5835,10 @@ S16 SFini()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SSetDateTime
 (
 REG1 DateTime *dt           /* date and time */
 )
-#else
-S16 SSetDateTime(dt)
-REG1 DateTime *dt;          /* date and time */
-#endif
 {
 
    UNUSED(dt);
@@ -6282,15 +5864,10 @@ REG1 DateTime *dt;          /* date and time */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetDateTime
 (
 REG1 DateTime *dt           /* date and time */
 )
-#else
-S16 SGetDateTime(dt)
-REG1 DateTime *dt;          /* date and time */
-#endif
 {
    /*-- mt035.201 : SSI enhancements for micro second in datetime struct --*/
    /* time_t tt; --*/
@@ -6361,15 +5938,10 @@ REG1 DateTime *dt;          /* date and time */
 *       File:  mt_ss.c
 */
 /* mt003.301 Modifications */
-#ifdef ANSI
 S16 SGetEpcTime
 (
 EpcTime *et           /* date and time */
 )
-#else
-S16 SGetEpcTime(et)
-EpcTime *et;          /* date and time */
-#endif
 {
 /* mt003.301 Modifications */
 static uint64_t now;
@@ -6427,15 +5999,10 @@ static uint64_t now;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetSysTime
 (
 Ticks *sysTime              /* system time */
 )
-#else
-S16 SGetSysTime(sysTime)
-Ticks *sysTime;             /* system time */
-#endif
 {
 
 
@@ -6474,19 +6041,12 @@ Ticks *sysTime;             /* system time */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetRefTime
 (
 uint32_t refTime,             /* reference time */
 uint32_t *sec,
 uint32_t *usec
 )
-#else
-S16 SGetRefTime(refTime, sec, usec)
-uint32_t refTime;             /* reference time */
-uint32_t *sec;
-uint32_t *usec;
-#endif
 {
 
 #ifndef SS_LINUX
@@ -6543,15 +6103,10 @@ uint32_t *usec;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SRandom
 (
 Random *value               /* random number */
 )
-#else
-S16 SRandom(value)
-Random *value;              /* random number */
-#endif
 {
 
 
@@ -6585,14 +6140,7 @@ Random *value;              /* random number */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SExitTsk
-(
-void
-)
-#else
-S16 SExitTsk()
-#endif
+S16 SExitTsk(void)
 {
 
 
@@ -6613,14 +6161,7 @@ S16 SExitTsk()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SExitInt
-(
-void
-)
-#else
-S16 SExitInt()
-#endif
+S16 SExitInt(void)
 {
 
 
@@ -6645,14 +6186,7 @@ S16 SExitInt()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SHoldInt
-(
-void
-)
-#else
-S16 SHoldInt()
-#endif
+S16 SHoldInt(void)
 {
 
 
@@ -6673,14 +6207,7 @@ S16 SHoldInt()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SRelInt
-(
-void
-)
-#else
-S16 SRelInt()
-#endif
+S16 SRelInt(void)
 {
 
 
@@ -6702,14 +6229,7 @@ S16 SRelInt()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-inline S16 SEnbInt
-(
-void
-)
-#else
-inline S16 SEnbInt()
-#endif
+inline S16 SEnbInt(void)
 {
 
 
@@ -6731,14 +6251,7 @@ inline S16 SEnbInt()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-inline S16 SDisInt
-(
-void
-)
-#else
-inline S16 SDisInt()
-#endif
+inline S16 SDisInt(void)
 {
 
 
@@ -6760,17 +6273,11 @@ inline S16 SDisInt()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetVect
 (
 VectNmb vectNmb,                /* vector number */
 PIF *vectFnct                   /* vector function */
 )
-#else
-S16 SGetVect(vectNmb, vectFnct)
-VectNmb vectNmb;                /* vector number */
-PIF *vectFnct;                  /* vector function */
-#endif
 {
 
 
@@ -6796,17 +6303,11 @@ PIF *vectFnct;                  /* vector function */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SPutVect
 (
 VectNmb vectNmb,                /* vector number */
 PIF vectFnct                    /* vector function */
 )
-#else
-S16 SPutVect(vectNmb, vectFnct)
-VectNmb vectNmb;                /* vector number */
-PIF vectFnct;                   /* vector function */
-#endif
 {
 
 
@@ -6835,17 +6336,11 @@ PIF vectFnct;                   /* vector function */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetEntInst
 (
 Ent *ent,                       /* entity */
 Inst *inst                      /* instance */
 )
-#else
-S16 SGetEntInst(ent, inst)
-Ent *ent;                       /* entity */
-Inst *inst;                     /* instance */
-#endif
 {
    S16 i;
    S16 ret;
@@ -6909,17 +6404,11 @@ Inst *inst;                     /* instance */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SSetEntInst
 (
 Ent ent,                    /* entity */
 Inst inst                   /* instance */
 )
-#else
-S16 SSetEntInst(ent, inst)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-#endif
 {
    S16 i;
    S16 ret;
@@ -6987,17 +6476,11 @@ Inst inst;                  /* instance */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 inline S16 SSetIntPend
 (
 uint16_t id,                         /* driver task identifier */
 Bool flag                       /* flag */
 )
-#else
-inline S16 SSetIntPend(id, flag)
-uint16_t id;                         /* driver task identifier */
-Bool flag;                      /* flag */
-#endif
 {
    MtIsFlag isFlag;
 
@@ -7042,14 +6525,7 @@ Bool flag;                      /* flag */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SGlobMemInfoShow
-(
-Void
-)
-#else
-S16 SGlobMemInfoShow()
-#endif
+S16 SGlobMemInfoShow(Void)
 {
    uint16_t   idx;
    Txt   prntBuf[100];
@@ -7143,17 +6619,11 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool)
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SRegInfoShow
 (
 Region region,
 uint32_t *availmem
 )
-#else
-S16 SRegInfoShow(region, availmem)
-Region region;
-uint32_t *availmem;
-#endif
 {
    uint16_t   idx;
    Txt   prntBuf[100];
@@ -7252,17 +6722,11 @@ uint32_t SMemMaxThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}};
 uint32_t SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}};
 uint32_t SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}};
 
-#ifdef ANSI
 static Void SInitMemThreshold
 (
 Region region,
 uint8_t     maxBkt
 )
-#else
-static Void SInitMemThreshold(region, maxBkt)
-Region region;
-uint8_t     maxBkt;
-#endif
 {
    uint8_t   idx = 0;
    for (idx = 0; (idx < maxBkt && idx < mtCMMRegCb[region]->numBkts); idx++)
@@ -7274,17 +6738,11 @@ uint8_t     maxBkt;
    }
 }
 
-#ifdef ANSI
 S16 SRegReachedMemThreshold
 (
 Region region,
 uint8_t     maxBkt
 )
-#else
-S16 SRegReachedMemThreshold(region, maxBkt)
-Region region;
-uint8_t     maxBkt;
-#endif
 {
    uint8_t           idx       = 0;
    uint8_t           memStatus = 3;
@@ -7331,17 +6789,11 @@ uint8_t     maxBkt;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SGetRegInfo
 (
 Region region,
 SsMemDbgInfo *dbgInfo
 )
-#else
-S16 SGetRegInfo(region, dbgInfo)
-Region region;
-SsMemDbgInfo *dbgInfo;
-#endif
 {
    uint32_t idx;
 
@@ -7388,17 +6840,11 @@ SsMemDbgInfo *dbgInfo;
    return ROK;
 }
 
-#ifdef ANSI
 S16 SGetRegPoolInfo
 (
 uint8_t *numRegion,
 uint8_t *numPool
 )
-#else
-S16 SGetRegPoolInfo(numRegion, numPool)
-uint8_t *numRegion;
-uint8_t *numPool;
-#endif
 {
    /* Send number of Region available */
    *numRegion = mtMemoCfg.numRegions;
@@ -7431,17 +6877,11 @@ uint8_t *numPool;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SPrintRegMemStatusInfo
 (
 Region region,
 uint8_t typeFlag
 )
-#else
-S16 SPrintRegMemStatusInfo(region, typeFlag)
-Region region;
-uint8_t typeFlag;
-#endif
 {
    Txt prntBuf[150];
    uint32_t idx;
@@ -7545,15 +6985,7 @@ uint8_t typeFlag;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-static S16 SPrintRegMemStats
-(
-Region region
-)
-#else
-static S16 SPrintRegMemStats(region)
-Region region;
-#endif
+static S16 SPrintRegMemStats(Region region)
 {
    CmMmHashListCp *hashListCp;
    Txt prntBuf[150];
@@ -7651,19 +7083,12 @@ Region region;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 Void SRegMemErrHdlr
 (
 Region region,
 Data *ptr,
 S16 errCode
 )
-#else
-Void SRegMemErrHdlr(region, ptr, errCode)
-Region region;
-Data *ptr;
-S16 errCode;
-#endif
 {
    Txt prntBuf[150];
 
@@ -7698,15 +7123,10 @@ S16 errCode;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SPrintRegMemProfile
 (
 Region region
 )
-#else
-S16 SPrintRegMemProfile(region)
-Region region;
-#endif
 {
    CmMmHeapCb *heapCb;
    CmMmRegCb *regCb;
@@ -7932,15 +7352,10 @@ Region region;
 *       File:  mt_ss.c
 *
 --*/
-#ifdef ANSI
 S16 SGetTimeStamp
 (
 S8    *ts
 )
-#else
-S16 SGetTimeStamp(ts)
-S8    *ts;
-#endif
 {
 
 #ifndef SS_LINUX
@@ -8002,14 +7417,7 @@ S8    *ts;
 *       File:  mt_ss.c
 *
 --*/
-#ifdef ANSI
-uint32_t SGetSystemTsk
-(
-Void
-)
-#else
-uint32_t SGetSystemTsk()
-#endif
+uint32_t SGetSystemTsk(Void)
 {
 
    return (pthread_self());
@@ -8031,11 +7439,7 @@ uint32_t SGetSystemTsk()
 *       File:  mt_ss.c
 *
 --*/
-#ifdef ANSI
 static SsSTskEntry* ssdAddTmrSTsk(Void)
-#else
-static SsSTskEntry* ssdAddTmrSTsk()
-#endif
 {
    SsSTskEntry *sTsk;
    S16 ret;
@@ -8161,17 +7565,7 @@ static SsSTskEntry* ssdAddTmrSTsk()
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdInitLockNew
-(
-SLockInfo *lockId,
-uint8_t        lockType
-)
-#else
-S16 ssdInitLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t        lockType;
-#endif
+S16 ssdInitLockNew(SLockInfo *lockId,uint8_t lockType)
 {
 
 #ifdef SS_REC_LOCK_SUPPORT
@@ -8251,17 +7645,7 @@ uint8_t        lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdLockNew
-(
-SLockInfo *lockId,
-uint8_t         lockType
-)
-#else
-S16 ssdLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t         lockType;
-#endif
+S16 ssdLockNew(SLockInfo *lockId,uint8_t lockType)
 {
 
    Txt prntBuf[PRNTSZE];
@@ -8349,17 +7733,7 @@ uint8_t         lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdUnlockNew
-(
-SLockInfo *lockId,
-uint8_t        lockType
-)
-#else
-S16 ssdUnlockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t        lockType;
-#endif
+S16 ssdUnlockNew(SLockInfo *lockId,uint8_t lockType)
 {
 
    Txt prntBuf[PRNTSZE];
@@ -8415,17 +7789,7 @@ uint8_t        lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdDestroyLockNew
-(
-SLockInfo *lockId,
-uint8_t        lockType
-)
-#else
-S16 ssdDestroyLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t        lockType;
-#endif
+S16 ssdDestroyLockNew(SLockInfo *lockId,uint8_t lockType)
 {
    Txt prntBuf[PRNTSZE];
    S16    retVal = ROK;
@@ -8488,14 +7852,7 @@ uint8_t        lockType;
  *       File:
  *
  **/
-#ifdef ANSI
-S16 ssInitRcvWork
-(
- void
- )
-#else
-S16 ssInitRcvWork()
-#endif
+S16 ssInitRcvWork(void)
 {
   pthread_attr_t attr;
   pthread_t      thread;
@@ -8540,15 +7897,7 @@ S16 ssInitRcvWork()
  *
  **/
 
-#ifdef ANSI
-static void *workRcvTsk
-(
- Ptr ptr
- )
-#else
-static void *workRcvTsk (ptr)
-  Ptr ptr;
-#endif
+static void *workRcvTsk(Ptr ptr)
 {
 
   cvmx_wqe_t *workPtr;
@@ -8828,17 +8177,11 @@ pthread_t    threadId    /* Thread Id of system task */
 *       File:  pt_ss.c
 *
 */
-#ifdef ANSI
 S16 SStartTask
 (
 volatile uint32_t      *startTime,
 uint32_t       taskId
 )
-#else
-S16 SStartTask(startTime, taskId)
-volatile uint32_t      *startTime;
-uint32_t       taskId;
-#endif
 {
 #ifdef MSPD_MLOG_NEW
    *startTime = GetTIMETICK();
@@ -8861,17 +8204,11 @@ uint32_t       taskId;
 *       File:  pt_ss.c
 *
 */
-#ifdef ANSI
 S16 SStopTask
 (
 volatile uint32_t       startTime,
 uint32_t       taskId
 )
-#else
-S16 SStopTask(startTime, taskId)
-volatile uint32_t       startTime;
-uint32_t       taskId;
-#endif
 {
    /*uint32_t      stopTime;*/
    switch(taskId)
@@ -8910,33 +8247,21 @@ uint32_t       taskId;
    return ROK;
 }
 #else
-#ifdef ANSI
 S16 SStartTask
 (
-volatile uint32_t      * startTime,
-uint32_t       taskId
+volatile uint32_t * startTime,
+uint32_t taskId
 )
-#else
-S16 SStartTask(startTime, taskId)
-volatile uint32_t      * startTime;
-uint32_t       taskId;
-#endif
 {
    *startTime = 0;
    return ROK;
 }
 
-#ifdef ANSI
 S16 SStopTask
 (
-volatile uint32_t       startTime,
-uint32_t       taskId
+volatile uint32_t startTime,
+uint32_t taskId
 )
-#else
-S16 SStopTask(startTime, taskId)
-volatile uint32_t       startTime;
-uint32_t       taskId;
-#endif
 {
    return ROK;
 }
@@ -8951,17 +8276,11 @@ uint32_t       taskId;
 *
 * @return  Void - function is always success
 */
-#ifdef ANSI
 Void UpdateSocCpuInfo
 (
 CmCpuStatsInfo *cpuInfo, 
 uint8_t    idx
 )
-#else
-Void UpdateSocCpuInfo(*cpuInfo, idx)
-CmCpuStatsInfo *cpuInfo;
-uint8_t       idx;
-#endif
 {
    FILE       *mipsFd;
    S8         mipsStr[MIPS_STRING_LEN];
@@ -9042,14 +8361,9 @@ uint8_t       idx;
 *       File:  mt_ss.c
 *
 --*/
-#ifdef ANSI
 static SsSTskEntry* ssdReAddTmrSTsk(
 uint8_t idx
 )
-#else
-static SsSTskEntry* ssdReAddTmrSTsk(idx)
-uint8_t idx;
-#endif
 {
    SsSTskEntry *sTsk;
    S16 ret;
@@ -9160,14 +8474,7 @@ uint8_t idx;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 ssdReInitTmr
-(
-void
-)
-#else
-S16 ssdReInitTmr()
-#endif
+S16 ssdReInitTmr(void)
 {
    pthread_attr_t attr;
    struct sched_param param_sched;
index 2c34d21..777c39a 100644 (file)
@@ -93,7 +93,6 @@
 *       File:  ss_drvr.c
 *
 */
-#ifdef ANSI
 S16 SRegDrvrTsk
 (
 Inst channel,                   /* channel instance */
@@ -102,14 +101,6 @@ ProcId high,                    /* processor ID -- high */
 ActvTsk actvTsk,                /* activation function */
 ISTsk isTsk                     /* interrupt service function */
 )
-#else
-S16 SRegDrvrTsk(channel, low, high, actvTsk, isTsk)
-Inst channel;                   /* channel instance */
-ProcId low;                     /* processor ID -- low */
-ProcId high;                    /* processor ID -- high */
-ActvTsk actvTsk;                /* activation function */
-ISTsk isTsk;                    /* interrupt service function */
-#endif
 {
    S16 ret;
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -241,15 +232,10 @@ ISTsk isTsk;                    /* interrupt service function */
 *       File:  ss_drvr.c 
 *
 */
-#ifdef ANSI
 S16 SDeregDrvrTsk
 (
 Inst channel                   /* channel instance */
 )
-#else
-S16 SDeregDrvrTsk(channel)
-Inst channel;
-#endif
 {
        /* ss002.301 Modifications */
 
index 4029afa..c50595c 100644 (file)
@@ -216,14 +216,7 @@ Void mtSigUsr2Hndlr()
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SInit
-(
-void
-)
-#else
-S16 SInit()
-#endif
+S16 SInit(void)
 {
    S16 ret;
    REG1 S16 i;
@@ -743,14 +736,7 @@ cleanup0:
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SDeInit
-(
-void
-)
-#else
-S16 SDeInit()
-#endif
+S16 SDeInit(void)
 {
   /* ss007.301 */
   uint16_t    regCnt;
@@ -805,15 +791,10 @@ S16 SDeInit()
 }
 /* ss001.301: additions */
 #ifdef SS_LOGGER_SUPPORT 
-#ifdef ANSI
 S16 SWrtLogBuf
 (
 Txt *buf                        /* buffer */
 )
-#else
-S16 SWrtLogBuf(buf)
-Txt *buf;                       /* buffer */
-#endif
 {
    S16 bufSz;
    /* buffer synchronisation*/
@@ -866,15 +847,10 @@ Txt *buf;                       /* buffer */
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
 S16 SPrint
 (
 Txt *buf                        /* buffer */
 )
-#else
-S16 SPrint(buf)
-Txt *buf;                       /* buffer */
-#endif
 {
 
 /* ss001.301: additions */
@@ -903,17 +879,11 @@ Txt *buf;                       /* buffer */
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
 S16 SError
 (
 Seq seq,                    /* sequence */
 Reason reason               /* reason */
 )
-#else
-S16 SError(seq, reason)
-Seq seq;                    /* sequence */
-Reason reason;              /* reason */
-#endif
 {
    S16 ret;
    DateTime dt;
@@ -946,7 +916,6 @@ Reason reason;              /* reason */
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
 Void SLogError
 (
 Ent ent,                    /* Calling layer's entity id */
@@ -959,19 +928,6 @@ ErrCode errCode,            /* layer unique error code */
 ErrVal errVal,              /* error value */
 Txt *errDesc                /* description of error */
 )
-#else
-Void SLogError(ent, inst, procId, file, line,
-                        errCls, errCode, errVal, errDesc)
-Ent ent;                    /* Calling layer's entity id */
-Inst inst;                  /* Calling layer's instance id */
-ProcId procId;              /* Calling layer's processor id */
-Txt *file;                  /* file name where error occured */
-S32 line;                   /* line in file where error occured */
-ErrCls errCls;              /* error class */
-ErrCode errCode;            /* layer unique error code */
-ErrVal errVal;              /* error value */
-Txt *errDesc;               /* description of error */
-#endif
 {
    DateTime dt;
    Txt errBuf[512];
@@ -1015,14 +971,7 @@ Txt *errDesc;               /* description of error */
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-ProcId SFndProcId
-(
-void
-)
-#else
-ProcId SFndProcId()
-#endif
+ProcId SFndProcId(void)
 {
 
    return (osCp.procId);
@@ -1042,15 +991,7 @@ ProcId SFndProcId()
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-Void SSetProcId
-(
-ProcId procId
-)
-#else
-Void SSetProcId(procId)
-ProcId procId;
-#endif
+Void SSetProcId(ProcId procId)
 {
 
    osCp.procId = procId;
@@ -1076,15 +1017,7 @@ ProcId procId;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-uint16_t SGetProcIdIdx
-(
-ProcId proc
-)
-#else
-uint16_t SGetProcIdIdx(proc)
-ProcId proc; 
-#endif
+uint16_t SGetProcIdIdx(ProcId proc)
 {
    uint16_t i;
    uint16_t idx;
@@ -1117,15 +1050,7 @@ ProcId proc;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-static S16 SInsProcId
-(
-ProcId proc
-)
-#else
-static S16 SInsProcId(proc)
-ProcId proc; 
-#endif
+static S16 SInsProcId(ProcId proc)
 {
    uint16_t i;
    uint16_t idx;
@@ -1167,15 +1092,7 @@ ProcId proc;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-static S16 SRemProcId
-(
-ProcId proc
-)
-#else
-static S16 SRemProcId(proc)
-ProcId proc; 
-#endif
+static S16 SRemProcId(ProcId proc)
 {
    uint16_t i;
    uint16_t idx;
@@ -1217,14 +1134,7 @@ ProcId proc;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-static S16 SLockOsCp
-(
-Void
-)
-#else
-static S16 SLockOsCp(Void)
-#endif
+static S16 SLockOsCp(void)
 {
    S16 ret;
 
@@ -1276,14 +1186,7 @@ static S16 SLockOsCp(Void)
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-static S16 SULockOsCp
-(
-Void
-)
-#else
 static S16 SULockOsCp(Void)
-#endif
 {
 
    /* unlock the table */
@@ -1317,17 +1220,7 @@ static S16 SULockOsCp(Void)
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SAddProcIdLst
-(
-uint16_t numPIds,
-ProcId *pIdLst
-)
-#else
-S16 SAddProcIdLst(numPIds, pIdLst)
-uint16_t numPIds;
-ProcId *pIdLst;
-#endif
+S16 SAddProcIdLst(uint16_t numPIds,ProcId *pIdLst)
 {
    uint16_t i;
    S16 ret;
@@ -1412,17 +1305,7 @@ exceeds");
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SRemProcIdLst
-(
-uint16_t numPIds,
-ProcId *pIdLst
-)
-#else
-S16 SRemProcIdLst(numPIds, pIdLst)
-uint16_t numPIds;
-ProcId *pIdLst;
-#endif
+S16 SRemProcIdLst(uint16_t numPIds,ProcId *pIdLst)
 {
    uint16_t i;
 
@@ -1476,17 +1359,7 @@ ProcId *pIdLst;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SGetProcIdLst
-(
-uint16_t *numPIds,
-ProcId *pIdLst
-)
-#else
-S16 SGetProcIdLst(numPIds, pIdLst)
-uint16_t *numPIds;
-ProcId *pIdLst;
-#endif
+S16 SGetProcIdLst(uint16_t *numPIds,ProcId *pIdLst)
 {
    uint16_t i;
    uint16_t count = 0;
@@ -1535,7 +1408,6 @@ ProcId *pIdLst;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
 S16 SGetXxCb
 (
 ProcId proc,
@@ -1543,13 +1415,6 @@ Ent ent,
 Inst inst,
 Void **xxCb
 )
-#else
-S16 SGetXxCb(proc, ent, inst, xxCb)
-ProcId proc;
-Ent ent;
-Inst inst;
-Void **xxCb;
-#endif
 {
    uint16_t procIdIdx;
    SsIdx idx;
@@ -1612,14 +1477,7 @@ Void **xxCb;
 *       File:  ss_gen.c
 *
 */
-#ifdef ANSI
-S16 SFillEntIds
-(
-Void
-)
-#else
 S16 SFillEntIds(Void)
-#endif
 {
 
    uint8_t entInfo[26][26] = {
@@ -1804,17 +1662,7 @@ S16 SFillEntIds(Void)
 *
 *
 */
-#ifdef ANSI
-S16 SGetEntInd 
-(
-Ent      *entId,
-uint8_t       *fileName
-)
-#else
-S16 SGetEntInd(entId, fileName)
-Ent      *entId;
-uint8_t       *fileName;
-#endif
+S16 SGetEntInd(Ent *entId,uint8_t *fileName)
 {
 
 
@@ -1909,18 +1757,7 @@ uint8_t       *fileName;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SLockNew 
-(
-SLockInfo *lockId,
-uint8_t         lockType
-
-)
-#else
-S16 SLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t         lockType;
-#endif
+S16 SLockNew(SLockInfo *lockId,uint8_t lockType)
 {
    S16    retVal = ROK;
 
@@ -1946,17 +1783,7 @@ uint8_t         lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SInitLockNew 
-(
-SLockInfo *lockId,
-uint8_t         lockType
-)
-#else
-S16 SInitLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t         lockType;
-#endif
+S16 SInitLockNew(SLockInfo *lockId,uint8_t  lockType)
 {
    S16    retVal = ROK;
 
@@ -1982,17 +1809,7 @@ uint8_t         lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SUnlockNew 
-(
-SLockInfo *lockId,
-uint8_t         lockType
-)
-#else
-S16 SUnlockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t         lockType;
-#endif
+S16 SUnlockNew(SLockInfo *lockId,uint8_t lockType)
 {
    S16    retVal = ROK;
 
@@ -2018,17 +1835,7 @@ uint8_t         lockType;
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
-S16 SDestroyLockNew 
-(
-SLockInfo *lockId,
-uint8_t         lockType
-)
-#else
-S16 SDestroyLockNew(lockId, lockType)
-SLockInfo *lockId;
-uint8_t         lockType;
-#endif
+S16 SDestroyLockNew(SLockInfo *lockId,uint8_t lockType)
 {
    S16    retVal = ROK;
 
@@ -2203,14 +2010,7 @@ void DumpStaticMemLeakFiles()
  *       File: mt_ss.c
  *
  */
-#ifdef ANSI
-S16 SReInitTmr
-(
-void
-)
-#else
-S16 SReInitTmr()
-#endif
+S16 SReInitTmr(void)
 {
    uint8_t ret = ROK;
    Txt prntBuf[PRNTSZE];
index fcf5744..743a71d 100644 (file)
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SRegDynRegion
 (
 Region region,                  /* region ID */
 SRegInfo *regInfo               /* information about the region */
 )
-#else
-S16 SRegDynRegion(region, regInfo)
-Region region;                  /* region ID */
-SRegInfo *regInfo;              /* information about the region */
-#endif
 {
    S16 ret;
 
@@ -205,17 +199,11 @@ SRegInfo *regInfo;              /* information about the region */
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SRegRegion
 (
 Region region,                  /* region ID */
 SRegInfo *regInfo               /* information about the region */
 )
-#else
-S16 SRegRegion(region, regInfo)
-Region region;                  /* region ID */
-SRegInfo *regInfo;              /* information about the region */
-#endif
 {
    S16 ret;
 
@@ -297,15 +285,10 @@ SRegInfo *regInfo;              /* information about the region */
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SDeregRegion
 (
 Region region                   /* region ID */
 )
-#else
-S16 SDeregRegion(region)
-Region region;                  /* region ID */
-#endif
 {
    S16 ret;
 
@@ -384,7 +367,6 @@ Region region;                  /* region ID */
 #ifndef SS_FAP
 /* ss001.301: Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SAlloc
 (
 Region region,                  /* region ID */
@@ -396,16 +378,6 @@ uint8_t    *fileName,
 uint8_t    entId
 )
 #else
-S16 SAlloc(region, size, flags, ptr, line, fileName, entId)
-Region region;                  /* region ID */
-Size *size;                     /* size of block required/allocated */
-uint32_t flags;                      /* allocation flags */
-Data **ptr;                     /* filled with pointer to block */
-uint32_t   line;
-uint8_t   *fileName;
-uint8_t    entId;
-#endif
-#else
 #ifdef T2K_MEM_LEAK_DBG
 S16 SAllocNew
 (
@@ -417,7 +389,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAlloc
 (
 Region region,                  /* region ID */
@@ -425,13 +396,6 @@ Size *size,                     /* size of block required/allocated */
 uint32_t flags,                      /* allocation flags */
 Data **ptr                      /* filled with pointer to block */
 )
-#else
-S16 SAlloc(region, size, flags, ptr)
-Region region;                  /* region ID */
-Size *size;                     /* size of block required/allocated */
-uint32_t flags;                      /* allocation flags */
-Data **ptr;                     /* filled with pointer to block */
-#endif
 #endif
 #endif
 {
@@ -584,7 +548,6 @@ Data **ptr;                     /* filled with pointer to block */
 */
 /* ss001.301: Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SFree
 (
 Region region,                  /* region ID */
@@ -595,16 +558,6 @@ uint8_t   *fileName,
 uint8_t   entId
 )
 #else
-S16 SFree(region, ptr, size, line, fileName, entId)
-Region region;                  /* region ID */
-Data *ptr;                      /* pointer to the allocated block */
-Size size;                      /* size of block */
-uint32_t  line;
-uint8_t   *fileName;
-uint8_t   entId;
-#endif
-#else
-#ifdef ANSI
 #ifdef T2K_MEM_LEAK_DBG
 S16 SFreeNew
 (
@@ -622,12 +575,6 @@ Data *ptr,                      /* pointer to the allocated block */
 Size size                       /* size of block */
 )
 #endif
-#else
-S16 SFree(region, ptr, size)
-Region region;                  /* region ID */
-Data *ptr;                      /* pointer to the allocated block */
-Size size;                      /* size of block */
-#endif
 #endif
 {
    S16 ret;
@@ -794,15 +741,10 @@ Size size;                      /* size of block */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SHstGrmInfoShow 
 (
 Ent      *entId
 )
-#else
-S16 SHstGrmInfoShow(entId)
-Ent      *entId;
-#endif
 {
     /*ss012.301 : Increased Buffer size to fix segmentation fault*/
     Txt                                        prntBuf[511];  /* Buffer to print on the console */
index a453e34..0cb2bb3 100644 (file)
@@ -260,19 +260,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 ssGetDBufOfSize
 (
 Region region,
 Size size,
 Buffer **dBuf
 )
-#else
-S16 ssGetDBufOfSize(region, size, dBuf)
-Region region;
-Size size;
-Buffer **dBuf;
-#endif
 #endif
 {
    Size mdsize;
@@ -348,7 +341,6 @@ Buffer **dBuf;
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SGetMsgNew
 (
 Region region,              /* region id */
@@ -357,14 +349,6 @@ Buffer **mBuf,              /* pointer to message buffer */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SGetMsgNew(region, pool, mBuf, line, fileName)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **mBuf;              /* pointer to message buffer */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
 S16 SGetMsgNew
@@ -376,19 +360,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetMsg
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **mBuf              /* pointer to message buffer */
 )
-#else
-S16 SGetMsg(region, pool, mBuf)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **mBuf;              /* pointer to message buffer */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -577,19 +554,12 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool)
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SPutMsgNew
 (
 Buffer *mBuf,
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SPutMsgNew(mBuf, line, fileName)
-Buffer *mBuf;
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #ifdef T2K_MEM_LEAK_DBG
 S16 SPutMsgNew
@@ -599,15 +569,10 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SPutMsg(mBuf)
-Buffer *mBuf;
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -763,7 +728,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
@@ -772,14 +736,6 @@ Data *ptr,                      /* pointer to buffer */
 Size size,                      /* size */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SPutStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 #endif
 {
    S16 ret = RFAILED;
@@ -916,7 +872,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
@@ -925,14 +880,6 @@ Data **ptr,                     /* pointer to buffer */
 Size size,                      /* size requested */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SGetStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 #endif
 {
    S16 ret = RFAILED;
@@ -1019,7 +966,6 @@ uint8_t   memType;                   /* memory type used if shareable or not */
 
 #ifdef INTEL_WLS_MEM 
 #ifndef SS_LOCKLESS_MEMORY
-#ifdef ANSI
 S16 SGetStaticBuffer
 (
 Region region,                  /* region ID */
@@ -1028,14 +974,6 @@ Data **ptr,                     /* pointer to buffer */
 Size size,                      /* size requested */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SGetStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 {
     S16  ret;
 
@@ -1045,7 +983,6 @@ uint8_t   memType;                   /* memory type used if shareable or not */
 }
 
 
-#ifdef ANSI
 S16 SPutStaticBuffer
 (
 Region region,                  /* region ID */
@@ -1054,14 +991,6 @@ Data *ptr,                      /* pointer to buffer */
 Size size,                      /* size */
 uint8_t   memType                    /* memory type used if shareable or not */
 )
-#else
-S16 SPutStaticBuffer(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint8_t   memType;                   /* memory type used if shareable or not */
-#endif
 {
 
    S16   ret;
@@ -1173,7 +1102,6 @@ Size size                      /* size */
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 S16 SGetSBufNew
 (
 Region region,                  /* region ID */
@@ -1183,18 +1111,8 @@ Size size,                       /* size requested */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SGetSBufNew(region, pool, ptr, size, line, fileName)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else /* SS_HISTOGRAM_SUPPORT */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
-#ifdef ANSI
 S16 SGetSBuf1
 (
 Region region,                  /* region ID */
@@ -1205,16 +1123,6 @@ char* file,
 uint32_t line
 )
 #else
-S16 SGetSBuf1(region, pool, ptr, size, file, line)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-char* file;
-uint32_t line;
-#endif
-#else
-#ifdef ANSI
 S16 SGetSBuf
 (
 Region region,                  /* region ID */
@@ -1222,13 +1130,6 @@ Pool pool,                      /* pool ID */
 Data **ptr,                     /* pointer to buffer */
 Size size                       /* size requested */
 )
-#else
-S16 SGetSBuf(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data **ptr;                     /* pointer to buffer */
-Size size;                      /* size requested */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -1449,7 +1350,6 @@ Size size;                      /* size requested */
 */
 /* ss001.301: additions */
 #ifdef SS_HISTOGRAM_SUPPORT
-#ifdef ANSI
 S16 SPutSBufNew
 (
 Region region,                  /* region ID */
@@ -1459,18 +1359,8 @@ Size size,                      /* size */
 uint32_t    line,
 uint8_t     *fileName
 )
-#else
-S16 SPutSBufNew(region, pool, ptr, size, line, fileName)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-uint32_t    line;
-uint8_t     *fileName;
-#endif
 #else  /* SS_HISTOGRAM_SUPPORT  */
 #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG))
-#ifdef ANSI
 S16 SPutSBuf1
 (
 Region region,                  /* region ID */
@@ -1481,16 +1371,6 @@ char* file,
 uint32_t line
 )
 #else
-S16 SPutSBuf1(region, pool, ptr, size, file, line)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-char* file;
-uint32_t line;
-#endif
-#else
-#ifdef ANSI
 S16 SPutSBuf
 (
 Region region,                  /* region ID */
@@ -1498,13 +1378,6 @@ Pool pool,                      /* pool ID */
 Data *ptr,                      /* pointer to buffer */
 Size size                      /* size */
 )
-#else
-S16 SPutSBuf(region, pool, ptr, size)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Data *ptr;                      /* pointer to buffer */
-Size size;                      /* size */
-#endif
 #endif
 #endif /* SS_HISTOGRAM_SUPPORT */
 {
@@ -1678,15 +1551,7 @@ Size size;                      /* size */
 *
 */
 
-#ifdef ANSI
-S16 SInitMsg
-(
-Buffer *mBuf
-)
-#else
-S16 SInitMsg(mBuf)
-Buffer *mBuf;
-#endif
+S16 SInitMsg(Buffer *mBuf)
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -1767,19 +1632,12 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAddPreMsgMultInOrder
 (
- Data *src,
- MsgLen cnt,
- Buffer *mBuf
- )
-#else
-S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
-    Data *src;
-    MsgLen cnt;
-    Buffer *mBuf;
-#endif
+Data *src,
+MsgLen cnt,
+Buffer *mBuf
+)
 {
    SsMsgInfo *minfo;   /* Message info */
    Buffer *tmp;
@@ -1955,17 +1813,11 @@ S16 SAddPreMsgMultInOrder(src, cnt, mBuf)
 */
 
  
-#ifdef ANSI
 S16 SAddPreMsg
 (
 Data data,
 Buffer *mBuf
 )
-#else
-S16 SAddPreMsg (data, mBuf)
-Data data;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2057,17 +1909,11 @@ Buffer *mBuf;
 */
 
  
-#ifdef ANSI
 S16 SAddPstMsg
 (
 Data data,
 Buffer *mBuf
 )
-#else
-S16 SAddPstMsg (data, mBuf)
-Data data;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2158,19 +2004,12 @@ uint32_t    line
 )
 
 #else
-#ifdef ANSI
 S16 SAddPreMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SAddPreMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -2334,19 +2173,12 @@ char   *file,
 uint32_t    line
 )
 #else
-#ifdef ANSI
 S16 SAddPstMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SAddPstMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;
@@ -2509,17 +2341,11 @@ Buffer *mBuf;
 */
 
  
-#ifdef ANSI
 S16 SRemPreMsg
 (
 Data *dataPtr,
 Buffer *mBuf
 )
-#else
-S16 SRemPreMsg(dataPtr, mBuf)
-Data *dataPtr;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2594,17 +2420,11 @@ Buffer *mBuf;
 */
 
 
-#ifdef ANSI
 S16 SRemPstMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf
 )
-#else
-S16 SRemPstMsg(dataPtr, mBuf)
-Data *dataPtr;              /* pointer to data */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2694,19 +2514,12 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 
-#ifdef ANSI
 S16 SRemPreMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
-#else
-S16 SRemPreMsgMult(dst, cnt, mBuf)
-Data *dst;                  /* destination */
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2816,19 +2629,12 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 
-#ifdef ANSI
 S16 SRemPstMsgMult
 (
 Data *dst,                  /* destination */
 MsgLen cnt,                 /* count */
 Buffer *mBuf
 )
-#else
-S16 SRemPstMsgMult(dst, cnt, mBuf)
-Data *dst;                  /* destination */
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -2950,19 +2756,12 @@ Buffer *mBuf;               /* message buffer */
 */
 
 
-#ifdef ANSI
 S16 SExamMsg
 (
 Data *dataPtr,              /* pointer to data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
-#else
-S16 SExamMsg(dataPtr, mBuf, idx)
-Data *dataPtr;              /* pointer to data */
-Buffer *mBuf;               /* message buffer */
-MsgLen idx;                 /* index */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -3043,7 +2842,6 @@ MsgLen idx;                 /* index */
 */
 
 
-#ifdef ANSI
 S16 SGetDataFrmMsg 
 (
 Buffer *mBuf,               /* message buffer */
@@ -3051,13 +2849,6 @@ Data *dataPtr,              /* pointer to data */
 MsgLen idx,
 MsgLen dataLen
 )
-#else
-S16 SGetDataFrmMsg(mBuf, dataPtr, idx, dataLen)
-Buffer *mBuf;               /* message buffer */
-Data *dataPtr;              /* pointer to data */
-MsgLen idx;                 /* index */
-MsgLen dataLen;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -3149,17 +2940,11 @@ MsgLen dataLen;
 */
 
 
-#ifdef ANSI
 S16 SFndLenMsg
 (
 REG1 Buffer *mBuf,          /* message buffer */
 MsgLen *lngPtr
 )
-#else
-S16 SFndLenMsg(mBuf, lngPtr)
-REG1 Buffer *mBuf;          /* message buffer */
-MsgLen *lngPtr;             /* pointer to length */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -3242,19 +3027,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SSegMsg
 (
 Buffer *mBuf1,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer **mBuf2
 )
-#else
-S16 SSegMsg(mBuf1, idx, mBuf2)
-Buffer *mBuf1;              /* message 1 */
-MsgLen idx;                 /* index */
-Buffer **mBuf2;             /* message 2 */
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -3439,7 +3217,6 @@ Buffer **mBuf2;             /* message 2 */
 *
 */
 
-#ifdef ANSI
 S16 SCpyFixMsg
 (
 Data *srcBuf,               /* source buffer */
@@ -3448,14 +3225,6 @@ MsgLen dstIdx,              /* destination index */
 MsgLen cnt,                 /* count */
 MsgLen *cCnt
 )
-#else
-S16 SCpyFixMsg(srcBuf, dstMbuf, dstIdx, cnt, cCnt)
-Data *srcBuf;               /* source buffer */
-Buffer *dstMbuf;            /* destination message buffer */
-MsgLen dstIdx;              /* destination index */
-MsgLen cnt;                 /* count */
-MsgLen *cCnt;               /* copied count */
-#endif
 {
    S16 ret;
    SsMsgInfo *minfo;
@@ -3592,7 +3361,6 @@ MsgLen *cCnt;               /* copied count */
 *
 */
 
-#ifdef ANSI
 S16 SCpyMsgFix
 (
 Buffer *srcMbuf,            /* source message buffer */
@@ -3601,14 +3369,6 @@ MsgLen cnt,                 /* count */
 Data *dstBuf,               /* destination buffer */
 MsgLen *cCnt
 )
-#else
-S16 SCpyMsgFix(srcMbuf, srcIdx, cnt, dstBuf, cCnt)
-Buffer *srcMbuf;            /* source message buffer */
-MsgLen srcIdx;              /* source index */
-MsgLen cnt;                 /* count */
-Data *dstBuf;               /* destination buffer */
-MsgLen *cCnt;               /* copied count */
-#endif
 {
    Data *cptr;
    Buffer *tmp;
@@ -3730,7 +3490,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SCpyMsgMsg
 (
 Buffer *srcBuf,
@@ -3738,13 +3497,6 @@ Region dstRegion,
 Pool dstPool,
 Buffer **dstBuf
 )
-#else
-S16 SCpyMsgMsg(srcBuf, dstRegion, dstPool, dstBuf)
-Buffer *srcBuf;
-Region dstRegion;
-Pool dstPool;
-Buffer **dstBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -3931,7 +3683,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAddMsgRef
 (
 Buffer *srcBuf,
@@ -3939,13 +3690,6 @@ Region dstRegion,
 Pool dstPool,
 Buffer **dstBuf
 )
-#else
-S16 SAddMsgRef(srcBuf, dstRegion, dstPool, dstBuf)
-Buffer *srcBuf;
-Region dstRegion;
-Pool dstPool;
-Buffer **dstBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo1;
@@ -4093,17 +3837,11 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 static Buffer *DupMsg
 (
 Region region,              /* region id */
 Buffer *mp                  /* message block */
 )
-#else
-static Buffer *DupMsg(region, mp)
-Region region;              /* region id */
-Buffer *mp;                 /* message block */
-#endif
 #endif
 {
    Buffer *bp;                  /* mblk for iteration */
@@ -4224,19 +3962,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SGetDBuf
 (
 Region region,              /* region id */
 Pool pool,                  /* pool id */
 Buffer **bufPtr
 )
-#else
-S16 SGetDBuf(region, pool, bufPtr)
-Region region;              /* region id */
-Pool pool;                  /* pool id */
-Buffer **bufPtr;            /* pointer to buffer */
-#endif
 #endif
 {
    Size size;
@@ -4407,19 +4138,12 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SPutDBuf
 (
 Region region,
 Pool pool,
 Buffer *buf
 )
-#else
-S16 SPutDBuf(region, pool, buf)
-Region region;
-Pool pool;
-Buffer *buf;
-#endif
 #endif
 {
    register SsDblk *dptr;
@@ -4592,19 +4316,12 @@ Buffer *buf;
 */
 
 
-#ifdef ANSI
 S16 SCatMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2,              /* message 2 */
 Order order
 )
-#else
-S16 SCatMsg(mBuf1, mBuf2, order)
-Buffer *mBuf1;              /* message 1 */
-Buffer *mBuf2;              /* message 2 */
-Order order;                /* order */
-#endif
 {
    SsMsgInfo *minfo1;
    SsMsgInfo *minfo2;
@@ -4751,19 +4468,12 @@ Order order;                /* order */
 */
 
 
-#ifdef ANSI
 S16 SRepMsg
 (
 Data data,                  /* data */
 Buffer *mBuf,               /* message buffer */
 MsgLen idx
 )
-#else
-S16 SRepMsg(data, mBuf, idx)
-Data data;                  /* data */
-Buffer *mBuf;               /* message buffer */
-MsgLen idx;                 /* index */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -4852,19 +4562,12 @@ MsgLen idx;                 /* index */
 */
 
 
-#ifdef ANSI
 S16 SUpdMsg
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf,                   /* data buffer */
 MsgLen dLen
 )
-#else
-S16 SUpdMsg(mBuf, dBuf, dLen)
-Buffer *mBuf;                   /* message buffer */
-Buffer *dBuf;                   /* data buffer */
-MsgLen dLen;                    /* data length */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -4943,17 +4646,11 @@ MsgLen dLen;                    /* data length */
 */
 
  
-#ifdef ANSI
 S16 SAddDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer *dBuf
 )
-#else
-S16 SAddDBufPst(mBuf, dBuf)
-Buffer *mBuf;                   /* message buffer */
-Buffer *dBuf;                   /* data buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5014,17 +4711,11 @@ Buffer *dBuf;                   /* data buffer */
 */
 
  
-#ifdef ANSI
 S16 SAddDBufPre
 (
 Buffer *mBuf,                    /* message buffer */
 Buffer *dBuf
 )
-#else
-S16 SAddDBufPre(mBuf, dBuf)
-Buffer *mBuf;                    /* message buffer */
-Buffer *dBuf;                    /* data buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -5088,17 +4779,11 @@ Buffer *dBuf;                    /* data buffer */
 */
 
  
-#ifdef ANSI
 S16 SRemDBufPre
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
-#else
-S16 SRemDBufPre(mBuf, dBufPtr)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBufPtr;               /* pointer to data buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5163,17 +4848,11 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 */
 
  
-#ifdef ANSI
 S16 SRemDBufPst
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBufPtr
 )
-#else
-S16 SRemDBufPst(mBuf, dBufPtr)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBufPtr;               /* pointer to data buffer */
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -5235,15 +4914,10 @@ Buffer **dBufPtr;               /* pointer to data buffer */
 */
 
  
-#ifdef ANSI
 S16 SInitNxtDBuf
 (
 Buffer *mBuf
 )
-#else
-S16 SInitNxtDBuf(mBuf)
-Buffer *mBuf;                   /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5284,17 +4958,11 @@ Buffer *mBuf;                   /* message buffer */
 */
 
  
-#ifdef ANSI
 S16 SGetNxtDBuf
 (
 Buffer *mBuf,                   /* message buffer */
 Buffer **dBuf
 )
-#else
-S16 SGetNxtDBuf(mBuf, dBuf)
-Buffer *mBuf;                   /* message buffer */
-Buffer **dBuf;                  /* data buffer return */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5343,15 +5011,10 @@ Buffer **dBuf;                  /* data buffer return */
 *
 */
 
-#ifdef ANSI
 S16 SChkNxtDBuf
 (
 Buffer *mBuf
 )
-#else
-S16 SChkNxtDBuf(mBuf)
-Buffer *mBuf;                   /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
 
@@ -5396,7 +5059,6 @@ Buffer *mBuf;                   /* message buffer */
 */
 
  
-#ifdef ANSI
 S16 SGetDataRx
 (
 Buffer *dBuf,                   /* data buffer */
@@ -5404,13 +5066,6 @@ MsgLen pad,                     /* pad */
 Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen
 )
-#else
-S16 SGetDataRx(dBuf, pad, retDatPtr, retDatLen)
-Buffer *dBuf;                   /* data buffer */
-MsgLen pad;                     /* pad */
-Data **retDatPtr;               /* return data pointer */
-MsgLen *retDatLen;              /* return data length */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -5479,19 +5134,12 @@ MsgLen *retDatLen;              /* return data length */
 */
 
  
-#ifdef ANSI
 S16 SGetDataTx
 (
 Buffer *dBuf,                   /* data buffer */
 Data **retDatPtr,               /* return data pointer */
 MsgLen *retDatLen               /* return data length */
 )
-#else
-S16 SGetDataTx(dBuf, retDatPtr, retDatLen)
-Buffer *dBuf;                   /* data buffer */
-Data **retDatPtr;               /* return data pointer */
-MsgLen *retDatLen;              /* return data length */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -5552,19 +5200,12 @@ MsgLen *retDatLen;              /* return data length */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetBufRegionPool
 (
 Buffer *mBuf,                   /* message buffer */
 Region *region,                 /* region */
 Pool   *pool                    /* pool */
 )
-#else
-S16 SGetBufRegionPool(mBuf, region, pool)
-Buffer *mBuf;                   /* message buffer */
-Region *region;                 /* region */
-Pool   *pool;                   /* pool */
-#endif
 {
    SsMsgInfo *mInfo;            /* message info pointer */
 
@@ -5629,15 +5270,10 @@ Pool   *pool;                   /* pool */
 */
 
  
-#ifdef ANSI
 S16 SCompressMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SCompressMsg(mBuf)
-Buffer *mBuf;                    /* message buffer */
-#endif
 {
    SsMsgInfo *minfo;
    MsgLen numBytes;
@@ -5726,19 +5362,12 @@ Buffer *mBuf;                    /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPrntMsg
 (
 Buffer *mBuf,               /* message buffer */
 S16 src,                    /* source id */
 S16 dst                     /* destination id */
 )
-#else
-S16 SPrntMsg(mBuf, src, dst)
-Buffer *mBuf;               /* message buffer */
-S16 src;                    /* source id */
-S16 dst;                    /* destination id */
-#endif
 {
    QLen qlen;               /* queue length */
        MsgLen mlen;             /* message length */
@@ -5883,17 +5512,11 @@ S16 dst;                    /* destination id */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetPstMsgMult
 (
 MsgLen cnt,                 /* count */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SGetPstMsgMult(cnt, mBuf)
-MsgLen cnt;                 /* count */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Buffer *tmp;
    Buffer *newb;
@@ -5987,15 +5610,10 @@ Buffer *mBuf;               /* message buffer */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SChkMsg
 (
 Buffer *mBuf
 )
-#else
-S16 SChkMsg(mBuf)
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;
    Buffer *tmp;
@@ -6041,15 +5659,10 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAlignDBufEven
 (
 Buffer *dBuf                      /* data buffer */
 )
-#else
-S16 SAlignDBufEven(dBuf)
-Buffer *dBuf;                   /* data buffer  */
-#endif
 {
    MsgLen len;
    Data *src;
@@ -6114,17 +5727,11 @@ Buffer *dBuf;                   /* data buffer  */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SAlignDBuf
 (
 Buffer *dBuf,                      /* data buffer */
 uint32_t    align                       /* alignemnt required */
 )
-#else
-S16 SAlignDBuf(dBuf, align)
-Buffer *dBuf;                      /* data buffer  */
-uint32_t    align;                      /* alignemnt required */
-#endif
 {
    MsgLen len;
    Data   *src;
@@ -6205,19 +5812,12 @@ uint32_t    align;                      /* alignemnt required */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetSMem
 (
 Region region,                  /* region ID */
 Size size,                      /* size */
 Pool *pool                      /* pointer to pool ID */
 )
-#else
-S16 SGetSMem(region, size, pool)
-Region region;                  /* region ID */
-Size size;                      /* size */
-Pool *pool;                     /* pointer to pool ID */
-#endif
 {
 
    UNUSED(size);
@@ -6264,17 +5864,11 @@ Pool *pool;                     /* pointer to pool ID */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SPutSMem
 (
 Region region,                  /* region ID */
 Pool pool                       /* pool ID */
 )
-#else
-S16 SPutSMem(region, pool)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-#endif
 {
    /* ss021.103 - Addition of return value */
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -6358,19 +5952,12 @@ Pool pool;                      /* pool ID */
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SChkRes
 (
 Region region,                  /* region ID */
 Pool pool,                      /* pool ID */
 Status *status                  /* pointer to status */
 )
-#else
-S16 SChkRes(region, pool, status)
-Region region;                  /* region ID */
-Pool pool;                      /* pool ID */
-Status *status;                 /* pointer to status */
-#endif
 {
    S16 ret;
    SMemCtl mctl;
@@ -6484,17 +6071,11 @@ Status *status;                 /* pointer to status */
 */
 
 
-#ifdef ANSI
 S16 SSwapMsg
 (
 Buffer *mBuf1,              /* message 1 */
 Buffer *mBuf2               /* message 2 */
 )
-#else
-S16 SSwapMsg(mBuf1, mBuf2)
-Buffer *mBuf1;              /* message 1 */
-Buffer *mBuf2;              /* message 2 */
-#endif
 {
    SsMsgInfo *minfop;
    SsMsgInfo minfo;
@@ -6595,15 +6176,10 @@ Buffer *mBuf2;              /* message 2 */
  *       File:  ss_msg.c
  *
  */
-#ifdef ANSI
 S16 SConvPtrPhy
 (
  Buffer  **mBuf
 )
-#else
-S16 SConvPtrPhy (mBuf)
-  Buffer **mBuf;
-#endif
 {
 
   Buffer      *curPtr;
@@ -6751,15 +6327,10 @@ S16 SConvPtrPhy (mBuf)
  *       File:  ss_msg.c
  *
  */
-#ifdef ANSI
 S16 SConvPhyPtr
 (
- Buffer  **workPtr
- )
-#else
-S16 SConvPhyPtr (workPtr)
-  Buffer  **workPtr;
-#endif
+Buffer  **workPtr
+)
 {
 
   Buffer      *curPtr;
@@ -6907,21 +6478,13 @@ S16 SConvPhyPtr (workPtr)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SCpyFpaMsg
 (
- Buffer *srcBuf,
- Region dstRegion,
- Pool dstPool,
- Buffer **dstBuf
- )
-#else
-S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
-  Buffer *srcBuf;
-  Region dstRegion;
-  Pool dstPool;
-  Buffer **dstBuf;
-#endif
+Buffer *srcBuf,
+Region dstRegion,
+Pool dstPool,
+Buffer **dstBuf
+)
 {
 
   Size        numBytes;
@@ -7060,17 +6623,11 @@ S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SCpyMsgFpa
 (
- Buffer *srcBuf,
- Buffer **dstBuf
- )
-#else
-S16 SCpyMsgFpa (srcBuf, dstBuf)
-  Buffer *srcBuf;
-  Buffer **dstBuf;
-#endif
+Buffer *srcBuf,
+Buffer **dstBuf
+)
 {
 
   Buffer     *curPtr = NULLP;
@@ -7241,15 +6798,10 @@ S16 SCpyMsgFpa (srcBuf, dstBuf)
  *       File:
  *
  */
-#ifdef ANSI
 S16 SPutFpaMsg
 (
- Buffer *fpaBuf
+Buffer *fpaBuf
 )
-#else
-S16 SPutFpaMsg(fpaBuf)
-Buffer *fpaBuf;
-#endif
 {
   uint16_t      size;
   Buffer   *curBlk;
@@ -7327,7 +6879,6 @@ Buffer *fpaBuf;
 *
 */
 
-#ifdef ANSI
 S16 SCpyPartMsg
 (
 Buffer *srcBuf,
@@ -7335,13 +6886,6 @@ MsgLen idx,
 MsgLen cnt,
 Buffer *dstBuf
 )
-#else
-S16 SCpyPartMsg(srcBuf, idx, cnt, dstBuf)
-Buffer *srcBuf;
-MsgLen idx;
-MsgLen cnt;
-Buffer *dstBuf;
-#endif
 {
    SsMsgInfo *sMinfo;
    SsMsgInfo *dMinfo;
@@ -7493,7 +7037,6 @@ Buffer *dstBuf;
 *
 */
 
-#ifdef ANSI
 S16 SRepPartMsg
 (
 Buffer *srcBuf,
@@ -7501,13 +7044,6 @@ MsgLen idx,
 MsgLen cnt,
 Buffer *dstBuf
 )
-#else
-S16 SRepPartMsg(srcBuf, idx, cnt, dstBuf)
-Buffer *srcBuf;
-MsgLen idx;
-MsgLen cnt;
-Buffer *dstBuf;
-#endif
 {
    SsMsgInfo *sMinfo;
    SsMsgInfo *dMinfo;
@@ -7635,19 +7171,12 @@ Buffer *dstBuf;
 */
 
 
-#ifdef ANSI
 S16 SMovPartMsg
 (
 Buffer *srcBuf,              /* message 1 */
 MsgLen idx,                 /* index */
 Buffer *dstBuf              /* message 2 */
 )
-#else
-S16 SMovPartMsg(srcBuf, idx, dstBuf)
-Buffer *srcBuf;              /* message 1 */
-MsgLen idx;                 /* index */
-Buffer *dstBuf;             /* message 2 */
-#endif
 {
    MsgLen     dCnt;
    MsgLen     sCnt;
@@ -7809,19 +7338,12 @@ Buffer *dstBuf;             /* message 2 */
 *
 */
  
-#ifdef ANSI
 S16 SPkMsgMult
 (
 Data *src,
 MsgLen cnt,
 Buffer *mBuf
 )
-#else
-S16 SPkMsgMult(src, cnt, mBuf)
-Data *src;
-MsgLen cnt;
-Buffer *mBuf;
-#endif
 {
    SsMsgInfo *minfo;   /* Message info */
    Buffer *tmp;
@@ -7920,19 +7442,12 @@ Buffer *mBuf;
 *       File:  ss_msg.c
 *
 */
-#ifdef ANSI
 S16 SGetReadPtr
 (
- Buffer *mBuf, 
- uint8_t** data, 
- MsgLen *len
+Buffer *mBuf, 
+uint8_t** data, 
+MsgLen *len
 )
-#else
-S16 SGetReadPtr (mBuf, data, len)
-Buffer *mBuf; 
-uint8_t** data; 
-MsgLen *len;
-#endif 
 {
 /*   Buffer       *tmp; */
 
@@ -7981,7 +7496,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachPtrToBuf
 (
 Region   region,
@@ -7990,14 +7504,6 @@ Data    *ptr,
 MsgLen   totalLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachPtrToBuf(region, pool, ptr, totalLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-MsgLen   totalLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8091,17 +7597,11 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 static S16 SPutZbcDBuf
 (
 Region region,
 Buffer *buf
 )
-#else
-static S16 SPutZbcDBuf(region, buf)
-Region region;
-Buffer *buf;
-#endif
 #endif
 {
    register SsDblk *dptr;
@@ -8228,7 +7728,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachPtrToMBuf
 (
 Region   region,
@@ -8238,15 +7737,6 @@ MsgLen   totalLen,
 MsgLen   ptrLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachPtrToMBuf(region, pool, ptr, totalLen, ptrLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-MsgLen   totalLen;
-MsgLen   ptrLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8384,7 +7874,6 @@ char* file,
 uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAttachWlsPtrToMBuf
 (
 Region   region,
@@ -8395,16 +7884,6 @@ MsgLen   totalLen,
 MsgLen   ptrLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, totalLen, ptrLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-Data    *readPtr;
-MsgLen   totalLen;
-MsgLen   ptrLen;
-Buffer** mBuf;
-#endif
 #endif
 {
    SsMsgInfo *minfo;   /* Message info */
@@ -8564,7 +8043,6 @@ S16 SDetachDpdkPtrFrmMBuf
 }
 
 
-#ifdef ANSI
 S16 SAttachDpdkPtrToMBuf
 (
 Region   region,
@@ -8575,16 +8053,6 @@ MsgLen   msgLen,
 MsgLen   totalLen,
 Buffer** mBuf
 )
-#else
-S16 SAttachDpdkPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf)
-Region   region;
-Pool     pool;
-Data    *ptr;
-Data    *readPtr;
-MsgLen   msgLen;
-MsgLen   totalLen;
-Buffer** mBuf;
-#endif
 {
 
    SsDblk    *dptr;
index b998e5d..2f9635a 100644 (file)
 *
 */
 
-#ifdef ANSI
 S16 SPkS8
 (
 S8 val,                     /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS8(val, mBuf)
-S8 val;                     /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    ret = SAddPreMsg((Data) val, mBuf);
@@ -127,17 +121,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduUnpackUInt8
 (
 uint8_t val,                     /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt8(val, mBuf)
-uint8_t val;                     /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    ret = SAddPreMsg((Data) val, mBuf);
@@ -164,17 +152,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkS16
 (
 S16 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS16(val, mBuf)
-S16 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data pkArray[2];         /* array for packing */
    S16 ret;                 /* return code */
@@ -211,17 +193,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduUnpackUInt16
 (
 uint16_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt16(val, mBuf)
-uint16_t val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data pkArray[2];         /* array for packing */
    S16 ret;                 /* return code */
@@ -258,17 +234,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkS32
 (
 S32 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkS32(val, mBuf)
-S32 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp;                 /* temporary value */
    Data pkArray[4];         /* packing array */
@@ -314,17 +284,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduUnpackUInt32
 (
 uint32_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduUnpackUInt32(val, mBuf)
-uint32_t val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp;                 /* temporary value */
    Data pkArray[4];         /* packing array */
@@ -371,17 +335,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkF32
 (
 F32 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkF32(val, mBuf)
-F32 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16  ret;                /* return code */
    S8   tmpArray[15];       /* temporary array */
@@ -428,17 +386,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SPkF64
 (
 F64 val,                    /* value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SPkF64(val, mBuf)
-F64 val;                    /* value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    S16  ret;                /* return code */
@@ -486,17 +438,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS8
 (
 S8 *val,                    /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS8(val, mBuf)
-S8 *val;                    /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data tmp;                /* temporary value */
    S16 ret;                 /* return code */
@@ -535,17 +481,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduPackUInt8
 (
 uint8_t *val,                    /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt8(val, mBuf)
-uint8_t *val;                    /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    Data tmp;                /* temporary value */
    S16 ret;                 /* return code */
@@ -583,17 +523,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS16
 (
 S16 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS16(val, mBuf)
-S16 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp16;               /* temporary value */
    Data unpkArray[2];       /* unpacking array */
@@ -641,17 +575,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduPackUInt16
 (
 uint16_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt16(val, mBuf)
-uint16_t *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp16;               /* temporary value */
    Data unpkArray[2];       /* unpacking array */
@@ -699,17 +627,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkS32
 (
 S32 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkS32(val, mBuf)
-S32 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp16;               /* temporary value */
    uint32_t tmp32;               /* temporary value */
@@ -767,17 +689,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 oduPackUInt32
 (
 uint32_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 oduPackUInt32(val, mBuf)
-uint32_t *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    uint16_t tmp16;               /* temporary value */
    uint32_t tmp32;               /* temporary value */
@@ -839,17 +755,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkF32
 (
 F32 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkF32(val, mBuf)
-F32 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    S16 ret;                 /* return code */
    S8 tmpArray[15];         /* temporary array */
@@ -903,17 +813,11 @@ Buffer *mBuf;               /* message buffer */
 *
 */
   
-#ifdef ANSI
 S16 SUnpkF64
 (
 F64 *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 SUnpkF64(val, mBuf)
-F64 *val;                   /* pointer to value */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 
    S16 ret;                 /* return code */
index 91fc301..b7a7cc2 100644 (file)
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SInitQueue
 (
 Queue *q               /* queue */
 )
-#else
-S16 SInitQueue(q)
-Queue *q;              /* queue */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -141,15 +136,10 @@ Queue *q;              /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SFlushQueue
 (
 Queue *q                    /* queue */
 )
-#else
-S16 SFlushQueue(q)
-Queue *q;                   /* queue */
-#endif
 {
    Buffer *tBuf;
    Buffer *mBuf;
@@ -215,19 +205,12 @@ Queue *q;                   /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SCatQueue
 (
 Queue *q1,                  /* queue 1 */
 Queue *q2,                  /* queue 2 */
 Order order                 /* order */
 )
-#else
-S16 SCatQueue(q1, q2, order)
-Queue *q1;                  /* queue 1 */
-Queue *q2;                  /* queue 2 */
-Order order;                /* order */
-#endif
 {
  
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -326,17 +309,11 @@ Order order;                /* order */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SFndLenQueue
 (
 Queue *q,                   /* queue */
 QLen  *lngPtr               /* pointer to length */
 )
-#else
-S16 SFndLenQueue(q, lngPtr)
-Queue *q;                   /* queue */
-QLen  *lngPtr;              /* pointer to length */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -382,19 +359,12 @@ QLen  *lngPtr;              /* pointer to length */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SExamQueue
 (
 Buffer **bufPtr,            /* pointer to buffer */
 Queue  *q,                  /* queue */
 QLen   idx                  /* index */
 )
-#else
-S16 SExamQueue(bufPtr, q, idx)
-Buffer **bufPtr;            /* pointer to buffer */
-Queue  *q;                  /* queue */
-QLen   idx;                 /* index */
-#endif
 {
    Buffer *tmpBuf;
    QLen   i;
@@ -476,19 +446,12 @@ QLen   idx;                 /* index */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SAddQueue
 (
 Buffer *mBuf,                /* buffer */
 Queue  *q,                   /* queue */
 QLen   idx                   /* index */
 )
-#else
-S16 SAddQueue(mBuf, q, idx)
-Buffer *mBuf;                /* buffer */
-Queue  *q;                   /* queue */
-QLen   idx;                  /* index */
-#endif
 {
    Buffer *tBuf;
    QLen   i;
@@ -600,19 +563,12 @@ QLen   idx;                  /* index */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SRemQueue
 (
 Buffer **bufPtr,            /* pointer to buffer */
 Queue  *q,                  /* queue */
 QLen   idx                  /* index */
 )
-#else
-S16 SRemQueue(bufPtr, q, idx)
-Buffer **bufPtr;            /* pointer to buffer */
-Queue  *q;                  /* queue */
-QLen   idx;                 /* index */
-#endif
 {
    Buffer *tBuf;
    QLen   i;
@@ -707,17 +663,11 @@ QLen   idx;                 /* index */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 inline S16 SQueueFirst
 (
 Buffer *buf,                /* buffer */
 Queue *q                    /* queue */
 )
-#else
-inline S16 SQueueFirst(buf, q)
-Buffer *buf;                /* buffer */
-Queue *q;                   /* queue */
-#endif
 {
 
    return (SAddQueue(buf, q, 0));
@@ -745,17 +695,11 @@ Queue *q;                   /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 inline S16 SDequeueFirst
 (
 Buffer **bufPtr,            /* pointer to buffer */
 Queue *q                    /* queue */
 )
-#else
-inline S16 SDequeueFirst(bufPtr, q)
-Buffer **bufPtr;            /* pointer to buffer */
-Queue *q;                   /* queue */
-#endif
 {
 
    return (SRemQueue(bufPtr, q, 0));
@@ -781,17 +725,11 @@ Queue *q;                   /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SQueueLast
 (
 Buffer *buf,                /* buffer */
 Queue *q                    /* queue */
 )
-#else
-S16 SQueueLast(buf, q)
-Buffer *buf;                /* buffer */
-Queue *q;                   /* queue */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -834,17 +772,11 @@ Queue *q;                   /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 SDequeueLast
 (
 Buffer **bufPtr,            /* pointer to buffer */
 Queue *q                    /* queue */
 )
-#else
-S16 SDequeueLast(bufPtr, q)
-Buffer **bufPtr;            /* pointer to buffer */
-Queue *q;                   /* queue */
-#endif
 {
    S16   ret;
 
@@ -888,15 +820,10 @@ Queue *q;                   /* queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssInitDmndQ
 (
 SsDmndQ *dQueue                 /* Demand Queue */
 )
-#else
-S16 ssInitDmndQ(dQueue)
-SsDmndQ *dQueue;                /* Demand Queue */
-#endif
 {
    uint8_t  i;
    S16 ret;
@@ -985,15 +912,10 @@ SsDmndQ *dQueue;                /* Demand Queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssDestroyDmndQ
 (
 SsDmndQ *dQueue                        /* demand Queue */
 )
-#else
-S16 ssDestroyDmndQ(dQueue)
-SsDmndQ *dQueue;                       /* demand Queue */
-#endif
 {
    uint8_t     i;
    Buffer *tBuf;
@@ -1068,7 +990,6 @@ SsDmndQ *dQueue;                       /* demand Queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssDmndQPut
 (
 SsDmndQ *dQueue,                       /* demand Queue */
@@ -1076,13 +997,6 @@ Buffer  *mBuf,                         /* message buffer */
 Prior   priority,                      /* priority */
 Order   order                          /* position */
 )
-#else
-S16 ssDmndQPut(dQueue, mBuf, priority, order)
-SsDmndQ *dQueue;                       /* demand Queue */
-Buffer  *mBuf;                         /* message buffer */
-Prior   priority;                      /* priority */
-Order   order;                         /* position */
-#endif
 {
 #ifndef TENB_RTLIN_CHANGES
    uint8_t     maskIndex;                   /* mask Index */
@@ -1273,15 +1187,10 @@ Order   order;                         /* position */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssDmndQWait
 (
 SsDmndQ *dQueue                          /* demand queue */
 )
-#else
-S16 ssDmndQWait(dQueue)
-SsDmndQ *dQueue;                          /* demand queue */
-#endif
 {
    S16   ret;
 
@@ -1327,19 +1236,12 @@ SsDmndQ *dQueue;                          /* demand queue */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssDmndQGet
 (
 SsDmndQ *dQueue,                          /* demand queue */
 Buffer  **mBuf,                           /* message buffer */
 Order   order                             /* position */ 
 )
-#else
-S16 ssDmndQGet(dQueue, mBuf, order)
-SsDmndQ *dQueue;                          /* demand queue */
-Buffer  **mBuf;                           /* message buffer */
-Order   order;                            /* position */
-#endif
 {
    Queue *queue;
    S16   ret;
@@ -1510,19 +1412,12 @@ setting the crntSize to 0 and removing the message */
 *       File:  ss_queue.c
 *
 */
-#ifdef ANSI
 S16 ssFndLenDmndQ
 (
 SsDmndQ *dQueue,                               /* demand queue */
 Prior   priority,                              /* priority */
 QLen    *len                                   /* queue length */
 )
-#else
-S16 ssFndLenDmndQ(dQueue, priority, len)
-SsDmndQ *dQueue;                               /* demand queue */
-Prior   priority;                              /* priority */
-QLen    *len;                                  /* queue length */
-#endif
 {
    
    S16  ret;                                   /* return value */
index 1da1b38..e10ba41 100755 (executable)
@@ -62,7 +62,6 @@ Desc: Creates Ring Buffer for the given Id.
       Ring Structure is allocated from given 
       Region and Pool
 */
-#ifdef ANSI
 S16 SCreateSRngBuf
 (
 uint32_t id,  
@@ -71,14 +70,6 @@ Pool pool,
 uint32_t elmSize,
 uint32_t rngSize
 )
-#else
-S16 SCreateSRngBuf (id, region, pool, elmSize, rngSize)
-uint32_t id; 
-Region region;
-Pool pool;
-uint32_t elmSize;
-uint32_t rngSize;
-#endif
 {
    SsRngBuf* ring;
 
@@ -149,19 +140,12 @@ Func: SAttachSRngBuf
 Desc: Attach the calling Entity to a ring buffer 
       as consumer(Rx) or producer (Tx)
 */
-#ifdef ANSI
 S16 SAttachSRngBuf
 (
 uint32_t id,  
 uint32_t ent,
 uint32_t txRx
 )
-#else
-S16 SAttachSRngBuf (id, ent, txRx)
-uint32_t id;
-uint32_t ent;
-uint32_t txRx;
-#endif
 {
     /* Retrive Buffer from Global Info Table */
     if( id >= SS_RNG_BUF_MAX)
@@ -203,17 +187,11 @@ Func: SConnectSRngBuf
 Desc: Establish a pipe between producer and consumer
 
 */
-#ifdef ANSI
 S16 SConnectSRngBuf
 (
 uint32_t id,  
 uint32_t rxEnt
 )
-#else
-S16 SConnectSRngBuf (id, rxEnt)
-uint32_t id;
-uint32_t rxEnt;
-#endif
 {
    /* Send to Reciever ENT*/ 
    return ROK; 
@@ -259,17 +237,11 @@ S16 isRngEmpty(uint32_t id)
 Func: SEnqSRngBuf
 Desc: Perform Queue operation on Ring bufer
 */
-#ifdef ANSI
 S16 SEnqSRngBuf 
 (
 uint32_t id, 
 Void* elem
 )
-#else
-S16 SEnqSRngBuf(id,elem) 
-uint32_t id;
-Void* elem;
-#endif
 {
    uint8_t* w_ptr;
    uint8_t i=0;
@@ -300,15 +272,7 @@ Void* elem;
    return ROK;
 }
 
-#ifdef ANSI
-S16 SGetNumElemInRng
-(
-uint32_t id
-)
-#else
-S16 SGetNumElemInRng (id)
-uint32_t id;
-#endif
+S16 SGetNumElemInRng(uint32_t id)
 {
 
    S16 freeDist = (SsRngInfoTbl[id].n_write- SsRngInfoTbl[id].n_read);
@@ -319,17 +283,7 @@ uint32_t id;
 Func: SDeqSRngBuf
 Desc: Perform DeQueue operation on Ring bufer
 */
-#ifdef ANSI
-S16 SDeqSRngBuf
-(
-uint32_t id,
-Void *elem
-)
-#else
-S16 SDeqSRngBuf (id,elem)
-uint8_t id;
-Void *elem;
-#endif
+S16 SDeqSRngBuf(uint32_t id,Void *elem)
 {
    uint8_t* r_ptr;
    uint8_t i=0;
@@ -356,19 +310,12 @@ Void *elem;
    return ROK;
 }
 
-#ifdef ANSI
 S16 SDestroySRngBuf 
 (
 uint32_t id,
 Region region,
 Pool pool
 )
-#else
-S16 SDestroySRngBuf(id, region, pool)
-uint32_t id;
-Region region;
-Pool pool;
-#endif
 {
    /* Retrive Buffer from Id */
    SsRngBuf* ring = SsRngInfoTbl[id].r_addr;
@@ -387,15 +334,7 @@ Pool pool;
    return ROK;
 }
 
-#ifdef ANSI
-S16 SPrintSRngStats
-(
-Void
-)
-#else
-S16 SPrintSRngStats ()
-Void;
-#endif
+S16 SPrintSRngStats(Void)
 {
 uint32_t i; 
 
@@ -461,15 +400,7 @@ uint32_t i;
    return ROK; 
 }
 
-#ifdef ANSI
-Void* SRngGetWIndx
-(
-uint32_t rngId
-)
-#else
-Void* SRngGetWIndx (rngId)
-uint32_t rngId;
-#endif
+Void* SRngGetWIndx(uint32_t rngId)
 {
    /* Retrive Buffer from Id*/
    SsRngBuf* ring  = SsRngInfoTbl[rngId].r_addr;
@@ -484,15 +415,7 @@ uint32_t rngId;
    }
 }
 
-#ifdef ANSI
-Void* SRngGetRIndx
-(
-uint32_t rngId
-)
-#else
-Void* SRngGetRIndx (rngId)
-uint32_t rngId;
-#endif
+Void* SRngGetRIndx(uint32_t rngId)
 {
    /* Retrive Buffer from Id*/
    SsRngBuf* ring  = SsRngInfoTbl[rngId].r_addr;
@@ -507,15 +430,7 @@ uint32_t rngId;
    }
 }
 
-#ifdef ANSI
-Void SRngIncrWIndx
-(
-uint32_t rngId
-)
-#else
-Void SRngIncrWIndx (rngId)
-uint32_t rngId;
-#endif
+Void SRngIncrWIndx(uint32_t rngId)
 {
    uint32_t wrIndex;
    /* Retrive Buffer from Id*/
@@ -526,15 +441,7 @@ uint32_t rngId;
    SsRngInfoTbl[rngId].n_write++;
 }
 
-#ifdef ANSI
-Void SRngIncrRIndx
-(
-uint32_t rngId
-)
-#else
-Void SRngIncrRIndx (rngId)
-uint32_t rngId;
-#endif
+Void SRngIncrRIndx(uint32_t rngId)
 {
    uint32_t rdIndex;
    /* Retrive Buffer from Id*/
index ad3ec52..b4fb65f 100644 (file)
@@ -103,17 +103,11 @@ static struct
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 S16 ssStrmCfg
 (
 Region mdRegId,                 /* region for message and data blocks */
 Region datRegId                 /* region for data buffers */
 )
-#else
-S16 ssStrmCfg(mdRegId, datRegId)
-Region mdRegId;                 /* region for message and data blocks */
-Region datRegId;                /* region for data buffers */
-#endif
 {
 
    strmCfg.mdRegion = mdRegId;
@@ -150,17 +144,11 @@ Region datRegId;                /* region for data buffers */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 S32 ssAdjMsg
 (
 SsMblk *mp,                     /* message */
 S32 len                         /* bytes to remove */
 )
-#else
-S32 ssAdjMsg(mp, len)
-SsMblk *mp;                     /* message */
-S32 len;                        /* bytes to remove */
-#endif
 {
    S32 n;                       /* counter */
    S32 size;                    /* size of mblks of same type as head/tail */
@@ -309,17 +297,11 @@ S32 len;                        /* bytes to remove */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssAllocB
 (
 S32 size,                       /* required size */
 uint32_t pri                         /* message priority */
 )
-#else
-SsMblk *ssAllocB(size, pri)
-S32 size;                       /* required size */
-uint32_t pri;                        /* message priority */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    Data *dat;                   /* pointer to data buffer */
@@ -409,15 +391,10 @@ uint32_t pri;                        /* message priority */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssCopyB
 (
 SsMblk *mp                      /* message block */
 )
-#else
-SsMblk *ssCopyB(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    uint8_t *ptr;                     /* pointer to data */
@@ -477,15 +454,10 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssCopyMsg
 (
 SsMblk *mp                      /* message block */
 )
-#else
-SsMblk *ssCopyMsg(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *first;               /* first mblk in message */
    SsMblk *bp;                  /* mblk for iteration */
@@ -554,15 +526,10 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssDupB
 (
 SsMblk *mp                      /* message block */
 )
-#else
-SsMblk *ssDupB(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    /* ss028.103 - Addition of lock for mBuf reference count */
@@ -649,15 +616,10 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssDupMsg
 (
 SsMblk *mp                      /* message block */
 )
-#else
-SsMblk *ssDupMsg(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *first;               /* first mblk in message */
    SsMblk *bp;                  /* mblk for iteration */
@@ -715,7 +677,6 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssESBAlloc
 (
 uint8_t *base,                       /* client supplied data buffer */
@@ -723,13 +684,6 @@ S32 size,                       /* size of data buffer */
 S32 pri,                        /* message priority */
 SsFrtn *fr_rtn                  /* free routine */
 )
-#else
-SsMblk *ssESBAlloc(base, size, pri, fr_rtn)
-uint8_t *base;                       /* client supplied data buffer */
-S32 size;                       /* size of data buffer */
-S32 pri;                        /* message priority */
-SsFrtn *fr_rtn;                 /* free routine */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    Size m;                      /* mblk + dblk */
@@ -794,15 +748,10 @@ SsFrtn *fr_rtn;                 /* free routine */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 Void ssFreeB
 (
 SsMblk *mp                      /* message block */
 )
-#else
-Void ssFreeB(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    Size size;                   /* mblk + dblk */
@@ -982,15 +931,10 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 Void ssFreeMsg
 (
 SsMblk *mp                      /* message block */
 )
-#else
-Void ssFreeMsg(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
@@ -1020,17 +964,11 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 Void ssLinkB
 (
 SsMblk *mp,                     /* first message block */
 SsMblk *bp                      /* second message block */
 )
-#else
-Void ssLinkB(mp, bp)
-SsMblk *mp;                     /* first message block */
-SsMblk *bp;                     /* second message block */
-#endif
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1070,15 +1008,10 @@ SsMblk *bp;                     /* second message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 S32 ssMsgDSize
 (
 SsMblk *mp                      /* message block */
 )
-#else
-S32 ssMsgDSize(mp)
-SsMblk *mp;                     /* message block */
-#endif
 {
    S32 n;                       /* temporary */
    S32 size;                    /* size of data */
@@ -1120,17 +1053,11 @@ SsMblk *mp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 S32 ssPullupMsg
 (
 SsMblk *mp,                     /* message block */
 S32 len                         /* number of bytes to align */
 )
-#else
-S32 ssPullupMsg(mp, len)
-SsMblk *mp;                     /* message block */
-S32 len;                        /* number of bytes to align */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
    SsMblk *newbp;               /* the new mblk */
@@ -1319,17 +1246,11 @@ S32 len;                        /* number of bytes to align */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssRmvB
 (
 SsMblk *mp,                     /* message */
 SsMblk *bp                      /* message block */
 )
-#else
-SsMblk *ssRmvB(mp, bp)
-SsMblk *mp;                     /* message */
-SsMblk *bp;                     /* message block */
-#endif
 {
    SsMblk *rp;                  /* mblk that will be returned */
 
@@ -1398,17 +1319,11 @@ SsMblk *bp;                     /* message block */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 S32 ssTestB
 (
 S32 size,                       /* size required */
 uint32_t pri                         /* priority of the message buffer */
 )
-#else
-S32 ssTestB(size, pri)
-S32 size;                       /* size required */
-uint32_t pri;                        /* priority of the message buffer */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
@@ -1440,15 +1355,10 @@ uint32_t pri;                        /* priority of the message buffer */
 *       File:  ss_strm.c
 *
 */
-#ifdef ANSI
 SsMblk *ssUnlinkB
 (
 SsMblk *mp                      /* message */
 )
-#else
-SsMblk *ssUnlinkB(mp)
-SsMblk *mp;                     /* message */
-#endif
 {
    SsMblk *bp;                  /* mblk for iteration */
 
index 8a63958..41b856e 100644 (file)
@@ -165,19 +165,12 @@ int          WLS_WakeUp(void* h);
 *
 */
   
-#ifdef ANSI
 S16 SRegInit
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
 PAIFS16 initFnct            /* initialization function */
 )
-#else
-S16 SRegInit(ent, inst, initFnct)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-PAIFS16 initFnct;           /* initialization function */
-#endif
 {
    /* ss021.103 - Addition for return value and pointer */
    S16         ret;     /* return value */
@@ -343,7 +336,6 @@ PAIFS16 initFnct;           /* initialization function */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SRegActvTsk
 (
 Ent ent,                       /* entity */
@@ -352,14 +344,6 @@ Ttype ttype,                   /* task type */
 Prior prior,                   /* task priority */
 ActvTsk actvTsk                /* activate task function */
 )
-#else
-S16 SRegActvTsk(ent, inst, ttype, prior, actvTsk)
-Ent ent;                       /* entity */
-Inst inst;                     /* instance */
-Ttype ttype;                   /* task type */
-Prior prior;                   /* task priority */
-ActvTsk actvTsk;               /* activate task function */
-#endif
 {
    S16 ret;
    SSTskId sTskId;
@@ -572,17 +556,11 @@ ActvTsk actvTsk;               /* activate task function */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SDeregInitTskTmr
 (
 Ent ent,                       /* entity */
 Inst inst                      /* instance */
 )
-#else
-S16 SDeregInitTskTmr(ent, inst)
-Ent ent;                       /* entity */
-Inst inst;                     /* instance */
-#endif
 {
    SsTTskEntry *tTsk;
    SsSTskEntry *sTsk;
@@ -809,7 +787,6 @@ Inst inst;                     /* instance */
 /* ss029.103: modification: procId added */ 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 S16 SRegTTsk
 (
 Ent ent,                        /* entity */
@@ -819,19 +796,8 @@ Prior prior,                    /* task priority */
 PAIFS16 initTsk,                /* initialization function */
 ActvTsk actvTsk                 /* activation function */
 )
-#else
-S16 SRegTTsk(ent, inst, type, prior, initTsk, actvTsk)
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-Ttype type;                     /* task type */
-Prior prior;                    /* task priority */
-PAIFS16 initTsk;                /* initialization function */
-ActvTsk actvTsk;                /* activation function */
-#endif
-
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SRegTTsk
 (
 ProcId proc,                    /* processor */
@@ -842,17 +808,6 @@ Prior prior,                    /* task priority */
 PAIFS16 initTsk,                /* initialization function */
 ActvTsk actvTsk                 /* activation function */
 )
-#else
-S16 SRegTTsk(proc, ent, inst, type, prior, initTsk, actvTsk)
-ProcId proc;                    /* processor */
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-Ttype type;                     /* task type */
-Prior prior;                    /* task priority */
-PAIFS16 initTsk;                /* initialization function */
-ActvTsk actvTsk;                /* activation function */
-#endif
-
 #endif /* SS_MULTIPLE_PROCS */
 
 {
@@ -1129,23 +1084,14 @@ ActvTsk actvTsk;                /* activation function */
 *
 **/
 #ifndef SS_MULTIPLE_PROCS
-#ifdef ANSI
 S16 SRegCbTsk
 (
 Ent ent,                        /* entity */
 Inst inst,                      /* instance */
 ActvTsk cbTsk                   /* Callback Function */
 )
-#else
-S16 SRegCbTsk(ent, inst, cbTsk)
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-ActvTsk cbTsk;
-#endif
-
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SRegCbTsk 
 (
 ProcId proc,                    /* processor */
@@ -1153,13 +1099,6 @@ Ent ent,                        /* entity */
 Inst inst,                       /* instance */
 ActvTsk cbTsk 
 )
-#else
-S16 SRegCbTsk(proc, ent, inst, cbTsk)
-ProcId proc;                    /* processor */
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-ActvTsk cbTsk;
-#endif
 #endif /* SS_MULTIPLE_PROCS */
 {
    SsTTskEntry *tTsk;
@@ -1253,33 +1192,19 @@ ActvTsk cbTsk;
 /* ss029.103: addition: procId added */ 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 S16 SDeregTTsk
 (
 Ent ent,                        /* entity */
 Inst inst                       /* instance */
 )
-#else
-S16 SDeregTTsk(ent, inst)
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-#endif
-
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SDeregTTsk
 (
 ProcId proc,                    /* processor */
 Ent ent,                        /* entity */
 Inst inst                       /* instance */
 )
-#else
-S16 SDeregTTsk(proc, ent, inst)
-ProcId proc;                    /* processor */
-Ent ent;                        /* entity */
-Inst inst;                      /* instance */
-#endif
 #endif /* SS_MULTIPLE_PROCS */
 {
    S16          ret;
@@ -1548,17 +1473,11 @@ Inst inst;                      /* instance */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SCreateSTsk
 (
 SSTskPrior tskPrior,            /* task priority */
 SSTskId *tskId                  /* filled in with system task ID */
 )
-#else
-S16 SCreateSTsk(tskPrior, tskId)
-SSTskPrior tskPrior;            /* task priority */
-SSTskId *tskId;                 /* filled in with system task ID */
-#endif
 {
    S16 ret;
    SsSTskEntry *sTsk;
@@ -1803,7 +1722,6 @@ SSTskId *tskId;                 /* filled in with system task ID */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SRegLogCfg
 (
 uint8_t mode,
@@ -1812,14 +1730,6 @@ uint32_t size,
 S8 *IPA,
 uint16_t port
 )
-#else
-S16 SRegLogCfg(mode, path, size, IPA, port)
-uint8_t mode;
-S8 *path;
-uint32_t size;
-S8 *IPA;
-uint16_t port
-#endif
 {
 
 #ifdef WIN32
@@ -1966,15 +1876,7 @@ uint16_t port
 *       File:  ss_task.c
 *
 --*/
-#ifdef ANSI
-S16 SFlushBufToLog 
-(
-S8 *logBuf
-)
-#else
-S16 SFlushBufToLog(logBuf)
-S8 *logBuf
-#endif
+S16 SFlushBufToLog (S8 *logBuf)
 {
    S8 *buffer;
    static uint16_t logFileCnt = 0;
@@ -2037,14 +1939,7 @@ S8 *logBuf
 *       File:  ss_task.c
 *
 --*/
-#ifdef ANSI
-S16 SCleanUp
-(
-Void
-)
-#else
-S16 SCleanUp()
-#endif
+S16 SCleanUp(Void)
 {
 
    /*Flush the remaining data in the log file*/
@@ -2098,13 +1993,7 @@ S16 SCleanUp()
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
-S16 SDeregLogCfg
-(
-)
-#else
 S16 SDeregLogCfg()
-#endif
 {
 
 
@@ -2128,14 +2017,7 @@ S16 SDeregLogCfg()
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
-Void SStartLogger
-(
-void
-)
-#else
-Void SStartLogger()
-#endif
+Void SStartLogger(void)
 {
        if (osCp.logger.configured == TRUE)
        {
@@ -2157,14 +2039,7 @@ Void SStartLogger()
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
-Void SStopLogger
-(
-void
-)
-#else
-Void SStopLogger()
-#endif
+Void SStopLogger(void)
 {
    osCp.logger.started = FALSE;
 }
@@ -2190,15 +2065,10 @@ Void SStopLogger()
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SRegCpuInfo 
 (
 SCpuInfo *cpuInfo    /* Information about the cores/threads per core */
 )
-#else
-S16 SRegCpuInfo (cpuInfo)
-SCpuInfo *cpuInfo;  /* Information about the cores/threads per core */
-#endif
 {
    uint32_t coreCount = 0;
 
@@ -2253,17 +2123,11 @@ SCpuInfo *cpuInfo;  /* Information about the cores/threads per core */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SGetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
 uint32_t *coreId                      /* the core/processor id to which the affinity is set */
 )
-#else
-S16 SGetAffinity(tskId, coreId)
-SSTskId *tskId;                 /* filled in with system task ID */
-uint32_t *coreId;                    /* the core/processor id to which the affinity is set */
-#endif
 {
    S16 ret;
 
@@ -2297,7 +2161,6 @@ uint32_t *coreId;                    /* the core/processor id to which the affin
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SSetAffinity
 (
 SSTskId *tskId,                  /* filled in with system task ID */
@@ -2305,13 +2168,6 @@ SsAffinityMode mode,             /* the mode according to which the affinty is s
 uint32_t coreId,                      /* the core/processor id to which the affinity has to be set */
 SSTskId *tskAssociatedTskId      /* filled in with system task ID of the associated layer */
 )
-#else
-S16 SSetAffinity(tskId, mode, coreId, tskAssociatedTskId)
-SSTskId *tskId;                 /* filled in with system task ID */
-SsAffinityMode mode;            /* the mode according to which the affinty is set */
-uint32_t coreId;                     /* the core/processor id to which the affinity has to be set */
-SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associated layer */
-#endif
 {
    S16 ret;
   
@@ -2634,15 +2490,10 @@ SSTskId *tskAssociatedTskId;    /* filled in with system task ID of the associat
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SDestroySTsk
 (
 SSTskId tskId                   /* system task to be destroyed */
 )
-#else
-S16 SDestroySTsk(tskId)
-SSTskId tskId;                  /* system task to be destroyed */
-#endif
 {
    S16 ret;
    /* ss029.103: modification: the subscript should be of same type */
@@ -2947,23 +2798,15 @@ SSTskId tskId;                  /* system task to be destroyed */
 /* ss029.103: addition: procId added */ 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 S16 SAttachTTsk
 (
 Ent ent,                        /* entity ID of the task */
 Inst inst,                      /* instance ID of the task */
 SSTskId sTskId                  /* system task to use */
 )
-#else
-S16 SAttachTTsk(ent, inst, sTskId)
-Ent ent;                        /* entity ID of the task */
-Inst inst;                      /* instance ID of the task */
-SSTskId sTskId;                 /* system task to use */
-#endif
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SAttachTTsk
 (
 ProcId proc,                    /* processor ID of the task */
@@ -2971,16 +2814,7 @@ Ent ent,                        /* entity ID of the task */
 Inst inst,                      /* instance ID of the task */
 SSTskId sTskId                  /* system task to use */
 )
-#else
-S16 SAttachTTsk(proc, ent, inst, sTskId)
-ProcId proc;                    /* processor ID of the task */
-Ent ent;                        /* entity ID of the task */
-Inst inst;                      /* instance ID of the task */
-SSTskId sTskId;                 /* system task to use */
-#endif
-
 #endif /* SS_MULTIPLE_PROCS */
-
 {
    S16 ret;
    S16 i;
@@ -3410,33 +3244,20 @@ SSTskId sTskId;                 /* system task to use */
 /* ss029.103: addition: procId added */ 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 S16 SDetachTTsk
 (
 Ent ent,                        /* entity ID of the task */
 Inst inst                       /* instance ID of the task */
 )
-#else
-S16 SDetachTTsk(ent, inst)
-Ent ent;                        /* entity ID of the task */
-Inst inst;                      /* instance ID of the task */
-#endif
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SDetachTTsk
 (
 ProcId proc,                    /* processor ID of the task */
 Ent ent,                        /* entity ID of the task */
 Inst inst                       /* instance ID of the task */
 )
-#else
-S16 SDetachTTsk(proc, ent, inst)
-ProcId proc;                    /* processor ID of the task */
-Ent ent;                        /* entity ID of the task */
-Inst inst;                      /* instance ID of the task */
-#endif
 
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -3744,17 +3565,11 @@ Inst inst;                      /* instance ID of the task */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SPstTsk
 (
 Pst *pst,                       /* post information */
 Buffer *mBuf                    /* message to post */
 )
-#else
-S16 SPstTsk(pst, mBuf)
-Pst *pst;                       /* post information */
-Buffer *mBuf;                   /* message to post */
-#endif
 {
    S16 r;
    S16 i;
@@ -4392,15 +4207,10 @@ Buffer *mBuf;                   /* message to post */
 */
 /* ss029.103: modification: procId added */
 
-#ifdef ANSI
 S16 SGetTapaTskEntIds
 (
 Ent *ent                        /* entity */
 )
-#else
-S16 SGetTapaTskEntIds(ent)
-Ent *ent;                        /* entity */
-#endif
 {
 
    uint32_t tskCnt = 0;
@@ -4432,15 +4242,10 @@ Ent *ent;                        /* entity */
 */
 /* ss029.103: modification: procId added */
 
-#ifdef ANSI
 S16 SRegForHstGrm
 (
 Ent ent                        /* entity */
 )
-#else
-S16 SRegForHstGrm(ent)
-Ent ent;                        /* entity */
-#endif
 {
 
    uint32_t tskCnt = 0;
@@ -4494,17 +4299,11 @@ Ent ent;                        /* entity */
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
 S16 SGetHstGrmInfo
 (
 Ent   *entId,
 Bool  *hstReg                        /* entity */
 )
-#else
-S16 SGetHstGrmInfo(entId, hstReg)
-Ent   *entId;
-Bool  *hstReg;                        /* entity */
-#endif
 {
 
    uint32_t tskCnt = 0;
@@ -4533,20 +4332,11 @@ Bool  *hstReg;                        /* entity */
 #endif /* SS_HISTOGRAM_SUPPORT */
 
 #ifdef SS_WATCHDOG
-#ifdef ANSI
-S16 SInitWatchdog
-(
-uint16_t port
-)
-#else
-S16 SInitWatchdog(port)
-uint16_t port;
-#endif
+S16 SInitWatchdog(uint16_t port)
 {
  return ssdInitWatchDog(port);
 }
 
-#ifdef ANSI
 S16 SRegCfgWd
 (
 uint32_t numNodes,
@@ -4556,15 +4346,6 @@ uint32_t timeout,
 WdUserCallback callback,
 void *data
 )
-#else
-S16 SRegCfgWd(numNodes, addr, port, timeout, callback, data)
-uint32_t numNodes;
-uint8_t  *addr[];
-uint16_t port[];
-uint32_t timeout;
-WdUserCallback callback;
-void *data;
-#endif
 {
    Txt prntBuf[PRNTSZE];
    int i = 0;
@@ -4602,15 +4383,7 @@ void *data;
    return ROK;
 }
 
-#ifdef ANSI
-S16 SDeregCfgWd
-(
-void
-)
-#else
 S16 SDeregCfgWd(void)
-void;
-#endif
 {
    Txt prntBuf[PRNTSZE];
    int i = 0;
@@ -4640,15 +4413,10 @@ void;
    return ROK;
 }
 
-#ifdef ANSI
 S16 SStartHrtBt
 (
 uint8_t timeInterval /* time interval */
 )
-#else
-S16 SStartHrtBt(timeInterval)
-uint8_t timeInterval;
-#endif
 {
 
    ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval);
@@ -4657,15 +4425,7 @@ uint8_t timeInterval;
    return ROK;
 }
 
-#ifdef ANSI
-S16 SStopHrtBt
-(
-void
-)
-#else
-S16 SStopHrtBt()
-void
-#endif
+S16 SStopHrtBt(void)
 {
 
    osCp.wdCp.globWd.watchdogStop = 1;
@@ -4673,17 +4433,11 @@ void
    return ROK;
 }
 
-#ifdef ANSI
 S16 watchDgActvTsk
 (
 Pst *pst,                   /* post */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 watchDgActvTsk(pst, mBuf)
-Pst *pst;                   /* post */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 /* ss002.301 Fixed warnings */
 #ifdef DEBUGP
@@ -4700,17 +4454,11 @@ Buffer *mBuf;               /* message buffer */
        return ROK;
 }
 
-#ifdef ANSI
 S16 watchDgRcvrActvTsk
 (
 Pst *pst,                   /* post */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 watchDgRcvrActvTsk(pst, mBuf)
-Pst *pst;                   /* post */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
 #ifdef DEBUGP
    DateTime dt;
@@ -4807,7 +4555,6 @@ Buffer *mBuf;               /* message buffer */
 *
 */
 #ifdef SS_MULTIPLE_PROCS
-#ifdef ANSI
 S16 SGetThrdProf
 (
 SSTskId *sTskId,
@@ -4819,17 +4566,6 @@ uint32_t *curEvtTime,
 uint64_t *totTime
 )
 #else
-S16 SGetThrdProf(sTskId, procId, ent, inst, evnt, curEvent, curEvtTime, totTime)
-SSTskId *sTskId;
-ProcId procId;
-Ent ent;                      /* entity */
-Inst inst;
-Event *curEvent;
-uint32_t *curEvtTime;
-uint64_t *totTime;
-#endif
-#else
-#ifdef ANSI
 S16 SGetThrdProf
 (
 SSTskId *sTskId,
@@ -4839,15 +4575,6 @@ Event *curEvent,
 uint32_t *curEvtTime,
 uint64_t *totTime
 )
-#else
-S16 SGetThrdProf(sTskId, ent, inst, curEvent,curEvtTime, totTime)
-SSTskId *sTskId;
-Ent ent;                      /* entity */
-Inst inst;
-Event *curEvent;
-uint32_t *curEvtTime;
-uint64_t *totTime;
-#endif
 #endif /* SS_MULTIPLE_PROCS */
 {
   S16 ret;
@@ -4929,15 +4656,7 @@ uint64_t *totTime;
 *       File:  ss_task.c
 *
 */
-#ifdef ANSI
-S16 SRegTskInfo
-(
-uint8_t *cfgFile
-)
-#else
-S16 SRegTskInfo(cfgFile)
-uint8_t *cfgFile;
-#endif
+S16 SRegTskInfo(uint8_t *cfgFile)
 {
    return cmCfgrTskReg(cfgFile); 
 }
index 21013e5..ccce3ce 100644 (file)
@@ -145,7 +145,6 @@ static S16 STmrDeregHndlr ARGS((
 */
 /* ss029.103: addition: procId added and timer function type modified */ 
 #ifndef SS_MULTIPLE_PROCS
-#ifdef ANSI
 S16 SRegCfgTmr
 (
 Ent ent,                    /* entity */
@@ -154,14 +153,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function, typically SActvTmr */
 )
-#else
-S16 SRegCfgTmr(ent, inst, period, units, tmrFnct)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PFS16 tmrFnct;              /* timer function, typically SActvTmr */
-#endif
 {
    S16 ret;
    /* ss015.301 - Enclosed all timer activation functions in a union. */
@@ -177,7 +168,6 @@ PFS16 tmrFnct;              /* timer function, typically SActvTmr */
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SRegCfgTmr
 (
 ProcId proc,                /* processor */
@@ -187,16 +177,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function, typically SActvTmr */
 )
-#else
-S16 SRegCfgTmr(proc, ent, inst, period, units, tmrFnct)
-ProcId proc;                /* processor */
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
-#endif
-
 {
    S16 ret;
    /* ss015.301 - Enclosed all timer activation functions in a union. */
@@ -235,7 +215,6 @@ PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
 *       File:  ss_timer.c
 *
 */
-#ifdef ANSI
 S16 SRegCfgTmrMt
 (
 Ent ent,                    /* entity */
@@ -244,14 +223,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt        /* timer function, typically SActvTmr */
 )
-#else
-S16 SRegCfgTmrMt(ent, inst, period, units, tmrFnctMt)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PAIFTMRS16 tmrFnctMt;       /* timer function, typically SActvTmr */
-#endif
 {
    S16 ret;
    /* ss015.301 - Enclosed all timer activation functions in a union. */
@@ -291,7 +262,6 @@ PAIFTMRS16 tmrFnctMt;       /* timer function, typically SActvTmr */
 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 static S16 STmrRegHndlr
 (
 Ent ent,                    /* entity */
@@ -300,21 +270,12 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn               /* timer function, typically SActvTmr */
 )
-#else
-static S16 STmrRegHndlr(ent, inst, period, units, ssTmrActvFn)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-SsTmrActvFn ssTmrActvFn;              /* timer function, typically SActvTmr */
-#endif
 /* ss015.301: Removed the timer handler prototypes guarded
  * under SS_MT_TMR and handled mtFlag in existing timer handlers.
  */
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 static S16 STmrRegHndlr
 (
 ProcId proc,                /* processor */
@@ -324,16 +285,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn     /* timer function */
 )
-#else
-static S16 STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn)
-ProcId proc;                /* processor */
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-SsTmrActvFn ssTmrActvFn;         /* timer function */
-#endif
-
 #endif /* SS_MULTIPLE_PROCS */
 {
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -616,7 +567,6 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 /* ss029.103: addition: procId added and timer function type modified */ 
 #ifndef SS_MULTIPLE_PROCS
 
-#ifdef ANSI
 S16 SDeregCfgTmr
 (
 Ent ent,                    /* entity */
@@ -625,14 +575,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function */
 )
-#else
-S16 SDeregCfgTmr(ent, inst, period, units, tmrFnct)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PFS16 tmrFnct;              /* timer function */
-#endif
 {
    S16 ret;
    /* ss015.301 Enclosed all timer activation functions in a union. */
@@ -648,7 +590,6 @@ PFS16 tmrFnct;              /* timer function */
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 S16 SDeregCfgTmr
 (
 ProcId proc,                /* processor */
@@ -658,15 +599,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function */
 )
-#else
-S16 SDeregCfgTmr(proc, ent, inst, period, units, tmrFnct)
-ProcId proc;                /* processor */
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PAIFTMRS16 tmrFnct;              /* timer function */
-#endif
 {
    S16 ret;
    /* ss015.301 Enclosed all timer activation functions in a union. */ 
@@ -701,7 +633,6 @@ PAIFTMRS16 tmrFnct;              /* timer function */
 *       File:  ss_timer.c
 *
 */
-#ifdef ANSI
 S16 SDeregCfgTmrMt
 (
 Ent ent,                    /* entity */
@@ -710,14 +641,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt               /* timer function */
 )
-#else
-S16 SDeregCfgTmrMt(ent, inst, period, units, tmrFnctMt)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-PAIFTMRS16 tmrFnctMt;              /* timer function */
-#endif
 {
    S16 ret;
    /* ss015.301 Enclosed all timer activation functions in a union. */
@@ -755,7 +678,6 @@ PAIFTMRS16 tmrFnctMt;              /* timer function */
  * functions are enclosed in a union.
  */
 #ifndef SS_MULTIPLE_PROCS
-#ifdef ANSI
 static S16 STmrDeregHndlr
 (
 Ent ent,                    /* entity */
@@ -764,24 +686,12 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn           /* timer function */
 )
-#else
-/* ss017.301: Modified the prototype of STmrDeregHndlr for Non-ANSI
- * compilation.
- */
-static S16 STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn)
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-SsTmrActvFn ssTmrActvFn;          /* timer function */
-#endif
 /* ss015.301: Removed the timer handler prototypes guarded under SS_MT_TMR
  * and handled mtFlag in existing timer handlers.
  */
 
 #else /* SS_MULTIPLE_PROCS */
 
-#ifdef ANSI
 static S16 STmrDeregHndlr
 (
 ProcId proc,                /* processor */
@@ -791,15 +701,6 @@ S16 period,                 /* period */
 S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn          /* timer function */
 )
-#else
-static S16 STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn)
-ProcId proc;                /* processor */
-Ent ent;                    /* entity */
-Inst inst;                  /* instance */
-S16 period;                 /* period */
-S16 units;                  /* period units*/
-SsTmrActvFn ssTmrActvFn;         /* timer function */
-#endif
 
 #endif /* SS_MULTIPLE_PROCS */
 {
diff --git a/src/o1/Alarm.hpp b/src/o1/Alarm.hpp
new file mode 100644 (file)
index 0000000..ced49d0
--- /dev/null
@@ -0,0 +1,194 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains Alarm class defining Netconf Yang based alarm fields */
+
+#ifndef __ALARM_HPP__
+#define __ALARM_HPP__
+
+#include <string>
+#include <string.h>
+#include "Alarm.h"
+
+using std::string; 
+
+
+class Alarm
+{
+
+   private:
+   EventType mEventType;
+   string mObjectClassObjectInstance;
+   uint16_t mAlarmId;
+   string mAlarmRaiseTime;
+   string mAlarmChangeTime;
+   string mAlarmClearTime;
+   string mProbableCause;
+   SeverityLevel mPerceivedSeverity;
+   string mRootCauseIndicator; 
+   string mAdditionalText;
+   string mAdditionalInfo;
+   string mSpecificProblem;
+
+   public:
+   Alarm(){};
+   ~Alarm(){};
+   /* Getter functions */
+   inline const EventType& getEventType()const 
+   { 
+      return mEventType; 
+   }
+   inline const string& getObjectClassObjectInstance()const 
+   { 
+      return mObjectClassObjectInstance; 
+   }
+   inline const uint16_t& getAlarmId()const 
+   { 
+      return mAlarmId; 
+   }
+   inline const string& getAlarmRaiseTime()const 
+   { 
+      return mAlarmRaiseTime; 
+   }
+   inline const string& getAlarmChangeTime()const 
+   { 
+      return mAlarmChangeTime; 
+   }
+   inline const string& getAlarmClearTime()const 
+   { 
+      return mAlarmClearTime; 
+   }
+   inline const string& getProbableCause()const 
+   { 
+      return mProbableCause; 
+   }
+   inline const SeverityLevel getPerceivedSeverity()const 
+   { 
+      return mPerceivedSeverity; 
+   }
+   inline const string getRootCauseIndicator()const 
+   { 
+      return mRootCauseIndicator; 
+   }
+   inline const string getAdditionalText()const 
+   { 
+      return mAdditionalText; 
+   }
+   inline const string getAdditionalInfo()const 
+   { 
+      return mAdditionalInfo; 
+   }
+   inline const string getSpecificProblem()const 
+   { 
+      return mSpecificProblem; 
+   }
+   
+   /* Setter functions */
+   inline void setEventType(const EventType& eventType) 
+   { 
+      mEventType = eventType; 
+   }
+   inline void setObjectClassObjectInstance(const string& objectClassObjectInstance )
+   { 
+      mObjectClassObjectInstance = objectClassObjectInstance; 
+   }
+   inline void setObjectClassObjectInstance(const char* objectClassObjectInstance )
+   { 
+      mObjectClassObjectInstance = objectClassObjectInstance; 
+   }
+   inline void setAlarmId(const uint16_t& alarmId) 
+   {  
+      mAlarmId = alarmId; 
+   }
+   inline void setAlarmRaiseTime(const string& alarmRaiseTime) 
+   { 
+      mAlarmRaiseTime = alarmRaiseTime; 
+   }
+   inline void setAlarmRaiseTime(const char* alarmRaiseTime)
+   { 
+      mAlarmRaiseTime = alarmRaiseTime; 
+   }
+   inline void setAlarmChangeTime(const string& alarmChangeTime) 
+   { 
+      mAlarmChangeTime = alarmChangeTime; 
+   }
+   inline void setAlarmChangeTime(const char* alarmChangeTime) 
+   { 
+      mAlarmChangeTime = alarmChangeTime; 
+   }
+   inline void setAlarmClearTime(const string& alarmClearTime) 
+   { 
+      mAlarmClearTime = alarmClearTime; 
+   }
+   inline void setAlarmClearTime(const char* alarmClearTime) 
+   { 
+      mAlarmClearTime = alarmClearTime; 
+   }
+   inline void setProbableCause(const string& probableCause) 
+   { 
+      mProbableCause = probableCause; 
+   }
+   inline void setProbableCause(const char* probableCause) 
+   { 
+      mProbableCause = probableCause; 
+   }
+   inline void setPerceivedSeverity(const SeverityLevel& perceivedSeverity) 
+   { 
+      mPerceivedSeverity = perceivedSeverity; 
+   }
+   inline void setRootCauseIndicator(const string& rootCauseIndicator) 
+   { 
+      mRootCauseIndicator = rootCauseIndicator; 
+   }
+   inline void setRootCauseIndicator(const char* rootCauseIndicator) 
+   { 
+      mRootCauseIndicator = rootCauseIndicator; 
+   }
+   inline void setAdditionalText(const string& additionalText) 
+   { 
+      mAdditionalText = additionalText; 
+   }
+   inline void setAdditionalText(const char* additionalText) 
+   { 
+      mAdditionalText = additionalText; 
+   }
+   inline void setAdditionalInfo(const string& additionalInfo) 
+   { 
+      mAdditionalInfo = additionalInfo; 
+   }
+   inline void setAdditionalInfo(const char* additionalInfo) 
+   { 
+      mAdditionalInfo = additionalInfo; 
+   }
+   inline void setSpecificProblem(const string& specificProblem) 
+   { 
+      mSpecificProblem = specificProblem; 
+   }
+   inline void setSpecificProblem(const char* specificProblem) 
+   { 
+      mSpecificProblem = specificProblem; 
+   }
+  
+
+};
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/Alarm3GPPYangModel.cpp b/src/o1/Alarm3GPPYangModel.cpp
new file mode 100644 (file)
index 0000000..42915a5
--- /dev/null
@@ -0,0 +1,84 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains Alarm Yang model data filling and sending related methods */
+
+#include "Alarm3GPPYangModel.hpp"
+
+using namespace std;
+
+
+/********************************************************************** 
+   Description : It is a callback function, called on get request of
+                 alarm-list (overridden function of sysrepo::Callback )
+   Params[In]  : (sysrepo::S_Session, module_name, path,
+                 request_xpath, request_id, &parent, private_data)
+   Return      : SR_ERR_OK - success
+**********************************************************************/
+
+int Alarm3GPPYangModel::oper_get_items(sysrepo::S_Session session,
+                                       const char         *module_name,
+                                       const char         *path,
+                                       const char         *request_xpath,
+                                       uint32_t           request_id,
+                                       libyang::S_Data_Node &parent,
+                                       void *private_data) 
+{
+    O1_LOG("\n\n ========== CALLBACK CALLED TO PROVIDE \" %s DATA ==========\n", path); 
+
+    libyang::S_Context ctx = session->get_context();
+    libyang::S_Module mod = ctx->get_module(module_name);
+
+    parent.reset(new libyang::Data_Node(ctx, ALARM_MODULE_PATH_3GPP, nullptr, LYD_ANYDATA_CONSTSTRING, 0));
+    //read the data from map
+    //tree of alarmRecord  : AlarmList/AlarmListGrp/alarmRecordList/AlarmRecordGrp
+
+    libyang::S_Data_Node alarms(new libyang::Data_Node(parent, mod, "AlarmList"));
+    libyang::S_Data_Node alarm(new libyang::Data_Node(alarms, mod, "AlarmListGrp"));
+    libyang::S_Data_Node ifc3(new libyang::Data_Node(parent, mod, "alarmRecordList"));
+    libyang::S_Data_Node ifc4(new libyang::Data_Node(ifc3, mod, "AlarmRecordGrp"));
+    
+
+    libyang::S_Data_Node id;
+    libyang::S_Data_Node text;
+    libyang::S_Data_Node severity;
+    libyang::S_Data_Node status;
+    libyang::S_Data_Node add_info;
+
+    //read the data from map
+    map<uint16_t,Alarm>::const_iterator it;
+
+    AlarmManager& alrmMgr = AlarmManager::instance();
+    const map<uint16_t,Alarm>& alrmList = alrmMgr.getAlarmList();
+
+    for(it = alrmList.begin(); it !=alrmList.end(); it++)
+    {
+        O1_LOG("\nAlarm ID %hu", it->second.getAlarmId());
+        alarm.reset(new libyang::Data_Node(alarms, mod, "alarm"));
+        id.reset(new libyang::Data_Node(alarm, mod, "alarm-id", to_string(it->second.getAlarmId()).c_str()));
+        text.reset(new libyang::Data_Node(alarm, mod, "alarm-text", it->second.getAdditionalText().c_str()));
+        severity.reset(new libyang::Data_Node(alarm, mod, "severity", to_string(it->second.getEventType()).c_str()));
+        status.reset(new libyang::Data_Node(alarm, mod, "status", it->second.getSpecificProblem().c_str()));
+        add_info.reset(new libyang::Data_Node(alarm, mod, "additional-info", it->second.getAdditionalInfo().c_str()));
+    }
+    return SR_ERR_OK;
+}
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/Alarm3GPPYangModel.hpp b/src/o1/Alarm3GPPYangModel.hpp
new file mode 100644 (file)
index 0000000..01c2363
--- /dev/null
@@ -0,0 +1,48 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains Alarm Yang model data filling and sending related methods */
+
+#ifndef __ALARM_3GPP_YANG_MODEL_HPP__
+#define __ALARM_3GPP_YANG_MODEL_HPP__
+
+/*#include <string.h>
+#include <stdlib.h>
+#include "sysrepo-cpp/Session.hpp"
+#include "AlarmManager.hpp"
+#include "GlobalDefs.hpp"
+*/
+
+#include "AlarmOranYangModel.hpp"
+
+class Alarm3GPPYangModel:public sysrepo::Callback {
+   public:
+      int oper_get_items(sysrepo::S_Session session,\
+                         const char *module_name,\
+                         const char *path,\
+                         const char *request_xpath,\
+                         uint32_t request_id,\
+                         libyang::S_Data_Node &parent,\
+                         void *private_data) override;
+};
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/AlarmManager.cpp b/src/o1/AlarmManager.cpp
new file mode 100644 (file)
index 0000000..3ed8aca
--- /dev/null
@@ -0,0 +1,103 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains AlarmManager singleton class which is responsible for 
+   storing and managing alarms. 
+*/ 
+
+#include <iostream>
+#include "AlarmManager.hpp"
+
+using std::pair;
+
+/* Default constructor */
+AlarmManager::AlarmManager()
+{
+
+}
+
+/* Destructor */
+AlarmManager::~AlarmManager()
+{
+
+}
+
+
+
+/********************************************************************** 
+   Description : Raise an Alarm and store it in alarm list
+   Params[In]  : Alarm
+   Return      : true  - insert in map successful
+                 false - insert in map unsuccessful 
+**********************************************************************/
+bool AlarmManager::raiseAlarm(const Alarm& alarm)
+{
+   pair<map<uint16_t,Alarm>::iterator,bool> ret;
+   ret = mAlarmList.insert(pair<uint16_t,Alarm>(alarm.getAlarmId(),alarm));
+   return ret.second;
+}
+
+
+
+/********************************************************************** 
+   Description : Clear an Alarm and delete it from alarm list 
+   Params[In]  : Alarm instance
+   Return      : true  - delete successful
+                 false - delete unsuccessful 
+**********************************************************************/
+bool AlarmManager::clearAlarm(const Alarm& alarm)
+{
+   map<uint16_t,Alarm>::iterator it;
+   bool ret = false;
+   it = mAlarmList.find(alarm.getAlarmId());
+   if( it != mAlarmList.end() )
+   {
+      mAlarmList.erase(it);
+      ret = true;
+   }    
+   return ret;
+}
+
+
+/********************************************************************** 
+   Description : Clear an Alarm and delete it from alarm list with
+                 alarmId 
+   Params[In]  : Alarm Id
+   Return      : true  - delete successful
+                 false - delete unsuccessful 
+**********************************************************************/
+bool AlarmManager::clearAlarm(const uint16_t& alarmId)
+{
+   return (mAlarmList.erase(alarmId) > 0);
+}
+
+
+/********************************************************************** 
+   Description : Return the list of active alarms
+   Params[In]  : None
+   Return      : constant reference to the map<int, Alarm> 
+**********************************************************************/
+const map<uint16_t, Alarm>& AlarmManager::getAlarmList()const
+{
+   return mAlarmList;
+}
+
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/AlarmManager.hpp b/src/o1/AlarmManager.hpp
new file mode 100644 (file)
index 0000000..a30fa9a
--- /dev/null
@@ -0,0 +1,58 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains AlarmManager singleton class responsible for 
+   storing and managing alarms. 
+*/ 
+
+#ifndef __ALARM_MANAGER_HPP__
+#define __ALARM_MANAGER_HPP__
+
+#include <map>
+#include "Alarm.hpp"
+#include "Singleton.hpp"
+
+using std::map;
+
+
+class AlarmManager : public Singleton<AlarmManager>
+{
+
+   friend Singleton<AlarmManager>;
+
+   private:
+   map<uint16_t,Alarm> mAlarmList;         
+
+   protected:
+   AlarmManager();    
+   ~AlarmManager();
+
+   public:
+   bool raiseAlarm(const Alarm& alarm);
+   bool clearAlarm(const uint16_t& alarmId);
+   bool clearAlarm(const Alarm& alarm );
+   const map<uint16_t, Alarm>& getAlarmList()const;
+
+};
+
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/AlarmOranYangModel.cpp b/src/o1/AlarmOranYangModel.cpp
new file mode 100644 (file)
index 0000000..fba9f57
--- /dev/null
@@ -0,0 +1,81 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains Alarm Yang model data filling and sending related methods */
+
+#include "AlarmOranYangModel.hpp"
+
+using namespace std;
+
+/********************************************************************** 
+   Description : It is a callback function, called on get request of
+                 alarm-list (overridden function of sysrepo::Callback )
+   Params[In]  : (sysrepo::S_Session, module_name, path, 
+                 request_xpath, request_id, &parent, private_data)
+   Return      : SR_ERR_OK - success
+**********************************************************************/
+
+int AlarmOranYangModel::oper_get_items(sysrepo::S_Session session, \
+                                       const char *module_name, \
+                                       const char *path, \
+                                       const char *request_xpath, \
+                                       uint32_t request_id, \
+                                       libyang::S_Data_Node &parent, \
+                                       void *private_data)
+{
+    O1_LOG("\n\n ========== CALLBACK CALLED TO PROVIDE \" %s DATA ==========\n", path); 
+    libyang::S_Context ctx = session->get_context();
+    libyang::S_Module mod = ctx->get_module(module_name);
+
+    //first create root of the tree then add nodes and leaves and fill data
+    parent.reset(new libyang::Data_Node(ctx, ALARM_MODULE_PATH_ORAN, nullptr, LYD_ANYDATA_CONSTSTRING, 0));
+    libyang::S_Data_Node alarms(new libyang::Data_Node(parent, mod, "alarms"));
+    
+    libyang::S_Data_Node alarm;
+    libyang::S_Data_Node id;
+    libyang::S_Data_Node text;
+    libyang::S_Data_Node severity;
+    libyang::S_Data_Node status;
+    libyang::S_Data_Node add_info;
+
+    //read the data from map
+    map<uint16_t,Alarm>::const_iterator it;
+
+    AlarmManager& alrmMgr = AlarmManager::instance();
+    const map<uint16_t,Alarm>& alrmList = alrmMgr.getAlarmList();
+    char alarmId[MAX_ALARM_ID_LEN];
+
+    for(it = alrmList.begin(); it !=alrmList.end(); it++)
+    {
+        strcpy(alarmId, to_string(it->second.getAlarmId()).c_str());
+        O1_LOG("\nAlarm ID %s",alarmId);
+        alarm.reset(new libyang::Data_Node(alarms, mod, "alarm"));
+        id.reset(new libyang::Data_Node(alarm, mod, "alarm-id", alarmId));
+        text.reset(new libyang::Data_Node(alarm, mod, "alarm-text", it->second.getAdditionalText().c_str()));
+        severity.reset(new libyang::Data_Node(alarm, mod, "severity", to_string(it->second.getEventType()).c_str()));
+        status.reset(new libyang::Data_Node(alarm, mod, "status", it->second.getSpecificProblem().c_str()));
+        add_info.reset(new libyang::Data_Node(alarm, mod, "additional-info", it->second.getAdditionalInfo().c_str()));
+    }
+
+    return SR_ERR_OK;
+}
+
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/AlarmOranYangModel.hpp b/src/o1/AlarmOranYangModel.hpp
new file mode 100644 (file)
index 0000000..d8495af
--- /dev/null
@@ -0,0 +1,46 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains Alarm Yang model data filling and sending related methods */
+
+#ifndef __ALARM_ORAN_YANG_MODEL_HPP__
+#define __ALARM_ORAN_YANG_MODEL_HPP__
+#include <string.h>
+#include <stdlib.h>
+#include "sysrepo-cpp/Session.hpp"
+#include "AlarmManager.hpp"
+#include "GlobalDefs.hpp"
+
+
+class AlarmOranYangModel : public sysrepo::Callback {
+   public:
+      int oper_get_items(sysrepo::S_Session session,\
+                         const char *module_name,\
+                         const char *path,\
+                         const char *request_xpath,\
+                         uint32_t request_id,\
+                         libyang::S_Data_Node &parent,\
+                         void *private_data);
+
+};
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/GlobalDefs.cpp b/src/o1/GlobalDefs.cpp
new file mode 100644 (file)
index 0000000..77ea380
--- /dev/null
@@ -0,0 +1,29 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains global definitions for O1 interface modules */
+
+#include "GlobalDefs.hpp"
+
+const short O1::TCP_PORT = 8282;
+const int   O1::SUCCESS  = 0;
+const int   O1::FAILURE  = 1;
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/GlobalDefs.hpp b/src/o1/GlobalDefs.hpp
new file mode 100644 (file)
index 0000000..0f8d42a
--- /dev/null
@@ -0,0 +1,50 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains global definitions for O1 interface modules */
+
+#ifndef __GLOBAL_DEFS_HPP__
+#define __GLOBAL_DEFS_HPP__
+
+#include <syslog.h>
+
+#define O1_LOG(...) ( {\
+               printf(__VA_ARGS__);\
+               syslog(LOG_DEBUG,__VA_ARGS__);\
+               } )
+
+#define ALARM_MODULE_NAME_3GPP "_3gpp-common-fm"
+#define ALARM_MODULE_PATH_3GPP "/_3gpp-common-fm:AlarmListGrp"
+#define ALARM_MODULE_NAME_ORAN "o-ran-sc-odu-alarm-v1"
+#define ALARM_MODULE_PATH_ORAN "/o-ran-sc-odu-alarm-v1:odu"
+
+#define MAX_ALARM_ID_LEN 10
+
+class O1 
+{
+   public:
+   static const short TCP_PORT;
+   static const int   SUCCESS;
+   static const int   FAILURE;
+};
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/NetconfManager.cpp b/src/o1/NetconfManager.cpp
new file mode 100644 (file)
index 0000000..077cdfe
--- /dev/null
@@ -0,0 +1,149 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This class is the netconf manager class. It will handle netopeer-server start and stop along with session handler init. Additionally it will provide the
+   signal handling. */
+
+#include "NetconfManager.hpp"
+
+/* Default constructor */
+NetconfManager::NetconfManager()
+{
+}
+
+
+/* Destructor */
+NetconfManager::~NetconfManager()
+{
+   if( NULL != mSessHndl)
+   {
+      delete mSessHndl;
+   }  
+}
+
+/********************************************************************** 
+   Description : This function will start the netopeer2-server and 
+                 redirect logs to the /etc/netopeer2-server.log file
+   Params[In]  : void
+   Return      : true  - started successful
+                 false - start failed
+**********************************************************************/
+
+bool NetconfManager::startNetopeerServer ()
+{
+    int status = system("netopeer2-server -d -v3 > /etc/netopeer2-server.log 2>&1 &");
+    if (status < 0)
+    {
+       O1_LOG("\nO1 NetconfManager : Error during netopeer server start status : %s",\
+               strerror(errno));
+    }
+    else
+    {
+       if (WIFEXITED(status))
+          O1_LOG("\nO1 NetconfManager : netopeer server started normally with status : %d",\
+                  WEXITSTATUS(status));
+       else
+          O1_LOG("\nO1 NetconfManager : netopeer server started abnormally with status : %d",\
+                  WEXITSTATUS(status));
+    }
+    return (status == 0);
+}
+
+
+/********************************************************************** 
+   Description : This function will stop the netopeer2-server 
+   Params[In]  : void
+   Return      : true  - started successful
+                 false - start failed
+**********************************************************************/
+bool NetconfManager::stopNetopeerServer(void)
+{
+   int status = system("kill -9 `pidof netopeer2-server`");
+   if (status < 0)
+   {
+      O1_LOG("\nO1 NetconfManager : Error during Netopeer server stopped status : %s\n",\
+              strerror(errno));
+   }
+   else
+   {
+      if (WIFEXITED(status))
+      {
+         O1_LOG("\nO1 NetconfManager : Netopeer server stopped normally with status : %d\n",\
+                 WEXITSTATUS(status));
+      }
+      else
+      {
+         O1_LOG("\nO1  NetconfManager : Netopeer server stopped abnormally with status : %d\n",\
+                 WEXITSTATUS(status));
+      }
+   }
+   return (status == 0);
+}
+
+
+/********************************************************************** 
+   Description : catch and handle the SIGINT signal 
+   Params[In]  : signum
+   Return      : void 
+**********************************************************************/
+void NetconfManager::sigintHandler(int signum)
+{
+   if (true != NetconfManager::stopNetopeerServer())
+   {
+      O1_LOG("\nO1 NetconfManager : Error stopping Netopeer server");
+   }
+}
+
+
+/********************************************************************** 
+   Description : This function will start the netopeer2-server and 
+                 session handler  
+   Params[In]  : void
+   Return      : true  - started successful
+                 false - start failed
+**********************************************************************/
+bool NetconfManager::init(void)
+{
+   if(startNetopeerServer())
+   {
+      O1_LOG("\nO1 NetconfManager : netopeer server started");
+   }
+   
+   try
+   {
+      mSessHndl = new SessionHandler;
+      
+      O1_LOG("\nO1 NetconfManager : SessionHandler created ");
+
+      if( !mSessHndl->init())
+      {
+         O1_LOG("\nO1 NetconfManager : SessionHandler init failed ");         
+         return false;
+      }
+   }
+   catch( const std::exception& e ) 
+   {
+      O1_LOG("\nO1 O1_main : Exception : %s", e.what());
+      return false;
+   }
+}
+
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/NetconfManager.hpp b/src/o1/NetconfManager.hpp
new file mode 100644 (file)
index 0000000..213ce8c
--- /dev/null
@@ -0,0 +1,62 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This class is the netconf manager class. It creates instance of the 
+   SessionHandler that provides connections/sessions related funtionality
+   and signal handling. 
+*/
+
+#ifndef __NETCONF_MANAGER_HPP__
+#define __NETCONF_MANAGER_HPP__
+
+#include "SessionHandler.hpp"
+#include "Singleton.hpp"
+
+class NetconfManager : public Singleton<NetconfManager>
+{
+
+   friend Singleton<NetconfManager>;
+
+   public:
+      /*initialize variables*/
+      bool init();
+
+      /*handler for netopeer server*/
+      bool startNetopeerServer(void);
+      static bool stopNetopeerServer(void);
+      static void sigintHandler(int signum);
+
+      /*getter setter for  SessionHandler obj*/
+      bool setSessionHandler (SessionHandler  sessMgr);
+      SessionHandler  getSessionHandler(void);
+
+
+   protected:
+      NetconfManager();
+      ~NetconfManager();
+
+   private:
+      SessionHandler *mSessHndl;
+};
+
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/O1_main.cpp b/src/o1/O1_main.cpp
new file mode 100644 (file)
index 0000000..c0ecce7
--- /dev/null
@@ -0,0 +1,68 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains O1 main. 
+   Starts the Netopeer and TCP server
+*/
+
+#include "NetconfManager.hpp"
+#include "TcpServer.hpp"
+#include <signal.h>
+
+/********************************************************************** 
+   Description : Main function. Start of O1 module.
+   Params[In]  : None 
+   Return      : EXIT_SUCCESS 
+               : EXIT_FAILURE
+**********************************************************************/
+
+int main(int argc, char **argv)
+{
+   TcpServer tcpServer(O1::TCP_PORT);
+   /*SIGINT handling*/
+   //signal(SIGINT,  NetconfManager::sigintHandler);
+   /* Start Netconf server and subscribe to yang modules */
+   try
+   {
+      NetconfManager::instancePtr()->init();
+      O1_LOG("\nO1 O1_main : NetconfManager init successful");
+
+   }
+   catch( const std::exception& e ) 
+   {
+      O1_LOG("\nO1 O1_main : Exception : %s", e.what());
+      return EXIT_FAILURE;
+   }
+   /* Start the TCP Server to listen for alarm messages */
+   if( tcpServer.start() )
+   {
+      O1_LOG("\nO1 O1_main : TCP server started\n");
+      /* Wait for the TcpServer thread to end*/
+      tcpServer.wait();
+   }
+   else
+   {
+      O1_LOG("\nO1 O1_main : Failed to start TCP server");
+      return EXIT_FAILURE;
+   }
+   return EXIT_SUCCESS;
+}
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/SessionHandler.cpp b/src/o1/SessionHandler.cpp
new file mode 100644 (file)
index 0000000..f4108c0
--- /dev/null
@@ -0,0 +1,123 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains methods of Session/Connection creation and Subscription to
+   YANG modules */
+
+#include "SessionHandler.hpp"
+
+
+/* Default constructor */
+SessionHandler::SessionHandler()
+{    
+}
+
+
+/* Destructor */
+SessionHandler::~SessionHandler()
+{  
+}
+
+/********************************************************************** 
+   Description : This function will create Connection, Session, and 
+                 subscribe. These sysrepo class provide netconf connection
+                 related services.
+   Params[In]  : void
+   Return      : true  - started successful
+                 false - start failed
+**********************************************************************/
+bool SessionHandler::init()
+{
+   try
+   {
+      mConn = createConnection();
+      mSess = createSession(mConn);
+      mSub  = createSubscribe(mSess);
+      O1_LOG("\nO1 SessionHandler : Initialization done");
+      return true;
+   }
+   catch( const std::exception& e )
+   {
+      O1_LOG("\nO1 SessionHandler : Exception : %s", e.what());
+      return false;
+   }
+}
+
+/********************************************************************** 
+   Description : This function will create Connection instance and 
+                 return the same  
+   Params[In]  : void
+   Return      : sysrepo::S_Connection instance
+**********************************************************************/
+sysrepo::S_Connection SessionHandler::createConnection()
+{
+   sysrepo::S_Connection conn(new sysrepo::Connection());
+   return conn;
+}
+
+
+/********************************************************************** 
+   Description : This function will create Session instance and
+                 return the same
+   Params[In]  : sysrepo::S_Connection
+   Return      : sysrepo::S_Session instance
+**********************************************************************/
+sysrepo::S_Session SessionHandler::createSession(sysrepo::S_Connection conn)
+{
+   sysrepo::S_Session sess(new sysrepo::Session(conn));
+   return sess;
+}
+
+
+
+/**********************************************************************
+   Description : This function will create Subscribe instance and
+                 return the same
+   Params[In]  : sysrepo::S_Session
+   Return      : sysrepo::S_Subscribe instance
+**********************************************************************/
+sysrepo::S_Subscribe SessionHandler::createSubscribe(sysrepo::S_Session sess)
+{
+   sysrepo::S_Subscribe subscrb(new sysrepo::Subscribe(sess));
+   if(subscribeModule(subscrb))
+   {
+      O1_LOG("\nO1 SessionHandler : Subscription done successfully");
+   }
+   return subscrb;
+}
+
+
+/********************************************************************** 
+   Description : This function will create a callback object and register
+                 it for callback. 
+   Params[In]  : sysrepo::S_Subscribe
+   Return      : true   - on success
+**********************************************************************/
+bool SessionHandler::subscribeModule(sysrepo::S_Subscribe subscrb)
+{
+   sysrepo::S_Callback alarmOranCb(new AlarmOranYangModel());
+
+   subscrb->oper_get_items_subscribe(ALARM_MODULE_NAME_ORAN, \
+                                     ALARM_MODULE_PATH_ORAN, \
+                                     alarmOranCb);
+   return true;
+}
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/SessionHandler.hpp b/src/o1/SessionHandler.hpp
new file mode 100644 (file)
index 0000000..0e0472d
--- /dev/null
@@ -0,0 +1,54 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains SessionHandler class header*/
+
+#ifndef __SESSION_MANAGER_HPP__
+#define __SESSION_MANAGER_HPP__
+
+#include "sysrepo-cpp/Session.hpp"
+#include "Alarm3GPPYangModel.hpp"
+#include "AlarmOranYangModel.hpp"
+
+
+class SessionHandler
+{
+   public:
+      SessionHandler();
+      ~SessionHandler();
+      
+      bool init();
+
+
+   private:
+      sysrepo::S_Connection mConn;
+      sysrepo::S_Session mSess;
+      sysrepo::S_Subscribe mSub;
+      
+      /*creation of Connection, Session, Subscribe obj functions*/
+      bool subscribeModule(sysrepo::S_Subscribe sub);
+      sysrepo::S_Connection createConnection();
+      sysrepo::S_Session createSession(sysrepo::S_Connection conn);
+      sysrepo::S_Subscribe createSubscribe(sysrepo::S_Session sess);
+};
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/Singleton.hpp b/src/o1/Singleton.hpp
new file mode 100644 (file)
index 0000000..2d61843
--- /dev/null
@@ -0,0 +1,78 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file constains a singleton class template */
+
+#ifndef __SINGLETON_HPP__
+#define __SINGLETON_HPP__
+
+template<class T>
+class Singleton
+{
+  public:
+  static T& instance();
+  static T  *instancePtr();
+
+  protected:
+  Singleton() { } 
+  ~Singleton() { }
+
+  private:
+  static T* mPtr;
+};
+
+/* Define and initialize the static instance pointer */
+template<class T>
+T* Singleton<T>::mPtr = 0;
+
+
+/********************************************************************** 
+   Description : Check if instance already exists.
+                 Create a new instance if none exists  
+   Params[In]  : None
+   Return      : Reference to the instance 
+***********************************************************************/
+template<class T>
+T& Singleton<T>::instance()
+{
+    
+  if( mPtr == 0)
+    mPtr = new T();
+
+  return *mPtr;
+}
+
+
+/********************************************************************** 
+   Description : Check if instance already exists.
+                 Create a new instance if none exists  
+   Params[In]  : None
+   Return      : Pointer to the instance 
+***********************************************************************/
+template<class T>
+T *Singleton<T>::instancePtr()
+{
+    return &(instance());
+}
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
+
diff --git a/src/o1/TcpServer.cpp b/src/o1/TcpServer.cpp
new file mode 100644 (file)
index 0000000..47ce094
--- /dev/null
@@ -0,0 +1,275 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains TcpServer class that listens for Netconf Alarm messages
+   on a TCP socket from ODU. It calls the AlarmManager functions for raising 
+   or clearing the alarms based on the actions received 
+*/
+
+#include "TcpServer.hpp"
+#include "Alarm.hpp"
+#include "AlarmManager.hpp"
+#include "GlobalDefs.hpp"
+#include <iostream>
+#include <cstdio>
+#include <cerrno>
+#include <cstdlib>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+using std::map;
+using std::pair;
+
+/* Destructor */
+TcpServer::~TcpServer()
+{
+
+}
+
+
+/********************************************************************** 
+   Description : Read the data from the connected client application 
+   Params[In]  : fd - File descriptor
+   Return      : int - No of bytes read 
+**********************************************************************/
+int TcpServer::readMessage(int fd)
+{
+   AlarmRecord alrmRec;
+   bzero(&alrmRec,sizeof(alrmRec));
+   int nbytes = read (fd, &alrmRec, sizeof(alrmRec));
+   if (nbytes > 0)
+   {
+      Alarm alrm;
+      uint16_t alrmId;
+      O1_LOG("\nO1 TcpServer :\nAction %d\nalarm ID %s\n%d\n%s\n%d\n%s\n%s\nbytes %d",
+                     alrmRec.msgHeader.action,
+                     alrmRec.alarmId,
+                     alrmRec.perceivedSeverity,
+                     alrmRec.additionalText,
+                     alrmRec.eventType,
+                     alrmRec.specificProblem,
+                     alrmRec.additionalInfo,
+                     nbytes
+                     );
+      
+      /*Fill the alarm structure */
+      sscanf(alrmRec.alarmId,"%hu",&alrmId);
+      alrm.setAlarmId(alrmId);
+      alrm.setPerceivedSeverity(alrmRec.perceivedSeverity);
+      alrm.setAdditionalText(alrmRec.additionalText);
+      alrm.setEventType(alrmRec.eventType);
+      alrm.setSpecificProblem(alrmRec.specificProblem);
+      alrm.setAdditionalInfo(alrmRec.additionalInfo);
+
+      switch(alrmRec.msgHeader.action)
+      {
+         case RAISE: 
+                     if(AlarmManager::instance().raiseAlarm(alrm))
+                     {
+                        O1_LOG("\nO1 TcpServer : Alarm raised for alarm Id %s", alrmRec.alarmId);
+                     }
+                     else
+                     {
+                        O1_LOG("\nO1 TcpServer : Error in raising alarm for alrm Id %s", alrmRec.alarmId);
+                     }
+                     break;  
+         case CLEAR: 
+                     if(AlarmManager::instance().clearAlarm(alrm))
+                     {
+                        O1_LOG("\nO1 TcpServer : Alarm cleared for alarm Id %s", alrmRec.alarmId);
+                     }
+                     else
+                     {
+                        O1_LOG("\nO1 TcpServer : Error in clearing alarm for alarm Id %s", alrmRec.alarmId);
+                     }
+                     break;
+         default:    
+                     O1_LOG("\nO1 TcpServer : No action performed"); 
+                     break;
+      }
+
+   }
+   return nbytes;
+}
+
+
+/********************************************************************** 
+   Description : Open a TCP socket and bind on the port
+   Params[In]  : None
+   Return      : O1::SUCCESS - socket open and bind successful
+                 O1::FAILURE - socket open and bind failed
+**********************************************************************/
+int TcpServer::makeSocket() 
+{
+   struct sockaddr_in name;
+   /* Create the socket. */
+   mSock = socket (PF_INET, SOCK_STREAM, 0);
+   if (mSock < 0)
+   {
+      O1_LOG("\nO1 TcpServer : Socket error");
+      return O1::FAILURE;
+   }
+   /* Give the socket a name. */
+   bzero(&name, sizeof(name));
+   name.sin_family = AF_INET;
+   name.sin_port = htons (mPort);
+   name.sin_addr.s_addr = htonl (INADDR_ANY);
+   if (bind (mSock, (struct sockaddr *) &name, sizeof (name)) < 0)
+   {
+      close(mSock);
+      O1_LOG("\nO1 TcpServer : Bind error");
+      return O1::FAILURE;
+   }
+   return O1::SUCCESS;
+}
+
+
+/********************************************************************** 
+   Description : Start TCP server in thread    
+   Params[In]  : None
+   Return      : true  - task launched in pthread successfully
+                 false - task failed to launch
+**********************************************************************/
+bool TcpServer::start()
+{
+   return (pthread_create(&mThreadId, NULL, task, this) == 0);
+}
+
+/********************************************************************** 
+   Description : A TCP server to handle multiple connection using
+                 select multiplexing    
+   Params[In]  : None
+   Return      : true  - task launched in pthread successfully
+                 false - task failed to launch
+**********************************************************************/
+bool TcpServer::run()
+{
+
+   fd_set active_fd_set, read_fd_set;
+   int i;
+   struct sockaddr_in clientName;
+   socklen_t size;
+   bool ret = true;;
+
+   /* Create the socket and set it up to accept connections. */
+   if( makeSocket() == O1::SUCCESS )
+   {
+      if (listen (mSock, 1) < 0)
+      {
+         O1_LOG("\nO1 TcpServer : Listen error");
+         close(mSock);
+         ret = false;
+      }
+      else
+      {
+         /* Initialize the set of active sockets. */
+         FD_ZERO (&active_fd_set);
+         FD_SET (mSock, &active_fd_set);
+
+         while (1)
+         {
+            /* Block until input arrives on one or more active sockets. */
+            read_fd_set = active_fd_set;
+            if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0)
+            {
+               O1_LOG("\nO1 TcpServer : Select error");
+               close(mSock);
+               ret = false;
+               break;
+            }
+
+            /* Service all the sockets with input pending. */
+            for (i = 0; i < FD_SETSIZE; ++i)
+            {
+                if (FD_ISSET (i, &read_fd_set))
+                {
+                   if (i == mSock)
+                   {
+                      /* Connection request on original socket. */
+                      int newFd;
+                      bzero(&clientName, sizeof(clientName));
+                      size = sizeof (clientName);
+                      newFd = accept(mSock,(struct sockaddr *) &clientName,&size);
+                      if (newFd < 0)
+                      {
+                         O1_LOG("\nO1 TcpServer : Accept error");
+                         close(mSock);
+                         ret = false;
+                         break;
+                      }
+                      O1_LOG("\nO1 TcpServer : Connected from host %s, port %hd.\n",
+                         inet_ntoa (clientName.sin_addr),
+                         ntohs (clientName.sin_port));
+                      FD_SET (newFd, &active_fd_set);
+                   }      
+                   else
+                   {
+                      /* Data arriving on an already-connected socket. */
+                      if (readMessage(i) < 0)
+                      {
+                         close (i);
+                         FD_CLR (i, &active_fd_set);
+                      }
+                   }
+                }    
+             }/* for loop ends */     
+          } /* while(1) ends */
+      } /* else ends */
+   } /* outer if ends */
+   else
+   {
+      ret = false;
+   }
+   return ret;
+}
+
+
+/********************************************************************** 
+   Description : Static function for launching a TCP server instance 
+                 in a thread    
+   Params[In]  : TcpServer instance
+   Return      : NULL
+**********************************************************************/
+void* TcpServer::task(void *args)
+{
+   TcpServer *tcpServer = (TcpServer*)args;
+   tcpServer->run();
+   return NULL;
+}
+
+
+/********************************************************************** 
+   Description : Wait for the thread to complete in the parent process   
+   Params[In]  : None
+   Return      : true  - pthread join success
+                 false - pthread join failed
+**********************************************************************/
+bool TcpServer::wait()
+{
+    return (pthread_join(mThreadId,NULL) == 0);
+}
+
+
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/TcpServer.hpp b/src/o1/TcpServer.hpp
new file mode 100644 (file)
index 0000000..19f0eba
--- /dev/null
@@ -0,0 +1,56 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains TcpServer class that listens for Netconf Alarm messages
+   on a TCP socket from ODU. It calls the AlarmManager functions for raising 
+   or clearing the alarms based on the actions received  
+*/
+#ifndef __TCP_SERVER_HPP__
+#define __TCP_SERVER_HPP__
+#include <string>
+#include <pthread.h>
+
+using std::string;
+
+class TcpServer
+{
+
+   private:
+   pthread_t mThreadId;
+   int mSock;
+   const int16_t mPort;
+   int readMessage(int);
+   int makeSocket();
+   bool run();
+   static void* task(void*);
+
+   public:
+   bool start();
+   bool wait();
+   TcpServer(const uint16_t port) : mPort(port){};    
+   ~TcpServer();
+
+};
+
+#endif
+
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/o1_client/Alarm.h b/src/o1/o1_client/Alarm.h
new file mode 100644 (file)
index 0000000..3506f4b
--- /dev/null
@@ -0,0 +1,86 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains definitions of Alarm structure */
+
+#ifndef __ALARM_H__
+#define __ALARM_H__
+
+#include <string.h>
+#define ALRM_ID_SIZE 10
+#define OBJ_INST_SIZE 15
+#define TEXT_SIZE 50
+#define DATE_TIME_SIZE 30
+
+typedef enum
+{
+   CRITICAL = 3, 
+   MAJOR = 4,
+   MINOR = 5,
+   WARNING = 6,
+   INDETERMINATE = 7,
+   CLEARED = 8
+}SeverityLevel;
+
+typedef enum
+{
+   COMMUNICATIONS_ALARM = 2,
+   QUALITY_OF_SERVICE_ALARM = 3,
+   PROCESSING_ERROR_ALARM = 4,
+   EQUIPMENT_ALARM = 5,
+   ENVIRONMENTAL_ALARM = 6,
+   INTEGRITY_VIOLATION = 7,
+   OPERATIONAL_VIOLATION = 8,
+   PHYSICAL_VIOLATION = 9,
+   SECURITY_SERVICE_OR_MECHANISM_VIOLATION = 10,
+   TIME_DOMAIN_VIOLATION = 11
+}EventType;
+
+typedef enum
+{
+   CLEAR = 0,
+   RAISE = 1
+}AlarmAction;
+
+typedef struct
+{
+   AlarmAction action;
+}MsgHeader;
+
+typedef struct
+{
+   MsgHeader msgHeader;
+   EventType eventType;
+   char objectClassObjectInstance[OBJ_INST_SIZE];
+   char alarmId[ALRM_ID_SIZE];
+   char alarmRaiseTime[DATE_TIME_SIZE];
+   char alarmChangeTime[DATE_TIME_SIZE];
+   char alarmClearTime[DATE_TIME_SIZE];
+   char probableCause[TEXT_SIZE];
+   SeverityLevel perceivedSeverity;
+   char rootCauseIndicator[TEXT_SIZE]; 
+   char additionalText[TEXT_SIZE];
+   char additionalInfo[TEXT_SIZE];
+   char specificProblem[TEXT_SIZE];
+}AlarmRecord;
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/o1_client/AlarmInterface.c b/src/o1/o1_client/AlarmInterface.c
new file mode 100644 (file)
index 0000000..1f5bc3b
--- /dev/null
@@ -0,0 +1,131 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains interfaces to raise and clear alarms */
+
+#include "AlarmInterface.h"
+#include "TcpClient.h"
+
+
+/********************************************************************** 
+   Description : Raise an alarm by sending alarm info to O1 module over
+                 TCP socket with action set to RAISE
+   Params[In]  : Alarm information
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t raiseAlarm(AlarmRecord* alrm)
+{
+   if (openSocket(TCP_SERVER_IP,TCP_PORT) == RFAILED)
+   {
+      return RFAILED;
+   }
+   alrm->msgHeader.action = RAISE;
+   if (sendData(alrm,sizeof(AlarmRecord)) < 0 )
+   {
+      closeSocket();
+      return RFAILED;
+   }
+   closeSocket();
+   return ROK;
+}
+
+/********************************************************************** 
+   Description : Clears an alarm raised earlier by sending the alrm
+                 information to O1 module over TCP socket with action
+                 set to CLEAR 
+   Params[In]  : Alarm information
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t clearAlarm(AlarmRecord* alrm)
+{
+   if (openSocket(TCP_SERVER_IP,TCP_PORT) == RFAILED)
+   {
+      return RFAILED;
+   }
+   alrm->msgHeader.action = CLEAR;
+   if (sendData(alrm,sizeof(AlarmRecord)) < 0)
+   {
+      closeSocket();
+      return RFAILED;
+   }
+   closeSocket();
+   return ROK;
+}
+
+
+/********************************************************************** 
+   Description : Fill the cell specific alarm parmeters and generate
+                 the alarm
+   Params[In]  : alarm Id, cell Id
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t raiseCellAlrm(uint16_t alrmId, uint16_t cellId)
+{
+  char buff[BUFF_SIZE];
+  time_t now = time(NULL);
+
+  AlarmRecord alrm;
+  alrm.eventType = COMMUNICATIONS_ALARM;
+  snprintf (alrm.alarmId, sizeof(alrm.alarmId), "%d",alrmId);
+  alrm.perceivedSeverity = INDETERMINATE;
+  
+  strftime(buff, BUFF_SIZE, "%Y-%m-%d %H:%M:%S", localtime(&now));
+  if(CELL_UP_ALARM_ID == alrmId)
+  {
+    /* Fill cell up parameters */
+    snprintf (alrm.additionalText, sizeof(alrm.additionalText), \
+             "cell id  [%d] is up",cellId);
+    strcpy(alrm.additionalInfo , "cell UP");
+    strcpy(alrm.specificProblem, "Active");
+    strcpy(alrm.alarmRaiseTime, buff);
+  }
+  else
+  {
+    /* Clear the cell up alarm */
+    clearCellAlrm(CELL_UP_ALARM_ID);
+    /* Fill the cell down parameters */
+    snprintf (alrm.additionalText, sizeof(alrm.additionalText), \
+              "cell [%d] is down",cellId);
+    strcpy(alrm.additionalInfo , "cell down");
+    strcpy(alrm.specificProblem, "Active");
+    strcpy(alrm.alarmRaiseTime, buff);
+  }
+  /*Raise the alarm */
+  return raiseAlarm(&alrm);
+}
+
+/********************************************************************** 
+   Description : Clear the cell alarm
+   Params[In]  : alarm Id
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t clearCellAlrm(uint16_t alrmId)
+{
+  AlarmRecord alrm;
+  snprintf (alrm.alarmId, sizeof(alrm.alarmId), "%d",alrmId);
+  return clearAlarm(&alrm);
+}
+  
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/o1_client/AlarmInterface.h b/src/o1/o1_client/AlarmInterface.h
new file mode 100644 (file)
index 0000000..4dabd43
--- /dev/null
@@ -0,0 +1,41 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020]      [HCL Technologies Ltd.]                          #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains interfaces to raise and clear alarms */
+
+#ifndef __ALARM_INTERFACE_H__
+#define __ALARM_INTERFACE_H__
+
+#include <stdint.h>
+#include "Alarm.h"
+#include "ssi.h"
+#include "GlobalDefs.h"
+
+#define BUFF_SIZE 20
+
+uint8_t raiseAlarm(AlarmRecord* alrm);
+uint8_t clearAlarm(AlarmRecord* alrm);
+uint8_t raiseCellAlrm(uint16_t alrmId, uint16_t cellId);
+uint8_t clearCellAlrm(uint16_t alrmId);
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
+
diff --git a/src/o1/o1_client/GlobalDefs.h b/src/o1/o1_client/GlobalDefs.h
new file mode 100644 (file)
index 0000000..6323819
--- /dev/null
@@ -0,0 +1,40 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* Class for global defines and constants for O1 interface */
+
+#ifndef __GLOBAL_DEFS_H__
+#define __GLOBAL_DEFS_H__
+
+#include <syslog.h>
+
+#define O1_LOG(...) ({\
+               printf(__VA_ARGS__);\
+               syslog(LOG_DEBUG,__VA_ARGS__);\
+               })
+
+#define TCP_PORT           8282
+#define TCP_SERVER_IP      "127.0.0.1"
+#define CELL_UP_ALARM_ID   1009
+#define CELL_DOWN_ALARM_ID 1010
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/o1_client/TcpClient.c b/src/o1/o1_client/TcpClient.c
new file mode 100644 (file)
index 0000000..a7187e3
--- /dev/null
@@ -0,0 +1,132 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains functions to connect to TCP server and send massages */
+
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#include "TcpClient.h"
+#include "GlobalDefs.h"
+#include "ssi.h"
+
+static int s_sock;
+static struct sockaddr_in s_serverName;
+static uint16_t s_port;
+static const char* s_hostName = NULL;
+
+
+/********************************************************************** 
+   Description : Initilize the sockadd_in structure 
+   Params[In]  : None
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+static uint8_t initSockaddr()
+{
+
+   struct hostent *hostInfo;
+   struct sockaddr_in *name = &s_serverName;
+   bzero(&s_serverName, sizeof(s_serverName));
+   name->sin_family = AF_INET;
+   name->sin_port = htons (s_port);
+   hostInfo = gethostbyname (s_hostName);
+   if (hostInfo == NULL)
+   {
+      O1_LOG("\nO1 TcpClient : Unknown host %s", s_hostName);
+      return RFAILED;
+   }
+   name->sin_addr = *(struct in_addr *) hostInfo->h_addr;
+   return ROK;
+}
+
+
+/********************************************************************** 
+   Description : Open a TCP socket 
+   Params[In]  : hostName, port
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t openSocket(const char* hostName, const uint16_t port)
+{
+   /* Create the socket. */
+   s_port = port;
+   s_hostName = hostName;
+   s_sock = socket (PF_INET, SOCK_STREAM, 0);
+   if (s_sock < 0)
+   {
+      O1_LOG("\nO1 TcpClient : Error opening socket");
+      return RFAILED;
+   }
+
+   /* Init the sockaddr_in structure */
+   if (initSockaddr() == RFAILED)
+   {
+      return RFAILED;
+   }
+   /* Connect to the server */
+   if (0 > connect (s_sock,
+                   (struct sockaddr_in *)&s_serverName ,
+                   sizeof (s_serverName)))
+   {
+      O1_LOG("\nO1 TcpClient : Error connecting");
+      return RFAILED;
+   }
+
+   return ROK;
+
+}
+
+/********************************************************************** 
+   Description : Send the message on TCP socket 
+   Params[In]  : message, size of the message
+   Return      : Number of bytes sent
+**********************************************************************/
+int sendData(void* data, const int size)
+{
+   int nbytes = write (s_sock, data, size);
+   if (nbytes < 0)
+   {
+      O1_LOG("\nO1 TcpClient : Error writing. %d bytes sent", nbytes);
+   }
+   return nbytes;
+}
+
+/********************************************************************** 
+   Description : Close the TCP socket 
+   Params[In]  : None
+   Return      : ROK     - success
+                 RFAILED - failure
+**********************************************************************/
+uint8_t closeSocket()
+{
+   if( close(s_sock) != 0 )
+      return RFAILED;
+   return ROK;
+}
+
+/**********************************************************************
+         End of file
+**********************************************************************/
diff --git a/src/o1/o1_client/TcpClient.h b/src/o1/o1_client/TcpClient.h
new file mode 100644 (file)
index 0000000..13d6b3f
--- /dev/null
@@ -0,0 +1,34 @@
+/*******************************************************************************
+################################################################################
+#   Copyright (c) [2020] [HCL Technologies Ltd.]                               #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+*******************************************************************************/
+
+/* This file contains functions to connect to a TCP server and send massages */
+
+#ifndef __TCP_CLIENT_H__
+#define __TCP_CLIENT_H__
+#include <stdint.h>
+#include "ssi.h"
+
+uint8_t openSocket(const char*, const uint16_t);
+int sendData(void*, const int);
+uint8_t closeSocket();
+
+#endif
+
+/**********************************************************************
+         End of file
+**********************************************************************/
index 97e295d..c058d96 100644 (file)
@@ -29,15 +29,16 @@ bool     msg5ShortBsrSent = false;
 bool     msg5Sent = false;
 bool     dlDedMsg = false;
 bool     msgSecurityModeComp =  false;
-
+bool    msgRrcReconfiguration  =  false;
+bool    msgRegistrationComp    = false;
 typedef enum
 {
    MSG_TYPE_MSG3,
    MSG_TYPE_SHORT_BSR,
    MSG_TYPE_MSG5,
    MSG_TYPE_SECURITY_MODE_COMPLETE,
-   MSG_TYPE_RRC_RECONFIG_COMPLETE,
-   MSG_TYPE_REGISTRATION_COMPLETE
+   MSG_TYPE_REGISTRATION_COMPLETE,
+   MSG_TYPE_RRC_RECONFIG_COMPLETE
 }MsgType;
 
 void phyToMac ARGS((uint16_t msgType, uint32_t msgLen,void *msg));
index a9183c7..21533df 100644 (file)
@@ -349,6 +349,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
    {
       msg3Sent = true;
       type = MSG_TYPE_MSG3;
+      sleep(2);
    }
    else if(!msg5ShortBsrSent)
    {
@@ -360,11 +361,21 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
       msg5Sent = true;
       type = MSG_TYPE_MSG5;
    }
+   else if(!msgRegistrationComp)
+   {
+      msgRegistrationComp = true;
+      type = MSG_TYPE_REGISTRATION_COMPLETE; 
+   }
    else if(!msgSecurityModeComp)
    {
       msgSecurityModeComp = true;
       type = MSG_TYPE_SECURITY_MODE_COMPLETE;
    }
+   else if(!msgRrcReconfiguration)
+   {
+      msgRrcReconfiguration = true;
+      type = MSG_TYPE_RRC_RECONFIG_COMPLETE;
+   }
    else
       return RFAILED;
 
@@ -423,63 +434,99 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
 
            break;
         }
-
       case MSG_TYPE_SHORT_BSR:
-        {
-           DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU ");
-           uint8_t lcgId = 0;
-           uint8_t bufferSizeIdx = 6;
-            
-           /* For Short BSR
-              MAC subheader format is R/R/LcId (1Byte)
-              LCId is 61
-              From 38.321 section 6.1.1
-            */
-           pdu[byteIdx++] = 61;    // LCID
-           pdu[byteIdx++] = (lcgId << 5) | bufferSizeIdx;
+      {
+        DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU ");
+        uint8_t lcgId = 0;
+        uint8_t bufferSizeIdx = 6;
+
+        /* For Short BSR
+           MAC subheader format is R/R/LcId (1Byte)
+           LCId is 61
+           From 38.321 section 6.1.1
+         */
+        pdu[byteIdx++] = 61;    // LCID
+        pdu[byteIdx++] = (lcgId << 5) | bufferSizeIdx;
 
-           break;
-        }
+        break;
+      }
 
       case MSG_TYPE_MSG5:
-        {
-           DU_LOG("\nPHY_STUB: Forming MSG5 PDU");
-           uint8_t  msg5PduLen = 33;
-           /* For RRC setup complete
-              MAC subheader format is R/F/LCId/L (2/3 bytes)
-              LCId is 1 for SRB1
-              L is length of PDU i.e 6bytes here 
-              From 38.321 section 6.1.1
-            */
-           uint8_t msg5[] = {1, msg5PduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \
-              64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \
+      {
+        DU_LOG("\nPHY_STUB: Forming MSG5 PDU");
+        uint8_t  msg5PduLen = 33;
+        /* For RRC setup complete
+           MAC subheader format is R/F/LCId/L (2/3 bytes)
+           LCId is 1 for SRB1
+           L is length of PDU i.e 6bytes here 
+           From 38.321 section 6.1.1
+         */
+        uint8_t msg5[] = {1, msg5PduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \
+           64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \
               184, 56, 0, 0, 0, 0, 0};
 
-           msg5PduLen += 2;  /* 2bytes of header */
-           memcpy(pdu, &msg5, msg5PduLen);
-           byteIdx += msg5PduLen; /* 2 bytes of header */
-           break;
-        }
+        msg5PduLen += 2;  /* 2bytes of header */
+        memcpy(pdu, &msg5, msg5PduLen);
+        byteIdx += msg5PduLen; /* 2 bytes of header */
+        break;
+      }
 
       case MSG_TYPE_SECURITY_MODE_COMPLETE:
-        {
-           DU_LOG("\nPHY_STUB: Forming SECURITY MODE COMPLETE PDU");
-           uint8_t  pduLen = 33;
-           /* For security mode complete
-              MAC subheader format is R/F/LCId/L (2/3 bytes)
-              LCId is 1 for SRB1
-              L is length of PDU i.e 6bytes here 
-              From 38.321 section 6.1.1
-            */
-           uint8_t msg[] = {1, pduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \
-              64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \
-              184, 56, 0, 0, 0, 0, 0};
+      {
+        DU_LOG("\nPHY_STUB: Forming SECURITY MODE COMPLETE PDU");
+        uint8_t  pduLen = 12;
+        /* For security mode complete where RRC Container is dummy
+           MAC subheader format is R/F/LCId/L (2/3 bytes)
+           LCId is 1 for SRB1
+           L is length of PDU i.e 6bytes here 
+           From 38.321 section 6.1.1
+         */
+        uint8_t msg[] = {1, pduLen, 0, 3, 0x2a, 0x40, 0, 0, 0, 0, 0, 0, 0, 0};
+
+        pduLen += 2;  /* 2bytes of header */
+        memcpy(pdu, &msg, pduLen);
+        byteIdx += pduLen; /* 2 bytes of header */
+        break;
+      }
+      case MSG_TYPE_REGISTRATION_COMPLETE:
+      {
+          
+         DU_LOG("\nPHY_STUB: Forming RRC REGISTRATION COMPLETE PDU");
+         uint8_t  pduLen = 12;
+         /* For rrc reconfig complete where RRC Container is dummy
+         MAC subheader format is R/F/LCId/L (2/3 bytes)
+         LCId is 1 for SRB1
+         L is length of PDU i.e 6bytes here
+         From 38.321 section 6.1.1
+         */
+         uint8_t msg[] = {1, pduLen, 0, 0x04, 0x3a, 0x81, 0xbf, 0, 0x21, 0x80, 0, \
+         0, 0, 0};
+       
+         pduLen += 2;  /* 2bytes of header */
+         memcpy(pdu, &msg, pduLen);
+         byteIdx += pduLen; /* 2 bytes of header */
+          break;
+      }
+      case MSG_TYPE_RRC_RECONFIG_COMPLETE:
+      {
+         DU_LOG("\nPHY_STUB: Forming RRC RECONFIGURATION COMPLETE PDU");
+         uint8_t  pduLen = 14;
+        /* For rrc reconfig complete where RRC Container is dummy
+        MAC subheader format is R/F/LCId/L (2/3 bytes)
+        LCId is 1 for SRB1
+        L is length of PDU i.e 6bytes here
+        From 38.321 section 6.1.1
+        */
+        uint8_t msg[] = {1, pduLen, 0, 6, 8, 64, 0, 0, 0, 0, \
+                         0, 0, 0, 0, 0};
+       
+        pduLen += 2;  /* 2bytes of header */
+        memcpy(pdu, &msg, pduLen);
+        byteIdx += pduLen; /* 2 bytes of header */
+        break;
 
-           pduLen += 2;  /* 2bytes of header */
-           memcpy(pdu, &msg, pduLen);
-           byteIdx += pduLen; /* 2 bytes of header */
-           break;
-        }
+      }
+      
       default:
         break;
    } /* End of switch(type) */
@@ -957,8 +1004,8 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg)
       }
       if(ulTtiReq->pdus[numPdus-1].pduType == 1)
       {
-        DU_LOG("\nPHY STUB: PUSCH PDU");                       
-         l1BuildAndSendRxDataInd(ulTtiReq->slot, ulTtiReq->sfn, \
+        DU_LOG("\nPHY STUB: PUSCH PDU");
+        l1BuildAndSendRxDataInd(ulTtiReq->slot, ulTtiReq->sfn, \
               ulTtiReq->pdus[numPdus-1].pdu.pusch_pdu); 
       }
       if(ulTtiReq->pdus[numPdus-1].pduType == 2)