Changeset 2225

Timestamp:

01/17/04 19:12:38 (9 years ago)

Author:

khali

Message:

Use unbuffered I/O for 2.6 eeprom to benefit from driver

optimization.

Files:

• lm-sensors/trunk/lib/proc.c (modified) (3 diffs)

lm-sensors/trunk/lib/proc.c

@@ -18 +18 @@
 */
 
+/* for open() */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <stddef.h>
-#ifdef DEBUG
-#include <unistd.h> /* for getuid(), to be removed */
-#endif
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
@@ -294 +297 @@
         const sensors_chip_feature *the_feature;
         int buflen = BUF_LEN;
-        int mag, eepromoffset, i, ret=0;
+        int mag, eepromoffset, fd, ret=0;
         char n[NAME_MAX];
         FILE *f;
@@ -309 +312 @@
                 if (! strcmp(name.prefix, "eeprom")){
                         strcat(n, "eeprom");
-                        if ((f = fopen(n, "r")) != NULL) {
+                        /* we use unbuffered I/O to benefit from eeprom driver
+                           optimization */
+                        if ((fd = open(n, O_RDONLY)) >= 0) {
                                 eepromoffset =
                                   (the_feature->offset / sizeof(long))  +
                                   (16 * (the_feature->sysctl - EEPROM_SYSCTL1));
-                                for(i = 0; i <= eepromoffset; i++)
-                                        if(EOF == (ret = getc(f)))
-                                                break;
-                                fclose(f);
-                                if(ret == EOF)
+                                if (lseek(fd, eepromoffset, SEEK_SET) < 0
+                                 || read(fd, &ret, 1) != 1) {
+                                        close(fd);
                                         return -SENSORS_ERR_PROC;
+                                }
+                                close(fd);
                                 *value = ret;
                                 return 0;