diff options
Diffstat (limited to 'drivers/ieee1394/sbp2.h')
-rw-r--r-- | drivers/ieee1394/sbp2.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h index 890be1365523..abc647bae5b1 100644 --- a/drivers/ieee1394/sbp2.h +++ b/drivers/ieee1394/sbp2.h | |||
@@ -119,8 +119,8 @@ struct sbp2_query_logins_response { | |||
119 | struct sbp2_reconnect_orb { | 119 | struct sbp2_reconnect_orb { |
120 | u32 reserved1; | 120 | u32 reserved1; |
121 | u32 reserved2; | 121 | u32 reserved2; |
122 | u32 reserved3; | 122 | u32 reserved3; |
123 | u32 reserved4; | 123 | u32 reserved4; |
124 | u32 login_ID_misc; | 124 | u32 login_ID_misc; |
125 | u32 reserved5; | 125 | u32 reserved5; |
126 | u32 status_FIFO_hi; | 126 | u32 status_FIFO_hi; |
@@ -130,8 +130,8 @@ struct sbp2_reconnect_orb { | |||
130 | struct sbp2_logout_orb { | 130 | struct sbp2_logout_orb { |
131 | u32 reserved1; | 131 | u32 reserved1; |
132 | u32 reserved2; | 132 | u32 reserved2; |
133 | u32 reserved3; | 133 | u32 reserved3; |
134 | u32 reserved4; | 134 | u32 reserved4; |
135 | u32 login_ID_misc; | 135 | u32 login_ID_misc; |
136 | u32 reserved5; | 136 | u32 reserved5; |
137 | u32 status_FIFO_hi; | 137 | u32 status_FIFO_hi; |
@@ -188,7 +188,7 @@ struct sbp2_unrestricted_page_table { | |||
188 | struct sbp2_status_block { | 188 | struct sbp2_status_block { |
189 | u32 ORB_offset_hi_misc; | 189 | u32 ORB_offset_hi_misc; |
190 | u32 ORB_offset_lo; | 190 | u32 ORB_offset_lo; |
191 | u8 command_set_dependent[24]; | 191 | u8 command_set_dependent[24]; |
192 | }; | 192 | }; |
193 | 193 | ||
194 | /* | 194 | /* |
@@ -211,7 +211,7 @@ struct sbp2_status_block { | |||
211 | * specified for write posting, where the ohci controller will | 211 | * specified for write posting, where the ohci controller will |
212 | * automatically send an ack_complete when the status is written by the | 212 | * automatically send an ack_complete when the status is written by the |
213 | * sbp2 device... saving a split transaction. =) | 213 | * sbp2 device... saving a split transaction. =) |
214 | */ | 214 | */ |
215 | #define SBP2_STATUS_FIFO_ADDRESS 0xfffe00000000ULL | 215 | #define SBP2_STATUS_FIFO_ADDRESS 0xfffe00000000ULL |
216 | #define SBP2_STATUS_FIFO_ADDRESS_HI 0xfffe | 216 | #define SBP2_STATUS_FIFO_ADDRESS_HI 0xfffe |
217 | #define SBP2_STATUS_FIFO_ADDRESS_LO 0x0 | 217 | #define SBP2_STATUS_FIFO_ADDRESS_LO 0x0 |
@@ -333,10 +333,8 @@ struct sbp2_command_info { | |||
333 | #define SBP2_BREAKAGE_128K_MAX_TRANSFER 0x1 | 333 | #define SBP2_BREAKAGE_128K_MAX_TRANSFER 0x1 |
334 | #define SBP2_BREAKAGE_INQUIRY_HACK 0x2 | 334 | #define SBP2_BREAKAGE_INQUIRY_HACK 0x2 |
335 | 335 | ||
336 | |||
337 | struct sbp2scsi_host_info; | 336 | struct sbp2scsi_host_info; |
338 | 337 | ||
339 | |||
340 | /* | 338 | /* |
341 | * Information needed on a per scsi id basis (one for each sbp2 device) | 339 | * Information needed on a per scsi id basis (one for each sbp2 device) |
342 | */ | 340 | */ |
@@ -406,7 +404,6 @@ struct scsi_id_instance_data { | |||
406 | u32 workarounds; | 404 | u32 workarounds; |
407 | }; | 405 | }; |
408 | 406 | ||
409 | |||
410 | /* Sbp2 host data structure (one per IEEE1394 host) */ | 407 | /* Sbp2 host data structure (one per IEEE1394 host) */ |
411 | struct sbp2scsi_host_info { | 408 | struct sbp2scsi_host_info { |
412 | struct hpsb_host *host; /* IEEE1394 host */ | 409 | struct hpsb_host *host; /* IEEE1394 host */ |