mirror of https://github.com/acidanthera/audk.git
ArmPlatformPkg/PL061: remove duplicated PL061_GPIO_DATA_REG
PL061_GPIO_DATA_REG offset is referenced in PL061EffectiveAddress () already. So remove the duplicated reference when invoke PL061GetPins () or PL061SetPins (). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
parent
31d7be0135
commit
d164a0e31b
|
@ -186,7 +186,7 @@ Get (
|
||||||
return EFI_INVALID_PARAMETER;
|
return EFI_INVALID_PARAMETER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PL061GetPins (RegisterBase + PL061_GPIO_DATA_REG, Offset)) {
|
if (PL061GetPins (RegisterBase, Offset)) {
|
||||||
*Value = 1;
|
*Value = 1;
|
||||||
} else {
|
} else {
|
||||||
*Value = 0;
|
*Value = 0;
|
||||||
|
@ -239,14 +239,14 @@ Set (
|
||||||
// Set the corresponding direction bit to HIGH for output
|
// Set the corresponding direction bit to HIGH for output
|
||||||
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
|
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
|
||||||
// Set the corresponding data bit to LOW for 0
|
// Set the corresponding data bit to LOW for 0
|
||||||
PL061SetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset), 0);
|
PL061SetPins (RegisterBase, GPIO_PIN_MASK(Offset), 0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GPIO_MODE_OUTPUT_1:
|
case GPIO_MODE_OUTPUT_1:
|
||||||
// Set the corresponding direction bit to HIGH for output
|
// Set the corresponding direction bit to HIGH for output
|
||||||
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
|
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
|
||||||
// Set the corresponding data bit to HIGH for 1
|
// Set the corresponding data bit to HIGH for 1
|
||||||
PL061SetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset), 0xff);
|
PL061SetPins (RegisterBase, GPIO_PIN_MASK(Offset), 0xff);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -297,7 +297,7 @@ GetMode (
|
||||||
// Check if it is input or output
|
// Check if it is input or output
|
||||||
if (MmioRead8 (RegisterBase + PL061_GPIO_DIR_REG) & GPIO_PIN_MASK(Offset)) {
|
if (MmioRead8 (RegisterBase + PL061_GPIO_DIR_REG) & GPIO_PIN_MASK(Offset)) {
|
||||||
// Pin set to output
|
// Pin set to output
|
||||||
if (PL061GetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset))) {
|
if (PL061GetPins (RegisterBase, GPIO_PIN_MASK(Offset))) {
|
||||||
*Mode = GPIO_MODE_OUTPUT_1;
|
*Mode = GPIO_MODE_OUTPUT_1;
|
||||||
} else {
|
} else {
|
||||||
*Mode = GPIO_MODE_OUTPUT_0;
|
*Mode = GPIO_MODE_OUTPUT_0;
|
||||||
|
|
Loading…
Reference in New Issue