patch-2.4.23 linux-2.4.23/net/irda/irlap_event.c
Next file: linux-2.4.23/net/irda/irlap_frame.c
Previous file: linux-2.4.23/net/irda/irlan/irlan_provider_event.c
Back to the patch index
Back to the overall index
- Lines: 534
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/net/irda/irlap_event.c
- Orig date:
2003-08-25 04:44:44.000000000 -0700
diff -urN linux-2.4.22/net/irda/irlap_event.c linux-2.4.23/net/irda/irlap_event.c
@@ -217,7 +217,7 @@
} else
self->fast_RR = FALSE;
- IRDA_DEBUG(3, __FUNCTION__ "(), timeout=%d (%ld)\n", timeout, jiffies);
+ IRDA_DEBUG(3, "%s(), timeout=%d (%ld)\n", __FUNCTION__, timeout, jiffies);
#endif /* CONFIG_IRDA_FAST_RR */
if (timeout == 0)
@@ -241,7 +241,7 @@
if (!self || self->magic != LAP_MAGIC)
return;
- IRDA_DEBUG(3, __FUNCTION__ "(), event = %s, state = %s\n",
+ IRDA_DEBUG(3, "%s(), event = %s, state = %s\n", __FUNCTION__,
irlap_event[event], irlap_state[self->state]);
ret = (*state[self->state])(self, event, skb, info);
@@ -259,7 +259,7 @@
* try to disconnect link if we send any data frames, since
* that will change the state away form XMIT
*/
- IRDA_DEBUG(2, __FUNCTION__ "() : queue len = %d\n",
+ IRDA_DEBUG(2, "%s() : queue len = %d\n", __FUNCTION__,
skb_queue_len(&self->txq));
if (skb_queue_len(&self->txq)) {
@@ -353,8 +353,7 @@
/* Note : this will never happen, because we test
* media busy in irlap_connect_request() and
* postpone the event... - Jean II */
- IRDA_DEBUG(0, __FUNCTION__
- "(), CONNECT_REQUEST: media busy!\n");
+ IRDA_DEBUG(0, "%s(), CONNECT_REQUEST: media busy!\n", __FUNCTION__);
/* Always switch state before calling upper layers */
irlap_next_state(self, LAP_NDM);
@@ -380,15 +379,15 @@
irlap_connect_indication(self, skb);
} else {
- IRDA_DEBUG(0, __FUNCTION__ "(), SNRM frame does not "
- "contain an I field!\n");
+ IRDA_DEBUG(0, "%s(), SNRM frame does not "
+ "contain an I field!\n", __FUNCTION__);
}
break;
case DISCOVERY_REQUEST:
ASSERT(info != NULL, return -1;);
if (self->media_busy) {
- IRDA_DEBUG(0, __FUNCTION__ "(), media busy!\n");
+ IRDA_DEBUG(0, "%s(), media busy!\n", __FUNCTION__);
/* irlap->log.condition = MEDIA_BUSY; */
/* This will make IrLMP try again */
@@ -450,7 +449,7 @@
* log (and post an event).
* Jean II
*/
- IRDA_DEBUG(1, __FUNCTION__ "(), Receiving final discovery request, missed the discovery slots :-(\n");
+ IRDA_DEBUG(1, "%s(), Receiving final discovery request, missed the discovery slots :-(\n", __FUNCTION__);
/* Last discovery request -> in the log */
irlap_discovery_indication(self, info->discovery);
@@ -526,8 +525,7 @@
case RECV_UI_FRAME:
/* Only accept broadcast frames in NDM mode */
if (info->caddr != CBROADCAST) {
- IRDA_DEBUG(0, __FUNCTION__
- "(), not a broadcast frame!\n");
+ IRDA_DEBUG(0, "%s(), not a broadcast frame!\n", __FUNCTION__);
} else
irlap_unitdata_indication(self, skb);
break;
@@ -543,10 +541,10 @@
irlap_send_test_frame(self, CBROADCAST, info->daddr, skb);
break;
case RECV_TEST_RSP:
- IRDA_DEBUG(0, __FUNCTION__ "() not implemented!\n");
+ IRDA_DEBUG(0, "%s() not implemented!\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(2, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -1;
@@ -574,13 +572,13 @@
ASSERT(info != NULL, return -1;);
ASSERT(info->discovery != NULL, return -1;);
- IRDA_DEBUG(4, __FUNCTION__ "(), daddr=%08x\n",
+ IRDA_DEBUG(4, "%s(), daddr=%08x\n", __FUNCTION__,
info->discovery->daddr);
if (!self->discovery_log) {
- WARNING(__FUNCTION__ "(), discovery log is gone! "
+ WARNING("%s(), discovery log is gone! "
"maybe the discovery timeout has been set to "
- "short?\n");
+ "short?\n", __FUNCTION__);
break;
}
hashbin_insert(self->discovery_log,
@@ -605,7 +603,7 @@
ASSERT(info != NULL, return -1;);
- IRDA_DEBUG(1, __FUNCTION__ "(), Receiving discovery request (s = %d) while performing discovery :-(\n", info->s);
+ IRDA_DEBUG(1, "%s(), Receiving discovery request (s = %d) while performing discovery :-(\n", __FUNCTION__, info->s);
/* Last discovery request ? */
if (info->s == 0xff)
@@ -619,9 +617,8 @@
* timing requirements.
*/
if (irda_device_is_receiving(self->netdev) && !self->add_wait) {
- IRDA_DEBUG(2, __FUNCTION__
- "(), device is slow to answer, "
- "waiting some more!\n");
+ IRDA_DEBUG(2, "%s(), device is slow to answer, "
+ "waiting some more!\n", __FUNCTION__);
irlap_start_slot_timer(self, MSECS_TO_JIFFIES(10));
self->add_wait = TRUE;
return ret;
@@ -657,7 +654,7 @@
}
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(2, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -1;
@@ -679,14 +676,14 @@
discovery_t *discovery_rsp;
int ret=0;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
switch (event) {
case QUERY_TIMER_EXPIRED:
- IRDA_DEBUG(2, __FUNCTION__ "(), QUERY_TIMER_EXPIRED <%ld>\n",
+ IRDA_DEBUG(2, "%s(), QUERY_TIMER_EXPIRED <%ld>\n", __FUNCTION__,
jiffies);
irlap_next_state(self, LAP_NDM);
break;
@@ -715,7 +712,7 @@
}
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, %s\n", event,
+ IRDA_DEBUG(1, "%s(), Unknown event %d, %s\n", __FUNCTION__, event,
irlap_event[event]);
ret = -1;
@@ -736,7 +733,7 @@
{
int ret = 0;
- IRDA_DEBUG(4, __FUNCTION__ "(), event=%s\n", irlap_event[ event]);
+ IRDA_DEBUG(4, "%s(), event=%s\n", __FUNCTION__, irlap_event[ event]);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -796,19 +793,18 @@
break;
case RECV_DISCOVERY_XID_CMD:
- IRDA_DEBUG(3, __FUNCTION__
- "(), event RECV_DISCOVER_XID_CMD!\n");
+ IRDA_DEBUG(3, "%s(), event RECV_DISCOVER_XID_CMD!\n", __FUNCTION__);
irlap_next_state(self, LAP_NDM);
break;
case DISCONNECT_REQUEST:
- IRDA_DEBUG(0, __FUNCTION__ "(), Disconnect request!\n");
+ IRDA_DEBUG(0, "%s(), Disconnect request!\n", __FUNCTION__);
irlap_send_dm_frame(self);
irlap_next_state( self, LAP_NDM);
irlap_disconnect_indication(self, LAP_DISC_INDICATION);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, %s\n", event,
+ IRDA_DEBUG(1, "%s(), Unknown event %d, %s\n", __FUNCTION__, event,
irlap_event[event]);
ret = -1;
@@ -830,7 +826,7 @@
{
int ret = 0;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -859,7 +855,7 @@
self->retry_count++;
break;
case RECV_SNRM_CMD:
- IRDA_DEBUG(4, __FUNCTION__ "(), SNRM battle!\n");
+ IRDA_DEBUG(4, "%s(), SNRM battle!\n", __FUNCTION__);
ASSERT(skb != NULL, return 0;);
ASSERT(info != NULL, return 0;);
@@ -940,7 +936,7 @@
irlap_disconnect_indication(self, LAP_DISC_INDICATION);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, %s\n", event,
+ IRDA_DEBUG(1, "%s(), Unknown event %d, %s\n", __FUNCTION__, event,
irlap_event[event]);
ret = -1;
@@ -958,7 +954,7 @@
static int irlap_state_offline(struct irlap_cb *self, IRLAP_EVENT event,
struct sk_buff *skb, struct irlap_info *info)
{
- IRDA_DEBUG( 0, __FUNCTION__ "(), Unknown event\n");
+ IRDA_DEBUG( 0, "%s(), Unknown event\n", __FUNCTION__);
return -1;
}
@@ -989,9 +985,8 @@
* speed and turn-around-time.
*/
if (skb->len > self->bytes_left) {
- IRDA_DEBUG(4, __FUNCTION__
- "(), Not allowed to transmit more "
- "bytes!\n");
+ IRDA_DEBUG(4, "%s(), Not allowed to transmit more "
+ "bytes!\n", __FUNCTION__);
skb_queue_head(&self->txq, skb_get(skb));
/*
* We should switch state to LAP_NRM_P, but
@@ -1029,8 +1024,7 @@
self->fast_RR = FALSE;
#endif /* CONFIG_IRDA_FAST_RR */
} else {
- IRDA_DEBUG(4, __FUNCTION__
- "(), Unable to send! remote busy?\n");
+ IRDA_DEBUG(4, "%s(), Unable to send! remote busy?\n", __FUNCTION__);
skb_queue_head(&self->txq, skb_get(skb));
/*
@@ -1041,7 +1035,7 @@
}
break;
case POLL_TIMER_EXPIRED:
- IRDA_DEBUG(3, __FUNCTION__ "(), POLL_TIMER_EXPIRED (%ld)\n",
+ IRDA_DEBUG(3, "%s(), POLL_TIMER_EXPIRED (%ld)\n", __FUNCTION__,
jiffies);
irlap_send_rr_frame(self, CMD_FRAME);
/* Return to NRM properly - Jean II */
@@ -1067,7 +1061,7 @@
* when we return... - Jean II */
break;
default:
- IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(0, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -EINVAL;
@@ -1086,7 +1080,7 @@
{
int ret = 0;
- IRDA_DEBUG(1, __FUNCTION__ "()\n");
+ IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -1121,7 +1115,7 @@
}
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(1, "%s(), Unknown event %d\n", __FUNCTION__, event);
ret = -1;
break;
@@ -1234,8 +1228,7 @@
/* Keep state */
irlap_next_state(self, LAP_NRM_P);
} else {
- IRDA_DEBUG(4, __FUNCTION__
- "(), missing or duplicate frame!\n");
+ IRDA_DEBUG(4, "%s(), missing or duplicate frame!\n", __FUNCTION__);
/* Update Nr received */
irlap_update_nr_received(self, info->nr);
@@ -1299,8 +1292,7 @@
if ((ns_status == NS_UNEXPECTED) &&
(nr_status == NR_UNEXPECTED))
{
- IRDA_DEBUG(4, __FUNCTION__
- "(), unexpected nr and ns!\n");
+ IRDA_DEBUG(4, "%s(), unexpected nr and ns!\n", __FUNCTION__);
if (info->pf) {
/* Resend rejected frames */
irlap_resend_rejected_frames(self, CMD_FRAME);
@@ -1339,9 +1331,8 @@
}
break;
}
- IRDA_DEBUG(1, __FUNCTION__ "(), Not implemented!\n");
- IRDA_DEBUG(1, __FUNCTION__
- "(), event=%s, ns_status=%d, nr_status=%d\n",
+ IRDA_DEBUG(1, "%s(), Not implemented!\n", __FUNCTION__);
+ IRDA_DEBUG(1, "%s(), event=%s, ns_status=%d, nr_status=%d\n", __FUNCTION__,
irlap_event[ event], ns_status, nr_status);
break;
case RECV_UI_FRAME:
@@ -1353,7 +1344,7 @@
del_timer(&self->final_timer);
irlap_data_indication(self, skb, TRUE);
irlap_next_state(self, LAP_XMIT_P);
- printk(__FUNCTION__ "(): RECV_UI_FRAME: next state %s\n", irlap_state[self->state]);
+ printk("%s(): RECV_UI_FRAME: next state %s\n", __FUNCTION__, irlap_state[self->state]);
irlap_start_poll_timer(self, self->poll_timeout);
}
break;
@@ -1406,8 +1397,8 @@
irlap_next_state(self, LAP_NRM_P);
} else if (ret == NR_INVALID) {
- IRDA_DEBUG(1, __FUNCTION__ "(), Received RR with "
- "invalid nr !\n");
+ IRDA_DEBUG(1, "%s(), Received RR with "
+ "invalid nr !\n", __FUNCTION__);
del_timer(&self->final_timer);
irlap_next_state(self, LAP_RESET_WAIT);
@@ -1507,7 +1498,7 @@
irlap_start_final_timer(self, self->final_timeout);
break;
case RECV_RD_RSP:
- IRDA_DEBUG(1, __FUNCTION__ "(), RECV_RD_RSP\n");
+ IRDA_DEBUG(1, "%s(), RECV_RD_RSP\n", __FUNCTION__);
irlap_flush_all_queues(self);
irlap_next_state(self, LAP_XMIT_P);
@@ -1515,7 +1506,7 @@
irlap_disconnect_request(self);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(1, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -1;
@@ -1536,7 +1527,7 @@
{
int ret = 0;
- IRDA_DEBUG(3, __FUNCTION__ "(), event = %s\n", irlap_event[event]);
+ IRDA_DEBUG(3, "%s(), event = %s\n", __FUNCTION__, irlap_event[event]);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -1562,7 +1553,7 @@
irlap_next_state( self, LAP_PCLOSE);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(2, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -1;
@@ -1583,7 +1574,7 @@
{
int ret = 0;
- IRDA_DEBUG(3, __FUNCTION__ "(), event = %s\n", irlap_event[event]);
+ IRDA_DEBUG(3, "%s(), event = %s\n", __FUNCTION__, irlap_event[event]);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -1641,7 +1632,7 @@
* state
*/
if (!info) {
- IRDA_DEBUG(3, __FUNCTION__ "(), RECV_SNRM_CMD\n");
+ IRDA_DEBUG(3, "%s(), RECV_SNRM_CMD\n", __FUNCTION__);
irlap_initiate_connection_state(self);
irlap_wait_min_turn_around(self, &self->qos_tx);
irlap_send_ua_response_frame(self, &self->qos_rx);
@@ -1649,12 +1640,11 @@
irlap_start_wd_timer(self, self->wd_timeout);
irlap_next_state(self, LAP_NDM);
} else {
- IRDA_DEBUG(0, __FUNCTION__
- "(), SNRM frame contained an I field!\n");
+ IRDA_DEBUG(0, "%s(), SNRM frame contained an I field!\n", __FUNCTION__);
}
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(1, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -1;
@@ -1675,7 +1665,7 @@
{
int ret = 0;
- IRDA_DEBUG(4, __FUNCTION__ "(), event=%s\n", irlap_event[event]);
+ IRDA_DEBUG(4, "%s(), event=%s\n", __FUNCTION__, irlap_event[event]);
ASSERT(self != NULL, return -ENODEV;);
ASSERT(self->magic == LAP_MAGIC, return -EBADR;);
@@ -1731,7 +1721,7 @@
ret = -EPROTO;
}
} else {
- IRDA_DEBUG(2, __FUNCTION__ "(), Unable to send!\n");
+ IRDA_DEBUG(2, "%s(), Unable to send!\n", __FUNCTION__);
skb_queue_head(&self->txq, skb_get(skb));
ret = -EPROTO;
}
@@ -1747,7 +1737,7 @@
* when we return... - Jean II */
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %s\n",
+ IRDA_DEBUG(2, "%s(), Unknown event %s\n", __FUNCTION__,
irlap_event[event]);
ret = -EINVAL;
@@ -1770,7 +1760,7 @@
int nr_status;
int ret = 0;
- IRDA_DEBUG(4, __FUNCTION__ "(), event=%s\n", irlap_event[ event]);
+ IRDA_DEBUG(4, "%s(), event=%s\n", __FUNCTION__, irlap_event[ event]);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == LAP_MAGIC, return -1;);
@@ -1778,8 +1768,8 @@
switch (event) {
case RECV_I_CMD: /* Optimize for the common case */
/* FIXME: must check for remote_busy below */
- IRDA_DEBUG(4, __FUNCTION__ "(), event=%s nr=%d, vs=%d, ns=%d, "
- "vr=%d, pf=%d\n", irlap_event[event], info->nr,
+ IRDA_DEBUG(4, "%s(), event=%s nr=%d, vs=%d, ns=%d, "
+ "vr=%d, pf=%d\n", __FUNCTION__, irlap_event[event], info->nr,
self->vs, info->ns, self->vr, info->pf);
self->retry_count = 0;
@@ -2011,21 +2001,19 @@
/* Keep state */
irlap_next_state(self, LAP_NRM_S);
} else {
- IRDA_DEBUG(1, __FUNCTION__
- "(), invalid nr not implemented!\n");
+ IRDA_DEBUG(1, "%s(), invalid nr not implemented!\n", __FUNCTION__);
}
break;
case RECV_SNRM_CMD:
/* SNRM frame is not allowed to contain an I-field */
if (!info) {
del_timer(&self->wd_timer);
- IRDA_DEBUG(1, __FUNCTION__ "(), received SNRM cmd\n");
+ IRDA_DEBUG(1, "%s(), received SNRM cmd\n", __FUNCTION__);
irlap_next_state(self, LAP_RESET_CHECK);
irlap_reset_indication(self);
} else {
- IRDA_DEBUG(0, __FUNCTION__
- "(), SNRM frame contained an I-field!\n");
+ IRDA_DEBUG(0, "%s(), SNRM frame contained an I-field!\n", __FUNCTION__);
}
break;
@@ -2057,7 +2045,7 @@
* which explain why we use (self->N2 / 2) here !!!
* Jean II
*/
- IRDA_DEBUG(1, __FUNCTION__ "(), retry_count = %d\n",
+ IRDA_DEBUG(1, "%s(), retry_count = %d\n", __FUNCTION__,
self->retry_count);
if (self->retry_count < (self->N2 / 2)) {
@@ -2110,7 +2098,7 @@
irlap_send_test_frame(self, self->caddr, info->daddr, skb);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, (%s)\n",
+ IRDA_DEBUG(1, "%s(), Unknown event %d, (%s)\n", __FUNCTION__,
event, irlap_event[event]);
ret = -EINVAL;
@@ -2130,7 +2118,7 @@
{
int ret = 0;
- IRDA_DEBUG(1, __FUNCTION__ "()\n");
+ IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -ENODEV;);
ASSERT(self->magic == LAP_MAGIC, return -EBADR;);
@@ -2168,7 +2156,7 @@
irlap_disconnect_indication(self, LAP_DISC_INDICATION);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, (%s)\n",
+ IRDA_DEBUG(1, "%s(), Unknown event %d, (%s)\n", __FUNCTION__,
event, irlap_event[event]);
ret = -EINVAL;
@@ -2184,7 +2172,7 @@
{
int ret = 0;
- IRDA_DEBUG(1, __FUNCTION__ "(), event=%s\n", irlap_event[event]);
+ IRDA_DEBUG(1, "%s(), event=%s\n", __FUNCTION__, irlap_event[event]);
ASSERT(self != NULL, return -ENODEV;);
ASSERT(self->magic == LAP_MAGIC, return -EBADR;);
@@ -2205,7 +2193,7 @@
irlap_next_state(self, LAP_SCLOSE);
break;
default:
- IRDA_DEBUG(1, __FUNCTION__ "(), Unknown event %d, (%s)\n",
+ IRDA_DEBUG(1, "%s(), Unknown event %d, (%s)\n", __FUNCTION__,
event, irlap_event[event]);
ret = -EINVAL;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)