Fix checksum calculation both in romstage and ramstage.

[coreboot.git] / src / pc80 / mc146818rtc_early.c

diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 2e3d09c8c01c537e6cafc899b39fe93e8bbdc974..0652f27c47ff5967eb4a270e8fc37de4b2775b22 100644 (file)
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -1,35 +1,17 @@
+#include <stdint.h>
 #include <pc80/mc146818rtc.h>
-#include <part/fallback_boot.h>
+#include <fallback.h>
+#if CONFIG_USE_OPTION_TABLE
+#include "option_table.h"
+#endif
 
-#ifndef MAX_REBOOT_CNT
-#error "MAX_REBOOT_CNT not defined"
+#ifndef CONFIG_MAX_REBOOT_CNT
+#error "CONFIG_MAX_REBOOT_CNT not defined"
 #endif
-#if  MAX_REBOOT_CNT > 15
-#error "MAX_REBOOT_CNT too high"
+#if  CONFIG_MAX_REBOOT_CNT > 15
+#error "CONFIG_MAX_REBOOT_CNT too high"
 #endif
 
-static unsigned char cmos_read(unsigned char addr)
-{
-       int offs = 0;
-       if (addr >= 128) {
-               offs = 2;
-               addr -= 128;
-       }
-       outb(addr, RTC_BASE_PORT + offs + 0);
-       return inb(RTC_BASE_PORT + offs + 1);
-}
-
-static void cmos_write(unsigned char val, unsigned char addr)
-{
-       int offs = 0;
-       if (addr >= 128) {
-               offs = 2;
-               addr -= 128;
-       }
-       outb(addr, RTC_BASE_PORT + offs + 0);
-       outb(val, RTC_BASE_PORT + offs + 1);
-}
-
 static int cmos_error(void)
 {
        unsigned char reg_d;
@@ -40,31 +22,34 @@ static int cmos_error(void)
 
 static int cmos_chksum_valid(void)
 {
+#if CONFIG_USE_OPTION_TABLE
        unsigned char addr;
-       unsigned long sum, old_sum;
+       u16 sum, old_sum;
        sum = 0;
-       /* Comput the cmos checksum */
+       /* Compute the cmos checksum */
        for(addr = LB_CKS_RANGE_START; addr <= LB_CKS_RANGE_END; addr++) {
                sum += cmos_read(addr);
        }
-       sum = (sum & 0xffff) ^ 0xffff;
 
        /* Read the stored checksum */
        old_sum = cmos_read(LB_CKS_LOC) << 8;
        old_sum |=  cmos_read(LB_CKS_LOC+1);
 
        return sum == old_sum;
+#else
+       return 0;
+#endif
 }
 
 
-static int last_boot_normal(void)
+static inline int last_boot_normal(void)
 {
        unsigned char byte;
        byte = cmos_read(RTC_BOOT_BYTE);
        return (byte & (1 << 1));
 }
 
-static int do_normal_boot(void)
+static inline int do_normal_boot(void)
 {
        unsigned char byte;
 
@@ -75,13 +60,13 @@ static int do_normal_boot(void)
                 */
                byte = cmos_read(RTC_BOOT_BYTE);
                byte &= 0x0c;
-               byte |= MAX_REBOOT_CNT << 4;
+               byte |= CONFIG_MAX_REBOOT_CNT << 4;
                cmos_write(byte, RTC_BOOT_BYTE);
        }
 
        /* The RTC_BOOT_BYTE is now o.k. see where to go. */
        byte = cmos_read(RTC_BOOT_BYTE);
-       
+
        /* Are we in normal mode? */
        if (byte & 1) {
                byte &= 0x0f; /* yes, clear the boot count */
@@ -89,12 +74,12 @@ static int do_normal_boot(void)
 
        /* Properly set the last boot flag */
        byte &= 0xfc;
-       if ((byte >> 4) < MAX_REBOOT_CNT) {
+       if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) {
                byte |= (1<<1);
        }
 
        /* Are we already at the max count? */
-       if ((byte >> 4) < MAX_REBOOT_CNT) {
+       if ((byte >> 4) < CONFIG_MAX_REBOOT_CNT) {
                byte += 1 << 4; /* No, add 1 to the count */
        }
        else {
@@ -107,9 +92,9 @@ static int do_normal_boot(void)
        return (byte & (1<<1));
 }
 
-static unsigned read_option(unsigned start, unsigned size, unsigned def)
+unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def)
 {
-#if USE_OPTION_TABLE == 1
+#if CONFIG_USE_OPTION_TABLE
        unsigned byte;
        byte = cmos_read(start/8);
        return (byte >> (start & 7U)) & ((1U << size) - 1U);