emi26: use request_firmware() (ae93a55b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/misc/emi26.c

+66 −30

Original line number	Original line	Diff line number	Diff line
	@@ -16,18 +16,8 @@
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/usb.h>		#include <linux/usb.h>
	#include <linux/delay.h>		#include <linux/delay.h>
			#include <linux/firmware.h>
	#define MAX_INTEL_HEX_RECORD_LENGTH 16		#include <linux/ihex.h>
	typedef struct _INTEL_HEX_RECORD
	{
	__u32 length;
	__u32 address;
	__u32 type;
	__u8 data[MAX_INTEL_HEX_RECORD_LENGTH];
	} INTEL_HEX_RECORD, *PINTEL_HEX_RECORD;

	/* include firmware (variables) */
	#include "emi26_fw.h"

	#define EMI26_VENDOR_ID 0x086a /* Emagic Soft-und Hardware GmBH */		#define EMI26_VENDOR_ID 0x086a /* Emagic Soft-und Hardware GmBH */
	#define EMI26_PRODUCT_ID 0x0100 /* EMI 2\|6 without firmware */		#define EMI26_PRODUCT_ID 0x0100 /* EMI 2\|6 without firmware */
	@@ -40,7 +30,9 @@ typedef struct _INTEL_HEX_RECORD
	#define CPUCS_REG 0x7F92 /* EZ-USB Control and Status Register. Bit 0 controls 8051 reset */		#define CPUCS_REG 0x7F92 /* EZ-USB Control and Status Register. Bit 0 controls 8051 reset */
	#define INTERNAL_RAM(address) (address <= MAX_INTERNAL_ADDRESS)		#define INTERNAL_RAM(address) (address <= MAX_INTERNAL_ADDRESS)

	static int emi26_writememory( struct usb_device dev, int address, unsigned char data, int length, __u8 bRequest);		static int emi26_writememory( struct usb_device *dev, int address,
			const unsigned char *data, int length,
			__u8 bRequest);
	static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit);		static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit);
	static int emi26_load_firmware (struct usb_device *dev);		static int emi26_load_firmware (struct usb_device *dev);
	static int emi26_probe(struct usb_interface intf, const struct usb_device_id id);		static int emi26_probe(struct usb_interface intf, const struct usb_device_id id);
	@@ -50,7 +42,9 @@ static void __exit emi26_exit (void);


	/* thanks to drivers/usb/serial/keyspan_pda.c code */		/* thanks to drivers/usb/serial/keyspan_pda.c code */
	static int emi26_writememory (struct usb_device dev, int address, unsigned char data, int length, __u8 request)		static int emi26_writememory (struct usb_device *dev, int address,
			const unsigned char *data, int length,
			__u8 request)
	{		{
	int result;		int result;
	unsigned char *buffer = kmemdup(data, length, GFP_KERNEL);		unsigned char *buffer = kmemdup(data, length, GFP_KERNEL);
	@@ -83,9 +77,12 @@ static int emi26_set_reset (struct usb_device *dev, unsigned char reset_bit)

	static int emi26_load_firmware (struct usb_device *dev)		static int emi26_load_firmware (struct usb_device *dev)
	{		{
			const struct firmware *loader_fw = NULL;
			const struct firmware *bitstream_fw = NULL;
			const struct firmware *firmware_fw = NULL;
			const struct ihex_binrec *rec;
	int err;		int err;
	int i;		int i;
	int pos = 0; /* Position in hex record */
	__u32 addr; /* Address to write */		__u32 addr; /* Address to write */
	__u8 *buf;		__u8 *buf;

	@@ -96,6 +93,23 @@ static int emi26_load_firmware (struct usb_device *dev)
	goto wraperr;		goto wraperr;
	}		}

			err = request_ihex_firmware(&loader_fw, "emi26/loader.fw", &dev->dev);
			if (err)
			goto nofw;

			err = request_ihex_firmware(&bitstream_fw, "emi26/bitstream.fw",
			&dev->dev);
			if (err)
			goto nofw;

			err = request_ihex_firmware(&firmware_fw, "emi26/firmware.fw",
			&dev->dev);
			if (err) {
			nofw:
			err( "%s - request_firmware() failed", __func__);
			goto wraperr;
			}

	/* Assert reset (stop the CPU in the EMI) */		/* Assert reset (stop the CPU in the EMI) */
	err = emi26_set_reset(dev,1);		err = emi26_set_reset(dev,1);
	if (err < 0) {		if (err < 0) {
	@@ -103,13 +117,17 @@ static int emi26_load_firmware (struct usb_device *dev)
	goto wraperr;		goto wraperr;
	}		}

			rec = (const struct ihex_binrec *)loader_fw->data;
	/* 1. We need to put the loader for the FPGA into the EZ-USB */		/* 1. We need to put the loader for the FPGA into the EZ-USB */
	for (i=0; g_Loader[i].type == 0; i++) {		while (rec) {
	err = emi26_writememory(dev, g_Loader[i].address, g_Loader[i].data, g_Loader[i].length, ANCHOR_LOAD_INTERNAL);		err = emi26_writememory(dev, be32_to_cpu(rec->addr),
			rec->data, be16_to_cpu(rec->len),
			ANCHOR_LOAD_INTERNAL);
	if (err < 0) {		if (err < 0) {
	err("%s - error loading firmware: error = %d", __func__, err);		err("%s - error loading firmware: error = %d", __func__, err);
	goto wraperr;		goto wraperr;
	}		}
			rec = ihex_next_binrec(rec);
	}		}

	/* De-assert reset (let the CPU run) */		/* De-assert reset (let the CPU run) */
	@@ -123,15 +141,16 @@ static int emi26_load_firmware (struct usb_device *dev)
	/* 2. We upload the FPGA firmware into the EMI		/* 2. We upload the FPGA firmware into the EMI
	* Note: collect up to 1023 (yes!) bytes and send them with		* Note: collect up to 1023 (yes!) bytes and send them with
	* a single request. This is _much_ faster! */		* a single request. This is _much_ faster! */
			rec = (const struct ihex_binrec *)bitstream_fw->data;
	do {		do {
	i = 0;		i = 0;
	addr = g_bitstream[pos].address;		addr = be32_to_cpu(rec->addr);

	/* intel hex records are terminated with type 0 element */		/* intel hex records are terminated with type 0 element */
	while ((g_bitstream[pos].type == 0) && (i + g_bitstream[pos].length < FW_LOAD_SIZE)) {		while (rec && (i + be16_to_cpu(rec->len) < FW_LOAD_SIZE)) {
	memcpy(buf + i, g_bitstream[pos].data, g_bitstream[pos].length);		memcpy(buf + i, rec->data, be16_to_cpu(rec->len));
	i += g_bitstream[pos].length;		i += be16_to_cpu(rec->len);
	pos++;		rec = ihex_next_binrec(rec);
	}		}
	err = emi26_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA);		err = emi26_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA);
	if (err < 0) {		if (err < 0) {
	@@ -148,8 +167,11 @@ static int emi26_load_firmware (struct usb_device *dev)
	}		}

	/* 3. We need to put the loader for the firmware into the EZ-USB (again...) */		/* 3. We need to put the loader for the firmware into the EZ-USB (again...) */
	for (i=0; g_Loader[i].type == 0; i++) {		for (rec = (const struct ihex_binrec *)loader_fw->data;
	err = emi26_writememory(dev, g_Loader[i].address, g_Loader[i].data, g_Loader[i].length, ANCHOR_LOAD_INTERNAL);		rec; rec = ihex_next_binrec(rec)) {
			err = emi26_writememory(dev, be32_to_cpu(rec->addr),
			rec->data, be16_to_cpu(rec->len),
			ANCHOR_LOAD_INTERNAL);
	if (err < 0) {		if (err < 0) {
	err("%s - error loading firmware: error = %d", __func__, err);		err("%s - error loading firmware: error = %d", __func__, err);
	goto wraperr;		goto wraperr;
	@@ -165,9 +187,13 @@ static int emi26_load_firmware (struct usb_device *dev)
	}		}

	/* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */		/* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */
	for (i=0; g_Firmware[i].type == 0; i++) {
	if (!INTERNAL_RAM(g_Firmware[i].address)) {		for (rec = (const struct ihex_binrec *)firmware_fw->data;
	err = emi26_writememory(dev, g_Firmware[i].address, g_Firmware[i].data, g_Firmware[i].length, ANCHOR_LOAD_EXTERNAL);		rec; rec = ihex_next_binrec(rec)) {
			if (!INTERNAL_RAM(be32_to_cpu(rec->addr))) {
			err = emi26_writememory(dev, be32_to_cpu(rec->addr),
			rec->data, be16_to_cpu(rec->len),
			ANCHOR_LOAD_EXTERNAL);
	if (err < 0) {		if (err < 0) {
	err("%s - error loading firmware: error = %d", __func__, err);		err("%s - error loading firmware: error = %d", __func__, err);
	goto wraperr;		goto wraperr;
	@@ -182,9 +208,12 @@ static int emi26_load_firmware (struct usb_device *dev)
	goto wraperr;		goto wraperr;
	}		}

	for (i=0; g_Firmware[i].type == 0; i++) {		for (rec = (const struct ihex_binrec *)firmware_fw->data;
	if (INTERNAL_RAM(g_Firmware[i].address)) {		rec; rec = ihex_next_binrec(rec)) {
	err = emi26_writememory(dev, g_Firmware[i].address, g_Firmware[i].data, g_Firmware[i].length, ANCHOR_LOAD_INTERNAL);		if (INTERNAL_RAM(be32_to_cpu(rec->addr))) {
			err = emi26_writememory(dev, be32_to_cpu(rec->addr),
			rec->data, be16_to_cpu(rec->len),
			ANCHOR_LOAD_INTERNAL);
	if (err < 0) {		if (err < 0) {
	err("%s - error loading firmware: error = %d", __func__, err);		err("%s - error loading firmware: error = %d", __func__, err);
	goto wraperr;		goto wraperr;
	@@ -205,6 +234,10 @@ static int emi26_load_firmware (struct usb_device *dev)
	err = 1;		err = 1;

	wraperr:		wraperr:
			release_firmware(loader_fw);
			release_firmware(bitstream_fw);
			release_firmware(firmware_fw);

	kfree(buf);		kfree(buf);
	return err;		return err;
	}		}
	@@ -257,5 +290,8 @@ MODULE_AUTHOR("Tapio Laxström");
	MODULE_DESCRIPTION("Emagic EMI 2\|6 firmware loader.");		MODULE_DESCRIPTION("Emagic EMI 2\|6 firmware loader.");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

			MODULE_FIRMWARE("emi26/loader.fw");
			MODULE_FIRMWARE("emi26/bitstream.fw");
			MODULE_FIRMWARE("emi26/firmware.fw");
	/* vi:ai:syntax=c:sw=8:ts=8:tw=80		/* vi:ai:syntax=c:sw=8:ts=8:tw=80
	*/		*/

drivers/usb/misc/emi26_fw.h

deleted100644 → 0

+0 −5779

File deleted.

File size exceeds preview limit.

View file

firmware/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@ fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
	ess/maestro3_assp_minisrc.fw		ess/maestro3_assp_minisrc.fw
	fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \		fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
	yamaha/ds1e_ctrl.fw		yamaha/ds1e_ctrl.fw
			fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
			emi26/bitstream.fw
	fw-shipped-$(CONFIG_USB_KAWETH) += kaweth/new_code.bin kaweth/trigger_code.bin \		fw-shipped-$(CONFIG_USB_KAWETH) += kaweth/new_code.bin kaweth/trigger_code.bin \
	kaweth/new_code_fix.bin \		kaweth/new_code_fix.bin \
	kaweth/trigger_code_fix.bin		kaweth/trigger_code_fix.bin

firmware/WHENCE

+34 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,3 +133,37 @@ Licence: GPLv2+
	Compiled from original 8051 source into Intel HEX, used in our binary ihex form.		Compiled from original 8051 source into Intel HEX, used in our binary ihex form.

	--------------------------------------------------------------------------		--------------------------------------------------------------------------

			Driver: emi26 -- EMI 2\|6 USB Audio interface

			File: emi26/bitstream.fw
			Info: VERSION=1.1.1.131 DATE=2001dec06

			File: emi26/firmware.fw
			Info: VERSION=1.0.2.916 DATE=12.02.2002

			File: emi26/loader.fw

			Converted from Intel HEX files, used in our binary representation of ihex.

			Original licence information:
			/*
			* This firmware is for the Emagic EMI 2\|6 Audio Interface
			*
			* The firmware contained herein is Copyright (c) 1999-2002 Emagic
			* as an unpublished work. This notice does not imply unrestricted
			* or public access to this firmware which is a trade secret of Emagic,
			* and which may not be reproduced, used, sold or transferred to
			* any third party without Emagic's written consent. All Rights Reserved.
			*
			* Permission is hereby granted for the distribution of this firmware
			* image as part of a Linux or other Open Source operating system kernel
			* in text or binary form as required.
			*
			* This firmware may not be modified and may only be used with the
			* Emagic EMI 2\|6 Audio Interface. Distribution and/or Modification of
			* any driver which includes this firmware, in whole or in part,
			* requires the inclusion of this statement.
			*/

			--------------------------------------------------------------------------