Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1359 → Rev 1360

/demos/trunk/advtimer/initfile.c
6,7 → 6,7
* Paolo Gai <pj@gandalf.sssup.it>
*
* Authors :
* Paolo Gai <pj@gandalf.sssup.it>
* Giacomo Guidi <giacomo@gandalf.sssup.it>
* (see the web pages for full authors list)
*
* ReTiS Lab (Scuola Superiore S.Anna - Pisa - Italy)
17,39 → 17,6
*/
 
/*
------------
CVS : $Id: initfile.c,v 1.1 2003-04-23 09:15:48 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.1 $
Last update: $Date: 2003-04-23 09:15:48 $
------------
 
System initialization file
 
This file contains the 2 functions needed to initialize the system.
 
These functions register the following levels:
 
an EDF (Earliest Deadline First) level
a RR (Round Robin) level
a CBS (Costant Bandwidth Server) level
a Dummy level
 
It can accept these task models:
 
HARD_TASK_MODEL (wcet+mit) at level 0
SOFT_TASK_MODEL (met, period) at level 1
NRT_TASK_MODEL at level 2
 
This file is similar to the configuration of kernel/init/hartik3.c
 
TICK is set to 0 (one-shot timer is used)
*/
 
/*
* Copyright (C) 2000 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
63,12 → 30,12
* 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
*
*/
 
#include "kernel/kern.h"
#include "modules/intdrive.h"
#include "modules/edf.h"
#include "modules/cbs.h"
#include "modules/hardcbs.h"
#include "modules/rr.h"
#include "modules/dummy.h"
 
76,9 → 43,10
#include "modules/hartport.h"
#include "modules/cabs.h"
 
#include "drivers/keyb.h"
#include "drivers/shark_linuxc26.h"
#include "drivers/shark_input26.h"
#include "drivers/shark_keyb26.h"
 
 
/*+ sysyem tick in us +*/
#define TICK 1000
 
85,12 → 53,18
/*+ RR tick in us +*/
#define RRTICK 10000
 
/*+ IntDrive Server +*/
#define INTDRIVE_Q 1000
#define INTDRIVE_T 10000
#define INTDRIVE_FLAGS 0
 
TIME __kernel_register_levels__(void *arg)
{
struct multiboot_info *mb = (struct multiboot_info *)arg;
 
INTDRIVE_register_level(INTDRIVE_Q, INTDRIVE_T, INTDRIVE_FLAGS);
EDF_register_level(EDF_ENABLE_ALL);
CBS_register_level(CBS_ENABLE_ALL, 0);
HCBS_register_level(HCBS_ENABLE_ALL, 1);
RR_register_level(RRTICK, RR_MAIN_YES, mb);
dummy_register_level();
 
101,6 → 75,14
return TICK;
}
 
void shark_close(void *arg)
{
 
KEYB26_close();
INPUT26_close();
 
}
 
TASK __init__(void *arg)
{
struct multiboot_info *mb = (struct multiboot_info *)arg;
109,12 → 91,14
 
HARTPORT_init();
 
keyb_def_ctrlC(kparms, NULL);
keyb_def_map(kparms,itaMap);
KEYB_init(&kparms);
LINUXC26_register_module();
INPUT26_init();
KEYB26_init(&kparms);
 
sys_atrunlevel(shark_close, NULL, RUNLEVEL_BEFORE_EXIT);
 
__call_main__(mb);
 
return (void *)0;
return NULL;
}
 
/demos/trunk/advtimer/advtimer.c
16,8 → 16,6
*/
 
/*
* Copyright (C) 2000 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
42,7 → 40,7
#include "ll/i386/cons.h"
#include "ll/i386/advtimer.h"
 
#include "drivers/keyb.h"
#include "drivers/shark_keyb26.h"
 
#define UPDATE_PERIOD 10000
#define UPDATE_WCET 1000
147,7 → 145,8
k.flag = ALTL_BIT;
k.scan = KEY_C;
k.ascii = 'c';
keyb_hook(k,program_key_end);
k.status = KEY_PRESSED;
keyb_hook(k,program_key_end,FALSE);
 
set_screen();
/demos/trunk/advtimer/makefile
13,6 → 13,5
 
# Text applications
advtimer:
make -f $(SUBMAKE) APP=advtimer INIT= OTHEROBJS="initfile.o" SHARKOPT="__OLDCHAR__"
make -f $(SUBMAKE) APP=advtimer INIT= OTHEROBJS="initfile.o" SHARKOPT="__LINUXC26__ __NEWPIC__ __INPUT__"