Skip to content

L
linux-davinci-2.6.23
Commit 5e07e1cc authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files
Options

[PATCH] Char: n_r3964, cleanup 

- Lindent the code
- allow semicolons after macros by 'do {} while (0)'
- eliminate C++ comments
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 44bafdf3
Show whitespace changes
Inline Side-by-side
Showing with 981 additions and 1116 deletions
drivers/char/n_r3964.c
View file @ 5e07e1cc
...@@ -68,54 +68,48 @@ ...@@ -68,54 +68,48 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/*#define DEBUG_QUEUE*/
//#define DEBUG_QUEUE
/* Log successful handshake and protocol operations */ /* Log successful handshake and protocol operations */
//#define DEBUG_PROTO_S /*#define DEBUG_PROTO_S*/
/* Log handshake and protocol errors: */ /* Log handshake and protocol errors: */
//#define DEBUG_PROTO_E /*#define DEBUG_PROTO_E*/
/* Log Linediscipline operations (open, close, read, write...): */ /* Log Linediscipline operations (open, close, read, write...): */
//#define DEBUG_LDISC /*#define DEBUG_LDISC*/
/* Log module and memory operations (init, cleanup; kmalloc, kfree): */ /* Log module and memory operations (init, cleanup; kmalloc, kfree): */
//#define DEBUG_MODUL /*#define DEBUG_MODUL*/
/* Macro helpers for debug output: */ /* Macro helpers for debug output: */
#define TRACE(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE(format, args...) printk("r3964: " format "\n" , ## args)
#ifdef DEBUG_MODUL #ifdef DEBUG_MODUL
#define TRACE_M(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE_M(format, args...) printk("r3964: " format "\n" , ## args)
#else #else
#define TRACE_M(fmt, arg...) /**/ #define TRACE_M(fmt, arg...) do {} while (0)
#endif #endif
#ifdef DEBUG_PROTO_S #ifdef DEBUG_PROTO_S
#define TRACE_PS(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE_PS(format, args...) printk("r3964: " format "\n" , ## args)
#else #else
#define TRACE_PS(fmt, arg...) /**/ #define TRACE_PS(fmt, arg...) do {} while (0)
#endif #endif
#ifdef DEBUG_PROTO_E #ifdef DEBUG_PROTO_E
#define TRACE_PE(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE_PE(format, args...) printk("r3964: " format "\n" , ## args)
#else #else
#define TRACE_PE(fmt, arg...) /**/ #define TRACE_PE(fmt, arg...) do {} while (0)
#endif #endif
#ifdef DEBUG_LDISC #ifdef DEBUG_LDISC
#define TRACE_L(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE_L(format, args...) printk("r3964: " format "\n" , ## args)
#else #else
#define TRACE_L(fmt, arg...) /**/ #define TRACE_L(fmt, arg...) do {} while (0)
#endif #endif
#ifdef DEBUG_QUEUE #ifdef DEBUG_QUEUE
#define TRACE_Q(format, args...) printk("r3964: " format "\n" , ## args); #define TRACE_Q(format, args...) printk("r3964: " format "\n" , ## args)
#else #else
#define TRACE_Q(fmt, arg...) /**/ #define TRACE_Q(fmt, arg...) do {} while (0)
#endif #endif
static void add_tx_queue(struct r3964_info *, struct r3964_block_header *); static void add_tx_queue(struct r3964_info *, struct r3964_block_header *);
static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code); static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code);
static void put_char(struct r3964_info *pInfo, unsigned char ch); static void put_char(struct r3964_info *pInfo, unsigned char ch);
...@@ -126,10 +120,11 @@ static void receive_char(struct r3964_info *pInfo, const unsigned char c); ...@@ -126,10 +120,11 @@ static void receive_char(struct r3964_info *pInfo, const unsigned char c);
static void receive_error(struct r3964_info *pInfo, const char flag); static void receive_error(struct r3964_info *pInfo, const char flag);
static void on_timeout(unsigned long priv); static void on_timeout(unsigned long priv);
static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg); static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg);
static int read_telegram(struct r3964_info *pInfo, struct pid *pid, unsigned char __user *buf); static int read_telegram(struct r3964_info *pInfo, struct pid *pid,
unsigned char __user * buf);
static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg, static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
int error_code, struct r3964_block_header *pBlock); int error_code, struct r3964_block_header *pBlock);
static struct r3964_message* remove_msg(struct r3964_info *pInfo, static struct r3964_message *remove_msg(struct r3964_info *pInfo,
struct r3964_client_info *pClient); struct r3964_client_info *pClient);
static void remove_client_block(struct r3964_info *pInfo, static void remove_client_block(struct r3964_info *pInfo,
struct r3964_client_info *pClient); struct r3964_client_info *pClient);
...@@ -137,13 +132,13 @@ static void remove_client_block(struct r3964_info *pInfo, ...@@ -137,13 +132,13 @@ static void remove_client_block(struct r3964_info *pInfo,
static int r3964_open(struct tty_struct *tty); static int r3964_open(struct tty_struct *tty);
static void r3964_close(struct tty_struct *tty); static void r3964_close(struct tty_struct *tty);
static ssize_t r3964_read(struct tty_struct *tty, struct file *file, static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
unsigned char __user *buf, size_t nr); unsigned char __user * buf, size_t nr);
static ssize_t r3964_write(struct tty_struct * tty, struct file * file, static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
const unsigned char * buf, size_t nr); const unsigned char *buf, size_t nr);
static int r3964_ioctl(struct tty_struct * tty, struct file * file, static int r3964_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static void r3964_set_termios(struct tty_struct *tty, struct ktermios * old); static void r3964_set_termios(struct tty_struct *tty, struct ktermios *old);
static unsigned int r3964_poll(struct tty_struct * tty, struct file * file, static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,
struct poll_table_struct *wait); struct poll_table_struct *wait);
static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp, static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count); char *fp, int count);
...@@ -162,32 +157,24 @@ static struct tty_ldisc tty_ldisc_N_R3964 = { ...@@ -162,32 +157,24 @@ static struct tty_ldisc tty_ldisc_N_R3964 = {
.receive_buf = r3964_receive_buf, .receive_buf = r3964_receive_buf,
}; };
static void dump_block(const unsigned char *block, unsigned int length) static void dump_block(const unsigned char *block, unsigned int length)
{ {
unsigned int i,j; unsigned int i, j;
char linebuf[16*3+1]; char linebuf[16 * 3 + 1];
for(i=0;i<length;i+=16) for (i = 0; i < length; i += 16) {
{ for (j = 0; (j < 16) && (j + i < length); j++) {
for(j=0;(j<16) && (j+i<length);j++) sprintf(linebuf + 3 * j, "%02x ", block[i + j]);
{
sprintf(linebuf+3*j,"%02x ",block[i+j]);
} }
linebuf[3*j]='\0'; linebuf[3 * j] = '\0';
TRACE_PS("%s",linebuf); TRACE_PS("%s", linebuf);
} }
} }
/************************************************************* /*************************************************************
* Driver initialisation * Driver initialisation
*************************************************************/ *************************************************************/
/************************************************************* /*************************************************************
* Module support routines * Module support routines
*************************************************************/ *************************************************************/
...@@ -196,43 +183,38 @@ static void __exit r3964_exit(void) ...@@ -196,43 +183,38 @@ static void __exit r3964_exit(void)
{ {
int status; int status;
TRACE_M ("cleanup_module()"); TRACE_M("cleanup_module()");
status=tty_unregister_ldisc(N_R3964); status = tty_unregister_ldisc(N_R3964);
if(status!=0) if (status != 0) {
{ printk(KERN_ERR "r3964: error unregistering linediscipline: "
printk(KERN_ERR "r3964: error unregistering linediscipline: %d\n", status); "%d\n", status);
} } else {
else
{
TRACE_L("linediscipline successfully unregistered"); TRACE_L("linediscipline successfully unregistered");
} }
} }
static int __init r3964_init(void) static int __init r3964_init(void)
{ {
int status; int status;
printk ("r3964: Philips r3964 Driver $Revision: 1.10 $\n"); printk("r3964: Philips r3964 Driver $Revision: 1.10 $\n");
/* /*
* Register the tty line discipline * Register the tty line discipline
*/ */
status = tty_register_ldisc (N_R3964, &tty_ldisc_N_R3964); status = tty_register_ldisc(N_R3964, &tty_ldisc_N_R3964);
if (status == 0) if (status == 0) {
{
TRACE_L("line discipline %d registered", N_R3964); TRACE_L("line discipline %d registered", N_R3964);
TRACE_L("flags=%x num=%x", tty_ldisc_N_R3964.flags, TRACE_L("flags=%x num=%x", tty_ldisc_N_R3964.flags,
tty_ldisc_N_R3964.num); tty_ldisc_N_R3964.num);
TRACE_L("open=%p", tty_ldisc_N_R3964.open); TRACE_L("open=%p", tty_ldisc_N_R3964.open);
TRACE_L("tty_ldisc_N_R3964 = %p", &tty_ldisc_N_R3964); TRACE_L("tty_ldisc_N_R3964 = %p", &tty_ldisc_N_R3964);
} } else {
else printk(KERN_ERR "r3964: error registering line discipline: "
{ "%d\n", status);
printk (KERN_ERR "r3964: error registering line discipline: %d\n", status);
} }
return status; return status;
} }
...@@ -240,12 +222,12 @@ static int __init r3964_init(void) ...@@ -240,12 +222,12 @@ static int __init r3964_init(void)
module_init(r3964_init); module_init(r3964_init);
module_exit(r3964_exit); module_exit(r3964_exit);
/************************************************************* /*************************************************************
* Protocol implementation routines * Protocol implementation routines
*************************************************************/ *************************************************************/
static void add_tx_queue(struct r3964_info *pInfo, struct r3964_block_header *pHeader) static void add_tx_queue(struct r3964_info *pInfo,
struct r3964_block_header *pHeader)
{ {
unsigned long flags; unsigned long flags;
...@@ -253,12 +235,9 @@ static void add_tx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH ...@@ -253,12 +235,9 @@ static void add_tx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH
pHeader->next = NULL; pHeader->next = NULL;
if(pInfo->tx_last == NULL) if (pInfo->tx_last == NULL) {
{
pInfo->tx_first = pInfo->tx_last = pHeader; pInfo->tx_first = pInfo->tx_last = pHeader;
} } else {
else
{
pInfo->tx_last->next = pHeader; pInfo->tx_last->next = pHeader;
pInfo->tx_last = pHeader; pInfo->tx_last = pHeader;
} }
...@@ -266,7 +245,7 @@ static void add_tx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH ...@@ -266,7 +245,7 @@ static void add_tx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
TRACE_Q("add_tx_queue %p, length %d, tx_first = %p", TRACE_Q("add_tx_queue %p, length %d, tx_first = %p",
pHeader, pHeader->length, pInfo->tx_first ); pHeader, pHeader->length, pInfo->tx_first);
} }
static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code) static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code)
...@@ -279,51 +258,46 @@ static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code) ...@@ -279,51 +258,46 @@ static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code)
pHeader = pInfo->tx_first; pHeader = pInfo->tx_first;
if(pHeader==NULL) if (pHeader == NULL)
return; return;
#ifdef DEBUG_QUEUE #ifdef DEBUG_QUEUE
printk("r3964: remove_from_tx_queue: %p, length %u - ", printk("r3964: remove_from_tx_queue: %p, length %u - ",
pHeader, pHeader->length ); pHeader, pHeader->length);
for(pDump=pHeader;pDump;pDump=pDump->next) for (pDump = pHeader; pDump; pDump = pDump->next)
printk("%p ", pDump); printk("%p ", pDump);
printk("\n"); printk("\n");
#endif #endif
if (pHeader->owner) {
if(pHeader->owner) if (error_code) {
{
if(error_code)
{
add_msg(pHeader->owner, R3964_MSG_ACK, 0, add_msg(pHeader->owner, R3964_MSG_ACK, 0,
error_code, NULL); error_code, NULL);
} } else {
else
{
add_msg(pHeader->owner, R3964_MSG_ACK, pHeader->length, add_msg(pHeader->owner, R3964_MSG_ACK, pHeader->length,
error_code, NULL); error_code, NULL);
} }
wake_up_interruptible (&pInfo->read_wait); wake_up_interruptible(&pInfo->read_wait);
} }
spin_lock_irqsave(&pInfo->lock, flags); spin_lock_irqsave(&pInfo->lock, flags);
pInfo->tx_first = pHeader->next; pInfo->tx_first = pHeader->next;
if(pInfo->tx_first==NULL) if (pInfo->tx_first == NULL) {
{
pInfo->tx_last = NULL; pInfo->tx_last = NULL;
} }
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
kfree(pHeader); kfree(pHeader);
TRACE_M("remove_from_tx_queue - kfree %p",pHeader); TRACE_M("remove_from_tx_queue - kfree %p", pHeader);
TRACE_Q("remove_from_tx_queue: tx_first = %p, tx_last = %p", TRACE_Q("remove_from_tx_queue: tx_first = %p, tx_last = %p",
pInfo->tx_first, pInfo->tx_last ); pInfo->tx_first, pInfo->tx_last);
} }
static void add_rx_queue(struct r3964_info *pInfo, struct r3964_block_header *pHeader) static void add_rx_queue(struct r3964_info *pInfo,
struct r3964_block_header *pHeader)
{ {
unsigned long flags; unsigned long flags;
...@@ -331,12 +305,9 @@ static void add_rx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH ...@@ -331,12 +305,9 @@ static void add_rx_queue(struct r3964_info *pInfo, struct r3964_block_header *pH
pHeader->next = NULL; pHeader->next = NULL;
if(pInfo->rx_last == NULL) if (pInfo->rx_last == NULL) {
{
pInfo->rx_first = pInfo->rx_last = pHeader; pInfo->rx_first = pInfo->rx_last = pHeader;
} } else {
else
{
pInfo->rx_last->next = pHeader; pInfo->rx_last->next = pHeader;
pInfo->rx_last = pHeader; pInfo->rx_last = pHeader;
} }
...@@ -355,39 +326,32 @@ static void remove_from_rx_queue(struct r3964_info *pInfo, ...@@ -355,39 +326,32 @@ static void remove_from_rx_queue(struct r3964_info *pInfo,
unsigned long flags; unsigned long flags;
struct r3964_block_header *pFind; struct r3964_block_header *pFind;
if(pHeader==NULL) if (pHeader == NULL)
return; return;
TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d", TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d",
pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue ); pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue);
TRACE_Q("remove_from_rx_queue: %p, length %u", TRACE_Q("remove_from_rx_queue: %p, length %u",
pHeader, pHeader->length ); pHeader, pHeader->length);
spin_lock_irqsave(&pInfo->lock, flags); spin_lock_irqsave(&pInfo->lock, flags);
if(pInfo->rx_first == pHeader) if (pInfo->rx_first == pHeader) {
{
/* Remove the first block in the linked list: */ /* Remove the first block in the linked list: */
pInfo->rx_first = pHeader->next; pInfo->rx_first = pHeader->next;
if(pInfo->rx_first==NULL) if (pInfo->rx_first == NULL) {
{
pInfo->rx_last = NULL; pInfo->rx_last = NULL;
} }
pInfo->blocks_in_rx_queue--; pInfo->blocks_in_rx_queue--;
} } else {
else
{
/* Find block to remove: */ /* Find block to remove: */
for(pFind=pInfo->rx_first; pFind; pFind=pFind->next) for (pFind = pInfo->rx_first; pFind; pFind = pFind->next) {
{ if (pFind->next == pHeader) {
if(pFind->next == pHeader)
{
/* Got it. */ /* Got it. */
pFind->next = pHeader->next; pFind->next = pHeader->next;
pInfo->blocks_in_rx_queue--; pInfo->blocks_in_rx_queue--;
if(pFind->next==NULL) if (pFind->next == NULL) {
{
/* Oh, removed the last one! */ /* Oh, removed the last one! */
pInfo->rx_last = pFind; pInfo->rx_last = pFind;
} }
...@@ -399,21 +363,20 @@ static void remove_from_rx_queue(struct r3964_info *pInfo, ...@@ -399,21 +363,20 @@ static void remove_from_rx_queue(struct r3964_info *pInfo,
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
kfree(pHeader); kfree(pHeader);
TRACE_M("remove_from_rx_queue - kfree %p",pHeader); TRACE_M("remove_from_rx_queue - kfree %p", pHeader);
TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d", TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d",
pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue ); pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue);
} }
static void put_char(struct r3964_info *pInfo, unsigned char ch) static void put_char(struct r3964_info *pInfo, unsigned char ch)
{ {
struct tty_struct *tty = pInfo->tty; struct tty_struct *tty = pInfo->tty;
if(tty==NULL) if (tty == NULL)
return; return;
if(tty->driver->put_char) if (tty->driver->put_char) {
{
tty->driver->put_char(tty, ch); tty->driver->put_char(tty, ch);
} }
pInfo->bcc ^= ch; pInfo->bcc ^= ch;
...@@ -423,11 +386,10 @@ static void flush(struct r3964_info *pInfo) ...@@ -423,11 +386,10 @@ static void flush(struct r3964_info *pInfo)
{ {
struct tty_struct *tty = pInfo->tty; struct tty_struct *tty = pInfo->tty;
if(tty==NULL) if (tty == NULL)
return; return;
if(tty->driver->flush_chars) if (tty->driver->flush_chars) {
{
tty->driver->flush_chars(tty); tty->driver->flush_chars(tty);
} }
} }
...@@ -436,13 +398,11 @@ static void trigger_transmit(struct r3964_info *pInfo) ...@@ -436,13 +398,11 @@ static void trigger_transmit(struct r3964_info *pInfo)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pInfo->lock, flags); spin_lock_irqsave(&pInfo->lock, flags);
if((pInfo->state == R3964_IDLE) && (pInfo->tx_first!=NULL)) if ((pInfo->state == R3964_IDLE) && (pInfo->tx_first != NULL)) {
{
pInfo->state = R3964_TX_REQUEST; pInfo->state = R3964_TX_REQUEST;
pInfo->nRetry=0; pInfo->nRetry = 0;
pInfo->flags &= ~R3964_ERROR; pInfo->flags &= ~R3964_ERROR;
mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ); mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ);
...@@ -454,28 +414,22 @@ static void trigger_transmit(struct r3964_info *pInfo) ...@@ -454,28 +414,22 @@ static void trigger_transmit(struct r3964_info *pInfo)
flush(pInfo); flush(pInfo);
pInfo->bcc = 0; pInfo->bcc = 0;
} } else {
else
{
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
} }
} }
static void retry_transmit(struct r3964_info *pInfo) static void retry_transmit(struct r3964_info *pInfo)
{ {
if(pInfo->nRetry<R3964_MAX_RETRIES) if (pInfo->nRetry < R3964_MAX_RETRIES) {
{ TRACE_PE("transmission failed. Retry #%d", pInfo->nRetry);
TRACE_PE("transmission failed. Retry #%d",
pInfo->nRetry);
pInfo->bcc = 0; pInfo->bcc = 0;
put_char(pInfo, STX); put_char(pInfo, STX);
flush(pInfo); flush(pInfo);
pInfo->state = R3964_TX_REQUEST; pInfo->state = R3964_TX_REQUEST;
pInfo->nRetry++; pInfo->nRetry++;
mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ); mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ);
} } else {
else
{
TRACE_PE("transmission failed after %d retries", TRACE_PE("transmission failed after %d retries",
R3964_MAX_RETRIES); R3964_MAX_RETRIES);
...@@ -489,31 +443,27 @@ static void retry_transmit(struct r3964_info *pInfo) ...@@ -489,31 +443,27 @@ static void retry_transmit(struct r3964_info *pInfo)
} }
} }
static void transmit_block(struct r3964_info *pInfo) static void transmit_block(struct r3964_info *pInfo)
{ {
struct tty_struct *tty = pInfo->tty; struct tty_struct *tty = pInfo->tty;
struct r3964_block_header *pBlock = pInfo->tx_first; struct r3964_block_header *pBlock = pInfo->tx_first;
int room=0; int room = 0;
if((tty==NULL) || (pBlock==NULL)) if ((tty == NULL) || (pBlock == NULL)) {
{
return; return;
} }
if(tty->driver->write_room) if (tty->driver->write_room)
room=tty->driver->write_room(tty); room = tty->driver->write_room(tty);
TRACE_PS("transmit_block %p, room %d, length %d", TRACE_PS("transmit_block %p, room %d, length %d",
pBlock, room, pBlock->length); pBlock, room, pBlock->length);
while(pInfo->tx_position < pBlock->length) while (pInfo->tx_position < pBlock->length) {
{ if (room < 2)
if(room<2)
break; break;
if(pBlock->data[pInfo->tx_position]==DLE) if (pBlock->data[pInfo->tx_position] == DLE) {
{
/* send additional DLE char: */ /* send additional DLE char: */
put_char(pInfo, DLE); put_char(pInfo, DLE);
} }
...@@ -522,12 +472,10 @@ static void transmit_block(struct r3964_info *pInfo) ...@@ -522,12 +472,10 @@ static void transmit_block(struct r3964_info *pInfo)
room--; room--;
} }
if((pInfo->tx_position == pBlock->length) && (room>=3)) if ((pInfo->tx_position == pBlock->length) && (room >= 3)) {
{
put_char(pInfo, DLE); put_char(pInfo, DLE);
put_char(pInfo, ETX); put_char(pInfo, ETX);
if(pInfo->flags & R3964_BCC) if (pInfo->flags & R3964_BCC) {
{
put_char(pInfo, pInfo->bcc); put_char(pInfo, pInfo->bcc);
} }
pInfo->state = R3964_WAIT_FOR_TX_ACK; pInfo->state = R3964_WAIT_FOR_TX_ACK;
...@@ -542,13 +490,11 @@ static void on_receive_block(struct r3964_info *pInfo) ...@@ -542,13 +490,11 @@ static void on_receive_block(struct r3964_info *pInfo)
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
struct r3964_block_header *pBlock; struct r3964_block_header *pBlock;
length=pInfo->rx_position; length = pInfo->rx_position;
/* compare byte checksum characters: */ /* compare byte checksum characters: */
if(pInfo->flags & R3964_BCC) if (pInfo->flags & R3964_BCC) {
{ if (pInfo->bcc != pInfo->last_rx) {
if(pInfo->bcc!=pInfo->last_rx)
{
TRACE_PE("checksum error - got %x but expected %x", TRACE_PE("checksum error - got %x but expected %x",
pInfo->last_rx, pInfo->bcc); pInfo->last_rx, pInfo->bcc);
pInfo->flags |= R3964_CHECKSUM; pInfo->flags |= R3964_CHECKSUM;
...@@ -556,28 +502,23 @@ static void on_receive_block(struct r3964_info *pInfo) ...@@ -556,28 +502,23 @@ static void on_receive_block(struct r3964_info *pInfo)
} }
/* check for errors (parity, overrun,...): */ /* check for errors (parity, overrun,...): */
if(pInfo->flags & R3964_ERROR) if (pInfo->flags & R3964_ERROR) {
{
TRACE_PE("on_receive_block - transmission failed error %x", TRACE_PE("on_receive_block - transmission failed error %x",
pInfo->flags & R3964_ERROR); pInfo->flags & R3964_ERROR);
put_char(pInfo, NAK); put_char(pInfo, NAK);
flush(pInfo); flush(pInfo);
if(pInfo->nRetry<R3964_MAX_RETRIES) if (pInfo->nRetry < R3964_MAX_RETRIES) {
{ pInfo->state = R3964_WAIT_FOR_RX_REPEAT;
pInfo->state=R3964_WAIT_FOR_RX_REPEAT;
pInfo->nRetry++; pInfo->nRetry++;
mod_timer(&pInfo->tmr, jiffies + R3964_TO_RX_PANIC); mod_timer(&pInfo->tmr, jiffies + R3964_TO_RX_PANIC);
} } else {
else
{
TRACE_PE("on_receive_block - failed after max retries"); TRACE_PE("on_receive_block - failed after max retries");
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
} }
return; return;
} }
/* received block; submit DLE: */ /* received block; submit DLE: */
put_char(pInfo, DLE); put_char(pInfo, DLE);
flush(pInfo); flush(pInfo);
...@@ -585,14 +526,16 @@ static void on_receive_block(struct r3964_info *pInfo) ...@@ -585,14 +526,16 @@ static void on_receive_block(struct r3964_info *pInfo)
TRACE_PS(" rx success: got %d chars", length); TRACE_PS(" rx success: got %d chars", length);
/* prepare struct r3964_block_header: */ /* prepare struct r3964_block_header: */
pBlock = kmalloc(length+sizeof(struct r3964_block_header), GFP_KERNEL); pBlock = kmalloc(length + sizeof(struct r3964_block_header),
TRACE_M("on_receive_block - kmalloc %p",pBlock); GFP_KERNEL);
TRACE_M("on_receive_block - kmalloc %p", pBlock);
if(pBlock==NULL) if (pBlock == NULL)
return; return;
pBlock->length = length; pBlock->length = length;
pBlock->data = ((unsigned char*)pBlock)+sizeof(struct r3964_block_header); pBlock->data = ((unsigned char *)pBlock) +
sizeof(struct r3964_block_header);
pBlock->locks = 0; pBlock->locks = 0;
pBlock->next = NULL; pBlock->next = NULL;
pBlock->owner = NULL; pBlock->owner = NULL;
...@@ -603,66 +546,52 @@ static void on_receive_block(struct r3964_info *pInfo) ...@@ -603,66 +546,52 @@ static void on_receive_block(struct r3964_info *pInfo)
add_rx_queue(pInfo, pBlock); add_rx_queue(pInfo, pBlock);
/* notify attached client processes: */ /* notify attached client processes: */
for(pClient=pInfo->firstClient; pClient; pClient=pClient->next) for (pClient = pInfo->firstClient; pClient; pClient = pClient->next) {
{ if (pClient->sig_flags & R3964_SIG_DATA) {
if(pClient->sig_flags & R3964_SIG_DATA) add_msg(pClient, R3964_MSG_DATA, length, R3964_OK,
{ pBlock);
add_msg(pClient, R3964_MSG_DATA, length, R3964_OK, pBlock);
} }
} }
wake_up_interruptible (&pInfo->read_wait); wake_up_interruptible(&pInfo->read_wait);
pInfo->state = R3964_IDLE; pInfo->state = R3964_IDLE;
trigger_transmit(pInfo); trigger_transmit(pInfo);
} }
static void receive_char(struct r3964_info *pInfo, const unsigned char c) static void receive_char(struct r3964_info *pInfo, const unsigned char c)
{ {
switch(pInfo->state) switch (pInfo->state) {
{
case R3964_TX_REQUEST: case R3964_TX_REQUEST:
if(c==DLE) if (c == DLE) {
{
TRACE_PS("TX_REQUEST - got DLE"); TRACE_PS("TX_REQUEST - got DLE");
pInfo->state = R3964_TRANSMITTING; pInfo->state = R3964_TRANSMITTING;
pInfo->tx_position = 0; pInfo->tx_position = 0;
transmit_block(pInfo); transmit_block(pInfo);
} } else if (c == STX) {
else if(c==STX) if (pInfo->nRetry == 0) {
{
if(pInfo->nRetry==0)
{
TRACE_PE("TX_REQUEST - init conflict"); TRACE_PE("TX_REQUEST - init conflict");
if(pInfo->priority == R3964_SLAVE) if (pInfo->priority == R3964_SLAVE) {
{
goto start_receiving; goto start_receiving;
} }
} } else {
else TRACE_PE("TX_REQUEST - secondary init "
{ "conflict!? Switching to SLAVE mode "
TRACE_PE("TX_REQUEST - secondary init conflict!?" "for next rx.");
" Switching to SLAVE mode for next rx.");
goto start_receiving; goto start_receiving;
} }
} } else {
else
{
TRACE_PE("TX_REQUEST - char != DLE: %x", c); TRACE_PE("TX_REQUEST - char != DLE: %x", c);
retry_transmit(pInfo); retry_transmit(pInfo);
} }
break; break;
case R3964_TRANSMITTING: case R3964_TRANSMITTING:
if(c==NAK) if (c == NAK) {
{
TRACE_PE("TRANSMITTING - got NAK"); TRACE_PE("TRANSMITTING - got NAK");
retry_transmit(pInfo); retry_transmit(pInfo);
} } else {
else
{
TRACE_PE("TRANSMITTING - got invalid char"); TRACE_PE("TRANSMITTING - got invalid char");
pInfo->state = R3964_WAIT_ZVZ_BEFORE_TX_RETRY; pInfo->state = R3964_WAIT_ZVZ_BEFORE_TX_RETRY;
...@@ -670,30 +599,28 @@ static void receive_char(struct r3964_info *pInfo, const unsigned char c) ...@@ -670,30 +599,28 @@ static void receive_char(struct r3964_info *pInfo, const unsigned char c)
} }
break; break;
case R3964_WAIT_FOR_TX_ACK: case R3964_WAIT_FOR_TX_ACK:
if(c==DLE) if (c == DLE) {
{
TRACE_PS("WAIT_FOR_TX_ACK - got DLE"); TRACE_PS("WAIT_FOR_TX_ACK - got DLE");
remove_from_tx_queue(pInfo, R3964_OK); remove_from_tx_queue(pInfo, R3964_OK);
pInfo->state = R3964_IDLE; pInfo->state = R3964_IDLE;
trigger_transmit(pInfo); trigger_transmit(pInfo);
} } else {
else
{
retry_transmit(pInfo); retry_transmit(pInfo);
} }
break; break;
case R3964_WAIT_FOR_RX_REPEAT: case R3964_WAIT_FOR_RX_REPEAT:
/* FALLTROUGH */ /* FALLTROUGH */
case R3964_IDLE: case R3964_IDLE:
if(c==STX) if (c == STX) {
{
/* Prevent rx_queue from overflow: */ /* Prevent rx_queue from overflow: */
if(pInfo->blocks_in_rx_queue >= R3964_MAX_BLOCKS_IN_RX_QUEUE) if (pInfo->blocks_in_rx_queue >=
{ R3964_MAX_BLOCKS_IN_RX_QUEUE) {
TRACE_PE("IDLE - got STX but no space in rx_queue!"); TRACE_PE("IDLE - got STX but no space in "
pInfo->state=R3964_WAIT_FOR_RX_BUF; "rx_queue!");
mod_timer(&pInfo->tmr, jiffies + R3964_TO_NO_BUF); pInfo->state = R3964_WAIT_FOR_RX_BUF;
mod_timer(&pInfo->tmr,
jiffies + R3964_TO_NO_BUF);
break; break;
} }
start_receiving: start_receiving:
...@@ -702,7 +629,7 @@ start_receiving: ...@@ -702,7 +629,7 @@ start_receiving:
pInfo->rx_position = 0; pInfo->rx_position = 0;
pInfo->last_rx = 0; pInfo->last_rx = 0;
pInfo->flags &= ~R3964_ERROR; pInfo->flags &= ~R3964_ERROR;
pInfo->state=R3964_RECEIVING; pInfo->state = R3964_RECEIVING;
mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ); mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ);
pInfo->nRetry = 0; pInfo->nRetry = 0;
put_char(pInfo, DLE); put_char(pInfo, DLE);
...@@ -711,34 +638,25 @@ start_receiving: ...@@ -711,34 +638,25 @@ start_receiving:
} }
break; break;
case R3964_RECEIVING: case R3964_RECEIVING:
if(pInfo->rx_position < RX_BUF_SIZE) if (pInfo->rx_position < RX_BUF_SIZE) {
{
pInfo->bcc ^= c; pInfo->bcc ^= c;
if(c==DLE) if (c == DLE) {
{ if (pInfo->last_rx == DLE) {
if(pInfo->last_rx==DLE)
{
pInfo->last_rx = 0; pInfo->last_rx = 0;
goto char_to_buf; goto char_to_buf;
} }
pInfo->last_rx = DLE; pInfo->last_rx = DLE;
break; break;
} } else if ((c == ETX) && (pInfo->last_rx == DLE)) {
else if((c==ETX) && (pInfo->last_rx==DLE)) if (pInfo->flags & R3964_BCC) {
{
if(pInfo->flags & R3964_BCC)
{
pInfo->state = R3964_WAIT_FOR_BCC; pInfo->state = R3964_WAIT_FOR_BCC;
mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ); mod_timer(&pInfo->tmr,
} jiffies + R3964_TO_ZVZ);
else } else {
{
on_receive_block(pInfo); on_receive_block(pInfo);
} }
} } else {
else
{
pInfo->last_rx = c; pInfo->last_rx = c;
char_to_buf: char_to_buf:
pInfo->rx_buf[pInfo->rx_position++] = c; pInfo->rx_buf[pInfo->rx_position++] = c;
...@@ -756,24 +674,23 @@ char_to_buf: ...@@ -756,24 +674,23 @@ char_to_buf:
static void receive_error(struct r3964_info *pInfo, const char flag) static void receive_error(struct r3964_info *pInfo, const char flag)
{ {
switch (flag) switch (flag) {
{
case TTY_NORMAL: case TTY_NORMAL:
break; break;
case TTY_BREAK: case TTY_BREAK:
TRACE_PE("received break") TRACE_PE("received break");
pInfo->flags |= R3964_BREAK; pInfo->flags |= R3964_BREAK;
break; break;
case TTY_PARITY: case TTY_PARITY:
TRACE_PE("parity error") TRACE_PE("parity error");
pInfo->flags |= R3964_PARITY; pInfo->flags |= R3964_PARITY;
break; break;
case TTY_FRAME: case TTY_FRAME:
TRACE_PE("frame error") TRACE_PE("frame error");
pInfo->flags |= R3964_FRAME; pInfo->flags |= R3964_FRAME;
break; break;
case TTY_OVERRUN: case TTY_OVERRUN:
TRACE_PE("frame overrun") TRACE_PE("frame overrun");
pInfo->flags |= R3964_OVERRUN; pInfo->flags |= R3964_OVERRUN;
break; break;
default: default:
...@@ -787,8 +704,7 @@ static void on_timeout(unsigned long priv) ...@@ -787,8 +704,7 @@ static void on_timeout(unsigned long priv)
{ {
struct r3964_info *pInfo = (void *)priv; struct r3964_info *pInfo = (void *)priv;
switch(pInfo->state) switch (pInfo->state) {
{
case R3964_TX_REQUEST: case R3964_TX_REQUEST:
TRACE_PE("TX_REQUEST - timeout"); TRACE_PE("TX_REQUEST - timeout");
retry_transmit(pInfo); retry_transmit(pInfo);
...@@ -806,37 +722,35 @@ static void on_timeout(unsigned long priv) ...@@ -806,37 +722,35 @@ static void on_timeout(unsigned long priv)
TRACE_PE("WAIT_FOR_RX_BUF - timeout"); TRACE_PE("WAIT_FOR_RX_BUF - timeout");
put_char(pInfo, NAK); put_char(pInfo, NAK);
flush(pInfo); flush(pInfo);
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
break; break;
case R3964_RECEIVING: case R3964_RECEIVING:
TRACE_PE("RECEIVING - timeout after %d chars", TRACE_PE("RECEIVING - timeout after %d chars",
pInfo->rx_position); pInfo->rx_position);
put_char(pInfo, NAK); put_char(pInfo, NAK);
flush(pInfo); flush(pInfo);
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
break; break;
case R3964_WAIT_FOR_RX_REPEAT: case R3964_WAIT_FOR_RX_REPEAT:
TRACE_PE("WAIT_FOR_RX_REPEAT - timeout"); TRACE_PE("WAIT_FOR_RX_REPEAT - timeout");
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
break; break;
case R3964_WAIT_FOR_BCC: case R3964_WAIT_FOR_BCC:
TRACE_PE("WAIT_FOR_BCC - timeout"); TRACE_PE("WAIT_FOR_BCC - timeout");
put_char(pInfo, NAK); put_char(pInfo, NAK);
flush(pInfo); flush(pInfo);
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
break; break;
} }
} }
static struct r3964_client_info *findClient( static struct r3964_client_info *findClient(struct r3964_info *pInfo,
struct r3964_info *pInfo, struct pid *pid) struct pid *pid)
{ {
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
for(pClient=pInfo->firstClient; pClient; pClient=pClient->next) for (pClient = pInfo->firstClient; pClient; pClient = pClient->next) {
{ if (pClient->pid == pid) {
if(pClient->pid == pid)
{
return pClient; return pClient;
} }
} }
...@@ -849,90 +763,80 @@ static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg) ...@@ -849,90 +763,80 @@ static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg)
struct r3964_client_info **ppClient; struct r3964_client_info **ppClient;
struct r3964_message *pMsg; struct r3964_message *pMsg;
if((arg & R3964_SIG_ALL)==0) if ((arg & R3964_SIG_ALL) == 0) {
{
/* Remove client from client list */ /* Remove client from client list */
for(ppClient=&pInfo->firstClient; *ppClient; ppClient=&(*ppClient)->next) for (ppClient = &pInfo->firstClient; *ppClient;
{ ppClient = &(*ppClient)->next) {
pClient = *ppClient; pClient = *ppClient;
if(pClient->pid == pid) if (pClient->pid == pid) {
{ TRACE_PS("removing client %d from client list",
TRACE_PS("removing client %d from client list", pid_nr(pid)); pid_nr(pid));
*ppClient = pClient->next; *ppClient = pClient->next;
while(pClient->msg_count) while (pClient->msg_count) {
{ pMsg = remove_msg(pInfo, pClient);
pMsg=remove_msg(pInfo, pClient); if (pMsg) {
if(pMsg)
{
kfree(pMsg); kfree(pMsg);
TRACE_M("enable_signals - msg kfree %p",pMsg); TRACE_M("enable_signals - msg "
"kfree %p", pMsg);
} }
} }
put_pid(pClient->pid); put_pid(pClient->pid);
kfree(pClient); kfree(pClient);
TRACE_M("enable_signals - kfree %p",pClient); TRACE_M("enable_signals - kfree %p", pClient);
return 0; return 0;
} }
} }
return -EINVAL; return -EINVAL;
} } else {
else pClient = findClient(pInfo, pid);
{ if (pClient) {
pClient=findClient(pInfo, pid);
if(pClient)
{
/* update signal options */ /* update signal options */
pClient->sig_flags=arg; pClient->sig_flags = arg;
} } else {
else
{
/* add client to client list */ /* add client to client list */
pClient=kmalloc(sizeof(struct r3964_client_info), GFP_KERNEL); pClient = kmalloc(sizeof(struct r3964_client_info),
TRACE_M("enable_signals - kmalloc %p",pClient); GFP_KERNEL);
if(pClient==NULL) TRACE_M("enable_signals - kmalloc %p", pClient);
if (pClient == NULL)
return -ENOMEM; return -ENOMEM;
TRACE_PS("add client %d to client list", pid_nr(pid)); TRACE_PS("add client %d to client list", pid_nr(pid));
spin_lock_init(&pClient->lock); spin_lock_init(&pClient->lock);
pClient->sig_flags=arg; pClient->sig_flags = arg;
pClient->pid = get_pid(pid); pClient->pid = get_pid(pid);
pClient->next=pInfo->firstClient; pClient->next = pInfo->firstClient;
pClient->first_msg = NULL; pClient->first_msg = NULL;
pClient->last_msg = NULL; pClient->last_msg = NULL;
pClient->next_block_to_read = NULL; pClient->next_block_to_read = NULL;
pClient->msg_count = 0; pClient->msg_count = 0;
pInfo->firstClient=pClient; pInfo->firstClient = pClient;
} }
} }
return 0; return 0;
} }
static int read_telegram(struct r3964_info *pInfo, struct pid *pid, unsigned char __user *buf) static int read_telegram(struct r3964_info *pInfo, struct pid *pid,
unsigned char __user * buf)
{ {
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
struct r3964_block_header *block; struct r3964_block_header *block;
if(!buf) if (!buf) {
{
return -EINVAL; return -EINVAL;
} }
pClient=findClient(pInfo,pid); pClient = findClient(pInfo, pid);
if(pClient==NULL) if (pClient == NULL) {
{
return -EINVAL; return -EINVAL;
} }
block=pClient->next_block_to_read; block = pClient->next_block_to_read;
if(!block) if (!block) {
{
return 0; return 0;
} } else {
else if (copy_to_user(buf, block->data, block->length))
{
if (copy_to_user (buf, block->data, block->length))
return -EFAULT; return -EFAULT;
remove_client_block(pInfo, pClient); remove_client_block(pInfo, pClient);
...@@ -948,14 +852,13 @@ static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg, ...@@ -948,14 +852,13 @@ static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
struct r3964_message *pMsg; struct r3964_message *pMsg;
unsigned long flags; unsigned long flags;
if(pClient->msg_count<R3964_MAX_MSG_COUNT-1) if (pClient->msg_count < R3964_MAX_MSG_COUNT - 1) {
{
queue_the_message: queue_the_message:
pMsg = kmalloc(sizeof(struct r3964_message), pMsg = kmalloc(sizeof(struct r3964_message),
error_code?GFP_ATOMIC:GFP_KERNEL); error_code ? GFP_ATOMIC : GFP_KERNEL);
TRACE_M("add_msg - kmalloc %p",pMsg); TRACE_M("add_msg - kmalloc %p", pMsg);
if(pMsg==NULL) { if (pMsg == NULL) {
return; return;
} }
...@@ -967,34 +870,25 @@ queue_the_message: ...@@ -967,34 +870,25 @@ queue_the_message:
pMsg->block = pBlock; pMsg->block = pBlock;
pMsg->next = NULL; pMsg->next = NULL;
if(pClient->last_msg==NULL) if (pClient->last_msg == NULL) {
{ pClient->first_msg = pClient->last_msg = pMsg;
pClient->first_msg=pClient->last_msg=pMsg; } else {
}
else
{
pClient->last_msg->next = pMsg; pClient->last_msg->next = pMsg;
pClient->last_msg=pMsg; pClient->last_msg = pMsg;
} }
pClient->msg_count++; pClient->msg_count++;
if(pBlock!=NULL) if (pBlock != NULL) {
{
pBlock->locks++; pBlock->locks++;
} }
spin_unlock_irqrestore(&pClient->lock, flags); spin_unlock_irqrestore(&pClient->lock, flags);
} } else {
else if ((pClient->last_msg->msg_id == R3964_MSG_ACK)
{ && (pClient->last_msg->error_code == R3964_OVERFLOW)) {
if((pClient->last_msg->msg_id == R3964_MSG_ACK)
&& (pClient->last_msg->error_code==R3964_OVERFLOW))
{
pClient->last_msg->arg++; pClient->last_msg->arg++;
TRACE_PE("add_msg - inc prev OVERFLOW-msg"); TRACE_PE("add_msg - inc prev OVERFLOW-msg");
} } else {
else
{
msg_id = R3964_MSG_ACK; msg_id = R3964_MSG_ACK;
arg = 0; arg = 0;
error_code = R3964_OVERFLOW; error_code = R3964_OVERFLOW;
...@@ -1004,8 +898,7 @@ queue_the_message: ...@@ -1004,8 +898,7 @@ queue_the_message:
} }
} }
/* Send SIGIO signal to client process: */ /* Send SIGIO signal to client process: */
if(pClient->sig_flags & R3964_USE_SIGIO) if (pClient->sig_flags & R3964_USE_SIGIO) {
{
kill_pid(pClient->pid, SIGIO, 1); kill_pid(pClient->pid, SIGIO, 1);
} }
} }
...@@ -1013,23 +906,20 @@ queue_the_message: ...@@ -1013,23 +906,20 @@ queue_the_message:
static struct r3964_message *remove_msg(struct r3964_info *pInfo, static struct r3964_message *remove_msg(struct r3964_info *pInfo,
struct r3964_client_info *pClient) struct r3964_client_info *pClient)
{ {
struct r3964_message *pMsg=NULL; struct r3964_message *pMsg = NULL;
unsigned long flags; unsigned long flags;
if(pClient->first_msg) if (pClient->first_msg) {
{
spin_lock_irqsave(&pClient->lock, flags); spin_lock_irqsave(&pClient->lock, flags);
pMsg = pClient->first_msg; pMsg = pClient->first_msg;
pClient->first_msg = pMsg->next; pClient->first_msg = pMsg->next;
if(pClient->first_msg==NULL) if (pClient->first_msg == NULL) {
{
pClient->last_msg = NULL; pClient->last_msg = NULL;
} }
pClient->msg_count--; pClient->msg_count--;
if(pMsg->block) if (pMsg->block) {
{
remove_client_block(pInfo, pClient); remove_client_block(pInfo, pClient);
pClient->next_block_to_read = pMsg->block; pClient->next_block_to_read = pMsg->block;
} }
...@@ -1045,19 +935,16 @@ static void remove_client_block(struct r3964_info *pInfo, ...@@ -1045,19 +935,16 @@ static void remove_client_block(struct r3964_info *pInfo,
TRACE_PS("remove_client_block PID %d", pid_nr(pClient->pid)); TRACE_PS("remove_client_block PID %d", pid_nr(pClient->pid));
block=pClient->next_block_to_read; block = pClient->next_block_to_read;
if(block) if (block) {
{
block->locks--; block->locks--;
if(block->locks==0) if (block->locks == 0) {
{
remove_from_rx_queue(pInfo, block); remove_from_rx_queue(pInfo, block);
} }
} }
pClient->next_block_to_read = NULL; pClient->next_block_to_read = NULL;
} }
/************************************************************* /*************************************************************
* Line discipline routines * Line discipline routines
*************************************************************/ *************************************************************/
...@@ -1070,42 +957,39 @@ static int r3964_open(struct tty_struct *tty) ...@@ -1070,42 +957,39 @@ static int r3964_open(struct tty_struct *tty)
TRACE_L("tty=%p, PID=%d, disc_data=%p", TRACE_L("tty=%p, PID=%d, disc_data=%p",
tty, current->pid, tty->disc_data); tty, current->pid, tty->disc_data);
pInfo=kmalloc(sizeof(struct r3964_info), GFP_KERNEL); pInfo = kmalloc(sizeof(struct r3964_info), GFP_KERNEL);
TRACE_M("r3964_open - info kmalloc %p",pInfo); TRACE_M("r3964_open - info kmalloc %p", pInfo);
if(!pInfo) if (!pInfo) {
{
printk(KERN_ERR "r3964: failed to alloc info structure\n"); printk(KERN_ERR "r3964: failed to alloc info structure\n");
return -ENOMEM; return -ENOMEM;
} }
pInfo->rx_buf = kmalloc(RX_BUF_SIZE, GFP_KERNEL); pInfo->rx_buf = kmalloc(RX_BUF_SIZE, GFP_KERNEL);
TRACE_M("r3964_open - rx_buf kmalloc %p",pInfo->rx_buf); TRACE_M("r3964_open - rx_buf kmalloc %p", pInfo->rx_buf);
if(!pInfo->rx_buf) if (!pInfo->rx_buf) {
{
printk(KERN_ERR "r3964: failed to alloc receive buffer\n"); printk(KERN_ERR "r3964: failed to alloc receive buffer\n");
kfree(pInfo); kfree(pInfo);
TRACE_M("r3964_open - info kfree %p",pInfo); TRACE_M("r3964_open - info kfree %p", pInfo);
return -ENOMEM; return -ENOMEM;
} }
pInfo->tx_buf = kmalloc(TX_BUF_SIZE, GFP_KERNEL); pInfo->tx_buf = kmalloc(TX_BUF_SIZE, GFP_KERNEL);
TRACE_M("r3964_open - tx_buf kmalloc %p",pInfo->tx_buf); TRACE_M("r3964_open - tx_buf kmalloc %p", pInfo->tx_buf);
if(!pInfo->tx_buf) if (!pInfo->tx_buf) {
{
printk(KERN_ERR "r3964: failed to alloc transmit buffer\n"); printk(KERN_ERR "r3964: failed to alloc transmit buffer\n");
kfree(pInfo->rx_buf); kfree(pInfo->rx_buf);
TRACE_M("r3964_open - rx_buf kfree %p",pInfo->rx_buf); TRACE_M("r3964_open - rx_buf kfree %p", pInfo->rx_buf);
kfree(pInfo); kfree(pInfo);
TRACE_M("r3964_open - info kfree %p",pInfo); TRACE_M("r3964_open - info kfree %p", pInfo);
return -ENOMEM; return -ENOMEM;
} }
spin_lock_init(&pInfo->lock); spin_lock_init(&pInfo->lock);
pInfo->tty = tty; pInfo->tty = tty;
init_waitqueue_head (&pInfo->read_wait); init_waitqueue_head(&pInfo->read_wait);
pInfo->priority = R3964_MASTER; pInfo->priority = R3964_MASTER;
pInfo->rx_first = pInfo->rx_last = NULL; pInfo->rx_first = pInfo->rx_last = NULL;
pInfo->tx_first = pInfo->tx_last = NULL; pInfo->tx_first = pInfo->tx_last = NULL;
...@@ -1113,8 +997,8 @@ static int r3964_open(struct tty_struct *tty) ...@@ -1113,8 +997,8 @@ static int r3964_open(struct tty_struct *tty)
pInfo->tx_position = 0; pInfo->tx_position = 0;
pInfo->last_rx = 0; pInfo->last_rx = 0;
pInfo->blocks_in_rx_queue = 0; pInfo->blocks_in_rx_queue = 0;
pInfo->firstClient=NULL; pInfo->firstClient = NULL;
pInfo->state=R3964_IDLE; pInfo->state = R3964_IDLE;
pInfo->flags = R3964_DEBUG; pInfo->flags = R3964_DEBUG;
pInfo->nRetry = 0; pInfo->nRetry = 0;
...@@ -1130,7 +1014,7 @@ static int r3964_open(struct tty_struct *tty) ...@@ -1130,7 +1014,7 @@ static int r3964_open(struct tty_struct *tty)
static void r3964_close(struct tty_struct *tty) static void r3964_close(struct tty_struct *tty)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
struct r3964_client_info *pClient, *pNext; struct r3964_client_info *pClient, *pNext;
struct r3964_message *pMsg; struct r3964_message *pMsg;
struct r3964_block_header *pHeader, *pNextHeader; struct r3964_block_header *pHeader, *pNextHeader;
...@@ -1145,69 +1029,62 @@ static void r3964_close(struct tty_struct *tty) ...@@ -1145,69 +1029,62 @@ static void r3964_close(struct tty_struct *tty)
del_timer_sync(&pInfo->tmr); del_timer_sync(&pInfo->tmr);
/* Remove client-structs and message queues: */ /* Remove client-structs and message queues: */
pClient=pInfo->firstClient; pClient = pInfo->firstClient;
while(pClient) while (pClient) {
{ pNext = pClient->next;
pNext=pClient->next; while (pClient->msg_count) {
while(pClient->msg_count) pMsg = remove_msg(pInfo, pClient);
{ if (pMsg) {
pMsg=remove_msg(pInfo, pClient);
if(pMsg)
{
kfree(pMsg); kfree(pMsg);
TRACE_M("r3964_close - msg kfree %p",pMsg); TRACE_M("r3964_close - msg kfree %p", pMsg);
} }
} }
put_pid(pClient->pid); put_pid(pClient->pid);
kfree(pClient); kfree(pClient);
TRACE_M("r3964_close - client kfree %p",pClient); TRACE_M("r3964_close - client kfree %p", pClient);
pClient=pNext; pClient = pNext;
} }
/* Remove jobs from tx_queue: */ /* Remove jobs from tx_queue: */
spin_lock_irqsave(&pInfo->lock, flags); spin_lock_irqsave(&pInfo->lock, flags);
pHeader=pInfo->tx_first; pHeader = pInfo->tx_first;
pInfo->tx_first=pInfo->tx_last=NULL; pInfo->tx_first = pInfo->tx_last = NULL;
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
while(pHeader) while (pHeader) {
{ pNextHeader = pHeader->next;
pNextHeader=pHeader->next;
kfree(pHeader); kfree(pHeader);
pHeader=pNextHeader; pHeader = pNextHeader;
} }
/* Free buffers: */ /* Free buffers: */
wake_up_interruptible(&pInfo->read_wait); wake_up_interruptible(&pInfo->read_wait);
kfree(pInfo->rx_buf); kfree(pInfo->rx_buf);
TRACE_M("r3964_close - rx_buf kfree %p",pInfo->rx_buf); TRACE_M("r3964_close - rx_buf kfree %p", pInfo->rx_buf);
kfree(pInfo->tx_buf); kfree(pInfo->tx_buf);
TRACE_M("r3964_close - tx_buf kfree %p",pInfo->tx_buf); TRACE_M("r3964_close - tx_buf kfree %p", pInfo->tx_buf);
kfree(pInfo); kfree(pInfo);
TRACE_M("r3964_close - info kfree %p",pInfo); TRACE_M("r3964_close - info kfree %p", pInfo);
} }
static ssize_t r3964_read(struct tty_struct *tty, struct file *file, static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
unsigned char __user *buf, size_t nr) unsigned char __user * buf, size_t nr)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
struct r3964_message *pMsg; struct r3964_message *pMsg;
struct r3964_client_message theMsg; struct r3964_client_message theMsg;
DECLARE_WAITQUEUE (wait, current); DECLARE_WAITQUEUE(wait, current);
int count; int count;
TRACE_L("read()"); TRACE_L("read()");
pClient=findClient(pInfo, task_pid(current)); pClient = findClient(pInfo, task_pid(current));
if(pClient) if (pClient) {
{
pMsg = remove_msg(pInfo, pClient); pMsg = remove_msg(pInfo, pClient);
if(pMsg==NULL) if (pMsg == NULL) {
{
/* no messages available. */ /* no messages available. */
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK) {
{
return -EAGAIN; return -EAGAIN;
} }
/* block until there is a message: */ /* block until there is a message: */
...@@ -1215,8 +1092,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, ...@@ -1215,8 +1092,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
repeat: repeat:
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
pMsg = remove_msg(pInfo, pClient); pMsg = remove_msg(pInfo, pClient);
if (!pMsg && !signal_pending(current)) if (!pMsg && !signal_pending(current)) {
{
schedule(); schedule();
goto repeat; goto repeat;
} }
...@@ -1226,7 +1102,8 @@ repeat: ...@@ -1226,7 +1102,8 @@ repeat:
/* If we still haven't got a message, we must have been signalled */ /* If we still haven't got a message, we must have been signalled */
if (!pMsg) return -EINTR; if (!pMsg)
return -EINTR;
/* deliver msg to client process: */ /* deliver msg to client process: */
theMsg.msg_id = pMsg->msg_id; theMsg.msg_id = pMsg->msg_id;
...@@ -1235,9 +1112,9 @@ repeat: ...@@ -1235,9 +1112,9 @@ repeat:
count = sizeof(struct r3964_client_message); count = sizeof(struct r3964_client_message);
kfree(pMsg); kfree(pMsg);
TRACE_M("r3964_read - msg kfree %p",pMsg); TRACE_M("r3964_read - msg kfree %p", pMsg);
if (copy_to_user(buf,&theMsg, count)) if (copy_to_user(buf, &theMsg, count))
return -EFAULT; return -EFAULT;
TRACE_PS("read - return %d", count); TRACE_PS("read - return %d", count);
...@@ -1246,10 +1123,10 @@ repeat: ...@@ -1246,10 +1123,10 @@ repeat:
return -EPERM; return -EPERM;
} }
static ssize_t r3964_write(struct tty_struct * tty, struct file * file, static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
const unsigned char *data, size_t count) const unsigned char *data, size_t count)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
struct r3964_block_header *pHeader; struct r3964_block_header *pHeader;
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
unsigned char *new_data; unsigned char *new_data;
...@@ -1259,32 +1136,28 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file, ...@@ -1259,32 +1136,28 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
* Verify the pointers * Verify the pointers
*/ */
if(!pInfo) if (!pInfo)
return -EIO; return -EIO;
/* /*
* Ensure that the caller does not wish to send too much. * Ensure that the caller does not wish to send too much.
*/ */
if (count > R3964_MTU) if (count > R3964_MTU) {
{ if (pInfo->flags & R3964_DEBUG) {
if (pInfo->flags & R3964_DEBUG) TRACE_L(KERN_WARNING "r3964_write: truncating user "
{ "packet from %u to mtu %d", count, R3964_MTU);
TRACE_L (KERN_WARNING
"r3964_write: truncating user packet "
"from %u to mtu %d", count, R3964_MTU);
} }
count = R3964_MTU; count = R3964_MTU;
} }
/* /*
* Allocate a buffer for the data and copy it from the buffer with header prepended * Allocate a buffer for the data and copy it from the buffer with header prepended
*/ */
new_data = kmalloc (count+sizeof(struct r3964_block_header), GFP_KERNEL); new_data = kmalloc(count + sizeof(struct r3964_block_header),
TRACE_M("r3964_write - kmalloc %p",new_data); GFP_KERNEL);
TRACE_M("r3964_write - kmalloc %p", new_data);
if (new_data == NULL) { if (new_data == NULL) {
if (pInfo->flags & R3964_DEBUG) if (pInfo->flags & R3964_DEBUG) {
{ printk(KERN_ERR "r3964_write: no memory\n");
printk (KERN_ERR
"r3964_write: no memory\n");
} }
return -ENOSPC; return -ENOSPC;
} }
...@@ -1295,16 +1168,14 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file, ...@@ -1295,16 +1168,14 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
pHeader->locks = 0; pHeader->locks = 0;
pHeader->owner = NULL; pHeader->owner = NULL;
pClient=findClient(pInfo, task_pid(current)); pClient = findClient(pInfo, task_pid(current));
if(pClient) if (pClient) {
{
pHeader->owner = pClient; pHeader->owner = pClient;
} }
memcpy(pHeader->data, data, count); /* We already verified this */ memcpy(pHeader->data, data, count); /* We already verified this */
if(pInfo->flags & R3964_DEBUG) if (pInfo->flags & R3964_DEBUG) {
{
dump_block(pHeader->data, count); dump_block(pHeader->data, count);
} }
...@@ -1317,63 +1188,60 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file, ...@@ -1317,63 +1188,60 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
return 0; return 0;
} }
static int r3964_ioctl(struct tty_struct * tty, struct file * file, static int r3964_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
if(pInfo==NULL) if (pInfo == NULL)
return -EINVAL; return -EINVAL;
switch(cmd) switch (cmd) {
{
case R3964_ENABLE_SIGNALS: case R3964_ENABLE_SIGNALS:
return enable_signals(pInfo, task_pid(current), arg); return enable_signals(pInfo, task_pid(current), arg);
case R3964_SETPRIORITY: case R3964_SETPRIORITY:
if(arg<R3964_MASTER || arg>R3964_SLAVE) if (arg < R3964_MASTER || arg > R3964_SLAVE)
return -EINVAL; return -EINVAL;
pInfo->priority = arg & 0xff; pInfo->priority = arg & 0xff;
return 0; return 0;
case R3964_USE_BCC: case R3964_USE_BCC:
if(arg) if (arg)
pInfo->flags |= R3964_BCC; pInfo->flags |= R3964_BCC;
else else
pInfo->flags &= ~R3964_BCC; pInfo->flags &= ~R3964_BCC;
return 0; return 0;
case R3964_READ_TELEGRAM: case R3964_READ_TELEGRAM:
return read_telegram(pInfo, task_pid(current), (unsigned char __user *)arg); return read_telegram(pInfo, task_pid(current),
(unsigned char __user *)arg);
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
static void r3964_set_termios(struct tty_struct *tty, struct ktermios * old) static void r3964_set_termios(struct tty_struct *tty, struct ktermios *old)
{ {
TRACE_L("set_termios"); TRACE_L("set_termios");
} }
/* Called without the kernel lock held - fine */ /* Called without the kernel lock held - fine */
static unsigned int r3964_poll(struct tty_struct * tty, struct file * file, static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,
struct poll_table_struct *wait) struct poll_table_struct *wait)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
struct r3964_client_info *pClient; struct r3964_client_info *pClient;
struct r3964_message *pMsg=NULL; struct r3964_message *pMsg = NULL;
unsigned long flags; unsigned long flags;
int result = POLLOUT; int result = POLLOUT;
TRACE_L("POLL"); TRACE_L("POLL");
pClient=findClient(pInfo, task_pid(current)); pClient = findClient(pInfo, task_pid(current));
if(pClient) if (pClient) {
{
poll_wait(file, &pInfo->read_wait, wait); poll_wait(file, &pInfo->read_wait, wait);
spin_lock_irqsave(&pInfo->lock, flags); spin_lock_irqsave(&pInfo->lock, flags);
pMsg=pClient->first_msg; pMsg = pClient->first_msg;
spin_unlock_irqrestore(&pInfo->lock, flags); spin_unlock_irqrestore(&pInfo->lock, flags);
if(pMsg) if (pMsg)
result |= POLLIN | POLLRDNORM; result |= POLLIN | POLLRDNORM;
} } else {
else
{
result = -EINVAL; result = -EINVAL;
} }
return result; return result;
...@@ -1382,20 +1250,17 @@ static unsigned int r3964_poll(struct tty_struct * tty, struct file * file, ...@@ -1382,20 +1250,17 @@ static unsigned int r3964_poll(struct tty_struct * tty, struct file * file,
static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp, static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) char *fp, int count)
{ {
struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data; struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;
const unsigned char *p; const unsigned char *p;
char *f, flags = 0; char *f, flags = 0;
int i; int i;
for (i=count, p = cp, f = fp; i; i--, p++) { for (i = count, p = cp, f = fp; i; i--, p++) {
if (f) if (f)
flags = *f++; flags = *f++;
if(flags==TTY_NORMAL) if (flags == TTY_NORMAL) {
{
receive_char(pInfo, *p); receive_char(pInfo, *p);
} } else {
else
{
receive_error(pInfo, flags); receive_error(pInfo, flags);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment