Changeset 601
- Timestamp:
- 10/20/99 03:26:00 (9 years ago)
- Files:
-
- lm-sensors/trunk/doc/chips/w83781d (modified) (1 diff)
- lm-sensors/trunk/kernel/chips/w83781d.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lm-sensors/trunk/doc/chips/w83781d
r526 r601 491 491 TO DO: 492 492 ----- 493 782d beep 3 register494 493 782d programmable pins 495 494 783s temp2 (labeled as temp1 in data sheet) at different location lm-sensors/trunk/kernel/chips/w83781d.c
r600 r601 108 108 #define W83781D_REG_BEEP_INTS1 0x56 109 109 #define W83781D_REG_BEEP_INTS2 0x57 110 #define W83781D_REG_BEEP_INTS3 0x453 /* W83782D only*/110 #define W83781D_REG_BEEP_INTS3 0x453 /* not on W83781D */ 111 111 112 112 #define W83781D_REG_VID_FANDIV 0x47 … … 178 178 #define PWM_TO_REG(val) (SENSORS_LIMIT((val),0,255)) 179 179 #define BEEPS_FROM_REG(val) (val) 180 #define BEEPS_TO_REG(val) ((val) & 0xffff )180 #define BEEPS_TO_REG(val) ((val) & 0xffffff) 181 181 182 182 #define BEEP_ENABLE_TO_REG(val) (val) … … 343 343 u8 vid; /* Register encoding, combined */ 344 344 u32 alarms; /* Register encoding, combined */ 345 u 16beeps; /* Register encoding, combined */345 u32 beeps; /* Register encoding, combined */ 346 346 u8 beep_enable; /* Boolean */ 347 347 u8 pwm[4]; /* Register value */ … … 1154 1154 data->beeps = ((i & 0x7f) << 8) + 1155 1155 w83781d_read_value(client,W83781D_REG_BEEP_INTS1); 1156 if (data->type != w83781d) { 1157 data->beeps |= w83781d_read_value(client,W83781D_REG_BEEP_INTS3) << 16; 1158 } 1156 1159 data->last_updated = jiffies; 1157 1160 data->valid = 1; … … 1323 1326 data->beeps = BEEPS_TO_REG(results[1]); 1324 1327 w83781d_write_value(client,W83781D_REG_BEEP_INTS1,data->beeps & 0xff); 1328 if(data->type != w83781d) 1329 { 1330 w83781d_write_value(client,W83781D_REG_BEEP_INTS3, 1331 ((data->beeps) >> 16) & 0xff); 1332 } 1325 1333 val = data->beeps >> 8; 1326 1334 } else if (*nrels_mag >= 1)
