Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1004 → Rev 1003

/shark/trunk/modules/intdrive/inttask.c
File deleted
\ No newline at end of file
/shark/trunk/modules/intdrive/intdrive/inttask.h
File deleted
/shark/trunk/modules/intdrive/intdrive/intdrive.h
49,7 → 49,7
 
#define INTDRIVE_CHECK_WCET 1
 
LEVEL INTDRIVE_register_level(TIME capacity, TIME q_theta, int U, int flags);
LEVEL INTDRIVE_register_level(TIME capacity, TIME replenish_period, int flag);
 
/*+ Returns the used bandwidth of a level +*/
bandwidth_t INTDRIVE_usedbandwidth(LEVEL l);
/shark/trunk/modules/intdrive/intdrive.c
262,7 → 262,7
kern_gettime(&acttime);
SUBTIMESPEC(&acttime, &(lev->act_time), &time);
delta_time = TIMESPEC2USEC(&time);
mul32div32to32(delta_time, (MAX_BANDWIDTH-lev->U), MAX_BANDWIDTH, delta_capacity);
mul32div32to32(delta_time, (1-lev->U), MAX_BANDWIDTH, delta_capacity);
lev->avail -= delta_capacity;
//lev->avail -= TIMESPEC2USEC(&time);
337,7 → 337,7
/* Registration functions */
 
/*+ Registration function: +*/
LEVEL INTDRIVE_register_level(TIME capacity, TIME q_theta, int U, int flags)
LEVEL INTDRIVE_register_level(TIME capacity, TIME replenish_period, int flags)
{
LEVEL l; /* the level that we register */
INTDRIVE_level_des *lev;
363,16 → 363,15
NULL_TIMESPEC(&(lev->act_time));
 
lev->capacity = capacity;
//lev->replenish_period = replenish_period;
lev->replenish_timer = NIL;
//lev->wcet_timer = NIL;
lev->flags = flags;
lev->act_number = 0;
lev->avail = 0;
lev->q_theta = q_theta;
mul32div32to32(MAX_BANDWIDTH,U,10000,lev->U);
lev->q_theta = capacity;
mul32div32to32(MAX_BANDWIDTH,lev->capacity,replenish_period,lev->U);
//!!!calcolare parametro
intdrive_taskinit(10000);
 
return l;
}
 
/shark/trunk/modules/intdrive/subdir.mk
1,0 → 0,0
OBJS += intdrive/intdrive.o intdrive/inttask.o
OBJS += intdrive/intdrive.o