diff options
| -rw-r--r-- | drivers/fpga/fpga.c | 216 | 
1 files changed, 98 insertions, 118 deletions
| diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 26d244354..ddebd495f 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -22,122 +22,99 @@   *   */ -/* - *  Generic FPGA support - */ +/* Generic FPGA support */  #include <common.h>             /* core U-Boot definitions */  #include <xilinx.h>             /* xilinx specific definitions */  #include <altera.h>             /* altera specific definitions */  #include <lattice.h> -#if 0 -#define FPGA_DEBUG              /* define FPGA_DEBUG to get debug messages */ -#endif -  /* Local definitions */  #ifndef CONFIG_MAX_FPGA_DEVICES  #define CONFIG_MAX_FPGA_DEVICES		5  #endif -/* Enable/Disable debug console messages */ -#ifdef FPGA_DEBUG -#define	PRINTF(fmt,args...)	printf (fmt ,##args) -#else -#define	PRINTF(fmt,args...) -#endif -  /* Local static data */  static int next_desc = FPGA_INVALID_DEVICE;  static fpga_desc desc_table[CONFIG_MAX_FPGA_DEVICES]; -/* Local static functions */ -static __attribute__((__const__)) fpga_desc * __attribute__((__const__)) fpga_get_desc( int devnum ); -static __attribute__((__const__)) fpga_desc * __attribute__((__const__)) fpga_validate(int devnum, const void *buf, -					 size_t bsize, char *fn ); -static int fpga_dev_info( int devnum ); - - -/* ------------------------------------------------------------------------- */ - -/* fpga_no_sup +/* + * fpga_no_sup   * 'no support' message function   */ -static void fpga_no_sup( char *fn, char *msg ) +static void fpga_no_sup(char *fn, char *msg)  { -	if ( fn && msg ) { -		printf( "%s: No support for %s.\n", fn, msg); -	} else if ( msg ) { -		printf( "No support for %s.\n", msg); -	} else { -		printf( "No FPGA suport!\n"); -	} +	if (fn && msg) +		printf("%s: No support for %s.\n", fn, msg); +	else if (msg) +		printf("No support for %s.\n", msg); +	else +		printf("No FPGA suport!\n");  }  /* fpga_get_desc   *	map a device number to a descriptor   */ -static __attribute__((__const__)) fpga_desc * __attribute__((__const__)) fpga_get_desc( int devnum ) +static const fpga_desc *const fpga_get_desc(int devnum)  { -	fpga_desc *desc = (fpga_desc * )NULL; +	fpga_desc *desc = (fpga_desc *)NULL; -	if (( devnum >= 0 ) && (devnum < next_desc )) { +	if ((devnum >= 0) && (devnum < next_desc)) {  		desc = &desc_table[devnum]; -		PRINTF( "%s: found fpga descriptor #%d @ 0x%p\n", -				__FUNCTION__, devnum, desc ); +		debug("%s: found fpga descriptor #%d @ 0x%p\n", +		      __func__, devnum, desc);  	}  	return desc;  } - -/* fpga_validate +/* + * fpga_validate   *	generic parameter checking code   */ -static __attribute__((__const__)) fpga_desc * __attribute__((__const__)) fpga_validate(int devnum, const void *buf, -					 size_t bsize, char *fn ) +static const fpga_desc *const fpga_validate(int devnum, const void *buf, +					 size_t bsize, char *fn)  { -	fpga_desc * desc = fpga_get_desc( devnum ); +	const fpga_desc *desc = fpga_get_desc(devnum); -	if ( !desc ) { -		printf( "%s: Invalid device number %d\n", fn, devnum ); -	} +	if (!desc) +		printf("%s: Invalid device number %d\n", fn, devnum); -	if ( !buf ) { -		printf( "%s: Null buffer.\n", fn ); +	if (!buf) { +		printf("%s: Null buffer.\n", fn);  		return (fpga_desc * const)NULL;  	}  	return desc;  } - -/* fpga_dev_info +/* + * fpga_dev_info   *	generic multiplexing code   */ -static int fpga_dev_info( int devnum ) +static int fpga_dev_info(int devnum)  { -	int ret_val = FPGA_FAIL;           /* assume failure */ -	const fpga_desc * const desc = fpga_get_desc( devnum ); +	int ret_val = FPGA_FAIL; /* assume failure */ +	const fpga_desc * const desc = fpga_get_desc(devnum); -	if ( desc ) { -		PRINTF( "%s: Device Descriptor @ 0x%p\n", -				__FUNCTION__, desc->devdesc ); +	if (desc) { +		debug("%s: Device Descriptor @ 0x%p\n", +		      __func__, desc->devdesc); -		switch ( desc->devtype ) { +		switch (desc->devtype) {  		case fpga_xilinx:  #if defined(CONFIG_FPGA_XILINX) -			printf( "Xilinx Device\nDescriptor @ 0x%p\n", desc ); -			ret_val = xilinx_info( desc->devdesc ); +			printf("Xilinx Device\nDescriptor @ 0x%p\n", desc); +			ret_val = xilinx_info(desc->devdesc);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); +			fpga_no_sup((char *)__func__, "Xilinx devices");  #endif  			break;  		case fpga_altera:  #if defined(CONFIG_FPGA_ALTERA) -			printf( "Altera Device\nDescriptor @ 0x%p\n", desc ); -			ret_val = altera_info( desc->devdesc ); +			printf("Altera Device\nDescriptor @ 0x%p\n", desc); +			ret_val = altera_info(desc->devdesc);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Altera devices" ); +			fpga_no_sup((char *)__func__, "Altera devices");  #endif  			break;  		case fpga_lattice: @@ -145,171 +122,174 @@ static int fpga_dev_info( int devnum )  			printf("Lattice Device\nDescriptor @ 0x%p\n", desc);  			ret_val = lattice_info(desc->devdesc);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" ); +			fpga_no_sup((char *)__func__, "Lattice devices");  #endif  			break;  		default: -			printf( "%s: Invalid or unsupported device type %d\n", -					__FUNCTION__, desc->devtype ); +			printf("%s: Invalid or unsupported device type %d\n", +			       __func__, desc->devtype);  		}  	} else { -		printf( "%s: Invalid device number %d\n", -			__FUNCTION__, devnum ); +		printf("%s: Invalid device number %d\n", __func__, devnum);  	}  	return ret_val;  } - -/* ------------------------------------------------------------------------- */ -/* fgpa_init is usually called from misc_init_r() and MUST be called +/* + * fgpa_init is usually called from misc_init_r() and MUST be called   * before any of the other fpga functions are used.   */  void fpga_init(void)  {  	next_desc = 0; -	memset( desc_table, 0, sizeof(desc_table)); +	memset(desc_table, 0, sizeof(desc_table)); -	PRINTF( "%s: CONFIG_FPGA = 0x%x\n", __FUNCTION__, CONFIG_FPGA ); +	debug("%s: CONFIG_FPGA = 0x%x\n", __func__, CONFIG_FPGA);  } -/* fpga_count +/* + * fpga_count   * Basic interface function to get the current number of devices available.   */ -int fpga_count( void ) +int fpga_count(void)  {  	return next_desc;  } -/* fpga_add +/* + * fpga_add   *	Add the device descriptor to the device table.   */ -int fpga_add( fpga_type devtype, void *desc ) +int fpga_add(fpga_type devtype, void *desc)  {  	int devnum = FPGA_INVALID_DEVICE; -	if ( next_desc  < 0 ) { -		printf( "%s: FPGA support not initialized!\n", __FUNCTION__ ); -	} else if (( devtype > fpga_min_type ) && ( devtype < fpga_undefined )) { -		if ( desc ) { -			if ( next_desc < CONFIG_MAX_FPGA_DEVICES ) { +	if (next_desc < 0) { +		printf("%s: FPGA support not initialized!\n", __func__); +	} else if ((devtype > fpga_min_type) && (devtype < fpga_undefined)) { +		if (desc) { +			if (next_desc < CONFIG_MAX_FPGA_DEVICES) {  				devnum = next_desc;  				desc_table[next_desc].devtype = devtype;  				desc_table[next_desc++].devdesc = desc;  			} else { -				printf( "%s: Exceeded Max FPGA device count\n", __FUNCTION__ ); +				printf("%s: Exceeded Max FPGA device count\n", +				       __func__);  			}  		} else { -			printf( "%s: NULL device descriptor\n", __FUNCTION__ ); +			printf("%s: NULL device descriptor\n", __func__);  		}  	} else { -		printf( "%s: Unsupported FPGA type %d\n", __FUNCTION__, devtype ); +		printf("%s: Unsupported FPGA type %d\n", __func__, devtype);  	}  	return devnum;  }  /* - *	Generic multiplexing code + * Generic multiplexing code   */  int fpga_load(int devnum, const void *buf, size_t bsize)  {  	int ret_val = FPGA_FAIL;           /* assume failure */ -	fpga_desc * desc = fpga_validate( devnum, buf, bsize, (char *)__FUNCTION__ ); +	const fpga_desc *desc = fpga_validate(devnum, buf, bsize, +					      (char *)__func__); -	if ( desc ) { -		switch ( desc->devtype ) { +	if (desc) { +		switch (desc->devtype) {  		case fpga_xilinx:  #if defined(CONFIG_FPGA_XILINX) -			ret_val = xilinx_load( desc->devdesc, buf, bsize ); +			ret_val = xilinx_load(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); +			fpga_no_sup((char *)__func__, "Xilinx devices");  #endif  			break;  		case fpga_altera:  #if defined(CONFIG_FPGA_ALTERA) -			ret_val = altera_load( desc->devdesc, buf, bsize ); +			ret_val = altera_load(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Altera devices" ); +			fpga_no_sup((char *)__func__, "Altera devices");  #endif  			break;  		case fpga_lattice:  #if defined(CONFIG_FPGA_LATTICE)  			ret_val = lattice_load(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" ); +			fpga_no_sup((char *)__func__, "Lattice devices");  #endif  			break;  		default: -			printf( "%s: Invalid or unsupported device type %d\n", -				__FUNCTION__, desc->devtype ); +			printf("%s: Invalid or unsupported device type %d\n", +			       __func__, desc->devtype);  		}  	}  	return ret_val;  } -/* fpga_dump +/* + * fpga_dump   *	generic multiplexing code   */  int fpga_dump(int devnum, const void *buf, size_t bsize)  {  	int ret_val = FPGA_FAIL;           /* assume failure */ -	fpga_desc * desc = fpga_validate( devnum, buf, bsize, (char *)__FUNCTION__ ); +	const fpga_desc *desc = fpga_validate(devnum, buf, bsize, +					      (char *)__func__); -	if ( desc ) { -		switch ( desc->devtype ) { +	if (desc) { +		switch (desc->devtype) {  		case fpga_xilinx:  #if defined(CONFIG_FPGA_XILINX) -			ret_val = xilinx_dump( desc->devdesc, buf, bsize ); +			ret_val = xilinx_dump(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); +			fpga_no_sup((char *)__func__, "Xilinx devices");  #endif  			break;  		case fpga_altera:  #if defined(CONFIG_FPGA_ALTERA) -			ret_val = altera_dump( desc->devdesc, buf, bsize ); +			ret_val = altera_dump(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Altera devices" ); +			fpga_no_sup((char *)__func__, "Altera devices");  #endif  			break;  		case fpga_lattice:  #if defined(CONFIG_FPGA_LATTICE)  			ret_val = lattice_dump(desc->devdesc, buf, bsize);  #else -			fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" ); +			fpga_no_sup((char *)__func__, "Lattice devices");  #endif  			break;  		default: -			printf( "%s: Invalid or unsupported device type %d\n", -				__FUNCTION__, desc->devtype ); +			printf("%s: Invalid or unsupported device type %d\n", +			       __func__, desc->devtype);  		}  	}  	return ret_val;  } - -/* fpga_info +/* + * fpga_info   *	front end to fpga_dev_info.  If devnum is invalid, report on all   *	available devices.   */ -int fpga_info( int devnum ) +int fpga_info(int devnum)  { -	if ( devnum == FPGA_INVALID_DEVICE ) { -		if ( next_desc > 0 ) { +	if (devnum == FPGA_INVALID_DEVICE) { +		if (next_desc > 0) {  			int dev; -			for ( dev = 0; dev < next_desc; dev++ ) { -				fpga_dev_info( dev ); -			} +			for (dev = 0; dev < next_desc; dev++) +				fpga_dev_info(dev); +  			return FPGA_SUCCESS;  		} else { -			printf( "%s: No FPGA devices available.\n", __FUNCTION__ ); +			printf("%s: No FPGA devices available.\n", __func__);  			return FPGA_FAIL;  		}  	} -	else return fpga_dev_info( devnum ); -} -/* ------------------------------------------------------------------------- */ +	return fpga_dev_info(devnum); +} |