Hi!
Linus' decision to replace "DECLARE_MUTEX_LOCKED" by "DECLARE_COMPLETION"
apparently hasn't reached the DAC960 driver. This patch fixes that. This means
the driver now compiles. I don't have the hardware, so I can't tell if the
driver actually works.
Rolf
--- linux/drivers/block/DAC960.h.dac960 Wed Feb 21 06:26:22 2001
+++ linux/drivers/block/DAC960.h Sat Jul 21 10:54:04 2001
@@ -2153,7 +2153,7 @@
typedef struct pt_regs Registers_T;
typedef struct request IO_Request_T;
typedef request_queue_t RequestQueue_T;
-typedef struct semaphore Semaphore_T;
+typedef struct completion Wait_T;
typedef struct super_block SuperBlock_T;
typedef struct timer_list Timer_T;
typedef wait_queue_head_t WaitQueue_T;
@@ -2220,7 +2220,7 @@
DAC960_CommandType_T CommandType;
struct DAC960_Controller *Controller;
struct DAC960_Command *Next;
- Semaphore_T *Semaphore;
+ Wait_T *Wait;
unsigned int LogicalDriveNumber;
unsigned int BlockNumber;
unsigned int BlockCount;
--- linux/drivers/block/DAC960.c.dac960 Sun May 27 14:12:55 2001
+++ linux/drivers/block/DAC960.c Sat Jul 21 11:02:28 2001
@@ -40,6 +40,7 @@
#include <linux/spinlock.h>
#include <linux/timer.h>
#include <linux/pci.h>
+#include <linux/completion.h>
#include <asm/io.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
@@ -484,14 +485,14 @@
static void DAC960_ExecuteCommand(DAC960_Command_T *Command)
{
DAC960_Controller_T *Controller = Command->Controller;
- DECLARE_MUTEX_LOCKED(Semaphore);
+ DECLARE_COMPLETION(Wait);
unsigned long ProcessorFlags;
- Command->Semaphore = &Semaphore;
+ Command->Wait = &Wait;
DAC960_AcquireControllerLock(Controller, &ProcessorFlags);
DAC960_QueueCommand(Command);
DAC960_ReleaseControllerLock(Controller, &ProcessorFlags);
if (in_interrupt()) return;
- down(&Semaphore);
+ wait_for_completion(&Wait);
}
@@ -1316,7 +1317,7 @@
*Controller)
{
DAC960_V1_DCDB_T DCDBs[DAC960_V1_MaxChannels], *DCDB;
- Semaphore_T Semaphores[DAC960_V1_MaxChannels], *Semaphore;
+ Wait_T Waits[DAC960_V1_MaxChannels], *Wait;
unsigned long ProcessorFlags;
int Channel, TargetID;
for (TargetID = 0; TargetID < Controller->Targets; TargetID++)
@@ -1327,12 +1328,12 @@
DAC960_SCSI_Inquiry_T *InquiryStandardData =
&Controller->V1.InquiryStandardData[Channel][TargetID];
InquiryStandardData->PeripheralDeviceType = 0x1F;
- Semaphore = &Semaphores[Channel];
- init_MUTEX_LOCKED(Semaphore);
+ Wait = &Waits[Channel];
+ init_completion(Wait);
DCDB = &DCDBs[Channel];
DAC960_V1_ClearCommand(Command);
Command->CommandType = DAC960_ImmediateCommand;
- Command->Semaphore = Semaphore;
+ Command->Wait = Wait;
Command->V1.CommandMailbox.Type3.CommandOpcode = DAC960_V1_DCDB;
Command->V1.CommandMailbox.Type3.BusAddress = Virtual_to_Bus32(DCDB);
DCDB->Channel = Channel;
@@ -1363,11 +1364,11 @@
DAC960_SCSI_Inquiry_UnitSerialNumber_T *InquiryUnitSerialNumber =
&Controller->V1.InquiryUnitSerialNumber[Channel][TargetID];
InquiryUnitSerialNumber->PeripheralDeviceType = 0x1F;
- Semaphore = &Semaphores[Channel];
- down(Semaphore);
+ Wait = &Waits[Channel];
+ wait_for_completion(Wait);
if (Command->V1.CommandStatus != DAC960_V1_NormalCompletion)
continue;
- Command->Semaphore = Semaphore;
+ Command->Wait = Wait;
DCDB = &DCDBs[Channel];
DCDB->TransferLength = sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T);
DCDB->BusAddress = Virtual_to_Bus32(InquiryUnitSerialNumber);
@@ -1381,7 +1382,7 @@
DAC960_AcquireControllerLock(Controller, &ProcessorFlags);
DAC960_QueueCommand(Command);
DAC960_ReleaseControllerLock(Controller, &ProcessorFlags);
- down(Semaphore);
+ wait_for_completion(Wait);
}
}
return true;
@@ -2768,7 +2769,7 @@
if (Request->cmd == READ)
Command->CommandType = DAC960_ReadCommand;
else Command->CommandType = DAC960_WriteCommand;
- Command->Semaphore = Request->sem;
+ Command->Wait = Request->waiting;
Command->LogicalDriveNumber = DAC960_LogicalDriveNumber(Request->rq_dev);
Command->BlockNumber =
Request->sector
@@ -2924,10 +2925,10 @@
/*
Wake up requestor for swap file paging requests.
*/
- if (Command->Semaphore != NULL)
+ if (Command->Wait != NULL)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
}
add_blkdev_randomness(DAC960_MAJOR + Controller->ControllerNumber);
}
@@ -2972,10 +2973,10 @@
/*
Wake up requestor for swap file paging requests.
*/
- if (Command->Semaphore != NULL)
+ if (Command->Wait != NULL)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
}
}
}
@@ -3589,8 +3590,8 @@
}
if (CommandType == DAC960_ImmediateCommand)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
return;
}
if (CommandType == DAC960_QueuedCommand)
@@ -3934,10 +3935,10 @@
/*
Wake up requestor for swap file paging requests.
*/
- if (Command->Semaphore != NULL)
+ if (Command->Wait != NULL)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
}
add_blkdev_randomness(DAC960_MAJOR + Controller->ControllerNumber);
}
@@ -3982,10 +3983,10 @@
/*
Wake up requestor for swap file paging requests.
*/
- if (Command->Semaphore != NULL)
+ if (Command->Wait != NULL)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
}
}
}
@@ -4539,8 +4540,8 @@
}
if (CommandType == DAC960_ImmediateCommand)
{
- up(Command->Semaphore);
- Command->Semaphore = NULL;
+ complete(Command->Wait);
+ Command->Wait = NULL;
return;
}
if (CommandType == DAC960_QueuedCommand)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jul 23 2001 - 21:00:14 EST