2009-08-14 12:17:59

by Gábor Stefanik

Subject: [PATCH v2] b43: Add LP-PHY firmware loading support

Add support for loading LP-PHY firmware to b43_try_request_fw.

Signed-off-by: Gábor Stefanik <[email protected]>
---
drivers/net/wireless/b43/main.c | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index fbcbe4f..51767fa 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,15 @@ 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;
default:
goto err_no_initvals;
}
--
1.6.2.4

2009-08-14 12:20:45

by Mark Huijgen

Subject: Re: [PATCH v2] b43: Add LP-PHY firmware loading support

Still missing a break in the bandswitch initvals.

Mark

Gábor Stefanik wrote:
> Add support for loading LP-PHY firmware to b43_try_request_fw.
>
> Signed-off-by: Gábor Stefanik <[email protected]>
> ---
> drivers/net/wireless/b43/main.c | 25 ++++++++++++++++++++++++-
> 1 files changed, 24 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/main.c
> b/drivers/net/wireless/b43/main.c
> index fbcbe4f..51767fa 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,15 @@ 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;
> default:
> goto err_no_initvals;
> }