projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...
[powerpc.git]
/
drivers
/
scsi
/
NCR53C9x.c
diff --git
a/drivers/scsi/NCR53C9x.c
b/drivers/scsi/NCR53C9x.c
index
26146a4
..
c7dd015
100644
(file)
--- a/
drivers/scsi/NCR53C9x.c
+++ b/
drivers/scsi/NCR53C9x.c
@@
-529,7
+529,7
@@
void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs)
/* Allocate structure and insert basic data such as SCSI chip frequency
* data and a pointer to the device
*/
/* Allocate structure and insert basic data such as SCSI chip frequency
* data and a pointer to the device
*/
-struct NCR_ESP* esp_allocate(
Scsi_Host_T
emplate *tpnt, void *esp_dev)
+struct NCR_ESP* esp_allocate(
struct scsi_host_t
emplate *tpnt, void *esp_dev)
{
struct NCR_ESP *esp, *elink;
struct Scsi_Host *esp_host;
{
struct NCR_ESP *esp, *elink;
struct Scsi_Host *esp_host;
@@
-1006,7
+1006,7
@@
static void esp_exec_cmd(struct NCR_ESP *esp)
struct ESP_regs *eregs = esp->eregs;
struct esp_device *esp_dev;
Scsi_Cmnd *SCptr;
struct ESP_regs *eregs = esp->eregs;
struct esp_device *esp_dev;
Scsi_Cmnd *SCptr;
-
Scsi_D
evice *SDptr;
+
struct scsi_d
evice *SDptr;
volatile unchar *cmdp = esp->esp_command;
unsigned char the_esp_command;
int lun, target;
volatile unchar *cmdp = esp->esp_command;
unsigned char the_esp_command;
int lun, target;
@@
-1687,7
+1687,7
@@
static inline int reconnect_lun(struct NCR_ESP *esp, struct ESP_regs *eregs)
static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
Scsi_Cmnd *sp)
{
static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
Scsi_Cmnd *sp)
{
-
Scsi_D
evice *dp = sp->device;
+
struct scsi_d
evice *dp = sp->device;
struct esp_device *esp_dev = dp->hostdata;
if(esp->prev_soff != esp_dev->sync_max_offset ||
struct esp_device *esp_dev = dp->hostdata;
if(esp->prev_soff != esp_dev->sync_max_offset ||
@@
-1799,6
+1799,7
@@
static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
*/
int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */
int fifocnt = 0;
*/
int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */
int fifocnt = 0;
+ unsigned char *p = phys_to_virt((unsigned long)SCptr->SCp.ptr);
oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK;
oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK;
@@
-1860,7
+1861,7
@@
static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
/* read fifo */
for(j=0;j<fifocnt;j++)
/* read fifo */
for(j=0;j<fifocnt;j++)
-
SCptr->SCp.ptr
[i++] = esp_read(eregs->esp_fdata);
+
p
[i++] = esp_read(eregs->esp_fdata);
ESPDATA(("(%d) ", i));
ESPDATA(("(%d) ", i));
@@
-1882,7
+1883,7
@@
static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
/* fill fifo */
for(j=0;j<this_count;j++)
/* fill fifo */
for(j=0;j<this_count;j++)
- esp_write(eregs->esp_fdata,
SCptr->SCp.ptr
[i++]);
+ esp_write(eregs->esp_fdata,
p
[i++]);
/* how many left if this goes out ?? */
hmuch -= this_count;
/* how many left if this goes out ?? */
hmuch -= this_count;
@@
-3605,7
+3606,7
@@
out:
}
#endif
}
#endif
-int esp_slave_alloc(
Scsi_D
evice *SDptr)
+int esp_slave_alloc(
struct scsi_d
evice *SDptr)
{
struct esp_device *esp_dev =
kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
{
struct esp_device *esp_dev =
kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
@@
-3617,7
+3618,7
@@
int esp_slave_alloc(Scsi_Device *SDptr)
return 0;
}
return 0;
}
-void esp_slave_destroy(
Scsi_D
evice *SDptr)
+void esp_slave_destroy(
struct scsi_d
evice *SDptr)
{
struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;
{
struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;