Changeset 323

Timestamp:

03/18/99 16:12:01 (14 years ago)

Author:

frodo

Message:

Finished renaming of detect.pl

* Either Phil had not done a 'cvs update', or I forgot a 'cvs commit'; anyway,

the last changes to detect.pl have been ported to sensors-detect.

* Added a rule to the Makefile fragment to install it in $(SBINDIR).
* Added SBINDIR to the main Makefile.
* Deleted detect.pl

Location:

lm-sensors/trunk

Files:

• Makefile (modified) (1 diff)
• prog/detect/Module.mk (modified) (2 diffs)
• prog/detect/sensors-detect (modified) (2 diffs)

lm-sensors/trunk/Makefile

@@ -71 +71 @@
 
 # You should not need to change this. It is the directory into which the
-# executable program files will be installed.
+# executable program files will be installed. BINDIR for programs that are
+# also useful for normal users, SBINDIR for programs that can only be run
+# by the superuser.
 # Note that not all programs in this package are really installed;
 # some are just examples. You can always install them by hand, of
 # course.
 BINDIR := $(PREFIX)/bin
+SBINDIR := $(PREFIX)/sbin
 
 # You should not need to change this. It is the basic directory into which

lm-sensors/trunk/prog/detect/Module.mk

@@ -25 +25 @@
 PROGDETECTTARGETS := $(MODULE_DIR)/i2cdetect
 PROGDETECTSOURCES := $(MODULE_DIR)/i2cdetect.c
+PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect
 
 # Include all dependency files. We use '.rd' to indicate this will create
@@ -33 +34 @@
 all :: all-prog-detect
 
+install-prog-detect: all-prog-detect
+        mkdir -p $(SBINDIR)
+        $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(SBINDIR)
+install :: install-prog-detect
+
 clean-prog-detect:
         $(RM) $(PROGDETECTSOURCES:.c=.rd) $(PROGDETECTSOURCES:.c=.ro) \

lm-sensors/trunk/prog/detect/sensors-detect

@@ -159 +159 @@
        i2c_addrs => [0x00..0x7f], 
        i2c_detect => sub { w83781d_detect 1, @_},
-       isa_addrs => [0x290],
-       isa_detect => sub { w83781d_isa_detect 1, @_ },
-       alias_detect => sub { w83781d_alias_detect 1, @_ },
      } ,
      {
@@ -1150 +1147 @@
                 (($reg1 & 0x80) == 0x80 and $reg2 == 0x5c);
   return unless ($reg1 & 0x07) == 0x00;
-  $reg1 = i2c_smbus_read_byte_data($file,0x58);
-  return if $chip == 0 and  ($reg1 & 0xfe) != 0x10;
+  $reg1 = i2c_smbus_read_byte_data($file,0x58) &0xfe;
+  return if $chip == 0 and  $reg1 != 0x10;
   return if $chip == 1 and  $reg1 != 0x30;
   return if $chip == 2 and  $reg1 != 0x40;