projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
include
/
linux
/
serial_8250.h
diff --git
a/include/linux/serial_8250.h
b/include/linux/serial_8250.h
index
faa0e03
..
4348797
100644
(file)
--- a/
include/linux/serial_8250.h
+++ b/
include/linux/serial_8250.h
@@
-76,6
+76,12
@@
struct uart_8250_ops {
void (*release_irq)(struct uart_8250_port *);
};
void (*release_irq)(struct uart_8250_port *);
};
+struct uart_8250_em485 {
+ struct timer_list start_tx_timer; /* "rs485 start tx" timer */
+ struct timer_list stop_tx_timer; /* "rs485 stop tx" timer */
+ struct timer_list *active_timer; /* pointer to active timer */
+};
+
/*
* This should be used by drivers which want to register
* their own 8250 ports without registering their own
/*
* This should be used by drivers which want to register
* their own 8250 ports without registering their own
@@
-122,6
+128,8
@@
struct uart_8250_port {
/* 8250 specific callbacks */
int (*dl_read)(struct uart_8250_port *);
void (*dl_write)(struct uart_8250_port *, int);
/* 8250 specific callbacks */
int (*dl_read)(struct uart_8250_port *);
void (*dl_write)(struct uart_8250_port *, int);
+
+ struct uart_8250_em485 *em485;
};
static inline struct uart_8250_port *up_to_u8250p(struct uart_port *up)
};
static inline struct uart_8250_port *up_to_u8250p(struct uart_port *up)