From patchwork Fri Aug 14 12:39:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Stefanik?= X-Patchwork-Id: 41431 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7ECeVk7014122 for ; Fri, 14 Aug 2009 12:40:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756690AbZHNMjy (ORCPT ); Fri, 14 Aug 2009 08:39:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756689AbZHNMjy (ORCPT ); Fri, 14 Aug 2009 08:39:54 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:48272 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756658AbZHNMjx (ORCPT ); Fri, 14 Aug 2009 08:39:53 -0400 Received: by bwz22 with SMTP id 22so1116765bwz.18 for ; Fri, 14 Aug 2009 05:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=vfbESfnxoC8ZjyxNxLL14ajOqvRF9qYfKEJ6F1c5enw=; b=YLuTd1eKAv4v6oEIo8YfI8GQ/z2n5Xz+fWDb8DDY9297eUhbFFa5Lfd6lOu76U6gvA K0NRtl/fdF6fqmVWVxCoTcnd/XuFXSq8I7qexOTS43bSn5E+vyBj9UGP9G+NHbUR24RS g93sIXY9aLJu/N4AY17TVB5ZBURswT0MHplSs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=NtlulJIKcAqZoy6EvIHVHCSiEf09YvByTAUjDS3UpsAtYcAt6+gaU3ggCXi7j2KETC xzpS/Em8zXluXV0lUF8pnixADxqL/E9K0Ku7OUg3v10SC7NMv7AoXKuCTpwDEYORO4ex 2ewrkr2kDiTzyfiGwzARS9OaN6fKGzjnRdRsc= Received: by 10.103.138.8 with SMTP id q8mr607408mun.23.1250253593318; Fri, 14 Aug 2009 05:39:53 -0700 (PDT) Received: from ?192.168.1.5? (pool-02f2c.externet.hu [88.209.217.43]) by mx.google.com with ESMTPS id 23sm6554939mum.35.2009.08.14.05.39.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 14 Aug 2009 05:39:52 -0700 (PDT) Message-ID: <4A855B19.5080900@gmail.com> Date: Fri, 14 Aug 2009 14:39:53 +0200 From: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Linville , Michael Buesch , Larry Finger , Mark Huijgen CC: Broadcom Wireless , linux-wireless Subject: [PATCH v3 this time really] b43: Add LP-PHY firmware loading support Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add support for loading LP-PHY firmware to b43_try_request_fw. Signed-off-by: Gábor Stefanik --- I use Kate, and I added the break, then switched to Kate's terminal, committed, format-patched - but forgot to click the Save button before committing. :-) V3 for real: Add yet another missing "break", this time really. V3: Accidentally the same as V2. V2: Add a missing "break". drivers/net/wireless/b43/main.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index fbcbe4f..3ca3e93 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2062,8 +2062,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) filename = "ucode5"; else if ((rev >= 11) && (rev <= 12)) filename = "ucode11"; - else if (rev >= 13) + else if (rev == 13) filename = "ucode13"; + else if (rev == 14) + filename = "ucode14"; + else if (rev >= 15) + filename = "ucode15"; else goto err_no_ucode; err = b43_do_request_fw(ctx, filename, &fw->ucode); @@ -2111,6 +2115,16 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break; + case B43_PHYTYPE_LP: + if (rev == 13) + filename = "lp0initvals13"; + else if (rev == 14) + filename = "lp0initvals14"; + else if (rev >= 15) + filename = "lp0initvals15"; + else + goto err_no_initvals; + break; default: goto err_no_initvals; } @@ -2145,6 +2159,16 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break; + case B43_PHYTYPE_LP: + if (rev == 13) + filename = "lp0bsinitvals13"; + else if (rev == 14) + filename = "lp0bsinitvals14"; + else if (rev >= 15) + filename = "lp0bsinitvals15"; + else + goto err_no_initvals; + break; default: goto err_no_initvals; }