You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Char: ip2, macros cleanup
- remove i2os.h -- there was only macro to macro renaming or useless
stuff
- remove another uselless stuf (NULLFUNC, NULLPTR, YES, NO)
- use outb/inb directly
- use locking functions directly
- don't define another ROUNDUP, use roundup(x, 2) instead
- some comments and whitespace cleanup
- remove some commented crap
- prepend the rest by I2 prefix to not collide with rest of the world
like in following output (pointed out by akpm)
In file included from drivers/char/ip2/ip2main.c:128:
drivers/char/ip2/i2ellis.h:608:1: warning: "COMPLETE" redefined
In file included from include/net/netns/ipv4.h:8,
from include/net/net_namespace.h:13,
from include/linux/seq_file.h:7,
from include/asm/machdep.h:12,
from include/asm/pci.h:17,
from include/linux/pci.h:951,
from drivers/char/ip2/ip2main.c:95:
include/net/inet_frag.h:28:1: warning: this is the location of the previous definition
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
committed by
Linus Torvalds
Linus Torvalds
parent
83e422b764
commit
cf1c63c3e6
+93
-101
File diff suppressed because it is too large
Load Diff
@@ -185,10 +185,6 @@ typedef struct _i2eBordStr
|
||||
// The highest allowable IRQ, based on the
|
||||
// slot size.
|
||||
|
||||
unsigned char i2eChangeIrq;
|
||||
// Whether tis valid to change IRQ's
|
||||
// ISA = ok, EISA, MicroChannel, no
|
||||
|
||||
// Accelerators for various addresses on the board
|
||||
int i2eBase; // I/O Address of the Board
|
||||
int i2eData; // From here data transfers happen
|
||||
@@ -431,12 +427,6 @@ typedef struct _i2eBordStr
|
||||
// Manifests for i2eBordStr:
|
||||
//-------------------------------------------
|
||||
|
||||
#define YES 1
|
||||
#define NO 0
|
||||
|
||||
#define NULLFUNC (void (*)(void))0
|
||||
#define NULLPTR (void *)0
|
||||
|
||||
typedef void (*delayFunc_t)(unsigned int);
|
||||
|
||||
// i2eValid
|
||||
@@ -494,8 +484,8 @@ typedef void (*delayFunc_t)(unsigned int);
|
||||
|
||||
// i2eUsingIrq
|
||||
//
|
||||
#define IRQ_UNDEFINED 0x1352 // No valid irq (or polling = 0) can ever
|
||||
// promote to this!
|
||||
#define I2_IRQ_UNDEFINED 0x1352 /* No valid irq (or polling = 0) can
|
||||
* ever promote to this! */
|
||||
//------------------------------------------
|
||||
// Handy Macros for i2ellis.c and others
|
||||
// Note these are common to -II and -IIEX
|
||||
@@ -504,41 +494,14 @@ typedef void (*delayFunc_t)(unsigned int);
|
||||
// Given a pointer to the board structure, does the input FIFO have any data or
|
||||
// not?
|
||||
//
|
||||
#define HAS_INPUT(pB) !(INB(pB->i2eStatus) & ST_IN_EMPTY)
|
||||
#define HAS_NO_INPUT(pB) (INB(pB->i2eStatus) & ST_IN_EMPTY)
|
||||
|
||||
// Given a pointer to board structure, read a byte or word from the fifo
|
||||
//
|
||||
#define BYTE_FROM(pB) (unsigned char)INB(pB->i2eData)
|
||||
#define WORD_FROM(pB) (unsigned short)INW(pB->i2eData)
|
||||
|
||||
// Given a pointer to board structure, is there room for any data to be written
|
||||
// to the data fifo?
|
||||
//
|
||||
#define HAS_OUTROOM(pB) !(INB(pB->i2eStatus) & ST_OUT_FULL)
|
||||
#define HAS_NO_OUTROOM(pB) (INB(pB->i2eStatus) & ST_OUT_FULL)
|
||||
|
||||
// Given a pointer to board structure, write a single byte to the fifo
|
||||
// structure. Note that for 16-bit interfaces, the high order byte is undefined
|
||||
// and unknown.
|
||||
//
|
||||
#define BYTE_TO(pB, c) OUTB(pB->i2eData,(c))
|
||||
|
||||
// Write a word to the fifo structure. For 8-bit interfaces, this may have
|
||||
// unknown results.
|
||||
//
|
||||
#define WORD_TO(pB, c) OUTW(pB->i2eData,(c))
|
||||
#define I2_HAS_INPUT(pB) !(inb(pB->i2eStatus) & ST_IN_EMPTY)
|
||||
|
||||
// Given a pointer to the board structure, is there anything in the incoming
|
||||
// mailbox?
|
||||
//
|
||||
#define HAS_MAIL(pB) (INB(pB->i2eStatus) & ST_IN_MAIL)
|
||||
#define I2_HAS_MAIL(pB) (inb(pB->i2eStatus) & ST_IN_MAIL)
|
||||
|
||||
#define UPDATE_FIFO_ROOM(pB) (pB)->i2eFifoRemains=(pB)->i2eFifoSize
|
||||
|
||||
// Handy macro to round up a number (like the buffer write and read routines do)
|
||||
//
|
||||
#define ROUNDUP(number) (((number)+1) & (~1))
|
||||
#define I2_UPDATE_FIFO_ROOM(pB) ((pB)->i2eFifoRemains = (pB)->i2eFifoSize)
|
||||
|
||||
//------------------------------------------
|
||||
// Function Declarations for i2ellis.c
|
||||
@@ -593,20 +556,11 @@ static int iiDownloadBlock(i2eBordStrPtr, loadHdrStrPtr, int);
|
||||
//
|
||||
static int iiDownloadAll(i2eBordStrPtr, loadHdrStrPtr, int, int);
|
||||
|
||||
// Called indirectly always. Needed externally so the routine might be
|
||||
// SPECIFIED as an argument to iiReset()
|
||||
//
|
||||
//static void ii2DelayIO(unsigned int); // N-millisecond delay using
|
||||
//hardware spin
|
||||
//static void ii2DelayTimer(unsigned int); // N-millisecond delay using Linux
|
||||
//timer
|
||||
|
||||
// Many functions defined here return True if good, False otherwise, with an
|
||||
// error code in i2eError field. Here is a handy macro for setting the error
|
||||
// code and returning.
|
||||
//
|
||||
#define COMPLETE(pB,code) \
|
||||
do { \
|
||||
#define I2_COMPLETE(pB,code) do { \
|
||||
pB->i2eError = code; \
|
||||
return (code == I2EE_GOOD);\
|
||||
} while (0)
|
||||
|
||||
@@ -129,7 +129,6 @@ registers, use byte operations only.
|
||||
//------------------------------------------------
|
||||
//
|
||||
#include "ip2types.h"
|
||||
#include "i2os.h" /* For any o.s., compiler, or host-related issues */
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// Manifests for the I/O map:
|
||||
@@ -644,5 +643,10 @@ typedef union _loadHdrStr
|
||||
#define ABS_BIGGEST_BOX 16 // Absolute the most ports per box
|
||||
#define ABS_MOST_PORTS (ABS_MAX_BOXES * ABS_BIGGEST_BOX)
|
||||
|
||||
#define I2_OUTSW(port, addr, count) outsw((port), (addr), (((count)+1)/2))
|
||||
#define I2_OUTSB(port, addr, count) outsb((port), (addr), (((count)+1))&-2)
|
||||
#define I2_INSW(port, addr, count) insw((port), (addr), (((count)+1)/2))
|
||||
#define I2_INSB(port, addr, count) insb((port), (addr), (((count)+1))&-2)
|
||||
|
||||
#endif // I2HW_H
|
||||
|
||||
|
||||
+73
-68
@@ -227,17 +227,17 @@ i2InitChannels ( i2eBordStrPtr pB, int nChannels, i2ChanStrPtr pCh)
|
||||
i2ChanStrPtr *ppCh;
|
||||
|
||||
if (pB->i2eValid != I2E_MAGIC) {
|
||||
COMPLETE(pB, I2EE_BADMAGIC);
|
||||
I2_COMPLETE(pB, I2EE_BADMAGIC);
|
||||
}
|
||||
if (pB->i2eState != II_STATE_STDLOADED) {
|
||||
COMPLETE(pB, I2EE_BADSTATE);
|
||||
I2_COMPLETE(pB, I2EE_BADSTATE);
|
||||
}
|
||||
|
||||
LOCK_INIT(&pB->read_fifo_spinlock);
|
||||
LOCK_INIT(&pB->write_fifo_spinlock);
|
||||
LOCK_INIT(&pB->Dbuf_spinlock);
|
||||
LOCK_INIT(&pB->Bbuf_spinlock);
|
||||
LOCK_INIT(&pB->Fbuf_spinlock);
|
||||
rwlock_init(&pB->read_fifo_spinlock);
|
||||
rwlock_init(&pB->write_fifo_spinlock);
|
||||
rwlock_init(&pB->Dbuf_spinlock);
|
||||
rwlock_init(&pB->Bbuf_spinlock);
|
||||
rwlock_init(&pB->Fbuf_spinlock);
|
||||
|
||||
// NO LOCK needed yet - this is init
|
||||
|
||||
@@ -259,10 +259,10 @@ i2InitChannels ( i2eBordStrPtr pB, int nChannels, i2ChanStrPtr pCh)
|
||||
if ( !(pB->i2eChannelMap[index >> 4] & (1 << (index & 0xf)) ) ) {
|
||||
continue;
|
||||
}
|
||||
LOCK_INIT(&pCh->Ibuf_spinlock);
|
||||
LOCK_INIT(&pCh->Obuf_spinlock);
|
||||
LOCK_INIT(&pCh->Cbuf_spinlock);
|
||||
LOCK_INIT(&pCh->Pbuf_spinlock);
|
||||
rwlock_init(&pCh->Ibuf_spinlock);
|
||||
rwlock_init(&pCh->Obuf_spinlock);
|
||||
rwlock_init(&pCh->Cbuf_spinlock);
|
||||
rwlock_init(&pCh->Pbuf_spinlock);
|
||||
// NO LOCK needed yet - this is init
|
||||
// Set up validity flag according to support level
|
||||
if (pB->i2eGoodMap[index >> 4] & (1 << (index & 0xf)) ) {
|
||||
@@ -347,7 +347,7 @@ i2InitChannels ( i2eBordStrPtr pB, int nChannels, i2ChanStrPtr pCh)
|
||||
}
|
||||
// No need to check for wrap here; this is initialization.
|
||||
pB->i2Fbuf_stuff = stuffIndex;
|
||||
COMPLETE(pB, I2EE_GOOD);
|
||||
I2_COMPLETE(pB, I2EE_GOOD);
|
||||
|
||||
}
|
||||
|
||||
@@ -374,7 +374,7 @@ i2DeQueueNeeds(i2eBordStrPtr pB, int type)
|
||||
|
||||
case NEED_INLINE:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Dbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Dbuf_spinlock, flags);
|
||||
if ( pB->i2Dbuf_stuff != pB->i2Dbuf_strip)
|
||||
{
|
||||
queueIndex = pB->i2Dbuf_strip;
|
||||
@@ -386,12 +386,12 @@ i2DeQueueNeeds(i2eBordStrPtr pB, int type)
|
||||
pB->i2Dbuf_strip = queueIndex;
|
||||
pCh->channelNeeds &= ~NEED_INLINE;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Dbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Dbuf_spinlock, flags);
|
||||
break;
|
||||
|
||||
case NEED_BYPASS:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Bbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Bbuf_spinlock, flags);
|
||||
if (pB->i2Bbuf_stuff != pB->i2Bbuf_strip)
|
||||
{
|
||||
queueIndex = pB->i2Bbuf_strip;
|
||||
@@ -403,12 +403,12 @@ i2DeQueueNeeds(i2eBordStrPtr pB, int type)
|
||||
pB->i2Bbuf_strip = queueIndex;
|
||||
pCh->channelNeeds &= ~NEED_BYPASS;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Bbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Bbuf_spinlock, flags);
|
||||
break;
|
||||
|
||||
case NEED_FLOW:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Fbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Fbuf_spinlock, flags);
|
||||
if (pB->i2Fbuf_stuff != pB->i2Fbuf_strip)
|
||||
{
|
||||
queueIndex = pB->i2Fbuf_strip;
|
||||
@@ -420,7 +420,7 @@ i2DeQueueNeeds(i2eBordStrPtr pB, int type)
|
||||
pB->i2Fbuf_strip = queueIndex;
|
||||
pCh->channelNeeds &= ~NEED_FLOW;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Fbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Fbuf_spinlock, flags);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "i2DeQueueNeeds called with bad type:%x\n",type);
|
||||
@@ -453,7 +453,7 @@ i2QueueNeeds(i2eBordStrPtr pB, i2ChanStrPtr pCh, int type)
|
||||
|
||||
case NEED_INLINE:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Dbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Dbuf_spinlock, flags);
|
||||
if ( !(pCh->channelNeeds & NEED_INLINE) )
|
||||
{
|
||||
pCh->channelNeeds |= NEED_INLINE;
|
||||
@@ -463,12 +463,12 @@ i2QueueNeeds(i2eBordStrPtr pB, i2ChanStrPtr pCh, int type)
|
||||
queueIndex = 0;
|
||||
pB->i2Dbuf_stuff = queueIndex;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Dbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Dbuf_spinlock, flags);
|
||||
break;
|
||||
|
||||
case NEED_BYPASS:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Bbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Bbuf_spinlock, flags);
|
||||
if ((type & NEED_BYPASS) && !(pCh->channelNeeds & NEED_BYPASS))
|
||||
{
|
||||
pCh->channelNeeds |= NEED_BYPASS;
|
||||
@@ -478,12 +478,12 @@ i2QueueNeeds(i2eBordStrPtr pB, i2ChanStrPtr pCh, int type)
|
||||
queueIndex = 0;
|
||||
pB->i2Bbuf_stuff = queueIndex;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Bbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Bbuf_spinlock, flags);
|
||||
break;
|
||||
|
||||
case NEED_FLOW:
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->Fbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pB->Fbuf_spinlock, flags);
|
||||
if ((type & NEED_FLOW) && !(pCh->channelNeeds & NEED_FLOW))
|
||||
{
|
||||
pCh->channelNeeds |= NEED_FLOW;
|
||||
@@ -493,7 +493,7 @@ i2QueueNeeds(i2eBordStrPtr pB, i2ChanStrPtr pCh, int type)
|
||||
queueIndex = 0;
|
||||
pB->i2Fbuf_stuff = queueIndex;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->Fbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->Fbuf_spinlock, flags);
|
||||
break;
|
||||
|
||||
case NEED_CREDIT:
|
||||
@@ -562,9 +562,8 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
|
||||
pB = pCh->pMyBord;
|
||||
|
||||
// Board must also exist, and THE INTERRUPT COMMAND ALREADY SENT
|
||||
if (pB->i2eValid != I2E_MAGIC || pB->i2eUsingIrq == IRQ_UNDEFINED) {
|
||||
if (pB->i2eValid != I2E_MAGIC || pB->i2eUsingIrq == I2_IRQ_UNDEFINED)
|
||||
return -2;
|
||||
}
|
||||
// If the board has gone fatal, return bad, and also hit the trap routine if
|
||||
// it exists.
|
||||
if (pB->i2eFatal) {
|
||||
@@ -620,13 +619,13 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
|
||||
switch(type) {
|
||||
case PTYPE_INLINE:
|
||||
lock_var_p = &pCh->Obuf_spinlock;
|
||||
WRITE_LOCK_IRQSAVE(lock_var_p,flags);
|
||||
write_lock_irqsave(lock_var_p, flags);
|
||||
stuffIndex = pCh->Obuf_stuff;
|
||||
bufroom = pCh->Obuf_strip - stuffIndex;
|
||||
break;
|
||||
case PTYPE_BYPASS:
|
||||
lock_var_p = &pCh->Cbuf_spinlock;
|
||||
WRITE_LOCK_IRQSAVE(lock_var_p,flags);
|
||||
write_lock_irqsave(lock_var_p, flags);
|
||||
stuffIndex = pCh->Cbuf_stuff;
|
||||
bufroom = pCh->Cbuf_strip - stuffIndex;
|
||||
break;
|
||||
@@ -645,7 +644,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
|
||||
break; /* from for()- Enough room: goto proceed */
|
||||
}
|
||||
ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
|
||||
WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags);
|
||||
write_unlock_irqrestore(lock_var_p, flags);
|
||||
} else
|
||||
ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
|
||||
|
||||
@@ -747,7 +746,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
|
||||
{
|
||||
case PTYPE_INLINE:
|
||||
pCh->Obuf_stuff = stuffIndex; // Store buffer pointer
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
|
||||
pB->debugInlineQueued++;
|
||||
// Add the channel pointer to list of channels needing service (first
|
||||
@@ -757,7 +756,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
|
||||
|
||||
case PTYPE_BYPASS:
|
||||
pCh->Cbuf_stuff = stuffIndex; // Store buffer pointer
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Cbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Cbuf_spinlock, flags);
|
||||
|
||||
pB->debugBypassQueued++;
|
||||
// Add the channel pointer to list of channels needing service (first
|
||||
@@ -840,7 +839,7 @@ i2Input(i2ChanStrPtr pCh)
|
||||
count = -1;
|
||||
goto i2Input_exit;
|
||||
}
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Ibuf_spinlock, flags);
|
||||
|
||||
// initialize some accelerators and private copies
|
||||
stripIndex = pCh->Ibuf_strip;
|
||||
@@ -850,7 +849,7 @@ i2Input(i2ChanStrPtr pCh)
|
||||
// If buffer is empty or requested data count was 0, (trivial case) return
|
||||
// without any further thought.
|
||||
if ( count == 0 ) {
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
goto i2Input_exit;
|
||||
}
|
||||
// Adjust for buffer wrap
|
||||
@@ -891,10 +890,10 @@ i2Input(i2ChanStrPtr pCh)
|
||||
|
||||
if ((pCh->sinceLastFlow += count) >= pCh->whenSendFlow) {
|
||||
pCh->sinceLastFlow -= pCh->whenSendFlow;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
i2QueueNeeds(pCh->pMyBord, pCh, NEED_FLOW);
|
||||
} else {
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
}
|
||||
|
||||
i2Input_exit:
|
||||
@@ -926,7 +925,7 @@ i2InputFlush(i2ChanStrPtr pCh)
|
||||
|
||||
ip2trace (CHANN, ITRC_INPUT, 10, 0);
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Ibuf_spinlock, flags);
|
||||
count = pCh->Ibuf_stuff - pCh->Ibuf_strip;
|
||||
|
||||
// Adjust for buffer wrap
|
||||
@@ -947,10 +946,10 @@ i2InputFlush(i2ChanStrPtr pCh)
|
||||
if ( (pCh->sinceLastFlow += count) >= pCh->whenSendFlow )
|
||||
{
|
||||
pCh->sinceLastFlow -= pCh->whenSendFlow;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
i2QueueNeeds(pCh->pMyBord, pCh, NEED_FLOW);
|
||||
} else {
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
}
|
||||
|
||||
ip2trace (CHANN, ITRC_INPUT, 19, 1, count);
|
||||
@@ -979,9 +978,9 @@ i2InputAvailable(i2ChanStrPtr pCh)
|
||||
|
||||
|
||||
// initialize some accelerators and private copies
|
||||
READ_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,flags);
|
||||
read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
|
||||
count = pCh->Ibuf_stuff - pCh->Ibuf_strip;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
|
||||
// Adjust for buffer wrap
|
||||
if (count < 0)
|
||||
@@ -1045,9 +1044,9 @@ i2Output(i2ChanStrPtr pCh, const char *pSource, int count)
|
||||
while ( count > 0 ) {
|
||||
|
||||
// How much room in output buffer is there?
|
||||
READ_LOCK_IRQSAVE(&pCh->Obuf_spinlock,flags);
|
||||
read_lock_irqsave(&pCh->Obuf_spinlock, flags);
|
||||
amountToMove = pCh->Obuf_strip - pCh->Obuf_stuff - 1;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
if (amountToMove < 0) {
|
||||
amountToMove += OBUF_SIZE;
|
||||
}
|
||||
@@ -1075,7 +1074,7 @@ i2Output(i2ChanStrPtr pCh, const char *pSource, int count)
|
||||
if ( !(pCh->flush_flags && i2RetryFlushOutput(pCh) )
|
||||
&& amountToMove > 0 )
|
||||
{
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Obuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Obuf_spinlock, flags);
|
||||
stuffIndex = pCh->Obuf_stuff;
|
||||
|
||||
// Had room to move some data: don't know whether the block size,
|
||||
@@ -1102,7 +1101,7 @@ i2Output(i2ChanStrPtr pCh, const char *pSource, int count)
|
||||
}
|
||||
pCh->Obuf_stuff = stuffIndex;
|
||||
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
|
||||
ip2trace (CHANN, ITRC_OUTPUT, 13, 1, stuffIndex );
|
||||
|
||||
@@ -1352,9 +1351,9 @@ i2OutputFree(i2ChanStrPtr pCh)
|
||||
if ( !i2Validate ( pCh ) ) {
|
||||
return -1;
|
||||
}
|
||||
READ_LOCK_IRQSAVE(&pCh->Obuf_spinlock,flags);
|
||||
read_lock_irqsave(&pCh->Obuf_spinlock, flags);
|
||||
amountToMove = pCh->Obuf_strip - pCh->Obuf_stuff - 1;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
|
||||
if (amountToMove < 0) {
|
||||
amountToMove += OBUF_SIZE;
|
||||
@@ -1464,11 +1463,11 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
|
||||
// ip2trace (ITRC_NO_PORT, ITRC_SFIFO, ITRC_ENTER, 0 );
|
||||
|
||||
while (HAS_INPUT(pB)) {
|
||||
while (I2_HAS_INPUT(pB)) {
|
||||
// ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 2, 0 );
|
||||
|
||||
// Process packet from fifo a one atomic unit
|
||||
WRITE_LOCK_IRQSAVE(&pB->read_fifo_spinlock,bflags);
|
||||
write_lock_irqsave(&pB->read_fifo_spinlock, bflags);
|
||||
|
||||
// The first word (or two bytes) will have channel number and type of
|
||||
// packet, possibly other information
|
||||
@@ -1490,7 +1489,8 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
// sick!
|
||||
if ( ((unsigned int)count) > IBUF_SIZE ) {
|
||||
pB->i2eFatal = 2;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,bflags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
return; /* Bail out ASAP */
|
||||
}
|
||||
// Channel is illegally big ?
|
||||
@@ -1498,7 +1498,8 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
(NULL==(pCh = ((i2ChanStrPtr*)pB->i2eChannelPtr)[channel])))
|
||||
{
|
||||
iiReadBuf(pB, junkBuffer, count);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,bflags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
break; /* From switch: ready for next packet */
|
||||
}
|
||||
|
||||
@@ -1512,14 +1513,15 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
if(ID_OF(pB->i2eLeadoffWord) == ID_HOT_KEY)
|
||||
{
|
||||
pCh->hotKeyIn = iiReadWord(pB) & 0xff;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,bflags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_HOTACK);
|
||||
break; /* From the switch: ready for next packet */
|
||||
}
|
||||
|
||||
// Normal data! We crudely assume there is room for the data in our
|
||||
// buffer because the board wouldn't have exceeded his credit limit.
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,cflags);
|
||||
write_lock_irqsave(&pCh->Ibuf_spinlock, cflags);
|
||||
// We have 2 locks now
|
||||
stuffIndex = pCh->Ibuf_stuff;
|
||||
amountToRead = IBUF_SIZE - stuffIndex;
|
||||
@@ -1562,8 +1564,9 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
|
||||
// Update stuff index
|
||||
pCh->Ibuf_stuff = stuffIndex;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,cflags);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,bflags);
|
||||
write_unlock_irqrestore(&pCh->Ibuf_spinlock, cflags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
|
||||
#ifdef USE_IQ
|
||||
schedule_work(&pCh->tqueue_input);
|
||||
@@ -1585,7 +1588,8 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
|
||||
iiReadBuf(pB, cmdBuffer, count);
|
||||
// We can release early with buffer grab
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,bflags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
|
||||
pc = cmdBuffer;
|
||||
pcLimit = &(cmdBuffer[count]);
|
||||
@@ -1830,12 +1834,12 @@ i2StripFifo(i2eBordStrPtr pB)
|
||||
default: // Neither packet? should be impossible
|
||||
ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1,
|
||||
PTYPE_OF(pB->i2eLeadoffWord) );
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock,
|
||||
bflags);
|
||||
|
||||
break;
|
||||
} // End of switch on type of packets
|
||||
} //while(board HAS_INPUT)
|
||||
} /*while(board I2_HAS_INPUT)*/
|
||||
|
||||
ip2trace (ITRC_NO_PORT, ITRC_SFIFO, ITRC_RETURN, 0 );
|
||||
|
||||
@@ -1858,7 +1862,7 @@ i2Write2Fifo(i2eBordStrPtr pB, unsigned char *source, int count,int reserve)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned long flags;
|
||||
WRITE_LOCK_IRQSAVE(&pB->write_fifo_spinlock,flags);
|
||||
write_lock_irqsave(&pB->write_fifo_spinlock, flags);
|
||||
if (!pB->i2eWaitingForEmptyFifo) {
|
||||
if (pB->i2eFifoRemains > (count+reserve)) {
|
||||
pB->i2eFifoRemains -= count;
|
||||
@@ -1867,7 +1871,7 @@ i2Write2Fifo(i2eBordStrPtr pB, unsigned char *source, int count,int reserve)
|
||||
rc = count;
|
||||
}
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->write_fifo_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
|
||||
return rc;
|
||||
}
|
||||
//******************************************************************************
|
||||
@@ -1898,7 +1902,7 @@ i2StuffFifoBypass(i2eBordStrPtr pB)
|
||||
while ( --bailout && notClogged &&
|
||||
(NULL != (pCh = i2DeQueueNeeds(pB,NEED_BYPASS))))
|
||||
{
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Cbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Cbuf_spinlock, flags);
|
||||
stripIndex = pCh->Cbuf_strip;
|
||||
|
||||
// as long as there are packets for this channel...
|
||||
@@ -1906,7 +1910,7 @@ i2StuffFifoBypass(i2eBordStrPtr pB)
|
||||
while (stripIndex != pCh->Cbuf_stuff) {
|
||||
pRemove = &(pCh->Cbuf[stripIndex]);
|
||||
packetSize = CMD_COUNT_OF(pRemove) + sizeof(i2CmdHeader);
|
||||
paddedSize = ROUNDUP(packetSize);
|
||||
paddedSize = roundup(packetSize, 2);
|
||||
|
||||
if (paddedSize > 0) {
|
||||
if ( 0 == i2Write2Fifo(pB, pRemove, paddedSize,0)) {
|
||||
@@ -1930,7 +1934,7 @@ WriteDBGBuf("BYPS", pRemove, paddedSize);
|
||||
// Done with this channel. Move to next, removing this one from
|
||||
// the queue of channels if we cleaned it out (i.e., didn't get clogged.
|
||||
pCh->Cbuf_strip = stripIndex;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Cbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Cbuf_spinlock, flags);
|
||||
} // Either clogged or finished all the work
|
||||
|
||||
#ifdef IP2DEBUG_TRACE
|
||||
@@ -1954,7 +1958,7 @@ static inline void
|
||||
i2StuffFifoFlow(i2eBordStrPtr pB)
|
||||
{
|
||||
i2ChanStrPtr pCh;
|
||||
unsigned short paddedSize = ROUNDUP(sizeof(flowIn));
|
||||
unsigned short paddedSize = roundup(sizeof(flowIn), 2);
|
||||
|
||||
ip2trace (ITRC_NO_PORT, ITRC_SFLOW, ITRC_ENTER, 2,
|
||||
pB->i2eFifoRemains, paddedSize );
|
||||
@@ -2010,7 +2014,7 @@ i2StuffFifoInline(i2eBordStrPtr pB)
|
||||
while ( --bailout && notClogged &&
|
||||
(NULL != (pCh = i2DeQueueNeeds(pB,NEED_INLINE))) )
|
||||
{
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Obuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Obuf_spinlock, flags);
|
||||
stripIndex = pCh->Obuf_strip;
|
||||
|
||||
ip2trace (CHANN, ITRC_SICMD, 3, 2, stripIndex, pCh->Obuf_stuff );
|
||||
@@ -2031,7 +2035,7 @@ i2StuffFifoInline(i2eBordStrPtr pB)
|
||||
packetSize = flowsize + sizeof(i2CmdHeader);
|
||||
}
|
||||
flowsize = CREDIT_USAGE(flowsize);
|
||||
paddedSize = ROUNDUP(packetSize);
|
||||
paddedSize = roundup(packetSize, 2);
|
||||
|
||||
ip2trace (CHANN, ITRC_SICMD, 4, 2, pB->i2eFifoRemains, paddedSize );
|
||||
|
||||
@@ -2086,7 +2090,7 @@ WriteDBGBuf("DATA", pRemove, paddedSize);
|
||||
// Done with this channel. Move to next, removing this one from the
|
||||
// queue of channels if we cleaned it out (i.e., didn't get clogged.
|
||||
pCh->Obuf_strip = stripIndex;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
if ( notClogged )
|
||||
{
|
||||
|
||||
@@ -2190,10 +2194,11 @@ i2ServiceBoard ( i2eBordStrPtr pB )
|
||||
|
||||
if (inmail & MB_OUT_STRIPPED) {
|
||||
pB->i2eFifoOutInts++;
|
||||
WRITE_LOCK_IRQSAVE(&pB->write_fifo_spinlock,flags);
|
||||
write_lock_irqsave(&pB->write_fifo_spinlock, flags);
|
||||
pB->i2eFifoRemains = pB->i2eFifoSize;
|
||||
pB->i2eWaitingForEmptyFifo = 0;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->write_fifo_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->write_fifo_spinlock,
|
||||
flags);
|
||||
|
||||
ip2trace (ITRC_NO_PORT, ITRC_INTR, 30, 1, pB->i2eFifoRemains );
|
||||
|
||||
|
||||
@@ -1,127 +0,0 @@
|
||||
/*******************************************************************************
|
||||
*
|
||||
* (c) 1999 by Computone Corporation
|
||||
*
|
||||
********************************************************************************
|
||||
*
|
||||
*
|
||||
* PACKAGE: Linux tty Device Driver for IntelliPort II family of multiport
|
||||
* serial I/O controllers.
|
||||
*
|
||||
* DESCRIPTION: Defines, definitions and includes which are heavily dependent
|
||||
* on O/S, host, compiler, etc. This file is tailored for:
|
||||
* Linux v2.0.0 and later
|
||||
* Gnu gcc c2.7.2
|
||||
* 80x86 architecture
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef I2OS_H /* To prevent multiple includes */
|
||||
#define I2OS_H 1
|
||||
|
||||
//-------------------------------------------------
|
||||
// Required Includes
|
||||
//-------------------------------------------------
|
||||
|
||||
#include "ip2types.h"
|
||||
#include <asm/io.h> /* For inb, etc */
|
||||
|
||||
//------------------------------------
|
||||
// Defines for I/O instructions:
|
||||
//------------------------------------
|
||||
|
||||
#define INB(port) inb(port)
|
||||
#define OUTB(port,value) outb((value),(port))
|
||||
#define INW(port) inw(port)
|
||||
#define OUTW(port,value) outw((value),(port))
|
||||
#define OUTSW(port,addr,count) outsw((port),(addr),(((count)+1)/2))
|
||||
#define OUTSB(port,addr,count) outsb((port),(addr),(((count)+1))&-2)
|
||||
#define INSW(port,addr,count) insw((port),(addr),(((count)+1)/2))
|
||||
#define INSB(port,addr,count) insb((port),(addr),(((count)+1))&-2)
|
||||
|
||||
//--------------------------------------------
|
||||
// Interrupt control
|
||||
//--------------------------------------------
|
||||
|
||||
#define LOCK_INIT(a) rwlock_init(a)
|
||||
|
||||
#define SAVE_AND_DISABLE_INTS(a,b) { \
|
||||
/* printk("get_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
spin_lock_irqsave(a,b); \
|
||||
}
|
||||
|
||||
#define RESTORE_INTS(a,b) { \
|
||||
/* printk("rel_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
spin_unlock_irqrestore(a,b); \
|
||||
}
|
||||
|
||||
#define READ_LOCK_IRQSAVE(a,b) { \
|
||||
/* printk("get_read_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
read_lock_irqsave(a,b); \
|
||||
}
|
||||
|
||||
#define READ_UNLOCK_IRQRESTORE(a,b) { \
|
||||
/* printk("rel_read_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
read_unlock_irqrestore(a,b); \
|
||||
}
|
||||
|
||||
#define WRITE_LOCK_IRQSAVE(a,b) { \
|
||||
/* printk("get_write_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
write_lock_irqsave(a,b); \
|
||||
}
|
||||
|
||||
#define WRITE_UNLOCK_IRQRESTORE(a,b) { \
|
||||
/* printk("rel_write_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \
|
||||
write_unlock_irqrestore(a,b); \
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Hardware-delay loop
|
||||
//
|
||||
// Probably used in only one place (see i2ellis.c) but this helps keep things
|
||||
// together. Note we have unwound the IN instructions. On machines with a
|
||||
// reasonable cache, the eight instructions (1 byte each) should fit in cache
|
||||
// nicely, and on un-cached machines, the code-fetch would tend not to dominate.
|
||||
// Note that cx is shifted so that "count" still reflects the total number of
|
||||
// iterations assuming no unwinding.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//#define DELAY1MS(port,count,label)
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Macros to switch to a new stack, saving stack pointers, and to restore the
|
||||
// old stack (Used, for example, in i2lib.c) "heap" is the address of some
|
||||
// buffer which will become the new stack (working down from highest address).
|
||||
// The two words at the two lowest addresses in this stack are for storing the
|
||||
// SS and SP.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//#define TO_NEW_STACK(heap,size)
|
||||
//#define TO_OLD_STACK(heap)
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Macros to save the original IRQ vectors and masks, and to patch in new ones.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//#define SAVE_IRQ_MASKS(dest)
|
||||
//#define WRITE_IRQ_MASKS(src)
|
||||
//#define SAVE_IRQ_VECTOR(value,dest)
|
||||
//#define WRITE_IRQ_VECTOR(value,src)
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Macro to copy data from one far pointer to another.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#define I2_MOVE_DATA(fpSource,fpDest,count) memmove(fpDest,fpSource,count);
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Macros to issue eoi's to host interrupt control (IBM AT 8259-style).
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//#define MASTER_EOI
|
||||
//#define SLAVE_EOI
|
||||
|
||||
#endif /* I2OS_H */
|
||||
|
||||
|
||||
+34
-34
@@ -1052,9 +1052,9 @@ set_irq( int boardnum, int boardIrq )
|
||||
* Write to FIFO; don't bother to adjust fifo capacity for this, since
|
||||
* board will respond almost immediately after SendMail hit.
|
||||
*/
|
||||
WRITE_LOCK_IRQSAVE(&pB->write_fifo_spinlock,flags);
|
||||
write_lock_irqsave(&pB->write_fifo_spinlock, flags);
|
||||
iiWriteBuf(pB, tempCommand, 4);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->write_fifo_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
|
||||
pB->i2eUsingIrq = boardIrq;
|
||||
pB->i2eOutMailWaiting |= MB_OUT_STUFFED;
|
||||
|
||||
@@ -1072,9 +1072,9 @@ set_irq( int boardnum, int boardIrq )
|
||||
(CMD_OF(tempCommand))[4] = 64; // chars
|
||||
|
||||
(CMD_OF(tempCommand))[5] = 87; // HW_TEST
|
||||
WRITE_LOCK_IRQSAVE(&pB->write_fifo_spinlock,flags);
|
||||
write_lock_irqsave(&pB->write_fifo_spinlock, flags);
|
||||
iiWriteBuf(pB, tempCommand, 8);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->write_fifo_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
|
||||
|
||||
CHANNEL_OF(tempCommand) = 0;
|
||||
PTYPE_OF(tempCommand) = PTYPE_BYPASS;
|
||||
@@ -1089,9 +1089,9 @@ set_irq( int boardnum, int boardIrq )
|
||||
CMD_COUNT_OF(tempCommand) = 2;
|
||||
(CMD_OF(tempCommand))[0] = 44; /* get ping */
|
||||
(CMD_OF(tempCommand))[1] = 200; /* 200 ms */
|
||||
WRITE_LOCK_IRQSAVE(&pB->write_fifo_spinlock,flags);
|
||||
write_lock_irqsave(&pB->write_fifo_spinlock, flags);
|
||||
iiWriteBuf(pB, tempCommand, 4);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->write_fifo_spinlock,flags);
|
||||
write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
|
||||
#endif
|
||||
|
||||
iiEnableMailIrq(pB);
|
||||
@@ -1270,12 +1270,12 @@ static void do_input(struct work_struct *work)
|
||||
|
||||
// Data input
|
||||
if ( pCh->pTTY != NULL ) {
|
||||
READ_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,flags)
|
||||
read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
|
||||
if (!pCh->throttled && (pCh->Ibuf_stuff != pCh->Ibuf_strip)) {
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags)
|
||||
read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
i2Input( pCh );
|
||||
} else
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags)
|
||||
read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
} else {
|
||||
ip2trace(CHANN, ITRC_INPUT, 22, 0 );
|
||||
|
||||
@@ -1719,9 +1719,9 @@ ip2_write( PTTY tty, const unsigned char *pData, int count)
|
||||
ip2_flush_chars( tty );
|
||||
|
||||
/* This is the actual move bit. Make sure it does what we need!!!!! */
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
bytesSent = i2Output( pCh, pData, count);
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
|
||||
ip2trace (CHANN, ITRC_WRITE, ITRC_RETURN, 1, bytesSent );
|
||||
|
||||
@@ -1746,13 +1746,13 @@ ip2_putchar( PTTY tty, unsigned char ch )
|
||||
|
||||
// ip2trace (CHANN, ITRC_PUTC, ITRC_ENTER, 1, ch );
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
pCh->Pbuf[pCh->Pbuf_stuff++] = ch;
|
||||
if ( pCh->Pbuf_stuff == sizeof pCh->Pbuf ) {
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
ip2_flush_chars( tty );
|
||||
} else
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
|
||||
// ip2trace (CHANN, ITRC_PUTC, ITRC_RETURN, 1, ch );
|
||||
}
|
||||
@@ -1772,7 +1772,7 @@ ip2_flush_chars( PTTY tty )
|
||||
i2ChanStrPtr pCh = tty->driver_data;
|
||||
unsigned long flags;
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
if ( pCh->Pbuf_stuff ) {
|
||||
|
||||
// ip2trace (CHANN, ITRC_PUTC, 10, 1, strip );
|
||||
@@ -1786,7 +1786,7 @@ ip2_flush_chars( PTTY tty )
|
||||
}
|
||||
pCh->Pbuf_stuff -= strip;
|
||||
}
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
@@ -1804,9 +1804,9 @@ ip2_write_room ( PTTY tty )
|
||||
i2ChanStrPtr pCh = tty->driver_data;
|
||||
unsigned long flags;
|
||||
|
||||
READ_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
read_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
bytesFree = i2OutputFree( pCh ) - pCh->Pbuf_stuff;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
|
||||
ip2trace (CHANN, ITRC_WRITE, 11, 1, bytesFree );
|
||||
|
||||
@@ -1836,12 +1836,12 @@ ip2_chars_in_buf ( PTTY tty )
|
||||
pCh->Obuf_char_count + pCh->Pbuf_stuff,
|
||||
pCh->Obuf_char_count, pCh->Pbuf_stuff );
|
||||
#endif
|
||||
READ_LOCK_IRQSAVE(&pCh->Obuf_spinlock,flags);
|
||||
read_lock_irqsave(&pCh->Obuf_spinlock, flags);
|
||||
rc = pCh->Obuf_char_count;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Obuf_spinlock,flags);
|
||||
READ_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
|
||||
read_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
rc += pCh->Pbuf_stuff;
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
read_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -1865,9 +1865,9 @@ ip2_flush_buffer( PTTY tty )
|
||||
#ifdef IP2DEBUG_WRITE
|
||||
printk (KERN_DEBUG "IP2: flush buffer\n" );
|
||||
#endif
|
||||
WRITE_LOCK_IRQSAVE(&pCh->Pbuf_spinlock,flags);
|
||||
write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
|
||||
pCh->Pbuf_stuff = 0;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pCh->Pbuf_spinlock,flags);
|
||||
write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
|
||||
i2FlushOutput( pCh );
|
||||
ip2_owake(tty);
|
||||
|
||||
@@ -1953,15 +1953,15 @@ ip2_unthrottle ( PTTY tty )
|
||||
pCh->throttled = 0;
|
||||
i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_RESUME);
|
||||
serviceOutgoingFifo( pCh->pMyBord );
|
||||
READ_LOCK_IRQSAVE(&pCh->Ibuf_spinlock,flags)
|
||||
read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
|
||||
if ( pCh->Ibuf_stuff != pCh->Ibuf_strip ) {
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags)
|
||||
read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
#ifdef IP2DEBUG_READ
|
||||
printk (KERN_DEBUG "i2Input called from unthrottle\n" );
|
||||
#endif
|
||||
i2Input( pCh );
|
||||
} else
|
||||
READ_UNLOCK_IRQRESTORE(&pCh->Ibuf_spinlock,flags)
|
||||
read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2204,9 +2204,9 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
|
||||
* for masking). Caller should use TIOCGICOUNT to see which one it was
|
||||
*/
|
||||
case TIOCMIWAIT:
|
||||
WRITE_LOCK_IRQSAVE(&pB->read_fifo_spinlock, flags);
|
||||
write_lock_irqsave(&pB->read_fifo_spinlock, flags);
|
||||
cprev = pCh->icount; /* note the counters on entry */
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock, flags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
|
||||
i2QueueCommands(PTYPE_BYPASS, pCh, 100, 4,
|
||||
CMD_DCD_REP, CMD_CTS_REP, CMD_DSR_REP, CMD_RI_REP);
|
||||
init_waitqueue_entry(&wait, current);
|
||||
@@ -2226,9 +2226,9 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
|
||||
rc = -ERESTARTSYS;
|
||||
break;
|
||||
}
|
||||
WRITE_LOCK_IRQSAVE(&pB->read_fifo_spinlock, flags);
|
||||
write_lock_irqsave(&pB->read_fifo_spinlock, flags);
|
||||
cnow = pCh->icount; /* atomic copy */
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock, flags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
|
||||
if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
|
||||
cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
|
||||
rc = -EIO; /* no change => rc */
|
||||
@@ -2266,9 +2266,9 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
|
||||
case TIOCGICOUNT:
|
||||
ip2trace (CHANN, ITRC_IOCTL, 11, 1, rc );
|
||||
|
||||
WRITE_LOCK_IRQSAVE(&pB->read_fifo_spinlock, flags);
|
||||
write_lock_irqsave(&pB->read_fifo_spinlock, flags);
|
||||
cnow = pCh->icount;
|
||||
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock, flags);
|
||||
write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
|
||||
p_cuser = argp;
|
||||
rc = put_user(cnow.cts, &p_cuser->cts);
|
||||
rc = put_user(cnow.dsr, &p_cuser->dsr);
|
||||
@@ -2874,7 +2874,7 @@ ip2_ipl_ioctl ( struct inode *pInode, struct file *pFile, UINT cmd, ULONG arg )
|
||||
case 65: /* Board - ip2stat */
|
||||
if ( pB ) {
|
||||
rc = copy_to_user(argp, pB, sizeof(i2eBordStr));
|
||||
rc = put_user(INB(pB->i2eStatus),
|
||||
rc = put_user(inb(pB->i2eStatus),
|
||||
(ULONG __user *)(arg + (ULONG)(&pB->i2eStatus) - (ULONG)pB ) );
|
||||
} else {
|
||||
rc = -ENODEV;
|
||||
|
||||
Reference in New Issue
Block a user