Author: axeld Date: 2011-06-15 22:33:31 +0200 (Wed, 15 Jun 2011) New Revision: 42198 Changeset: https://dev.haiku-os.org/changeset/42198 Ticket: https://dev.haiku-os.org/ticket/917 Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp Log: * Removed extra snooze() for debugging purposes when publishing a device; this directly reduces the time the mouse cursor is visible but cannot be moved yet. Based on a patch by Adek336 as part of ticket #917. * Decreased the republishing snooze about a second, too. * Minor cleanup. Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp =================================================================== --- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp 2011-06-15 20:25:50 UTC (rev 42197) +++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp 2011-06-15 20:33:31 UTC (rev 42198) @@ -8,34 +8,37 @@ * Marcus Overhagen (marcus@xxxxxxxxxxxx) */ + #include "ps2_service.h" + #include "packet_buffer.h" + #define DEBUG_PUBLISHING - #ifdef DEBUG_PUBLISHING - #include <debug.h> - #include <stdlib.h> +# include <stdlib.h> +# include <debug.h> #endif -static sem_id sServiceSem; -static thread_id sServiceThread; -static volatile bool sServiceTerminate; -static packet_buffer * sServiceCmdBuffer; -typedef struct -{ +typedef struct { uint32 id; ps2_dev * dev; } ps2_service_cmd; -enum -{ +enum { PS2_SERVICE_NOTIFY_DEVICE_ADDED = 1, PS2_SERVICE_NOTIFY_DEVICE_REPUBLISH, PS2_SERVICE_NOTIFY_DEVICE_REMOVED, }; + +static sem_id sServiceSem; +static thread_id sServiceThread; +static volatile bool sServiceTerminate; +static packet_buffer * sServiceCmdBuffer; + + void ps2_service_notify_device_added(ps2_dev *dev) { @@ -104,7 +107,6 @@ packet_buffer_read(sServiceCmdBuffer, (uint8 *)&cmd, sizeof(cmd)); switch (cmd.id) { case PS2_SERVICE_NOTIFY_DEVICE_ADDED: - snooze(1000000); // for better testing of possible input server race condition TRACE("ps2: PS2_SERVICE_NOTIFY_DEVICE_ADDED %s\n", cmd.dev->name); ps2_dev_publish(cmd.dev); break; @@ -112,7 +114,7 @@ case PS2_SERVICE_NOTIFY_DEVICE_REPUBLISH: TRACE("ps2: PS2_SERVICE_NOTIFY_DEVICE_REPUBLISH %s\n", cmd.dev->name); ps2_dev_unpublish(cmd.dev); - snooze(2500000); + snooze(1500000); ps2_dev_publish(cmd.dev); break;