[commit] r6312 - in trunk/util/nvramtool: . accessors cli

[repository service]

Author: oxygene
Date: Fri Jan 28 08:50:33 2011
New Revision: 6312
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6312

Log:
Move the parser for cmos.layout text files to accessors

Signed-off-by: Patrick Georgi 
Acked-by: Stefan Reinauer

Added:
   trunk/util/nvramtool/accessors/
   trunk/util/nvramtool/accessors/layout-text.c
      - copied, changed from r6311, trunk/util/nvramtool/layout_file.c
   trunk/util/nvramtool/accessors/layout-text.h
      - copied unchanged from r6311, trunk/util/nvramtool/layout_file.h
Deleted:
   trunk/util/nvramtool/layout_file.c
   trunk/util/nvramtool/layout_file.h
Modified:
   trunk/util/nvramtool/Makefile
   trunk/util/nvramtool/cli/nvramtool.c

Modified: trunk/util/nvramtool/Makefile
==============================================================================
--- trunk/util/nvramtool/Makefile	Fri Jan 28 08:47:35 2011	(r6311)
+++ trunk/util/nvramtool/Makefile	Fri Jan 28 08:50:33 2011	(r6312)
@@ -30,7 +30,7 @@
 CLI_OBJS = cli/nvramtool.o cli/opts.o

OBJS =  cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \
-	hexdump.o input_file.o layout.o layout_file.o lbtable.o   \
+	hexdump.o input_file.o layout.o accessors/layout-text.o lbtable.o   \
    reg_expr.o cbfs.o

OBJS += $(CLI_OBJS)

Copied and modified: trunk/util/nvramtool/accessors/layout-text.c (from r6311, trunk/util/nvramtool/layout_file.c)
==============================================================================
--- trunk/util/nvramtool/layout_file.c	Fri Jan 28 08:47:35 2011	(r6311, copy source)
+++ trunk/util/nvramtool/accessors/layout-text.c	Fri Jan 28 08:50:33 2011	(r6312)
@@ -1,5 +1,5 @@
 /*****************************************************************************\
- * layout_file.c
+ * layout-text.c
  *****************************************************************************
  *  Copyright (C) 2002-2005 The Regents of the University of California.
  *  Produced at the Lawrence Livermore National Laboratory.
@@ -29,7 +29,7 @@
 *****************************************************************************/

#include "common.h"
-#include "layout_file.h"
+#include "layout-text.h"
 #include "layout.h"
 #include "cmos_lowlevel.h"
 #include "reg_expr.h"

Copied: trunk/util/nvramtool/accessors/layout-text.h (from r6311, trunk/util/nvramtool/layout_file.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/util/nvramtool/accessors/layout-text.h	Fri Jan 28 08:50:33 2011	(r6312, copy of r6311, trunk/util/nvramtool/layout_file.h)
@@ -0,0 +1,41 @@
+/*****************************************************************************\
+ * layout_file.h
+ *****************************************************************************
+ *  Copyright (C) 2002-2005 The Regents of the University of California.
+ *  Produced at the Lawrence Livermore National Laboratory.
+ *  Written by Dave Peterson  .
+ *  UCRL-CODE-2003-012
+ *  All rights reserved.
+ *
+ *  This file is part of nvramtool, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
+ *  For details, see http://coreboot.org/nvramtool.
+ *
+ *  Please also read the file DISCLAIMER which is included in this software
+ *  distribution.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License (as published by the
+ *  Free Software Foundation) version 2, dated June 1991.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the terms and
+ *  conditions of the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*****************************************************************************/
+
+#ifndef LAYOUT_FILE_H
+#define LAYOUT_FILE_H
+
+#include "common.h"
+#include "coreboot_tables.h"
+
+void set_layout_filename(const char filename[]);
+void get_layout_from_file(void);
+void write_cmos_layout(FILE * f);
+
+#endif				/* LAYOUT_FILE_H */

Modified: trunk/util/nvramtool/cli/nvramtool.c
==============================================================================
--- trunk/util/nvramtool/cli/nvramtool.c	Fri Jan 28 08:47:35 2011	(r6311)
+++ trunk/util/nvramtool/cli/nvramtool.c	Fri Jan 28 08:50:33 2011	(r6312)
@@ -36,7 +36,7 @@
 #include "opts.h"
 #include "lbtable.h"
 #include "layout.h"
-#include "layout_file.h"
+#include "accessors/layout-text.h"
 #include "input_file.h"
 #include "cmos_ops.h"
 #include "cmos_lowlevel.h"