From owner-svn-src-head@FreeBSD.ORG Tue May 27 22:33:54 2014 Return-Path: Delivered-To: svn-src-head@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 09C4EA09; Tue, 27 May 2014 22:33:54 +0000 (UTC) Received: from mail-ig0-x233.google.com (mail-ig0-x233.google.com [IPv6:2607:f8b0:4001:c05::233]) (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 AD4AD2D7B; Tue, 27 May 2014 22:33:53 +0000 (UTC) Received: by mail-ig0-f179.google.com with SMTP id hn18so1736672igb.6 for ; Tue, 27 May 2014 15:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=pPx5YEDBHD7j9aV+5sTtytvV6F2PzDxept8OWHhbCYc=; b=H9GuHnDPRDmnISO0OONv1JDfpyYNWNs0rH8lJGCeh8iQ75/6xA5bL+l83RkEa7R53z 00k8kdlJ3zTWUdCAQUvQzUkuAw0YkqhvVq87dMh5/ZiQ9izj/dJz1g/WqY3dj6syGefX 2GclREZWOyZb9EDlP1FrhXCIJ43pstdhbfDOvF89W3CbSvitcnF76IgS0s32MpdXkmO7 q3OUYcr1RMbeMISHrVFe0YKTaI/AazVgNxxFwgmO3U7fMshCeDbeoXxpafD5dg/6HmoI NU7YTbEKf5cMpngh6SwGYt735z3mkspgHaqh2kDcOIN22A+btMz4Q+irQzd0+ak/oxuV 8puA== MIME-Version: 1.0 X-Received: by 10.50.97.68 with SMTP id dy4mr38035268igb.8.1401230032283; Tue, 27 May 2014 15:33:52 -0700 (PDT) Received: by 10.64.137.104 with HTTP; Tue, 27 May 2014 15:33:52 -0700 (PDT) Received: by 10.64.137.104 with HTTP; Tue, 27 May 2014 15:33:52 -0700 (PDT) In-Reply-To: References: <201405271939.s4RJdvDJ083301@svn.freebsd.org> Date: Tue, 27 May 2014 23:33:52 +0100 Message-ID: Subject: Re: svn commit: r266770 - head/sys/dev/iwn From: Gavin Atkinson To: Adrian Chadd Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18 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 22:33:54 -0000 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 > > * > -------------------------------------------------------------------------- > > */ > > >