Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 17691
b: refs/heads/master
c: aaa246e
h: refs/heads/master
i:
  17689: b0e1213
  17687: 87045e0
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jan 10, 2006
1 parent 8d1bd58 commit 3a98896
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 86 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8070e35c6524e0f254cd69f493c50811e8e5b856
refs/heads/master: aaa246ea78c68cd205f505070650cda7c5a95d34
163 changes: 81 additions & 82 deletions trunk/drivers/char/isicom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,17 @@

#include <linux/isicom.h>

#define InterruptTheCard(base) outw(0, (base) + 0xc)
#define ClearInterrupt(base) inw((base) + 0x0a)

#ifdef DEBUG
#define pr_dbg(str...) printk(KERN_DEBUG "ISICOM: " str)
#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c))
#else
#define pr_dbg(str...) do { } while (0)
#define isicom_paranoia_check(a, b, c) 0
#endif

static struct pci_device_id isicom_pci_tbl[] = {
{ VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Expand All @@ -161,7 +172,6 @@ static void isicom_tx(unsigned long _data);
static void isicom_start(struct tty_struct *tty);

static unsigned char *tmp_buf;
static DECLARE_MUTEX(tmp_buf_sem);

/* baud index mappings from linux defns to isi */

Expand Down Expand Up @@ -599,23 +609,20 @@ static int ISILoad_ioctl(struct inode *inode, struct file *filp,
*
*/

static inline int isicom_paranoia_check(struct isi_port const *port, char *name,
const char *routine)
static inline int __isicom_paranoia_check(struct isi_port const *port,
char *name, const char *routine)
{
#ifdef ISICOM_DEBUG
static const char *badmagic =
KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n";
static const char *badport =
KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n";
if (!port) {
printk(badport, name, routine);
printk(KERN_WARNING "ISICOM: Warning: bad isicom magic for "
"dev %s in %s.\n", name, routine);
return 1;
}
if (port->magic != ISICOM_MAGIC) {
printk(badmagic, name, routine);
printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for "
"dev %s in %s.\n", name, routine);
return 1;
}
#endif

return 0;
}

Expand Down Expand Up @@ -674,12 +681,10 @@ static void isicom_tx(unsigned long _data)
unlock_card(&isi_card[card]);
continue;
}
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n",
txcount, port->channel+1);
#endif
outw((port->channel << isi_card[card].shift_count) | txcount
, base);
pr_dbg("txing %d bytes, port%d.\n", txcount,
port->channel + 1);
outw((port->channel << isi_card[card].shift_count) | txcount,
base);
residue = NO;
wrd = 0;
while (1) {
Expand Down Expand Up @@ -725,8 +730,11 @@ static void isicom_tx(unsigned long _data)

/* schedule another tx for hopefully in about 10ms */
sched_again:
if (!re_schedule)
return;
if (!re_schedule) {
re_schedule = 2;
return;
}

init_timer(&tx);
tx.expires = jiffies + HZ/100;
tx.data = 0;
Expand Down Expand Up @@ -830,19 +838,15 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (port->status & ISI_DCD) {
if (!(header & ISI_DCD)) {
/* Carrier has been lost */
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n");
#endif
pr_dbg("interrupt: DCD->low.\n");
port->status &= ~ISI_DCD;
schedule_work(&port->hangup_tq);
}
}
else {
if (header & ISI_DCD) {
/* Carrier has been detected */
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n");
#endif
pr_dbg("interrupt: DCD->high.\n");
port->status |= ISI_DCD;
wake_up_interruptible(&port->open_wait);
}
Expand Down Expand Up @@ -899,21 +903,18 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
break;

case 2: /* Statistics */
printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n");
pr_dbg("isicom_interrupt: stats!!!.\n");
break;

default:
printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n");
pr_dbg("Intr: Unknown code in status packet.\n");
break;
}
}
else { /* Data Packet */

count = tty_prepare_flip_string(tty, &rp, byte_count & ~1);
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n",
count, byte_count);
#endif
pr_dbg("Intr: Can rx %d of %d bytes.\n", count, byte_count);
word_count = count >> 1;
insw(base, rp, word_count);
byte_count -= (word_count << 1);
Expand All @@ -922,8 +923,8 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
byte_count -= 2;
}
if (byte_count > 0) {
printk(KERN_DEBUG "ISICOM: Intr(0x%lx:%d): Flip buffer overflow! dropping bytes...\n",
base, channel+1);
pr_dbg("Intr(0x%lx:%d): Flip buffer overflow! dropping "
"bytes...\n", base, channel + 1);
while(byte_count > 0) { /* drain out unread xtra data */
inw(base);
byte_count -= 2;
Expand Down Expand Up @@ -1116,9 +1117,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi
/* block if port is in the process of being closed */

if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n");
#endif
pr_dbg("block_til_ready: close in progress.\n");
interruptible_sleep_on(&port->close_wait);
if (port->flags & ASYNC_HUP_NOTIFY)
return -EAGAIN;
Expand All @@ -1129,9 +1128,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi
/* if non-blocking mode is set ... */

if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) {
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n");
#endif
pr_dbg("block_til_ready: non-block mode.\n");
port->flags |= ASYNC_NORMAL_ACTIVE;
return 0;
}
Expand Down Expand Up @@ -1271,7 +1268,7 @@ static void isicom_shutdown_port(struct isi_port *port)
set_bit(TTY_IO_ERROR, &tty->flags);

if (--card->count < 0) {
printk(KERN_DEBUG "ISICOM: isicom_shutdown_port: bad board(0x%lx) count %d.\n",
pr_dbg("isicom_shutdown_port: bad board(0x%lx) count %d.\n",
card->base, card->count);
card->count = 0;
}
Expand All @@ -1294,9 +1291,7 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
if (isicom_paranoia_check(port, tty->name, "isicom_close"))
return;

#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: Close start!!!.\n");
#endif
pr_dbg("Close start!!!.\n");

spin_lock_irqsave(&card->card_lock, flags);
if (tty_hung_up_p(filp)) {
Expand Down Expand Up @@ -1347,9 +1342,7 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
if (port->blocked_open) {
spin_unlock_irqrestore(&card->card_lock, flags);
if (port->close_delay) {
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: scheduling until time out.\n");
#endif
pr_dbg("scheduling until time out.\n");
msleep_interruptible(jiffies_to_msecs(port->close_delay));
}
spin_lock_irqsave(&card->card_lock, flags);
Expand Down Expand Up @@ -1786,42 +1779,44 @@ static struct tty_operations isicom_ops = {
.tiocmset = isicom_tiocmset,
};

static int __devinit register_drivers(void)
static int __devinit isicom_register_tty_driver(void)
{
int error;
int error = -ENOMEM;

/* tty driver structure initialization */
isicom_normal = alloc_tty_driver(PORT_COUNT);
if (!isicom_normal)
return -ENOMEM;

isicom_normal->owner = THIS_MODULE;
isicom_normal->name = "ttyM";
isicom_normal->devfs_name = "isicom/";
isicom_normal->major = ISICOM_NMAJOR;
isicom_normal->minor_start = 0;
isicom_normal->type = TTY_DRIVER_TYPE_SERIAL;
isicom_normal->subtype = SERIAL_TYPE_NORMAL;
isicom_normal->init_termios = tty_std_termios;
isicom_normal->init_termios.c_cflag =
B9600 | CS8 | CREAD | HUPCL |CLOCAL;
isicom_normal->flags = TTY_DRIVER_REAL_RAW;
goto end;

isicom_normal->owner = THIS_MODULE;
isicom_normal->name = "ttyM";
isicom_normal->devfs_name = "isicom/";
isicom_normal->major = ISICOM_NMAJOR;
isicom_normal->minor_start = 0;
isicom_normal->type = TTY_DRIVER_TYPE_SERIAL;
isicom_normal->subtype = SERIAL_TYPE_NORMAL;
isicom_normal->init_termios = tty_std_termios;
isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |
CLOCAL;
isicom_normal->flags = TTY_DRIVER_REAL_RAW;
tty_set_operations(isicom_normal, &isicom_ops);

if ((error=tty_register_driver(isicom_normal))!=0) {
printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n",
if ((error = tty_register_driver(isicom_normal))) {
pr_dbg("Couldn't register the dialin driver, error=%d\n",
error);
put_tty_driver(isicom_normal);
return error;
}
return 0;
end:
return error;
}

static void unregister_drivers(void)
static void isicom_unregister_tty_driver(void)
{
int error = tty_unregister_driver(isicom_normal);
if (error)
printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error);
int error;

if ((error = tty_unregister_driver(isicom_normal)))
pr_dbg("couldn't unregister normal driver, error=%d.\n", error);

put_tty_driver(isicom_normal);
}

Expand Down Expand Up @@ -1891,15 +1886,15 @@ static int __devinit isicom_init(void)
free_page((unsigned long)tmp_buf);
return 0;
}
if (register_drivers())
if (isicom_register_tty_driver())
{
unregister_ioregion();
free_page((unsigned long)tmp_buf);
return 0;
}
if (!register_isr())
{
unregister_drivers();
isicom_unregister_tty_driver();
/* ioports already uregistered in register_isr */
free_page((unsigned long)tmp_buf);
return 0;
Expand Down Expand Up @@ -1936,14 +1931,6 @@ static int __devinit isicom_init(void)
static int io[4];
static int irq[4];

MODULE_AUTHOR("MultiTech");
MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
MODULE_LICENSE("GPL");
module_param_array(io, int, NULL, 0);
MODULE_PARM_DESC(io, "I/O ports for the cards");
module_param_array(irq, int, NULL, 0);
MODULE_PARM_DESC(irq, "Interrupts for the cards");

static int __devinit isicom_setup(void)
{
struct pci_dev *dev = NULL;
Expand Down Expand Up @@ -2047,11 +2034,15 @@ static int __devinit isicom_setup(void)

static void __exit isicom_exit(void)
{
unsigned int index = 0;

re_schedule = 0;
/* FIXME */
msleep(1000);

while (re_schedule != 2 && index++ < 100)
msleep(10);

unregister_isr();
unregister_drivers();
isicom_unregister_tty_driver();
unregister_ioregion();
if (tmp_buf)
free_page((unsigned long)tmp_buf);
Expand All @@ -2061,3 +2052,11 @@ static void __exit isicom_exit(void)

module_init(isicom_setup);
module_exit(isicom_exit);

MODULE_AUTHOR("MultiTech");
MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
MODULE_LICENSE("GPL");
module_param_array(io, int, NULL, 0);
MODULE_PARM_DESC(io, "I/O ports for the cards");
module_param_array(irq, int, NULL, 0);
MODULE_PARM_DESC(irq, "Interrupts for the cards");
3 changes: 0 additions & 3 deletions trunk/include/linux/isicom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ typedef struct {
#define ISICOM_INITIATE_XONXOFF 0x04
#define ISICOM_RESPOND_XONXOFF 0x08

#define InterruptTheCard(base) (outw(0,(base)+0xc))
#define ClearInterrupt(base) (inw((base)+0x0a))

#define BOARD(line) (((line) >> 4) & 0x3)

/* isi kill queue bitmap */
Expand Down

0 comments on commit 3a98896

Please sign in to comment.