Compare commits
1 Commits
master
...
submit/sta
Author | SHA1 | Date | |
---|---|---|---|
|
47fa09f728 |
|
@ -1261,7 +1261,7 @@ ephyrPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
|
||||||
|
|
||||||
/* Mouse calls */
|
/* Mouse calls */
|
||||||
|
|
||||||
static Status
|
static int
|
||||||
MouseInit(KdPointerInfo * pi)
|
MouseInit(KdPointerInfo * pi)
|
||||||
{
|
{
|
||||||
pi->driverPrivate = (EphyrPointerPrivate *)
|
pi->driverPrivate = (EphyrPointerPrivate *)
|
||||||
|
@ -1283,7 +1283,7 @@ MouseInit(KdPointerInfo * pi)
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Status
|
static int
|
||||||
MouseEnable(KdPointerInfo * pi)
|
MouseEnable(KdPointerInfo * pi)
|
||||||
{
|
{
|
||||||
((EphyrPointerPrivate *) pi->driverPrivate)->enabled = TRUE;
|
((EphyrPointerPrivate *) pi->driverPrivate)->enabled = TRUE;
|
||||||
|
@ -1318,7 +1318,7 @@ KdPointerDriver EphyrMouseDriver = {
|
||||||
|
|
||||||
/* Keyboard */
|
/* Keyboard */
|
||||||
|
|
||||||
static Status
|
static int
|
||||||
EphyrKeyboardInit(KdKeyboardInfo * ki)
|
EphyrKeyboardInit(KdKeyboardInfo * ki)
|
||||||
{
|
{
|
||||||
KeySymsRec keySyms;
|
KeySymsRec keySyms;
|
||||||
|
@ -1349,7 +1349,7 @@ EphyrKeyboardInit(KdKeyboardInfo * ki)
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Status
|
static int
|
||||||
EphyrKeyboardEnable(KdKeyboardInfo * ki)
|
EphyrKeyboardEnable(KdKeyboardInfo * ki)
|
||||||
{
|
{
|
||||||
((EphyrKbdPrivate *) ki->driverPrivate)->enabled = TRUE;
|
((EphyrKbdPrivate *) ki->driverPrivate)->enabled = TRUE;
|
||||||
|
|
|
@ -52,8 +52,6 @@
|
||||||
#define KD_DPMS_POWERDOWN 3
|
#define KD_DPMS_POWERDOWN 3
|
||||||
#define KD_DPMS_MAX KD_DPMS_POWERDOWN
|
#define KD_DPMS_MAX KD_DPMS_POWERDOWN
|
||||||
|
|
||||||
#define Status int
|
|
||||||
|
|
||||||
typedef struct _KdCardInfo {
|
typedef struct _KdCardInfo {
|
||||||
struct _KdCardFuncs *cfuncs;
|
struct _KdCardFuncs *cfuncs;
|
||||||
void *closure;
|
void *closure;
|
||||||
|
@ -169,8 +167,8 @@ typedef struct _KdPointerInfo KdPointerInfo;
|
||||||
|
|
||||||
typedef struct _KdPointerDriver {
|
typedef struct _KdPointerDriver {
|
||||||
const char *name;
|
const char *name;
|
||||||
Status(*Init) (KdPointerInfo *);
|
int (*Init) (KdPointerInfo *);
|
||||||
Status(*Enable) (KdPointerInfo *);
|
int (*Enable) (KdPointerInfo *);
|
||||||
void (*Disable) (KdPointerInfo *);
|
void (*Disable) (KdPointerInfo *);
|
||||||
void (*Fini) (KdPointerInfo *);
|
void (*Fini) (KdPointerInfo *);
|
||||||
struct _KdPointerDriver *next;
|
struct _KdPointerDriver *next;
|
||||||
|
|
Loading…
Reference in New Issue