[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pf
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pflash_read() |
Date: |
Mon, 6 May 2019 00:15:40 +0200 |
The load/store API eases code review.
Signed-off-by: Stephen Checkoway <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Extracted from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/block/pflash_cfi02.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 69e0086324e..2777167af11 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -196,34 +196,20 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr
offset,
case 0x00:
flash_read:
/* Flash area read */
- p = pfl->storage;
+ p = (uint8_t *)pfl->storage + offset;
+ if (pfl->be) {
+ ret = ldn_be_p(p, width);
+ } else {
+ ret = ldn_le_p(p, width);
+ }
switch (width) {
case 1:
- ret = p[offset];
trace_pflash_data_read8(offset, ret);
break;
case 2:
- if (be) {
- ret = p[offset] << 8;
- ret |= p[offset + 1];
- } else {
- ret = p[offset];
- ret |= p[offset + 1] << 8;
- }
trace_pflash_data_read16(offset, ret);
break;
case 4:
- if (be) {
- ret = p[offset] << 24;
- ret |= p[offset + 1] << 16;
- ret |= p[offset + 2] << 8;
- ret |= p[offset + 3];
- } else {
- ret = p[offset];
- ret |= p[offset + 1] << 8;
- ret |= p[offset + 2] << 16;
- ret |= p[offset + 3] << 24;
- }
trace_pflash_data_read32(offset, ret);
break;
}
--
2.20.1
- [Qemu-devel] [PATCH 00/13] hw/block/pflash_cfi02: Clean-up and fixes, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 01/13] tests/pflash-cfi02: Add test for supported CFI commands, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 04/13] hw/block/pflash_cfi02: Fix debug format string, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 10/13] hw/block/pflash_cfi02: Extract the pflash_data_read() function, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 03/13] tests/pflash-cfi02: Use IEC binary prefixes for size constants, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 06/13] hw/block/pflash_cfi02: Add helpers to manipulate the status bits, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 05/13] hw/block/pflash_cfi02: Add an enum to define the write cycles, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 08/13] hw/block/pflash_cfi02: Use the ldst API in pflash_write(), Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pflash_read(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 13/13] hw/block/pflash_cfi02: Use the chip erase time specified in the CFI table, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 12/13] hw/block/pflash_cfi02: Fix command address comparison, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 11/13] hw/block/pflash_cfi02: Unify the MemoryRegionOps, Philippe Mathieu-Daudé, 2019/05/05