Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 540 → Rev 539

/shark/trunk/drivers/linuxc26/videodev.c
File deleted
/shark/trunk/drivers/linuxc26/linuxcomp.c
354,12 → 354,6
 
}
 
loff_t no_llseek(struct file *file, loff_t offset, int origin) {
 
return 0;
 
}
 
void *vmalloc(unsigned long size) {
 
return malloc(size);
/shark/trunk/drivers/linuxc26/shark_glue.c
2,12 → 2,9
#include <stdlib.h>
#include <kernel/func.h>
#include <ll/sys/ll/event.h>
#include <ll/i386/pic.h>
 
#include <linuxcomp.h>
 
//#define DEBUG_SHARK_GLUE
 
PID intr_server = NIL;
 
#define MAX_INT_LIST 50
85,10 → 82,8
 
no = get_interrupt_job();
 
if (no != -1 && no < 16) {
if (no != -1 && no < 16)
linux_intr(no);
irq_unmask(no);
}
 
if (no != -1 && no >= 16) {
linux_timer(no);
147,10 → 142,6
 
int no = (int)arg,res;
 
#ifdef DEBUG_SHARK_GLUE
cprintf("(Timer Exe)");
#endif
 
timer_table[no] = -2;
 
res = add_interrupt_job(no);
166,10 → 157,6
 
f = kern_fsave();
 
#ifdef DEBUG_SHARK_GLUE
cprintf("(Timer Set)");
#endif
 
i = get_free_timer_slot();
 
if (i == -1) {
204,10 → 191,6
return -1;
}
 
#ifdef DEBUG_SHARK_GLUE
cprintf("(Timer Del)");
#endif
 
if (timer_table[index] != -1 && timer_table[index] != -2) {
 
int_func_table[index] = NULL;
228,14 → 211,9
 
void fast_call_intr(int no)
{
 
int res;
 
#ifdef DEBUG_SHARK_GLUE
cprintf("(Int Exe)");
#endif
 
irq_mask(no);
 
res = add_interrupt_job(no);
if (intr_server != NIL && res == 0)
task_activate(intr_server);
/shark/trunk/drivers/linuxc26/makefile
11,7 → 11,7
OBJS_PATH = $(BASE)/drivers/linuxc26
 
OBJS = bus.o linuxcomp.o core.o driver.o vsprintf.o interface.o kobject.o\
shark_linuxc26.o shark_glue.o class.o videodev.o\
shark_linuxc26.o shark_glue.o class.o\
int.o timer.o cmdline.o video-buf.o
 
C_OPT += -I../linuxc26/include