--- 00README.txt.org Mon Feb 11 03:36:48 2002 +++ 00README.txt Sun Mar 3 01:31:15 2002 @@ -1,7 +1,7 @@ ********************************************************* Mother Board Monitor Program for X Window System - XMBmon ver.1.07 + XMBmon ver.1.07pl1 for FreeBSD (and possibly Linux, but not checked). ********************************************************* @@ -24,6 +24,14 @@ << 1. Changes in the new version >> +------------------------------------------------------------ +patch level 1 (problems in version 1.07) + + * SMBus of AMD chipset (756, 766) was not supported. + + * The transformation from Celsius to Fahrenheit was wrong. +------------------------------------------------------------ + * Few more hardware monitor chips are supported (Winbond's W83627HF, W83697HF; ITE's IT8705F, IF8712F). @@ -77,8 +85,7 @@ chipset) are supported: Intel: PIIX4 (440BX), ICH, ICH2 (810, 815, 820 ...) - AMD: 756 (750), 766 (760) - VIA: VT82C596/B, VT82C686A/B (KT133/A), VT8233 (KT233/A) + VIA: VT82C596/B, VT82C686A/B (KT133/A), VT8233 (KT233/A) Here, I must confess that I myself did not check the Intel ones, because I have no motherboard, which uses Intel chipsets, available --- 00READMEj.txt.org Mon Feb 11 03:36:48 2002 +++ 00READMEj.txt Sun Mar 3 01:30:38 2002 @@ -1,7 +1,7 @@ ********************************************************* Mother Board Monitor Program for X Window System - XMBmon ver.1.07 + XMBmon ver.1.07pl1 for FreeBSD (and possibly Linux, but not checked). ********************************************************* @@ -21,6 +21,14 @@ << 1. 新ヴァージョンでの変更点 >> +------------------------------------------------------------ +patch level 1 (version 1.07 での問題点) + +・AMD chipset (756, 766) の SMBus はサポートできてなかった。 + +・華氏への温度変換に間違いがあった。 +------------------------------------------------------------ + ・いくつかの新しいハードウエアモニタチップ(Winbond の W83627HF, W83697HF、ITE の IT8705F, IF8712F)をサポート。 @@ -69,8 +77,7 @@ 以下のようなチップ(いわゆるチップセットのサウスブリッジ)に対応。 Intel: PIIX4 (440BX), ICH, ICH2 (810, 815, 820 ...) - AMD: 756 (750), 766 (760) - VIA: VT82C596/B, VT82C686A/B (KT133/A), VT8233 (KT233/A) + VIA: VT82C596/B, VT82C686A/B (KT133/A), VT8233 (KT233/A) ただし、Intel の ICH, ICH2 については実機でチェックしていませんので 動くことは保証できません。 --- getMBinfo.c.org Sun Feb 3 08:19:58 2002 +++ getMBinfo.c Mon Feb 18 02:15:53 2002 @@ -91,6 +91,9 @@ case PIIX4SMB: fprintf(stderr, "IntelPIIX4(440BX)"); break; + case SRVWSSSMB: + fprintf(stderr, "ServerWorks(ServerSet Chipset)"); + break; case VIA8233SMB: fprintf(stderr, "VIA8233(KT266)"); break; @@ -374,7 +377,7 @@ Getting Temperatures -------------------------*/ -#define traFahrn(x) ((x) * 1.6 + 32.0) +#define traFahrn(x) ((x) * 1.8 + 32.0) static float via686temp_tab[256]= {\ .00, .00, .00, .00, .00, .00, .00, .00, --- pci_hwm.c.org Sun Feb 3 08:17:29 2002 +++ pci_hwm.c Sun Mar 3 01:23:48 2002 @@ -80,6 +80,10 @@ ret = PIIX4SMB; inq_smbba = canSMBUS_base[0]; break; + case ID_SRVWSS: + ret = SRVWSSSMB; + inq_smbba = canSMBUS_base[0]; + break; case ID_VIA8233: ret = VIA8233SMB; inq_smbba = canSMBUS_base[1]; @@ -91,16 +95,26 @@ ret = ICH801SMB; inq_smbba = canSMBUS_base[2]; break; +/* +AMD chipset not supported yet + case ID_AMD756: case ID_AMD766: ret = AMD756SMB; inq_smbba = canSMBUS_base[3]; break; + +*/ default: } if (ret) { - *smb_base = 0xFFFE & \ - pci_conf_read(PCI_BUSN, dev, fun, inq_smbba); + *smb_base = pci_conf_read(PCI_BUSN, dev, fun, inq_smbba); + if (ret == AMD756SMB) { + *smb_base &= 0xFF00; + *smb_base += AMD_SMBOFF; + } else { + *smb_base &= 0xFFF0; + } goto ending; } } @@ -134,8 +148,11 @@ #endif if (dat != 0x0 && dat != 0xFFFFFFFF \ && (dat & 0x0F) == 1 && (dat & 0xFFF00000) == 0) { - smb_base[n] = (dat & 0xFFFE); chip_id[n] = chip; + if (chip == ID_AMD756 || chip == ID_AMD766 ) + smb_base[n] = (dat & 0xFF00) + AMD_SMBOFF; + else + smb_base[n] = (dat & 0xFFF0); if (inb(smb_base[n]) != 0xFF) ++n; } --- pci_hwm.h.org Tue Jan 22 02:32:07 2002 +++ pci_hwm.h Thu Feb 21 01:37:46 2002 @@ -36,12 +36,14 @@ #define getSMBBA2 0xD0 /* VIA8233 */ #define getSMBBA3 0x20 /* Intel801_ICH's */ #define getSMBBA4 0x58 /* AMD756 */ +#define AMD_SMBOFF 0xE0 /* for AMD756, extra offset */ #define ID_VIA686 0x30571106 #define ID_VIA596 0x30501106 #define ID_VIA596B 0x30511106 #define ID_VIA8233 0x30741106 #define ID_PIIX4 0x71138086 +#define ID_SRVWSS 0x02001166 #define ID_I801AA 0x24138086 #define ID_I801AB 0x24238086 #define ID_I801BA 0x24438086 @@ -56,6 +58,7 @@ #define VIA686HWM 2 #define VIA596SMB 11 #define PIIX4SMB 21 +#define SRVWSSSMB 22 #define VIA8233SMB 31 #define ICH801SMB 41 #define AMD756SMB 51 --- smb_io.h.org Fri Aug 24 05:11:19 2001 +++ smb_io.h Thu Feb 21 02:42:29 2002 @@ -14,7 +14,7 @@ #else /* LINUX */ #include #include -#define OUTb(x,y) outb((x),(y)) +#define OUTb(x,y) outb((y),(x)) #define WAIT outb(0x00,0xEB) #endif --- testpci.c.org Wed Jan 16 01:36:32 2002 +++ testpci.c Mon Feb 18 02:20:36 2002 @@ -52,6 +52,10 @@ printf("IntelPIIX4(440BX south) found.\n"); printf(" SMBus Base Address: 0x%04X.\n", smb_base); break; + case SRVWSSSMB: + printf("ServerWorks(ServerSet Chipset) found.\n"); + printf(" SMBus Base Address: 0x%04X.\n", smb_base); + break; case VIA8233SMB: printf("VIA8233(KT266 south) found.\n"); printf(" SMBus Base Address: 0x%04X.\n", smb_base); --- testsmb.c.org Thu Jan 17 03:11:16 2002 +++ testsmb.c Mon Feb 18 02:16:48 2002 @@ -66,6 +66,9 @@ case ID_PIIX4: fprintf(stderr, "IntelPIIX4(440BX south) found.\n"); break; + case ID_SRVWSS: + fprintf(stderr, "ServerWorks(ServerSet Chipset) found.\n"); + break; case ID_VIA8233: fprintf(stderr, "VIA8233(KT266 south) found.\n"); break; --- xmbmon.c.org Thu Jan 31 01:05:00 2002 +++ xmbmon.c Sun Mar 3 01:54:42 2002 @@ -59,7 +59,7 @@ * */ -#define XMBMON_VERSION "1.07" +#define XMBMON_VERSION "1.07pl1" #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,6 +96,8 @@ #define DEFAULT_WSEC "1800" #define DEFAULT_TMIN "10.0" #define DEFAULT_TMAX "50.0" +#define DEFAULT_TMINF "50.0" /* for Fahrenheit */ +#define DEFAULT_TMAXF "130.0" /* for Fahrenheit */ #define DEFAULT_VMIN "1.80" #define DEFAULT_VMAX "2.20" #define DEFAULT_TICK "3" @@ -418,7 +420,7 @@ " : -cmtcs (" DEFAULT_CMTCS ") " " [set. ]\n" " : -cmvc (" DEFAULT_CMVC1 ") \n" -" : -fahrn (" DEFAULT_FAHRN ") \n" +" : -fahrn (" DEFAULT_FAHRN ") \n" " : -label ( ) for showing label [No label if null-string.]\n" " and -labelfont, -labelcolor\n" " : -method (%c) \n" @@ -509,8 +511,14 @@ c_rdg[3] = app_resources.cmvc; if(c_rdg[3] == NULL) c_rdg[3] = DEFAULT_CMVC1; - if(app_resources.fahrn) + if(app_resources.fahrn) { fahrn_flag = 1; + if( tmin == (float) atof(DEFAULT_TMIN) && + tmax == (float) atof(DEFAULT_TMAX) ) { + tmin = (float) atof(DEFAULT_TMINF); + tmax = (float) atof(DEFAULT_TMAXF); + } + } label = app_resources.label; lb_font = app_resources.labelfont; lb_color = app_resources.labelcolor;