From owner-svn-src-all@FreeBSD.ORG Mon May 21 19:58:41 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 665871065673; Mon, 21 May 2012 19:58:41 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 479C88FC14; Mon, 21 May 2012 19:58:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LJwe8q070840; Mon, 21 May 2012 19:58:40 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4LJweXG070838; Mon, 21 May 2012 19:58:40 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201205211958.q4LJweXG070838@svn.freebsd.org> From: Sean Bruno Date: Mon, 21 May 2012 19:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235738 - in stable/9/sys: . dev/mfi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2012 19:58:41 -0000 Author: sbruno Date: Mon May 21 19:58:40 2012 New Revision: 235738 URL: http://svn.freebsd.org/changeset/base/235738 Log: MFC r235634 Fix and update battery status bits according to linux driver Modified: stable/9/sys/dev/mfi/mfireg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/Makefile (props changed) stable/9/sys/amd64/ (props changed) stable/9/sys/arm/ (props changed) stable/9/sys/bsm/ (props changed) stable/9/sys/cam/ (props changed) stable/9/sys/cddl/ (props changed) stable/9/sys/compat/ (props changed) stable/9/sys/contrib/ (props changed) stable/9/sys/crypto/ (props changed) stable/9/sys/ddb/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/aac/ (props changed) stable/9/sys/dev/acpi_support/ (props changed) stable/9/sys/dev/acpica/ (props changed) stable/9/sys/dev/adb/ (props changed) stable/9/sys/dev/adlink/ (props changed) stable/9/sys/dev/advansys/ (props changed) stable/9/sys/dev/ae/ (props changed) stable/9/sys/dev/age/ (props changed) stable/9/sys/dev/agp/ (props changed) stable/9/sys/dev/aha/ (props changed) stable/9/sys/dev/ahb/ (props changed) stable/9/sys/dev/ahci/ (props changed) stable/9/sys/dev/aic/ (props changed) stable/9/sys/dev/aic7xxx/ (props changed) stable/9/sys/dev/alc/ (props changed) stable/9/sys/dev/ale/ (props changed) stable/9/sys/dev/amd/ (props changed) stable/9/sys/dev/amdsbwd/ (props changed) stable/9/sys/dev/amdtemp/ (props changed) stable/9/sys/dev/amr/ (props changed) stable/9/sys/dev/an/ (props changed) stable/9/sys/dev/arcmsr/ (props changed) stable/9/sys/dev/asmc/ (props changed) stable/9/sys/dev/asr/ (props changed) stable/9/sys/dev/ata/ (props changed) stable/9/sys/dev/ath/ (props changed) stable/9/sys/dev/atkbdc/ (props changed) stable/9/sys/dev/auxio/ (props changed) stable/9/sys/dev/bce/ (props changed) stable/9/sys/dev/bfe/ (props changed) stable/9/sys/dev/bge/ (props changed) stable/9/sys/dev/bktr/ (props changed) stable/9/sys/dev/bm/ (props changed) stable/9/sys/dev/buslogic/ (props changed) stable/9/sys/dev/bwi/ (props changed) stable/9/sys/dev/bwn/ (props changed) stable/9/sys/dev/bxe/ (props changed) stable/9/sys/dev/cardbus/ (props changed) stable/9/sys/dev/cas/ (props changed) stable/9/sys/dev/ce/ (props changed) stable/9/sys/dev/cesa/ (props changed) stable/9/sys/dev/cfe/ (props changed) stable/9/sys/dev/cfi/ (props changed) stable/9/sys/dev/ciss/ (props changed) stable/9/sys/dev/cm/ (props changed) stable/9/sys/dev/cmx/ (props changed) stable/9/sys/dev/coretemp/ (props changed) stable/9/sys/dev/cp/ (props changed) stable/9/sys/dev/cpuctl/ (props changed) stable/9/sys/dev/cpufreq/ (props changed) stable/9/sys/dev/cs/ (props changed) stable/9/sys/dev/ct/ (props changed) stable/9/sys/dev/ctau/ (props changed) stable/9/sys/dev/cx/ (props changed) stable/9/sys/dev/cxgb/ (props changed) stable/9/sys/dev/cxgbe/ (props changed) stable/9/sys/dev/cy/ (props changed) stable/9/sys/dev/dc/ (props changed) stable/9/sys/dev/dcons/ (props changed) stable/9/sys/dev/de/ (props changed) stable/9/sys/dev/digi/ (props changed) stable/9/sys/dev/dpms/ (props changed) stable/9/sys/dev/dpt/ (props changed) stable/9/sys/dev/drm/ (props changed) stable/9/sys/dev/ed/ (props changed) stable/9/sys/dev/eisa/ (props changed) stable/9/sys/dev/en/ (props changed) stable/9/sys/dev/ep/ (props changed) stable/9/sys/dev/esp/ (props changed) stable/9/sys/dev/et/ (props changed) stable/9/sys/dev/ex/ (props changed) stable/9/sys/dev/exca/ (props changed) stable/9/sys/dev/fatm/ (props changed) stable/9/sys/dev/fb/ (props changed) stable/9/sys/dev/fdc/ (props changed) stable/9/sys/dev/fdt/ (props changed) stable/9/sys/dev/fe/ (props changed) stable/9/sys/dev/firewire/ (props changed) stable/9/sys/dev/flash/ (props changed) stable/9/sys/dev/fxp/ (props changed) stable/9/sys/dev/gem/ (props changed) stable/9/sys/dev/glxiic/ (props changed) stable/9/sys/dev/glxsb/ (props changed) stable/9/sys/dev/gpio/ (props changed) stable/9/sys/dev/hatm/ (props changed) stable/9/sys/dev/hifn/ (props changed) stable/9/sys/dev/hme/ (props changed) stable/9/sys/dev/hpt27xx/ (props changed) stable/9/sys/dev/hptiop/ (props changed) stable/9/sys/dev/hptmv/ (props changed) stable/9/sys/dev/hptrr/ (props changed) stable/9/sys/dev/hwpmc/ (props changed) stable/9/sys/dev/ic/ (props changed) stable/9/sys/dev/ichsmb/ (props changed) stable/9/sys/dev/ichwd/ (props changed) stable/9/sys/dev/ida/ (props changed) stable/9/sys/dev/ie/ (props changed) stable/9/sys/dev/ieee488/ (props changed) stable/9/sys/dev/if_ndis/ (props changed) stable/9/sys/dev/iicbus/ (props changed) stable/9/sys/dev/iir/ (props changed) stable/9/sys/dev/io/ (props changed) stable/9/sys/dev/ipmi/ (props changed) stable/9/sys/dev/ips/ (props changed) stable/9/sys/dev/ipw/ (props changed) stable/9/sys/dev/isci/ (props changed) stable/9/sys/dev/iscsi/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ispfw/ (props changed) stable/9/sys/dev/iwi/ (props changed) stable/9/sys/dev/iwn/ (props changed) stable/9/sys/dev/ixgb/ (props changed) stable/9/sys/dev/jme/ (props changed) stable/9/sys/dev/joy/ (props changed) stable/9/sys/dev/kbd/ (props changed) stable/9/sys/dev/kbdmux/ (props changed) stable/9/sys/dev/ksyms/ (props changed) stable/9/sys/dev/le/ (props changed) stable/9/sys/dev/led/ (props changed) stable/9/sys/dev/lge/ (props changed) stable/9/sys/dev/lindev/ (props changed) stable/9/sys/dev/lmc/ (props changed) stable/9/sys/dev/malo/ (props changed) stable/9/sys/dev/mc146818/ (props changed) stable/9/sys/dev/mca/ (props changed) stable/9/sys/dev/mcd/ (props changed) stable/9/sys/dev/md/ (props changed) stable/9/sys/dev/mem/ (props changed) stable/9/sys/dev/mge/ (props changed) stable/9/sys/dev/mii/ (props changed) stable/9/sys/dev/mk48txx/ (props changed) stable/9/sys/dev/mlx/ (props changed) stable/9/sys/dev/mly/ (props changed) stable/9/sys/dev/mmc/ (props changed) stable/9/sys/dev/mn/ (props changed) stable/9/sys/dev/mps/ (props changed) stable/9/sys/dev/mpt/ (props changed) stable/9/sys/dev/mse/ (props changed) stable/9/sys/dev/msk/ (props changed) stable/9/sys/dev/mvs/ (props changed) stable/9/sys/dev/mwl/ (props changed) stable/9/sys/dev/mxge/ (props changed) stable/9/sys/dev/my/ (props changed) stable/9/sys/dev/ncv/ (props changed) stable/9/sys/dev/netmap/ (props changed) stable/9/sys/dev/nfe/ (props changed) stable/9/sys/dev/nge/ (props changed) stable/9/sys/dev/nmdm/ (props changed) stable/9/sys/dev/nsp/ (props changed) stable/9/sys/dev/null/ (props changed) stable/9/sys/dev/nve/ (props changed) stable/9/sys/dev/nvram/ (props changed) stable/9/sys/dev/nvram2env/ (props changed) stable/9/sys/dev/nxge/ (props changed) stable/9/sys/dev/oce/ (props changed) stable/9/sys/dev/ofw/ (props changed) stable/9/sys/dev/patm/ (props changed) stable/9/sys/dev/pbio/ (props changed) stable/9/sys/dev/pccard/ (props changed) stable/9/sys/dev/pccbb/ (props changed) stable/9/sys/dev/pcf/ (props changed) stable/9/sys/dev/pci/ (props changed) stable/9/sys/dev/pcn/ (props changed) stable/9/sys/dev/pdq/ (props changed) stable/9/sys/dev/powermac_nvram/ (props changed) stable/9/sys/dev/ppbus/ (props changed) stable/9/sys/dev/ppc/ (props changed) stable/9/sys/dev/pst/ (props changed) stable/9/sys/dev/pty/ (props changed) stable/9/sys/dev/puc/ (props changed) stable/9/sys/dev/qlxgb/ (props changed) stable/9/sys/dev/quicc/ (props changed) stable/9/sys/dev/ral/ (props changed) stable/9/sys/dev/random/ (props changed) stable/9/sys/dev/rc/ (props changed) stable/9/sys/dev/re/ (props changed) stable/9/sys/dev/rndtest/ (props changed) stable/9/sys/dev/rp/ (props changed) stable/9/sys/dev/rt/ (props changed) stable/9/sys/dev/safe/ (props changed) stable/9/sys/dev/sbni/ (props changed) stable/9/sys/dev/scc/ (props changed) stable/9/sys/dev/scd/ (props changed) stable/9/sys/dev/sdhci/ (props changed) stable/9/sys/dev/sec/ (props changed) stable/9/sys/dev/sf/ (props changed) stable/9/sys/dev/sfxge/ (props changed) stable/9/sys/dev/sge/ (props changed) stable/9/sys/dev/si/ (props changed) stable/9/sys/dev/siba/ (props changed) stable/9/sys/dev/siis/ (props changed) stable/9/sys/dev/sio/ (props changed) stable/9/sys/dev/sis/ (props changed) stable/9/sys/dev/sk/ (props changed) stable/9/sys/dev/smbus/ (props changed) stable/9/sys/dev/smc/ (props changed) stable/9/sys/dev/sn/ (props changed) stable/9/sys/dev/snc/ (props changed) stable/9/sys/dev/snp/ (props changed) stable/9/sys/dev/sound/ (props changed) stable/9/sys/dev/speaker/ (props changed) stable/9/sys/dev/spibus/ (props changed) stable/9/sys/dev/ste/ (props changed) stable/9/sys/dev/stg/ (props changed) stable/9/sys/dev/stge/ (props changed) stable/9/sys/dev/streams/ (props changed) stable/9/sys/dev/sym/ (props changed) stable/9/sys/dev/syscons/ (props changed) stable/9/sys/dev/tdfx/ (props changed) stable/9/sys/dev/ti/ (props changed) stable/9/sys/dev/tl/ (props changed) stable/9/sys/dev/tpm/ (props changed) stable/9/sys/dev/trm/ (props changed) stable/9/sys/dev/tsec/ (props changed) stable/9/sys/dev/twa/ (props changed) stable/9/sys/dev/twe/ (props changed) stable/9/sys/dev/tws/ (props changed) stable/9/sys/dev/tx/ (props changed) stable/9/sys/dev/txp/ (props changed) stable/9/sys/dev/uart/ (props changed) stable/9/sys/dev/ubsec/ (props changed) stable/9/sys/dev/usb/ (props changed) stable/9/sys/dev/utopia/ (props changed) stable/9/sys/dev/vge/ (props changed) stable/9/sys/dev/viawd/ (props changed) stable/9/sys/dev/vkbd/ (props changed) stable/9/sys/dev/vr/ (props changed) stable/9/sys/dev/vte/ (props changed) stable/9/sys/dev/vx/ (props changed) stable/9/sys/dev/vxge/ (props changed) stable/9/sys/dev/watchdog/ (props changed) stable/9/sys/dev/wb/ (props changed) stable/9/sys/dev/wds/ (props changed) stable/9/sys/dev/wi/ (props changed) stable/9/sys/dev/wl/ (props changed) stable/9/sys/dev/wpi/ (props changed) stable/9/sys/dev/xe/ (props changed) stable/9/sys/dev/xen/ (props changed) stable/9/sys/dev/xl/ (props changed) stable/9/sys/gdb/ (props changed) stable/9/sys/geom/ (props changed) stable/9/sys/gnu/ (props changed) stable/9/sys/i386/ (props changed) stable/9/sys/ia64/ (props changed) stable/9/sys/isa/ (props changed) stable/9/sys/kern/ (props changed) stable/9/sys/kgssapi/ (props changed) stable/9/sys/libkern/ (props changed) stable/9/sys/mips/ (props changed) stable/9/sys/net/ (props changed) stable/9/sys/net80211/ (props changed) stable/9/sys/netatalk/ (props changed) stable/9/sys/netgraph/ (props changed) stable/9/sys/netinet/ (props changed) stable/9/sys/netinet6/ (props changed) stable/9/sys/netipsec/ (props changed) stable/9/sys/netipx/ (props changed) stable/9/sys/netnatm/ (props changed) stable/9/sys/netncp/ (props changed) stable/9/sys/netsmb/ (props changed) stable/9/sys/nfs/ (props changed) stable/9/sys/nfsclient/ (props changed) stable/9/sys/nfsserver/ (props changed) stable/9/sys/nlm/ (props changed) stable/9/sys/ofed/ (props changed) stable/9/sys/opencrypto/ (props changed) stable/9/sys/pc98/ (props changed) stable/9/sys/pci/ (props changed) stable/9/sys/powerpc/ (props changed) stable/9/sys/rpc/ (props changed) stable/9/sys/security/ (props changed) stable/9/sys/sparc64/ (props changed) stable/9/sys/sys/ (props changed) stable/9/sys/teken/ (props changed) stable/9/sys/tools/ (props changed) stable/9/sys/ufs/ (props changed) stable/9/sys/vm/ (props changed) stable/9/sys/x86/ (props changed) stable/9/sys/xdr/ (props changed) stable/9/sys/xen/ (props changed) Modified: stable/9/sys/dev/mfi/mfireg.h ============================================================================== --- stable/9/sys/dev/mfi/mfireg.h Mon May 21 19:53:22 2012 (r235737) +++ stable/9/sys/dev/mfi/mfireg.h Mon May 21 19:58:40 2012 (r235738) @@ -1377,8 +1377,13 @@ struct mfi_bbu_status { #define MFI_BBU_STATE_PACK_MISSING (1 << 0) #define MFI_BBU_STATE_VOLTAGE_LOW (1 << 1) #define MFI_BBU_STATE_TEMPERATURE_HIGH (1 << 2) -#define MFI_BBU_STATE_CHARGE_ACTIVE (1 << 0) -#define MFI_BBU_STATE_DISCHARGE_ACTIVE (1 << 0) +#define MFI_BBU_STATE_CHARGE_ACTIVE (1 << 3) +#define MFI_BBU_STATE_DISCHARGE_ACTIVE (1 << 4) +#define MFI_BBU_STATE_LEARN_CYC_REQ (1 << 5) +#define MFI_BBU_STATE_LEARN_CYC_ACTIVE (1 << 6) +#define MFI_BBU_STATE_LEARN_CYC_FAIL (1 << 7) +#define MFI_BBU_STATE_LEARN_CYC_TIMEOUT (1 << 8) +#define MFI_BBU_STATE_I2C_ERR_DETECT (1 << 9) uint8_t pad[20]; union mfi_bbu_status_detail detail; } __packed;