};\r
\r
STATIC PAM_REGISTER_VALUE mRegisterValues440[] = {\r
- {REG_PAM1_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM1_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM2_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM2_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM3_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM3_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM4_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM4_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM5_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM5_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM6_OFFSET_440, 0x01, 0x02},\r
- {REG_PAM6_OFFSET_440, 0x10, 0x20},\r
- {REG_PAM0_OFFSET_440, 0x10, 0x20}\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x01, 0x02},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x10, 0x20},\r
+ {PMC_REGISTER_PIIX4 (PIIX4_PAM0), 0x10, 0x20}\r
};\r
\r
STATIC PAM_REGISTER_VALUE mRegisterValuesQ35[] = {\r
- {REG_PAM1_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM1_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM2_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM2_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM3_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM3_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM4_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM4_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM5_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM5_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM6_OFFSET_Q35, 0x01, 0x02},\r
- {REG_PAM6_OFFSET_Q35, 0x10, 0x20},\r
- {REG_PAM0_OFFSET_Q35, 0x10, 0x20}\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM1), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM1), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM2), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM2), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM3), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM3), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM4), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM4), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM5), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM5), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM6), 0x01, 0x02},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM6), 0x10, 0x20},\r
+ {DRAMC_REGISTER_Q35 (MCH_PAM0), 0x10, 0x20}\r
};\r
\r
STATIC PAM_REGISTER_VALUE *mRegisterValues;\r
// Loop to find the start PAM.\r
//\r
StartIndex = 0;\r
- for (Index = 0; Index < (sizeof(mSectionArray) / sizeof (mSectionArray[0])); Index++) {\r
+ for (Index = 0; Index < ARRAY_SIZE (mSectionArray); Index++) {\r
if ((Start >= mSectionArray[Index].Start) && (Start < (mSectionArray[Index].Start + mSectionArray[Index].Length))) {\r
StartIndex = Index;\r
break;\r
}\r
}\r
- ASSERT (Index < (sizeof(mSectionArray) / sizeof (mSectionArray[0])));\r
+ ASSERT (Index < ARRAY_SIZE (mSectionArray));\r
\r
//\r
// Program PAM until end PAM is encountered\r
//\r
- for (Index = StartIndex; Index < (sizeof(mSectionArray) / sizeof (mSectionArray[0])); Index++) {\r
+ for (Index = StartIndex; Index < ARRAY_SIZE (mSectionArray); Index++) {\r
if (ReadEnable != NULL) {\r
if (*ReadEnable) {\r
PciOr8 (\r
- PCI_LIB_ADDRESS(PAM_PCI_BUS, PAM_PCI_DEV, PAM_PCI_FUNC, mRegisterValues[Index].PAMRegOffset),\r
+ mRegisterValues[Index].PAMRegPciLibAddress,\r
mRegisterValues[Index].ReadEnableData\r
);\r
} else {\r
PciAnd8 (\r
- PCI_LIB_ADDRESS(PAM_PCI_BUS, PAM_PCI_DEV, PAM_PCI_FUNC, mRegisterValues[Index].PAMRegOffset),\r
+ mRegisterValues[Index].PAMRegPciLibAddress,\r
(UINT8) (~mRegisterValues[Index].ReadEnableData)\r
);\r
}\r
if (WriteEnable != NULL) {\r
if (*WriteEnable) {\r
PciOr8 (\r
- PCI_LIB_ADDRESS(PAM_PCI_BUS, PAM_PCI_DEV, PAM_PCI_FUNC, mRegisterValues[Index].PAMRegOffset),\r
+ mRegisterValues[Index].PAMRegPciLibAddress,\r
mRegisterValues[Index].WriteEnableData\r
);\r
} else {\r
PciAnd8 (\r
- PCI_LIB_ADDRESS(PAM_PCI_BUS, PAM_PCI_DEV, PAM_PCI_FUNC, mRegisterValues[Index].PAMRegOffset),\r
+ mRegisterValues[Index].PAMRegPciLibAddress,\r
(UINT8) (~mRegisterValues[Index].WriteEnableData)\r
);\r
}\r
break;\r
}\r
}\r
- ASSERT (Index < (sizeof(mSectionArray) / sizeof (mSectionArray[0])));\r
+ ASSERT (Index < ARRAY_SIZE (mSectionArray));\r
\r
return EFI_SUCCESS;\r
}\r
//\r
*DescriptorCount = sizeof(mSectionArray) / sizeof (mSectionArray[0]);\r
for (Index = 0; Index < *DescriptorCount; Index++) {\r
- PamValue = PciRead8 (PCI_LIB_ADDRESS(PAM_PCI_BUS, PAM_PCI_DEV, PAM_PCI_FUNC, mRegisterValues[Index].PAMRegOffset));\r
+ PamValue = PciRead8 (mRegisterValues[Index].PAMRegPciLibAddress);\r
mSectionArray[Index].ReadEnabled = FALSE;\r
if ((PamValue & mRegisterValues[Index].ReadEnableData) != 0) {\r
mSectionArray[Index].ReadEnabled = TRUE;\r