[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/9] bswap.h: Remove le32_to_cpupu()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 4/9] bswap.h: Remove le32_to_cpupu() |
Date: |
Tue, 5 Nov 2013 16:38:32 +0000 |
Replace the legacy le32_to_cpupu() with ldl_le_p().
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
---
hw/net/ne2000.c | 2 +-
include/hw/pci/pci.h | 2 +-
include/qemu/bswap.h | 5 -----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 9ba3d1e..4c32e9e 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -497,7 +497,7 @@ static inline uint32_t ne2000_mem_readl(NE2000State *s,
uint32_t addr)
addr &= ~1; /* XXX: check exact behaviour if not even */
if (addr < 32 ||
(addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) {
- return le32_to_cpupu((uint32_t *)(s->mem + addr));
+ return ldl_le_p(s->mem + addr);
} else {
return 0xffffffff;
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 9c961a9..b783e68 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -439,7 +439,7 @@ pci_set_long(uint8_t *config, uint32_t val)
static inline uint32_t
pci_get_long(const uint8_t *config)
{
- return le32_to_cpupu((const uint32_t *)config);
+ return ldl_le_p(config);
}
static inline void
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 1c50002..ac5b2e0 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -412,11 +412,6 @@ static inline void stfq_be_p(void *ptr, float64 v)
/* Legacy unaligned versions. Note that we never had a complete set. */
-static inline uint32_t le32_to_cpupu(const uint32_t *p)
-{
- return ldl_le_p(p);
-}
-
static inline uint32_t be32_to_cpupu(const uint32_t *p)
{
return ldl_be_p(p);
--
1.7.9.5
- [Qemu-devel] [PATCH v2 0/9] Remove legacy unaligned bswap functions, Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 2/9] bswap.h: Remove cpu_to_le32wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 1/9] bswap.h: Remove cpu_to_le16wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 3/9] bswap.h: Remove le16_to_cpupu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 8/9] bswap.h: Remove cpu_to_be64wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 6/9] bswap.h: Remove cpu_to_be16wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 4/9] bswap.h: Remove le32_to_cpupu(),
Peter Maydell <=
- [Qemu-devel] [PATCH v2 7/9] bswap.h: Remove cpu_to_be32wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 9/9] bswap.h: Remove cpu_to_32wu(), Peter Maydell, 2013/11/05
- Re: [Qemu-devel] [PATCH v2 0/9] Remove legacy unaligned bswap functions, Richard Henderson, 2013/11/05