Changeset 4449
- Timestamp:
- 06/15/07 13:42:28 (6 years ago)
- Location:
- lm-sensors/trunk
- Files:
-
- 4 modified
-
CHANGES (modified) (2 diffs)
-
lib/chips.c (modified) (4 diffs)
-
lib/chips.h (modified) (1 diff)
-
prog/sensors/chips.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
lm-sensors/trunk/CHANGES
r4447 r4449 9 9 Add dme1737 support 10 10 Add applesmc support 11 Add w83627ehf support (for Linux 2.4) 11 12 Man page sensors.conf.5: Update the chip statement section 12 13 Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport) … … 33 34 Add max6680 support 34 35 Fix alignment of alarm for one-limit temperatures 36 Add w83627ehf support (for Linux 2.4) 35 37 Program sensors-detect: Stop Super-I/O probe after first family success 36 38 Fix SMSC DME1737 detection -
lm-sensors/trunk/lib/chips.c
r4412 r4449 1956 1956 { 1957 1957 { { SENSORS_W83627EHF_IN0, "in0", NOMAP, NOMAP, R }, 1958 NOSYSCTL, VALUE(3), 3 },1958 W83627EHF_SYSCTL_IN0, VALUE(3), 3 }, 1959 1959 { { SENSORS_W83627EHF_IN1, "in1", NOMAP, NOMAP, R }, 1960 NOSYSCTL, VALUE(3), 3 },1960 W83627EHF_SYSCTL_IN1, VALUE(3), 3 }, 1961 1961 { { SENSORS_W83627EHF_IN2, "in2", NOMAP, NOMAP, R }, 1962 NOSYSCTL, VALUE(3), 3 },1962 W83627EHF_SYSCTL_IN2, VALUE(3), 3 }, 1963 1963 { { SENSORS_W83627EHF_IN3, "in3", NOMAP, NOMAP, R }, 1964 NOSYSCTL, VALUE(3), 3 },1964 W83627EHF_SYSCTL_IN3, VALUE(3), 3 }, 1965 1965 { { SENSORS_W83627EHF_IN4, "in4", NOMAP, NOMAP, R }, 1966 NOSYSCTL, VALUE(3), 3 },1966 W83627EHF_SYSCTL_IN4, VALUE(3), 3 }, 1967 1967 { { SENSORS_W83627EHF_IN5, "in5", NOMAP, NOMAP, R }, 1968 NOSYSCTL, VALUE(3), 3 },1968 W83627EHF_SYSCTL_IN5, VALUE(3), 3 }, 1969 1969 { { SENSORS_W83627EHF_IN6, "in6", NOMAP, NOMAP, R }, 1970 NOSYSCTL, VALUE(3), 3 },1970 W83627EHF_SYSCTL_IN6, VALUE(3), 3 }, 1971 1971 { { SENSORS_W83627EHF_IN7, "in7", NOMAP, NOMAP, R }, 1972 NOSYSCTL, VALUE(3), 3 },1972 W83627EHF_SYSCTL_IN7, VALUE(3), 3 }, 1973 1973 { { SENSORS_W83627EHF_IN8, "in8", NOMAP, NOMAP, R }, 1974 NOSYSCTL, VALUE(3), 3 },1974 W83627EHF_SYSCTL_IN8, VALUE(3), 3 }, 1975 1975 { { SENSORS_W83627EHF_IN9, "in9", NOMAP, NOMAP, R }, 1976 NOSYSCTL, VALUE(3), 3 },1976 W83627EHF_SYSCTL_IN9, VALUE(3), 3 }, 1977 1977 { { SENSORS_W83627EHF_IN0_ALARM, "in0_alarm", SENSORS_W83627EHF_IN0, NOMAP, 1978 1978 R }, … … 2007 2007 { { SENSORS_W83627EHF_IN0_MIN, "in0_min", SENSORS_W83627EHF_IN0, 2008 2008 SENSORS_W83627EHF_IN0, RW }, 2009 NOSYSCTL, VALUE(1), 3 },2009 W83627EHF_SYSCTL_IN0, VALUE(1), 3 }, 2010 2010 { { SENSORS_W83627EHF_IN1_MIN, "in1_min", SENSORS_W83627EHF_IN1, 2011 2011 SENSORS_W83627EHF_IN1, RW }, 2012 NOSYSCTL, VALUE(1), 3 },2012 W83627EHF_SYSCTL_IN1, VALUE(1), 3 }, 2013 2013 { { SENSORS_W83627EHF_IN2_MIN, "in2_min", SENSORS_W83627EHF_IN2, 2014 2014 SENSORS_W83627EHF_IN2, RW }, 2015 NOSYSCTL, VALUE(1), 3 },2015 W83627EHF_SYSCTL_IN2, VALUE(1), 3 }, 2016 2016 { { SENSORS_W83627EHF_IN3_MIN, "in3_min", SENSORS_W83627EHF_IN3, 2017 2017 SENSORS_W83627EHF_IN3, RW }, 2018 NOSYSCTL, VALUE(1), 3 },2018 W83627EHF_SYSCTL_IN3, VALUE(1), 3 }, 2019 2019 { { SENSORS_W83627EHF_IN4_MIN, "in4_min", SENSORS_W83627EHF_IN4, 2020 2020 SENSORS_W83627EHF_IN4, RW }, 2021 NOSYSCTL, VALUE(1), 3 },2021 W83627EHF_SYSCTL_IN4, VALUE(1), 3 }, 2022 2022 { { SENSORS_W83627EHF_IN5_MIN, "in5_min", SENSORS_W83627EHF_IN5, 2023 2023 SENSORS_W83627EHF_IN5, RW }, 2024 NOSYSCTL, VALUE(1), 3 },2024 W83627EHF_SYSCTL_IN5, VALUE(1), 3 }, 2025 2025 { { SENSORS_W83627EHF_IN6_MIN, "in6_min", SENSORS_W83627EHF_IN6, 2026 2026 SENSORS_W83627EHF_IN6, RW }, 2027 NOSYSCTL, VALUE(1), 3 },2027 W83627EHF_SYSCTL_IN6, VALUE(1), 3 }, 2028 2028 { { SENSORS_W83627EHF_IN7_MIN, "in7_min", SENSORS_W83627EHF_IN7, 2029 2029 SENSORS_W83627EHF_IN7, RW }, 2030 NOSYSCTL, VALUE(1), 3 },2030 W83627EHF_SYSCTL_IN7, VALUE(1), 3 }, 2031 2031 { { SENSORS_W83627EHF_IN8_MIN, "in8_min", SENSORS_W83627EHF_IN8, 2032 2032 SENSORS_W83627EHF_IN8, RW }, 2033 NOSYSCTL, VALUE(1), 3 },2033 W83627EHF_SYSCTL_IN8, VALUE(1), 3 }, 2034 2034 { { SENSORS_W83627EHF_IN9_MIN, "in9_min", SENSORS_W83627EHF_IN9, 2035 2035 SENSORS_W83627EHF_IN9, RW }, 2036 NOSYSCTL, VALUE(1), 3 },2036 W83627EHF_SYSCTL_IN9, VALUE(1), 3 }, 2037 2037 { { SENSORS_W83627EHF_IN0_MAX, "in0_max", SENSORS_W83627EHF_IN0, 2038 2038 SENSORS_W83627EHF_IN0, RW }, 2039 NOSYSCTL, VALUE(2), 3 },2039 W83627EHF_SYSCTL_IN0, VALUE(2), 3 }, 2040 2040 { { SENSORS_W83627EHF_IN1_MAX, "in1_max", SENSORS_W83627EHF_IN1, 2041 2041 SENSORS_W83627EHF_IN1, RW }, 2042 NOSYSCTL, VALUE(2), 3 },2042 W83627EHF_SYSCTL_IN1, VALUE(2), 3 }, 2043 2043 { { SENSORS_W83627EHF_IN2_MAX, "in2_max", SENSORS_W83627EHF_IN2, 2044 2044 SENSORS_W83627EHF_IN2, RW }, 2045 NOSYSCTL, VALUE(2), 3 },2045 W83627EHF_SYSCTL_IN2, VALUE(2), 3 }, 2046 2046 { { SENSORS_W83627EHF_IN3_MAX, "in3_max", SENSORS_W83627EHF_IN3, 2047 2047 SENSORS_W83627EHF_IN3, RW }, 2048 NOSYSCTL, VALUE(2), 3 },2048 W83627EHF_SYSCTL_IN3, VALUE(2), 3 }, 2049 2049 { { SENSORS_W83627EHF_IN4_MAX, "in4_max", SENSORS_W83627EHF_IN4, 2050 2050 SENSORS_W83627EHF_IN4, RW }, 2051 NOSYSCTL, VALUE(2), 3 },2051 W83627EHF_SYSCTL_IN4, VALUE(2), 3 }, 2052 2052 { { SENSORS_W83627EHF_IN5_MAX, "in5_max", SENSORS_W83627EHF_IN5, 2053 2053 SENSORS_W83627EHF_IN5, RW }, 2054 NOSYSCTL, VALUE(2), 3 },2054 W83627EHF_SYSCTL_IN5, VALUE(2), 3 }, 2055 2055 { { SENSORS_W83627EHF_IN6_MAX, "in6_max", SENSORS_W83627EHF_IN6, 2056 2056 SENSORS_W83627EHF_IN6, RW }, 2057 NOSYSCTL, VALUE(2), 3 },2057 W83627EHF_SYSCTL_IN6, VALUE(2), 3 }, 2058 2058 { { SENSORS_W83627EHF_IN7_MAX, "in7_max", SENSORS_W83627EHF_IN7, 2059 2059 SENSORS_W83627EHF_IN7, RW }, 2060 NOSYSCTL, VALUE(2), 3 },2060 W83627EHF_SYSCTL_IN7, VALUE(2), 3 }, 2061 2061 { { SENSORS_W83627EHF_IN8_MAX, "in8_max", SENSORS_W83627EHF_IN8, 2062 2062 SENSORS_W83627EHF_IN8, RW }, 2063 NOSYSCTL, VALUE(2), 3 },2063 W83627EHF_SYSCTL_IN8, VALUE(2), 3 }, 2064 2064 { { SENSORS_W83627EHF_IN9_MAX, "in9_max", SENSORS_W83627EHF_IN9, 2065 2065 SENSORS_W83627EHF_IN9, RW }, 2066 NOSYSCTL, VALUE(2), 3 },2066 W83627EHF_SYSCTL_IN9, VALUE(2), 3 }, 2067 2067 { { SENSORS_W83627EHF_FAN1, "fan1", NOMAP, NOMAP, R }, 2068 NOSYSCTL, VALUE(2), 0 },2068 W83627EHF_SYSCTL_FAN1, VALUE(2), 0 }, 2069 2069 { { SENSORS_W83627EHF_FAN2, "fan2", NOMAP, NOMAP, R }, 2070 NOSYSCTL, VALUE(2), 0 },2070 W83627EHF_SYSCTL_FAN2, VALUE(2), 0 }, 2071 2071 { { SENSORS_W83627EHF_FAN3, "fan3", NOMAP, NOMAP, R }, 2072 NOSYSCTL, VALUE(2), 0 },2072 W83627EHF_SYSCTL_FAN3, VALUE(2), 0 }, 2073 2073 { { SENSORS_W83627EHF_FAN4, "fan4", NOMAP, NOMAP, R }, 2074 NOSYSCTL, VALUE(2), 0 },2074 W83627EHF_SYSCTL_FAN4, VALUE(2), 0 }, 2075 2075 { { SENSORS_W83627EHF_FAN5, "fan5", NOMAP, NOMAP, R }, 2076 NOSYSCTL, VALUE(2), 0 },2076 W83627EHF_SYSCTL_FAN5, VALUE(2), 0 }, 2077 2077 { { SENSORS_W83627EHF_FAN1_ALARM, "fan1_alarm", SENSORS_W83627EHF_FAN1, 2078 2078 NOMAP, R }, … … 2092 2092 { { SENSORS_W83627EHF_FAN1_MIN, "fan1_min", SENSORS_W83627EHF_FAN1, 2093 2093 SENSORS_W83627EHF_FAN1, RW }, 2094 NOSYSCTL, VALUE(1), 0 },2094 W83627EHF_SYSCTL_FAN1, VALUE(1), 0 }, 2095 2095 { { SENSORS_W83627EHF_FAN2_MIN, "fan2_min", SENSORS_W83627EHF_FAN2, 2096 2096 SENSORS_W83627EHF_FAN2, RW }, 2097 NOSYSCTL, VALUE(1), 0 },2097 W83627EHF_SYSCTL_FAN2, VALUE(1), 0 }, 2098 2098 { { SENSORS_W83627EHF_FAN3_MIN, "fan3_min", SENSORS_W83627EHF_FAN3, 2099 2099 SENSORS_W83627EHF_FAN3, RW }, 2100 NOSYSCTL, VALUE(1), 0 },2100 W83627EHF_SYSCTL_FAN3, VALUE(1), 0 }, 2101 2101 { { SENSORS_W83627EHF_FAN4_MIN, "fan4_min", SENSORS_W83627EHF_FAN4, 2102 2102 SENSORS_W83627EHF_FAN4, RW }, 2103 NOSYSCTL, VALUE(1), 0 },2103 W83627EHF_SYSCTL_FAN4, VALUE(1), 0 }, 2104 2104 { { SENSORS_W83627EHF_FAN5_MIN, "fan5_min", SENSORS_W83627EHF_FAN5, 2105 2105 SENSORS_W83627EHF_FAN5, RW }, 2106 NOSYSCTL, VALUE(1), 0 },2106 W83627EHF_SYSCTL_FAN5, VALUE(1), 0 }, 2107 2107 { { SENSORS_W83627EHF_FAN1_DIV, "fan1_div", SENSORS_W83627EHF_FAN1, NOMAP, R }, 2108 NOSYSCTL, VALUE(1), 0 },2108 W83627EHF_SYSCTL_FAN_DIV, VALUE(1), 0 }, 2109 2109 { { SENSORS_W83627EHF_FAN2_DIV, "fan2_div", SENSORS_W83627EHF_FAN2, NOMAP, R }, 2110 NOSYSCTL, VALUE(2), 0 },2110 W83627EHF_SYSCTL_FAN_DIV, VALUE(2), 0 }, 2111 2111 { { SENSORS_W83627EHF_FAN3_DIV, "fan3_div", SENSORS_W83627EHF_FAN3, NOMAP, R }, 2112 NOSYSCTL, VALUE(3), 0 },2112 W83627EHF_SYSCTL_FAN_DIV, VALUE(3), 0 }, 2113 2113 { { SENSORS_W83627EHF_FAN4_DIV, "fan4_div", SENSORS_W83627EHF_FAN4, NOMAP, R }, 2114 NOSYSCTL, VALUE(4), 0 },2114 W83627EHF_SYSCTL_FAN_DIV, VALUE(4), 0 }, 2115 2115 { { SENSORS_W83627EHF_FAN5_DIV, "fan5_div", SENSORS_W83627EHF_FAN5, NOMAP, R }, 2116 NOSYSCTL, VALUE(5), 0 },2116 W83627EHF_SYSCTL_FAN_DIV, VALUE(5), 0 }, 2117 2117 { { SENSORS_W83627EHF_TEMP1, "temp1", NOMAP, NOMAP, R }, 2118 NOSYSCTL, VALUE(3), 0},2118 W83627EHF_SYSCTL_TEMP1, VALUE(3), 1 }, 2119 2119 { { SENSORS_W83627EHF_TEMP2, "temp2", NOMAP, NOMAP, R }, 2120 NOSYSCTL, VALUE(3), 1 },2120 W83627EHF_SYSCTL_TEMP2, VALUE(3), 1 }, 2121 2121 { { SENSORS_W83627EHF_TEMP3, "temp3", NOMAP, NOMAP, R }, 2122 NOSYSCTL, VALUE(3), 1 },2122 W83627EHF_SYSCTL_TEMP3, VALUE(3), 1 }, 2123 2123 { { SENSORS_W83627EHF_TEMP1_ALARM, "temp1_alarm", SENSORS_W83627EHF_TEMP1, 2124 2124 NOMAP, R }, … … 2132 2132 { { SENSORS_W83627EHF_TEMP1_OVER, "temp1_over", SENSORS_W83627EHF_TEMP1, 2133 2133 SENSORS_W83627EHF_TEMP1, RW }, 2134 NOSYSCTL, VALUE(1), 0},2134 W83627EHF_SYSCTL_TEMP1, VALUE(1), 1 }, 2135 2135 { { SENSORS_W83627EHF_TEMP2_OVER, "temp2_over", SENSORS_W83627EHF_TEMP2, 2136 2136 SENSORS_W83627EHF_TEMP2, RW }, 2137 NOSYSCTL, VALUE(1), 1 },2137 W83627EHF_SYSCTL_TEMP2, VALUE(1), 1 }, 2138 2138 { { SENSORS_W83627EHF_TEMP3_OVER, "temp3_over", SENSORS_W83627EHF_TEMP3, 2139 2139 SENSORS_W83627EHF_TEMP3, RW }, 2140 NOSYSCTL, VALUE(1), 1 },2140 W83627EHF_SYSCTL_TEMP3, VALUE(1), 1 }, 2141 2141 { { SENSORS_W83627EHF_TEMP1_HYST, "temp1_hyst", SENSORS_W83627EHF_TEMP1, 2142 2142 SENSORS_W83627EHF_TEMP1, RW }, 2143 NOSYSCTL, VALUE(2), 0},2143 W83627EHF_SYSCTL_TEMP1, VALUE(2), 1 }, 2144 2144 { { SENSORS_W83627EHF_TEMP2_HYST, "temp2_hyst", SENSORS_W83627EHF_TEMP2, 2145 2145 SENSORS_W83627EHF_TEMP2, RW }, 2146 NOSYSCTL, VALUE(2), 1 },2146 W83627EHF_SYSCTL_TEMP2, VALUE(2), 1 }, 2147 2147 { { SENSORS_W83627EHF_TEMP3_HYST, "temp3_hyst", SENSORS_W83627EHF_TEMP3, 2148 2148 SENSORS_W83627EHF_TEMP3, RW }, 2149 NOSYSCTL, VALUE(2), 1 }, 2149 W83627EHF_SYSCTL_TEMP3, VALUE(2), 1 }, 2150 { { SENSORS_W83627EHF_ALARMS, "alarms", NOMAP, NOMAP, R }, 2151 W83627EHF_SYSCTL_ALARMS, VALUE(1), 0 }, 2150 2152 { { 0 }, 0 } 2151 2153 }; -
lm-sensors/trunk/lib/chips.h
r4412 r4449 972 972 #define SENSORS_W83627EHF_TEMP2_HYST 82 /* RW */ 973 973 #define SENSORS_W83627EHF_TEMP3_HYST 83 /* RW */ 974 #define SENSORS_W83627EHF_ALARMS 250 /* R */ 974 975 975 976 -
lm-sensors/trunk/prog/sensors/chips.c
r4422 r4449 2898 2898 int i, valid, num_in; 2899 2899 double cur, min, fdiv, max, alarm, over, hyst; 2900 unsigned int in_alarms = 0, fan_alarms = 0, temp_alarms = 0; 2900 2901 2901 2902 if (!strcmp(name->prefix, "w83627dhg")) … … 2903 2904 else 2904 2905 num_in = 10; 2906 2907 /* For the 2.4 kernel driver, alarms are a bit harder to handle */ 2908 if (!sensors_get_feature(*name, SENSORS_W83627EHF_ALARMS, &cur)) { 2909 unsigned long alarms = cur + 0.5; 2910 2911 if (alarms & W83627EHF_ALARM_IN0) 2912 in_alarms |= (1 << 0); 2913 if (alarms & W83627EHF_ALARM_IN1) 2914 in_alarms |= (1 << 1); 2915 if (alarms & W83627EHF_ALARM_IN2) 2916 in_alarms |= (1 << 2); 2917 if (alarms & W83627EHF_ALARM_IN3) 2918 in_alarms |= (1 << 3); 2919 if (alarms & W83627EHF_ALARM_IN4) 2920 in_alarms |= (1 << 4); 2921 if (alarms & W83627EHF_ALARM_IN5) 2922 in_alarms |= (1 << 5); 2923 if (alarms & W83627EHF_ALARM_IN6) 2924 in_alarms |= (1 << 6); 2925 if (alarms & W83627EHF_ALARM_IN7) 2926 in_alarms |= (1 << 7); 2927 if (alarms & W83627EHF_ALARM_IN8) 2928 in_alarms |= (1 << 8); 2929 if (num_in >= 10 && (alarms & W83627EHF_ALARM_IN9)) 2930 in_alarms |= (1 << 9); 2931 2932 if (alarms & W83627EHF_ALARM_FAN1) 2933 fan_alarms |= (1 << 0); 2934 if (alarms & W83627EHF_ALARM_FAN2) 2935 fan_alarms |= (1 << 1); 2936 if (alarms & W83627EHF_ALARM_FAN3) 2937 fan_alarms |= (1 << 2); 2938 if (alarms & W83627EHF_ALARM_FAN4) 2939 fan_alarms |= (1 << 3); 2940 if (alarms & W83627EHF_ALARM_FAN5) 2941 fan_alarms |= (1 << 4); 2942 2943 if (alarms & W83627EHF_ALARM_TEMP1) 2944 temp_alarms |= (1 << 0); 2945 if (alarms & W83627EHF_ALARM_TEMP2) 2946 temp_alarms |= (1 << 1); 2947 if (alarms & W83627EHF_ALARM_TEMP3) 2948 temp_alarms |= (1 << 2); 2949 } 2905 2950 2906 2951 for (i = 0; i < num_in; i++) { … … 2909 2954 && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0+i,&cur) 2910 2955 && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_MIN+i,&min) 2911 && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_MAX+i,&max) 2912 && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_ALARM+i,&alarm)) { 2956 && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_MAX+i,&max)) { 2913 2957 if (valid) { 2958 if (sensors_get_feature(*name, SENSORS_W83627EHF_IN0_ALARM+i, &alarm)) 2959 alarm = in_alarms & (1 << i); 2914 2960 print_label(label,10); 2915 2961 printf("%+6.2f V (min = %+6.2f V, max = %+6.2f V) %s\n", … … 2933 2979 printf(", div = %1.0f", fdiv); 2934 2980 printf(")"); 2935 if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_ALARM+i, 2936 &alarm) && alarm) 2981 if (sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_ALARM+i, &alarm)) 2982 alarm = fan_alarms & (1 << i); 2983 if (alarm) 2937 2984 printf(" ALARM"); 2938 2985 printf("\n"); … … 2952 2999 print_label(label,10); 2953 3000 print_temp_info(cur, over, hyst, HYST, i ? 1 : 0, i ? 1 : 0); 2954 if (!sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1_ALARM+i, 2955 &alarm) && alarm) 3001 if (sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1_ALARM+i, &alarm)) 3002 alarm = temp_alarms & (1 << i); 3003 if (alarm) 2956 3004 printf(" ALARM"); 2957 3005 printf("\n");
