summaryrefslogtreecommitdiff
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-06-12 20:35:21 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-06-19 13:01:41 +0200
commitb384cf18873da1ed100662aa7373edf5883a1c24 (patch)
tree2c4f488315855554dd430d0cc1e8969333f26d54 /drivers/firewire
parentc8a94ded57e9cc2498d401b2f5c856213a3e19fb (diff)
firewire: core: combine some repeated code
All of these CSRs have the same read/ write/ aynthing-else handling, except for CSR_PRIORITY_BUDGET which might not be implemented. The CSR_CYCLE_TIME read handler implementation accepted 4-byte-sized block write requests before this change but this is just silly; the register is only required to support quadlet read and write requests like the other r/w CSR core and Serial-Bus-dependent registers. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/core-transaction.c84
1 files changed, 15 insertions, 69 deletions
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 87d69cddb231..b8f6db6a0494 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -1006,38 +1006,30 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
unsigned long flags;
switch (reg) {
- case CSR_STATE_CLEAR:
- if (tcode == TCODE_READ_QUADLET_REQUEST)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_STATE_CLEAR));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_STATE_CLEAR,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
-
- case CSR_STATE_SET:
- if (tcode == TCODE_READ_QUADLET_REQUEST)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_STATE_SET));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_STATE_SET,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
+ case CSR_PRIORITY_BUDGET:
+ if (!card->priority_budget_implemented) {
+ rcode = RCODE_ADDRESS_ERROR;
+ break;
+ }
+ /* else fall through */
case CSR_NODE_IDS:
/*
* per IEEE 1394-2008 8.3.22.3, not IEEE 1394.1-2004 3.2.8
* and 9.6, but interoperable with IEEE 1394.1-2004 bridges
*/
+ /* fall through */
+
+ case CSR_STATE_CLEAR:
+ case CSR_STATE_SET:
+ case CSR_CYCLE_TIME:
+ case CSR_BUS_TIME:
+ case CSR_BUSY_TIMEOUT:
if (tcode == TCODE_READ_QUADLET_REQUEST)
*data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_NODE_IDS));
+ read_csr_reg(card, reg));
else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_NODE_IDS,
+ card->driver->write_csr_reg(card, reg,
be32_to_cpu(*data));
else
rcode = RCODE_TYPE_ERROR;
@@ -1078,52 +1070,6 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
}
break;
- case CSR_CYCLE_TIME:
- if (TCODE_IS_READ_REQUEST(tcode) && length == 4)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_CYCLE_TIME));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_CYCLE_TIME,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
-
- case CSR_BUS_TIME:
- if (tcode == TCODE_READ_QUADLET_REQUEST)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_BUS_TIME));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_BUS_TIME,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
-
- case CSR_BUSY_TIMEOUT:
- if (tcode == TCODE_READ_QUADLET_REQUEST)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_BUSY_TIMEOUT));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_BUSY_TIMEOUT,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
-
- case CSR_PRIORITY_BUDGET:
- if (!card->priority_budget_implemented)
- rcode = RCODE_ADDRESS_ERROR;
- else if (tcode == TCODE_READ_QUADLET_REQUEST)
- *data = cpu_to_be32(card->driver->
- read_csr_reg(card, CSR_PRIORITY_BUDGET));
- else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
- card->driver->write_csr_reg(card, CSR_PRIORITY_BUDGET,
- be32_to_cpu(*data));
- else
- rcode = RCODE_TYPE_ERROR;
- break;
-
case CSR_MAINT_UTILITY:
if (tcode == TCODE_READ_QUADLET_REQUEST)
*data = card->maint_utility_register;