diff options
author | Tejun Heo <htejun@gmail.com> | 2006-03-05 02:03:52 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-05 02:39:55 -0500 |
commit | e653a1e6131d0a819288a2e2de654627233604e0 (patch) | |
tree | 1bfdb56d50a92f89d61efb4ca5b09886f8581a13 /drivers/scsi/sata_sil.c | |
parent | 48d4ef2a1df9867c67b515d66732ba028a73735d (diff) |
[PATCH] sata_sil: cosmetic flag/constant changes
Collect common host flags into SIL_DFL_HOST_FLAGS and add comments to
constants.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/sata_sil.c')
-rw-r--r-- | drivers/scsi/sata_sil.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index 81bdc10a6e9..4f2a67ed39d 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c | |||
@@ -49,14 +49,30 @@ | |||
49 | #define DRV_VERSION "0.9" | 49 | #define DRV_VERSION "0.9" |
50 | 50 | ||
51 | enum { | 51 | enum { |
52 | /* | ||
53 | * host flags | ||
54 | */ | ||
52 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), | 55 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), |
53 | SIL_FLAG_MOD15WRITE = (1 << 30), | 56 | SIL_FLAG_MOD15WRITE = (1 << 30), |
57 | SIL_DFL_HOST_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | ||
58 | ATA_FLAG_MMIO, | ||
54 | 59 | ||
60 | /* | ||
61 | * Controller IDs | ||
62 | */ | ||
55 | sil_3112 = 0, | 63 | sil_3112 = 0, |
56 | sil_3512 = 1, | 64 | sil_3512 = 1, |
57 | sil_3114 = 2, | 65 | sil_3114 = 2, |
58 | 66 | ||
67 | /* | ||
68 | * Register offsets | ||
69 | */ | ||
59 | SIL_SYSCFG = 0x48, | 70 | SIL_SYSCFG = 0x48, |
71 | |||
72 | /* | ||
73 | * Register bits | ||
74 | */ | ||
75 | /* SYSCFG */ | ||
60 | SIL_MASK_IDE0_INT = (1 << 22), | 76 | SIL_MASK_IDE0_INT = (1 << 22), |
61 | SIL_MASK_IDE1_INT = (1 << 23), | 77 | SIL_MASK_IDE1_INT = (1 << 23), |
62 | SIL_MASK_IDE2_INT = (1 << 24), | 78 | SIL_MASK_IDE2_INT = (1 << 24), |
@@ -65,7 +81,12 @@ enum { | |||
65 | SIL_MASK_4PORT = SIL_MASK_2PORT | | 81 | SIL_MASK_4PORT = SIL_MASK_2PORT | |
66 | SIL_MASK_IDE2_INT | SIL_MASK_IDE3_INT, | 82 | SIL_MASK_IDE2_INT | SIL_MASK_IDE3_INT, |
67 | 83 | ||
84 | /* BMDMA/BMDMA2 */ | ||
68 | SIL_INTR_STEERING = (1 << 1), | 85 | SIL_INTR_STEERING = (1 << 1), |
86 | |||
87 | /* | ||
88 | * Others | ||
89 | */ | ||
69 | SIL_QUIRK_MOD15WRITE = (1 << 0), | 90 | SIL_QUIRK_MOD15WRITE = (1 << 0), |
70 | SIL_QUIRK_UDMA5MAX = (1 << 1), | 91 | SIL_QUIRK_UDMA5MAX = (1 << 1), |
71 | }; | 92 | }; |
@@ -169,8 +190,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
169 | /* sil_3112 */ | 190 | /* sil_3112 */ |
170 | { | 191 | { |
171 | .sht = &sil_sht, | 192 | .sht = &sil_sht, |
172 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 193 | .host_flags = SIL_DFL_HOST_FLAGS | SIL_FLAG_MOD15WRITE, |
173 | ATA_FLAG_MMIO | SIL_FLAG_MOD15WRITE, | ||
174 | .pio_mask = 0x1f, /* pio0-4 */ | 194 | .pio_mask = 0x1f, /* pio0-4 */ |
175 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 195 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
176 | .udma_mask = 0x3f, /* udma0-5 */ | 196 | .udma_mask = 0x3f, /* udma0-5 */ |
@@ -179,9 +199,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
179 | /* sil_3512 */ | 199 | /* sil_3512 */ |
180 | { | 200 | { |
181 | .sht = &sil_sht, | 201 | .sht = &sil_sht, |
182 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 202 | .host_flags = SIL_DFL_HOST_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
183 | ATA_FLAG_MMIO | | ||
184 | SIL_FLAG_RERR_ON_DMA_ACT, | ||
185 | .pio_mask = 0x1f, /* pio0-4 */ | 203 | .pio_mask = 0x1f, /* pio0-4 */ |
186 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 204 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
187 | .udma_mask = 0x3f, /* udma0-5 */ | 205 | .udma_mask = 0x3f, /* udma0-5 */ |
@@ -190,9 +208,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
190 | /* sil_3114 */ | 208 | /* sil_3114 */ |
191 | { | 209 | { |
192 | .sht = &sil_sht, | 210 | .sht = &sil_sht, |
193 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 211 | .host_flags = SIL_DFL_HOST_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
194 | ATA_FLAG_MMIO | | ||
195 | SIL_FLAG_RERR_ON_DMA_ACT, | ||
196 | .pio_mask = 0x1f, /* pio0-4 */ | 212 | .pio_mask = 0x1f, /* pio0-4 */ |
197 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 213 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
198 | .udma_mask = 0x3f, /* udma0-5 */ | 214 | .udma_mask = 0x3f, /* udma0-5 */ |