Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / drivers / char / rocket_int.h

diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 802687290ee1f7d28393e0da74adc5632cc75a0b..55b8f2d71a9617d3be3c3d932b34002636d52afe 100644 (file)
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -15,6 +15,8 @@
 #define ROCKET_TYPE_MODEMIII   3
 #define ROCKET_TYPE_PC104       4
 
+#include <linux/mutex.h>
+
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
@@ -1130,46 +1132,6 @@ Warnings: This function writes the data byte without checking to see if
 */
 #define sWriteTxByte(IO,DATA) sOutB(IO,DATA)
 
-int sInitController(CONTROLLER_T * CtlP,
-                   int CtlNum,
-                   ByteIO_t MudbacIO,
-                   ByteIO_t * AiopIOList,
-                   int AiopIOListSize,
-                   int IRQNum, Byte_t Frequency, int PeriodicOnly);
-
-int sPCIInitController(CONTROLLER_T * CtlP,
-                      int CtlNum,
-                      ByteIO_t * AiopIOList,
-                      int AiopIOListSize,
-                      WordIO_t ConfigIO,
-                      int IRQNum,
-                      Byte_t Frequency,
-                      int PeriodicOnly,
-                      int altChanRingIndicator, int UPCIRingInd);
-
-int sReadAiopID(ByteIO_t io);
-int sReadAiopNumChan(WordIO_t io);
-int sInitChan(CONTROLLER_T * CtlP,
-             CHANNEL_T * ChP, int AiopNum, int ChanNum);
-Byte_t sGetRxErrStatus(CHANNEL_T * ChP);
-void sStopRxProcessor(CHANNEL_T * ChP);
-void sStopSWInFlowCtl(CHANNEL_T * ChP);
-void sFlushRxFIFO(CHANNEL_T * ChP);
-void sFlushTxFIFO(CHANNEL_T * ChP);
-int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data);
-void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags);
-void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags);
-void sModemReset(CONTROLLER_T * CtlP, int chan, int on);
-void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on);
-void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode);
-
-extern Byte_t R[RDATASIZE];
-extern CONTROLLER_T sController[CTL_SIZE];
-extern Byte_t sIRQMap[16];
-extern Byte_t sBitMapClrTbl[8];
-extern Byte_t sBitMapSetTbl[8];
-extern int sClockPrescale;
-
 /*
  * Begin Linux specific definitions for the Rocketport driver
  *
@@ -1196,22 +1158,15 @@ struct r_port {
        int xmit_head;
        int xmit_tail;
        int xmit_cnt;
-       int session;
-       int pgrp;
        int cd_status;
        int ignore_status_mask;
        int read_status_mask;
        int cps;
 
-#ifdef DECLARE_WAITQUEUE
        wait_queue_head_t open_wait;
-       wait_queue_head_t close_wait;
-#else
-       struct wait_queue *open_wait;
-       struct wait_queue *close_wait;
-#endif
+       struct completion close_wait;
        spinlock_t slock;
-       struct semaphore write_sem;
+       struct mutex write_mtx;
 };
 
 #define RPORT_MAGIC 0x525001