Skip to contentSkip to conversation

Fix u16 status declaration when PCMCIA is defined

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 6 messages Nov 18, 2007

lore
Share & tools
lore

Jean-Christophe PLAGNIOL-VILLARD

author
#0 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/pb1x00/pb1x00.c +2 -0
index 95b7d82..536c954 100644
@@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 int checkboard (void)
 {
+#if defined(CONFIG_IDE_PCMCIA) && 0
 	u16 status;
+#endif
 	/* volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10); */
 	volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL;
 	u32 proc_id;
Signature · 1 line
1.5.3.2
#1 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

board/pb1x00/pb1x00.c void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); · line 45

Quoted 11 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/pb1x00/pb1x00.c +1 -0
index 95b7d82..536c954 100644
@@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 int checkboard (void)
 {
+#if defined(CONFIG_IDE_PCMCIA) && 0

Oops? What is the meaning of the "&& 0" here ???

There are less cryptic ways to comment out a line of code, it seems.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"One thing they don't tell you about doing  experimental  physics  is
that sometimes you must work under adverse conditions... like a state
of sheer terror."                                    - W. K. Hartmann
author
#2 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

Quoted 9 lines · Wolfgang Denk
Quoted 8 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/pb1x00/pb1x00.c +0 -0
index 95b7d82..536c954 100644
@@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
Quoted 8 lines

board/pb1x00/pb1x00.c void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); · line 45

Quoted 3 lines
board/pb1x00/pb1x00.c +1 -0
 int checkboard (void)
 {
+#if defined(CONFIG_IDE_PCMCIA) && 0

Oops? What is the meaning of the "&& 0" here ???

There are less cryptic ways to comment out a line of code, it seems.

I agree, but I've chose the same that the line 78.

If you prefer I can as fallowing

#if 0
#if defined(CONFIG_IDE_PCMCIA)

...

#endif
#endif

Best Regards.
J.

#3 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

Quoted 5 lines · In message <[email protected]> you wrote:

I agree, but I've chose the same that the line 78.

If you prefer I can as fallowing

Quoted 7 lines

#if 0
#if defined(CONFIG_IDE_PCMCIA)

...

#endif
#endif

Well, instead, we could as well remove the code. That would be much cleaner.

BTW - which board configuration is throwing warnings for you?

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I distrust all systematisers, and avoid them. The will  to  a  system
shows a lack of honesty.
- Friedrich Wilhelm Nietzsche _G?tzen-D?mmerung [The Twilight of  the
Idols]_ ``Maxims and Missiles'' no. 26
author
#4 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

Quoted 11 lines · Wolfgang Denk
Quoted 10 lines · In message <[email protected]> you wrote:

I agree, but I've chose the same that the line 78.

If you prefer I can as fallowing

#if 0
#if defined(CONFIG_IDE_PCMCIA)

...

Quoted 7 lines
Quoted 2 lines

#endif
#endif

Well, instead, we could as well remove the code. That would be much cleaner.

BTW - which board configuration is throwing warnings for you?

On Mips incaip on cramfs, On arm evb4510, mx1ads(errors) , mx1fs2(errors), sbc2410x, adsvix, pleb2, wepep250, xm250, all ixp

I will send a ppc status within the few hours ro tomorrow morming

Best regards,
J.

#5 lore raw

PATCH 1/1 Fix u16 status declaration when PCMCIA is defined

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 7 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/pb1x00/pb1x00.c +0 -0
index 95b7d82..536c954 100644

board/pb1x00/pb1x00.c void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); · line 50

Quoted 9 lines
board/pb1x00/pb1x00.c +2 -0
@@ -42,7 +42,9 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 int checkboard (void)
 {
+#if defined(CONFIG_IDE_PCMCIA) && 0
 	u16 status;
+#endif
 	/* volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10); */
 	volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL;
 	u32 proc_id;

Checked in. Thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A Vulcan can  no  sooner  be  disloyal  than  he  can  exist  without
breathing.
	-- Kirk, "The Menagerie", stardate 3012.4