Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1121 → Rev 1120

/demos/branches/pj/base/iaster3.c
File deleted
/demos/branches/pj/base/iaster7.c
File deleted
/demos/branches/pj/base/iaster6.c
File deleted
/demos/branches/pj/base/isemdemo.c
File deleted
/demos/branches/pj/base/semdemo.c
File deleted
/demos/branches/pj/base/sig.c
File deleted
/demos/branches/pj/base/srpdemo.c
File deleted
/demos/branches/pj/base/preempt.c
File deleted
/demos/branches/pj/base/readme
File deleted
/demos/branches/pj/base/mousfind.c
File deleted
/demos/branches/pj/base/isched.c
File deleted
/demos/branches/pj/base/condtest.c
File deleted
/demos/branches/pj/base/jointest.c
File deleted
/demos/branches/pj/base/ihello.c
File deleted
/demos/branches/pj/base/hello.c
File deleted
/demos/branches/pj/base/intsem.c
File deleted
/demos/branches/pj/base/imdemo.c
File deleted
/demos/branches/pj/base/iaster1.c
File deleted
/demos/branches/pj/base/pcidemo.c
File deleted
/demos/branches/pj/base/iaster4.c
File deleted
/demos/branches/pj/base/aster1.c
File deleted
/demos/branches/pj/base/aster2.c
File deleted
/demos/branches/pj/base/aster3.c
File deleted
/demos/branches/pj/base/aster4.c
File deleted
/demos/branches/pj/base/aster5.c
File deleted
/demos/branches/pj/base/aster6.c
File deleted
/demos/branches/pj/base/aster7.c
File deleted
/demos/branches/pj/base/aster8.c
File deleted
/demos/branches/pj/base/memtest.c
File deleted
/demos/branches/pj/base/iaster8.c
File deleted
/demos/branches/pj/base/pcdemo.c
File deleted
/demos/branches/pj/base/pidemo.c
File deleted
/demos/branches/pj/base/keycode.c
File deleted
/demos/branches/pj/base/talk.c
File deleted
/demos/branches/pj/base/time.c
File deleted
/demos/branches/pj/base/sched.c
File deleted
/demos/branches/pj/base/aster.c
File deleted
/demos/branches/pj/base/mdemo.c
File deleted
/demos/branches/pj/base/cabs.c
1,42 → 1,3
/*
* Project: S.Ha.R.K.
*
* Coordinators:
* Giorgio Buttazzo <giorgio@sssup.it>
* Paolo Gai <pj@gandalf.sssup.it>
*
* Authors :
* Paolo Gai <pj@gandalf.sssup.it>
* (see the web pages for full authors list)
*
* ReTiS Lab (Scuola Superiore S.Anna - Pisa - Italy)
*
* http://www.sssup.it
* http://retis.sssup.it
* http://shark.sssup.it
*/
 
/*
* Copyright (C) 2000 Giorgio Buttazzo, Paolo Gai
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
* CVS : $Id: cabs.c,v 1.2 2002-10-28 08:11:29 pj Exp $
*/
 
/*--------------------------------------------------------------*/
/* TEST ON CABS */
/*--------------------------------------------------------------*/
103,7 → 64,7
/* Default action for an kern exception is */
kern_cli();
ll_gettime(TIME_EXACT, &t),
cprintf("\nS.Ha.R.K. Exception raised!!!"
kern_printf("\nS.Ha.R.K. Exception raised!!!"
"\nTime (s:ns) :%ld:%ld"
"\nException number:%d (numbers in include/bits/errno.h)"
"\nPID :%d\n",
148,7 → 109,7
void byebye(void *arg)
{
grx_close();
cprintf("Bye Bye!\n");
kern_printf("Bye Bye!\n");
}
 
/*--------------------------------------------------------------*/
184,9 → 145,10
}
if (grx_open(640, 480, 8) < 0) {
cprintf("GRX Err\n");
kern_printf("GRX Err\n");
sys_abort(1);
}
kern_printf("Video card ok!\n");
 
grx_clear(BLACK);
 
/demos/branches/pj/base/fly.c
18,11 → 18,11
 
/**
------------
CVS : $Id: fly.c,v 1.2 2002-10-28 08:11:29 pj Exp $
CVS : $Id: fly.c,v 1.1.1.1 2002-09-02 09:37:41 pj Exp $
 
File: $File$
Revision: $Revision: 1.2 $
Last update: $Date: 2002-10-28 08:11:29 $
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-09-02 09:37:41 $
------------
**/
 
147,7 → 147,7
void byebye(void *arg)
{
grx_close();
cprintf("Bye Bye!\n");
kern_printf("Bye Bye!\n");
}
 
/****************************** MAIN ******************************/
172,9 → 172,10
}
if (grx_open(640, 480, 8) < 0) {
cprintf("GRX Err\n");
kern_printf("GRX Err\n");
sys_abort(1);
}
kern_printf("Video card ok!\n");
 
/* The scenario */
grx_rect(XMIN-D-1, YMIN-D-1, XMAX+D+1, YMAX+D+1, 14);
/demos/branches/pj/base/ego.c
18,11 → 18,11
 
/**
------------
CVS : $Id: ego.c,v 1.2 2002-10-28 08:11:29 pj Exp $
CVS : $Id: ego.c,v 1.1.1.1 2002-09-02 09:37:41 pj Exp $
 
File: $File$
Revision: $Revision: 1.2 $
Last update: $Date: 2002-10-28 08:11:29 $
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-09-02 09:37:41 $
------------
**/
 
126,7 → 126,7
/* Default action for an kern exception is */
kern_cli();
ll_gettime(TIME_EXACT, &t),
cprintf("\nS.Ha.R.K. Exception raised!!!"
kern_printf("\nS.Ha.R.K. Exception raised!!!"
"\nTime (s:ns) :%ld:%ld"
"\nException number:%d (numbers in include/bits/errno.h)"
"\nPID :%d\n",
166,7 → 166,7
void byebye(void *arg)
{
grx_close();
cprintf("Bye Bye!\n");
kern_printf("Bye Bye!\n");
}
 
/****************************** MAIN ******************************/
201,9 → 201,10
}
 
if (grx_open(640, 480, 8) < 0) {
cprintf("GRX Err\n");
kern_printf("GRX Err\n");
sys_abort(1);
}
kern_printf("Video card ok!\n");
 
/* set the keyboard handler to exit correctly */
emerg.ascii = 'x';
/demos/branches/pj/base/makefile
7,96 → 7,10
endif
include $(BASE)/config/config.mk
 
PROGS = hello sig time preempt
PROGS += aster aster1 aster2 aster3 aster4 aster5 aster6 aster7 aster8
PROGS += pcidemo talk mousfind keycode memtest
PROGS += jointest condtest intsem semdemo pidemo pcdemo srpdemo mdemo
PROGS += ego fly cabs sched
PROGS= ego fly cabs
 
include $(BASE)/config/example.mk
 
 
# Text applications
hello:
make -f $(SUBMAKE) APP=hello INIT= OTHEROBJS="ihello.o" OTHERINCL=
 
time:
make -f $(SUBMAKE) APP=time INIT= OTHEROBJS="ihello.o" OTHERINCL=
 
sig:
make -f $(SUBMAKE) APP=sig INIT= OTHEROBJS="ihello.o" OTHERINCL=
 
preempt:
make -f $(SUBMAKE) APP=preempt INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
semdemo:
make -f $(SUBMAKE) APP=semdemo INIT= OTHEROBJS="isemdemo.o" OTHERINCL=
 
pidemo:
make -f $(SUBMAKE) APP=pidemo INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
pcdemo:
make -f $(SUBMAKE) APP=pcdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
srpdemo:
make -f $(SUBMAKE) APP=srpdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
mdemo:
make -f $(SUBMAKE) APP=mdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
aster:
make -f $(SUBMAKE) APP=aster INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
aster1:
make -f $(SUBMAKE) APP=aster1 INIT= OTHEROBJS="iaster1.o" OTHERINCL=
 
aster2:
make -f $(SUBMAKE) APP=aster2 INIT= OTHEROBJS="iaster1.o" OTHERINCL=
 
aster3:
make -f $(SUBMAKE) APP=aster3 INIT= OTHEROBJS="iaster3.o" OTHERINCL=
 
aster4:
make -f $(SUBMAKE) APP=aster4 INIT= OTHEROBJS="iaster4.o" OTHERINCL=
 
aster5:
make -f $(SUBMAKE) APP=aster5 INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
aster6:
make -f $(SUBMAKE) APP=aster6 INIT= OTHEROBJS="iaster6.o" OTHERINCL=
 
aster7:
make -f $(SUBMAKE) APP=aster7 INIT= OTHEROBJS="iaster7.o" OTHERINCL=
 
aster8:
make -f $(SUBMAKE) APP=aster8 INIT= OTHEROBJS="iaster8.o" OTHERINCL=
 
pcidemo:
make -f $(SUBMAKE) APP=pcidemo INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
talk:
make -f $(SUBMAKE) APP=talk INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
mousfind:
make -f $(SUBMAKE) APP=mousfind INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
jointest:
make -f $(SUBMAKE) APP=jointest INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
condtest:
make -f $(SUBMAKE) APP=condtest INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
intsem:
make -f $(SUBMAKE) APP=intsem INIT= OTHEROBJS="imdemo.o" OTHERINCL=
 
keycode:
make -f $(SUBMAKE) APP=keycode INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
memtest:
make -f $(SUBMAKE) APP=memtest INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
# Graphical applications
 
ego:
make -f $(SUBMAKE) APP=ego INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
106,5 → 20,3
cabs:
make -f $(SUBMAKE) APP=cabs INIT= OTHEROBJS="initfile.o" OTHERINCL=
 
sched:
make -f $(SUBMAKE) APP=sched INIT= OTHEROBJS="isched.o" OTHERINCL=