#include <linux/init.h>
#include <asm/uaccess.h>
#include <linux/smp_lock.h>
+#include <linux/delay.h>
#include <net/irda/irda.h>
#include <net/irda/irda_device.h>
{
struct sirtty_cb *priv = dev->priv;
- ASSERT(priv != NULL, return -1;);
- ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
+ IRDA_ASSERT(priv != NULL, return -1;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
return priv->tty->driver->chars_in_buffer(priv->tty);
}
struct sirtty_cb *priv = dev->priv;
struct tty_struct *tty;
- ASSERT(priv != NULL, return;);
- ASSERT(priv->magic == IRTTY_MAGIC, return;);
+ IRDA_ASSERT(priv != NULL, return;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return;);
tty = priv->tty;
if (tty->driver->wait_until_sent) {
unlock_kernel();
}
else {
- set_task_state(current, TASK_UNINTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(USBSERIAL_TX_DONE_DELAY));
+ msleep(USBSERIAL_TX_DONE_DELAY);
}
}
struct termios old_termios;
int cflag;
- ASSERT(priv != NULL, return -1;);
- ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
+ IRDA_ASSERT(priv != NULL, return -1;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
tty = priv->tty;
int set = 0;
int clear = 0;
- ASSERT(priv != NULL, return -1;);
- ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
+ IRDA_ASSERT(priv != NULL, return -1;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
if (rts)
set |= TIOCM_RTS;
* This function is not yet defined for all tty driver, so
* let's be careful... Jean II
*/
- ASSERT(priv->tty->driver->tiocmset != NULL, return -1;);
+ IRDA_ASSERT(priv->tty->driver->tiocmset != NULL, return -1;);
priv->tty->driver->tiocmset(priv->tty, NULL, set, clear);
return 0;
struct tty_struct *tty;
int writelen;
- ASSERT(priv != NULL, return -1;);
- ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
+ IRDA_ASSERT(priv != NULL, return -1;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;);
tty = priv->tty;
if (!tty->driver->write)
struct sirtty_cb *priv = tty->disc_data;
int i;
- ASSERT(priv != NULL, return;);
- ASSERT(priv->magic == IRTTY_MAGIC, return;);
+ IRDA_ASSERT(priv != NULL, return;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return;);
if (unlikely(count==0)) /* yes, this happens */
return;
dev = priv->dev;
if (!dev) {
- WARNING("%s(), not ready yet!\n", __FUNCTION__);
+ IRDA_WARNING("%s(), not ready yet!\n", __FUNCTION__);
return;
}
{
struct sirtty_cb *priv = tty->disc_data;
- ASSERT(priv != NULL, return 0;);
- ASSERT(priv->magic == IRTTY_MAGIC, return 0;);
+ IRDA_ASSERT(priv != NULL, return 0;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return 0;);
return 65536; /* We can handle an infinite amount of data. :-) */
}
{
struct sirtty_cb *priv = tty->disc_data;
- ASSERT(priv != NULL, return;);
- ASSERT(priv->magic == IRTTY_MAGIC, return;);
+ IRDA_ASSERT(priv != NULL, return;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return;);
tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
/* ------------------------------------------------------- */
-struct sir_driver sir_tty_drv = {
+static struct sir_driver sir_tty_drv = {
.owner = THIS_MODULE,
.driver_name = "sir_tty",
.start_dev = irtty_start_dev,
struct sirtty_cb *priv = tty->disc_data;
int err = 0;
- ASSERT(priv != NULL, return -ENODEV;);
- ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;);
+ IRDA_ASSERT(priv != NULL, return -ENODEV;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;);
IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __FUNCTION__, cmd);
dev = priv->dev;
- ASSERT(dev != NULL, return -1;);
+ IRDA_ASSERT(dev != NULL, return -1;);
switch (cmd) {
case TCGETS:
break;
case IRTTY_IOCGET:
- ASSERT(dev->netdev != NULL, return -1;);
+ IRDA_ASSERT(dev->netdev != NULL, return -1;);
memset(&info, 0, sizeof(info));
strncpy(info.name, dev->netdev->name, sizeof(info.name)-1);
{
struct sirtty_cb *priv = tty->disc_data;
- ASSERT(priv != NULL, return;);
- ASSERT(priv->magic == IRTTY_MAGIC, return;);
+ IRDA_ASSERT(priv != NULL, return;);
+ IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return;);
/* Hm, with a dongle attached the dongle driver wants
* to close the dongle - which requires the use of
int err;
if ((err = tty_register_ldisc(N_IRDA, &irda_ldisc)) != 0)
- ERROR("IrDA: can't register line discipline (err = %d)\n",
- err);
+ IRDA_ERROR("IrDA: can't register line discipline (err = %d)\n",
+ err);
return err;
}
int err;
if ((err = tty_register_ldisc(N_IRDA, NULL))) {
- ERROR("%s(), can't unregister line discipline (err = %d)\n",
- __FUNCTION__, err);
+ IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n",
+ __FUNCTION__, err);
}
}