From: Peter Maydell Date: Thu, 18 Mar 2021 10:05:37 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/vivier/tags/q800-for-6.0-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b12498fc575f2ad30f09fe78badc7fef526e2d76;p=qemu.git Merge remote-tracking branch 'remotes/vivier/tags/q800-for-6.0-pull-request' into staging q800 pull request 20210316 Several fixes for mac_via needed for future support of MacOS ROM # gpg: Signature made Tue 16 Mar 2021 21:14:42 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier " [full] # gpg: aka "Laurent Vivier " [full] # gpg: aka "Laurent Vivier (Red Hat) " [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier/tags/q800-for-6.0-pull-request: mac_via: remove VIA1 timer optimisations mac_via: fix 60Hz VIA1 timer interval mac_via: rename VBL timer to 60Hz timer mac_via: don't re-inject ADB response when switching to IDLE state mac_via: allow long accesses to VIA registers mac_via: fix up adb_via_receive() trace events mac_via: switch rtc pram trace-events to use hex rather than decimal for addresses Signed-off-by: Peter Maydell --- b12498fc575f2ad30f09fe78badc7fef526e2d76