lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: normalize STATE_CLEAR/SET CSR access interface

Browse Source 
Push the maintenance of STATE_CLEAR/SET.abdicate down into the card
driver.  This way, the read/write_csr_reg driver method works uniformly
across all CSR offsets.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter
2010-06-12 20:34:50 +02:00
parent db3c9cc105
commit c8a94ded57
5 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/firewire/core-transaction.c
View File

@ -982,20 +982,6 @@ static const struct fw_address_region registers_region =
{ .start = CSR_REGISTER_BASE,
.end = CSR_REGISTER_BASE | CSR_CONFIG_ROM, };
static u32 read_state_register(struct fw_card *card)
{
u32 value;
/* Bit 8 (cmstr): */
value = card->driver->read_csr_reg(card, CSR_STATE_CLEAR);
/* Bit 10 (abdicate): */
if (card->csr_abdicate)
value |= CSR_STATE_BIT_ABDICATE;
return value;
}
static void update_split_timeout(struct fw_card *card)
{
unsigned int cycles;
@ -1021,29 +1007,25 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
switch (reg) {
case CSR_STATE_CLEAR:
if (tcode == TCODE_READ_QUADLET_REQUEST) {
*data = cpu_to_be32(read_state_register(card));
} else if (tcode == TCODE_WRITE_QUADLET_REQUEST) {
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));
if (*data & cpu_to_be32(CSR_STATE_BIT_ABDICATE))
card->csr_abdicate = false;
} else {
else
rcode = RCODE_TYPE_ERROR;
}
break;
case CSR_STATE_SET:
if (tcode == TCODE_READ_QUADLET_REQUEST) {
*data = cpu_to_be32(read_state_register(card));
} else if (tcode == TCODE_WRITE_QUADLET_REQUEST) {
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));
if (*data & cpu_to_be32(CSR_STATE_BIT_ABDICATE))
card->csr_abdicate = true;
} else {
else
rcode = RCODE_TYPE_ERROR;
}
break;
case CSR_NODE_IDS:
@ -1063,7 +1045,8 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
case CSR_RESET_START:
if (tcode == TCODE_WRITE_QUADLET_REQUEST)
card->csr_abdicate = false;
card->driver->write_csr_reg(card, CSR_STATE_CLEAR,
CSR_STATE_BIT_ABDICATE);
else
rcode = RCODE_TYPE_ERROR;
break;