]>
Commit | Line | Data |
---|---|---|
c5c1b90c | 1 | diff -u linux-2.6.1-rc2.orig/drivers/scsi/ini9100u.c linux-2.6.1-rc2/drivers/scsi/ini9100u.c |
2 | --- linux-2.6.1-rc2.orig/drivers/scsi/ini9100u.c 2004-01-06 22:56:04.000000000 +0000 | |
3 | +++ linux-2.6.1-rc2/drivers/scsi/ini9100u.c 2004-01-06 22:58:04.000000000 +0000 | |
4 | @@ -106,6 +106,8 @@ | |
5 | * - Changed the assumption that HZ = 100 | |
6 | * 10/17/03 mc - v1.04 | |
7 | * - added new DMA API support | |
8 | + * 06/01/04 jmd - v1.04a | |
9 | + * - Re-add reset_bus support | |
10 | **************************************************************************/ | |
11 | ||
12 | #define CVT_LINUX_VERSION(V,P,S) (V * 65536 + P * 256 + S) | |
13 | @@ -149,6 +151,7 @@ | |
14 | .queuecommand = i91u_queue, | |
15 | // .abort = i91u_abort, | |
16 | // .reset = i91u_reset, | |
17 | + .eh_bus_reset_handler = i91u_bus_reset, | |
18 | .bios_param = i91u_biosparam, | |
19 | .can_queue = 1, | |
20 | .this_id = 1, | |
21 | @@ -161,7 +164,7 @@ | |
22 | char *i91uCopyright = "Copyright (C) 1996-98"; | |
23 | char *i91uInitioName = "by Initio Corporation"; | |
24 | char *i91uProductName = "INI-9X00U/UW"; | |
25 | -char *i91uVersion = "v1.04"; | |
26 | +char *i91uVersion = "v1.04a"; | |
27 | ||
28 | #define TULSZ(sz) (sizeof(sz) / sizeof(sz[0])) | |
29 | #define TUL_RDWORD(x,y) (short)(inl((int)((ULONG)((ULONG)x+(UCHAR)y)) )) | |
30 | @@ -587,6 +590,15 @@ | |
31 | return tul_device_reset(pHCB, (ULONG) SCpnt, SCpnt->device->id, reset_flags); | |
32 | } | |
33 | ||
34 | +int i91u_bus_reset(Scsi_Cmnd * SCpnt) | |
35 | +{ | |
36 | + HCS *pHCB; | |
37 | + | |
38 | + pHCB = (HCS *) SCpnt->device->host->base; | |
39 | + tul_reset_scsi_bus(pHCB); | |
40 | + return SUCCESS; | |
41 | +} | |
42 | + | |
43 | /* | |
44 | * Return the "logical geometry" | |
45 | */ | |
46 | diff -u linux-2.6.1-rc2.orig/drivers/scsi/ini9100u.h linux-2.6.1-rc2/drivers/scsi/ini9100u.h | |
47 | --- linux-2.6.1-rc2.orig/drivers/scsi/ini9100u.h 2003-12-18 02:58:56.000000000 +0000 | |
48 | +++ linux-2.6.1-rc2/drivers/scsi/ini9100u.h 2004-01-06 22:58:35.000000000 +0000 | |
49 | @@ -82,10 +82,11 @@ | |
50 | extern int i91u_queue(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); | |
51 | extern int i91u_abort(Scsi_Cmnd *); | |
52 | extern int i91u_reset(Scsi_Cmnd *, unsigned int); | |
53 | +extern int i91u_bus_reset(Scsi_Cmnd *); | |
54 | extern int i91u_biosparam(struct scsi_device *, struct block_device *, | |
55 | sector_t, int *); | |
56 | ||
57 | -#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03g" | |
58 | +#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a" | |
59 | ||
60 | #define VIRT_TO_BUS(i) (unsigned int) virt_to_bus((void *)(i)) | |
61 | #define ULONG unsigned long |