Author: uwe Date: 2008-03-31 17:18:56 +0200 (Mon, 31 Mar 2008) New Revision: 3200
Added: trunk/payloads/libpayload/drivers/nvram.c Removed: trunk/payloads/libpayload/drivers/cmos.c Modified: trunk/payloads/libpayload/drivers/Makefile.inc trunk/payloads/libpayload/include/libpayload.h Log: Rename drivers/cmos.c to drivers/nvram.c (trivial).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/payloads/libpayload/drivers/Makefile.inc =================================================================== --- trunk/payloads/libpayload/drivers/Makefile.inc 2008-03-31 15:17:39 UTC (rev 3199) +++ trunk/payloads/libpayload/drivers/Makefile.inc 2008-03-31 15:18:56 UTC (rev 3200) @@ -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_NVRAM) += drivers/cmos.o +TARGETS-$(CONFIG_NVRAM) += drivers/nvram.o
Deleted: trunk/payloads/libpayload/drivers/cmos.c =================================================================== --- trunk/payloads/libpayload/drivers/cmos.c 2008-03-31 15:17:39 UTC (rev 3199) +++ trunk/payloads/libpayload/drivers/cmos.c 2008-03-31 15:18:56 UTC (rev 3200) @@ -1,69 +0,0 @@ -/* - * This file is part of the libpayload project. - * - * Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Datasheet: - * - Name: MC146818: Real-time Clock Plus RAM (RTC) - * - PDF: http://www.freescale.com/files/microcontrollers/doc/data_sheet/MC146818.pdf - * - Order number: MC146818/D - */ - -/* - * See also: - * http://bochs.sourceforge.net/techspec/CMOS-reference.txt - * http://www.bioscentral.com/misc/cmosmap.htm - */ - -#include <libpayload.h> - -#define RTC_PORT 0x70 - -/** - * Read a byte from the specified NVRAM address. - * - * @param addr The NVRAM address to read a byte from. - * @return The byte at the given NVRAM address. - */ -u8 nvram_read(u8 addr) -{ - outb(addr, RTC_PORT); - return inb(RTC_PORT + 1); -} - -/** - * Write a byte to the specified NVRAM address. - * - * @param val The byte to write to NVRAM. - * @param addr The NVRAM address to write to. - */ -void nvram_write(u8 val, u8 addr) -{ - outb(addr, RTC_PORT); - outb(val, RTC_PORT + 1); -}
Copied: trunk/payloads/libpayload/drivers/nvram.c (from rev 3199, trunk/payloads/libpayload/drivers/cmos.c) =================================================================== --- trunk/payloads/libpayload/drivers/nvram.c (rev 0) +++ trunk/payloads/libpayload/drivers/nvram.c 2008-03-31 15:18:56 UTC (rev 3200) @@ -0,0 +1,69 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Datasheet: + * - Name: MC146818: Real-time Clock Plus RAM (RTC) + * - PDF: http://www.freescale.com/files/microcontrollers/doc/data_sheet/MC146818.pdf + * - Order number: MC146818/D + */ + +/* + * See also: + * http://bochs.sourceforge.net/techspec/CMOS-reference.txt + * http://www.bioscentral.com/misc/cmosmap.htm + */ + +#include <libpayload.h> + +#define RTC_PORT 0x70 + +/** + * Read a byte from the specified NVRAM address. + * + * @param addr The NVRAM address to read a byte from. + * @return The byte at the given NVRAM address. + */ +u8 nvram_read(u8 addr) +{ + outb(addr, RTC_PORT); + return inb(RTC_PORT + 1); +} + +/** + * Write a byte to the specified NVRAM address. + * + * @param val The byte to write to NVRAM. + * @param addr The NVRAM address to write to. + */ +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-31 15:17:39 UTC (rev 3199) +++ trunk/payloads/libpayload/include/libpayload.h 2008-03-31 15:18:56 UTC (rev 3200) @@ -49,7 +49,7 @@ #define NVRAM_RTC_MONTH 8 #define NVRAM_RTC_YEAR 9
-/* drivers/cmos.c */ +/* drivers/nvram.c */ u8 nvram_read(u8 addr); void nvram_write(u8 val, u8 addr);