Subject: Re: Getting started on new PB G3 Series
To: William O Ferry <woferry@iname.com>
From: Tsubai Masanari <tsubai@iri.co.jp>
List: port-macppc
Date: 08/09/1999 00:46:18
>What is necessary to get X working again?  I suspect it broke with the
>new wsmux foo, so I added two additional tries in
>...

I don't know if this is the right fix, but it seems to make Xmacppc
work again.

diff -c sys/dev/wscons/wskbd.c~ sys/dev/wscons/wskbd.c
*** sys/dev/wscons/wskbd.c~	Sun Aug  8 21:17:19 1999
--- sys/dev/wscons/wskbd.c	Mon Aug  9 00:38:45 1999
***************
*** 557,563 ****
  	if (!sc->sc_ready)
  		return;
  
! #if NWSMUX > 0 || NWSDISPLAY > 0
  	if (sc->sc_mux)
  		evar = &sc->sc_mux->sc_events;
  	else
--- 557,563 ----
  	if (!sc->sc_ready)
  		return;
  
! #if NWSMUX > 0
  	if (sc->sc_mux)
  		evar = &sc->sc_mux->sc_events;
  	else
***************
*** 663,669 ****
  		return (0);
  	}
  
! #if NWSMUX > 0 || NWSDISPLAY > 0
  	if (sc->sc_mux)
  		return (EBUSY);
  #endif
--- 663,669 ----
  		return (0);
  	}
  
! #if NWSMUX > 0
  	if (sc->sc_mux)
  		return (EBUSY);
  #endif