GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-03 21:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fpga: altera: Clean up the printing and debug

Browse source 
Clean up the printf() statements and get rid of the PRINTF()
macro by replacing it with debug_cond().

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Acked-by: Pavel Machek <pavel@denx.de>
This commit is contained in:
Marek Vasut 2014-09-16 20:21:42 +02:00
parent be9f643ae6
commit 0ae16cbb40
1 changed files with 58 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/fpga/altera.c
View file

@ -15,14 +15,8 @@
#include <ACEX1K.h> #include <ACEX1K.h>
#include <stratixII.h> #include <stratixII.h>
/* Define FPGA_DEBUG to get debug printf's */ /* Define FPGA_DEBUG to 1 to get debug printf's */
/* #define FPGA_DEBUG */ #define FPGA_DEBUG 0
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#else
#define PRINTF(fmt,args...)
#endif
/* Local Static Functions */ /* Local Static Functions */
static int altera_validate (Altera_desc * desc, const char *fn); static int altera_validate (Altera_desc * desc, const char *fn);
@ -32,36 +26,39 @@ int altera_load(Altera_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; /* assume a failure */ int ret_val = FPGA_FAIL; /* assume a failure */
if (!altera_validate (desc, (char *)__FUNCTION__)) { if (!altera_validate (desc, (char *)__func__)) {
printf ("%s: Invalid device descriptor\n", __FUNCTION__); printf("%s: Invalid device descriptor\n", __func__);
} else { } else {
switch (desc->family) { switch (desc->family) {
case Altera_ACEX1K: case Altera_ACEX1K:
case Altera_CYC2: case Altera_CYC2:
#if defined(CONFIG_FPGA_ACEX1K) #if defined(CONFIG_FPGA_ACEX1K)
PRINTF ("%s: Launching the ACEX1K Loader...\n", debug_cond(FPGA_DEBUG,
__FUNCTION__); "%s: Launching the ACEX1K Loader...\n",
__func__);
ret_val = ACEX1K_load (desc, buf, bsize); ret_val = ACEX1K_load (desc, buf, bsize);
#elif defined(CONFIG_FPGA_CYCLON2) #elif defined(CONFIG_FPGA_CYCLON2)
PRINTF ("%s: Launching the CYCLONE II Loader...\n", debug_cond(FPGA_DEBUG,
__FUNCTION__); "%s: Launching the CYCLONE II Loader...\n",
__func__);
ret_val = CYC2_load (desc, buf, bsize); ret_val = CYC2_load (desc, buf, bsize);
#else #else
printf("%s: No support for ACEX1K devices.\n", printf("%s: No support for ACEX1K devices.\n",
__FUNCTION__); __func__);
#endif #endif
break; break;
#if defined(CONFIG_FPGA_STRATIX_II) #if defined(CONFIG_FPGA_STRATIX_II)
case Altera_StratixII: case Altera_StratixII:
PRINTF ("%s: Launching the Stratix II Loader...\n", debug_cond(FPGA_DEBUG,
__FUNCTION__); "%s: Launching the Stratix II Loader...\n",
__func__);
ret_val = StratixII_load (desc, buf, bsize); ret_val = StratixII_load (desc, buf, bsize);
break; break;
#endif #endif
default: default:
printf("%s: Unsupported family type, %d\n", printf("%s: Unsupported family type, %d\n",
__FUNCTION__, desc->family); __func__, desc->family);
} }
} }
@ -72,31 +69,33 @@ int altera_dump(Altera_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; /* assume a failure */ int ret_val = FPGA_FAIL; /* assume a failure */
if (!altera_validate (desc, (char *)__FUNCTION__)) { if (!altera_validate (desc, (char *)__func__)) {
printf ("%s: Invalid device descriptor\n", __FUNCTION__); printf("%s: Invalid device descriptor\n", __func__);
} else { } else {
switch (desc->family) { switch (desc->family) {
case Altera_ACEX1K: case Altera_ACEX1K:
#if defined(CONFIG_FPGA_ACEX) #if defined(CONFIG_FPGA_ACEX)
PRINTF ("%s: Launching the ACEX1K Reader...\n", debug_cond(FPGA_DEBUG,
__FUNCTION__); "%s: Launching the ACEX1K Reader...\n",
__func__);
ret_val = ACEX1K_dump (desc, buf, bsize); ret_val = ACEX1K_dump (desc, buf, bsize);
#else #else
printf("%s: No support for ACEX1K devices.\n", printf("%s: No support for ACEX1K devices.\n",
__FUNCTION__); __func__);
#endif #endif
break; break;
#if defined(CONFIG_FPGA_STRATIX_II) #if defined(CONFIG_FPGA_STRATIX_II)
case Altera_StratixII: case Altera_StratixII:
PRINTF ("%s: Launching the Stratix II Reader...\n", debug_cond(FPGA_DEBUG,
__FUNCTION__); "%s: Launching the Stratix II Reader...\n",
__func__);
ret_val = StratixII_dump (desc, buf, bsize); ret_val = StratixII_dump (desc, buf, bsize);
break; break;
#endif #endif
default: default:
printf("%s: Unsupported family type, %d\n", printf("%s: Unsupported family type, %d\n",
__FUNCTION__, desc->family); __func__, desc->family);
} }
} }
@ -107,7 +106,7 @@ int altera_info( Altera_desc *desc )
{ {
int ret_val = FPGA_FAIL; int ret_val = FPGA_FAIL;
if (altera_validate (desc, (char *)__FUNCTION__)) { if (altera_validate (desc, (char *)__func__)) {
printf("Family: \t"); printf("Family: \t");
switch (desc->family) { switch (desc->family) {
case Altera_ACEX1K: case Altera_ACEX1K:
@ -169,7 +168,7 @@ int altera_info( Altera_desc *desc )
#else #else
/* just in case */ /* just in case */
printf("%s: No support for ACEX1K devices.\n", printf("%s: No support for ACEX1K devices.\n",
__FUNCTION__); __func__);
#endif #endif
break; break;
#if defined(CONFIG_FPGA_STRATIX_II) #if defined(CONFIG_FPGA_STRATIX_II)
@ -188,7 +187,7 @@ int altera_info( Altera_desc *desc )
ret_val = FPGA_SUCCESS; ret_val = FPGA_SUCCESS;
} else { } else {
printf ("%s: Invalid device descriptor\n", __FUNCTION__); printf("%s: Invalid device descriptor\n", __func__);
} }
return ret_val; return ret_val;