r3199 - in trunk/payloads/libpayload: . drivers include

Author: uwe
Date: 2008-03-31 17:17:39 +0200 (Mon, 31 Mar 2008)
New Revision: 3199

Modified:
   trunk/payloads/libpayload/Config.in
   trunk/payloads/libpayload/drivers/Makefile.inc
   trunk/payloads/libpayload/drivers/cmos.c
   trunk/payloads/libpayload/include/libpayload.h
Log:
Due to popular demand, rename "CMOS" to "NVRAM" (trivial).

Signed-off-by: Uwe Hermann 
Acked-by: Uwe Hermann

Modified: trunk/payloads/libpayload/Config.in
===================================================================
--- trunk/payloads/libpayload/Config.in	2008-03-30 11:31:15 UTC (rev 3198)
+++ trunk/payloads/libpayload/Config.in	2008-03-31 15:17:39 UTC (rev 3199)
@@ -68,8 +68,8 @@
        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

Modified: trunk/payloads/libpayload/drivers/Makefile.inc
===================================================================
--- trunk/payloads/libpayload/drivers/Makefile.inc	2008-03-30 11:31:15 UTC (rev 3198)
+++ trunk/payloads/libpayload/drivers/Makefile.inc	2008-03-31 15:17:39 UTC (rev 3199)
@@ -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

Modified: trunk/payloads/libpayload/drivers/cmos.c
===================================================================
--- trunk/payloads/libpayload/drivers/cmos.c	2008-03-30 11:31:15 UTC (rev 3198)
+++ trunk/payloads/libpayload/drivers/cmos.c	2008-03-31 15:17:39 UTC (rev 3199)
@@ -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);

Modified: trunk/payloads/libpayload/include/libpayload.h
===================================================================
--- trunk/payloads/libpayload/include/libpayload.h	2008-03-30 11:31:15 UTC (rev 3198)
+++ trunk/payloads/libpayload/include/libpayload.h	2008-03-31 15:17:39 UTC (rev 3199)
@@ -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);