Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1373 → Rev 1372

/demos/trunk/astro/rock.c
17,8 → 17,6
int kill_rock;
rock_pos rocks[ROCK_NMAX];
 
extern volatile int shark_running;
 
void draw_rock(int x, int y, int r, int c)
{
sem_wait(&mx_grf);
271,8 → 269,9
soft_task_def_usemath(ms);
pid_RC = task_create("RockCreator", rock_creator, &ms, NULL);
if (pid_RC == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <RockCreator>");
shark_running = 0;
sys_end();
} else
task_activate(pid_RC);
}
/demos/trunk/astro/astro.c
24,8 → 24,6
 
rock_ini rock_new;
 
extern volatile int shark_running;
 
TASK shot(int i)
{
int x, y; /* shot graphic position */
373,8 → 371,9
soft_task_def_usemath(ms);
pid = task_create("Astro", astro, &ms, NULL);
if (pid == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <astro>");
shark_running = 0;
sys_end();
} else
task_activate(pid);
 
385,8 → 384,9
hard_task_def_usemath(mp);
pid = task_create("Taken", look, &mp, NULL);
if (pid == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Taken>");
shark_running = 0;
sys_end();
} else
task_activate(pid);
 
400,8 → 400,9
hard_task_def_usemath(mp);
pid_TL = task_create("TurnLeft", turn, &mp, NULL);
if (pid_TL == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Turn L>");
shark_running = 0;
sys_end();
}
 
incr = - ASTRO_GRAD_INC;
414,8 → 415,9
hard_task_def_usemath(mp);
pid_TR = task_create("TurnRight", turn, &mp, NULL);
if (pid_TR == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Turn R>");
shark_running = 0;
sys_end();
}
 
incr = ASTRO_VEL_INC;
428,8 → 430,9
hard_task_def_usemath(mp);
pid_SU = task_create("SpeedUP", speed, &mp, NULL);
if (pid_SU == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Speed UP>");
shark_running = 0;
sys_end();
}
 
incr = - ASTRO_VEL_INC;
442,8 → 445,9
hard_task_def_usemath(mp);
pid_SD = task_create("SpeedDOWN", speed, &mp, NULL);
if (pid_SD == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Speed DOWN>");
shark_running = 0;
sys_end();
}
 
incr = 0;
456,8 → 460,9
hard_task_def_usemath(mp);
pid_SZ = task_create("SpeedZERO", speed, &mp, NULL);
if (pid_SZ == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Speed ZERO>");
shark_running = 0;
sys_end();
}
 
hard_task_default_model(mp);
467,8 → 472,9
hard_task_def_usemath(mp);
pid = task_create("MoveAstro", move, &mp, NULL);
if (pid == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <MoveAstro>");
shark_running = 0;
sys_end();
} else
task_activate(pid);
 
483,8 → 489,9
hard_task_def_usemath(mp);
pid_FL = task_create("FlipAstro", turn, &mp, NULL);
if (pid_FL == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <Flip Astro>");
shark_running = 0;
sys_end();
}
#endif
}
/demos/trunk/astro/stat.c
19,8 → 19,6
int lives; /* current player lives */
int crash; /* astro vs. rock */
 
extern volatile int shark_running;
 
TASK stat_write()
{
char st[20];
130,8 → 128,9
soft_task_def_usemath(ms);
pid = task_create("StatWrite", stat_write, &ms, NULL);
if (pid == NIL) {
FB26_close(FRAME_BUFFER_DEVICE);
perror("Could not create task <StatWrite>");
shark_running = 0;
sys_end();
} else
task_activate(pid);
}
/demos/trunk/astro/initfile.c
10,6 → 10,7
* http://hartik.sssup.it
*/
 
#include "asteroid.h"
#include "kernel/kern.h"
#include "modules/edf.h"
#include "modules/hardcbs.h"
17,8 → 18,9
#include "modules/dummy.h"
#include "modules/intdrive.h"
 
#include "modules/sem.h"
#include "modules/hartport.h"
#include <drivers/shark_linuxc26.h>
#include <drivers/shark_input26.h>
#include <drivers/shark_keyb26.h>
 
/*+ sysyem tick in us +*/
#define TICK 0
31,6 → 33,16
#define INTDRIVE_T 10000
#define INTDRIVE_FLAG 0
 
void my_close(void *arg)
{
 
KEYB26_close();
INPUT26_close();
kern_printf("S.Ha.R.K. closed.\n\n");
 
}
 
TIME __kernel_register_levels__(void *arg)
{
struct multiboot_info *mb = (struct multiboot_info *)arg;
50,8 → 62,18
{
struct multiboot_info *mb = (struct multiboot_info *)arg;
 
KEYB_PARMS kparms = BASE_KEYB;
 
keyb_def_ctrlC(kparms, NULL);
 
HARTPORT_init();
 
LINUXC26_register_module();
INPUT26_init();
KEYB26_init(&kparms);
 
sys_atrunlevel(my_close, NULL, RUNLEVEL_BEFORE_EXIT);
 
__call_main__(mb);
 
return (void *)0;
/demos/trunk/astro/asteroid.c
16,8 → 16,6
sem_t mx_mat, mx_grf, mx_pos, mx_vel, mx_xy, mx_rk, mx_rn; /* mutex semaphores */
sem_t mx_st_nrg, mx_st_scr, mx_st_kil, mx_st_liv; /* mutex semaphores */
 
volatile int shark_running = 1;
 
double dist_xy(int x1, int y1, int x2, int y2)
{
double dst;
65,54 → 63,16
 
void end_func(KEY_EVT *k) {
 
shark_running = 0;
 
}
 
int device_drivers_close() {
 
FB26_close(FRAME_BUFFER_DEVICE);
sys_end();
 
KEYB26_close();
INPUT26_close();
 
return 0;
 
}
 
int device_drivers_init() {
 
KEYB_PARMS kparms = BASE_KEYB;
LINUXC26_register_module();
 
PCI26_init();
 
INPUT26_init();
 
keyb_def_ctrlC(kparms, NULL);
 
KEYB26_init(&kparms);
 
FB26_init();
FB26_open(FRAME_BUFFER_DEVICE);
FB26_use_grx(FRAME_BUFFER_DEVICE);
FB26_setmode(FRAME_BUFFER_DEVICE,"640x480-16");
return 0;
 
}
 
int main(int argc, char **argv)
{
KEY_EVT k;
TIME seme;
 
device_drivers_init();
 
k.flag = CNTR_BIT;
k.scan = KEY_C;
k.ascii = 'c';
140,6 → 100,14
seme = sys_gettime(NULL);
srand(seme);
 
FB26_init();
 
FB26_open(FRAME_BUFFER_DEVICE);
 
FB26_use_grx(FRAME_BUFFER_DEVICE);
 
FB26_setmode(FRAME_BUFFER_DEVICE,"640x480-16");
 
frame_main();
 
init_stat();
146,12 → 114,5
init_astro();
init_rock();
 
while(shark_running);
 
device_drivers_close();
 
sys_end();
 
return 0;
 
}
/demos/trunk/astro/asteroid.h
16,9 → 16,6
#include "modules/sem.h"
#include "modules/hartport.h"
 
#include <drivers/shark_pci26.h>
#include <drivers/shark_linuxc26.h>
#include <drivers/shark_input26.h>
#include <drivers/shark_keyb26.h>
#include <drivers/shark_fb26.h>