Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv13293
Modified Files:
iforce-ff.c iforce-main.c iforce-packets.c
Log Message:
Removed debug messages.
Index: iforce-ff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce-ff.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iforce-ff.c 2001/10/27 14:43:18 1.4
+++ iforce-ff.c 2001/10/28 19:10:24 1.5
@@ -41,8 +41,6 @@
{
unsigned char data[3];
- printk(KERN_DEBUG "iforce: in make_magnitude_modifier\n");
-
if (!no_alloc) {
down(&iforce->mem_mutex);
if (allocate_resource(&(iforce->device_memory), mod_chunk, 2,
@@ -182,6 +180,7 @@
data[9] = (100*lsat)>>16;
iforce_send_packet(iforce, FF_CMD_INTERACT, data);
+ iforce_dump_packet("interactive", FF_CMD_INTERACT, data);
return 0;
}
@@ -408,9 +407,6 @@
effect->trigger.interval,
effect->direction);
}
- else {
- printk(KERN_DEBUG "iforce.c: no effect packet was needed\n");
- }
/* If one of the parameter creation failed, we already returned an
* error code.
@@ -438,8 +434,6 @@
int param2_err = 1;
int core_err = 0;
- printk(KERN_DEBUG "iforce.c: make constant effect\n");
-
if (!is_update || need_magnitude_modifier(iforce, effect)) {
param1_err = make_magnitude_modifier(iforce, mod1_chunk,
is_update,
@@ -471,9 +465,6 @@
effect->trigger.interval,
effect->direction);
}
- else {
- printk(KERN_DEBUG "iforce.c: no effect packet was needed\n");
- }
/* If one of the parameter creation failed, we already returned an
* error code.
@@ -496,8 +487,6 @@
u16 mod1, mod2, direction;
int param_err = 1;
int core_err = 0;
-
- printk(KERN_DEBUG "iforce.c: make interactive effect\n");
switch (effect->type) {
case FF_SPRING: type = 0x40; break;
Index: iforce-main.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce-main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iforce-main.c 2001/10/23 21:20:54 1.3
+++ iforce-main.c 2001/10/28 19:10:24 1.4
@@ -120,8 +120,6 @@
int ret;
int is_update;
- printk(KERN_DEBUG "iforce.c: upload effect\n");
-
/*
* If we want to create a new effect, get a free id
*/
@@ -149,7 +147,6 @@
/* Check the effect is not already being updated */
if (test_bit(FF_CORE_UPDATE, iforce->core_effects[effect->id].flags)) {
- printk(KERN_DEBUG "iforce.c: update too frequent refused\n");
return -EAGAIN;
}
@@ -203,8 +200,6 @@
return -EACCES;
}
- printk(KERN_DEBUG "iforce.c: erase effect %d\n", effect_id);
-
if (effect_id < 0 || effect_id >= FF_EFFECTS_MAX)
return -EINVAL;
@@ -238,7 +233,7 @@
#endif
}
- /* Reset device */
+ /* Enable force feedback */
iforce_send_packet(iforce, FF_CMD_ENABLE, "\004");
return 0;
@@ -256,7 +251,7 @@
current->pid == iforce->core_effects[i].owner) {
/* Stop effect */
- iforce_input_event(dev, EV_FF, i, 0);
+ input_report_ff(dev, i, 0);
/* Free ressources assigned to effect */
if (iforce_erase_effect(dev, i)) {
@@ -322,7 +317,6 @@
iforce->dev.idbus = BUS_USB;
iforce->dev.private = iforce;
- iforce->dev.name = iforce->name;
iforce->dev.name = iforce->phys;
iforce->dev.open = iforce_open;
iforce->dev.close = iforce_close;
Index: iforce-packets.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce-packets.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iforce-packets.c 2001/10/23 21:20:54 1.3
+++ iforce-packets.c 2001/10/28 19:10:24 1.4
@@ -142,11 +142,10 @@
(iforce->core_effects[i].mod1_chunk.start == addr ||
iforce->core_effects[i].mod2_chunk.start == addr)) {
clear_bit(FF_CORE_UPDATE, iforce->core_effects[i].flags);
-printk(KERN_DEBUG "iforce.c: marked effect %d as ready\n", i);
return 0;
}
}
- printk(KERN_DEBUG "iforce.c: unused effect %04x updated !!!\n", addr);
+ printk(KERN_WARNING "iforce-packets.c: unused effect %04x updated !!!\n", addr);
return -1;
}
@@ -157,7 +156,7 @@
static int being_used = 0;
if (being_used)
- printk(KERN_WARNING "iforce.c: re-entrant call to iforce_process %d\n", being_used);
+ printk(KERN_WARNING "iforce-packets.c: re-entrant call to iforce_process %d\n", being_used);
being_used++;
#ifdef IFORCE_232
@@ -218,8 +217,7 @@
if (LO(cmd) > 3) {
int j;
for (j=3; j<LO(cmd); j+=2) {
- if (mark_core_as_ready(iforce, data[j] | (data[j+1]<<8)))
- iforce_dump_packet("ff status", cmd, data);
+ mark_core_as_ready(iforce, data[j] | (data[j+1]<<8));
}
}
break;
|
