diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2010-06-10 02:34:13 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2010-06-10 02:34:13 -0400 |
commit | 27a2329f8235d6ce637463f5d83e98d760ef006e (patch) | |
tree | dcc3b1a62d92d407f38744a93914742e9eed1816 /drivers/firewire/core-transaction.c | |
parent | a48777e03ad53777ed119a5f86dd22a6c5a378ad (diff) |
firewire: add CSR BUSY_TIMEOUT support
Implement the BUSY_TIMEOUT register, which is required for nodes that
support retries.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'drivers/firewire/core-transaction.c')
-rw-r--r-- | drivers/firewire/core-transaction.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index 2a390726fa76..8146133818dc 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c | |||
@@ -1115,6 +1115,17 @@ static void handle_registers(struct fw_card *card, struct fw_request *request, | |||
1115 | rcode = RCODE_TYPE_ERROR; | 1115 | rcode = RCODE_TYPE_ERROR; |
1116 | break; | 1116 | break; |
1117 | 1117 | ||
1118 | case CSR_BUSY_TIMEOUT: | ||
1119 | if (tcode == TCODE_READ_QUADLET_REQUEST) | ||
1120 | *data = cpu_to_be32(card->driver-> | ||
1121 | read_csr_reg(card, CSR_BUSY_TIMEOUT)); | ||
1122 | else if (tcode == TCODE_WRITE_QUADLET_REQUEST) | ||
1123 | card->driver->write_csr_reg(card, CSR_BUSY_TIMEOUT, | ||
1124 | be32_to_cpu(*data)); | ||
1125 | else | ||
1126 | rcode = RCODE_TYPE_ERROR; | ||
1127 | break; | ||
1128 | |||
1118 | case CSR_BROADCAST_CHANNEL: | 1129 | case CSR_BROADCAST_CHANNEL: |
1119 | if (tcode == TCODE_READ_QUADLET_REQUEST) | 1130 | if (tcode == TCODE_READ_QUADLET_REQUEST) |
1120 | *data = cpu_to_be32(card->broadcast_channel); | 1131 | *data = cpu_to_be32(card->broadcast_channel); |
@@ -1140,9 +1151,6 @@ static void handle_registers(struct fw_card *card, struct fw_request *request, | |||
1140 | BUG(); | 1151 | BUG(); |
1141 | break; | 1152 | break; |
1142 | 1153 | ||
1143 | case CSR_BUSY_TIMEOUT: | ||
1144 | /* FIXME: Implement this. */ | ||
1145 | |||
1146 | default: | 1154 | default: |
1147 | rcode = RCODE_ADDRESS_ERROR; | 1155 | rcode = RCODE_ADDRESS_ERROR; |
1148 | break; | 1156 | break; |