On Thu, May 24, 2018 at 08:46:30AM +0800, Haojian Zhuang wrote:
> Enable virtual keyboard on HiKey platform. It detects the pattern
> in memory and GPIO pin setting, and simulates them into virtual
> key.
>
> Cc: Leif Lindholm <[email protected]>
> Cc: Ard Biesheuvel <[email protected]>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Haojian Zhuang <[email protected]>
I think I already gave you a reviewed-by for this one for v4.
/
Leif
> ---
> Platform/Hisilicon/HiKey/HiKey.dsc | 5 ++
> Platform/Hisilicon/HiKey/HiKey.fdf | 5 ++
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 5 ++
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 5 ++
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 93 ++++++++++++++++++++
> 5 files changed, 113 insertions(+)
>
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc
> b/Platform/Hisilicon/HiKey/HiKey.dsc
> index 5cc4ff27f01b..83dd68a820b1 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -192,6 +192,11 @@ [Components.common]
> Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf
>
> + #
> + # Virtual Keyboard
> + #
> + EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
> +
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>
> #
> diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf
> b/Platform/Hisilicon/HiKey/HiKey.fdf
> index 39020d27dbcd..2bca7232b6e5 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> @@ -123,6 +123,11 @@ [FV.FvMain]
> INF Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> INF ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf
>
> + #
> + # Virtual Keyboard
> + #
> + INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
> +
> INF Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>
> #
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> index 34734391b45a..41aa7f8081ed 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> @@ -28,11 +28,16 @@ [Packages]
> MdePkg/MdePkg.dec
>
> [LibraryClasses]
> + CacheMaintenanceLib
> DebugLib
> IoLib
> UefiLib
> UefiDriverEntryPoint
>
> +[Protocols]
> + gEmbeddedGpioProtocolGuid
> + gPlatformVirtualKeyboardProtocolGuid
> +
> [Guids]
> gEfiEndOfDxeEventGroupGuid
>
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> index 07f9ae6a949a..3d608183fa58 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> @@ -15,10 +15,15 @@
> #ifndef __HIKEYDXE_H__
> #define __HIKEYDXE_H__
>
> +#include <Library/CacheMaintenanceLib.h>
> #include <Library/DebugLib.h>
> #include <Library/IoLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> #include <Library/UefiLib.h>
>
> +#include <Protocol/EmbeddedGpio.h>
> +#include <Protocol/PlatformVirtualKeyboard.h>
> +
> #include <Hi6220.h>
> #include <Hi6220RegsPeri.h>
>
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> index b812f8bd483d..afd2f050896a 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> @@ -43,6 +43,8 @@ UartInit (
> MmioWrite32 (PMUSSI_ONOFF8_REG, Val);
> }
>
> +STATIC EMBEDDED_GPIO *mGpio;
> +
> STATIC
> VOID
> MtcmosInit (
> @@ -87,6 +89,90 @@ HiKeyInitPeripherals (
>
> EFI_STATUS
> EFIAPI
> +VirtualKeyboardRegister (
> + IN VOID
> + )
> +{
> + EFI_STATUS Status;
> +
> + Status = gBS->LocateProtocol (
> + &gEmbeddedGpioProtocolGuid,
> + NULL,
> + (VOID **) &mGpio
> + );
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> + return EFI_SUCCESS;
> +}
> +
> +EFI_STATUS
> +EFIAPI
> +VirtualKeyboardReset (
> + IN VOID
> + )
> +{
> + EFI_STATUS Status;
> +
> + if (mGpio == NULL) {
> + return EFI_INVALID_PARAMETER;
> + }
> + Status = mGpio->Set (mGpio, DETECT_J15_FASTBOOT, GPIO_MODE_INPUT);
> + return Status;
> +}
> +
> +BOOLEAN
> +EFIAPI
> +VirtualKeyboardQuery (
> + IN VIRTUAL_KBD_KEY *VirtualKey
> + )
> +{
> + EFI_STATUS Status;
> + UINTN Value = 0;
> +
> + if ((VirtualKey == NULL) || (mGpio == NULL)) {
> + return FALSE;
> + }
> + if (MmioRead32 (ADB_REBOOT_ADDRESS) == ADB_REBOOT_BOOTLOADER) {
> + goto Done;
> + } else {
> + Status = mGpio->Get (mGpio, DETECT_J15_FASTBOOT, &Value);
> + if (EFI_ERROR (Status) || (Value != 0)) {
> + return FALSE;
> + }
> + }
> +Done:
> + VirtualKey->Signature = VIRTUAL_KEYBOARD_KEY_SIGNATURE;
> + VirtualKey->Key.ScanCode = SCAN_NULL;
> + VirtualKey->Key.UnicodeChar = L'f';
> + return TRUE;
> +}
> +
> +EFI_STATUS
> +EFIAPI
> +VirtualKeyboardClear (
> + IN VIRTUAL_KBD_KEY *VirtualKey
> + )
> +{
> + if (VirtualKey == NULL) {
> + return EFI_INVALID_PARAMETER;
> + }
> + if (MmioRead32 (ADB_REBOOT_ADDRESS) == ADB_REBOOT_BOOTLOADER) {
> + MmioWrite32 (ADB_REBOOT_ADDRESS, ADB_REBOOT_NONE);
> + WriteBackInvalidateDataCacheRange ((VOID *)ADB_REBOOT_ADDRESS, 4);
> + }
> + return EFI_SUCCESS;
> +}
> +
> +PLATFORM_VIRTUAL_KBD_PROTOCOL mVirtualKeyboard = {
> + VirtualKeyboardRegister,
> + VirtualKeyboardReset,
> + VirtualKeyboardQuery,
> + VirtualKeyboardClear
> +};
> +
> +EFI_STATUS
> +EFIAPI
> HiKeyEntryPoint (
> IN EFI_HANDLE ImageHandle,
> IN EFI_SYSTEM_TABLE *SystemTable
> @@ -98,5 +184,12 @@ HiKeyEntryPoint (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> +
> + Status = gBS->InstallProtocolInterface (
> + &ImageHandle,
> + &gPlatformVirtualKeyboardProtocolGuid,
> + EFI_NATIVE_INTERFACE,
> + &mVirtualKeyboard
> + );
> return Status;
> }
> --
> 2.7.4
>
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
