diff options
| author | Peter Maydell | 2016-01-22 16:19:20 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-22 16:19:21 +0100 |
| commit | 047e363b05679724d6b784c6ec6310697fe48ba0 (patch) | |
| tree | 17570c0192a633520edf87b8371e4b0befaf82fc /hw/misc/imx31_ccm.c | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | softfloat: fix return type of roundAndPackFloat16 (diff) | |
| download | qemu-047e363b05679724d6b784c6ec6310697fe48ba0.tar.gz qemu-047e363b05679724d6b784c6ec6310697fe48ba0.tar.xz qemu-047e363b05679724d6b784c6ec6310697fe48ba0.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging
softfloat:
* drop confusing softfloat-only types
* fix return type of roundAndPackFloat16
# gpg: Signature made Fri 22 Jan 2016 15:15:17 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-softfloat-20160122:
softfloat: fix return type of roundAndPackFloat16
fpu: Replace uint8 typedef with uint8_t
fpu: Replace int8 typedef with int8_t
fpu: Replace uint32 typedef with uint32_t
fpu: Replace int32 typedef with int32_t
fpu: Replace uint64 typedef with uint64_t
fpu: Replace int64 typedef with int64_t
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/imx31_ccm.c')
| -rw-r--r-- | hw/misc/imx31_ccm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index 47d6ead5ad..c47b96f2ac 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -261,7 +261,7 @@ static void imx31_ccm_reset(DeviceState *dev) static uint64_t imx31_ccm_read(void *opaque, hwaddr offset, unsigned size) { - uint32 value = 0; + uint32_t value = 0; IMX31CCMState *s = (IMX31CCMState *)opaque; if ((offset >> 2) < IMX31_CCM_MAX_REG) { |