[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Alessio Centazzo]

This patch fixes a debug compilation error for PPC4xx platforms, all
other architectures are not affected by this change.  The 'handler'
pointer was undefined.  The fix is exercised and has effect only if
DEBUG is defined.

Signed-off-by: Alessio Centazzo acpatin at yahoo.com
---
 cpu/ppc4xx/uic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c
index a95d1cb..0ce7a93 100644
--- a/cpu/ppc4xx/uic.c
+++ b/cpu/ppc4xx/uic.c
@@ -164,7 +164,7 @@ void pic_irq_enable(unsigned int vec)
     else if (vec >= 96)
         mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));
 
-    debug("Install interrupt for vector %d ==> %p\n", vec, handler);
+    debug("Enable interrupt for vector %d\n", vec);
 }
 
 void pic_irq_disable(unsigned int vec)
-- 
1.6.0.4


      

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Stefan Roese]

On Wednesday 24 June 2009 04:31:01 Alessio Centazzo wrote:
> This patch fixes a debug compilation error for PPC4xx platforms, all
> other architectures are not affected by this change.  The 'handler'
> pointer was undefined.  The fix is exercised and has effect only if
> DEBUG is defined.
>
> Signed-off-by: Alessio Centazzo acpatin at yahoo.com
> ---
>  cpu/ppc4xx/uic.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c
> index a95d1cb..0ce7a93 100644
> --- a/cpu/ppc4xx/uic.c
> +++ b/cpu/ppc4xx/uic.c
> @@ -164,7 +164,7 @@ void pic_irq_enable(unsigned int vec)
>      else if (vec >= 96)
>          mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));
>
> -    debug("Install interrupt for vector %d ==> %p\n", vec, handler);
> +    debug("Enable interrupt for vector %d\n", vec);
>  }
>
>  void pic_irq_disable(unsigned int vec)

Patch still doesn't apply:

Applying: ppc4xx: Fixed PPC4xx debug compilation error in uic.c
error: patch failed: cpu/ppc4xx/uic.c:164
error: cpu/ppc4xx/uic.c: patch does not apply
Patch failed at 0001 ppc4xx: Fixed PPC4xx debug compilation error in uic.c

Not sure what went wrong here. On which repository did you base your patch? 
Please base it on the u-boot-ppc4xx repository (master branch).

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Alessio Centazzo]

This patch fixes a debug compilation error for PPC4xx platforms, all
other architectures are not affected by this change.  The 'handler'
pointer was undefined.  The fix is exercised and has effect only if
DEBUG is defined.

Signed-off-by: Alessio Centazzo acpatin at yahoo.com
---
 cpu/ppc4xx/uic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c
index a95d1cb..1a370b3 100644
--- a/cpu/ppc4xx/uic.c
+++ b/cpu/ppc4xx/uic.c
@@ -164,7 +164,7 @@ void pic_irq_enable(unsigned int vec)
        else if (vec >= 96)
                mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));

-       debug("Install interrupt for vector %d ==> %p\n", vec, handler);
+       debug("Enable interrupt vector %d\n", vec);
 }

 void pic_irq_disable(unsigned int vec)
--
1.6.0.4



      

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Stefan Roese]

On Wednesday 01 July 2009 05:40:53 Alessio Centazzo wrote:
> This patch fixes a debug compilation error for PPC4xx platforms, all
> other architectures are not affected by this change.  The 'handler'
> pointer was undefined.  The fix is exercised and has effect only if
> DEBUG is defined.

Unfortunately this still doesn't apply. Now I checked why this is the case 
(with such a "simple" patch). And it seems that you have a whitespace issue. 
Please see below.
 
> Signed-off-by: Alessio Centazzo acpatin at yahoo.com
> ---
>  cpu/ppc4xx/uic.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c
> index a95d1cb..1a370b3 100644
> --- a/cpu/ppc4xx/uic.c
> +++ b/cpu/ppc4xx/uic.c
> @@ -164,7 +164,7 @@ void pic_irq_enable(unsigned int vec)
>         else if (vec >= 96)
>                 mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));

Indentation done via spaces instead of tabs as done in the original file.

>
> -       debug("Install interrupt for vector %d ==> %p\n", vec, handler);
> +       debug("Enable interrupt vector %d\n", vec);

Again, indentation has to be done in tabs. Please fix and resubmit.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Alessio Centazzo]

This patch fixes a debug compilation error for PPC4xx platforms, all
other architectures are not affected by this change.  The 'handler'
pointer was undefined.  The fix is exercised and has effect only if
DEBUG is defined.

Signed-off-by: Alessio Centazzo acpatin at yahoo.com
---
 cpu/ppc4xx/uic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c
index a95d1cb..d298b31 100644
--- a/cpu/ppc4xx/uic.c
+++ b/cpu/ppc4xx/uic.c
@@ -164,7 +164,7 @@ void pic_irq_enable(unsigned int vec)
 	else if (vec >= 96)
 		mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec));

-	debug("Install interrupt for vector %d ==> %p\n", vec, handler);
+	debug("Install interrupt vector %d\n", vec);
 }

 void pic_irq_disable(unsigned int vec)
-- 
1.6.0.4

[U-Boot] [PATCH] ppc4xx: Fixed PPC4xx debug compilation error in uic.c

[Stefan Roese]

On Thursday 02 July 2009 07:20:51 Alessio Centazzo wrote:
> This patch fixes a debug compilation error for PPC4xx platforms, all
> other architectures are not affected by this change.  The 'handler'
> pointer was undefined.  The fix is exercised and has effect only if
> DEBUG is defined.

This one worked. :)

Applied to ppc4xx. Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================