Added visibility to the UIPC_Read() errors
Changed some of the BTIF_TRACE_EVENT() log messages
to BTIF_TRACE_WARNING() so we can get better visibility into the
UIPC_Read() errors.
Also, removed UIPC_ReadBuf() and UIPC_SendBuf(), because they are
not implemented / used.
Change-Id: Iccc6a4d73dfe3c3e57f21c538891d7cb429f11ac
diff --git a/udrv/include/uipc.h b/udrv/include/uipc.h
index b5efbd7..466e678 100644
--- a/udrv/include/uipc.h
+++ b/udrv/include/uipc.h
@@ -85,18 +85,6 @@
/*******************************************************************************
**
-** Function UIPC_SendBuf
-**
-** Description Called to transmit a message over UIPC.
-** Message buffer will be freed by UIPC_SendBuf.
-**
-** Returns void
-**
-*******************************************************************************/
-BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg);
-
-/*******************************************************************************
-**
** Function UIPC_Send
**
** Description Called to transmit a message over UIPC.
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index ae4636e..4256aed 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -181,7 +181,7 @@
if (poll(&pfd, 1, 0) == 0)
{
- BTIF_TRACE_EVENT("accept poll timeout");
+ BTIF_TRACE_WARNING("accept poll timeout");
return -1;
}
@@ -395,13 +395,14 @@
if (pfd.revents & (POLLERR|POLLHUP))
{
- BTIF_TRACE_EVENT("%s() - POLLERR or POLLHUP. Exiting", __FUNCTION__);
+ BTIF_TRACE_WARNING("%s() - POLLERR or POLLHUP. Exiting", __FUNCTION__);
return;
}
if (ret <= 0)
{
- BTIF_TRACE_EVENT("%s() - error (%d). Exiting", __FUNCTION__, ret);
+ BTIF_TRACE_WARNING("%s() - poll() failed (%s). Exiting",
+ __FUNCTION__, strerror(errno));
return;
}
@@ -669,31 +670,6 @@
/*******************************************************************************
**
- ** Function UIPC_SendBuf
- **
- ** Description Called to transmit a message over UIPC.
- ** Message buffer will be freed by UIPC_SendBuf.
- **
- ** Returns TRUE in case of success, FALSE in case of failure.
- **
- *******************************************************************************/
-BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
-{
- UNUSED(p_msg);
-
- BTIF_TRACE_DEBUG("UIPC_SendBuf : ch_id %d NOT IMPLEMENTED", ch_id);
-
- UIPC_LOCK();
-
- /* currently not used */
-
- UIPC_UNLOCK();
-
- return FALSE;
-}
-
-/*******************************************************************************
- **
** Function UIPC_Send
**
** Description Called to transmit a message over UIPC.
@@ -722,25 +698,6 @@
/*******************************************************************************
**
- ** Function UIPC_ReadBuf
- **
- ** Description Called to read a message from UIPC.
- **
- ** Returns void
- **
- *******************************************************************************/
-void UIPC_ReadBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
-{
- UNUSED(p_msg);
-
- BTIF_TRACE_DEBUG("UIPC_ReadBuf : ch_id:%d NOT IMPLEMENTED", ch_id);
-
- UIPC_LOCK();
- UIPC_UNLOCK();
-}
-
-/*******************************************************************************
- **
** Function UIPC_Read
**
** Description Called to read a message from UIPC.
@@ -781,7 +738,7 @@
a read for more than poll timeout */
if (poll(&pfd, 1, uipc_main.ch[ch_id].read_poll_tmo_ms) == 0)
{
- BTIF_TRACE_EVENT("poll timeout (%d ms)", uipc_main.ch[ch_id].read_poll_tmo_ms);
+ BTIF_TRACE_WARNING("poll timeout (%d ms)", uipc_main.ch[ch_id].read_poll_tmo_ms);
break;
}
@@ -789,7 +746,7 @@
if (pfd.revents & (POLLHUP|POLLNVAL) )
{
- BTIF_TRACE_EVENT("poll : channel detached remotely");
+ BTIF_TRACE_WARNING("poll : channel detached remotely");
UIPC_LOCK();
uipc_close_locked(ch_id);
UIPC_UNLOCK();
@@ -802,7 +759,7 @@
if (n == 0)
{
- BTIF_TRACE_EVENT("UIPC_Read : channel detached remotely");
+ BTIF_TRACE_WARNING("UIPC_Read : channel detached remotely");
UIPC_LOCK();
uipc_close_locked(ch_id);
UIPC_UNLOCK();
@@ -811,7 +768,7 @@
if (n < 0)
{
- BTIF_TRACE_EVENT("UIPC_Read : read failed (%s)", strerror(errno));
+ BTIF_TRACE_WARNING("UIPC_Read : read failed (%s)", strerror(errno));
return 0;
}