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

Commit 547d8bb7 authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

ip2: use request_firmware() 



Converted with help from Jaswinder Singh

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Acked-by: default avatarAlan Cox <alan@redhat.com>
parent 27d202ff

drivers/char/ip2/fip_firm.h

deleted100644 → 0
+0 −2149

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/char/ip2/ip2base.c

+2 −3
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@ 
#endif



#include "ip2types.h"		

#include "fip_firm.h"		// the meat



int

ip2_loadmain(int *, int  *, unsigned char *, int ); // ref into ip2main.c

ip2_loadmain(int *, int *); // ref into ip2main.c



/* Note: Add compiled in defaults to these arrays, not to the structure

	in ip2.h any longer.  That structure WILL get overridden
@@ -52,7 +51,7 @@ static int __init ip2_init(void) 
		irq[0] = irq[1] = irq[2] = irq[3] = 0;

	}



	return ip2_loadmain(io,irq,(unsigned char *)fip_firm,sizeof(fip_firm));

	return ip2_loadmain(io, irq);

}

module_init(ip2_init);

drivers/char/ip2/ip2main.c

+36 −11
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
#include <linux/major.h>

#include <linux/wait.h>

#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/platform_device.h>



#include <linux/tty.h>

#include <linux/tty_flip.h>
@@ -155,9 +157,7 @@ static char *pcDriver_name = "ip2"; 
static char *pcIpl    		 = "ip2ipl";



// cheezy kludge or genius - you decide?

int ip2_loadmain(int *, int *, unsigned char *, int);

static unsigned char *Fip_firmware;

static int Fip_firmware_size;

int ip2_loadmain(int *, int *);



/***********************/

/* Function Prototypes */
@@ -208,7 +208,7 @@ static int ip2_ipl_open(struct inode *, struct file *); 
static int DumpTraceBuffer(char __user *, int);

static int DumpFifoBuffer( char __user *, int);



static void ip2_init_board(int);

static void ip2_init_board(int, const struct firmware *);

static unsigned short find_eisa_board(int);



/***************/
@@ -474,8 +474,27 @@ static const struct tty_operations ip2_ops = { 
/* SA_RANDOM   - can be source for cert. random number generators */

#define IP2_SA_FLAGS	0





static const struct firmware *ip2_request_firmware(void)

{

	struct platform_device *pdev;

	const struct firmware *fw;



	pdev = platform_device_register_simple("ip2", 0, NULL, 0);

	if (IS_ERR(pdev)) {

		printk(KERN_ERR "Failed to register platform device for ip2\n");

		return NULL;

	}

	if (request_firmware(&fw, "intelliport2.bin", &pdev->dev)) {

		printk(KERN_ERR "Failed to load firmware 'intelliport2.bin'\n");

		fw = NULL;

	}

	platform_device_unregister(pdev);

	return fw;

}



int

ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 

ip2_loadmain(int *iop, int *irqp)

{

	int i, j, box;

	int err = 0;
@@ -483,6 +502,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 
	i2eBordStrPtr pB = NULL;

	int rc = -1;

	static struct pci_dev *pci_dev_i = NULL;

	const struct firmware *fw = NULL;



	ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0 );
@@ -516,9 +536,6 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 
	}

	poll_only = !poll_only;



	Fip_firmware = firmware;

	Fip_firmware_size = firmsize;



	/* Announce our presence */

	printk( KERN_INFO "%s version %s\n", pcName, pcVersion );
@@ -638,10 +655,18 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 
		}

	}

	for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {

		/* We don't want to request the firmware unless we have at

		   least one board */

		if ( i2BoardPtrTable[i] != NULL ) {

			ip2_init_board( i );

			if (!fw)

				fw = ip2_request_firmware();

			if (!fw)

				break;

			ip2_init_board(i, fw);

		}

	}

	if (fw)

		release_firmware(fw);



	ip2trace (ITRC_NO_PORT, ITRC_INIT, 2, 0 );
@@ -769,7 +794,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 
/* are reported on the console.                                               */

/******************************************************************************/

static void

ip2_init_board( int boardnum )

ip2_init_board(int boardnum, const struct firmware *fw)

{

	int i;

	int nports = 0, nboxes = 0;
@@ -789,7 +814,7 @@ ip2_init_board( int boardnum ) 
		goto err_initialize;

	}



	if ( iiDownloadAll ( pB, (loadHdrStrPtr)Fip_firmware, 1, Fip_firmware_size )

	if ( iiDownloadAll ( pB, (loadHdrStrPtr)fw->data, 1, fw->size )

	    != II_DOWN_GOOD ) {

		printk ( KERN_ERR "IP2: failed to download loadware\n" );

		goto err_release_region;

firmware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) 
# But be aware that the config file might not be included at all.



fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw

fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin

fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin

fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin

fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp

firmware/WHENCE

+10 −0
Original line number Diff line number Diff line
@@ -226,3 +226,13 @@ Debug loader claims the following behaviour: 
Converted from Intel HEX files, used in our binary representation of ihex.



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



Driver: ip2 -- Computone IntelliPort Plus serial device



File: intelliport2.bin



Licence: Unknown



Found in hex form in kernel source.



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