Re: [PATCH RESEND 4/4] m68k/atari: fix SCC initialization for debug console

Finn Thain
2014-05-26T04:31:37Z

On Mon, 26 May 2014, Michael Schmitz wrote:

> On Sun, May 25, 2014 at 10:37 PM, Finn Thain <fthain@telegraphics.com.au> wrote:
>
> >
> > diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
> > index 3ab329b..b210a29 100644
> > --- a/arch/m68k/kernel/head.S
> > +++ b/arch/m68k/kernel/head.S
> > @@ -2752,7 +2752,7 @@ L(scc_initable_mac):
> > #ifdef CONFIG_ATARI
> > /* #define USE_PRINTER */
> > /* #define USE_SCC_B */
> > -/* #define USE_SCC_A */
> > +#define USE_SCC_A
> > #define USE_MFP
> >
> > #if defined(USE_SCC_A) || defined(USE_SCC_B)
> >
>
> Does it even work if both USE_SCC_A and USE_MFP are defined? I've only
> ever had defined one or the other.

Right, you can't use both. The logic throughout head.S seems to be
consistent --

#if defined(USE_PRINTER)
...
#elif defined(USE_SCC_A) || defined(USE_SCC_B)
...
#elif defined(USE_MFP)
...
#endif

>
> Would not object to making that change too, if it happens to work OK.

Disabling the MFP output might not be desirable, so I'm not actually
proposing that change should be merged.

> More to test, sigh.

I'm sorry for sending untested patches but I didn't really expect anyone
to test this. It amounts to a bug fix in dead code and probably doesn't
need any more testing: it's mostly copied from the Mac SCC code, which has
been tested already.

--