From owner-svn-src-head@FreeBSD.ORG Tue May 27 19:47:01 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 528FBA25; Tue, 27 May 2014 19:47:01 +0000 (UTC) Received: from mail-qg0-x229.google.com (mail-qg0-x229.google.com [IPv6:2607:f8b0:400d:c04::229]) (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 6FB9C2EC1; Tue, 27 May 2014 19:47:00 +0000 (UTC) Received: by mail-qg0-f41.google.com with SMTP id j5so14891141qga.28 for ; Tue, 27 May 2014 12:46:59 -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=eNwMT4Ncj2Kqez1fM2Ph5Px0BWQ8wsK4hFuzWn6y/PI=; b=de9+SFwsiesr5eLdf1c6CpppEXfCnENuJkZRgvFP7uMKjVTvpBzO36Dtu2XgXPAXgw OBBqvHjMVH+WoRu/fCZUELPhTC669RRM6IfJ2BBN7Fp3M0mYPXnsGM9KPfruvRCL+an7 1YzGWiwAk9SPGMtwLkKDZwUQBXg8nmaOfObyE3E235fQzJCcME+OKZkAtC6WCuYES0Un yb77884CZxZDPi2z63V5oF+DdT8eJFlQEwiRTBu2adPD6lW5zOs0G+dNjRYuLdlSJsDz W8nIkqS2Ji/JewGLfUD7y4gfrDV0SHydvH6yRnglmwxKG8iqLIYmfDd1IAc/w26RtrF0 m2rQ== MIME-Version: 1.0 X-Received: by 10.224.51.2 with SMTP id b2mr47313023qag.49.1401220019592; Tue, 27 May 2014 12:46:59 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.191.201 with HTTP; Tue, 27 May 2014 12:46:59 -0700 (PDT) In-Reply-To: <201405271939.s4RJdvDJ083301@svn.freebsd.org> References: <201405271939.s4RJdvDJ083301@svn.freebsd.org> Date: Tue, 27 May 2014 12:46:59 -0700 X-Google-Sender-Auth: JABFj_pATKeW_BAvHqt25cYpWz0 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 19:47:01 -0000 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 > * -------------------------------------------------------------------------- > */ >