patch-2.4.20 linux-2.4.20/drivers/net/irda/irtty.c
Next file: linux-2.4.20/drivers/net/irda/ma600.c
Previous file: linux-2.4.20/drivers/net/irda/irport.c
Back to the patch index
Back to the overall index
- Lines: 178
- Date:
Thu Nov 28 15:53:13 2002
- Orig file:
linux-2.4.19/drivers/net/irda/irtty.c
- Orig date:
Sun Sep 30 12:26:06 2001
diff -urN linux-2.4.19/drivers/net/irda/irtty.c linux-2.4.20/drivers/net/irda/irtty.c
@@ -121,9 +121,8 @@
/* Unregister tty line-discipline */
if ((ret = tty_register_ldisc(N_IRDA, NULL))) {
- ERROR(__FUNCTION__
- "(), can't unregister line discipline (err = %d)\n",
- ret);
+ ERROR("%s(), can't unregister line discipline (err = %d)\n",
+ __FUNCTION__, ret);
}
/*
@@ -230,7 +229,7 @@
self->rx_buff.data = self->rx_buff.head;
if (!(dev = dev_alloc("irda%d", &err))) {
- ERROR(__FUNCTION__ "(), dev_alloc() failed!\n");
+ ERROR("%s(), dev_alloc() failed!\n", __FUNCTION__);
return -ENOMEM;
}
@@ -249,7 +248,7 @@
err = register_netdevice(dev);
rtnl_unlock();
if (err) {
- ERROR(__FUNCTION__ "(), register_netdev() failed!\n");
+ ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);
return -1;
}
@@ -352,7 +351,7 @@
cflag &= ~CBAUD;
- IRDA_DEBUG(2, __FUNCTION__ "(), Setting speed to %d\n", speed);
+ IRDA_DEBUG(2, "%s(), Setting speed to %d\n", __FUNCTION__, speed);
switch (speed) {
case 1200:
@@ -400,14 +399,14 @@
__u32 speed = (__u32) task->param;
int ret = 0;
- IRDA_DEBUG(2, __FUNCTION__ "(), <%ld>\n", jiffies);
+ IRDA_DEBUG(2, "%s(), <%ld>\n", __FUNCTION__, jiffies);
self = (struct irtty_cb *) task->instance;
ASSERT(self != NULL, return -1;);
/* Check if busy */
if (self->task && self->task != task) {
- IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n");
+ IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__);
return MSECS_TO_JIFFIES(10);
} else
self->task = task;
@@ -455,8 +454,7 @@
irda_task_next_state(task, IRDA_TASK_CHILD_DONE);
break;
case IRDA_TASK_CHILD_WAIT:
- WARNING(__FUNCTION__
- "(), changing speed of dongle timed out!\n");
+ WARNING("%s(), changing speed of dongle timed out!\n", __FUNCTION__);
ret = -1;
break;
case IRDA_TASK_CHILD_DONE:
@@ -467,7 +465,7 @@
self->task = NULL;
break;
default:
- ERROR(__FUNCTION__ "(), unknown state %d\n", task->state);
+ ERROR("%s(), unknown state %d\n", __FUNCTION__, task->state);
irda_task_next_state(task, IRDA_TASK_DONE);
self->task = NULL;
ret = -1;
@@ -559,7 +557,7 @@
struct irtty_cb *self = (struct irtty_cb *) tty->disc_data;
if (!self || !self->netdev) {
- IRDA_DEBUG(0, __FUNCTION__ "(), not ready yet!\n");
+ IRDA_DEBUG(0, "%s(), not ready yet!\n", __FUNCTION__);
return;
}
@@ -605,7 +603,7 @@
{
struct irtty_cb *self;
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
self = (struct irtty_cb *) task->instance;
@@ -684,7 +682,7 @@
*/
static int irtty_receive_room(struct tty_struct *tty)
{
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
return 65536; /* We can handle an infinite amount of data. :-) */
}
@@ -714,19 +712,19 @@
self->tx_buff.data += actual;
self->tx_buff.len -= actual;
-
- self->stats.tx_packets++;
} else {
/*
* Now serial buffer is almost free & we can start
* transmission of another packet
*/
- IRDA_DEBUG(5, __FUNCTION__ "(), finished with frame!\n");
+ IRDA_DEBUG(5, "%s(), finished with frame!\n", __FUNCTION__);
+ self->stats.tx_packets++;
+
tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
if (self->new_speed) {
- IRDA_DEBUG(5, __FUNCTION__ "(), Changing speed!\n");
+ IRDA_DEBUG(5, "%s(), Changing speed!\n", __FUNCTION__);
irda_task_execute(self, irtty_change_speed,
irtty_change_speed_complete,
NULL, (void *) self->new_speed);
@@ -760,14 +758,11 @@
struct irtty_cb *self;
struct tty_struct *tty;
mm_segment_t fs;
- int arg = 0;
+ int arg = TIOCM_MODEM_BITS;
self = (struct irtty_cb *) dev->priv;
tty = self->tty;
-#ifdef TIOCM_OUT2 /* Not defined for ARM */
- arg = TIOCM_OUT2;
-#endif
if (rts)
arg |= TIOCM_RTS;
if (dtr)
@@ -785,7 +780,7 @@
set_fs(get_ds());
if (tty->driver.ioctl(tty, NULL, TIOCMSET, (unsigned long) &arg)) {
- IRDA_DEBUG(2, __FUNCTION__ "(), error doing ioctl!\n");
+ IRDA_DEBUG(2, "%s(), error doing ioctl!\n", __FUNCTION__);
}
set_fs(fs);
@@ -808,7 +803,7 @@
ASSERT(self != NULL, return -1;);
- IRDA_DEBUG(2, __FUNCTION__ "(), mode=%s\n", infrared_mode[mode]);
+ IRDA_DEBUG(2, "%s(), mode=%s\n", __FUNCTION__, infrared_mode[mode]);
/* save status for driver */
self->mode = mode;
@@ -901,7 +896,7 @@
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRTTY_MAGIC, return -1;);
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
/* Ready to play! */
netif_start_queue(dev);
@@ -969,7 +964,7 @@
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRTTY_MAGIC, return -1;);
- IRDA_DEBUG(3, __FUNCTION__ "(), %s, (cmd=0x%X)\n", dev->name, cmd);
+ IRDA_DEBUG(3, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
/* Disable interrupts & save flags */
save_flags(flags);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)