Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1018 → Rev 1017

/shark/trunk/modules/intdrive/intdrive/inttask.h
42,7 → 42,7
__BEGIN_DECLS
 
int add_interrupt_job(int no);
int intdrive_taskinit(int level, int wcet);
int intdrive_taskinit(int wcet);
void set_noint_handler(void * new_handler);
 
__END_DECLS
/shark/trunk/modules/intdrive/intdrive.c
38,7 → 38,6
/* Interrupt Driver Module */
 
#include <intdrive/intdrive/intdrive.h>
#include <intdrive/intdrive/inttask.h>
#include <kernel/model.h>
#include <kernel/descr.h>
#include <kernel/var.h>
189,7 → 188,7
if (proc_table[INTDRIVE_task].wcet < TIMESPEC2USEC(&time)) {
kern_raise(XWCET_VIOLATION,INTDRIVE_task);
}
}
}
 
static void INTDRIVE_public_activate(LEVEL l, PID p, struct timespec *t)
269,7 → 268,7
//lev->avail -= TIMESPEC2USEC(&time);
 
TRACER_LOGEVENT(FTrace_EVT_user_event_0, 0, lev->avail + INT_MAX);
 
#ifdef INTDRIVE_DEBUG
kern_printf("(INTD:AV:%d)",(int)(lev->avail));
#endif
370,9 → 369,9
lev->avail = 0;
lev->q_theta = q_theta;
mul32div32to32(MAX_BANDWIDTH,U,10000,lev->U);
 
//!!!calcolare parametro
intdrive_taskinit(l, 10000);
intdrive_taskinit(10000);
 
return l;
}
/shark/trunk/modules/intdrive/inttask.c
46,7 → 46,7
 
#include <intdrive/intdrive/inttask.h>
 
#define DEBUG_SHARK_GLUE
//#define DEBUG_SHARK_GLUE
 
PID intr_server = NIL;
void (*noint_handler)(int n);
105,42 → 105,25
/* The Interrupt TASK is an aperiodic task designed for
the INTDRIVE module. */
 
void interrupt_job()
TASK Interrupt_Server(void *arg)
{
void (*tmp_fast)(int n);
int no;
 
n_intact++;
 
no = get_interrupt_job();
 
if (no != -1 && no < 16) {
tmp_fast = handler_get_intdrive(no);
(tmp_fast)(no);
irq_unmask(no);
}
 
if (no != -1 && no >= 16) {
(noint_handler)(no);
}
}
 
TASK Interrupt_Server(void *arg)
{
while(1) {
interrupt_job();
n_intact++;
 
task_endcycle();
}
no = get_interrupt_job();
 
}
if (no != -1 && no < 16) {
tmp_fast = handler_get_intdrive(no);
(tmp_fast)(no);
irq_unmask(no);
}
 
TASK Interrupt_Server_Prot(void *arg)
{
while(1) {
task_nopreempt();
interrupt_job();
task_preempt();
if (no != -1 && no >= 16) {
(noint_handler)(no);
}
 
task_endcycle();
}
147,11 → 130,10
 
}
 
int intdrive_taskinit(int level, int wcet)
int intdrive_taskinit(int wcet)
{
HARD_TASK_MODEL ht;
 
 
hard_task_default_model(ht);
hard_task_def_wcet(ht, wcet);
hard_task_def_interrupt(ht);
158,18 → 140,12
hard_task_def_system(ht);
hard_task_def_nokill(ht);
 
if (level >= 0)
intr_server = task_create("Interrupt Server (Protected)",Interrupt_Server_Prot,&ht,NULL);
else
intr_server = task_create("Interrupt Server",Interrupt_Server,&ht,NULL);
 
intr_server = task_create("Interrupt Server",Interrupt_Server,&ht,NULL);
if (intr_server == NIL)
return -1;
 
return 0;
}
 
void set_noint_handler(void * new_handler)
{
noint_handler = new_handler;
}
}