projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Char: mxser_new, pci probing
[powerpc.git]
/
drivers
/
char
/
ser_a2232.c
diff --git
a/drivers/char/ser_a2232.c
b/drivers/char/ser_a2232.c
index
dda30e4
..
4217d38
100644
(file)
--- a/
drivers/char/ser_a2232.c
+++ b/
drivers/char/ser_a2232.c
@@
-97,12
+97,13
@@
#include <asm/amigahw.h>
#include <linux/zorro.h>
#include <asm/irq.h>
#include <asm/amigahw.h>
#include <linux/zorro.h>
#include <asm/irq.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
#include <linux/delay.h>
#include <linux/serial.h>
#include <linux/generic_serial.h>
#include <linux/delay.h>
#include <linux/serial.h>
#include <linux/generic_serial.h>
+#include <linux/tty_flip.h>
#include "ser_a2232.h"
#include "ser_a2232fw.h"
#include "ser_a2232.h"
#include "ser_a2232fw.h"
@@
-110,7
+111,7
@@
/***************************** Prototypes ***************************/
/* The interrupt service routine */
/***************************** Prototypes ***************************/
/* The interrupt service routine */
-static irqreturn_t a2232_vbl_inter(int irq, void *data
, struct pt_regs *fp
);
+static irqreturn_t a2232_vbl_inter(int irq, void *data);
/* Initialize the port structures */
static void a2232_init_portstructs(void);
/* Initialize and register TTY drivers. */
/* Initialize the port structures */
static void a2232_init_portstructs(void);
/* Initialize and register TTY drivers. */
@@
-194,11
+195,6
@@
static inline void a2232_receive_char(struct a2232_port *port, int ch, int err)
*/
struct tty_struct *tty = port->gs.tty;
*/
struct tty_struct *tty = port->gs.tty;
- if (tty->flip.count >= TTY_FLIPBUF_SIZE)
- return;
-
- tty->flip.count++;
-
#if 0
switch(err) {
case TTY_BREAK:
#if 0
switch(err) {
case TTY_BREAK:
@@
-212,8
+208,7
@@
static inline void a2232_receive_char(struct a2232_port *port, int ch, int err)
}
#endif
}
#endif
- *tty->flip.flag_buf_ptr++ = err;
- *tty->flip.char_buf_ptr++ = ch;
+ tty_insert_flip_char(tty, ch, err);
tty_flip_buffer_push(tty);
}
tty_flip_buffer_push(tty);
}
@@
-509,7
+504,7
@@
static int a2232_open(struct tty_struct * tty, struct file * filp)
}
/*** END OF FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
}
/*** END OF FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
-static irqreturn_t a2232_vbl_inter(int irq, void *data
, struct pt_regs *fp
)
+static irqreturn_t a2232_vbl_inter(int irq, void *data)
{
#if A2232_IOBUFLEN != 256
#error "Re-Implement a2232_vbl_inter()!"
{
#if A2232_IOBUFLEN != 256
#error "Re-Implement a2232_vbl_inter()!"
@@
-659,14
+654,14
@@
static void a2232_init_portstructs(void)
port->gs.closing_wait = 30 * HZ;
port->gs.rd = &a2232_real_driver;
#ifdef NEW_WRITE_LOCKING
port->gs.closing_wait = 30 * HZ;
port->gs.rd = &a2232_real_driver;
#ifdef NEW_WRITE_LOCKING
- init_MUTEX(&(port->gs.port_write_
sem
));
+ init_MUTEX(&(port->gs.port_write_
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);
}
}
-static struct tty_operations a2232_ops = {
+static
const
struct tty_operations a2232_ops = {
.open = a2232_open,
.close = gs_close,
.write = gs_write,
.open = a2232_open,
.close = gs_close,
.write = gs_write,