build broken for ia64 simserial.c

build broken for ia64 simserial.c

[Luck, Tony]

Alan,

TTY layer buffering revamp broke ia64.

  CC      arch/ia64/hp/sim/simserial.o
arch/ia64/hp/sim/simserial.c: In function `receive_chars':
arch/ia64/hp/sim/simserial.c:170: error: structure has no member named `flip'
arch/ia64/hp/sim/simserial.c:172: error: structure has no member named `flip'
arch/ia64/hp/sim/simserial.c:174: error: structure has no member named `flip'
arch/ia64/hp/sim/simserial.c:176: error: structure has no member named `flip'
arch/ia64/hp/sim/simserial.c:177: error: structure has no member named `flip'
arch/ia64/hp/sim/simserial.c:178: error: structure has no member named `flip'
make[1]: *** [arch/ia64/hp/sim/simserial.o] Error 1

Any quick hints on the fix?

-Tony

Re: build broken for ia64 simserial.c

[Andreas Schwab]

"Luck, Tony" <tony.luck@intel.com> writes:

> Alan,
>
> TTY layer buffering revamp broke ia64.
>
>   CC      arch/ia64/hp/sim/simserial.o
> arch/ia64/hp/sim/simserial.c: In function `receive_chars':
> arch/ia64/hp/sim/simserial.c:170: error: structure has no member named `flip'
> arch/ia64/hp/sim/simserial.c:172: error: structure has no member named `flip'
> arch/ia64/hp/sim/simserial.c:174: error: structure has no member named `flip'
> arch/ia64/hp/sim/simserial.c:176: error: structure has no member named `flip'
> arch/ia64/hp/sim/simserial.c:177: error: structure has no member named `flip'
> arch/ia64/hp/sim/simserial.c:178: error: structure has no member named `flip'
> make[1]: *** [arch/ia64/hp/sim/simserial.o] Error 1
>
> Any quick hints on the fix?

This should work (untested):

--- linux/arch/ia64/hp/sim/simserial.c.~1~	2006-01-13 16:02:17.213612854 +0100
+++ linux/arch/ia64/hp/sim/simserial.c	2006-01-13 23:44:03.594619721 +0100
@@ -167,15 +167,9 @@ static  void receive_chars(struct tty_st
 			}
 		}
 		seen_esc = 0;
-		if (tty->flip.count >= TTY_FLIPBUF_SIZE) break;
 
-		*tty->flip.char_buf_ptr = ch;
-
-		*tty->flip.flag_buf_ptr = 0;
-
-		tty->flip.flag_buf_ptr++;
-		tty->flip.char_buf_ptr++;
-		tty->flip.count++;
+		if (tty_insert_flip_char(tty, ch, TTY_NORMAL) = 0)
+			break;
 	}
 	tty_flip_buffer_push(tty);
 }

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

RE: build broken for ia64 simserial.c

[Luck, Tony]

> This should work (untested):

Compiles cleanly ... and certainly looks ok.

Thanks

-Tony

RE: build broken for ia64 simserial.c

[Alan Cox]

On Gwe, 2006-01-13 at 14:57 -0800, Luck, Tony wrote:
> > This should work (untested):
> 
> Compiles cleanly ... and certainly looks ok.

Looks right to me too.

Alan