Interrupt not working

//*****************************************************************************
// button_if.c
//
// CC3200 Launchpad button interface APIs
//
//*****************************************************************************

#include <stdlib.h>
#include "hw_types.h"
#include "hw_ints.h"
#include "rom.h"
#include "rom_map.h"
#include "gpio.h"
#include "interrupt.h"
#include "pin.h"
#include "hw_memmap.h"

#include "osi.h"

#include "button_interface.h"

P_INT_HANDLER g_S2InterruptHdl;
P_INT_HANDLER g_S3InterruptHdl;
P_INT_HANDLER g_S4InterruptHdl;

void GPIOs4IntHandler()
{

    unsigned long ulPinState =  GPIOIntStatus(GPIOA3_BASE,1);

    if(ulPinState & GPIO_PIN_4)
    {
        Button_IF_DisableInterrupt(SW4);
        g_S4InterruptHdl();
    }
}
//*****************************************************************************
//
//! GPIO Interrupt Handler for S3 button
//!
//! \param None
//!
//! \return None
//
//*****************************************************************************
void GPIOs3IntHandler()
{

    unsigned long ulPinState =  GPIOIntStatus(GPIOA1_BASE,1);

    if(ulPinState & GPIO_PIN_5)
    {
        Button_IF_DisableInterrupt(SW3);
        g_S3InterruptHdl();
    }
}
//*****************************************************************************
//
//! GPIO Interrupt Handler for S2 button
//!
//! \param None
//!
//! \return None
//
//*****************************************************************************
void GPIOs2IntHandler()
{
    unsigned long ulPinState =  GPIOIntStatus(GPIOA2_BASE,1);
    if(ulPinState & GPIO_PIN_6)
    {
        Button_IF_DisableInterrupt(SW2);
        g_S2InterruptHdl();
    }
}

//*****************************************************************************
//
//!  \brief Initialize Push Button GPIO
//!
//! \param[in] S2InterruptHdl          GPIO Interrupt Handler for SW2 LP button
//! \param[in] S3InterruptHdl          GPIO Interrupt Handler for SW3 LP button

//!
//! \return none
//!
//! \brief  Initializes Push Button Ports and Pins
//
//*****************************************************************************
void Button_IF_Init(P_INT_HANDLER S2InterruptHdl,P_INT_HANDLER S3InterruptHdl, P_INT_HANDLER S4InterruptHdl )
{
    if(S4InterruptHdl != NULL)
    {
        //
        // Set Interrupt Type for GPIO
        //
        MAP_GPIOIntTypeSet(GPIOA3_BASE,GPIO_PIN_4,GPIO_FALLING_EDGE);

        g_S4InterruptHdl = S4InterruptHdl;

        //
        // Register Interrupt handler
        //
        osi_InterruptRegister(INT_GPIOA3,(P_OSI_INTR_ENTRY)GPIOs4IntHandler, \
                                INT_PRIORITY_LVL_1);

        //
        // Enable Interrupt
        //
        MAP_GPIOIntClear(GPIOA3_BASE,GPIO_PIN_4);
        MAP_GPIOIntEnable(GPIOA3_BASE,GPIO_INT_PIN_4);
    }

    if(S3InterruptHdl != NULL)
    {
        //
        // Set Interrupt Type for GPIO
        //
        MAP_GPIOIntTypeSet(GPIOA1_BASE,GPIO_PIN_5,GPIO_FALLING_EDGE);

        g_S3InterruptHdl = S3InterruptHdl;

        //
        // Register Interrupt handler
        //
        osi_InterruptRegister(INT_GPIOA1,(P_OSI_INTR_ENTRY)GPIOs3IntHandler, \
                                INT_PRIORITY_LVL_1);
        //
        // Enable Interrupt
        //
        MAP_GPIOIntClear(GPIOA1_BASE,GPIO_PIN_5);
        MAP_GPIOIntEnable(GPIOA1_BASE,GPIO_INT_PIN_5);
    }

    if(S2InterruptHdl != NULL)
    {
        //
        // Set Interrupt Type for GPIO
        //
        MAP_GPIOIntTypeSet(GPIOA2_BASE,GPIO_PIN_6,GPIO_FALLING_EDGE);

        g_S2InterruptHdl = S2InterruptHdl;

        //
        // Register Interrupt handler
        //
        osi_InterruptRegister(INT_GPIOA2,(P_OSI_INTR_ENTRY)GPIOs2IntHandler, \
                                INT_PRIORITY_LVL_1);

        //
        // Enable Interrupt
        //
        MAP_GPIOIntClear(GPIOA2_BASE,GPIO_PIN_6);
        MAP_GPIOIntEnable(GPIOA2_BASE,GPIO_INT_PIN_6);
    }
}

//*****************************************************************************
//
//!  \brief Enables Push Button GPIO Interrupt
//!
//! \param[in] ucSwitch               Push Button Swich Enum - SW2,SW3
//!
//! \return none
//!
//
//*****************************************************************************
void Button_IF_EnableInterrupt(unsigned char ucSwitch)
{
    if(ucSwitch & SW2)
    {
        //Enable GPIO Interrupt
        MAP_GPIOIntClear(GPIOA2_BASE,GPIO_PIN_6);
        MAP_IntPendClear(INT_GPIOA2);
        MAP_IntEnable(INT_GPIOA2);
        MAP_GPIOIntEnable(GPIOA2_BASE,GPIO_PIN_6);
    }

    if(ucSwitch & SW3)
    {
         //Enable GPIO Interrupt
         MAP_GPIOIntClear(GPIOA1_BASE,GPIO_PIN_5);
         MAP_IntPendClear(INT_GPIOA1);
         MAP_IntEnable(INT_GPIOA1);
         MAP_GPIOIntEnable(GPIOA1_BASE,GPIO_PIN_5);
    }

    if(ucSwitch & SW4)
    {
         //Enable GPIO Interrupt
         MAP_GPIOIntClear(GPIOA3_BASE,GPIO_PIN_4);
         MAP_IntPendClear(INT_GPIOA3);
         MAP_IntEnable(INT_GPIOA3);
         MAP_GPIOIntEnable(GPIOA3_BASE,GPIO_PIN_4);
    }
}


//*****************************************************************************
//
//!  \brief Disables Push Button GPIO Interrupt
//!
//! \param[in] ucSwitch               Push Button Swich Enum - SW2,SW3
//!
//! \return none
//!
//
//*****************************************************************************
void Button_IF_DisableInterrupt(unsigned char ucSwitch)
{
    if(ucSwitch & SW2)
    {
        //Clear and Disable GPIO Interrupt
        MAP_GPIOIntDisable(GPIOA2_BASE,GPIO_PIN_6);
        MAP_GPIOIntClear(GPIOA2_BASE,GPIO_PIN_6);
        MAP_IntDisable(INT_GPIOA2);
    }

    if(ucSwitch & SW3)
    {
        //Clear and Disable GPIO Interrupt
        MAP_GPIOIntDisable(GPIOA1_BASE,GPIO_PIN_5);
        MAP_GPIOIntClear(GPIOA1_BASE,GPIO_PIN_5);
        MAP_IntDisable(INT_GPIOA1);
    }


    if(ucSwitch & SW4)
    {
        //Clear and Disable GPIO Interrupt
        MAP_GPIOIntDisable(GPIOA3_BASE,GPIO_PIN_4);
        MAP_GPIOIntClear(GPIOA3_BASE,GPIO_PIN_4);
        MAP_IntDisable(INT_GPIOA3);
    }
}