Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cca60977 authored by Jarod Wilson's avatar Jarod Wilson Committed by Stefan Richter
Browse files

firewire: replace more hex values with defined csr constants 



Trivial change to replace more meaningless (to the untrained eye) hex
values with defined CSR constants.

Signed-off-by: default avatarJarod Wilson <jwilson@redhat.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent c9755e14

drivers/firewire/fw-device.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ read_rom(struct fw_device *device, int generation, int index, u32 *data) 


	init_completion(&callback_data.done);



	offset = 0xfffff0000400ULL + index * 4;

	offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;

	fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,

			device->node_id, generation, device->max_speed,

			offset, NULL, 4, complete_transaction, &callback_data);

drivers/firewire/fw-transaction.c

+6 −3
Original line number Diff line number Diff line
@@ -396,7 +396,8 @@ const struct fw_address_region fw_high_memory_region = 
const struct fw_address_region fw_private_region =

	{ .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL,  };

const struct fw_address_region fw_csr_region =

	{ .start = 0xfffff0000000ULL, .end = 0xfffff0000800ULL,  };

	{ .start = CSR_REGISTER_BASE,

	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM_END,  };

const struct fw_address_region fw_unit_space_region =

	{ .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, };

EXPORT_SYMBOL(fw_low_memory_region);
@@ -747,7 +748,8 @@ fw_core_handle_response(struct fw_card *card, struct fw_packet *p) 
EXPORT_SYMBOL(fw_core_handle_response);



static const struct fw_address_region topology_map_region =

	{ .start = 0xfffff0001000ull, .end = 0xfffff0001400ull, };

	{ .start = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP,

	  .end   = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP_END, };



static void

handle_topology_map(struct fw_card *card, struct fw_request *request,
@@ -785,7 +787,8 @@ static struct fw_address_handler topology_map = { 
};



static const struct fw_address_region registers_region =

	{ .start = 0xfffff0000000ull, .end = 0xfffff0000400ull, };

	{ .start = CSR_REGISTER_BASE,

	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM, };



static void

handle_registers(struct fw_card *card, struct fw_request *request,