firewire: rename CSR access driver methods
Rather than "read a Control and Status Registers (CSR) Architecture register" I prefer to say "read a Control and Status Register". Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
b384cf1887
commit
0fcff4e393
|
@ -1044,7 +1044,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
|
||||||
|
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
|
|
||||||
cycle_time = card->driver->read_csr_reg(card, CSR_CYCLE_TIME);
|
cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
|
||||||
|
|
||||||
switch (a->clk_id) {
|
switch (a->clk_id) {
|
||||||
case CLOCK_REALTIME: getnstimeofday(&ts); break;
|
case CLOCK_REALTIME: getnstimeofday(&ts); break;
|
||||||
|
|
|
@ -1026,19 +1026,17 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
|
||||||
case CSR_BUS_TIME:
|
case CSR_BUS_TIME:
|
||||||
case CSR_BUSY_TIMEOUT:
|
case CSR_BUSY_TIMEOUT:
|
||||||
if (tcode == TCODE_READ_QUADLET_REQUEST)
|
if (tcode == TCODE_READ_QUADLET_REQUEST)
|
||||||
*data = cpu_to_be32(card->driver->
|
*data = cpu_to_be32(card->driver->read_csr(card, reg));
|
||||||
read_csr_reg(card, reg));
|
|
||||||
else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
|
else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
|
||||||
card->driver->write_csr_reg(card, reg,
|
card->driver->write_csr(card, reg, be32_to_cpu(*data));
|
||||||
be32_to_cpu(*data));
|
|
||||||
else
|
else
|
||||||
rcode = RCODE_TYPE_ERROR;
|
rcode = RCODE_TYPE_ERROR;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CSR_RESET_START:
|
case CSR_RESET_START:
|
||||||
if (tcode == TCODE_WRITE_QUADLET_REQUEST)
|
if (tcode == TCODE_WRITE_QUADLET_REQUEST)
|
||||||
card->driver->write_csr_reg(card, CSR_STATE_CLEAR,
|
card->driver->write_csr(card, CSR_STATE_CLEAR,
|
||||||
CSR_STATE_BIT_ABDICATE);
|
CSR_STATE_BIT_ABDICATE);
|
||||||
else
|
else
|
||||||
rcode = RCODE_TYPE_ERROR;
|
rcode = RCODE_TYPE_ERROR;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -78,8 +78,8 @@ struct fw_card_driver {
|
||||||
int (*enable_phys_dma)(struct fw_card *card,
|
int (*enable_phys_dma)(struct fw_card *card,
|
||||||
int node_id, int generation);
|
int node_id, int generation);
|
||||||
|
|
||||||
u32 (*read_csr_reg)(struct fw_card *card, int csr_offset);
|
u32 (*read_csr)(struct fw_card *card, int csr_offset);
|
||||||
void (*write_csr_reg)(struct fw_card *card, int csr_offset, u32 value);
|
void (*write_csr)(struct fw_card *card, int csr_offset, u32 value);
|
||||||
|
|
||||||
struct fw_iso_context *
|
struct fw_iso_context *
|
||||||
(*allocate_iso_context)(struct fw_card *card,
|
(*allocate_iso_context)(struct fw_card *card,
|
||||||
|
|
|
@ -2026,7 +2026,7 @@ static int ohci_enable_phys_dma(struct fw_card *card,
|
||||||
#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */
|
#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 ohci_read_csr_reg(struct fw_card *card, int csr_offset)
|
static u32 ohci_read_csr(struct fw_card *card, int csr_offset)
|
||||||
{
|
{
|
||||||
struct fw_ohci *ohci = fw_ohci(card);
|
struct fw_ohci *ohci = fw_ohci(card);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -2077,7 +2077,7 @@ static u32 ohci_read_csr_reg(struct fw_card *card, int csr_offset)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ohci_write_csr_reg(struct fw_card *card, int csr_offset, u32 value)
|
static void ohci_write_csr(struct fw_card *card, int csr_offset, u32 value)
|
||||||
{
|
{
|
||||||
struct fw_ohci *ohci = fw_ohci(card);
|
struct fw_ohci *ohci = fw_ohci(card);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -2576,8 +2576,8 @@ static const struct fw_card_driver ohci_driver = {
|
||||||
.send_response = ohci_send_response,
|
.send_response = ohci_send_response,
|
||||||
.cancel_packet = ohci_cancel_packet,
|
.cancel_packet = ohci_cancel_packet,
|
||||||
.enable_phys_dma = ohci_enable_phys_dma,
|
.enable_phys_dma = ohci_enable_phys_dma,
|
||||||
.read_csr_reg = ohci_read_csr_reg,
|
.read_csr = ohci_read_csr,
|
||||||
.write_csr_reg = ohci_write_csr_reg,
|
.write_csr = ohci_write_csr,
|
||||||
|
|
||||||
.allocate_iso_context = ohci_allocate_iso_context,
|
.allocate_iso_context = ohci_allocate_iso_context,
|
||||||
.free_iso_context = ohci_free_iso_context,
|
.free_iso_context = ohci_free_iso_context,
|
||||||
|
|
Loading…
Reference in a new issue