Module Name: src Committed By: msaitoh Date: Wed May 11 15:30:34 UTC 2022
Modified Files: src/sys/dev/ic: mfireg.h src/sys/dev/pci: mfii.c Log Message: Add support for iBBU-09 to show BBU voltage, current and temp correctly. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/mfireg.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/mfireg.h diff -u src/sys/dev/ic/mfireg.h:1.17 src/sys/dev/ic/mfireg.h:1.18 --- src/sys/dev/ic/mfireg.h:1.17 Wed May 11 15:20:54 2022 +++ src/sys/dev/ic/mfireg.h Wed May 11 15:30:33 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: mfireg.h,v 1.17 2022/05/11 15:20:54 msaitoh Exp $ */ +/* $NetBSD: mfireg.h,v 1.18 2022/05/11 15:30:33 msaitoh Exp $ */ /* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us> @@ -1234,6 +1234,7 @@ struct mfi_bbu_status { #define MFI_BBU_TYPE_NONE 0 #define MFI_BBU_TYPE_IBBU 1 #define MFI_BBU_TYPE_BBU 2 +#define MFI_BBU_TYPE_IBBU09 5 uint8_t reserved; uint16_t voltage; int16_t current; Index: src/sys/dev/pci/mfii.c diff -u src/sys/dev/pci/mfii.c:1.12 src/sys/dev/pci/mfii.c:1.13 --- src/sys/dev/pci/mfii.c:1.12 Wed May 11 15:24:45 2022 +++ src/sys/dev/pci/mfii.c Wed May 11 15:30:33 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: mfii.c,v 1.12 2022/05/11 15:24:45 msaitoh Exp $ */ +/* $NetBSD: mfii.c,v 1.13 2022/05/11 15:30:33 msaitoh Exp $ */ /* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.12 2022/05/11 15:24:45 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.13 2022/05/11 15:30:33 msaitoh Exp $"); #include "bio.h" @@ -3712,6 +3712,7 @@ mfii_bbu(struct mfii_softc *sc, envsys_d soh_bad = 0; break; case MFI_BBU_TYPE_BBU: + case MFI_BBU_TYPE_IBBU09: mask = MFI_BBU_STATE_BAD_BBU; soh_bad = (bbu.detail.bbu.is_SOH_good == 0); break;