Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304119
b: refs/heads/master
c: 5de0a56
h: refs/heads/master
i:
  304117: 81f1d1d
  304115: 1c12f1d
  304111: aad3666
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent 794aef7 commit f55ca55
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 953756e2fb02880d6d6b7d961540a064c6df9f97
refs/heads/master: 5de0a567c020479d89953038eee9192d417349be
64 changes: 2 additions & 62 deletions trunk/include/linux/generic_serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,15 @@
* Copyright (C) 1998 R.E.Wolff@BitWizard.nl
*
* written for the SX serial driver.
* Contains the code that should be shared over all the serial drivers.
*
* Version 0.1 -- December, 1998.
*/

#ifndef GENERIC_SERIAL_H
#define GENERIC_SERIAL_H

#ifdef __KERNEL__
#include <linux/mutex.h>
#include <linux/tty.h>

struct real_driver {
void (*disable_tx_interrupts) (void *);
void (*enable_tx_interrupts) (void *);
void (*disable_rx_interrupts) (void *);
void (*enable_rx_interrupts) (void *);
void (*shutdown_port) (void*);
int (*set_real_termios) (void*);
int (*chars_in_buffer) (void*);
void (*close) (void*);
void (*hungup) (void*);
void (*getserial) (void*, struct serial_struct *sp);
};



struct gs_port {
int magic;
struct tty_port port;
unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
int xmit_cnt;
struct mutex port_write_mutex;
unsigned long event;
unsigned short closing_wait;
int close_delay;
struct real_driver *rd;
int wakeup_chars;
int baud_base;
int baud;
int custom_divisor;
spinlock_t driver_lock;
};

#endif /* __KERNEL__ */
#warning Use of this header is deprecated.
#warning Since nobody sets the constants defined here for you, you should not, in any case, use them. Including the header is thus pointless.

/* Flags */
/* Warning: serial.h defines some ASYNC_ flags, they say they are "only"
Expand All @@ -60,8 +22,6 @@ struct gs_port {
#define GS_RX_INTEN 0x00400000
#define GS_ACTIVE 0x00200000



#define GS_TYPE_NORMAL 1

#define GS_DEBUG_FLUSH 0x00000001
Expand All @@ -72,24 +32,4 @@ struct gs_port {
#define GS_DEBUG_FLOW 0x00000020
#define GS_DEBUG_WRITE 0x00000040

#ifdef __KERNEL__
int gs_put_char(struct tty_struct *tty, unsigned char ch);
int gs_write(struct tty_struct *tty,
const unsigned char *buf, int count);
int gs_write_room(struct tty_struct *tty);
int gs_chars_in_buffer(struct tty_struct *tty);
void gs_flush_buffer(struct tty_struct *tty);
void gs_flush_chars(struct tty_struct *tty);
void gs_stop(struct tty_struct *tty);
void gs_start(struct tty_struct *tty);
void gs_hangup(struct tty_struct *tty);
int gs_block_til_ready(void *port, struct file *filp);
void gs_close(struct tty_struct *tty, struct file *filp);
void gs_set_termios (struct tty_struct * tty,
struct ktermios * old_termios);
int gs_init_port(struct gs_port *port);
int gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
void gs_got_break(struct gs_port *port);
#endif /* __KERNEL__ */
#endif

0 comments on commit f55ca55

Please sign in to comment.