wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-06 15:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to only substitute the bus number of a subset of the

Browse Source 
chip entries. This is a prerequisite to add support for multiple
configuration files. Each configuration file can come with its own bus
statements and the bus number substitution should only affect chip
entries from the same configuration file.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5646 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2009-02-15 17:19:03 +00:00
1 parent d5bead6025
commit 3ea4545611
3 files changed
+11 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/data.c
+8 -2
View File
@@ -1,7 +1,7 @@
/*
data.c - Part of libsensors, a Linux library for reading sensor data.
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
Copyright (C) 2007 Jean Delvare <khali@linux-fr.org>
Copyright (C) 2007, 2009 Jean Delvare <khali@linux-fr.org>
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
@@ -35,6 +35,7 @@ const char *libsensors_version = LM_VERSION;
sensors_chip *sensors_config_chips = NULL;
int sensors_config_chips_count = 0;
int sensors_config_chips_subst = 0;
int sensors_config_chips_max = 0;
sensors_bus *sensors_config_busses = NULL;
@@ -226,13 +227,17 @@ static int sensors_substitute_chip(sensors_chip_name *name, int lineno)
return 0;
}
/* Bus substitution is on a per-configuration file basis, so we keep
memory (in sensors_config_chips_subst) of which chip entries have been
already substituted. */
int sensors_substitute_busses(void)
{
int err, i, j, lineno;
sensors_chip_name_list *chips;
int res = 0;
for (i = 0; i < sensors_config_chips_count; i++) {
for (i = sensors_config_chips_subst;
i < sensors_config_chips_count; i++) {
lineno = sensors_config_chips[i].lineno;
chips = &sensors_config_chips[i].chips;
for (j = 0; j < chips->fits_count; j++) {
@@ -246,5 +251,6 @@ int sensors_substitute_busses(void)
res = err;
}
}
sensors_config_chips_subst = sensors_config_chips_count;
return res;
}
lib/data.h
+2 -1
View File
@@ -1,7 +1,7 @@
/*
data.h - Part of libsensors, a Linux library for reading sensor data.
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
Copyright (C) 2007 Jean Delvare <khali@linux-fr.org>
Copyright (C) 2007, 2009 Jean Delvare <khali@linux-fr.org>
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
@@ -135,6 +135,7 @@ typedef struct sensors_chip_features {
extern sensors_chip *sensors_config_chips;
extern int sensors_config_chips_count;
extern int sensors_config_chips_subst;
extern int sensors_config_chips_max;
extern sensors_bus *sensors_config_busses;
lib/init.c
+1
View File
@@ -240,6 +240,7 @@ void sensors_cleanup(void)
free(sensors_config_chips);
sensors_config_chips = NULL;
sensors_config_chips_count = sensors_config_chips_max = 0;
sensors_config_chips_subst = 0;
for (i = 0; i < sensors_proc_bus_count; i++)
free_bus(&sensors_proc_bus[i]);