diff --git a/Changelog.md b/Changelog.md index de5e8f16..1f6ba359 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ OpenCore Changelog - Added APFS support with Fusion Drive and enhanced security - Added AppleEvent mouse support in OpenCanopy - Fixed AppleEvent compatibility with Timer TPL restrictions +- Added mouse drivers to the package as OVMF needs one #### v0.5.7 - Added TimeMachine detection to picker diff --git a/Debug/README.md b/Debug/README.md index a46826f4..a4d43044 100644 --- a/Debug/README.md +++ b/Debug/README.md @@ -100,16 +100,16 @@ when no macOS guest booting is required. ``` qemu-system-x86_64 -L . -bios "$OVMF_BUILD/OVMF.fd" -hda fat:rw:ESP \ - -machine q35 -m 2048 -cpu Penryn -smp 4,cores=2 -gdb tcp::8864 + -machine q35 -m 2048 -cpu Penryn -smp 4,cores=2 -usb -device usb-mouse -gdb tcp::8864 ``` To run QEMU with SMM support use the following command: ``` qemu-system-x86_64 -L . -global driver=cfi.pflash01,property=secure,value=on \ - -drive if=pflash,format=raw,unit=0,file="$OVMF_BUILD"/OVMF_CODE.fd,readonly=on \ - -drive if=pflash,format=raw,unit=1,file="$OVMF_BUILD"/OVMF_VARS.fd -hda fat:rw:ESP \ - -global ICH9-LPC.disable_s3=1 -machine q35,smm=on,accel=tcg -m 2048 -cpu Penryn \ - -smp 4,cores=2 -cdrom /Users/user/Downloads/debian-10.3.0-amd64-netinst.iso -gdb tcp::8864 + -drive if=pflash,format=raw,unit=0,file="$OVMF_BUILD"/OVMF_CODE.fd,readonly=on \ + -drive if=pflash,format=raw,unit=1,file="$OVMF_BUILD"/OVMF_VARS.fd -hda fat:rw:ESP \ + -global ICH9-LPC.disable_s3=1 -machine q35,smm=on,accel=tcg -m 2048 -cpu Penryn \ + -smp 4,cores=2 -usb -device usb-mouse -gdb tcp::8864 ``` You may additionally pass `-S` flag to QEMU to stop at first instruction diff --git a/Docs/Configuration.pdf b/Docs/Configuration.pdf index ecd51ace..e17f6681 100644 Binary files a/Docs/Configuration.pdf and b/Docs/Configuration.pdf differ diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex index 0f80d3ab..87c9401b 100755 --- a/Docs/Configuration.tex +++ b/Docs/Configuration.tex @@ -3945,6 +3945,14 @@ even cause permanent firmware damage. Some of the known drivers are listed below & USB keyboard driver adding the support of \texttt{AppleKeyMapAggregator} protocols on top of a custom USB keyboard driver implementation. This is an alternative to builtin \texttt{KeySupport}, which may work better or worse depending on the firmware. \\ + \href{https://github.com/acidanthera/audk}{\texttt{Ps2MouseDxe}}\textbf{*} +& PS/2 mouse driver from \texttt{MdeModulePkg}. Some very old laptop firmwares + may not include this driver, but it is necessary for touchpad to work + in UEFI graphical interfaces, such as \texttt{OpenCanopy}. \\ + \href{https://github.com/acidanthera/audk}{\texttt{UsbMouseDxe}}\textbf{*} +& USB mouse driver from \texttt{MdeModulePkg}. Some virtual machine firmwares + like OVMF may not include this driver, but it is necessary for mouse to work + in UEFI graphical interfaces, such as \texttt{OpenCanopy}. \\ \href{https://github.com/acidanthera/AppleSupportPkg}{\texttt{VBoxHfs}} & HFS file system driver with bless support. This driver is an alternative to a closed source \texttt{HfsPlus} driver commonly found in Apple firmwares. While diff --git a/Docs/Differences/Differences.pdf b/Docs/Differences/Differences.pdf index 04b8b4b5..11c92c4c 100644 Binary files a/Docs/Differences/Differences.pdf and b/Docs/Differences/Differences.pdf differ diff --git a/Docs/Differences/Differences.tex b/Docs/Differences/Differences.tex index 346b134f..f575375b 100644 --- a/Docs/Differences/Differences.tex +++ b/Docs/Differences/Differences.tex @@ -1,7 +1,7 @@ \documentclass[]{article} %DIF LATEXDIFF DIFFERENCE FILE %DIF DEL PreviousConfiguration.tex Tue Apr 7 19:32:13 2020 -%DIF ADD ../Configuration.tex Mon Apr 13 06:13:02 2020 +%DIF ADD ../Configuration.tex Fri Apr 17 09:18:48 2020 \usepackage{lmodern} \usepackage{amssymb,amsmath} @@ -4013,7 +4013,15 @@ even cause permanent firmware damage. Some of the known drivers are listed below & USB keyboard driver adding the support of \texttt{AppleKeyMapAggregator} protocols on top of a custom USB keyboard driver implementation. This is an alternative to builtin \texttt{KeySupport}, which may work better or worse depending on the firmware. \\ -\href{https://github.com/acidanthera/AppleSupportPkg}{\texttt{VBoxHfs}} + \DIFaddbegin \href{https://github.com/acidanthera/audk}{\texttt{Ps2MouseDxe}}\textbf{\DIFadd{*}} +& \DIFadd{PS/2 mouse driver from }\texttt{\DIFadd{MdeModulePkg}}\DIFadd{. Some very old laptop firmwares + may not include this driver, but it is necessary for touchpad to work + in UEFI graphical interfaces, such as }\texttt{\DIFadd{OpenCanopy}}\DIFadd{. }\\ + \href{https://github.com/acidanthera/audk}{\texttt{UsbMouseDxe}}\textbf{\DIFadd{*}} +& \DIFadd{USB mouse driver from }\texttt{\DIFadd{MdeModulePkg}}\DIFadd{. Some virtual machine firmwares + like OVMF may not include this driver, but it is necessary for mouse to work + in UEFI graphical interfaces, such as }\texttt{\DIFadd{OpenCanopy}}\DIFadd{. }\\ +\DIFaddend \href{https://github.com/acidanthera/AppleSupportPkg}{\texttt{VBoxHfs}} & HFS file system driver with bless support. This driver is an alternative to a closed source \texttt{HfsPlus} driver commonly found in Apple firmwares. While it is feature complete, it is approximately 3~times slower and is yet to undergo diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc index 3eee0b26..0f6b32ee 100755 --- a/OpenCorePkg.dsc +++ b/OpenCorePkg.dsc @@ -138,6 +138,8 @@ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif } + MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf + MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf OpenCorePkg/Application/BootKicker/BootKicker.inf OpenCorePkg/Application/Bootstrap/Bootstrap.inf diff --git a/macbuild.tool b/macbuild.tool index 1d4823cd..b360c650 100755 --- a/macbuild.tool +++ b/macbuild.tool @@ -42,6 +42,8 @@ package() { cp OpenCore.efi tmp/EFI/OC/ || exit 1 cp OpenRuntime.efi tmp/EFI/OC/Drivers/ || exit 1 cp OpenUsbKbDxe.efi tmp/EFI/OC/Drivers/ || exit 1 + cp Ps2MouseDxe.efi tmp/EFI/OC/Drivers/ || exit 1 + cp UsbMouseDxe.efi tmp/EFI/OC/Drivers/ || exit 1 cp Shell.efi tmp/EFI/OC/Tools/OpenShell.efi || exit 1 cp VerifyMsrE2.efi tmp/EFI/OC/Tools/ || exit 1 cp XhciDxe.efi tmp/EFI/OC/Drivers/ || exit 1