Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1393 → Rev 1394

/demos/trunk/advtimer/initfile.c
58,6 → 58,14
#define INTDRIVE_T 10000
#define INTDRIVE_FLAGS 0
 
void call_shutdown_task(void *arg);
int device_drivers_init();
int device_drivers_close();
void set_shutdown_task();
TASK shutdown_task_body(void *arg);
 
PID shutdown_task_PID = -1;
 
TIME __kernel_register_levels__(void *arg)
{
struct multiboot_info *mb = (struct multiboot_info *)arg;
81,8 → 89,88
 
HARTPORT_init();
 
/* Create the shutdown task. It will be activated at RUNLEVEL
SHUTDOWN */
set_shutdown_task();
 
/* Init the drivers */
device_drivers_init();
 
/* Set the shutdown task activation */
sys_atrunlevel(call_shutdown_task, NULL, RUNLEVEL_SHUTDOWN);
 
__call_main__(mb);
 
return (void *)0;
}
 
void set_shutdown_task() {
 
/* WARNING: the shutdown task is a background thread. It cannot execute
if the system is overloaded */
NRT_TASK_MODEL nrt;
 
nrt_task_default_model(nrt);
nrt_task_def_system(nrt);
 
shutdown_task_PID = task_create("Shutdown Task",shutdown_task_body,&nrt,NULL);
if (shutdown_task_PID == NIL) {
sys_shutdown_message("Error: Cannot create shutdown task\n");
sys_end();
}
 
}
 
int device_drivers_init() {
 
KEYB_PARMS kparms = BASE_KEYB;
LINUXC26_register_module();
 
INPUT26_init();
 
keyb_def_ctrlC(kparms, NULL);
 
KEYB26_init(&kparms);
 
return 0;
 
}
 
int device_drivers_close() {
KEYB26_close();
INPUT26_close();
return 0;
}
 
#define SHUTDOWN_TIMEOUT_SEC 3
 
void call_shutdown_task(void *arg)
{
struct timespec t;
 
sys_gettime(&t);
t.tv_sec += SHUTDOWN_TIMEOUT_SEC;
 
/* Emergency timeout to exit from RUNLEVEL_SHUTDOWN */
kern_event_post(&t,(void *)((void *)sys_abort_shutdown),(void *)0);
 
task_activate(shutdown_task_PID);
}
 
TASK shutdown_task_body(void *arg) {
 
device_drivers_close();
 
sys_shutdown_message("-- S.Ha.R.K. Closed --\n");
 
sys_abort_shutdown(0);
 
return NULL;
 
}
 
/demos/trunk/advtimer/advtimer.c
40,8 → 40,6
#include "ll/i386/cons.h"
#include "ll/i386/advtimer.h"
 
#include "drivers/shark_linuxc26.h"
#include "drivers/shark_input26.h"
#include "drivers/shark_keyb26.h"
 
#define UPDATE_PERIOD 10000
50,40 → 48,6
extern unsigned int clk_per_msec;
extern unsigned int apic_clk_per_msec;
 
volatile int shark_running = 1;
 
int device_drivers_close()
{
KEYB26_close();
INPUT26_close();
 
return 0;
}
 
int device_drivers_init()
{
 
KEYB_PARMS kparms = BASE_KEYB;
 
LINUXC26_register_module();
 
INPUT26_init();
 
KEYB26_init(&kparms);
 
return 0;
 
}
 
void program_key_end(KEY_EVT *k)
{
 
shark_running = 0;
 
}
 
TASK Update(void *arg)
{
struct timespec actual_timer;
155,13 → 119,19
void set_screen()
{
 
clear();
 
printf_xy(20,0,WHITE," Advanced Timer Demo ");
printf_xy(20,1,WHITE,"Giacomo Guidi <giacomo@gandalf.sssup.it>");
printf_xy(20,2,WHITE," Press Alt + c to exit ");
}
 
void program_key_end(KEY_EVT* e)
{
sys_end();
}
int main(int argc, char **argv)
{
169,8 → 139,6
PID update;
KEY_EVT k;
device_drivers_init();
k.flag = ALTL_BIT;
k.scan = KEY_C;
k.ascii = 'c';
188,12 → 156,6
update = task_create("Update", Update, &mp, NULL);
if (update != NIL) task_activate(update);
 
while(shark_running);
 
device_drivers_close();
 
sys_end();
 
return 0;
 
}