summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-11-05 16:38:32 +0000
committerAnthony Liguori <aliguori@amazon.com>2013-11-05 19:57:46 -0800
commitf567656a67e3859a8be2371c45ff66e90321a2c1 (patch)
tree947f2e0638e334b7262f6720c9b2c839b1fef79b
parentc65e5de94dbe667743d1523d6b4ac301cd76b0fe (diff)
bswap.h: Remove le32_to_cpupu()
Replace the legacy le32_to_cpupu() with ldl_le_p(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 1383669517-25598-5-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori <aliguori@amazon.com>
-rw-r--r--hw/net/ne2000.c2
-rw-r--r--include/hw/pci/pci.h2
-rw-r--r--include/qemu/bswap.h5
3 files changed, 2 insertions, 7 deletions
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 9ba3d1e7a..4c32e9ec2 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 9c961a994..b783e68d0 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 1c500026a..ac5b2e001 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);