Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a62f0d27
Commit
a62f0d27
authored
May 19, 2010
by
Dmitry Torokhov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Input: psmouse - small formatting changes to better follow coding style
Signed-off-by:
Dmitry Torokhov
<
dtor@mail.ru
>
parent
83ba9ea8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
95 deletions
+100
-95
drivers/input/mouse/hgpk.c
drivers/input/mouse/hgpk.c
+2
-2
drivers/input/mouse/logips2pp.c
drivers/input/mouse/logips2pp.c
+51
-47
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/psmouse-base.c
+36
-36
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.c
+11
-10
No files found.
drivers/input/mouse/hgpk.c
View file @
a62f0d27
...
@@ -40,8 +40,8 @@
...
@@ -40,8 +40,8 @@
#include "psmouse.h"
#include "psmouse.h"
#include "hgpk.h"
#include "hgpk.h"
static
int
tpdebug
;
static
bool
tpdebug
;
module_param
(
tpdebug
,
int
,
0644
);
module_param
(
tpdebug
,
bool
,
0644
);
MODULE_PARM_DESC
(
tpdebug
,
"enable debugging, dumping packets to KERN_DEBUG."
);
MODULE_PARM_DESC
(
tpdebug
,
"enable debugging, dumping packets to KERN_DEBUG."
);
static
int
recalib_delta
=
100
;
static
int
recalib_delta
=
100
;
...
...
drivers/input/mouse/logips2pp.c
View file @
a62f0d27
...
@@ -250,7 +250,6 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
...
@@ -250,7 +250,6 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
if
(
model
==
ps2pp_list
[
i
].
model
)
if
(
model
==
ps2pp_list
[
i
].
model
)
return
&
ps2pp_list
[
i
];
return
&
ps2pp_list
[
i
];
printk
(
KERN_WARNING
"logips2pp: Detected unknown logitech mouse model %d
\n
"
,
model
);
return
NULL
;
return
NULL
;
}
}
...
@@ -285,6 +284,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse,
...
@@ -285,6 +284,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse,
__set_bit
(
REL_HWHEEL
,
input_dev
->
relbit
);
__set_bit
(
REL_HWHEEL
,
input_dev
->
relbit
);
switch
(
model_info
->
kind
)
{
switch
(
model_info
->
kind
)
{
case
PS2PP_KIND_WHEEL
:
case
PS2PP_KIND_WHEEL
:
psmouse
->
name
=
"Wheel Mouse"
;
psmouse
->
name
=
"Wheel Mouse"
;
break
;
break
;
...
@@ -343,7 +343,8 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
...
@@ -343,7 +343,8 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
if
(
!
model
||
!
buttons
)
if
(
!
model
||
!
buttons
)
return
-
1
;
return
-
1
;
if
((
model_info
=
get_model_info
(
model
))
!=
NULL
)
{
model_info
=
get_model_info
(
model
);
if
(
model_info
)
{
/*
/*
* Do Logitech PS2++ / PS2T++ magic init.
* Do Logitech PS2++ / PS2T++ magic init.
...
@@ -379,6 +380,9 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
...
@@ -379,6 +380,9 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties)
use_ps2pp
=
true
;
use_ps2pp
=
true
;
}
}
}
}
}
else
{
printk
(
KERN_WARNING
"logips2pp: Detected unknown logitech mouse model %d
\n
"
,
model
);
}
}
if
(
set_properties
)
{
if
(
set_properties
)
{
...
...
drivers/input/mouse/psmouse-base.c
View file @
a62f0d27
...
@@ -1245,7 +1245,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse,
...
@@ -1245,7 +1245,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse,
psmouse
->
pktsize
=
3
;
psmouse
->
pktsize
=
3
;
if
(
proto
&&
(
proto
->
detect
||
proto
->
init
))
{
if
(
proto
&&
(
proto
->
detect
||
proto
->
init
))
{
if
(
proto
->
detect
&&
proto
->
detect
(
psmouse
,
1
)
<
0
)
if
(
proto
->
detect
&&
proto
->
detect
(
psmouse
,
true
)
<
0
)
return
-
1
;
return
-
1
;
if
(
proto
->
init
&&
proto
->
init
(
psmouse
)
<
0
)
if
(
proto
->
init
&&
proto
->
init
(
psmouse
)
<
0
)
...
...
drivers/input/mouse/synaptics.c
View file @
a62f0d27
...
@@ -532,6 +532,7 @@ static int synaptics_validate_byte(unsigned char packet[], int idx, unsigned cha
...
@@ -532,6 +532,7 @@ static int synaptics_validate_byte(unsigned char packet[], int idx, unsigned cha
return
0
;
return
0
;
switch
(
pkt_type
)
{
switch
(
pkt_type
)
{
case
SYN_NEWABS
:
case
SYN_NEWABS
:
case
SYN_NEWABS_RELAXED
:
case
SYN_NEWABS_RELAXED
:
return
(
packet
[
idx
]
&
newabs_rel_mask
[
idx
])
==
newabs_rslt
[
idx
];
return
(
packet
[
idx
]
&
newabs_rel_mask
[
idx
])
==
newabs_rslt
[
idx
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment