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
rocket: use tty_port
[pandora-kernel.git]
/
drivers
/
char
/
rocket_int.h
diff --git
a/drivers/char/rocket_int.h
b/drivers/char/rocket_int.h
index
b01d381
..
3affc48
100644
(file)
--- a/
drivers/char/rocket_int.h
+++ b/
drivers/char/rocket_int.h
@@
-55,7
+55,7
@@
static inline void sOutW(unsigned short port, unsigned short value)
static inline void out32(unsigned short port, Byte_t *p)
{
static inline void out32(unsigned short port, Byte_t *p)
{
- u32 value =
le32_to_cpu(get_unaligned((__le32 *)p)
);
+ u32 value =
get_unaligned_le32(p
);
#ifdef ROCKET_DEBUG_IO
printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
#endif
#ifdef ROCKET_DEBUG_IO
printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
#endif
@@
-1125,11
+1125,9
@@
Warnings: This function writes the data byte without checking to see if
struct r_port {
int magic;
struct r_port {
int magic;
+ struct tty_port port;
int line;
int line;
- int flags;
- int count;
- int blocked_open;
- struct tty_struct *tty;
+ int flags; /* Don't yet match the ASY_ flags!! */
unsigned int board:3;
unsigned int aiop:2;
unsigned int chan:3;
unsigned int board:3;
unsigned int aiop:2;
unsigned int chan:3;
@@
-1148,8
+1146,7
@@
struct r_port {
int read_status_mask;
int cps;
int read_status_mask;
int cps;
- wait_queue_head_t open_wait;
- struct completion close_wait;
+ struct completion close_wait; /* Not yet matching the core */
spinlock_t slock;
struct mutex write_mtx;
};
spinlock_t slock;
struct mutex write_mtx;
};