Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c84a7028 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8712u: Switch driver to use external firmware from linux-firmware

parent e3dc896b
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ TODO:
- switch to use LIB80211
- switch to use MAC80211
- checkpatch.pl fixes - only a few remain
- switch from large inline firmware file to use the firmware interface
  and add the file to the linux-firmware package.

Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
Larry Finger <Larry.Finger@lwfinger.net> and
+17 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@
#include "osdep_service.h"
#include "drv_types.h"
#include "rtl871x_byteorder.h"
#include "farray.h"
#include "usb_osintf.h"

#define FWBUFF_ALIGN_SZ 512
@@ -40,11 +39,24 @@
static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
		    const u8 **ppmappedfw)
{
	u32 len;
	int rc;
	const char firmware_file[] = "rtl8712u/rtl8712u.bin";
	const struct firmware **praw = (const struct firmware **)
				       (pphfwfile_hdl);
	struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
					(&padapter->dvobjpriv);
	struct usb_device *pusbdev = pdvobjpriv->pusbdev;

	*ppmappedfw = f_array;
	len = sizeof(f_array);
	return len;
	printk(KERN_INFO "r8712u: Loading firmware from \"%s\"\n",
	       firmware_file);
	rc = request_firmware(praw, firmware_file, &pusbdev->dev);
	if (rc < 0) {
		printk(KERN_ERR "r8712u: Unable to load firmware\n");
		printk(KERN_ERR "r8712u: Install latest linux-firmware\n");
		return 0;
	}
	*ppmappedfw = (u8 *)((*praw)->data);
	return (*praw)->size;
}

static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)