From owner-svn-src-all@FreeBSD.ORG Tue May 27 23:04:16 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 647C91B8; Tue, 27 May 2014 23:04:16 +0000 (UTC) Received: from mail-qg0-x231.google.com (mail-qg0-x231.google.com [IPv6:2607:f8b0:400d:c04::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 01D372FE0; Tue, 27 May 2014 23:04:15 +0000 (UTC) Received: by mail-qg0-f49.google.com with SMTP id a108so15316294qge.36 for ; Tue, 27 May 2014 16:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=hzz4U2PtxIri56G7Ka/6HJ13/Bde0V/CAsmOJO4yjIw=; b=KR6ZdMWPFpJOmGSeltvB9u3Prey44flxMbN/xB+SPA9x9AghWLlc8C9MOjl7+MlGLQ 3llvwoLudBSiq+JZ1M6aiiCthzDKdXhwN0RAdtAkZs6QV4WMJhXixyOUV3XXHQ16WiMm y3laMtSPTAaNtCp/vt9W/YiJ4n7GkKRieSu7rmYoRA2HlJarfVQ9OuYv8tZGJRZ9g200 ubsdPFoOCtJ/c/r5wYkzO7tgqCP0G/YvlhE0zuLVyPld6thv4PZmDQmR97yaeYt3c2Ti UmEFzyoYiCW//cnJSO1weelLnzCiVtLjxVnIvob57hrEEn33hzWeq6andRsWNzfK1tAA k5kQ== MIME-Version: 1.0 X-Received: by 10.229.97.71 with SMTP id k7mr47498025qcn.4.1401231855179; Tue, 27 May 2014 16:04:15 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.191.201 with HTTP; Tue, 27 May 2014 16:04:15 -0700 (PDT) In-Reply-To: References: <201405271939.s4RJdvDJ083301@svn.freebsd.org> Date: Tue, 27 May 2014 16:04:15 -0700 X-Google-Sender-Auth: C_V6OGbiYJYfQXap26ivsdmRpkA Message-ID: Subject: Re: svn commit: r266770 - head/sys/dev/iwn From: Adrian Chadd To: Gavin Atkinson Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Tue, 27 May 2014 23:04:16 -0000 Sweet. Firmware? Is that included? -a On 27 May 2014 15:33, Gavin Atkinson wrote: > Oops, you are correct. I shall remove the debugging printf it in an hour or > so. > > As far as treating this card like a 2030, that is also exactly what Linux > does. > > Thanks, > > Gavin > > On 27 May 2014 20:47, "Adrian Chadd" wrote: >> >> woo! >> >> There's some debugging printf left in. Maybe turn it into >> device_printf() and hide it behind bootverbose? >> >> Is this all the linux driver did? Are the 2030 parameters okay? >> >> >> -a >> >> >> On 27 May 2014 12:39, Gavin Atkinson wrote: >> > Author: gavin >> > Date: Tue May 27 19:39:57 2014 >> > New Revision: 266770 >> > URL: http://svnweb.freebsd.org/changeset/base/266770 >> > >> > Log: >> > Add support for the Intel Centrino Wireless-N 105 chipset. >> > >> > MFC after: 2 weeks >> > Relnotes: yes >> > >> > Modified: >> > head/sys/dev/iwn/if_iwn.c >> > head/sys/dev/iwn/if_iwn_devid.h >> > >> > Modified: head/sys/dev/iwn/if_iwn.c >> > >> > ============================================================================== >> > --- head/sys/dev/iwn/if_iwn.c Tue May 27 19:37:18 2014 >> > (r266769) >> > +++ head/sys/dev/iwn/if_iwn.c Tue May 27 19:39:57 2014 >> > (r266770) >> > @@ -109,6 +109,8 @@ static const struct iwn_ident iwn_ident_ >> > { 0x8086, IWN_DID_130_2, "Intel Centrino Wireless-N 130" >> > }, >> > { 0x8086, IWN_DID_100_1, "Intel Centrino Wireless-N 100" >> > }, >> > { 0x8086, IWN_DID_100_2, "Intel Centrino Wireless-N 100" >> > }, >> > + { 0x8086, IWN_DID_105_1, "Intel Centrino Wireless-N 105" >> > }, >> > + { 0x8086, IWN_DID_105_2, "Intel Centrino Wireless-N 105" >> > }, >> > { 0x8086, IWN_DID_135_1, "Intel Centrino Wireless-N 135" >> > }, >> > { 0x8086, IWN_DID_135_2, "Intel Centrino Wireless-N 135" >> > }, >> > { 0x8086, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965" >> > }, >> > @@ -458,7 +460,7 @@ iwn_attach(device_t dev) >> > sc->hw_type = (IWN_READ(sc, IWN_HW_REV) >> >> > IWN_HW_REV_TYPE_SHIFT) >> > & IWN_HW_REV_TYPE_MASK; >> > sc->subdevice_id = pci_get_subdevice(dev); >> > - >> > +printf("hw %d sdid %x\n", sc->hw_type, sc->subdevice_id); >> > /* >> > * 4965 versus 5000 and later have different methods. >> > * Let's set those up first. >> > @@ -986,6 +988,31 @@ iwn_config_specific(struct iwn_softc *sc >> > } >> > break; >> > >> > +/* 105 Series */ >> > +/* XXX: This series will need adjustment for rate. >> > + * see rx_with_siso_diversity in linux kernel >> > + */ >> > + case IWN_DID_105_1: >> > + case IWN_DID_105_2: >> > + switch(sc->subdevice_id) { >> > + case IWN_SDID_105_1: >> > + case IWN_SDID_105_2: >> > + case IWN_SDID_105_3: >> > + //iwl105_bgn_cfg >> > + case IWN_SDID_105_4: >> > + //iwl105_bgn_d_cfg >> > + sc->limits = >> > &iwn2030_sensitivity_limits; >> > + sc->base_params = &iwn2000_base_params; >> > + sc->fwname = "iwn105fw"; >> > + break; >> > + default: >> > + device_printf(sc->sc_dev, "adapter type >> > id : 0x%04x sub id :" >> > + "0x%04x rev %d not supported >> > (subdevice)\n", pid, >> > + sc->subdevice_id,sc->hw_type); >> > + return ENOTSUP; >> > + } >> > + break; >> > + >> > /* 135 Series */ >> > /* XXX: This series will need adjustment for rate. >> > * see rx_with_siso_diversity in linux kernel >> > >> > Modified: head/sys/dev/iwn/if_iwn_devid.h >> > >> > ============================================================================== >> > --- head/sys/dev/iwn/if_iwn_devid.h Tue May 27 19:37:18 2014 >> > (r266769) >> > +++ head/sys/dev/iwn/if_iwn_devid.h Tue May 27 19:39:57 2014 >> > (r266770) >> > @@ -228,6 +228,19 @@ >> > >> > /* >> > * >> > -------------------------------------------------------------------------- >> > + * Device ID for 105 Series >> > + * >> > -------------------------------------------------------------------------- >> > + */ >> > +#define IWN_DID_105_1 0x0894 >> > +#define IWN_DID_105_2 0x0895 >> > +/* SubDevice ID */ >> > +#define IWN_SDID_105_1 0x0022 >> > +#define IWN_SDID_105_2 0x0222 >> > +#define IWN_SDID_105_3 0x0422 >> > +#define IWN_SDID_105_4 0x0822 >> > + >> > +/* >> > + * >> > -------------------------------------------------------------------------- >> > * Device ID for 135 Series >> > * >> > -------------------------------------------------------------------------- >> > */ >> >