Commit Graph
52 Commits
Author SHA1 Message Date
Mark D. Studebaker 36c7305e78 use /sys/class/i2c-dev/i2c-x/name file if available;
solves problem with drivers that have multiple busses;
      requires Greg's patch (for kernel 2.6.5?)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2341 7894878c-1315-0410-8ee3-d5d059ff63e0
2004-03-06 20:27:41 +00:00
Mark D. Studebaker 64aeb747a4 remove -o and -g args to install
Date: Thu, 18 Dec 2003 22:42:36 +0100
From: Haakon Riiser <haakon.riiser@fys.uio.no>
To: sensors@Stimpy.netroedge.com
Subject: lm_sensors 2.8.2 / DESTDIR / root

The reason for this email is that I always try to avoid running
Makefiles as root, even during 'make install'.  Therefore, I
always use the DESTDIR feature, when it's available.  Until today,
I always built i2c and lm_sensors by doing

  $ make
  $ make -i install DESTDIR=/foo
  $ cd /foo && su root && fix permissions/ownership && install

The -i flag to make install is a kludge to avoid having to be root
while installing to the DESTDIR, and it's only required because
the files are installed with "-o root -g root".  Using the -i
flag is of course not a good idea, since more fatal errors can
easily fly by undetected.

Today, I upgraded to Linux 2.6.0, and tried a similar install
procedure for lm_sensors, except that the make target is now "user"
and the install target is "user_install".  I now noticed that the
DESTDIR variable is not used everywhere in "user_install", so I
couldn't use the -i kludge anymore.  Instead, I wrote a patch that
removes the "-o root -g root" arguments to install everywhere, and
I also tried to add DESTDIR to all files/directories installed.
(The patch only applies to lm_sensors, not i2c, since only
lm_sensors is required in Linux 2.6.0.)

There's really no reason to say -o root -g root anyway, since if you
do install directly with make install, you have to be logged in as
root, and then the files will get the right ownership by default.
Much of the point of installing to a temporary DESTDIR is that you
don't have to be root, and that you can prepare the installation
by hand.  Fixing the ownership is trivial:

  chown -R root.root $DESTDIR


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2189 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-23 23:13:38 +00:00
Jean Delvare 5c4b5f75d5 rpath patch by Joerg Dorchain <joerg@dorchain.net>.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2185 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-16 19:59:50 +00:00
Jean Delvare 9dcb6da848 Fix typo on "consecutive".
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2176 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-14 17:54:42 +00:00
Mark D. Studebaker 82caa7986f add -l option to i2cdetect so 'i2cdetect -l'
can be used as a replacement for 'cat /proc/bus/i2c'


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2100 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-28 04:37:08 +00:00
Mark D. Studebaker 713f3eddb7 simplification
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2098 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-28 02:27:41 +00:00
Mark D. Studebaker 5bfcb08e18 report i2c-dev bus numbers rather than i2c-adapter numbers,
which may be different.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2097 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-27 23:53:10 +00:00
Mark D. Studebaker bd947e0fe5 add 'c' mode for consecutive address byte reads
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2095 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-26 03:45:18 +00:00
Mark D. Studebaker 1ec05114f4 cleanups
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2086 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-22 22:27:19 +00:00
Mark D. Studebaker 5cef938a0e remove isaset accidentally added in
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2079 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-21 04:05:48 +00:00
Mark D. Studebaker 4f3ded5af9 use common function to print out available i2c busses;
add sysfs support to that function


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2065 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-17 03:04:09 +00:00
Mark D. Studebaker 0948e17ee9 add new build targets 'user' and 'user_install'.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1822 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-28 20:04:51 +00:00
Jean Delvare 9f5e11adc7 Fix compiler warning (missing include).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1792 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-16 17:22:22 +00:00
Jean Delvare a1ca8861d4 Fix compiler warning (uninitialized variable).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1791 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-16 17:19:10 +00:00
Jean Delvare eee8d62f7b Fix compiler warning (uninitialized variable).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1790 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-16 17:06:49 +00:00
Mark D. Studebaker 21920eeb66 cleanup from Philip Pokorny
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1725 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-03-17 02:28:56 +00:00
Kyosti Malkki 1cfe63804a (Kyösti) Cleanups
Copy sysctl enums to chip drivers from sensors.h for now,
   as seen in drivers included in 2.5 tree. File no longer included
   from kernel side.

   Apply i2c-proc change in CVS tagged -km2.

   Partial clean and sort of includes everywhere.

   Add i2c-dev.h, as a partial copy from i2c.
   Add to sensors.h from i2c-proc.h to compile things.
   Remove i2c-isa.h.

   Reflect header file changes to lib/ and prog/.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1705 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-01-21 20:01:27 +00:00
Mark D. Studebaker 2fa3db2f24 make install now installs i2cdump, i2cdetect, isadump, i2cset
in /usr/local/sbin


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1484 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-08-03 21:08:53 +00:00
Mark D. Studebaker 1a6cc8f95d add PEC support
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1445 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-07-11 02:24:56 +00:00
Mark D. Studebaker 7cdb5c4439 add ability to specify the "command" on a smbus block read
(previously forced to zero). Limit smbus block read printout to 32 bytes.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1390 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-06-12 02:52:16 +00:00
Mark D. Studebaker ecc1a18331 add text printout; patch from
Jean Delvare <delvare@ensicaen.ismra.fr>


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1311 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-02-09 16:34:13 +00:00
Mark D. Studebaker 7821a784f2 do multiple reads in i2c block read mode to get all 256 bytes
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1258 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-12-04 00:30:55 +00:00
Mark D. Studebaker 8e94a4925f add i2c block read capability to i2cdump
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1244 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-11-19 21:14:43 +00:00
Mark D. Studebaker b0892c62e4 add flat address space support (isadump -f 0x6000) so we can
get dumps of chips like the via686a.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1200 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-10-13 16:37:16 +00:00
Mark D. Studebaker eb65ad052e fix comment
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1138 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-06-24 20:33:14 +00:00
Mark D. Studebaker 96a5ce9a4f Patch from Oleg Vdovikin to make alpha compiles happy.
Replaced sys/perm.h with sys/io.h. But then it conflicted
      with asm/io.h so I changed it to only use one or the other.
      Hope it works.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1107 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-06-02 03:31:58 +00:00
Mark D. Studebaker 6c52f4b47f add i2cset, simple utility to write a single location
in an i2c device, good for debugging.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1057 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-04-03 02:39:23 +00:00
Mark D. Studebaker 0709b19497 add devfs /dev/i2c/x support
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1053 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-03-31 19:00:45 +00:00
Mark D. Studebaker f03fc688a2 fix message about what mode you are in - used to always say
i2c block rather than byte or word.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1049 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-03-31 01:55:54 +00:00
Mark D. Studebaker 94a2aa1305 (mds) add smbus block read support to i2cdump.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@858 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-08-12 19:16:00 +00:00
Mark D. Studebaker 86d41cfc96 (mds) fix error reporting when you don't have permission to open
/dev/i2c-x and /dev/i2cx doesn't exist.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@847 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-07-16 22:54:41 +00:00
Mark D. Studebaker 47a3491775 (mds) fix typos in /dev/i2c- and /dev/i2c checking.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@830 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-07-04 01:42:30 +00:00
Frodo Looijaard 93f3a9f7ac All tools now understand both /dev/i2c-* and /dev/i2c*
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@827 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-07-02 18:11:31 +00:00
Mark D. Studebaker 7f86b419d6 (mds) add Winbond-style bank selection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@805 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-05-12 00:16:08 +00:00
Mark D. Studebaker a2aaaa6608 (mds) added Winbond-style bank selection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@798 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-05-06 17:49:53 +00:00
Mark D. Studebaker 13f7d150e0 (mds) Change ioctl from I2C_SLAVE to I2C_SLAVE_FORCE so that
you can run i2cdump even when a driver is installed.
      Add a cat of /proc/bus/i2c to the help function to help
      users with the bus number argument.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@690 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-01-09 22:45:57 +00:00
Frodo Looijaard fc20445e02 Surer `make clean' implementation
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@581 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-27 10:52:50 +00:00
Frodo Looijaard 2212822342 ISA changes
* i2c-isa simplified, by using the addr field in the client structure,
  instead of a new field. This means we do not need `struct isa_*'
  anymore
* All clients changed to reflect the new isa code. Many are much
  simplified now.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@505 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-21 22:04:34 +00:00
Kyosti Malkki bddf810ebe (Kyösti)
* renamed SMBUS_* to I2C_SMBUS_*


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@501 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-21 10:12:21 +00:00
Frodo Looijaard 24e547b88e First round of lm_sensors changes for the new I2C tree
* The i2c package can no longer be compiled as part of the lm_sensors tree
* The archive of the i2c package is removed
* smbus, i2c-dev and i2c-proc modules and headers have been removed; they
  are now completely integrated into the i2c package
* The fake i2c.h header has been removed; this also allowed us to remove
  the ugly LM_SENSORS and TBD defines.
* A new variable I2C_HEADERS is introduced in the Makefile. This allows
  us to install the i2c headers in, for example, /usr/local/include/linux.
* All files now include <linux/i2c.h> instead of "i2c.h" and "smbus.h"

Status: 'make dep' works, all the right include files are found. 'make all'
         does not yet work.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@496 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-19 11:45:27 +00:00
Frodo Looijaard c2549b34ca Changed hydra stuff from DOS to UNIX fileformat. Fixed bug in isadump.
Thanks, Geert.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@434 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-04-30 12:30:04 +00:00
Frodo Looijaard 1ade24f919 Geert's PPC support and Hydra driver
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@430 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-04-28 18:18:12 +00:00
Frodo Looijaard 24792039f6 Adrian's copyright patch applied
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@207 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-02-08 22:50:29 +00:00
Kyosti Malkki 9ab5512ee3 (Kyösti) Modifications in makefiles to reflect the changed location
of i2cdetect.c from prog/dump to prog/detect. Should now compile cleanly.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@202 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-02-07 15:34:51 +00:00
Philip Edelbrock 9155afb864 (Phil) Moved i2cdetect.c from prog/dump to prog/detect. Be sure to do a
'cvs update'.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@201 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-02-07 02:28:08 +00:00
Philip Edelbrock ce7aea9a5a (Phil) Made slight adjustments so the new file arrangement will build.
I added two new make file 'includes': busses/Module.mk and chips/Module.mk
Frodo- You may want to review the makefile structure to make sure that
the system works as you intended.

Note: The docs still need to be updated to reflect the new file arrangement,
but at least it builds!


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@176 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-01-27 06:10:00 +00:00
Frodo Looijaard 33269d5252 Small fixes to make all programs compile cleanly with libc6.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@168 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-01-14 00:41:44 +00:00
Frodo Looijaard fefbf31867 New program 'i2cdetect', which scans your i2c bus for connected devices
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@167 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-01-13 21:08:50 +00:00
Frodo Looijaard 1867246ee0 Documentation updates, and a very small print fix in i2cdump.c
Note especially the autoloading of i2c-dev by adding the following line
to /etc/module.conf (or /etc/conf.module):
  alias char-major-89 i2c-dev


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@166 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-01-13 21:00:04 +00:00
Frodo Looijaard 8c18675d85 i2c-dev is now working!
You can now use i2cdump to dump SMBus device registers!


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@165 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-01-13 20:47:52 +00:00