Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1378 → Rev 1379

/demos/trunk/jumpball/jetctrl.c
18,11 → 18,11
 
/**
------------
CVS : $Id: jetctrl.c,v 1.2 2003-05-01 19:43:17 pj Exp $
CVS : $Id: jetctrl.c,v 1.3 2004-04-17 17:16:47 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.2 $
Last update: $Date: 2003-05-01 19:43:17 $
Revision: $Revision: 1.3 $
Last update: $Date: 2004-04-17 17:16:47 $
------------
**/
 
75,7 → 75,6
TIMESPEC_ASSIGN(&last, &now);
last_dummy = now_dummy;
 
mutex_lock(&mutex);
grx_line(JET_DUMMY_X+x,JET_DUMMY_Y,
JET_DUMMY_X+x,JET_DUMMY_Y+height ,black);
grx_line(JET_DUMMY_X+x,JET_DUMMY_Y+height,
82,7 → 81,6
JET_DUMMY_X+x,JET_DUMMY_Y+JET_DUMMY_HEIGHT,white);
grx_line(JET_DUMMY_X+(x+1)%JET_DUMMY_WIDTH,JET_DUMMY_Y,
JET_DUMMY_X+(x+1)%JET_DUMMY_WIDTH,JET_DUMMY_Y+JET_DUMMY_HEIGHT,255);
mutex_unlock(&mutex);
 
x = (x+1)%JET_DUMMY_WIDTH;
 
105,17 → 103,13
if (jet_getstat(i, &sum, &max, &n, NULL) != -1) {
if (!n) n=1;
sprintf(st, "%6d %6d %10s", (int)sum/n, (int)max, proc_table[i].name);
mutex_lock(&mutex);
grx_text(st, 384, JET_Y_NAME+16+printed*8, gray, black);
mutex_unlock(&mutex);
printed++;
}
}
while (printed<JET_NTASK) {
mutex_lock(&mutex);
grx_text(" ",
384, JET_Y_NAME+16+printed*8, gray, black);
mutex_unlock(&mutex);
printed++;
}
task_endcycle();
157,7 → 151,6
slides[i] = (int)( (((float)total[i])/max) * JET_SLIDE_WIDTH);
 
// print the data
mutex_lock(&mutex);
for (i=0; i<JET_NTASK; i++) {
grx_box(JET_SLIDE_X, JET_Y_NAME+16+i*8,
JET_SLIDE_X+slides[i], JET_Y_NAME+23+i*8, gray);
170,7 → 163,6
JET_SLIDE_X+JET_SLIDE_WIDTH, JET_Y_NAME+20+i*8, black);
i++;
}
mutex_unlock(&mutex);
task_endcycle();
}
}
201,7 → 193,7
PID p3, p4, p5;
 
soft_task_default_model(m3);
soft_task_def_level(m3,1);
soft_task_def_level(m3,2);
soft_task_def_period(m3, PERIOD_JETCTRL);
soft_task_def_met(m3, WCET_JETCTRL);
soft_task_def_ctrl_jet(m3);
210,11 → 202,11
if (p3 == -1) {
sys_shutdown_message("Could not create task <jetctrl> errno=%d",
errno);
sys_end();
task_activate(shutdown_task_PID);
}
 
soft_task_default_model(m4);
soft_task_def_level(m4,1);
soft_task_def_level(m4,2);
soft_task_def_period(m4, PERIOD_JETDUMMY);
soft_task_def_met(m4, WCET_JETDUMMY);
soft_task_def_group(m4, 1);
224,11 → 216,11
if (p4 == -1) {
sys_shutdown_message("Could not create task <jetdummy> errno=%d",
errno);
sys_end();
task_activate(shutdown_task_PID);
}
 
soft_task_default_model(m5);
soft_task_def_level(m5,1);
soft_task_def_level(m5,2);
soft_task_def_period(m5, PERIOD_JETSLIDE);
soft_task_def_met(m5, WCET_JETSLIDE);
soft_task_def_group(m5, 1);
238,7 → 230,7
if (p5 == -1) {
sys_shutdown_message("Could not create task <jetslide> errno=%d",
errno);
sys_end();
task_activate(shutdown_task_PID);
}
}