diff options
| -rw-r--r-- | payloads/libpayload/Config.in | 4 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/cmos.c | 16 | ||||
| -rw-r--r-- | payloads/libpayload/include/libpayload.h | 18 |
4 files changed, 20 insertions, 20 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index dca9e1e4ff..5690ac956a 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -68,8 +68,8 @@ config PC_KEYBOARD depends VGA_CONSOLE default y -config CMOS - bool "Support for reading/writing CMOS bytes" +config NVRAM + bool "Support for reading/writing NVRAM bytes" default y endmenu diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index 08e7150037..fd348408aa 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -31,4 +31,4 @@ TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o TARGETS-$(CONFIG_VGA_CONSOLE) += drivers/vga.o TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o -TARGETS-$(CONFIG_CMOS) += drivers/cmos.o +TARGETS-$(CONFIG_NVRAM) += drivers/cmos.o diff --git a/payloads/libpayload/drivers/cmos.c b/payloads/libpayload/drivers/cmos.c index c8cd605a0a..3789c09b3c 100644 --- a/payloads/libpayload/drivers/cmos.c +++ b/payloads/libpayload/drivers/cmos.c @@ -45,24 +45,24 @@ #define RTC_PORT 0x70 /** - * Read a byte from the specified CMOS address. + * Read a byte from the specified NVRAM address. * - * @param addr The CMOS address to read a byte from. - * @return The byte at the given CMOS address. + * @param addr The NVRAM address to read a byte from. + * @return The byte at the given NVRAM address. */ -u8 cmos_read(u8 addr) +u8 nvram_read(u8 addr) { outb(addr, RTC_PORT); return inb(RTC_PORT + 1); } /** - * Write a byte to the specified CMOS address. + * Write a byte to the specified NVRAM address. * - * @param val The byte to write to CMOS. - * @param addr The CMOS address to write to. + * @param val The byte to write to NVRAM. + * @param addr The NVRAM address to write to. */ -void cmos_write(u8 val, u8 addr) +void nvram_write(u8 val, u8 addr) { outb(addr, RTC_PORT); outb(val, RTC_PORT + 1); diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 6d80004a98..8f1c12e4df 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -41,17 +41,17 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -/* Some CMOS byte definitions */ -#define CMOS_RTC_SECONDS 0 -#define CMOS_RTC_MINUTES 2 -#define CMOS_RTC_HOURS 4 -#define CMOS_RTC_DAY 7 -#define CMOS_RTC_MONTH 8 -#define CMOS_RTC_YEAR 9 +/* Some NVRAM byte definitions */ +#define NVRAM_RTC_SECONDS 0 +#define NVRAM_RTC_MINUTES 2 +#define NVRAM_RTC_HOURS 4 +#define NVRAM_RTC_DAY 7 +#define NVRAM_RTC_MONTH 8 +#define NVRAM_RTC_YEAR 9 /* drivers/cmos.c */ -u8 cmos_read(u8 addr); -void cmos_write(u8 val, u8 addr); +u8 nvram_read(u8 addr); +void nvram_write(u8 val, u8 addr); /* drivers/keyboard.c */ int keyboard_havechar(void); |