i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed ...handle... into ...notify...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16035 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-01-22 14:48:06 +00:00
parent e999b3e654
commit 998c7c5496
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_common.c
+5 -5
View File
@@ -314,12 +314,12 @@ ps2_init_driver(void)
} }
} }
ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_KEYB]); ps2_service_notify_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_MOUSE]);
if (gMultiplexingActive) { if (gMultiplexingActive) {
ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE + 1]); ps2_service_notify_device_added(&ps2_device[PS2_DEVICE_MOUSE + 1]);
ps2_service_handle_device_added(&ps2_device[PS2_DEVICE_MOUSE + 2]); ps2_service_notify_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 + 3]);
} }
//goto err_5; //goto err_5;
src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
+1 -1
View File
@@ -111,7 +111,7 @@ ps2_dev_handle_int(ps2_dev *dev, uint8 data)
} }
if (!dev->active) { if (!dev->active) {
ps2_service_handle_device_added(dev); ps2_service_notify_device_added(dev);
dprintf("not active, data dropped\n"); dprintf("not active, data dropped\n");
return B_HANDLED_INTERRUPT; return B_HANDLED_INTERRUPT;
} }
src/add-ons/kernel/bus_managers/ps2/ps2_service.c
+13 -13
View File
@@ -26,35 +26,35 @@ typedef struct
enum enum
{ {
PS2_SERVICE_HANDLE_DEVICE_ADDED = 1, PS2_SERVICE_NOTIFY_DEVICE_ADDED = 1,
PS2_SERVICE_HANDLE_DEVICE_REMOVED, PS2_SERVICE_NOTIFY_DEVICE_REMOVED,
}; };
void void
ps2_service_handle_device_added(ps2_dev *dev) ps2_service_notify_device_added(ps2_dev *dev)
{ {
ps2_service_cmd cmd; 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; cmd.dev = dev;
packet_buffer_write(sServiceCmdBuffer, (const uint8 *)&cmd, sizeof(cmd)); packet_buffer_write(sServiceCmdBuffer, (const uint8 *)&cmd, sizeof(cmd));
release_sem_etc(sServiceSem, 1, B_DO_NOT_RESCHEDULE); 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 void
ps2_service_handle_device_removed(ps2_dev *dev) ps2_service_notify_device_removed(ps2_dev *dev)
{ {
ps2_service_cmd cmd; 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; cmd.dev = dev;
packet_buffer_write(sServiceCmdBuffer, (const uint8 *)&cmd, sizeof(cmd)); 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)); packet_buffer_read(sServiceCmdBuffer, (uint8 *)&cmd, sizeof(cmd));
switch (cmd.id) { switch (cmd.id) {
case PS2_SERVICE_HANDLE_DEVICE_ADDED: case PS2_SERVICE_NOTIFY_DEVICE_ADDED:
TRACE(("PS2_SERVICE_HANDLE_DEVICE_ADDED %s\n", cmd.dev->name)); TRACE(("PS2_SERVICE_NOTIFY_DEVICE_ADDED %s\n", cmd.dev->name));
if (ps2_service_probe_device(cmd.dev) == B_OK) if (ps2_service_probe_device(cmd.dev) == B_OK)
ps2_dev_publish(cmd.dev); ps2_dev_publish(cmd.dev);
break; break;
case PS2_SERVICE_HANDLE_DEVICE_REMOVED: case PS2_SERVICE_NOTIFY_DEVICE_REMOVED:
TRACE(("PS2_SERVICE_HANDLE_DEVICE_REMOVED %s\n", cmd.dev->name)); TRACE(("PS2_SERVICE_NOTIFY_DEVICE_REMOVED %s\n", cmd.dev->name));
ps2_dev_unpublish(cmd.dev); ps2_dev_unpublish(cmd.dev);
break; break;
src/add-ons/kernel/bus_managers/ps2/ps2_service.h
+2 -2
View File
@@ -16,7 +16,7 @@
status_t ps2_service_init(void); status_t ps2_service_init(void);
void ps2_service_exit(void); void ps2_service_exit(void);
void ps2_service_handle_device_added(ps2_dev *dev); void ps2_service_notify_device_added(ps2_dev *dev);
void ps2_service_handle_device_removed(ps2_dev *dev); void ps2_service_notify_device_removed(ps2_dev *dev);
#endif #endif