Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1314 → Rev 1315

/demos/trunk/mesaref/mesaref.c
16,7 → 16,7
* http://shark.sssup.it
*/
 
#include <drivers/vga.h>
#include <drivers/glib.h>
#include <drivers/keyb.h>
 
#include <GL/osmesa.h>
38,8 → 38,6
#define WIDTH 640
#define HEIGHT 480
#define BYTES_PP 2 //BytesPerPixel
#define INITSTR G640x480x64K //SVGAlib standard mode definitions
#define CARD VESA //Video driver
 
#define DEG2RAD (3.14159/180.0)
 
373,29 → 371,23
 
}
 
static int screen(int mode)
static int screen()
{
 
vga_modeinfo *minf;
 
vga_setmode(mode,CARD);
minf = vga_getmodeinfo(mode);
if(! (minf->flags & CAPABLE_LINEAR)){
vga_setmode(TEXT,CARD);
printk(KERN_INFO "The mode %d is not capable of linear\n",mode);
return 1;
extern DWORD flbaddr;
/* graphic card Initialization */
if (grx_init() < 1) {
sys_abort(1);
}
vga_setpage(0);
if(vga_setlinearaddressing() == -1) {
vga_setmode(TEXT,CARD);
printk(KERN_INFO "Could not set linear addressing for mode %d\n",mode);
return 1;
if (grx_open(640, 480, 16) < 0) {
cprintf("GRX Err\n");
sys_abort(1);
}
video_buf = vga_getgraphmem();
grx_setbuffer(rgb_565_buf, WIDTH, HEIGHT); //Init of RGB16 version of grx functions
//created to work with Mesa buffer
video_buf = (unsigned char *)flbaddr;
 
return 0;
}
406,7 → 398,7
OSMesaDestroyContext(ctx);
free(rgb_565_buf);
 
vga_setmode(TEXT,CARD);
grx_close();
 
sys_end();
 
424,7 → 416,7
 
while(1) {
 
copy_videomem_16to16(rgb_565_buf, video_buf, VMEMLONG);
memcpy(rgb_565_buf, video_buf, RGB565MEM);
task_endcycle();
 
}
512,7 → 504,7
gl_init();
if (screen(INITSTR)) {
if (screen()) {
printk(KERN_INFO "Graphical initialization failed !!\n");
sys_end();
}
/demos/trunk/mesaref/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
mesaref:
make -f $(SUBMAKE) APP=mesaref INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __PNG__ __OLDCHAR__ __SVGA__"
make -f $(SUBMAKE) APP=mesaref INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __PNG__ __OLDCHAR__ __GRX__"
 
/demos/trunk/mesatex/mesatex.c
16,7 → 16,7
* http://shark.sssup.it
*/
 
#include <drivers/vga.h>
#include <drivers/glib.h>
#include <drivers/keyb.h>
 
#include <GL/osmesa.h>
35,8 → 35,6
#define WIDTH 640
#define HEIGHT 480
#define BYTES_PP 2 //BytesPerPixel
#define INITSTR G640x480x64K //SVGAlib standard mode definitions
#define CARD VESA //Video driver
 
OSMesaContext ctx;
 
123,7 → 121,6
static void gl_init()
{
 
static GLfloat h = (GLfloat) HEIGHT / (GLfloat) WIDTH;
static int twidth=8, theight=8;
static GLubyte tex1[] = {
0, 0, 0, 0, 0, 0, 0, 0,
253,29 → 250,23
 
}
 
static int screen(int mode)
static int screen()
{
 
vga_modeinfo *minf;
 
vga_setmode(mode,CARD);
minf = vga_getmodeinfo(mode);
if(! (minf->flags & CAPABLE_LINEAR)){
vga_setmode(TEXT,CARD);
printk(KERN_INFO "The mode %d is not capable of linear\n",mode);
return 1;
extern DWORD flbaddr;
/* graphic card Initialization */
if (grx_init() < 1) {
sys_abort(1);
}
vga_setpage(0);
if(vga_setlinearaddressing() == -1) {
vga_setmode(TEXT,CARD);
printk(KERN_INFO "Could not set linear addressing for mode %d\n",mode);
return 1;
if (grx_open(640, 480, 16) < 0) {
cprintf("GRX Err\n");
sys_abort(1);
}
video_buf = vga_getgraphmem();
video_buf = (unsigned char *)flbaddr;
 
grx_setbuffer(rgb_565_buf, WIDTH, HEIGHT); //Init of RGB16 version of grx functions
//created to work with Mesa buffer
return 0;
}
286,7 → 277,7
OSMesaDestroyContext(ctx);
free(rgb_565_buf);
 
vga_setmode(TEXT,CARD);
grx_close();
 
sys_end();
 
304,7 → 295,7
 
while(1) {
 
copy_videomem_16to16(rgb_565_buf, video_buf, VMEMLONG);
memcpy(rgb_565_buf, video_buf, RGB565MEM);
task_endcycle();
 
}
393,7 → 384,7
gl_init();
if (screen(INITSTR)) {
if (screen()) {
printk(KERN_INFO "Graphical initialization failed !!\n");
sys_end();
}
/demos/trunk/mesatex/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
mesatex:
make -f $(SUBMAKE) APP=mesatex INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__ __SVGA__"
make -f $(SUBMAKE) APP=mesatex INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__ __GRX__"
 
/demos/trunk/mpegstar/initfile.c
65,7 → 65,7
EDF_register_level(EDF_ENABLE_ALL);
POSIX_register_level(RRTICK, 1, mb, 32);
grubstar_level = GRUBSTAR_register_level(FSF_MAX_N_SERVERS, 0);
FSF_register_module(grubstar_level);
FSF_register_module(grubstar_level,4080218930UL);
dummy_register_level();
CBS_register_level(CBS_ENABLE_ALL,0);
/demos/trunk/mesademo/mesademo.c
300,7 → 300,7
 
while(1) {
 
memcpy(video_buf, rgb_565_buf, RGB565MEM);
memcpy(rgb_565_buf, video_buf, RGB565MEM);
task_endcycle();
 
}
/demos/trunk/kalm3d/kalm3d.c
281,8 → 281,6
 
char text[100];
TIME disegna_TIME, carrello_TIME;
static unsigned long int count = WIDTH * HEIGHT / 2;
 
pr_x = port_connect("porta1",sizeof(float),STICK,READ);
pr_th = port_connect("porta2",sizeof(float),STICK,READ);
306,7 → 304,7
sprintf(text,"Hard Task Draw PER:%6d us EX:%6d us",(int)PERIOD_DISEGNA,(int)disegna_TIME);
grx_text(text,10,15,rgb16(0,0,255),rgb16(255,255,255));
memcpy(vbuf,buffers,count);
memcpy(buffers,vbuf,WIDTH*HEIGHT*BYTES_PP);
 
task_endcycle();
 
/demos/trunk/oldload/initfile.c
63,7 → 63,7
EDF_register_level(EDF_ENABLE_ALL);
POSIX_register_level(RRTICK, 1, mb, 32);
grubstar_level = GRUBSTAR_register_level(FSF_MAX_N_SERVERS, 0);
FSF_register_module(grubstar_level);
FSF_register_module(grubstar_level,4080218930UL);
dummy_register_level();
CBS_register_level(CBS_ENABLE_ALL,0);