[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-6.1 03/12] bitops.h: revert db1ffc32dd ("qemu/bitops.h: add bi
From: |
Richard Henderson |
Subject: |
[PULL for-6.1 03/12] bitops.h: revert db1ffc32dd ("qemu/bitops.h: add bitrev8 implementation") |
Date: |
Mon, 26 Jul 2021 11:47:20 -1000 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit db1ffc32dd ("qemu/bitops.h: add bitrev8 implementation") introduced
a bitrev8() function to reverse the bit ordering required for storing the
MAC address in the q800 PROM.
This function is not required since QEMU implements its own revbit8()
function which does exactly the same thing. Remove the extraneous
bitrev8() function and switch its only caller in hw/m68k/q800.c to
use revbit8() instead.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210725110557.3007-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/bitops.h | 22 ----------------------
hw/m68k/q800.c | 2 +-
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h
index 110c56e099..03213ce952 100644
--- a/include/qemu/bitops.h
+++ b/include/qemu/bitops.h
@@ -618,26 +618,4 @@ static inline uint64_t half_unshuffle64(uint64_t x)
return x;
}
-/**
- * bitrev8:
- * @x: 8-bit value to be reversed
- *
- * Given an input value with bits::
- *
- * ABCDEFGH
- *
- * return the value with its bits reversed from left to right::
- *
- * HGFEDCBA
- *
- * Returns: the bit-reversed value.
- */
-static inline uint8_t bitrev8(uint8_t x)
-{
- x = ((x >> 1) & 0x55) | ((x << 1) & 0xaa);
- x = ((x >> 2) & 0x33) | ((x << 2) & 0xcc);
- x = (x >> 4) | (x << 4) ;
- return x;
-}
-
#endif
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 6817c8b5d1..ac0a13060b 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -334,7 +334,7 @@ static void q800_init(MachineState *machine)
prom = memory_region_get_ram_ptr(dp8393x_prom);
checksum = 0;
for (i = 0; i < 6; i++) {
- prom[i] = bitrev8(nd_table[0].macaddr.a[i]);
+ prom[i] = revbit8(nd_table[0].macaddr.a[i]);
checksum ^= prom[i];
}
prom[7] = 0xff - checksum;
--
2.25.1
- [PULL for-6.1 00/12] tcg and misc patch queue, Richard Henderson, 2021/07/26
- [PULL for-6.1 02/12] accel/tcg: Remove unnecessary check on icount_extra in cpu_loop_exec_tb(), Richard Henderson, 2021/07/26
- [PULL for-6.1 01/12] accel/tcg: Don't use CF_COUNT_MASK as the max value of icount_decr.u16.low, Richard Henderson, 2021/07/26
- [PULL for-6.1 03/12] bitops.h: revert db1ffc32dd ("qemu/bitops.h: add bitrev8 implementation"),
Richard Henderson <=
- [PULL for-6.1 04/12] nbd/server: Mark variable unused in nbd_negotiate_meta_queries, Richard Henderson, 2021/07/26
- [PULL for-6.1 05/12] accel/tcg: Remove unused variable in cpu_exec, Richard Henderson, 2021/07/26
- [PULL for-6.1 06/12] util/selfmap: Discard mapping on error, Richard Henderson, 2021/07/26
- [PULL for-6.1 07/12] net/checksum: Remove unused variable in net_checksum_add_iov, Richard Henderson, 2021/07/26
- [PULL for-6.1 08/12] hw/audio/adlib: Remove unused variable in adlib_callback, Richard Henderson, 2021/07/26
- [PULL for-6.1 09/12] hw/ppc/spapr_events: Remove unused variable from check_exception, Richard Henderson, 2021/07/26
- [PULL for-6.1 10/12] hw/pci-hist/pnv_phb4: Fix typo in pnv_phb4_ioda_write, Richard Henderson, 2021/07/26
- [PULL for-6.1 11/12] linux-user/syscall: Remove unused variable from execve, Richard Henderson, 2021/07/26
- [PULL for-6.1 12/12] tests/unit: Remove unused variable from test_io, Richard Henderson, 2021/07/26
- Re: [PULL for-6.1 00/12] tcg and misc patch queue, Peter Maydell, 2021/07/27