Move the few lines of code remaining in chips.c to data.c, and finally

delete chips.c. RIP.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4507 7894878c-1315-0410-8ee3-d5d059ff63e0

lib/Module.mk

@@ -46,7 +46,7 @@ LIBTARGETS := $(MODULE_DIR)/$(LIBSTLIBNAME) $(MODULE_DIR)/$(LIBSHLIBNAME) \
               $(MODULE_DIR)/$(LIBSHSONAME) $(MODULE_DIR)/$(LIBSHBASENAME)
 
 LIBCSOURCES := $(MODULE_DIR)/data.c $(MODULE_DIR)/general.c \
-               $(MODULE_DIR)/error.c $(MODULE_DIR)/chips.c \
+               $(MODULE_DIR)/error.c \
                $(MODULE_DIR)/proc.c $(MODULE_DIR)/access.c \
                $(MODULE_DIR)/init.c $(MODULE_DIR)/sysfs.c
 

lib/chips.c

@@ -1,28 +0,0 @@
-/*
-    chips.c - Part of libsensors, a Linux library for reading sensor data.
-    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
-
-    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; either version 2 of the License, or
-    (at your option) any later version.
-
-    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
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "data.h"
-
-#define PLACEHOLDER_ELEMENTS {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}
-
-sensors_chip_features sensors_chip_features_list[] =
-{
- PLACEHOLDER_ELEMENTS,
- { 0 }
-};

lib/data.c

@@ -44,6 +44,13 @@ sensors_bus *sensors_proc_bus = NULL;
 int sensors_proc_bus_count = 0;
 int sensors_proc_bus_max = 0;
 
+#define PLACEHOLDER_ELEMENTS {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}
+
+sensors_chip_features sensors_chip_features_list[] = {
+  PLACEHOLDER_ELEMENTS,
+  { 0 }
+};
+
 static int sensors_substitute_chip(sensors_chip_name *name,int lineno);
 
 /* Wow, this must be one of the ugliest functions I have ever written.