git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
char
/
vme_scc.c
diff --git
a/drivers/char/vme_scc.c
b/drivers/char/vme_scc.c
index
33e71e2
..
bfe5ea9
100644
(file)
--- a/
drivers/char/vme_scc.c
+++ b/
drivers/char/vme_scc.c
@@
-14,7
+14,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
@@
-147,7
+146,6
@@
static int scc_init_drivers(void)
scc_driver->owner = THIS_MODULE;
scc_driver->driver_name = "scc";
scc_driver->name = "ttyS";
scc_driver->owner = THIS_MODULE;
scc_driver->driver_name = "scc";
scc_driver->name = "ttyS";
- scc_driver->devfs_name = "tts/";
scc_driver->major = TTY_MAJOR;
scc_driver->minor_start = SCC_MINOR_BASE;
scc_driver->type = TTY_DRIVER_TYPE_SERIAL;
scc_driver->major = TTY_MAJOR;
scc_driver->minor_start = SCC_MINOR_BASE;
scc_driver->type = TTY_DRIVER_TYPE_SERIAL;
@@
-184,7
+182,7
@@
static void scc_init_portstructs(void)
port->gs.closing_wait = 30 * HZ;
port->gs.rd = &scc_real_driver;
#ifdef NEW_WRITE_LOCKING
port->gs.closing_wait = 30 * HZ;
port->gs.rd = &scc_real_driver;
#ifdef NEW_WRITE_LOCKING
- port->gs.port_write_
sem
= MUTEX;
+ port->gs.port_write_
mutex
= MUTEX;
#endif
init_waitqueue_head(&port->gs.open_wait);
init_waitqueue_head(&port->gs.close_wait);
#endif
init_waitqueue_head(&port->gs.open_wait);
init_waitqueue_head(&port->gs.close_wait);
@@
-205,13
+203,13
@@
static int mvme147_scc_init(void)
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-232,13
+230,13
@@
static int mvme147_scc_init(void)
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-B special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-275,13
+273,13
@@
static int mvme162_scc_init(void)
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-302,13
+300,13
@@
static int mvme162_scc_init(void)
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
"SCC-B special cond", port);
{
@@
-343,13
+341,13
@@
static int bvme6000_scc_init(void)
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(BVME_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(BVME_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-370,13
+368,13
@@
static int bvme6000_scc_init(void)
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(BVME_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(BVME_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
"SCC-B special cond", port);
{
@@
-434,13
+432,7
@@
static irqreturn_t scc_rx_int(int irq, void *data, struct pt_regs *fp)
SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
return IRQ_HANDLED;
}
SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
return IRQ_HANDLED;
}
- if (tty->flip.count < TTY_FLIPBUF_SIZE) {
- *tty->flip.char_buf_ptr = ch;
- *tty->flip.flag_buf_ptr = 0;
- tty->flip.flag_buf_ptr++;
- tty->flip.char_buf_ptr++;
- tty->flip.count++;
- }
+ tty_insert_flip_char(tty, ch, 0);
/* Check if another character is already ready; in that case, the
* spcond_int() function must be used, because this character may have an
/* Check if another character is already ready; in that case, the
* spcond_int() function must be used, because this character may have an
@@
-487,13
+479,7
@@
static irqreturn_t scc_spcond_int(int irq, void *data, struct pt_regs *fp)
else
err = 0;
else
err = 0;
- if (tty->flip.count < TTY_FLIPBUF_SIZE) {
- *tty->flip.char_buf_ptr = ch;
- *tty->flip.flag_buf_ptr = err;
- tty->flip.flag_buf_ptr++;
- tty->flip.char_buf_ptr++;
- tty->flip.count++;
- }
+ tty_insert_flip_char(tty, ch, err);
/* ++TeSche: *All* errors have to be cleared manually,
* else the condition persists for the next chars
/* ++TeSche: *All* errors have to be cleared manually,
* else the condition persists for the next chars