Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1014 → Rev 1015

/shark/trunk/drivers/input/keyboard/atkbd.c
734,8 → 734,11
__setup("atkbd_reset", atkbd_setup_reset);
#endif
 
int __init atkbd_init(void)
int __init atkbd_init(int soft)
{
/* S.Ha.R.K. stuff */
atkbd_softrepeat = soft;
 
serio_register_device(&atkbd_dev);
return 0;
}
/shark/trunk/drivers/input/include/drivers/shark_keyb26.h
94,6 → 94,7
TASK_MODEL *tm;
unsigned char keymap;
void (*ctrlcfunc)(KEY_EVT *k);
int softrepeat;
} KEYB_PARMS;
 
#define KEYB_DEFAULT ((unsigned long)(-1)) /*+ used for default params +*/
100,15 → 101,18
 
#define BASE_KEYB {(TASK_MODEL *)KEYB_DEFAULT, \
(unsigned char)KEYB_DEFAULT, \
(void *)KEYB_DEFAULT}
(void *)KEYB_DEFAULT, \
(int) KEYB_DEFAULT}
 
#define keyb_default_parm(m) (m).tm = (TASK_MODEL *) KEYB_DEFAULT, \
(m).keymap = (unsigned char) KEYB_DEFAULT, \
(m).ctrlcfunc = (void *) KEYB_DEFAULT
(m).ctrlcfunc = (void *) KEYB_DEFAULT, \
(m).softrepeat = (int) KEYB_DEFAULT
 
#define keyb_def_map(s,m) (s).keymap = (m)
#define keyb_def_ctrlC(s,f) (s).ctrlcfunc = (f)
#define keyb_def_task(s,m) (s).tm = (TASK_MODEL *)(m)
#define keyb_def_srepeat(s,r) (s).softrepeat = (r)
 
int KEYB26_installed(void);
int KEYB26_init(KEYB_PARMS *s);
/shark/trunk/drivers/input/shark/shark_keyb.c
30,7 → 30,7
#include "../include/drivers/shark_keyb26.h"
 
/* Devices */
extern int atkbd_init(void);
extern int atkbd_init(int soft);
extern int atkbd_exit(void);
 
/* Handlers */
531,7 → 531,12
return -1;
}
 
status = atkbd_init();
if (s->softrepeat == (int) KEYB_DEFAULT) {
status = atkbd_init(1);
} else {
status = atkbd_init(s->softrepeat);
}
if (status) {
printk(KERN_ERR "shark_keyb.c: AtKbd_Init return: %d\n", status);
port_delete (pkeyPort);