From 998c7c5496adc9dc484f17794c521f651c632b4b Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Sun, 22 Jan 2006 14:48:06 +0000 Subject: [PATCH] renamed ...handle... into ...notify... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16035 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/bus_managers/ps2/ps2_common.c | 10 +++---- src/add-ons/kernel/bus_managers/ps2/ps2_dev.c | 2 +- .../kernel/bus_managers/ps2/ps2_service.c | 26 +++++++++---------- .../kernel/bus_managers/ps2/ps2_service.h | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c index a42f13de54..06bc10287c 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c @@ -314,12 +314,12 @@ ps2_init_driver(void) } } - ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_KEYB]); - ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE]); + ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_KEYB]); + ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_MOUSE]); if (gMultiplexingActive) { - ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE + 1]); - ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE + 2]); - ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE + 3]); + ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_MOUSE + 1]); + ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_MOUSE + 2]); + ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_MOUSE + 3]); } //goto err_5; diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c index 337c48a56a..e6511262e8 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c @@ -111,7 +111,7 @@ ps2_dev_handle_int(ps2_dev *dev, uint8 data) } if (!dev->active) { - ps2_service_handle_device_added(dev); + ps2_service_notify_device_added(dev); dprintf("not active, data dropped\n"); return B_HANDLED_INTERRUPT; } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.c b/src/add-ons/kernel/bus_managers/ps2/ps2_service.c index 22376aeee0..ce6f165855 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.c @@ -26,35 +26,35 @@ typedef struct enum { - PS2_SERVICE_HANDLE_DEVICE_ADDED = 1, - PS2_SERVICE_HANDLE_DEVICE_REMOVED, + PS2_SERVICE_NOTIFY_DEVICE_ADDED = 1, + PS2_SERVICE_NOTIFY_DEVICE_REMOVED, }; void -ps2_service_handle_device_added(ps2_dev *dev) +ps2_service_notify_device_added(ps2_dev *dev) { ps2_service_cmd cmd; - TRACE(("ps2_service_handle_device_added %s\n", dev->name)); + TRACE(("ps2_service_notify_device_added %s\n", dev->name)); - cmd.id = PS2_SERVICE_HANDLE_DEVICE_ADDED; + cmd.id = PS2_SERVICE_NOTIFY_DEVICE_ADDED; cmd.dev = dev; packet_buffer_write(sServiceCmdBuffer, (const uint8 *)&cmd, sizeof(cmd)); release_sem_etc(sServiceSem, 1, B_DO_NOT_RESCHEDULE); - TRACE(("ps2_service_handle_device_added done\n")); + TRACE(("ps2_service_notify_device_added done\n")); } void -ps2_service_handle_device_removed(ps2_dev *dev) +ps2_service_notify_device_removed(ps2_dev *dev) { ps2_service_cmd cmd; - TRACE(("ps2_service_handle_device_removed %s\n", dev->name)); + TRACE(("ps2_service_notify_device_removed %s\n", dev->name)); - cmd.id = PS2_SERVICE_HANDLE_DEVICE_REMOVED; + cmd.id = PS2_SERVICE_NOTIFY_DEVICE_REMOVED; cmd.dev = dev; packet_buffer_write(sServiceCmdBuffer, (const uint8 *)&cmd, sizeof(cmd)); @@ -110,14 +110,14 @@ ps2_service_thread(void *arg) packet_buffer_read(sServiceCmdBuffer, (uint8 *)&cmd, sizeof(cmd)); switch (cmd.id) { - case PS2_SERVICE_HANDLE_DEVICE_ADDED: - TRACE(("PS2_SERVICE_HANDLE_DEVICE_ADDED %s\n", cmd.dev->name)); + case PS2_SERVICE_NOTIFY_DEVICE_ADDED: + TRACE(("PS2_SERVICE_NOTIFY_DEVICE_ADDED %s\n", cmd.dev->name)); if (ps2_service_probe_device(cmd.dev) == B_OK) ps2_dev_publish(cmd.dev); break; - case PS2_SERVICE_HANDLE_DEVICE_REMOVED: - TRACE(("PS2_SERVICE_HANDLE_DEVICE_REMOVED %s\n", cmd.dev->name)); + case PS2_SERVICE_NOTIFY_DEVICE_REMOVED: + TRACE(("PS2_SERVICE_NOTIFY_DEVICE_REMOVED %s\n", cmd.dev->name)); ps2_dev_unpublish(cmd.dev); break; diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.h b/src/add-ons/kernel/bus_managers/ps2/ps2_service.h index 4d1a5b0b84..5a4a5a10f1 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.h +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.h @@ -16,7 +16,7 @@ status_t ps2_service_init(void); void ps2_service_exit(void); -void ps2_service_handle_device_added(ps2_dev *dev); -void ps2_service_handle_device_removed(ps2_dev *dev); +void ps2_service_notify_device_added(ps2_dev *dev); +void ps2_service_notify_device_removed(ps2_dev *dev); #endif