diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-27 00:44:04 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-27 19:23:50 +0200 |
| commit | bf34e94095dfdbd032d50c0067ee91182db88118 (patch) | |
| tree | 7a110d93d83117f71697dc6ee508399aaed06211 /src/southbridge | |
| parent | ac8209a4b351f0a241d68f09851593625a0f146a (diff) | |
| download | coreboot-bf34e94095dfdbd032d50c0067ee91182db88118.tar.xz | |
SMM: unify mainboard APM command handlers
rename from mainboard_apm_cnt to mainboard_smi_apmc to match the function
naming scheme of the other handlers. Add prototype for mainboard_smi_sleep
(mainboard specific S3 sleep handlers in SMM) that is required by Sandybridge.
Change-Id: Ib479397e460e33772d90d9d41dba267e4e7e3008
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/933
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/smihandler.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801gx/smihandler.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c index e311d95e01..d7690ba63f 100644 --- a/src/southbridge/intel/bd82x6x/smihandler.c +++ b/src/southbridge/intel/bd82x6x/smihandler.c @@ -405,7 +405,7 @@ static void southbridge_smi_apmc(unsigned int node, smm_state_save_area_t *state { u32 pmctrl; u8 reg8; - void (*mainboard_apmc)(u8 apmc) = mainboard_smi_apmc; + int (*mainboard_apmc)(u8 apmc) = mainboard_smi_apmc; /* Emulate B2 register as the FADT / Linux expects it */ diff --git a/src/southbridge/intel/i82801gx/smihandler.c b/src/southbridge/intel/i82801gx/smihandler.c index 401c9adcf8..9d71fa3362 100644 --- a/src/southbridge/intel/i82801gx/smihandler.c +++ b/src/southbridge/intel/i82801gx/smihandler.c @@ -366,7 +366,7 @@ static void southbridge_smi_apmc(unsigned int node, smm_state_save_area_t *state /* Emulate B2 register as the FADT / Linux expects it */ reg8 = inb(APM_CNT); - if (mainboard_apm_cnt && mainboard_apm_cnt(reg8)) + if (mainboard_smi_apmc && mainboard_smi_apmc(reg8)) return; switch (reg8) { |