falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bswap.h: Remove cpu_to_be32wu() 

Replace the legacy cpu_to_be32wu() with stl_be_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-8-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
Peter Maydell 2013-11-05 16:38:35 +00:00 committed by Anthony Liguori
parent d8ee2591e4
commit 6bd194ab99
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/block/cdrom.c
View File

@ -59,7 +59,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track)
q += 3; q += 3;
} else { } else {
/* sector 0 */ /* sector 0 */
cpu_to_be32wu((uint32_t *)q, 0); stl_be_p(q, 0);
q += 4; q += 4;
} }
} }
@ -73,7 +73,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track)
lba_to_msf(q, nb_sectors); lba_to_msf(q, nb_sectors);
q += 3; q += 3;
} else { } else {
cpu_to_be32wu((uint32_t *)q, nb_sectors); stl_be_p(q, nb_sectors);
q += 4; q += 4;
} }
len = q - buf; len = q - buf;
@ -127,7 +127,7 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num)
lba_to_msf(q, nb_sectors); lba_to_msf(q, nb_sectors);
q += 3; q += 3;
} else { } else {
cpu_to_be32wu((uint32_t *)q, nb_sectors); stl_be_p(q, nb_sectors);
q += 4; q += 4;
} }

3
hw/net/e1000.c
View File

@ -599,8 +599,7 @@ xmit_seg(E1000State *s)
DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len); DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len);
if (tp->tcp) { if (tp->tcp) {
sofar = frames * tp->mss; sofar = frames * tp->mss;
cpu_to_be32wu((uint32_t *)(tp->data+css+4), // seq stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */
ldl_be_p(tp->data+css+4)+sofar);
if (tp->paylen - sofar > tp->mss) if (tp->paylen - sofar > tp->mss)
tp->data[css + 13] &= ~9; // PSH, FIN tp->data[css + 13] &= ~9; // PSH, FIN
} else // UDP } else // UDP

4
hw/pci/pcie_aer.c
View File

@ -425,7 +425,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err)
/* 7.10.8 Header Log Register */ /* 7.10.8 Header Log Register */
uint8_t *header_log = uint8_t *header_log =
aer_cap + PCI_ERR_HEADER_LOG + i * sizeof err->header[0]; aer_cap + PCI_ERR_HEADER_LOG + i * sizeof err->header[0];
cpu_to_be32wu((uint32_t*)header_log, err->header[i]); stl_be_p(header_log, err->header[i]);
} }
} else { } else {
assert(!(err->flags & PCIE_AER_ERR_TLP_PREFIX_PRESENT)); assert(!(err->flags & PCIE_AER_ERR_TLP_PREFIX_PRESENT));
@ -439,7 +439,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err)
/* 7.10.12 tlp prefix log register */ /* 7.10.12 tlp prefix log register */
uint8_t *prefix_log = uint8_t *prefix_log =
aer_cap + PCI_ERR_TLP_PREFIX_LOG + i * sizeof err->prefix[0]; aer_cap + PCI_ERR_TLP_PREFIX_LOG + i * sizeof err->prefix[0];
cpu_to_be32wu((uint32_t*)prefix_log, err->prefix[i]); stl_be_p(prefix_log, err->prefix[i]);
} }
errcap |= PCI_ERR_CAP_TLP; errcap |= PCI_ERR_CAP_TLP;
} else { } else {

5
include/qemu/bswap.h
View File

@ -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. */ /* Legacy unaligned versions. Note that we never had a complete set. */
static inline void cpu_to_be32wu(uint32_t *p, uint32_t v)
{
stl_be_p(p, v);
}
static inline void cpu_to_be64wu(uint64_t *p, uint64_t v) static inline void cpu_to_be64wu(uint64_t *p, uint64_t v)
{ {
stq_be_p(p, v); stq_be_p(p, v);