Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

isicom: split the open method for the isicom device

Browse source 
Again moving towards being able to add a common open method

Signed-off-by: Alan Cox <alan@linux.intel.com>
This commit is contained in:
Alan Cox 2009-09-19 13:13:27 -07:00 committed by Live-CD User
parent a509a7e478
commit 11d85d7b2e
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/char/isicom.c
View file

@ -846,37 +846,53 @@ static int isicom_carrier_raised(struct tty_port *port)
return (ip->status & ISI_DCD)?1 : 0; return (ip->status & ISI_DCD)?1 : 0;
} }
static int isicom_open(struct tty_struct *tty, struct file *filp) static struct tty_port *isicom_find_port(struct tty_struct *tty)
{ {
struct isi_port *port; struct isi_port *port;
struct isi_board *card; struct isi_board *card;
unsigned int board; unsigned int board;
int error, line; int line = tty->index;
line = tty->index;
if (line < 0 || line > PORT_COUNT-1) if (line < 0 || line > PORT_COUNT-1)
return -ENODEV; return NULL;
board = BOARD(line); board = BOARD(line);
card = &isi_card[board]; card = &isi_card[board];
if (!(card->status & FIRMWARE_LOADED)) if (!(card->status & FIRMWARE_LOADED))
return -ENODEV; return NULL;
/* open on a port greater than the port count for the card !!! */ /* open on a port greater than the port count for the card !!! */
if (line > ((board * 16) + card->port_count - 1)) if (line > ((board * 16) + card->port_count - 1))
return -ENODEV; return NULL;
port = &isi_ports[line]; port = &isi_ports[line];
if (isicom_paranoia_check(port, tty->name, "isicom_open")) if (isicom_paranoia_check(port, tty->name, "isicom_open"))
return -ENODEV; return NULL;
return &port->port;
}
static int isicom_open(struct tty_struct *tty, struct file *filp)
{
struct isi_port *port;
struct isi_board *card;
struct tty_port *tport;
int error = 0;
tport = isicom_find_port(tty);
if (tport == NULL)
return -ENODEV;
port = container_of(tport, struct isi_port, port);
card = &isi_card[BOARD(tty->index)];
isicom_setup_board(card); isicom_setup_board(card);
/* FIXME: locking on port.count etc */ /* FIXME: locking on port.count etc */
port->port.count++; port->port.count++;
tty->driver_data = port; tty->driver_data = port;
tty_port_tty_set(&port->port, tty); tty_port_tty_set(&port->port, tty);
error = isicom_setup_port(tty); /* FIXME: Locking on Initialized flag */
if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
error = isicom_setup_port(tty);
if (error == 0) if (error == 0)
error = tty_port_block_til_ready(&port->port, tty, filp); error = tty_port_block_til_ready(&port->port, tty, filp);
return error; return error;