Re: [MiNT] [Mint-cvs] [FreeMiNT CVS] freemint/sys

[Alan Hourihane <alanh@fairlite.co.uk>]

Also,

I can't find anywhere where this new sys_err variable is actually used.

Can you explain `no char s[]="foo"` ???

Alan.

On 10/12/13 12:06, Alan Hourihane wrote:
> Woah again!
>
> get_ssp() only exists when DEBUG_INFO is defined. Why not for 68000 ?
>
> Please explain these commits on the development list before committing 
> !!!
>
> Alan.
>
> On 10/12/13 10:42, cvs@sparemint.org wrote:
> > Update of /mint/freemint/sys
> > In directory mail.sparemint.org:/tmp/cvs-serv19753
> >
> > Modified Files:
> >        Tag: helmut-enhancements
> >     init.c
> > Log Message:
> > - 68k-fixes: no get_ssp, no char s[]="foo"
> > - don't clear screen before shutdown if error
> >
> >
> > Index: freemint/sys/init.c
> > diff -u freemint/sys/init.c:1.120.2.15 freemint/sys/init.c:1.120.2.16
> > --- freemint/sys/init.c:1.120.2.15    Sat Mar 23 20:05:23 2013
> > +++ freemint/sys/init.c    Sat Oct 12 05:42:21 2013
> > @@ -1,5 +1,5 @@
> >   /*
> > - * $Id: init.c,v 1.120.2.15 2013/03/24 00:05:23 hek Exp $
> > + * $Id: init.c,v 1.120.2.16 2013/10/12 09:42:21 hek Exp $
> >    *
> >    * This file has been modified as part of the FreeMiNT project. See
> >    * the file Changes.MH for details and dates.
> > @@ -331,7 +331,11 @@
> >           long usp, ssp;
> >             usp = get_usp();
> > +#ifndef M68000
> >           ssp = get_ssp();
> > +#else
> > +        ssp = 0;
> > +#endif
> >             DEBUG(("Kernel BASE: 0x%08lx", _base));
> >           DEBUG(("Kernel TEXT: 0x%08lx (SIZE: %ld bytes)", 
> > _base->p_tbase, _base->p_tlen));
> > @@ -1004,6 +1008,8 @@
> >       TRAP_Pterm ((int)r);
> >   }
> >   +int sys_err= 0;
> > +
> >   void
> >   mint_thread(void *arg)
> >   {
> > @@ -1071,7 +1077,8 @@
> >        */
> >       {
> >           unsigned short i;
> > -        char cwd[PATH_MAX] = "X:";
> > +        char cwd[PATH_MAX];
> > +        strcpy( cwd, "X:");
> >             for (i = 0; i < NUM_DRIVES; i++)
> >           {
> > @@ -1282,7 +1289,10 @@
> >       }
> >   # ifndef DEBUG_INFO
> >       else
> > +    {
> > +        sys_err |= 0x80;
> >           sys_s_hutdown(SHUT_HALT);        /* Everything failed. 
> > Halt. */
> > +    }
> >         /* If init program exited, reboot the system.
> >        * Never go back to TOS.
> > @@ -1293,6 +1303,7 @@
> >       /* With debug kernels, always halt
> >        */
> >       FORCE("init:sys_s_hutdown:HALT");
> > +    sys_err |= 0x80;
> >       (void) sys_s_hutdown(SHUT_HALT);
> >   # endif
> >
> > _______________________________________________
> > cz-bobek-lists-mint-cvs mailing list
> > mint-cvs@lists.bobek.cz
> > https://lists.bobek.cz/mailman/listinfo/cz-bobek-lists-mint-cvs