From owner-svn-src-all@FreeBSD.ORG Fri Feb 6 07:49:03 2009 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 9A309106566C; Fri, 6 Feb 2009 07:49:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6F63D8FC16; Fri, 6 Feb 2009 07:49:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n167n3qh053643; Fri, 6 Feb 2009 07:49:03 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n167n3DZ053641; Fri, 6 Feb 2009 07:49:03 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200902060749.n167n3DZ053641@svn.freebsd.org> From: Warner Losh Date: Fri, 6 Feb 2009 07:49:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188219 - head/sys/dev/pccard 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: Fri, 06 Feb 2009 07:49:04 -0000 Author: imp Date: Fri Feb 6 07:49:03 2009 New Revision: 188219 URL: http://svn.freebsd.org/changeset/base/188219 Log: Store the entire funce for disk type functions (eg CF cards and the like). Modified: head/sys/dev/pccard/pccard_cis.c head/sys/dev/pccard/pccardvarp.h Modified: head/sys/dev/pccard/pccard_cis.c ============================================================================== --- head/sys/dev/pccard/pccard_cis.c Fri Feb 6 07:47:53 2009 (r188218) +++ head/sys/dev/pccard/pccard_cis.c Fri Feb 6 07:49:03 2009 (r188219) @@ -1283,6 +1283,8 @@ decode_funce(const struct pccard_tuple * if (type == PCCARD_TPLFE_TYPE_DISK_DEVICE_INTERFACE) { pf->pf_funce_disk_interface = pccard_tuple_read_1(tuple, 1); + pf->pf_funce_disk_power + = pccard_tuple_read_1(tuple, 2); } break; case PCCARD_FUNCTION_NETWORK: Modified: head/sys/dev/pccard/pccardvarp.h ============================================================================== --- head/sys/dev/pccard/pccardvarp.h Fri Feb 6 07:47:53 2009 (r188218) +++ head/sys/dev/pccard/pccardvarp.h Fri Feb 6 07:49:03 2009 (r188219) @@ -75,7 +75,23 @@ struct pccard_config_entry { }; struct pccard_funce_disk { - int pfd_interface; + uint8_t pfd_interface; +#define PFD_I_V_MASK 0x3 +#define PFD_I_V_NONE_REQUIRED 0x0 +#define PFD_I_V_REQ_MOD_ACC 0x1 +#define PFD_I_V_REQ_ACC 0x2 +#define PFD_I_V_REQ_ALWYS 0x1 +#define PFD_I_S 0x4 /* 0 rotating, 1 silicon */ +#define PFD_I_U 0x8 /* SN Uniq? */ +#define PFD_I_D 0x10 /* 0 - 1 drive, 1 - 2 drives */ + uint8_t pfd_power; +#define PFD_P_P0 0x1 +#define PFD_P_P1 0x2 +#define PFD_P_P2 0x4 +#define PFD_P_P3 0x8 +#define PFD_P_N 0x10 /* 3f7/377 excluded? */ +#define PFD_P_E 0x20 /* Index bit supported? */ +#define PFD_P_I 0x40 /* twincard */ }; struct pccard_funce_lan { @@ -119,6 +135,7 @@ struct pccard_function { union pccard_funce pf_funce; /* CISTPL_FUNCE */ #define pf_funce_disk_interface pf_funce.pfv_disk.pfd_interface +#define pf_funce_disk_power pf_funce.pfv_disk.pfd_power #define pf_funce_lan_nid pf_funce.pfv_lan.pfl_nid #define pf_funce_lan_nidlen pf_funce.pfv_lan.pfl_nidlen };