Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 80 → Rev 819

/shark/tags/rel_0_4/drivers/char/8042.h
20,11 → 20,11
 
/**
------------
CVS : $Id: 8042.h,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: 8042.h,v 1.2 2003-03-13 13:49:53 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-13 13:49:53 $
------------
 
8042.h
63,6 → 63,10
#ifndef __8042_H__
#define __8042_H__
 
#include "ll/sys/cdefs.h"
 
__BEGIN_DECLS
 
#define C8042_KEYBOARDIRQ 1
#define C8042_PS2IRQ 12
 
213,6 → 217,7
need
*/
 
__END_DECLS
#endif
 
 
/shark/tags/rel_0_4/drivers/char/sermouse.h
20,11 → 20,11
 
/**
------------
CVS : $Id: sermouse.h,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: sermouse.h,v 1.2 2003-03-13 13:49:53 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-13 13:49:53 $
------------
 
Author: Massimiliano Giorgi
59,7 → 59,10
#define __SERMOUSE_H__
 
#include <drivers/mouse.h>
#include "ll/sys/cdefs.h"
 
__BEGIN_DECLS
 
typedef struct sermouse_info {
int type; /* MSMOUSE, MMMOUSE,... */
int port; /* COM1,COM2,... */
88,4 → 91,5
int M_mm(MOUSE_EVT *evt,unsigned char *data);
int M_logi(MOUSE_EVT *evt,unsigned char *data);
 
__END_DECLS
#endif
/shark/tags/rel_0_4/drivers/char/ps2mouse.h
20,11 → 20,11
 
/**
------------
CVS : $Id: ps2mouse.h,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: ps2mouse.h,v 1.2 2003-03-13 13:49:53 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-13 13:49:53 $
------------
 
Author: Massimiliano Giorgi
59,7 → 59,10
#define __PS2MOUSE_H__
 
#include <drivers/mouse.h>
#include "ll/sys/cdefs.h"
 
__BEGIN_DECLS
 
extern int C8042_ps2mousepresent(void);
#define ps2mouse_present() C8042_ps2mousepresent()
 
75,4 → 78,5
 
extern int M_ps2(MOUSE_EVT *evt, unsigned char *data);
 
__END_DECLS
#endif
/shark/tags/rel_0_4/drivers/char/_mouse.h
20,11 → 20,11
 
/**
------------
CVS : $Id: _mouse.h,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: _mouse.h,v 1.2 2003-03-13 13:49:53 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-13 13:49:53 $
------------
 
_mouse.h
52,7 → 52,10
 
#ifndef ___MOUSE_H__
#define ___MOUSE_H__
#include "ll/sys/cdefs.h"
 
__BEGIN_DECLS
 
/* "virtual operations" on a mouse */
struct mouse_operations {
char *name; /* name! */
134,6 → 137,7
/* (to not declare saved_x & saved_y public) */
void _mouse_getsavedposition(int *xptr, int *yptr);
 
__END_DECLS
#endif
 
 
/shark/tags/rel_0_4/drivers/char/makefile
3,6 → 3,7
ifndef BASE
BASE=../..
endif
 
include $(BASE)/config/config.mk
 
LIBRARY = hdev
/shark/tags/rel_0_4/drivers/char/mcurgrx.c
20,11 → 20,11
 
/**
------------
CVS : $Id: mcurgrx.c,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: mcurgrx.c,v 1.2 2003-02-28 11:11:04 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-02-28 11:11:04 $
------------
 
Author: Massimiliano Giorgi
153,7 → 153,7
int mouse_grxshape(BYTE *shapeptr, BYTE *maskptr)
{
int result;
vga_modeinfo info;
grx_vga_modeinfo info;
int nb;
BYTE b;
int pc;
/shark/tags/rel_0_4/drivers/char/scom.c
20,11 → 20,11
 
/**
------------
CVS : $Id: scom.c,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: scom.c,v 1.2 2003-01-07 17:14:05 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-01-07 17:14:05 $
------------
 
Author: Massimiliano Giorgi
482,7 → 482,6
task_activate(p3);
task_endcycle();
sys_end();
sys_status(NORM_STATUS);
#ifdef __DEBUG_SERIAL__
cprintf("RxServer was activated %d times\n",rx_time);
cprintf("TxServer was activated %d times\n",tx_time);
/shark/tags/rel_0_4/drivers/char/sermouse.c
20,11 → 20,11
 
/**
------------
CVS : $Id: sermouse.c,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: sermouse.c,v 1.2 2002-11-11 08:41:31 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2002-11-11 08:41:31 $
------------
 
Author: Gerardo Lamastra
84,6 → 84,7
//#include <cons.h>
 
#include <kernel/kern.h>
#include <time.h>
//#include "sys/sys.h"
//#include "vm.h"
//#include "kern.h"
405,15 → 406,19
int port;
int ret;
int found;
struct timespec delay;
 
delay.tv_sec = 0;
delay.tv_nsec = 500000000;
 
found=0;
for (port=COM1;port<=COM4;port++) {
ret=com_open(port,1200,NONE,7,1);
if (ret==1) {
com_write(port,MCR,0x0e);
task_delay(500000l); /* necessary? */
nanosleep(&delay,NULL); /* necessary? */
com_write(port,MCR,0x0f);
task_delay(500000l); /* necessary? */
nanosleep(&delay,NULL); /* necessary? */
ret=sem_wait(&com_link[mouse_port].rx_sem);
if (ret==TRUE) {
if (*(com_link[mouse_port].rx_buf)=='M') found=1;
/shark/tags/rel_0_4/drivers/char/rtc.c
20,11 → 20,11
 
/**
------------
CVS : $Id: rtc.c,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: rtc.c,v 1.2 2002-11-11 08:41:31 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2002-11-11 08:41:31 $
------------
 
Author: Massimiliano Giorgi
183,7 → 183,7
SYS_FLAGS flags;
unsigned char ctrl;
unsigned retries=0;
unsigned delay;
struct timespec delay;
 
/*
* read RTC once any update in progress is done. The update
201,8 → 201,9
barrier();
*/
 
delay=1000;
while (rtc_is_updating()&&++retries<=5) task_delay(delay);
delay.tv_nsec = 1000000;
delay.tv_sec = 0;
while (rtc_is_updating()&&++retries<=5) nanosleep(&delay, NULL);
if (retries>5) return -1;
 
/*
/shark/tags/rel_0_4/drivers/char/8042.c
20,11 → 20,11
 
/**
------------
CVS : $Id: 8042.c,v 1.1.1.1 2002-03-29 14:12:49 pj Exp $
CVS : $Id: 8042.c,v 1.2 2002-11-11 08:41:31 pj Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:49 $
Revision: $Revision: 1.2 $
Last update: $Date: 2002-11-11 08:41:31 $
------------
 
8042.h
348,7 → 348,7
static int C8042_reset(void)
{
int c;
int c=0;
int retries=16;
 
trace("8042 reset START");